fo

src/api/project/index.js

@@ -47,6 +47,9 @@ export default {
   folderAdd (params) { // 添加文件夹
     return fetch('/blade-project-manage/filefolder/v1/save', params, 'post', 'json')
   },
+  folderUpdate (params) {
+    return fetch('/blade-project-manage/filefolder/v1/update', params, 'post', 'json')
+  },
   fileList (params) { // 文件夹里包含文件列表
     return fetch('/blade-project-manage/bladefile/v1/getListByFolderId', params)
   },

src/components/basic-step/index.vue

@@ -17,13 +17,13 @@
           <div :style='indicator === index ? "background-color: #596A8A":"background-color: transparent" '
                class='content pointer' style='z-index: 2;margin-left: -15px'
                @click='change(index)'>
-            <div class='flex flex-col flex-align-start  full-width '>
-              <div class='padding flex flex-col ml-15 font-15 bold'>
-                <div :style='indicator === index ? "color:white": "color:#AFAFAF"' class="mt-5">
+            <div class='flex flex-col flex-align-start  full-width'>
+              <div class='padding flex flex-col ml-5 font-15 bold'>
+                <div :style='indicator === index ? "color:white": "color:#AFAFAF"' class="mt-5 nowrap">
                   {{ item.title }}
                 </div>
                 <div :style='indicator === index ? "color:#E2AE64": "color:#9E2E26" ' class='text-left'>
-                  {{ item.count }} 个
+                  {{ item.count }} 个文件
                 </div>
               </div>
             </div>
@@ -46,13 +46,13 @@ export default {
   },
   watch: {
     active: {
-      handler(val) {
+      handler (val) {
         this.indicator = val
       },
       immediate: true
     }
   },
-  data() {
+  data () {
     return {
       indicator: 0,
       selected: true,
@@ -61,7 +61,7 @@ export default {
     }
   },
   methods: {
-    change(index) {
+    change (index) {
       this.indicator = index
       this.$emit('change', index)
       this.$bus.emit('change', index)

src/layout/index.vue

@@ -1,18 +1,18 @@
 <template>
   <div class='full-screen flex flex-justify-start'>
-    <el-aside width="240px" >
+    <el-aside width="200px">
       <left/>
     </el-aside>
     <el-container>
       <el-header class='header'>
-          <top />
+        <top/>
       </el-header>
       <el-main class='wt-main orange-bg'>
         <div>
           <router-view v-slot="{ Component, route }">
-              <keep-alive :include='keepAlive.list'>
-                <component :is="Component" :key="route.fullPath" />
-              </keep-alive>
+            <keep-alive :include='keepAlive.list'>
+              <component :is="Component" :key="route.fullPath"/>
+            </keep-alive>
           </router-view>
         </div>
       </el-main>
@@ -24,6 +24,7 @@
 import left from './left.vue'
 import top from './top.vue'
 import keepAliveStore from '../store/keepAlive.js'
+
 export default {
   name: 'index.vue',
   components: { left, top },
@@ -40,9 +41,10 @@ export default {
 </script>
 
 <style lang='scss' scoped>
-.header{
+.header {
   padding: 0;
 }
+
 .wt-main {
   background-color: #E4E4E4;
   padding: 0;

src/layout/left.vue

@@ -6,10 +6,11 @@
       </div>
     </div>
     <div>
-      <div class="flex flex-center flex-col bold font-18 item-bg" >
-        <div v-for="(item,index) in data" :key="item.name" class="flex flex-center pointer" :class="active === index ? 'item-s' : 'item'" @click="navClick(item,index)">
+      <div class="flex flex-center flex-col bold font-18 item-bg">
+        <div v-for="(item,index) in data" :key="item.name" class="flex flex-center pointer"
+             :class="active === index ? 'item-s' : 'item'" @click="navClick(item,index)">
           <img :src=item.img>
-          <span class="ml-10">{{item.name}}</span>
+          <span class="ml-10">{{ item.name }}</span>
         </div>
       </div>
     </div>
@@ -70,20 +71,23 @@ export default {
 <style scoped>
 .box-shadow-blue {
   position: fixed;
-  width: 240px;
+  width: 200px;
   left: 0;
   z-index: 2;
   background-color: white;
   box-shadow: 5px 0 10px -5px rgba(0, 0, 0, 0.1);
 }
 
-.item-bg{
-  margin: 0 20px;border-top:1px solid #D1D1D1;border-bottom:1px solid #D1D1D1;padding-bottom: 40px
+.item-bg {
+  margin: 0 20px;
+  border-top: 1px solid #D1D1D1;
+  border-bottom: 1px solid #D1D1D1;
+  padding-bottom: 40px
 }
 
 .item-s {
   height: 58px;
-  width: 200px;
+  width: 180px;
   border-radius: 14px;
   margin-top: 40px;
   color: white;
@@ -93,7 +97,7 @@ export default {
 
 .item {
   height: 58px;
-  width: 200px;
+  width: 180px;
   border-radius: 14px;
   margin-top: 40px;
   color: #707070;

src/page/login.vue

@@ -10,15 +10,15 @@
 
         <div class='right  flex flex-col flex-child-average'>
           <div class="flex flex-col flex-justify-between" style="height: 560px">
-            <div class='flex flex-justify-end'
-                 style="margin-right: 3px;margin-top: 3px">
-              <div>
-                <img v-if="qrCodeLogin" src='../assets/img/com.png' style='width: 80px'
-                     @click='qrCodeLogin = !qrCodeLogin'/>
-                <img v-else src='../assets/img/code.png' style='width: 80px'
-                     @click='qrCodeLogin = !qrCodeLogin'/>
-              </div>
-            </div>
+            <!--            <div class='flex flex-justify-end'-->
+            <!--                 style="margin-right: 3px;margin-top: 3px">-->
+            <!--              <div>-->
+            <!--                <img v-if="qrCodeLogin" src='../assets/img/com.png' style='width: 80px'-->
+            <!--                     @click='qrCodeLogin = !qrCodeLogin'/>-->
+            <!--                <img v-else src='../assets/img/code.png' style='width: 80px'-->
+            <!--                     @click='qrCodeLogin = !qrCodeLogin'/>-->
+            <!--              </div>-->
+            <!--            </div>-->
 
             <div v-if='qrCodeLogin' class='flex flex-center flex-col ' style="height: 500px">
               <span class='font-24 black bold '>欢迎来到梧桐树云平台👏</span>

src/views/home/component/dash.vue

@@ -2,17 +2,18 @@
   <div class="full-height full-width flex flex-col">
     <div class="white-bg flex flex-col padding">
       <div class="flex flex-align-center tip">
-        <el-icon class="ml-20" color="#ECAB56">
+        <el-icon class="ml-20" color="#BC002D">
           <WarningFilled/>
         </el-icon>
-        <span class="ml-5">项目总投资额{{ num }}万元</span>
+        <span class="ml-5">项目总投资额<span
+            class="main-color bold">{{ Number.parseFloat(num).toLocaleString() }}</span>万元</span>
       </div>
       <div class="flex ml-20 hide-scrollbar" style="overflow-x: scroll;width: 86vw">
         <div v-for="(item,index) in stage" :key='item.id' :class="active === index ? 'total-s' : 'total'"
              class="flex flex-col  flex-center mt-20 bold font-16 pointer"
              @click="switchTab(item,index)">
-          <span class="ml-15 sp">{{ item.name }}</span>
-          <span class="ml-15 sp1 mt-5">{{ item.projectNumber }}<span class="grey font-14 ml-5">个</span></span>
+          <span class=" sp">{{ item.name }}</span>
+          <span class=" sp1 mt-5">{{ item.projectNumber }}<span class="grey font-14 ml-5">个</span></span>
         </div>
       </div>
       <base-button v-if='permissions.permissions.projectAdd' class="ml-20 mt-20" icon="Plus" title="新增"
@@ -277,10 +278,13 @@ export default {
           query: { id: this.form.id, type: '0' }
         })
       } else if (type === 'edit') {
-        this.$router.push({
-          path: '/home/details',
-          query: { id: this.form.id, type: '1' }
+        this.$alert('功能建设中，尽情期待...', '消息提醒', {
+          confirmButtonText: 'OK'
         })
+        // this.$router.push({
+        //   path: '/home/details',
+        //   query: { id: this.form.id, type: '1' }
+        // })
       }
     },
     currentChange (currentPage) {
@@ -351,7 +355,6 @@ export default {
   width: 260px;
   height: 38px;
   background-color: #FBF6ED;
-  color: #ECAB56;
   font-weight: 500;
   flex-wrap: nowrap;
   margin-left: 20px;

src/views/home/component/folder_list.vue

@@ -2,19 +2,23 @@
   <div class="full-width full-height mb-10">
     <div class="flex flex-col">
       <div class="flex flex-align-center padding border-bottom bold title-sp">
+
         <span class="flex-1"></span>
-        <span style="flex: 2">文件/文件夹名称</span>
+        <span style="flex: 2;text-align: left">文件/文件夹名称</span>
         <span style="flex: 1">更新（上传）时间</span>
         <span style="flex: 1.5">文件数量</span>
         <span style="flex: 3">操作</span>
       </div>
 
       <el-empty v-if="folder && folder.length === 0" description="暂无数据"/>
-      <div v-for="item in folder" :key='item.id' v-else class="flex flex-center border-bottom padding content-sp">
-        <img v-if="item.isAccess === 1" class="icon" src="../../../assets/svg/folder/see.svg">
-        <img v-else-if="item.isAccess === 2" class="icon" src="../../../assets/svg/folder/edit.svg">
-        <img v-else class="icon" src="../../../assets/svg/folder/invisible.svg">
-        <span style="flex:2">{{ item.folderName }}</span>
+      <div v-for="item in folder" :key='item.id' v-else
+           class="flex flex-center border-bottom padding content-sp">
+        <div class="flex-1 pointer" @click="fileView(item)">
+          <img v-if="item.isAccess === 1" class="icon light-red-bg" src="../../../assets/svg/folder/see.svg">
+          <img v-else-if="item.isAccess === 2" class="icon" src="../../../assets/svg/folder/edit.svg">
+          <img v-else class="icon" src="../../../assets/svg/folder/invisible.svg">
+        </div>
+        <span style="flex:2;text-align: left">{{ item.folderName }}</span>
         <span style="flex: 1">{{ item.updateTime }}</span>
         <span style="flex: 1.5">{{ item.fileNumber }}</span>
         <div class="flex flex-center" style="flex: 3">
@@ -330,8 +334,8 @@ export default {
 
 .icon {
   flex: 0.5;
-  width: 50px;
-  height: 46px;
+  width: 43px;
+  height: 45px;
 }
 
 .custom-dialog {

src/views/home/component/left_bar.vue

@@ -19,7 +19,9 @@
         <el-divider></el-divider>
         <div class="flex flex-col flex-center tip">
           <span class="font-16 bold mt-5" style="color:#787C90;">项目总投资额</span>
-          <span class="mt-5 font-16 bold" style="color: #ECAB56">{{ data.totalAmount }}万元</span>
+          <span class="mt-5 font-16 bold main-color">{{
+              data.totalAmount ? data.totalAmount.toLocaleString() : '-'
+            }}万元</span>
         </div>
       </div>
     </div>