Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/views/home/component/dash.vue
#	src/views/home/component/pro_left.vue

src/api/project/index.js

@@ -2,163 +2,169 @@ import fetch from '../fetch.js'
 import request from '@/api/axios'
 
 export default {
-  /**
+    /**
      * 项目相关借口
      * @returns {Promise<unknown>}
      */
-  projectList (current, size, params) { // 项目列表
-    return fetch('/blade-project-manage-v2/project/v2/page', {
-      ...params,
-      current,
-      size
-    })
-  },
-  projectAdd (params) { // 新增项目
-    return fetch('/blade-project-manage-v2/project/v2/save', params, 'post', 'json')
-  },
-  projectRemove (params) { // 删除项目
-    return fetch('/blade-project-manage-v2/project/v2/remove', params, 'post')
-  },
-  proContact (params) { // 关联子项目
-    return fetch('/blade-project-manage-v2/project/v2/connect', params, 'post', 'json')
-  },
-  removeContact (params) {
-    return fetch('/blade-project-manage-v2/project/v2/removeConnect', params, 'post')
-  },
-  childrenList (params) { // 已关联子项目列表
-    return fetch('/blade-project-manage-v2/project/v2/childrenList', params)
-  },
-  typeList (params) { // 项目分类列表
-    return fetch('/blade-project-manage-v2/typeAndStage/v2/page', params)
-  },
-  projectInfo (id) { // 项目详细信息
-    return fetch('/blade-project-manage-v2/project/v2/detail/?id=' + id)
-  },
-  proUpdate (params) { // 项目信息更新
-    return fetch('/blade-project-manage-v2/project/v2/update', params, 'post', 'json')
-  },
-  issuanceDetail (params) { // 项目发行明细
-    return fetch('/blade-project-manage-v2/projectdetail/v2/list', params)
-  },
-  issueAdd (params) { // 新增发行明细
-    return fetch('/blade-project-manage-v2/projectdetail/v2/save', params, 'post', 'json')
-  },
-  userStageList () { // 统计用户阶段项目数
-    return fetch('/blade-project-manage-v2/stage/v2/projectCount')
-  },
-  includeStage (params) { // 单个项目包含阶段
-    return fetch('/blade-project-manage-v2/stage/v2/projectStages', params)
-  },
-  folderList (params) { // 阶段包含文件夹列表
-    return fetch('/blade-project-manage-v2/folder/v2/listByStageId', params)
-  },
-  sqRecord (params) { // 文件夹授权记录
-    return fetch('/blade-project-manage-v2/qrcode/v2/grantLog', params)
-  },
-  findFiles (params) { // 文件搜索
-    return fetch('/blade-project-manage-v2/folder/v2/findFile', params)
-  },
-  folderListAll (params) { // 历史数据文件夹列表
-    return fetch('/blade-project-manage-v2/folder/v2/history', params)
-  },
-  folderRemove (params) { // 删除文件夹
-    return fetch('/blade-project-manage-v2/folder/v2/remove', params, 'post')
-  },
-  folderAdd (params) { // 添加文件夹
-    return fetch('/blade-project-manage-v2/folder/v2/submit', params, 'post', 'json')
-  },
-  folderUpdate (params) { // 文件夹更新
-    return fetch('/blade-project-manage-v2/folder/v2/submit', params, 'post', 'json')
-  },
-  fileList (params) { // 文件夹里包含文件列表
-    return fetch('/blade-project-manage-v2/folder/v2/getListByFolderId', params)
-  },
-  fileDetail (id) {
-    return fetch('/wutong-library/library/detail/' + id)
-  },
-  articleDetailByFile (id) {
-    return fetch('/wutong-library/library/detail/file/' + id)
-  },
-  fileAdd (params) { // 上传（新增）文件
-    return fetch('/blade-project-manage-v2/folder/v2/saveFile', params, 'post', 'json')
-  },
-  fileRemove (params) { // 删除文件
-    return fetch('/blade-project-manage-v2/folder/v2/remove', params, 'post')
-  },
-  /**
+    projectList(current, size, params) { // 项目列表
+        return fetch('/blade-project-manage-v2/project/v2/page', {
+            ...params,
+            current,
+            size
+        })
+    },
+    projectAdd(params) { // 新增项目
+        return fetch('/blade-project-manage-v2/project/v2/save', params, 'post', 'json')
+    },
+    projectRemove(params) { // 删除项目
+        return fetch('/blade-project-manage-v2/project/v2/remove', params, 'post')
+    },
+    proContact(params) { // 关联子项目
+        return fetch('/blade-project-manage-v2/project/v2/connect', params, 'post', 'json')
+    },
+    removeContact(params) {
+        return fetch('/blade-project-manage-v2/project/v2/removeConnect', params, 'post')
+    },
+    childrenList(params) { // 已关联子项目列表
+        return fetch('/blade-project-manage-v2/project/v2/childrenList', params)
+    },
+    typeList(params) { // 项目分类列表
+        return fetch('/blade-project-manage-v2/typeAndStage/v2/page', params)
+    },
+    projectInfo(id) { // 项目详细信息
+        return fetch('/blade-project-manage-v2/project/v2/detail/?id=' + id)
+    },
+    proUpdate(params) { // 项目信息更新
+        return fetch('/blade-project-manage-v2/project/v2/update', params, 'post', 'json')
+    },
+    issuanceDetail(params) { // 项目发行明细
+        return fetch('/blade-project-manage-v2/projectdetail/v2/list', params)
+    },
+    issueAdd(params) { // 新增发行明细
+        return fetch('/blade-project-manage-v2/projectdetail/v2/save', params, 'post', 'json')
+    },
+    userStageList() { // 统计用户阶段项目数
+        return fetch('/blade-project-manage-v2/stage/v2/projectCount')
+    },
+    userNunList() { // 统计用户各类型项目数
+        return fetch('/blade-project-manage-v2/project/v2/projectStageNumber')
+    },
+    updateStage(params) { // 修改项目情况
+        return fetch('/blade-project-manage-v2/project/v2/updateProjectStage', params, 'post')
+    },
+    includeStage(params) { // 单个项目包含阶段
+        return fetch('/blade-project-manage-v2/stage/v2/projectStages', params)
+    },
+    folderList(params) { // 阶段包含文件夹列表
+        return fetch('/blade-project-manage-v2/folder/v2/listByStageId', params)
+    },
+    sqRecord(params) { // 文件夹授权记录
+        return fetch('/blade-project-manage-v2/qrcode/v2/grantLog', params)
+    },
+    findFiles(params) { // 文件搜索
+        return fetch('/blade-project-manage-v2/folder/v2/findFile', params)
+    },
+    folderListAll(params) { // 历史数据文件夹列表
+        return fetch('/blade-project-manage-v2/folder/v2/history', params)
+    },
+    folderRemove(params) { // 删除文件夹
+        return fetch('/blade-project-manage-v2/folder/v2/remove', params, 'post')
+    },
+    folderAdd(params) { // 添加文件夹
+        return fetch('/blade-project-manage-v2/folder/v2/submit', params, 'post', 'json')
+    },
+    folderUpdate(params) { // 文件夹更新
+        return fetch('/blade-project-manage-v2/folder/v2/submit', params, 'post', 'json')
+    },
+    fileList(params) { // 文件夹里包含文件列表
+        return fetch('/blade-project-manage-v2/folder/v2/getListByFolderId', params)
+    },
+    fileDetail(id) {
+        return fetch('/wutong-library/library/detail/' + id)
+    },
+    articleDetailByFile(id) {
+        return fetch('/wutong-library/library/detail/file/' + id)
+    },
+    fileAdd(params) { // 上传（新增）文件
+        return fetch('/blade-project-manage-v2/folder/v2/saveFile', params, 'post', 'json')
+    },
+    fileRemove(params) { // 删除文件
+        return fetch('/blade-project-manage-v2/folder/v2/remove', params, 'post')
+    },
+    /**
      * 业主主动授权
      * @param params
      * @returns {Promise | Promise<unknown>}
      */
-  initCode (params) {
-    return fetch('/blade-project-manage-v2/qrcode/v2/getGrantQrcode', params, 'post', 'json')
-  },
-  /**
+    initCode(params) {
+        return fetch('/blade-project-manage-v2/qrcode/v2/getGrantQrcode', params, 'post', 'json')
+    },
+    /**
      * 服务商触发消息发送
      * @param params
      * @returns {Promise | Promise<unknown>}
      */
-  send (params) {
-    return fetch('/blade-project-manage-v2/frontMessage/v2/sendMessage', params)
-  },
-  /**
+    send(params) {
+        return fetch('/blade-project-manage-v2/frontMessage/v2/sendMessage', params)
+    },
+    /**
      * 服务商主动申请文件授权
      * @param params
      * @returns {Promise<unknown>}
      */
-  apply (params) {
-    return fetch('/blade-project-manage-v2/grant/v2/applyGrant', params, 'post', 'json')
-  },
-  folderType (params) {
-    return fetch('/blade-project-manage-v2/dict/v2/getDictList', params)
-  },
-  /**
+    apply(params) {
+        return fetch('/blade-project-manage-v2/grant/v2/applyGrant', params, 'post', 'json')
+    },
+    folderType(params) {
+        return fetch('/blade-project-manage-v2/dict/v2/getDictList', params)
+    },
+    /**
      * 全站搜索
      * @param params
      * @returns {Promise<unknown>}
      */
-  totalSearch (params) {
-    return fetch('/blade-project-manage-v2/searcher/v2/getListByKeyword', params, 'post', 'json')
-  },
-  /**
+    totalSearch(params) {
+        return fetch('/blade-project-manage-v2/searcher/v2/getListByKeyword', params, 'post', 'json')
+    },
+    /**
      * 搜索详情
      */
-  searchDetail (params) {
-    return fetch('/blade-project-manage-v2/searcher/v2/searchFileDetails', params, 'post', 'json')
-  },
-  total (params) {
-    return fetch('/blade-project-manage-v2/searcher/v2/getTotalByKeyword', params, 'post')
-  },
-  totalAmount (params) {
-    return fetch('/blade-project-manage-v2/project/v2/getTotalAmount', params)
-  },
-  /**
+    searchDetail(params) {
+        return fetch('/blade-project-manage-v2/searcher/v2/searchFileDetails', params, 'post', 'json')
+    },
+    total(params) {
+        return fetch('/blade-project-manage-v2/searcher/v2/getTotalByKeyword', params, 'post')
+    },
+    totalAmount(params) {
+        return fetch('/blade-project-manage-v2/project/v2/getTotalAmount', params)
+    },
+    /**
      * 是否需要归档
      */
-  isHistory (params) {
-    return fetch('/blade-project-manage-v2/folder/v2/isHistory', params)
-  },
-  /**
+    isHistory(params) {
+        return fetch('/blade-project-manage-v2/folder/v2/isHistory', params)
+    },
+    /**
      * 归档
      */
-  doneHistory (params) {
-    return fetch('/blade-project-manage-v2/folder/v2/history', params)
-  },
-  /**
+    doneHistory(params) {
+        return fetch('/blade-project-manage-v2/folder/v2/history', params)
+    },
+    /**
      * 是否有权限创建文件夹
      */
-  queryCreateFolder (params) {
-    return fetch('/blade-project-manage-v2/folder/v2/queryFolderGrant', params)
-  }
+    queryCreateFolder(params) {
+        return fetch('/blade-project-manage-v2/folder/v2/queryFolderGrant', params)
+    }
 }
 
 export const getLazyList = (parentId, params) => {
-  return request({
-    url: '/api/blade-project-manage-v2/project/v2/childrenList',
-    method: 'get',
-    params: {
-      ...params,
-      parentId
-    }
-  })
+    return request({
+        url: '/api/blade-project-manage-v2/project/v2/childrenList',
+        method: 'get',
+        params: {
+            ...params,
+            parentId
+        }
+    })
 }

src/views/home/component/dash.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="full-height full-width flex flex-col">
-    <div class="white-bg flex flex-col padding">
+    <div class="flex flex-col padding white-bg">
       <div class="flex flex-align-center tip">
         <el-icon class="ml-20" color="#BC002D">
           <WarningFilled/>
@@ -8,12 +8,13 @@
         <span class="ml-5">项目总投资额<span
             class="main-color bold">{{ num ? Number.parseFloat(num).toLocaleString() : '-' }}</span>万元</span>
       </div>
-      <div class="flex ml-20 hide-scrollbar" style="overflow-x: scroll;width: 86vw" v-show='stage && stage.length > 0'>
-        <div v-for="(item,index) in proType" :key='item.id' :class="active === index ? 'total-s' : 'total'"
+      <div class="flex ml-20 hide-scrollbar" style="overflow-x: scroll;width: 86vw;"
+           v-show='numList && numList.length > 0'>
+        <div v-for="(item,index) in numList" :key='item.id' :class="active === index ? 'total-s' : 'total'"
              class="flex flex-center flex-justify-between mt-20 bold font-16 pointer" @click='switchTab(item,index)'
         >
           <span class=" sp">{{ item.name }}</span>
-          <span class=" sp1 ">{{ 33 }}<span class="grey font-13">个</span></span>
+          <span class=" sp1 ">{{ item.number }}<span class="grey font-13">个</span></span>
         </div>
       </div>
       <div class='flex flex-center flex-justify-start'>
@@ -235,28 +236,7 @@ export default {
         total: 0
       },
       stage: [],
-      proType: [
-        {
-          name: '全部项目',
-          index: 0
-        },
-        {
-          name: '储备项目',
-          index: 1
-        },
-        {
-          name: '正式项目',
-          index: 2
-        },
-        {
-          name: '在建项目',
-          index: 3
-        },
-        {
-          name: '完工项目',
-          index: 4
-        }
-      ],
+      numList: [],
       typeList: [],
       tagsList: [],
       num: '',
@@ -290,27 +270,31 @@ export default {
       parentId: 0
     }
   },
-  created () {
+  created() {
     this.getTypeList()
+    this.getNumList()
     this.$bus.on('serach', (res) => {
-      this.onLoad(res)
+      if (res.dictKey === '') {
+        this.active = 0
+        this.onLoad(res)
+      }
     })
   },
   computed: {
-    permissionList () {
+    permissionList() {
       return {
         delBtn: vaildData(this.permissions.permissions.home_del, false)
       }
     }
   },
   methods: {
-    switchTab (item, index) {
+    switchTab(item, index) {
       this.active = index
-      this.onLoad()
+      this.onLoad({projectStage: item.dictKey})
     },
-    onLoad (query = {}) {
+    onLoad(query = {}) {
       this.loading = true
-      const data = { ...query, parentId: this.parentId }
+      const data = {...query, parentId: this.parentId}
       this.$api.project.projectList(this.page.currentPage, this.page.pageSize, data).then(res => {
         this.loading = false
         if (res.code === 200) {
@@ -324,11 +308,11 @@ export default {
         this.loading = false
       })
     },
-    beforeOpen (done, type) {
+    beforeOpen(done, type) {
       if (['edit'].includes(type)) {
         this.$router.push({
           path: '/home/details',
-          query: { id: this.form.id, type: '0', ownerId: this.form.createUser }
+          query: {id: this.form.id, type: '0', ownerId: this.form.createUser}
         })
       } else if (type === 'view') {
         // this.$alert('功能建设中，尽情期待...', '消息提醒', {
@@ -336,51 +320,52 @@ export default {
         // })
         this.$router.push({
           path: '/home/pro_detail',
-          query: { id: this.form.id }
+          query: {id: this.form.id}
         })
       }
     },
-    currentChange (currentPage) {
+    currentChange(currentPage) {
       this.page.current = currentPage
     },
-    sizeChange (pageSize) {
+    sizeChange(pageSize) {
       this.page.size = pageSize
     },
-    refreshChange () {
+    refreshChange() {
       this.onLoad()
     },
-    treeLoad (tree, treeNode, resolve) {
+    treeLoad(tree, treeNode, resolve) {
       this.loading = true
       getLazyList(tree.id).then(res => {
         this.loading = false
         resolve(res.data.data.childrenList)
       })
     },
-    rowDel (row) {
+    rowDel(row) {
       this.$confirm('确定删除选择的项目?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       })
-        .then(() => {
-          this.$api.project.projectRemove({ ids: row.id }).then(res => {
-            if (res.code === 200) {
-              this.$message.success(res.msg)
-              this.onLoad()
-            } else {
-              this.$message.error(res.msg)
-            }
+          .then(() => {
+            this.$api.project.projectRemove({ids: row.id}).then(res => {
+              if (res.code === 200) {
+                this.$message.success(res.msg)
+                this.onLoad()
+              } else {
+                this.$message.error(res.msg)
+              }
+            })
           })
-        })
     },
-    getStageList () {
-      this.$api.project.userStageList().then(res => {
+    getNumList() {
+      this.$api.project.userNunList().then(res => {
         if (res.code === 200) {
-          this.stage = res.data
+          this.numList = res.data.projectStage
+          this.num = res.data.totalAmount
         }
       })
     },
-    getTotalAmount (data) {
+    getTotalAmount(data) {
       this.$api.project.totalAmount(Object.assign(data, this.query)).then(res => {
         if (res.code === 200) {
           this.num = res.data
@@ -389,17 +374,17 @@ export default {
         }
       })
     },
-    getTypeList () {
-      this.$api.project.typeList({ type: 1, size: 999, current: 1 }).then(res => {
+    getTypeList() {
+      this.$api.project.typeList({type: 1, size: 999, current: 1}).then(res => {
         this.typeList = res.data.records
       })
-      this.$api.common.dicList({ code: 'project-tags' }).then(res => {
+      this.$api.common.dicList({code: 'project-tags'}).then(res => {
         if (res.code === 200) {
           this.tagsList = res.data
         }
       })
     },
-    track (res) {
+    track(res) {
       if (res.isReport === 1) {
         this.$message.error('该项目已经上报')
         return
@@ -409,7 +394,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        const data = { id: res.id, isReport: 1 }
+        const data = {id: res.id, isReport: 1}
         this.$api.project.proUpdate(data).then(res => {
           if (res.code === 200) {
             console.log(res)
@@ -420,7 +405,7 @@ export default {
         })
       })
     },
-    projectSave () {
+    projectSave() {
       if (this.disable) {
         this.$message.error('正在处理，请稍后...')
         return

src/views/home/component/owner_serach.vue

@@ -14,29 +14,29 @@
           <div class="flex flex-center">
             <el-form-item class="full-width" label="是否开工">
               <el-select
-                  v-model="form.projectType"
+                  v-model="form.isStart"
                   clearable
                   placeholder="选择项目分类"
                   style="width: 100%">
                 <el-option
-                    v-for="item in typeList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
+                    v-for="item in start"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
                 />
               </el-select>
             </el-form-item>
             <el-form-item class="full-width" label="是否入库">
               <el-select
-                  v-model="form.projectType"
+                  v-model="form.isStorage"
                   clearable
                   placeholder="选择项目分类"
                   style="width: 100%">
                 <el-option
-                    v-for="item in typeList"
-                    :key="item.id"
-                    :label="item.name"
-                    :value="item.id"
+                    v-for="item in storage"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -45,7 +45,7 @@
         <div class="flex flex-col ml-20 mr-15">
           <el-form-item class="full-width" label="分类筛选">
             <el-select
-                v-model="form.projectType"
+                v-model="form.typeId"
                 clearable
                 placeholder="选择项目分类"
                 style="width: 100%">
@@ -60,15 +60,16 @@
           <div class="flex flex-center">
             <el-form-item class="full-width" label="总投资额">
               <el-select
-                  v-model="form.projectType"
+                  v-model="form.amount"
                   clearable
-                  placeholder="选择项目分类"
+                  @change="changeAmount"
+                  placeholder="选择投资额度"
                   style="width: 100%">
                 <el-option
-                    v-for="item in typeList"
-                    :key="item.id"
+                    v-for="item in totalAmount"
+                    :key="item.value"
                     :label="item.name"
-                    :value="item.id"
+                    :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -82,11 +83,42 @@
                style="width: 70%;margin-left: 120px">
           </div>
         </div>
-        <div class="flex flex-center ml-20" style="margin-top: 28px">
-          <base-button class="pointer mr-20" icon="Delete" title="清空" type="0" width="130" @click="clear"/>
-          <base-button class="pointer" width="130" @click="sure"/>
+        <div class="flex flex-col">
+          <div class="flex  flex-align-center" style="margin-left: 65px">
+            <base-button class="pointer mr-20" icon="Delete" title="清空" type="0" width="130" @click="clear"/>
+            <base-button class="pointer" width="130" @click="sure"/>
+          </div>
+          <div class="flex flex-center mt-15">
+            <el-form-item class="full-width" label="省重点">
+              <el-select
+                  v-model="form.isImportant"
+                  clearable
+                  placeholder="选择项目分类"
+                  style="width: 100%">
+                <el-option
+                    v-for="item in isimport"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item class="full-width" label="省集中开工">
+              <el-select
+                  v-model="form.isFocusStart"
+                  clearable
+                  placeholder="选择项目分类"
+                  style="width: 100%">
+                <el-option
+                    v-for="item in isfocus"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </div>
         </div>
-
       </div>
     </el-form>
     <!----机构选择----->
@@ -134,9 +166,65 @@ export default {
   data() {
     return {
       form: {
-        projectName: '', // 项目名称
-        projectType: ''// 项目分类
+        projectName: '', // 项目名称/关键字
+        typeId: '', // 项目分类
+        isStart: '',//是否开工
+        isStorage: '',//是否入库
+        amount: '',
+        isImportant: '',//是否省重点
+        isFocusStart: '',//是否集中开工
+        dictKey: ''
       },
+      totalAmount: [
+        {
+          name: '500万以上',
+          value: '"",500',
+        },
+        {
+          name: '200-500 万',
+          value: '500,200',
+        }
+      ],
+      start: [
+        {
+          label: "否",
+          value: 0,
+        },
+        {
+          label: "是",
+          value: 1,
+        }
+      ],
+      storage: [
+        {
+          label: "否",
+          value: 0,
+        },
+        {
+          label: "是",
+          value: 1,
+        }
+      ],
+      isimport: [
+        {
+          label: "否",
+          value: 0,
+        },
+        {
+          label: "是",
+          value: 1,
+        }
+      ],
+      isfocus: [
+        {
+          label: "否",
+          value: 0,
+        },
+        {
+          label: "是",
+          value: 1,
+        }
+      ],
       typeList: [],
       showOrg: false,
       keyWords: '',
@@ -144,7 +232,7 @@ export default {
     }
   },
   created() {
-    // this.getTypeList()
+    this.getTypeList()
   },
   methods: {
     getTypeList() {
@@ -156,9 +244,20 @@ export default {
       this.$bus.emit('serach', this.form)
     },
     clear() {
-      this.form.projectType = ''
-      this.form.name = ''
+      this.form.projectName = ''
+      this.form.typeId = ''
+      this.form.isStorage = ''
+      this.form.isStart = ''
+      this.form.amount = ''
+      this.form.isFocusStart = ''
+      this.form.isImportant = ''
+      this.form.dictKey = ''
       this.$bus.emit('serach', this.form)
+    },
+    changeAmount() {
+      let tmps = this.form.amount.split(',')
+      this.form.totalAmountMax = tmps[0]
+      this.form.totalAmountMin = tmps[1]
     }
   }
 }

src/views/home/component/pro_left.vue

@@ -5,15 +5,15 @@
         <span class='font-15 bold  mb-10'>{{ data.name }}</span>
         <span class="font-15 bold mt-5" style="color:#787C90;">项目总投资额</span>
         <span class="mt-5 font-15 bold main-color">{{
-            data.totalAmount ? data.totalAmount.toLocaleString() : '-'
+            data.totalAmount ? data.totalAmount.toLocaleString() : '0'
           }}万元</span>
         <div class="flex flex-center mt-10">
           <!--          <span class="bold mr-15" style="color:#787C90;">{{ currentSituation.dictValue }}</span>-->
           <el-select
               v-model="keyWords"
-              class='bold'
-              :placeholder="currentSituation.dictValue"
+              placeholder="修改"
               size="small"
+              style="width: 60px"
               @change="result"
           >
             <el-option
@@ -26,7 +26,8 @@
         </div>
         <el-divider></el-divider>
         <div class="flex flex-center full-width">
-          <span class="title pointer" @click="showRelation = !showRelation">已关联子项目</span>
+          <span class="title pointer" @click="showRelation = !showRelation">已关联子项目<span
+              class="bold blue font-16">{{ data.lot }}</span>个</span>
         </div>
       </div>
       <div class="flex flex-center flex-justify-between flex-col mt-15 hide-scrollbar"
@@ -50,7 +51,7 @@ import proRelation from '@/views/home/component/pro_relation.vue'
 
 export default {
   name: 'pro_left',
-  components: { proRelation },
+  components: { mainButton, proRelation },
   props: {
     data: Object,
     code: {
@@ -85,8 +86,7 @@ export default {
       active: 0,
       showRelation: false,
       projectId: '',
-      resultList: [],
-      scorllTopList: []
+      resultList: []
     }
   },
   created () {

src/views/home/component/top_serach.vue

@@ -64,7 +64,7 @@
           </el-col>
         </el-form-item>
         <!------领域------>
-        <el-form-item class="full-width" label="项目领域">
+        <el-form-item class="full-width " label="项目领域">
           <el-select
               v-model="form.dictName"
               clearable
@@ -138,8 +138,8 @@ import baseButton from '../../../components/base-button.vue'
 
 export default {
   name: 'top-serach',
-  components: { baseButton },
-  data () {
+  components: {baseButton},
+  data() {
     return {
       form: {
         name: '', // 项目名称
@@ -156,20 +156,20 @@ export default {
       deptFields: []
     }
   },
-  created () {
+  created() {
     this.getTypeList()
     this.getDict()
   },
   methods: {
-    sure () {
+    sure() {
       this.$bus.emit('serach', this.form)
     },
-    getTypeList () {
+    getTypeList() {
       this.$api.project.typeList().then(res => {
         this.typeList = res.data.records
       })
     },
-    clear () {
+    clear() {
       this.form = {
         name: '', // 项目名称
         startDate: '', // 项目建设期
@@ -183,8 +183,8 @@ export default {
       }
       this.$bus.emit('serach', this.form)
     },
-    getDict () {
-      this.$api.common.dicList({ code: 'pc-debt-type' }).then(res => {
+    getDict() {
+      this.$api.common.dicList({code: 'pc-debt-type'}).then(res => {
         if (res.code === 200) {
           this.deptFields = res.data.map(sub => {
             sub.checked = false