diff --git a/public/JSON/listOverviewData.json b/public/JSON/listOverviewData.json
new file mode 100644
index 0000000..6ea1127
--- /dev/null
+++ b/public/JSON/listOverviewData.json
@@ -0,0 +1,20 @@
+[
+  {
+    "deptName": "住建局",
+    "subDeptName": "运行调度指挥中心",
+    "indexMenu": "在线服务",
+    "score": "95分"
+  },
+  {
+    "deptName": "综治办",
+    "subDeptName": "综治科",
+    "indexMenu": "社会治理",
+    "score": "95分"
+  },
+  {
+    "deptName": "项目办",
+    "subDeptName": "综合科",
+    "indexMenu": "现代服务业项目",
+    "score": "95分"
+  }
+]

diff --git a/public/JSON/listOverviewData.json b/public/JSON/listOverviewData.json
new file mode 100644
index 0000000..6ea1127
--- /dev/null
+++ b/public/JSON/listOverviewData.json
@@ -0,0 +1,20 @@
+[
+  {
+    "deptName": "住建局",
+    "subDeptName": "运行调度指挥中心",
+    "indexMenu": "在线服务",
+    "score": "95分"
+  },
+  {
+    "deptName": "综治办",
+    "subDeptName": "综治科",
+    "indexMenu": "社会治理",
+    "score": "95分"
+  },
+  {
+    "deptName": "项目办",
+    "subDeptName": "综合科",
+    "indexMenu": "现代服务业项目",
+    "score": "95分"
+  }
+]
diff --git a/public/JSON/resultData.json b/public/JSON/resultData.json
index 2e305e9..c500200 100644
--- a/public/JSON/resultData.json
+++ b/public/JSON/resultData.json
@@ -4,9 +4,9 @@
     "indexMenu": "质检平均分",
     "indexType": "部门职能",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "政研科",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.8",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -15,7 +15,7 @@
     "indexMenu": "质检平均分",
     "indexType": "部门职能",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "机关事务管理中心",
     "indexdesc": "质检分大于9",
     "currentindex": "9.2",
     "facotor": "30",
@@ -26,9 +26,9 @@
     "indexMenu": "质检平均分",
     "indexType": "部门职能",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "督查室",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.6",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -37,9 +37,9 @@
     "indexMenu": "质检平均分",
     "indexType": "专题专项",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "秘书科",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.5",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -48,9 +48,9 @@
     "indexMenu": "质检平均分",
     "indexType": "专题专项",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "领导",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.4",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -59,9 +59,9 @@
     "indexMenu": "质检平均分",
     "indexType": "专题专项",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "领导",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.4",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -70,9 +70,9 @@
     "indexMenu": "质检平均分",
     "indexType": "经济发展",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "秘书科",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.1",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -81,9 +81,9 @@
     "indexMenu": "质检平均分",
     "indexType": "经济发展",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "督查室",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.3",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -92,7 +92,18 @@
     "indexMenu": "质检平均分",
     "indexType": "经济发展",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "秘书科",
+    "indexdesc": "质检分大于9",
+    "currentindex": "9.1",
+    "facotor": "30",
+    "indexscore": "7.5"
+  },
+  {
+    "checkId": "678",
+    "indexMenu": "质检平均分",
+    "indexType": "行政综合",
+    "deptName": "住建局",
+    "subDeptName": "政研科",
     "indexdesc": "质检分大于9",
     "currentindex": "9.2",
     "facotor": "30",
@@ -103,9 +114,9 @@
     "indexMenu": "质检平均分",
     "indexType": "行政综合",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "政研科",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.7",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -114,20 +125,9 @@
     "indexMenu": "质检平均分",
     "indexType": "行政综合",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "督查室",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
-    "facotor": "30",
-    "indexscore": "7.5"
-  },
-  {
-    "checkId": "678",
-    "indexMenu": "质检平均分",
-    "indexType": "行政综合",
-    "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
-    "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.3",
     "facotor": "30",
     "indexscore": "7.5"
   }

diff --git a/public/JSON/listOverviewData.json b/public/JSON/listOverviewData.json
new file mode 100644
index 0000000..6ea1127
--- /dev/null
+++ b/public/JSON/listOverviewData.json
@@ -0,0 +1,20 @@
+[
+  {
+    "deptName": "住建局",
+    "subDeptName": "运行调度指挥中心",
+    "indexMenu": "在线服务",
+    "score": "95分"
+  },
+  {
+    "deptName": "综治办",
+    "subDeptName": "综治科",
+    "indexMenu": "社会治理",
+    "score": "95分"
+  },
+  {
+    "deptName": "项目办",
+    "subDeptName": "综合科",
+    "indexMenu": "现代服务业项目",
+    "score": "95分"
+  }
+]
diff --git a/public/JSON/resultData.json b/public/JSON/resultData.json
index 2e305e9..c500200 100644
--- a/public/JSON/resultData.json
+++ b/public/JSON/resultData.json
@@ -4,9 +4,9 @@
     "indexMenu": "质检平均分",
     "indexType": "部门职能",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "政研科",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.8",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -15,7 +15,7 @@
     "indexMenu": "质检平均分",
     "indexType": "部门职能",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "机关事务管理中心",
     "indexdesc": "质检分大于9",
     "currentindex": "9.2",
     "facotor": "30",
@@ -26,9 +26,9 @@
     "indexMenu": "质检平均分",
     "indexType": "部门职能",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "督查室",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.6",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -37,9 +37,9 @@
     "indexMenu": "质检平均分",
     "indexType": "专题专项",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "秘书科",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.5",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -48,9 +48,9 @@
     "indexMenu": "质检平均分",
     "indexType": "专题专项",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "领导",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.4",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -59,9 +59,9 @@
     "indexMenu": "质检平均分",
     "indexType": "专题专项",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "领导",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.4",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -70,9 +70,9 @@
     "indexMenu": "质检平均分",
     "indexType": "经济发展",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "秘书科",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.1",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -81,9 +81,9 @@
     "indexMenu": "质检平均分",
     "indexType": "经济发展",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "督查室",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.3",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -92,7 +92,18 @@
     "indexMenu": "质检平均分",
     "indexType": "经济发展",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "秘书科",
+    "indexdesc": "质检分大于9",
+    "currentindex": "9.1",
+    "facotor": "30",
+    "indexscore": "7.5"
+  },
+  {
+    "checkId": "678",
+    "indexMenu": "质检平均分",
+    "indexType": "行政综合",
+    "deptName": "住建局",
+    "subDeptName": "政研科",
     "indexdesc": "质检分大于9",
     "currentindex": "9.2",
     "facotor": "30",
@@ -103,9 +114,9 @@
     "indexMenu": "质检平均分",
     "indexType": "行政综合",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "政研科",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.7",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -114,20 +125,9 @@
     "indexMenu": "质检平均分",
     "indexType": "行政综合",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "督查室",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
-    "facotor": "30",
-    "indexscore": "7.5"
-  },
-  {
-    "checkId": "678",
-    "indexMenu": "质检平均分",
-    "indexType": "行政综合",
-    "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
-    "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.3",
     "facotor": "30",
     "indexscore": "7.5"
   }
diff --git a/src/views/assessResult/components/resultDetail.vue b/src/views/assessResult/components/resultDetail.vue
index 977e41b..94692e3 100644
--- a/src/views/assessResult/components/resultDetail.vue
+++ b/src/views/assessResult/components/resultDetail.vue
@@ -4,25 +4,25 @@
     <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
-          <el-form-item class="selectForm-container-item" prop="deptId" >
+          <el-form-item class="selectForm-container-item" prop="deptId">
             <el-select v-model="listQuery.deptId" placeholder="考核部门" clearable @change="changeDept">
               <el-option
                 v-for="item in deptList"
-                :key="item.id"
-                :label="item.simplename"
-                :value="item.id"/>
+                :key="item.key"
+                :label="item.key"
+                :value="item.key"/>
             </el-select>
           </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="subDeptId" >
+          <el-form-item class="selectForm-container-item" prop="subDeptId">
             <el-select v-model="listQuery.subDeptId" :disabled="!listQuery.deptId" placeholder="下属部门" clearable>
               <el-option
                 v-for="item in subDeptList"
-                :key="item.id"
-                :label="item.simplename"
-                :value="item.id"/>
+                :key="item.key"
+                :label="item.key"
+                :value="item.key"/>
             </el-select>
           </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="indexType" >
+          <el-form-item class="selectForm-container-item" prop="indexType">
             <el-select v-model="listQuery.indexType" placeholder="指标类型" clearable>
               <el-option
                 v-for="item in typeList"
@@ -37,12 +37,15 @@
       <!--查询结果Table显示-->
       <div>
         <el-row class="table-title">
-          <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+          <el-col :span="6">
+            <div class="title-header"><i class="el-icon-menu"/>数据列表</div>
+          </el-col>
         </el-row>
         <el-table v-loading="listLoading" :data="list" class="table" border>
           <!--<el-table-column align="center" type="selection" width="55"/>-->
           <el-table-column :index="indexMethod" label="序号" align="center" type="index" width="55"/>
-          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width"
+                           :align="column.align" show-overflow-tooltip>
             <template slot-scope="scope">
               <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
               <span v-else>{{ scope.row[column.value] }}</span>
@@ -67,12 +70,14 @@
         <el-button @click="cancel">确定</el-button>
       </div>
     </el-dialog>
-</div></template>
+  </div>
+</template>
 
 <script>
 import { getDeptResultDetail } from '@/api/assessResult'
 import { getDeptList } from '@/api/assessRules'
 import axios from 'axios'
+
 export default {
   name: 'ResultDetail',
   data() {
@@ -138,7 +143,137 @@
       queryList: [],
       total: 0, // 数据总数
       subDeptList: [],
-      deptList: [],
+      deptList: [
+        {
+          key: '党政办'
+        },
+        {
+          key: '住建局'
+        },
+        {
+          key: '经发局'
+        },
+        {
+          key: '自然资源分局'
+        },
+        {
+          key: '执法分局'
+        },
+        {
+          key: '财政局'
+        },
+        {
+          key: '社管局'
+        },
+        {
+          key: '综治办'
+        },
+        {
+          key: '产业招商局'
+        },
+        {
+          key: '公安分局'
+        },
+        {
+          key: '项目办'
+        },
+        {
+          key: '交警大队'
+        },
+        {
+          key: '党工部'
+        },
+        {
+          key: '机关党委'
+        },
+        {
+          key: '农办'
+        },
+        {
+          key: '总工会'
+        },
+        {
+          key: '团工委'
+        },
+        {
+          key: '妇联'
+        },
+        {
+          key: '人武部'
+        },
+        {
+          key: '市工商联区分会'
+        },
+        {
+          key: '征收办'
+        },
+        {
+          key: '质监站'
+        },
+        {
+          key: '融媒体中心'
+        },
+        {
+          key: '安监大队'
+        },
+        {
+          key: '数据信息中心'
+        },
+        {
+          key: '劳动监察局'
+        },
+        {
+          key: '会计核算中心'
+        },
+        {
+          key: '法院工作室'
+        },
+        {
+          key: '检察室'
+        },
+        {
+          key: '司法分局'
+        },
+        {
+          key: '生态环境分局'
+        },
+        {
+          key: '市场监督管理分局'
+        },
+        {
+          key: '潭东税务所'
+        },
+        {
+          key: '蓉源城市投资公司'
+        },
+        {
+          key: '荣盛公司'
+        },
+        {
+          key: '蓉腾人力资源公司'
+        },
+        {
+          key: '余土管理有限公司'
+        },
+        {
+          key: '锦源置业'
+        },
+        {
+          key: '潭东镇人民政府'
+        },
+        {
+          key: '潭口镇人民政府'
+        },
+        {
+          key: '高校园区管理处'
+        },
+        {
+          key: '建投公司'
+        },
+        {
+          key: '指挥中心'
+        }
+      ],
       listLoading: false,
       title: '',
       dialogFormVisible: false,
@@ -158,7 +293,7 @@
     }
   },
   mounted() {
-    this.fetchDeptList()
+    // this.fetchDeptList()
   },
   methods: {
     // 初始化对话框
@@ -194,13 +329,23 @@
       // this.fetchData()
       let listResult = []
       console.log(this.queryList)
-      for(let i = 0;i<=this.queryList.length-1;i++){
-        if(this.queryList[i].indexType === this.listQuery.indexType){
-          listResult.push(this.queryList[i])
+      for (let i = 0; i <= this.queryList.length - 1; i++) {
+        if (this.listQuery.indexType && !this.listQuery.deptId && !this.listQuery.subDeptId) {
+          if (this.queryList[i].indexType === this.listQuery.indexType) {
+            listResult.push(this.queryList[i])
+          }
+        } else if (this.listQuery.deptId && this.listQuery.subDeptId && !this.listQuery.indexType){
+          if (this.queryList[i].deptName === this.listQuery.deptId && this.queryList[i].subDeptName === this.listQuery.subDeptId) {
+            listResult.push(this.queryList[i])
+          }
+        } else if (this.listQuery.deptId && !this.listQuery.subDeptId && !this.listQuery.indexType){
+          if (this.queryList[i].deptName === this.listQuery.deptId) {
+            listResult.push(this.queryList[i])
+          }
         }
       }
       this.list = listResult
-      console.log(listResult)
+      console.log(this.listQuery.deptId,this.listQuery.subDeptId,this.queryList)
     },
     fetchDeptList() {
       getDeptList('24').then(response => {
@@ -214,11 +359,29 @@
       })
     },
     changeDept() {
-      if (this.listQuery.dept) {
-        getDeptList(this.listQuery.dept).then(response => {
-          this.subDeptList = response.data
-        })
-      }
+      // if (this.listQuery.dept) {
+      // getDeptList(this.listQuery.dept).then(response => {
+      //   this.subDeptList = response.data
+      // })
+    // }
+      this.listQuery.subDeptId = null
+      this.subDeptList = [
+        {
+          key: '领导'
+        },
+        {
+          key: '政研科'
+        },
+        {
+          key: '机关事务管理中心'
+        },
+        {
+          key: '督查室'
+        },
+        {
+          key: '秘书科'
+        }
+      ]
     },
     typeChanged() {
       this.deviceForm.networkType = ''
@@ -248,10 +411,11 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
+.el-select {
+  width: 100%;
+}
+
+.el-date-editor {
+  width: 100%;
+}
 </style>

diff --git a/public/JSON/listOverviewData.json b/public/JSON/listOverviewData.json
new file mode 100644
index 0000000..6ea1127
--- /dev/null
+++ b/public/JSON/listOverviewData.json
@@ -0,0 +1,20 @@
+[
+  {
+    "deptName": "住建局",
+    "subDeptName": "运行调度指挥中心",
+    "indexMenu": "在线服务",
+    "score": "95分"
+  },
+  {
+    "deptName": "综治办",
+    "subDeptName": "综治科",
+    "indexMenu": "社会治理",
+    "score": "95分"
+  },
+  {
+    "deptName": "项目办",
+    "subDeptName": "综合科",
+    "indexMenu": "现代服务业项目",
+    "score": "95分"
+  }
+]
diff --git a/public/JSON/resultData.json b/public/JSON/resultData.json
index 2e305e9..c500200 100644
--- a/public/JSON/resultData.json
+++ b/public/JSON/resultData.json
@@ -4,9 +4,9 @@
     "indexMenu": "质检平均分",
     "indexType": "部门职能",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "政研科",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.8",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -15,7 +15,7 @@
     "indexMenu": "质检平均分",
     "indexType": "部门职能",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "机关事务管理中心",
     "indexdesc": "质检分大于9",
     "currentindex": "9.2",
     "facotor": "30",
@@ -26,9 +26,9 @@
     "indexMenu": "质检平均分",
     "indexType": "部门职能",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "督查室",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.6",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -37,9 +37,9 @@
     "indexMenu": "质检平均分",
     "indexType": "专题专项",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "秘书科",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.5",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -48,9 +48,9 @@
     "indexMenu": "质检平均分",
     "indexType": "专题专项",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "领导",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.4",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -59,9 +59,9 @@
     "indexMenu": "质检平均分",
     "indexType": "专题专项",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "领导",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.4",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -70,9 +70,9 @@
     "indexMenu": "质检平均分",
     "indexType": "经济发展",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "秘书科",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.1",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -81,9 +81,9 @@
     "indexMenu": "质检平均分",
     "indexType": "经济发展",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "督查室",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.3",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -92,7 +92,18 @@
     "indexMenu": "质检平均分",
     "indexType": "经济发展",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "秘书科",
+    "indexdesc": "质检分大于9",
+    "currentindex": "9.1",
+    "facotor": "30",
+    "indexscore": "7.5"
+  },
+  {
+    "checkId": "678",
+    "indexMenu": "质检平均分",
+    "indexType": "行政综合",
+    "deptName": "住建局",
+    "subDeptName": "政研科",
     "indexdesc": "质检分大于9",
     "currentindex": "9.2",
     "facotor": "30",
@@ -103,9 +114,9 @@
     "indexMenu": "质检平均分",
     "indexType": "行政综合",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "政研科",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.7",
     "facotor": "30",
     "indexscore": "7.5"
   },
@@ -114,20 +125,9 @@
     "indexMenu": "质检平均分",
     "indexType": "行政综合",
     "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
+    "subDeptName": "督查室",
     "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
-    "facotor": "30",
-    "indexscore": "7.5"
-  },
-  {
-    "checkId": "678",
-    "indexMenu": "质检平均分",
-    "indexType": "行政综合",
-    "deptName": "住建局",
-    "subDeptName": "运行调度指挥中心",
-    "indexdesc": "质检分大于9",
-    "currentindex": "9.2",
+    "currentindex": "9.3",
     "facotor": "30",
     "indexscore": "7.5"
   }
diff --git a/src/views/assessResult/components/resultDetail.vue b/src/views/assessResult/components/resultDetail.vue
index 977e41b..94692e3 100644
--- a/src/views/assessResult/components/resultDetail.vue
+++ b/src/views/assessResult/components/resultDetail.vue
@@ -4,25 +4,25 @@
     <el-dialog :title="title" :visible.sync="dialogFormVisible" append-to-body>
       <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
         <el-row>
-          <el-form-item class="selectForm-container-item" prop="deptId" >
+          <el-form-item class="selectForm-container-item" prop="deptId">
             <el-select v-model="listQuery.deptId" placeholder="考核部门" clearable @change="changeDept">
               <el-option
                 v-for="item in deptList"
-                :key="item.id"
-                :label="item.simplename"
-                :value="item.id"/>
+                :key="item.key"
+                :label="item.key"
+                :value="item.key"/>
             </el-select>
           </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="subDeptId" >
+          <el-form-item class="selectForm-container-item" prop="subDeptId">
             <el-select v-model="listQuery.subDeptId" :disabled="!listQuery.deptId" placeholder="下属部门" clearable>
               <el-option
                 v-for="item in subDeptList"
-                :key="item.id"
-                :label="item.simplename"
-                :value="item.id"/>
+                :key="item.key"
+                :label="item.key"
+                :value="item.key"/>
             </el-select>
           </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="indexType" >
+          <el-form-item class="selectForm-container-item" prop="indexType">
             <el-select v-model="listQuery.indexType" placeholder="指标类型" clearable>
               <el-option
                 v-for="item in typeList"
@@ -37,12 +37,15 @@
       <!--查询结果Table显示-->
       <div>
         <el-row class="table-title">
-          <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
+          <el-col :span="6">
+            <div class="title-header"><i class="el-icon-menu"/>数据列表</div>
+          </el-col>
         </el-row>
         <el-table v-loading="listLoading" :data="list" class="table" border>
           <!--<el-table-column align="center" type="selection" width="55"/>-->
           <el-table-column :index="indexMethod" label="序号" align="center" type="index" width="55"/>
-          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
+          <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width"
+                           :align="column.align" show-overflow-tooltip>
             <template slot-scope="scope">
               <span v-if="column.checkCell" :class="checkCell(scope.row.cell)">{{ scope.row[column.value] }}</span>
               <span v-else>{{ scope.row[column.value] }}</span>
@@ -67,12 +70,14 @@
         <el-button @click="cancel">确定</el-button>
       </div>
     </el-dialog>
-</div></template>
+  </div>
+</template>
 
 <script>
 import { getDeptResultDetail } from '@/api/assessResult'
 import { getDeptList } from '@/api/assessRules'
 import axios from 'axios'
+
 export default {
   name: 'ResultDetail',
   data() {
@@ -138,7 +143,137 @@
       queryList: [],
       total: 0, // 数据总数
       subDeptList: [],
-      deptList: [],
+      deptList: [
+        {
+          key: '党政办'
+        },
+        {
+          key: '住建局'
+        },
+        {
+          key: '经发局'
+        },
+        {
+          key: '自然资源分局'
+        },
+        {
+          key: '执法分局'
+        },
+        {
+          key: '财政局'
+        },
+        {
+          key: '社管局'
+        },
+        {
+          key: '综治办'
+        },
+        {
+          key: '产业招商局'
+        },
+        {
+          key: '公安分局'
+        },
+        {
+          key: '项目办'
+        },
+        {
+          key: '交警大队'
+        },
+        {
+          key: '党工部'
+        },
+        {
+          key: '机关党委'
+        },
+        {
+          key: '农办'
+        },
+        {
+          key: '总工会'
+        },
+        {
+          key: '团工委'
+        },
+        {
+          key: '妇联'
+        },
+        {
+          key: '人武部'
+        },
+        {
+          key: '市工商联区分会'
+        },
+        {
+          key: '征收办'
+        },
+        {
+          key: '质监站'
+        },
+        {
+          key: '融媒体中心'
+        },
+        {
+          key: '安监大队'
+        },
+        {
+          key: '数据信息中心'
+        },
+        {
+          key: '劳动监察局'
+        },
+        {
+          key: '会计核算中心'
+        },
+        {
+          key: '法院工作室'
+        },
+        {
+          key: '检察室'
+        },
+        {
+          key: '司法分局'
+        },
+        {
+          key: '生态环境分局'
+        },
+        {
+          key: '市场监督管理分局'
+        },
+        {
+          key: '潭东税务所'
+        },
+        {
+          key: '蓉源城市投资公司'
+        },
+        {
+          key: '荣盛公司'
+        },
+        {
+          key: '蓉腾人力资源公司'
+        },
+        {
+          key: '余土管理有限公司'
+        },
+        {
+          key: '锦源置业'
+        },
+        {
+          key: '潭东镇人民政府'
+        },
+        {
+          key: '潭口镇人民政府'
+        },
+        {
+          key: '高校园区管理处'
+        },
+        {
+          key: '建投公司'
+        },
+        {
+          key: '指挥中心'
+        }
+      ],
       listLoading: false,
       title: '',
       dialogFormVisible: false,
@@ -158,7 +293,7 @@
     }
   },
   mounted() {
-    this.fetchDeptList()
+    // this.fetchDeptList()
   },
   methods: {
     // 初始化对话框
@@ -194,13 +329,23 @@
       // this.fetchData()
       let listResult = []
       console.log(this.queryList)
-      for(let i = 0;i<=this.queryList.length-1;i++){
-        if(this.queryList[i].indexType === this.listQuery.indexType){
-          listResult.push(this.queryList[i])
+      for (let i = 0; i <= this.queryList.length - 1; i++) {
+        if (this.listQuery.indexType && !this.listQuery.deptId && !this.listQuery.subDeptId) {
+          if (this.queryList[i].indexType === this.listQuery.indexType) {
+            listResult.push(this.queryList[i])
+          }
+        } else if (this.listQuery.deptId && this.listQuery.subDeptId && !this.listQuery.indexType){
+          if (this.queryList[i].deptName === this.listQuery.deptId && this.queryList[i].subDeptName === this.listQuery.subDeptId) {
+            listResult.push(this.queryList[i])
+          }
+        } else if (this.listQuery.deptId && !this.listQuery.subDeptId && !this.listQuery.indexType){
+          if (this.queryList[i].deptName === this.listQuery.deptId) {
+            listResult.push(this.queryList[i])
+          }
         }
       }
       this.list = listResult
-      console.log(listResult)
+      console.log(this.listQuery.deptId,this.listQuery.subDeptId,this.queryList)
     },
     fetchDeptList() {
       getDeptList('24').then(response => {
@@ -214,11 +359,29 @@
       })
     },
     changeDept() {
-      if (this.listQuery.dept) {
-        getDeptList(this.listQuery.dept).then(response => {
-          this.subDeptList = response.data
-        })
-      }
+      // if (this.listQuery.dept) {
+      // getDeptList(this.listQuery.dept).then(response => {
+      //   this.subDeptList = response.data
+      // })
+    // }
+      this.listQuery.subDeptId = null
+      this.subDeptList = [
+        {
+          key: '领导'
+        },
+        {
+          key: '政研科'
+        },
+        {
+          key: '机关事务管理中心'
+        },
+        {
+          key: '督查室'
+        },
+        {
+          key: '秘书科'
+        }
+      ]
     },
     typeChanged() {
       this.deviceForm.networkType = ''
@@ -248,10 +411,11 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .el-select{
-    width: 100%;
-  }
-  .el-date-editor{
-    width: 100%;
-  }
+.el-select {
+  width: 100%;
+}
+
+.el-date-editor {
+  width: 100%;
+}
 </style>
diff --git a/src/views/assessRules/listOverview.vue b/src/views/assessRules/listOverview.vue
index 5cc14e6..c25acc8 100644
--- a/src/views/assessRules/listOverview.vue
+++ b/src/views/assessRules/listOverview.vue
@@ -61,6 +61,7 @@
 <script>
 import { getOverviewList, getDeptList } from '@/api/assessRules'
 import DeptStatistics from '@/views/assessRules/deptStatistics'
+import axios from 'axios'
 
 export default {
   name: 'ListOverview',
@@ -91,6 +92,11 @@
           text: '考核指标',
           value: 'indexMenu',
           align: 'center'
+        },
+        {
+          text: '指标完成目标',
+          value: 'score',
+          align: 'center'
         }
       ], // 显示列
       multipleSelection: [], // 多选选中项
@@ -103,7 +109,7 @@
       fullscreenLoading: false, // 全屏加载动画
       editShow: false, // 是否显示编辑框
       detailShow: false, // 是否显示编辑框
-      deptShowTop: false
+      deptShowTop: false,
     }
   },
   watch: {
@@ -140,9 +146,20 @@
       }
       this.listQuery.keyword1 = this.listQuery.dept
       getOverviewList(this.listQuery).then(response => {
+        for (let i = 0; i < response.data.rows.length; i++) {
+          response.data.rows[i].score = '95分'
+        }
+        console.log(response)
         this.list = response.data.rows
+        // console.log(response)
+        // console.log(this.list)
         this.listLoading = false
       })
+      // axios.get('./public/JSON/listOverviewData.json').then(response => {
+      //   console.log(response)
+      //   this.queryList = response.data
+      //   this.list = response.data.rows
+      // })
     },
     fetchDeptList() {
       getDeptList('24').then(response => {