diff --git a/dist.zip b/dist.zip
index c9d0f79..6df21cf 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ

diff --git a/dist.zip b/dist.zip
index c9d0f79..6df21cf 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue
index caa5b05..8f4c02e 100644
--- a/src/views/assessResult/components/indexStatistics.vue
+++ b/src/views/assessResult/components/indexStatistics.vue
@@ -15,14 +15,14 @@
         </el-form-item>
           <!-- </el-col>
           <el-col :span="3"> -->
-        <el-form-item prop="statisticsTime">
+        <!-- <el-form-item prop="statisticsTime">
           <el-date-picker
             v-model="listQuery.statisticsTime"
             type="year"
             placeholder="年份"
             value-format="yyyy"
             size="middle"/>
-        </el-form-item>
+        </el-form-item> -->
           <!-- </el-col>
           <el-col :span="3" style="margin-left: 60px"> -->
         <el-form-item prop="indexType">
@@ -78,9 +78,9 @@
         // axisSite: { right: ['value2'] },
         // yAxisType: ['number', 'percent'],
         yAxisName: ['分数'],
-        xAxisName: '月份',
+        xAxisName: '年份',
         labelMap: {
-          'text': '月份',
+          'text': '年份',
           'value': '分数'
         },
         showLine: ['value2']

diff --git a/dist.zip b/dist.zip
index c9d0f79..6df21cf 100644
--- a/dist.zip
+++ b/dist.zip
Binary files differ
diff --git a/src/views/assessResult/components/indexStatistics.vue b/src/views/assessResult/components/indexStatistics.vue
index caa5b05..8f4c02e 100644
--- a/src/views/assessResult/components/indexStatistics.vue
+++ b/src/views/assessResult/components/indexStatistics.vue
@@ -15,14 +15,14 @@
         </el-form-item>
           <!-- </el-col>
           <el-col :span="3"> -->
-        <el-form-item prop="statisticsTime">
+        <!-- <el-form-item prop="statisticsTime">
           <el-date-picker
             v-model="listQuery.statisticsTime"
             type="year"
             placeholder="年份"
             value-format="yyyy"
             size="middle"/>
-        </el-form-item>
+        </el-form-item> -->
           <!-- </el-col>
           <el-col :span="3" style="margin-left: 60px"> -->
         <el-form-item prop="indexType">
@@ -78,9 +78,9 @@
         // axisSite: { right: ['value2'] },
         // yAxisType: ['number', 'percent'],
         yAxisName: ['分数'],
-        xAxisName: '月份',
+        xAxisName: '年份',
         labelMap: {
-          'text': '月份',
+          'text': '年份',
           'value': '分数'
         },
         showLine: ['value2']
diff --git a/src/views/indexStatus/alarmIndex.vue b/src/views/indexStatus/alarmIndex.vue
index c8f5b61..9733422 100644
--- a/src/views/indexStatus/alarmIndex.vue
+++ b/src/views/indexStatus/alarmIndex.vue
@@ -12,7 +12,7 @@
                 :value="item.id"/>
             </el-select>
           </el-form-item>
-          <el-form-item v-if="showSubDeptId" prop="subDeptId" >
+          <!-- <el-form-item v-if="showSubDeptId" prop="subDeptId" >
             <el-select v-model="listQuery.subDeptId" :disabled="!listQuery.deptId" placeholder="下属部门" clearable @change="changeSubDept">
               <el-option
                 v-for="item in subDeptList"
@@ -20,8 +20,8 @@
                 :label="item.simplename"
                 :value="item.id"/>
             </el-select>
-          </el-form-item>
-          <el-form-item v-if="showIndexMenuId" prop="indexMenuId" >
+          </el-form-item> -->
+          <!-- <el-form-item v-if="showIndexMenuId" prop="indexMenuId" >
             <el-select v-model="listQuery.indexMenuId" placeholder="指标名称">
               <el-option
                 v-for="item in menuList"
@@ -29,6 +29,24 @@
                 :label="item.indexMenu"
                 :value="item.id"/>
             </el-select>
+          </el-form-item> -->
+          <el-form-item prop="indexMenu" >
+            <el-select v-model="listQuery.indexMenu" placeholder="指标名称">
+              <el-option
+                v-for="item in tempzbmcList"
+                :key="item.id"
+                :label="item.indexMenu"
+                :value="item.id"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item prop="indexType">
+            <el-select v-model="listQuery.indexType" placeholder="指标类型" clearable>
+              <el-option
+                v-for="item in tempTypeList"
+                :key="item.name"
+                :label="item.name"
+                :value="item.name"/>
+            </el-select>
           </el-form-item>
           <el-form-item prop="statisticsTime">
             <el-date-picker
@@ -106,20 +124,68 @@
           }
         }
       },
+      // listQuery: {
+      //   deptId: '',
+      //   subDeptId: '',
+      //   indexMenuId: '',
+      //   statisticsTime: ''
+      // },
       listQuery: {
+        indexType: '部门职能指标', // 默认部门职能
         deptId: '',
         subDeptId: '',
-        indexMenuId: '',
+        indexMenu: '呼损率', // 暂时先默认质检平均分
         statisticsTime: ''
       },
+      tempTypeList: [
+        { name: '部门职能指标' },
+        { name: '专题专项指标' },
+        { name: '经济发展指标' },
+        { name: '行政综合指标' }
+      ],
       rules: {
         indexMenuId: [{ required: true, message: '指标名称必选', trigger: ['blur', 'change'] }],
+        indexMenu: [{ required: true, message: '指标名称必选', trigger: ['blur', 'change'] }],
         statisticsTime: [{ required: true, message: '年份必选', trigger: ['blur', 'change'] }],
         subDeptId: [{ required: true, message: '下属部门必选', trigger: ['blur', 'change'] }]
       },
       showIndexMenuId: false, // 控制指标名称是否显示
       showSubDeptId: false, // 控制下属部门是否显示
       menuList: [],
+      tempzbmcList: [
+        {
+          id: '呼损率',
+          indexMenu: '呼损率'
+        },
+        {
+          id: '接通率',
+          indexMenu: '接通率'
+        },
+        {
+          id: '质检平均分',
+          indexMenu: '质检平均分'
+        },
+        {
+          id: '满意度',
+          indexMenu: '满意度'
+        },
+        {
+          id: '平均呼出',
+          indexMenu: '平均呼出'
+        },
+        {
+          id: '平均呼入',
+          indexMenu: '平均呼入'
+        },
+        {
+          id: '经济收益',
+          indexMenu: '经济收益'
+        },
+        {
+          id: '专项建设',
+          indexMenu: '专项建设'
+        }
+      ],
       title: '',
       deptName: '',
       menuName: '',
@@ -148,6 +214,7 @@
     // 如果路径里带参数，解析devcode参数
     var row = this.$route.query
     if (row) {
+      console.log('-----', row)
       this.hasQuery = true
       this.deptName = row.deptName
       this.listQuery.deptId = row.deptid
@@ -156,7 +223,7 @@
     }
     this.listQuery.statisticsTime = new Date().Format('yyyy')
     this.fetchDeptList()
-    this.fetchData()
+    // this.fetchData()
   },
   activated() {
     this.hasQuery = false
@@ -175,6 +242,20 @@
   },
   mounted() {
     this.hasQuery = false
+    // -------------------------------------------------------------------------------
+    // var row = this.$route.query
+    // if (row) {
+    //   console.log('有数据', row)
+    //   this.hasQuery = true
+    //   this.deptName = row.deptName
+    //   this.listQuery.deptId = row.deptid
+    //   this.listQuery.subDeptId = row.subdeptid
+    //   this.listQuery.indexMenuId = row.id
+    // } else {
+    //   console.log('不是从其他页面来的')
+    //   this.hasQuery = false
+    // }
+    // -----------------------------------------------------------------------------
   },
   methods: {
     // 查询数据
@@ -209,10 +290,19 @@
     fetchDeptList() {
       getDeptList('24').then(response => {
         this.deptList = response.data
+        // if (!this.hasQuery) {
         if (!this.hasQuery) {
-          this.deptName = this.deptList[0].simplename
-          this.listQuery.deptId = this.deptList[0].id
+          // --------------------------------------------------------------------
+          // this.deptName = this.deptList[0].simplename
+          // this.listQuery.deptId = this.deptList[0].id
+          this.deptName = this.deptList[1].simplename
+          this.listQuery.deptId = this.deptList[1].id
+          console.log('999999', this.listQuery.deptId)
+          // -------------------------------------------------------------------
         }
+        // -----------------------------------------------------------------------
+        this.fetchData()
+        // ------------------------------------------------------------------------
         if (this.listQuery.deptId) {
           // 获取下属部门
           getDeptList(this.listQuery.deptId).then(response => {