综合查询

src/assets/styles/common.css

@@ -216,6 +216,10 @@ textarea.ivu-input {
   background: #0185ea;
   color: #f2f2f2;
 }
+.ivu-select-disabled .ivu-select-selection {
+  background-color: #06214D;
+  color: #f2f2f2;
+}
 /* 修改下拉框的placeholder文字颜色*/
 .ivu-select-single .ivu-select-selection .ivu-select-placeholder { 
   color: #718EBD;

src/components/common/TreeList.vue

@@ -60,8 +60,10 @@ export default {
         color = 'red'
       } else if (data.level == 2) {
         calssName = 'iconfont '+ this.secondCalssName;
+        color = '#41aeff'
       } else {
         calssName = 'iconfont '+ this.thirdCalssName
+        color = '#41aeff'
       }
       return h(
         "span",
@@ -200,7 +202,7 @@ export default {
 </script>
 <style scoped lang="stylus">
 >>> .ivu-tree-arrow {
-  color: #00FFFF;
+  color: #41aeff;
   // height: 30px;
   // line-height: 30px;
   width: 15px;

src/views/homecomponents/BasicInfomation/ApplicationEquip.vue

@@ -40,9 +40,8 @@
               <div class="common-page-total">
                 共<span>{{tablePage}}</span>页 / <span>{{tableTotal}}</span>条数据
               </div>
-              <Page :total="tableTotal" :current="tableParams.pageNum" :page-size="tableParams.pageSize" @on-change="changePage" @on-page-size-change="sizeChange" show-elevator />
+              <Page :total="tableTotal" :current="tableParams.pageNum" :page-size="tableParams.pageSize" @on-change="changePage" show-elevator />
             </div>
-            <!-- <Page :total="tableTotal" :current="tableParams.pageNum" :page-size="tableParams.pageSize" @on-change="changePage" @on-page-size-change="sizeChange" show-elevator class="common-page"/> -->
           </div>
         </i-col>
       </Row>
@@ -170,7 +169,7 @@ export default {
     };
   },
   mounted() {
-    document.querySelector(".common-scroll").scrollTo(0, 0) 
+    document.querySelector(".common-scroll").scrollTo(0, 0)
     this.getMetroLevel()
   },
   methods: {
@@ -196,6 +195,7 @@ export default {
       this.currentStaData = []
       this.treeName = []
       this.$nextTick(()=> {
+        this.tableParams.pageNum = 1
         this.getTableData()
       })
       if(this.currentStation != ''){
@@ -212,6 +212,7 @@ export default {
     clearChange () {
       this.getSelectedItem()
       this.$nextTick(()=> {
+        this.tableParams.pageNum = 1
         this.getTableData()
       })
     },
@@ -267,6 +268,7 @@ export default {
     treeChange(val,arr,level) {
       this.currentStation = val
       this.$nextTick(()=> {
+        this.tableParams.pageNum = 1
         this.getTableData(arr,level)
       })
 		},
@@ -282,11 +284,6 @@ export default {
       this.tableParams.pageNum = val
       this.getTableData()
     },
-    //跳转
-    sizeChange (val) {
-      this.tableParams.pageSize = val
-      this.getTableData()
-    },
     getTableData (arr,level) {
       if (level) {
         this.tableParams.keywords = ''

src/views/homecomponents/BasicInfomation/ApplicationStation.vue

@@ -474,6 +474,7 @@ export default {
     },
     resetClick (name) {
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },   
     addClick () {

src/views/homecomponents/BasicInfomation/DeviceManage.vue

@@ -26,7 +26,8 @@
             </Tabs>
             <device-manage-index v-if="currentTabs=='设备管理'" ref="device"></device-manage-index>
             <device-type-manage  v-if="currentTabs=='设备类型管理'" ref="deviceType" @changeTree="changeTree"></device-type-manage>
-            <!-- <device-model-manage v-if="currentTabs=='设备监测模型'" ref="deviceModel" @changeTree="changeTree"></device-model-manage> -->
+            <device-model-manage v-if="currentTabs=='设备监测模型'" ref="deviceModel" @changeTree="changeTree"></device-model-manage>
+            <model-config v-if="currentTabs=='监测模型配置（开发人员专用）'" ref="modelConfig" @changeTree="changeTree"></model-config>
           </div>
         </i-col>
       </Row>
@@ -39,10 +40,11 @@ import LineManage from './LineManage.vue'
 import DeviceManageIndex from './DeviceManageIndex.vue'
 import DeviceTypeManage from './DeviceTypeManage.vue'
 import DeviceModelManage from './DeviceModelManage.vue'
+import ModelConfig from './ModelConfig.vue'
 export default {
   name: "DeviceManage",
   components:{
-    DeviceManageIndex,DeviceTypeManage,DeviceModelManage
+    DeviceManageIndex,DeviceTypeManage,DeviceModelManage,ModelConfig
   },
   data() {
     return {
@@ -51,24 +53,30 @@ export default {
       showTree: true,// 是否显示树形组件
 		  stationData: [],
       tabsData: [{label:'设备管理'},{label:'设备类型管理'}],
-      //  tabsData: [{label:'设备管理'},{label:'设备类型管理'},{label:'设备监测模型'}],
+      // tabsData: [{label:'设备管理'},{label:'设备类型管理'},{label:'设备监测模型'},{label:'监测模型配置（开发人员专用）'}],
       currentTabs: '设备管理'
     };
   },
   mounted() {
     this.getMetroLevel()
     this.currentTabs = sessionStorage.getItem('currentTabs') || '设备管理'
-    if (sessionStorage.getItem('currentTabs') == '设备类型管理') {
+    if(this.currentTabs == '设备管理'){
+       this.$nextTick(()=> {
+        this.$refs.device.getType()
+        this.$refs.device.getTableData()
+      })
+    } else if (this.currentTabs == '设备类型管理') {
       this.$nextTick(()=> {
         this.$refs.deviceType.getTableData()
       })
-    } else if(sessionStorage.getItem('currentTabs') == '设备管理'){
-      this.$refs.device.getType()
-      this.$refs.device.getTableData()
-    } else {
+    } else if(this.currentTabs == '设备监测模型'){
        this.$nextTick(()=> {
         this.$refs.deviceModel.getTableData()
       })
+    } else {
+       this.$nextTick(()=> {
+        this.$refs.modelConfig.getTableData()
+      })
     }
   },
   // 离开当前路由之前的钩子函数 
@@ -100,15 +108,23 @@ export default {
       this.treeName = []
       this.$nextTick(()=> {
         if (this.currentTabs == '设备管理') {
+          this.$refs.device.tableParams.pageNum = 1
           this.$refs.device.getTableData(this.currentStation)
         } else if(this.currentTabs == '设备类型管理'){
           this.$nextTick(()=> {
+            this.$refs.deviceType.tableParams.pageNum = 1
             this.$refs.deviceType.getTableData(this.currentStation)
           })
-        } else {
+        } else if(this.currentTabs == '设备监测模型'){
           this.$nextTick(()=> {
+            this.$refs.deviceModel.tableParams.pageNum = 1
             this.$refs.deviceModel.getTableData(this.currentStation)
           })
+        } else {
+          this.$nextTick(()=> {
+            this.$refs.modelConfig.tableParams.pageNum = 1
+            this.$refs.modelConfig.getTableData(this.currentStation)
+          })
         }
       })
       if(this.currentStation != ''){
@@ -126,15 +142,23 @@ export default {
       this.getSelectedItem()
       this.$nextTick(()=> {
         if (this.currentTabs == '设备管理') {
+          this.$refs.device.tableParams.pageNum = 1
           this.$refs.device.getTableData(this.currentStation)
         } else if(this.currentTabs == '设备类型管理'){
           this.$nextTick(()=> {
+            this.$refs.deviceType.tableParams.pageNum = 1
             this.$refs.deviceType.getTableData(this.currentStation)
           })
-        } else {
+        } else if(this.currentTabs == '设备监测模型'){
           this.$nextTick(()=> {
+            this.$refs.deviceModel.tableParams.pageNum = 1
             this.$refs.deviceModel.getTableData(this.currentStation)
           })
+        } else {
+          this.$nextTick(()=> {
+            this.$refs.modelConfig.tableParams.pageNum = 1
+            this.$refs.modelConfig.getTableData(this.currentStation)
+          })
         }
       })
     },
@@ -190,16 +214,24 @@ export default {
     treeChange(val,arr,level) {
       this.currentStation = val
       if (this.currentTabs == '设备管理') {
+        this.$refs.device.tableParams.pageNum = 1
         this.$refs.device.getTableData(this.currentStation,arr,level)
       } else if(this.currentTabs == '设备类型管理'){
         this.$nextTick(()=> {
+          this.$refs.deviceType.tableParams.pageNum = 1
           this.$refs.deviceType.getTableData(this.currentStation,arr,level)
         })
-      } else {
-          this.$nextTick(()=> {
-            this.$refs.deviceModel.getTableData(this.currentStation,arr,level)
-          })
-        }
+      } else if(this.currentTabs == '设备监测模型'){
+        this.$nextTick(()=> {
+          this.$refs.deviceModel.tableParams.pageNum = 1
+          this.$refs.deviceModel.getTableData(this.currentStation,arr,level)
+        })
+       } else {
+        this.$nextTick(()=> {
+          this.$refs.modelConfig.tableParams.pageNum = 1
+          this.$refs.modelConfig.getTableData(this.currentStation,arr,level)
+        })
+       }
 		},
     tabsClick (name) {
       document.querySelector(".station-tree-left").scrollTo(0, 0) 
@@ -217,11 +249,15 @@ export default {
         this.$nextTick(()=> {
           this.$refs.deviceType.getTableData()
         })
+      } else if(this.currentTabs == '设备监测模型'){
+        this.$nextTick(()=> {
+          this.$refs.deviceModel.getTableData()
+        })
       } else {
-          this.$nextTick(()=> {
-            this.$refs.deviceModel.getTableData()
-          })
-        }
+        this.$nextTick(()=> {
+          this.$refs.modelConfig.getTableData()
+        })
+      }
     },
     changeTree () {
      this.getMetroLevel()

src/views/homecomponents/BasicInfomation/DeviceManageIndex.vue

@@ -523,6 +523,7 @@ export default {
       })
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
       // this.$router.push({ path: '/MainPage/ApplicationManage',  query: {deptName: "2"}})
     },
@@ -532,6 +533,7 @@ export default {
      this.tableParams.useDateEnd = ''
      this.stationTypeData = [{ id: '-1', stationName: '站点' }]
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },   
     changeMoldaPicker (val) {

src/views/homecomponents/BasicInfomation/DeviceModelManage.vue

@@ -4,9 +4,6 @@
       <Row :gutter="8" style="width:100%;height:100%">
         <i-col span="24" style="height:100%">
           <div class="right-main">
-            <!-- <div class="manage-main-top">
-              <Button icon="ios-add" class="common-add-btn" @click="addClick">新增设备类型</Button>
-            </div> -->
             <div class="manage-main-center">
               <Table :columns="columns" :data="tableData" class="common-table" no-data-text="" :row-class-name="rowClassName" :loading="loading">
                 <template slot="loading">
@@ -26,7 +23,7 @@
               <div class="common-page-total">
                 共<span>{{tablePage}}</span>页 / <span>{{tableTotal}}</span>条数据
               </div>
-              <Page :total="tableTotal" :current="tableParams.pageNum" :page-size="tableParams.pageSize" @on-change="changePage" @on-page-size-change="sizeChange" show-elevator />
+              <Page :total="tableTotal" :current="tableParams.pageNum" :page-size="tableParams.pageSize" @on-change="changePage" show-elevator />
             </div>
           </div>
         </i-col>
@@ -35,36 +32,24 @@
      <Modal
       v-model="showModal"
       :title="title"
-      width="36"
+      width="45"
       ref="modalGrag"
       draggable
       reset-drag-position
       :mask-closable="false"
-      @on-visible-change="modalChange"
       class-name="common-modal">
       <div class="common-form-item-tips">
         <i class="iconfont icon-tishi" style="vertical-align: middle;color:#FFB31A;margin-right:12px"></i>
         编辑提交后，系统所有历史警示信息将同时变动，可能造成统计数据混乱，请谨慎操作。
       </div> 
-      <!-- <rolling-detail-table :columns1="editColumns" :apiUrl="apiUrl" ref="detailTable" class="rolling-detail-table">
-        <template slot-scope="params" slot="appName">{{params.row.id}}</template>
-      </rolling-detail-table> -->
-      <div class="common-modal-loading" v-show="editLoading">
+      <div class="common-modal-loading" v-if="editLoading">
         <loading-animation></loading-animation>
       </div>
-      <Table :columns="editColumns" :data="editTableData" class="common-table edit-table" :row-class-name="rowClassName" :loading="loading" v-show="!editLoading">
-        <template slot="appName" slot-scope="{ row }">
-            <Input v-model.trim="row.appName" style="width: 100%; padding: 6px"></Input>
+      <Table :columns="editColumns" :data="editTableData" class="common-table edit-table" :row-class-name="rowClassName" :loading="loading" v-if="!editLoading">
+        <template slot="targetName" slot-scope="{ row,index }">
+          <Input v-model.trim="row.targetName" style="width: 100%; padding: 6px" maxlength="20" show-word-limit @on-change="inputChange(row,index)"/>
         </template>
       </Table>
-      <!-- <Form class="common-form" ref="formOption" :model="formOption" :rules="ruleValidate" :label-width="120">
-				<FormItem label="类型名称：" prop="name">
-          <Input v-model.trim="formOption.name" maxlength="20" show-word-limit />  
-				</FormItem>
-				<FormItem label="说明：" prop="remark">
-           <Input v-model="formOption.remark" type="textarea" :rows="6" maxlength="200" show-word-limit /> 
-        </FormItem>
-			</Form> -->
       <div slot="footer">
           <Button @click="modalCancel">取消</Button>
           <Button type="primary" @click="modalOk('formOption')">确定</Button>
@@ -100,7 +85,7 @@ export default {
       tableParams: {
         equipmentTypeId: '',
         applicationId: '',
-        name: '',
+        keywords: '',
         pageNum: 1,
         pageSize: 10
       },
@@ -110,29 +95,24 @@ export default {
       columns: [
           {
             title: '设备类型名称',
-            key: 'name',
+            key: 'equipmentTypeName',
             align: 'center',
             ellipsis: true,
             tooltip: true
           },
           {
             title: '模型监测指标',
-            key: 'appCount',
+            key: 'targetCount',
             align: 'center'
           },
           {
             title: '等级判定策略覆盖指标数量',
-            key: 'equipmentCount',
-            align: 'center'
-          },
-          {
-            title: '自动确认策略覆盖指标数量',
-            key: ' targetCount',
+            key: 'rankCount',
             align: 'center'
           },
           {
             title: '连续监测策略覆盖指标数量',
-            key: ' targetCount',
+            key: 'durativeCount',
             align: 'center'
           },
           {
@@ -143,7 +123,7 @@ export default {
           }
       ],
       rowObj: {},
-      formOption: {name: '',remark:''},
+      formOption: {equipmentTypeId:null},
       ruleValidate: {
         name: [{
           required: true,
@@ -161,16 +141,17 @@ export default {
        {
           title: '序号',
           type: 'index',
-          align: 'center'
+          align: 'center',
+          width: 80
         },
         {
           title: '设备指标',
-          slot: 'appName',
+          slot: 'targetName',
           align: 'center',
         },
         {
           title: '对应数据库字段',
-          key: 'equipmentNum',
+          key: 'targetCode',
           align: 'center',
           ellipsis: true,
           tooltip: true
@@ -179,105 +160,98 @@ export default {
     detailStatus: false,
     currentModalTabs:'监测指标',
     tabsModalData: [{label:'监测指标'},{label:'关联设备'}],
-    detailLabel: [],
     columnsModal: [],
-    columnsEquipType: [
+    columnsModalType: [
+      {
+        title: '序号',
+        type: 'index',
+        align: 'center',
+        width: 80
+      },
+      {
+        title: '设备指标',
+        key: 'targetName',
+        align: 'center',
+        ellipsis: true,
+        tooltip: true
+      },
+      {
+        title: '对应数据库字段',
+        key: 'targetCode',
+        align: 'center',
+        ellipsis: true,
+        tooltip: true
+      },
+      {
+        title: '等级判定策略',
+        key: 'rankCount',
+        align: 'center'
+      },
+      {
+        title: '连续监测策略',
+        key: 'durativeCount',
+        align: 'center'
+      },
+    ],
+    columnsRelatedEquip: [
         {
           title: '序号',
           type: 'index',
-          align: 'center'
+          align: 'center',
+          width: 80
         },
         {
-          title: '设备指标',
-          key: 'appName',
+          title: '设备ID',
+          key: 'equipmentId',
           align: 'center',
           ellipsis: true,
           tooltip: true
         },
         {
-          title: '对应数据库字段',
-          key: 'equipmentNum',
+          title: '设备名称',
+          key: 'equipmentName',
           align: 'center',
           ellipsis: true,
           tooltip: true
         },
         {
-          title: '等级判定策略',
-          key: 'equipmentNum',
-          align: 'center'
+          title: '归属线路',
+          key: 'lineName',
+          align: 'center',
+          ellipsis: true,
+          tooltip: true
         },
         {
-          title: '自动确认策略',
-          key: 'equipmentNum',
-          align: 'center'
+          title: '归属站点',
+          key: 'stationName',
+          align: 'center',
+          ellipsis: true,
+          tooltip: true
         },
         {
-          title: '连续监测策略',
-          key: 'equipmentNum',
-          align: 'center'
+          title: '状态',
+          key: 'equipmentStatusValue',
+          align: 'center',
+          ellipsis: true,
+          tooltip: true
         },
-      ],
-      columnsRelatedEquip: [
-          {
-            title: '序号',
-            type: 'index',
-            align: 'center'
-          },
-          {
-            title: '设备ID',
-            key: 'equipmentId',
-            align: 'center',
-            ellipsis: true,
-            tooltip: true
-         },
-         {
-            title: '设备名称',
-            key: 'equipmentName',
-            align: 'center',
-            ellipsis: true,
-            tooltip: true
-         },
-         {
-            title: '归属线路',
-            key: 'lineName',
-            align: 'center',
-            ellipsis: true,
-            tooltip: true
-            // render:(h,params)=>{
-            //   return h('div', [ h('span',!params.row.lineName ? '/' : params.row.lineName) ])
-            // }
-         },
-         {
-            title: '归属站点',
-            key: 'stationName',
-            align: 'center',
-            ellipsis: true,
-            tooltip: true
-         },
-         {
-            title: '状态',
-            key: 'equipmentStatusValue',
-            align: 'center'
-         },
-      ],
-      // equipTypeModal: [],
-      // equipTypeCount: 0,
-      detailParams: {
-					equipmentTypeId: null,
-					pageNum: 1,
-					pageSize: 10
-			},
-      apiUrl: '',
-      appNameObj: {
-        level: '',
-        lineId: '',
-        stationId: '',
-        equipmentCheck: '',
-        instrumentCheck: '',
+    ],
+    detailParams: {
+        equipmentTypeId: null,
         pageNum: 1,
         pageSize: 9999
-      },
-      appNameList: []
+    },
+    apiUrl: '',
+    appNameObj: {
+      level: '',
+      lineId: '',
+      stationId: '',
+      equipmentCheck: '',
+      instrumentCheck: '',
+      pageNum: 1,
+      pageSize: 9999
+    },
+    appNameList: []
     };
   },
   mounted() {
@@ -295,11 +269,6 @@ export default {
       this.tableParams.pageNum = val
       this.getTableData()
     },
-    //跳转
-    sizeChange (val) {
-      this.tableParams.pageSize = val
-      this.getTableData()
-    },
     getTableData (keywords,arr,level) {
       if (level) {
         this.tableParams.name = ''
@@ -323,7 +292,7 @@ export default {
         }
       }
       this.loading = true
-      this.$get('metroapi/equipment/queryEquipmentTypePage', this.tableParams).then(res=>{
+      this.$get('metroapi/target/queryTargetPage', this.tableParams).then(res=>{
         this.loading = false
           if ( res.httpCode == 1 ){
             this.tableData = res.data.data
@@ -343,82 +312,93 @@ export default {
           }
         })
     },
-    getType  () {
-      // 获取设备类型
-      this.$get('metroapi/equipment/queryEquipmentType', {name:''}).then(res=>{
-        if (res.httpCode == 1 ){
-          this.equipTypeData = res.data
-        } else {
-          this.equipTypeData = []
-        }
-      })
-      // 获取应用名称
-      this.$get('metroapi/application/info/list', this.appNameObj).then(res=>{
-          if (res.httpCode == 1 ){
-            this.appNameList = res.data.data
-          } else {
-            this.appNameList = []
-          }
-        })
-    },
     detailClick (row) {
-      this.detailParams.equipmentTypeId = Number(row.id)
+      this.detailParams.equipmentTypeId = Number(row.equipmentTypeId)
+      this.detailParams.pageSize = 999
       this.rowObj = row
       this.detailStatus = true
       this.currentModalTabs = '监测指标'
       this.$nextTick(() => {
-        this.apiUrl = 'metroapi/equipment/equipmentTypeDetail'
-        this.columnsModal = this.columnsEquipType
+        this.apiUrl = 'metroapi/target/queryTargetCountByEquTypeId'
+        this.columnsModal = this.columnsModalType
         document.querySelector(".rolling-detail-table .ivu-table-body").scrollTo(0, 0) 
         this.$refs.detailTable.getChartsDetail(this.detailParams,this.apiUrl)
       });
-      this.$get('metroapi/equipment/equipmentTypeDetail', this.detailParams).then(res=>{
-        if ( res.httpCode == 1 ){
-            this.detailLabel = res.data
-          } else {
-            this.$Message.info(res.msg)
-          }
-        })
-        // document.querySelector(".rolling-detail-table .ivu-table-body").scrollTo(0, 0)
     },
     editClick (row) {
-      this.editLoading = false
+      this.getstrategyData(row.equipmentTypeId)
+      this.editLoading = true
       this.rowObj = row
       this.formOption = JSON.parse(JSON.stringify(row))
       this.title = '编辑监测模型'
-      this.showModal = true
-    },
-    modalChange (modalStatus) {
-
+      this.$nextTick(()=> {
+        this.showModal = true
+      })
     },
-    modalOk (formName) {  
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.$post('metroapi/equipment/editEquipmentType', this.formOption).then(res=>{
-            if (res.httpCode == 1 ){
-              this.showModal = false
-              this.$Message.info(res.msg)
-              this.getTableData()
-            } else {
-              this.$Message.info(res.msg)
-            }
-          })
+    getstrategyData (equipmentTypeId) {
+      this.$get('metroapi/target/queryTargetByEquipmentType', {equipmentTypeId:equipmentTypeId}).then(res=>{
+        this.editLoading = false
+        if (res.httpCode == 1 ){
+          this.editTableData = res.data
+          this.formOption.targetInfoList = res.data
         } else {
-          this.showModal = true
+          this.$Message.info(res.msg)
         }
       })
     },
+    inputChange (row,index) {
+      this.formOption.targetInfoList[index].targetName = row.targetName
+    },
+    modalOk (formName) {  
+      let canSave = true;
+      let arr = this.formOption.targetInfoList
+      for (var i = 0; i < arr.length; i++) {
+        if (arr[i].targetName == '') {
+           this.$Message['error']({
+              background: true,
+              content: '指标名称不可为空'
+            });
+            return
+        }
+          for (var j = i + 1; j < arr.length; j++) {
+              if (arr[i].targetName == arr[j].targetName) 
+              { 
+                canSave = false; 
+                break;
+              }
+          }
+      }
+      if(canSave) {
+        this.$post('metroapi/target/editTarget', this.formOption).then(res=>{
+          if (res.httpCode == 1 ){
+            this.showModal = false
+            this.$Message.info(res.msg)
+            this.getTableData()
+          } else {
+            this.$Message.info(res.msg)
+          }
+        })
+      } else {
+        this.$Message['error']({
+          background: true,
+          content: '模型内各监测指标名称不可重复'
+        });
+      }
+    },
     modalCancel () {
       this.showModal = false
     },
     tabsClick (name) {
       this.currentModalTabs = name
       if (this.currentModalTabs == '监测指标') {
-        this.apiUrl = 'metroapi/equipment/equipmentTypeDetail'
-        this.columnsModal = this.columnsEquipType
+        this.detailStatus
+        this.apiUrl = 'metroapi/target/queryTargetCountByEquTypeId'
+        this.columnsModal = this.columnsModalType
+        this.detailParams.pageSize = 999
       } else if (this.currentModalTabs == '关联设备') {
         this.apiUrl = 'metroapi/equipment/queryEquipmentByTypePage'
         this.columnsModal = this.columnsRelatedEquip
+        this.detailParams.pageSize = 10
       }
       this.$nextTick(() => {    
         document.querySelector(".rolling-detail-table .ivu-table-body").scrollTo(0, 0) 

src/views/homecomponents/BasicInfomation/DeviceTypeManage.vue

@@ -150,7 +150,7 @@ export default {
           },
           {
             title: '监测指标',
-            key: ' targetCount',
+            key: 'targetCount',
             align: 'center'
           },
           {
@@ -178,7 +178,6 @@ export default {
     activeColor: '#E92E2E',
     activeClass: '',
     modalTitle: '',
-    detailStatus: false,
     currentModalTabs:'设备类型信息',
     tabsModalData: [{label:'设备类型信息'},{label:'关联设备'}],
     detailLabel: [],

src/views/homecomponents/BasicInfomation/LineStationManage.vue

@@ -95,6 +95,7 @@ export default {
       this.currentStaData = []
       this.treeName = []
       this.$nextTick(()=> {
+        this.$refs.stationManage.tableParams.pageNum = 1
         this.$refs.stationManage.getTableData(this.currentStation)
       })
       if(this.currentStation != ''){
@@ -111,6 +112,7 @@ export default {
     clearChange () {
       this.getSelectedItem()
       this.$nextTick(()=> {
+        this.$refs.stationManage.tableParams.pageNum = 1
         this.$refs.stationManage.getTableData(this.currentStation)
       })
     },
@@ -164,6 +166,7 @@ export default {
     treeChange(val,arr) {
       this.currentStation = val
       this.$nextTick(()=> {
+        this.$refs.stationManage.tableParams.pageNum = 1
         this.$refs.stationManage.getTableData(this.currentStation)
       })
 		},

src/views/homecomponents/BasicInfomation/ModelConfig.vue

@@ -0,0 +1,605 @@
+<template>
+  <div class="content-main common-scroll">
+    <div class="content-body">
+      <Row :gutter="8" style="width:100%;height:100%">
+        <i-col span="24" style="height:100%">
+          <div class="right-main">
+            <div class="manage-main-top">
+              <Button icon="ios-add" class="common-add-btn" @click="addClick">新增监测模型</Button>
+            </div>
+            <div class="manage-main-center">
+              <Table :columns="columns" :data="tableData" class="common-table" no-data-text="" :row-class-name="rowClassName" :loading="loading">
+                <template slot="loading">
+                    <Loading-animation></Loading-animation>
+                </template>
+                <template slot-scope="{ row }" slot="action">
+                  <Tooltip content="编辑" placement="top">
+                      <i class="iconfont icon-bianji" style="cursor:pointer;color:#64ACFE;fontSize:20px;marginRight:6px" @click="editClick(row)"></i>
+                  </Tooltip>
+                </template>
+              </Table>
+            </div>
+            <div class="common-page">
+              <div class="common-page-total">
+                共<span>{{tablePage}}</span>页 / <span>{{tableTotal}}</span>条数据
+              </div>
+              <Page :total="tableTotal" :current="tableParams.pageNum" :page-size="tableParams.pageSize" @on-change="changePage" show-elevator />
+            </div>
+          </div>
+        </i-col>
+      </Row>
+    </div>
+     <Modal
+      v-model="showModal"
+      :title="title"
+      width="40"
+      ref="modalGrag"
+      draggable
+      reset-drag-position
+      :mask-closable="false"
+      @on-visible-change="modalChange"
+      class-name="common-modal">
+       <Form class="common-form" ref="formOption" :model="formOption" :rules="ruleValidate" :label-width="130" label-position="left">
+        <FormItem label="归属设备类型：" prop="equipmentTypeId">
+           <Select v-model="formOption.equipmentTypeId" placeholder="设备类型">
+              <Option v-for="item in equipTypeData" :value="item.id" :key="item.id">{{ item.name }}</Option>
+          </Select>
+        </FormItem>
+			</Form>
+      <div class="sub-add" v-show="title == '新增监测模型'">
+          <span>点击"+"添加新指标</span>
+          <i class="iconfont icon-tianjia" style="cursor:pointer;color:#43B843;padding-left:10px" @click="handleAdd('formDynamic')"></i>
+        </div>
+      <Form ref="formDynamic" :model="formCustom" :label-width="0" class="common-modal-bot">
+        <Row class="strategy-form-header">
+          <Col span="3" class="row-first">序号</Col>
+          <Col span="12">设备指标名称</Col>
+          <Col span="8">对应字段</Col>
+          <Col span="1" class="row-last"></Col>
+        </Row>
+        <div class="strategy-form-scroll common-scroll" v-if="showModal">
+          <div class="strategy-form">
+              <Row v-for="(item, index) in formCustom.targetInfoList" :key="index">
+              <Col span="3" :class="{'row-first': index == 0}" class="row-first-es">{{index + 1}}</Col>
+              <Col span="12" :class="{'row-first': index == 0}" class="row-input">
+                <FormItem
+                  :prop="'targetInfoList.'+index+'.targetName'" :rules="{required: true,message: '请输入设备指标名称',trigger: 'blur'}">
+                 <Input v-model.trim="item.targetName" placeholder="设备指标名称" maxlength="20" show-word-limit />
+                </FormItem>
+              </Col>
+              <Col span="8" :class="{'row-first': index == 0}" class="row-input">
+                 <FormItem
+                  :prop="'targetInfoList.'+index+'.targetCode'" :rules="{required: true,message: '请输入字段名称',trigger: 'blur'}">
+                 <Input v-model.trim="item.targetCode" placeholder="字段名称"></Input>
+                </FormItem>
+              </Col>
+              <Col span="1" class="ivu-col-btn">
+               <i class="iconfont icon-shanchu ivu-col-del" style="cursor:pointer; color:#BC2020;padding-left:10px" @click="handleRemove(index,item.id)"></i>
+              </Col>
+            </Row>
+          </div>
+        </div>
+      </Form>
+      <div slot="footer">
+          <Button @click="modalCancel">取消</Button>
+          <Button type="primary" @click="modalOk('formOption')">确定</Button>
+        </div>
+    </Modal>
+</div>
+</template>
+<script>
+const defaultFrom = {equipmentTypeId: ''}
+import _ from 'lodash'
+export default {
+  name: "ModelConfig",
+  components:{
+  },
+  data() {
+    return {
+      tableTotal: 0,
+      tablePage: 0,
+      tableParams: {
+        equipmentTypeId: '',
+        applicationId: '',
+        keywords: '',
+        pageNum: 1,
+        pageSize: 10
+      },
+      loading: true,
+      tableData: [],
+      columns: [
+        {
+          title: '设备类型名称',
+          key: 'equipmentTypeName',
+          align: 'center',
+          ellipsis: true,
+          tooltip: true
+        },
+        {
+          title: '模型监测指标',
+          key: 'targetCount',
+          align: 'center',
+          ellipsis: true,
+          tooltip: true
+        },
+        {
+          title: '操作',
+          align: 'center',
+          slot: 'action',
+          width: 120
+        }
+      ],
+      rowObj: {},
+      formOption: {equipmentTypeId: ''},
+      ruleValidate: {
+        equipmentTypeId: [{
+          required: true,
+          type: 'number',
+          message: '请选择归属设备类型',
+          trigger: 'change'
+        }],
+      },
+    equipTypeData: [],
+    showModal: false,
+    title: '新增监测模型',
+    equipTypeData: [],
+    formCustom: {
+        targetInfoList: [
+          {
+            targetName: '',
+            targetCode: '',
+            id: null,
+          },
+        ],
+      },
+    };
+  },
+  mounted() {
+    this.getType() 
+  },
+  methods: {
+    rowClassName(row, index) {
+      if (index % 2 == 0) {
+        return "ivu-table-stripe-even";
+      } else {
+        return "ivu-table-stripe-odd";
+      }
+    },
+    // 分页
+    changePage (val) {
+      this.tableParams.pageNum = val
+      this.getTableData()
+    },
+    getTableData (keywords,arr,level) {
+      if (level) {
+        this.tableParams.keywords = ''
+        if (level == 2) {
+          this.tableParams.applicationId = arr[arr.length-1]
+          this.tableParams.equipmentTypeId = ''
+        } else if (level == 3) {
+          this.tableParams.applicationId = arr[arr.length-2]
+          this.tableParams.equipmentTypeId = arr[arr.length-1]
+        } else {
+          this.tableParams.applicationId = ''
+          this.tableParams.equipmentTypeId = ''
+        }
+      } else {
+        this.tableParams.applicationId = ''
+        this.tableParams.equipmentTypeId = ''
+        if (keywords == '合肥轨道交通' || keywords == '' || keywords == undefined) {
+          this.tableParams.keywords = ''
+        } else {
+          this.tableParams.keywords = keywords
+        }
+      }
+      this.loading = true
+      this.$get('metroapi/target/queryTargetPage', this.tableParams).then(res=>{
+        this.loading = false
+          if ( res.httpCode == 1 ){
+            this.tableData = res.data.data
+            this.tableTotal = res.data.count
+            if (res.data.data.length==0) {
+              this.tablePage = 0
+            } else {
+              this.tablePage = res.data.count<= 10 ? 1: Math.ceil(res.data.count/this.tableParams.pageSize)
+            }
+            if (res.data.data.length==0 && this.tableParams.pageNum>1) {
+              this.tableParams.pageNum--
+              return this.getTableData()
+            }
+          } else {
+            this.tableData = []
+            this.tableTotal = 0
+          }
+        })
+    },
+    getType  () {
+      // 获取设备类型
+      this.$get('metroapi/equipment/queryEquipmentType', {name:''}).then(res=>{
+        if (res.httpCode == 1 ){
+          this.equipTypeData = res.data
+        } else {
+          this.equipTypeData = []
+        }
+      })
+    },
+    addClick () {
+      this.formCustom.targetInfoList= [
+        {
+          targetName: '',
+          targetCode: '',
+          id: null
+        },
+      ],      
+      this.title = '新增监测模型'
+      this.formOption = JSON.parse(JSON.stringify(defaultFrom))
+      this.showModal = true
+    },
+    editClick (row) {
+      this.getstrategyData(row.equipmentTypeId)
+      this.rowObj = row
+      this.formOption = JSON.parse(JSON.stringify(row))
+      this.title = '编辑监测模型'
+      this.$nextTick(()=> {
+        this.showModal = true
+      })
+    },
+    getstrategyData (equipmentTypeId) {
+      this.$get('metroapi/target/queryTargetByEquipmentType', {equipmentTypeId:equipmentTypeId}).then(res=>{
+        if (res.httpCode == 1 ){
+          this.formCustom.targetInfoList = res.data
+        } else {
+          this.$Message.info(res.msg)
+        }
+      })
+    },
+    modalChange (modalStatus) {
+     if (!modalStatus) {
+      this.$refs.formOption.resetFields();
+      this.$refs.formDynamic.resetFields();
+     }
+    },
+    modalDetailChange (val) {
+     	if (!val) {
+        this.detailParams.pageNum = 1
+        document.querySelector(".rolling-detail-table .ivu-table-body").scrollTo(0, 0)
+      }
+    },
+    modalOk () {
+      let params = Object.assign({}, this.formOption, this.formCustom); // 合并对象 注意目标对象自身也会改变。假设目标对象{}是之前里的对象，他的值跟obj一样
+      this.$nextTick(()=> {
+        // 多个form表单验证
+        const p1 = new Promise((resolve,reject)=>{
+        this.$refs['formOption'].validate(valid=>{
+                if(valid) resolve()
+            })
+        })
+        const p2 = new Promise((resolve,reject)=>{
+            this.$refs['formDynamic'].validate(valid=>{
+                if(valid) resolve()
+            })
+        })
+        Promise.all([p1,p2]).then(()=>{
+          let canSave = true;
+          let arr = this.formCustom.targetInfoList
+          for (var i = 0; i < arr.length; i++) {
+              for (var j = i + 1; j < arr.length; j++) {
+                  if (arr[i].targetName == arr[j].targetName) 
+                  { 
+                    canSave = false; 
+                    break;
+                  }
+              }
+          }
+          if(canSave) {
+            this.saveStrategyData(params)
+          } else {
+            this.$Message['error']({
+              background: true,
+              content: '请勿设置重复设备指标名称'
+            });
+          }
+        })
+      })
+    },
+    saveStrategyData (params) {
+      let url = ''
+      if (this.title == '新增监测模型') {
+        url = 'metroapi/target/addTarget'  
+        if (this.formCustom.targetInfoList.length == 0) {
+          this.$Message['error']({
+            background: true,
+            content: '指标不能为空'
+          });
+          return;
+        }
+      } else {
+        url = 'metroapi/target/editTarget'
+      }
+      this.$post(url, params).then(res=>{
+        if ( res.httpCode == 1 ){
+            this.showModal = false
+            this.$Message.info(res.msg)
+            this.getTableData()
+          } else {
+            this.$Message.info(res.msg)
+          }
+        })
+    },
+    modalCancel () {
+      this.showModal = false
+    },
+    handleAdd(name) {
+      this.$nextTick(()=> {
+        this.$refs[name].validate((valid) => {
+        if (valid) { 
+          this.formCustom.targetInfoList.push({
+            targetName: '',
+            targetCode: '',
+            id: null
+          })
+        }
+       });
+      }) 
+    },
+    handleRemove(i,id) {
+      if (this.title == '新增监测模型') {
+       this.formCustom.targetInfoList.splice(i,1)
+      } else {
+        this.$get('metroapi/target/delTarget', {targetId:id}).then(res=>{
+        if ( res.httpCode == 1 ){
+            this.formCustom.targetInfoList.splice(i,1)
+            this.$Message.info(res.msg)
+          } else {
+            this.$Message.info(res.msg)
+          }
+        })
+      }
+    },
+  }
+};
+</script>
+<style scoped lang="stylus">
+.content-main {
+  width: 100%;
+  height: calc(100% - 50px);
+  overflow: hidden;
+}
+.common-search {
+  width: 100%;
+}
+>>> .common-search .ivu-input {
+  background-color: #06214D;
+  border: 1px solid #2355A6;
+  border-radius: 15px;
+  color: #fff;
+  height: 32px;
+}
+>>> .common-search .ivu-input:focus {
+    border-color: #0185ea;
+}
+.content-body {
+  width: 100%;
+  height: 100%;
+  background: #06214D;
+}
+.station-tree {
+  height: 100%;
+  padding: 10px;
+}
+.station-tree-body {
+  border: 1px solid #204384;
+  height: 100%;
+  padding: 10px;
+}
+.station-tree-center {
+  height: calc(100% - 32px);
+  padding-top: 10px;
+  // display: flex;
+}
+.station-tree-left {
+  height: 100%;
+  overflow: auto;
+}
+.station-tree-left-notree {
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: #fff;
+  fon-size: 14px;
+}
+.right-main {
+  height: 100%;
+  padding: 10px 0;
+  position: relative;
+  // padding: 16px;
+}
+.manage-main-top {
+  padding: 12px 0;
+  display: flex;
+  justify-content: flex-end;
+}
+.manage-main-center {
+  width: 100%;
+  height: calc(100% - 100px);
+}
+.common-table {
+  max-height: 100%;
+}
+>>> .common-table .ivu-table th {
+  height: 54px;
+ }
+ >>> .common-table .ivu-table td {
+  height: 54px;
+ }
+>>> .common-table .ivu-spin-fix {
+  top: 54px;
+  height: calc(100vh - 350px);
+}
+>>> .common-table .ivu-table-tip {
+  background: url('../../../assets/images/noData.png') no-repeat center;
+  height: calc(100vh - 350px);
+}
+>>> .common-table .ivu-table-tip table {
+ display: none;
+}
+.common-page {
+  margin-top: 15px;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+}
+.common-page-total {
+  color: #fff;
+  padding-right: 10px;
+  font-size: 14px;
+  span {
+    color #409EFF;
+  }
+}
+
+>>> .sub-add {
+  display: flex;
+  align-items: center;
+  margin-bottom: 15px;
+  font-size: 12PX;
+  color: #FFFFFF;
+}
+>>> .common-modal-bot {
+  margin-bottom: 15px;
+}
+>>> .modal-content-item-value .ivu-tooltip {
+  width: 100%;
+}
+>>> .modal-content-item-value .ivu-tooltip-rel {
+  overflow: hidden;
+  text-overflow:ellipsis; 
+  white-space: nowrap;
+}
+>>> .strategy-form-scroll {
+  max-height: 360px;
+  overflow: hidden;
+  overflow-y: auto;  
+}
+>>> .strategy-form {
+margin-bottom: 20px;
+}
+>>> .strategy-form .ivu-col{
+  color: #2B8EE2;
+  font-size: 14PX;
+}
+>>> .row-first-es {
+  border-left: 1px solid #21437B;
+  border-bottom: 1px solid #21437B;
+  border-right: 1px solid #21437B;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  // background: #13305F;
+}
+>>> .strategy-form-header {
+  color: #2B8EE2;
+  font-size: 14PX;
+  display: flex;
+  align-items: center;
+  height: 55PX;
+  .ivu-col {
+    border-top: 1px solid #21437B;
+    border-right: 1px solid #21437B;
+    height: 100%;
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #13305F;
+  }
+  .row-first {
+    border-left: 1px solid #21437B;
+  }
+  .row-last {
+    background: none;
+    border: none;
+  }
+}
+>>> .strategy-form .row-first{
+  border-top: 1px solid #21437B;
+}
+ >>> .strategy-form .row-first-es {
+     background: #13305F;
+  }
+>>> .strategy-form .ivu-form-item{
+  height: 100%;
+  margin-bottom: 0;
+  width: 90%;
+}
+
+>>> .strategy-form .row-es-text {
+  border-left: none;
+  border-bottom: 1px solid #21437B;
+  border-right: 1px solid #21437B;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: #13305F;
+}
+>>> .row-select .ivu-form-item {
+  height: 100%;
+  border-right: 1px solid #21437B;
+  border-bottom: 1px solid #21437B;
+   .ivu-form-item-content {
+    padding: 10px 5px;
+  }
+}
+>>> .row-input {
+  border-bottom: 1px solid #21437B;
+  border-right: 1px solid #21437B;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  .ivu-input-wrapper{
+   margin: 10px 0;
+ }
+}
+>>> .strategy-form .row-es-last {
+  border-right: 1px solid #21437B;
+  border-bottom: 1px solid #21437B;
+  height: 100%;
+  // display: flex;
+  // justify-content: space-around;
+  // align-items: center;
+  .row-es-last-text {
+    font-size: 14PX;
+    margin-right: 5px;
+    display: inline-block;
+    width: 42px;
+  }
+  .ivu-form-item  {
+    // display: flex;
+    // flex: 1;
+    width: 100%;
+  }
+   .ivu-form-item-content {
+    // display: flex;
+    padding: 10px 5px;
+    width: 100%;
+  }
+}
+>>> .ivu-col-del {
+  cursor:pointer;
+  color:#BC2020;
+  padding-left:10px;
+}
+>>> .strategy-form .ivu-col-btn {
+  display: flex;
+  align-items: center;
+  border-top: none;
+  border-bottom: none;
+}
+>>> .strategy-form .ivu-form-item-error-tip {
+ padding-left: 6px;
+}
+</style>

src/views/homecomponents/EquipmentAnalysis/AlarmAcknowledgConfig.vue

@@ -517,11 +517,13 @@ export default {
       })
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
       // this.$router.push({ path: '/MainPage/ApplicationManage',  query: {deptName: "2"}})
     },
     resetClick (name) {
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },   
     addClick () {

src/views/homecomponents/EquipmentAnalysis/AlarmFilterConfig.vue

@@ -260,13 +260,6 @@ export default {
             // tooltip: true,
           },
           {
-            title: '设备名称',
-            key: 'equipmentName',
-            align: 'center',
-            ellipsis: true,
-            tooltip: true
-          },
-          {
             title: '告警等级',
             key: 'rankName',
             align: 'center',
@@ -351,8 +344,6 @@ export default {
     };
   },
   mounted() {
-    //  this.startTime = moment().startOf('day').format('YYYY-MM-DD HH:mm:ss');
-    //   this.endTime = moment().endOf('day').format('YYYY-MM-DD HH:mm:ss');
     this.getType()
   },
   methods: {
@@ -419,17 +410,6 @@ export default {
           this.alarmLevelModalData = []
         }
       })
-      //  // 获取设备类型
-      // this.$get('metroapi/equipment/queryEquipmentType', {name:''}).then(res=>{
-      //   if (res.httpCode == 1 ){
-      //     this.equipTypeModalData = JSON.parse(JSON.stringify(res.data))
-      //     this.equipTypeData = res.data
-      //     this.equipTypeData.unshift({ id: '-1', name: '设备类型' })
-      //   } else {
-      //     this.equipTypeData = []
-      //     this.equipTypeModalData = []
-      //   }
-      // })
     },
     selectLine (val) {
       // 获取站点类型
@@ -453,11 +433,6 @@ export default {
         })
       }
     },
-    // selectChange (selection) {
-    //  console.log(selection)
-    //  let user = selection.map(item => item.id)
-    //  console.log(user)
-    // },
     // 获取表格数据
     getTableData (keywords,arr,level) {
        if (level) {
@@ -534,6 +509,7 @@ export default {
       })
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
       // this.$router.push({ path: '/MainPage/ApplicationManage',  query: {deptName: "2"}})
     },
@@ -543,6 +519,7 @@ export default {
      this.tableParams.filterEndTime = ''
      this.stationTypeData = [{ id: -1, stationName: '站点' }]
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },   
     changeMoldaPicker (val) {

src/views/homecomponents/EquipmentAnalysis/AlarmHandling.vue

@@ -177,26 +177,32 @@ export default {
       this.currentTabs = currentTabs || '告警信息-无法判定等级'
       if (currentTabs == '告警信息-无法判定等级' || !currentTabs) {
          this.$nextTick(()=> {
+          this.$refs.unableDeter.tableParams.pageNum = 1
           this.$refs.unableDeter.getTableData(currentStation,arr,level)
         })
       } else if(currentTabs == '告警信息-待确认'){       
         this.$nextTick(()=> {
+          this.$refs.toConfirmed.tableParams.pageNum = 1
           this.$refs.toConfirmed.getTableData(currentStation,arr,level)
         })
       } else if(currentTabs == '告警信息-已确认'){
         this.$nextTick(()=> {
+          this.$refs.confirmed.tableParams.pageNum = 1
           this.$refs.confirmed.getTableData(currentStation,arr,level)
         })
       } else if(currentTabs == '告警信息-已清除'){
         this.$nextTick(()=> {
+          this.$refs.cleared.tableParams.pageNum = 1
           this.$refs.cleared.getTableData(currentStation,arr,level)
         })
       } else if(currentTabs == '告警信息-已过滤'){
         this.$nextTick(()=> {
+          this.$refs.filtered.tableParams.pageNum = 1
           this.$refs.filtered.getTableData(currentStation,arr,level)
         })
       } else {
          this.$nextTick(()=> {
+           this.$refs.comprehensive.tableParams.pageNum = 1
           this.$refs.comprehensive.getTableData(currentStation,arr,level)
         })
       }

src/views/homecomponents/EquipmentAnalysis/AlarmLevelConfig.vue

@@ -343,6 +343,7 @@ export default {
         })
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
     },
     resetClick (name) {
@@ -350,6 +351,7 @@ export default {
      this.tableParams.beginDate = ''
      this.tableParams.endDate = ''
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },   
     addClick () {

src/views/homecomponents/EquipmentAnalysis/AlarmMonitor.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="content-main">
-    <div class="content-body-wrap">
+    <!-- <div class="content-body-wrap">
      <div class="content-body">
          <Row :gutter="8" style="width:100%;height: 100%">
           <i-col span="5" style="height:100%">
@@ -135,7 +135,7 @@
           </i-col>
         </Row>
      </div>
-    </div>
+    </div> -->
   </div>
 </template>
 <script>
@@ -337,10 +337,12 @@ export default {
       } else if(currentTabs == '实时告警列表-线网视图'){ 
         this.$route.params.equipmentId = null //告警处理页面跳转点击tab页，清除跳转参数值 先不考虑 等测试提bug再放开
         this.$nextTick(()=> {
+         this.$refs.alarmRealLine.tableParams.pageNum = 1
          this.$refs.alarmRealLine.getTableData(currentStation,arr,level,equipmentId)
         })
       } else if(currentTabs == '实时告警列表-设备视图'){
         this.$nextTick(()=> {
+          this.$refs.alarmRealStation.tableParams.pageNum = 1
           this.$refs.alarmRealStation.getTableData(currentStation,arr,level,equipmentId)
         })
       }

src/views/homecomponents/EquipmentAnalysis/AlarmRealLine.vue

@@ -526,6 +526,7 @@ export default {
       }
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
       // this.$router.push({ path: '/MainPage/ApplicationManage',  query: {deptName: "2"}})
     },
@@ -535,6 +536,7 @@ export default {
      this.tableParams.endAlertTime = ''
      this.equipTypeData = [{ equipmentTypeId: '-1', equipmentName: '设备类型' }]
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },
     correctClick (row) {

src/views/homecomponents/EquipmentAnalysis/AlarmRealStation.vue

@@ -407,6 +407,7 @@ export default {
     go (val) {
       if (val.name == '设备今日告警') {
         this.tableParams.equipmentId = this.rowObj.equipmentId
+        this.tableParams.pageNum = 1
         this.getTableData()
         this.detailStatus = false
       }
@@ -575,6 +576,7 @@ export default {
       }
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
       // this.$router.push({ path: '/MainPage/ApplicationManage',  query: {deptName: "2"}})
     },
@@ -588,6 +590,7 @@ export default {
     //  this.tableParams.endUpdateTime =  ''
      this.stationTypeData = [{ id: '-1', stationName: '站点' }]
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },
     correctClick (row) {

src/views/homecomponents/EquipmentAnalysis/ClearedAlarm.vue

@@ -486,6 +486,7 @@ export default {
       }
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
       // this.$router.push({ path: '/MainPage/ApplicationManage',  query: {deptName: "2"}})
     },
@@ -498,6 +499,7 @@ export default {
      this.tableParams.endUpdateTime =  ''
      this.equipTypeData = [{ equipmentTypeId: '-1', equipmentName: '设备类型' }]
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },   
     correctClick (row) {

src/views/homecomponents/EquipmentAnalysis/ComprehensiveInfor.vue

@@ -551,6 +551,7 @@ export default {
       }
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
       // this.$router.push({ path: '/MainPage/ApplicationManage',  query: {deptName: "2"}})
     },
@@ -565,6 +566,7 @@ export default {
      this.updateTimeContent = '操作时间范围'
      this.equipTypeData = [{ equipmentTypeId: '-1', equipmentName: '设备类型' }]
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },
     correctClick (row) {

src/views/homecomponents/EquipmentAnalysis/ComprehensiveQuery.vue

@@ -92,8 +92,6 @@
 <script>
 export default {
   name: "ComprehensiveQuery",
-   components:{
-  },
   data() {
     return {
        alarmParams: {
@@ -411,6 +409,7 @@ export default {
       }
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
       // this.$router.push({ path: '/MainPage/ApplicationManage',  query: {deptName: "2"}})
     },
@@ -426,6 +425,7 @@ export default {
      this.stationTypeData = [{ id: '-1', stationName: '站点' }]
      this.equipTypeData = [{ equipmentTypeId: '-1', equipmentName: '设备类型' }]
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData('reset')
     },   
   }

src/views/homecomponents/EquipmentAnalysis/ConfirmedAlarm.vue

@@ -491,6 +491,7 @@ export default {
       }
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
       // this.$router.push({ path: '/MainPage/ApplicationManage',  query: {deptName: "2"}})
     },
@@ -504,6 +505,7 @@ export default {
      this.tableParams.endUpdateTime =  ''
      this.equipTypeData = [{ equipmentTypeId: '-1', equipmentName: '设备类型' }]
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },   
     correctClick (row) {

src/views/homecomponents/EquipmentAnalysis/ContinuityMonitorConfig.vue

@@ -67,12 +67,12 @@
           <Input v-model.trim="formOption.strategyName" maxlength="20" show-word-limit /> 
         </FormItem>
         <FormItem label="来源应用：" prop="appId" style="width:100%">
-          <Select v-model="formOption.appId" placeholder="来源应用" @on-change="selectModalApp">
+          <Select v-model="formOption.appId" placeholder="来源应用" @on-change="selectModalApp" :disabled="disabledApp">
              <Option v-for="item in appModalData" :value="item.id" :key="item.id">{{ item.appName }}</Option>
           </Select>
         </FormItem>
         <FormItem label="设备类型：" prop="equipmentTypeId" style="width:100%">
-          <Select v-model="formOption.equipmentTypeId" placeholder="设备类型">
+          <Select v-model="formOption.equipmentTypeId" placeholder="设备类型" @on-change="selectModalEquip" :disabled="disabledEquip">
              <Option v-for="item in equipTypeModalData" :value="item.equipmentTypeId" :key="item.equipmentTypeId">{{ item.equipmentName }}</Option>
           </Select>
         </FormItem>
@@ -98,7 +98,7 @@
                 <FormItem
                   :prop="'alertStrategyDurativeDTOList.'+index+'.targetId'" :rules="{required: true,type: 'number',message: '请选择监测指标',trigger: 'change'}">
                   <Select v-model="item.targetId" style="width: 100%" placeholder="监测指标" transfer @on-change="selectTarget(item.targetId,index)" ref="targetId">
-                    <Option v-for="firstitem in indicatorsModalData" :value="firstitem.id" :key="firstitem.id">{{ firstitem.value }}</Option>
+                    <Option v-for="firstitem in indicatorsModalData" :value="firstitem.id" :key="firstitem.id">{{ firstitem.targetName }}</Option>
                   </Select>
                 </FormItem>
               </Col>
@@ -138,7 +138,6 @@
             </Row>
           </div>
         </div>
-        
       </Form>
       <div slot="footer">
           <Button @click="modalCancel">取消</Button>
@@ -328,8 +327,11 @@ export default {
       appModalData: [],
       equipTypeModalData: [],
       equipAppModalData: [],
+      indicatorsModalData: [],
       exceptionRuleData: [],
       alarmLevelModalData: [],
+      disabledApp: false,
+      disabledEquip: false,
       // testColumns: [{title:'设备',slot:'strategyName',align: 'center'},{title:'线网',slot:'appName',align: 'center'},{title:'1号线',slot:'equipmentTypeName',align: 'center'}],
       // testTableData: [{alarmNum:1,alarmEquip: 2,name:'UPS'},{alarmNum:16767,alarmEquip: 67672,name:'UPS2'},{alarmNum:16767,alarmEquip: 67672,name:'UPS3'}],
       columns: [
@@ -500,13 +502,13 @@ export default {
         }
       })
       // 获取监测指标
-      this.$get('metroapi/dic/queryDictionary', {name:'监测指标'}).then(res=>{
-        if (res.httpCode == 1 ){
-          this.indicatorsModalData = res.data
-        } else {
-          this.indicatorsModalData = []
-        }
-      })
+      // this.$get('metroapi/dic/queryDictionary', {name:'监测指标'}).then(res=>{
+      //   if (res.httpCode == 1 ){
+      //     this.indicatorsModalData = res.data
+      //   } else {
+      //     this.indicatorsModalData = []
+      //   }
+      // })
       // 获取异常规则
       this.$get('metroapi/dic/queryDictionary', {name:'异常规则'}).then(res=>{
         if (res.httpCode == 1 ){
@@ -573,10 +575,31 @@ export default {
     selectModalApp (val) {
       this.appParams.applicationId = val
       this.formOption.equipmentTypeId = ''
+      this.formCustom.alertStrategyDurativeDTOList[0].targetId = ''
+      this.indicatorsModalData = []
       if (val) {
         this.getAddEquipType( this.appParams)
       }
     },
+    selectModalEquip (val) {
+      if (val) {
+        this.formCustom.alertStrategyDurativeDTOList[0].targetId = ''
+        let params = {
+          equipmentTypeId: val
+        }
+        this.getMonitorIndex(params)
+      }
+    },
+     // 获取监测指标
+    getMonitorIndex (params) {
+      this.$get('metroapi/target/queryTargetCountByEquTypeId', params).then(res=>{
+        if (res.httpCode == 1 ){
+          this.indicatorsModalData = res.data.data
+        } else {
+          this.equipTypeModalData = []
+        }
+      })
+    },
     // 获取新增设备类型 
     getAddEquipType (params) {
       this.$get('metroapi/application/equipmentTypeInfo', params).then(res=>{
@@ -588,13 +611,17 @@ export default {
       })
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
     },
     resetClick (name) {
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },   
     addClick () {
+      this.disabledApp = false
+      this.disabledEquip = false
       this.formOption = JSON.parse(JSON.stringify(defaultFrom))
       this.formCustom.alertStrategyDurativeDTOList= [
         {
@@ -616,6 +643,10 @@ export default {
       })
     },
     editClick (row) {
+      let params = {
+        equipmentTypeId: row.equipmentTypeId
+      }
+      this.getMonitorIndex(params)
       this.getstrategyData(row.id)
       this.rowObj = row
       this.formOption = JSON.parse(JSON.stringify(row));
@@ -631,6 +662,10 @@ export default {
         if ( res.httpCode == 1 ){
           this.detailLabel = [{name:'基础信息',arr:[{name:'策略名称',value:res.data.strategyName},{name:'设备类型',value:res.data.equipmentTypeName},{name:'来源应用',value:res.data.appName}]}]
           this.formCustom.alertStrategyDurativeDTOList = res.data.alertStrategyDurativeDTOList
+          if( this.formCustom.alertStrategyDurativeDTOList &&  this.formCustom.alertStrategyDurativeDTOList.length>1) {
+            this.disabledApp = true
+            this.disabledEquip = true
+          }
         } else {
           this.$Message.info(res.msg)
         }
@@ -649,6 +684,7 @@ export default {
       this.$refs.formOption.resetFields();
       this.$refs.formDynamic.resetFields();
       this.equipTypeModalData = []
+      this.indicatorsModalData = []
      }
     },
     modalOk () {
@@ -770,6 +806,10 @@ export default {
       this.$nextTick(()=> {
         this.$refs[name].validate((valid) => {
         if (valid) { 
+          if (this.formCustom.alertStrategyDurativeDTOList &&  this.formCustom.alertStrategyDurativeDTOList.length>=1) {
+            this.disabledApp = true
+            this.disabledEquip = true
+          }
           this.formCustom.alertStrategyDurativeDTOList.push({
             targetId: '',
             targetName: '',
@@ -792,6 +832,10 @@ export default {
         });
       } else {
         this.formCustom.alertStrategyDurativeDTOList.splice(i,1)
+         if(this.formCustom.alertStrategyDurativeDTOList &&  this.formCustom.alertStrategyDurativeDTOList.length==1) {
+            this.disabledApp = false
+            this.disabledEquip = false
+          }
       }
     },
     selectTarget (val,index) {
@@ -799,7 +843,7 @@ export default {
       let targetName = ''
       this.indicatorsModalData.forEach((item)=> {
         if (val == item.id) {
-         targetName = item.value
+         targetName = item.targetCode
         }
       })
       this.formCustom.alertStrategyDurativeDTOList[index].targetName = targetName

src/views/homecomponents/EquipmentAnalysis/FilteredAlarm.vue

@@ -467,6 +467,7 @@ export default {
       }
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
       // this.$router.push({ path: '/MainPage/ApplicationManage',  query: {deptName: "2"}})
     },
@@ -479,6 +480,7 @@ export default {
     this.tableParams.endUpdateTime =  ''
      this.equipTypeData = [{ equipmentTypeId: '-1', equipmentName: '设备类型' }]
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },   
     correctClick (row) {

src/views/homecomponents/EquipmentAnalysis/LevelDeterConfig.vue

@@ -84,12 +84,12 @@
       </div>
       <Form class="common-form" ref="formOption" :model="formOption" :rules="ruleValidate" :label-width="95" inline label-position="left">
         <FormItem label="来源应用：" prop="appId" style="width:48%">
-           <Select v-model="formOption.appId" placeholder="来源应用" @on-change="selectModalApp" label-in-value>
+           <Select v-model="formOption.appId" placeholder="来源应用" @on-change="selectModalApp" label-in-value :disabled="disabledApp">
              <Option v-for="item in appModalData" :value="item.id" :key="item.id">{{ item.appName }}</Option>
           </Select>
         </FormItem>
         <FormItem label="设备类型：" prop="equipmentTypeId" style="width:48%">
-          <Select v-model="formOption.equipmentTypeId" placeholder="设备类型" @on-change="selectModalEquip" label-in-value>
+          <Select v-model="formOption.equipmentTypeId" placeholder="设备类型" @on-change="selectModalEquip" label-in-value :disabled="disabledEquip">
              <Option v-for="item in equipTypeModalData" :value="item.equipmentTypeId" :key="item.equipmentTypeId">{{ item.equipmentName }}</Option>
           </Select>
         </FormItem>
@@ -110,8 +110,11 @@
                 <FormItem :prop="'alertStrategyRankDTOList.' + index + '.alertStrategyDetailList.' + i + '.targetId'" :rules="{ required: clickbtn==3 ? false: true, type: 'number',message: '请选择监测指标', trigger: 'change',}" style="display:flex">
                 <span class="sub-first-text">{{val.relationName}}</span>
                   <Select v-model="val.targetId" style="width: 75%" placeholder="监测指标" @on-change="selectTarget(val.targetId,index,i)" ref="targetId" transfer>
-                    <Option v-for="subItem in indicatorsModalData" :value="subItem.id" :key="subItem.id">{{ subItem.value }}</Option>
+                    <Option v-for="subItem in indicatorsModalData" :value="subItem.id" :key="subItem.id">{{ subItem.targetName }}</Option>
                   </Select>
+                   <!-- <Select v-model="val.targetId" style="width: 75%" placeholder="监测指标" @on-change="selectTarget(val.targetId,index,i)" ref="targetId" transfer>
+                    <Option v-for="subItem in indicatorsModalData" :value="subItem.id" :key="subItem.id">{{ subItem.value }}</Option>
+                  </Select> -->
                 </FormItem>
               </Col>
               <Col span="4">
@@ -499,6 +502,8 @@ export default {
           width: 120,
         }
       ],
+      disabledApp: false,
+      disabledEquip: false,
       showModal: false,
       detailStatus: false, 
       modalStatus: false,
@@ -604,13 +609,13 @@ export default {
           // this.appData = []
         }
       })
-      this.$get('metroapi/dic/queryDictionary', {name:'监测指标'}).then(res=>{
-        if (res.httpCode == 1 ){
-          this.indicatorsModalData = res.data
-        } else {
-          this.indicatorsModalData = []
-        }
-      })
+      // this.$get('metroapi/dic/queryDictionary', {name:'监测指标'}).then(res=>{
+      //   if (res.httpCode == 1 ){
+      //     this.indicatorsModalData = res.data
+      //   } else {
+      //     this.indicatorsModalData = []
+      //   }
+      // })
       this.$get('metroapi/dic/queryDictionary', {name:'逻辑运算符'}).then(res=>{
         if (res.httpCode == 1 ){
           this.operatorModalData = res.data
@@ -717,6 +722,9 @@ export default {
         this.formOption.equipmentTypeId = ''
         this.formOption.strategyName = val.label
         this.appModalName = val.label
+        this.clickbtn = 1
+        this.formCustom.alertStrategyRankDTOList[0].alertStrategyDetailList[0].targetId = ''
+        this.indicatorsModalData = []
         this.getAddEquipType( this.appParams)
       }
     },
@@ -724,8 +732,24 @@ export default {
       if (val) {
         this.formOption.equipmentTypeId = val.value
         this.formOption.strategyName = this.appModalName + '-'+ val.label
+        this.clickbtn = 1
+        this.formCustom.alertStrategyRankDTOList[0].alertStrategyDetailList[0].targetId = ''
+        let params = {
+          equipmentTypeId: val.value
+        }
+        this.getMonitorIndex(params)
       }
     },
+    // 获取监测指标
+    getMonitorIndex (params) {
+      this.$get('metroapi/target/queryTargetCountByEquTypeId', params).then(res=>{
+        if (res.httpCode == 1 ){
+          this.indicatorsModalData = res.data.data
+        } else {
+          this.equipTypeModalData = []
+        }
+      })
+    },
     // 获取新增设备类型 
     getAddEquipType (params) {
       this.$get('metroapi/application/equipmentTypeInfo', params).then(res=>{
@@ -737,6 +761,7 @@ export default {
       })
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
       // this.$router.push({ path: '/MainPage/ApplicationManage',  query: {deptName: "2"}})
     },
@@ -744,6 +769,7 @@ export default {
     //  this.tableParams.equipmentTypeId = ''
     //  this.equipTypeModalData = [{ id: '-1', stationName: '设备类型' }]
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },   
     getstrategyData (id) {
@@ -751,6 +777,15 @@ export default {
         if ( res.httpCode == 1 ){
           this.detailLabel = [{name:'基础信息',arr:[{name:'策略名称',value:res.data.strategyName},{name:'设备类型',value:res.data.equipmentTypeName},{name:'来源应用',value:res.data.appName}]}]
           this.formCustom.alertStrategyRankDTOList = res.data.alertStrategyRankDTOList
+          if (this.formCustom.alertStrategyRankDTOList && this.formCustom.alertStrategyRankDTOList.length>1) {
+            this.disabledApp = true
+            this.disabledEquip = true
+          } else if (this.formCustom.alertStrategyRankDTOList.length==1) {
+            if (this.formCustom.alertStrategyRankDTOList[0].alertStrategyDetailList.length>1) {
+              this.disabledApp = true
+              this.disabledEquip = true
+            }
+          }
         } else {
           this.$Message.info(res.msg)
         }
@@ -781,6 +816,8 @@ export default {
         subLogical: '',
         subLogicalName: ''
       }];
+      this.disabledApp = false
+      this.disabledEquip = false
       this.title = '新增策略'
       this.$nextTick(()=> {
         this.showModal = true
@@ -801,6 +838,10 @@ export default {
       // })
     },
     editClick (row) {
+      let params = {
+        equipmentTypeId: row.equipmentTypeId
+      }
+      this.getMonitorIndex(params)
       this.getstrategyData(row.id)
       this.clickbtn = 1
       this.rowObj = row
@@ -825,6 +866,7 @@ export default {
       this.$refs.formOption.resetFields();
       this.$refs.formDynamic.resetFields();
       this.equipTypeModalData = []
+      this.indicatorsModalData = []
       document.querySelector(".common-modal .common-scroll").scrollTo(0, 0); // 滚动条回到顶部
      } 
     },
@@ -940,6 +982,10 @@ export default {
       this.$nextTick(()=> {
         this.$refs[name].validate((valid) => {
         if (valid) { 
+          if (this.formCustom.alertStrategyRankDTOList.length>0) {
+            this.disabledApp = true
+            this.disabledEquip = true
+          }
           this.formCustom.alertStrategyRankDTOList.push({
                 rankId: '',
                 rankName: '',
@@ -1005,6 +1051,8 @@ export default {
       this.$nextTick(()=> {
         this.$refs[name].validate((valid) => {
             if (valid) {
+              this.disabledApp = true
+              this.disabledEquip = true
               this.formCustom.alertStrategyRankDTOList[
                 this.formCustom.alertStrategyRankDTOList.length - 1
               ].alertStrategyDetailList.push({
@@ -1031,6 +1079,16 @@ export default {
       this.clickbtn = 3
       this.$nextTick(()=> {
         this.formCustom.alertStrategyRankDTOList[index].alertStrategyDetailList.splice(i, 1) //因为删除选值的下拉框，没选值的下拉框的值会变成undefined 所以加个状态值（clickbtn=3）
+        // if (this.formCustom.alertStrategyRankDTOList.length==1) {
+        //   this.disabledApp = false
+        //   this.disabledEquip = false
+        // }
+        this.formCustom.alertStrategyRankDTOList.forEach((item,index)=> {
+          if (this.formCustom.alertStrategyRankDTOList.length==1 && item.alertStrategyDetailList && item.alertStrategyDetailList.length==1) {
+            this.disabledApp = false
+            this.disabledEquip = false
+          }
+        })
         // this.formCustom.alertStrategyRankDTOList[this.formCustom.alertStrategyRankDTOList.length - 1].alertStrategyDetailList.splice(i, 1) //因为删除选值的下拉框，没选值的下拉框的值会变成undefined 所以加个状态值（clickbtn=3）
       })
     },
@@ -1046,7 +1104,7 @@ export default {
       let targetName = ''
       this.indicatorsModalData.forEach((item)=> {
         if (val == item.id) {
-          targetName = item.value
+          targetName = item.targetCode
         }
       })
       this.formCustom.alertStrategyRankDTOList[index].alertStrategyDetailList[i].targetName = targetName

src/views/homecomponents/EquipmentAnalysis/PolicyConfigManage.vue

@@ -186,18 +186,22 @@ export default {
         })
       } else if(currentTabs == '等级判定策略配置'){       
         this.$nextTick(()=> {
+          this.$refs.levelDeter.tableParams.pageNum = 1
           this.$refs.levelDeter.getTableData(currentStation,arr,level)
         })
       } else if(currentTabs == '告警过滤策略配置'){
         this.$nextTick(()=> {
+          this.$refs.alarmFilter.tableParams.pageNum = 1
           this.$refs.alarmFilter.getTableData(currentStation,arr,level)
         })
       } else if(currentTabs == '告警自动确认策略'){
         this.$nextTick(()=> {
+          this.$refs.alarmAcknowledg.tableParams.pageNum = 1
           this.$refs.alarmAcknowledg.getTableData(currentStation,arr,level)
         })
       } else if(currentTabs == '连续性监测策略'){
         this.$nextTick(()=> {
+          this.$refs.continuityMonitor.tableParams.pageNum = 1
           this.$refs.continuityMonitor.getTableData(currentStation,arr,level)
         })
       }

src/views/homecomponents/EquipmentAnalysis/ToConfirmedAlarm.vue

@@ -504,6 +504,7 @@ export default {
       }
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
       // this.$router.push({ path: '/MainPage/ApplicationManage',  query: {deptName: "2"}})
     },
@@ -513,6 +514,7 @@ export default {
      this.tableParams.endAlertTime = ''
      this.equipTypeData = [{ equipmentTypeId: '-1', equipmentName: '设备类型' }]
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },
     correctClick (row) {

src/views/homecomponents/EquipmentAnalysis/UnableDeterAlarm.vue

@@ -153,7 +153,7 @@
 </template>
 <script>
 import utils from "@/libs/utils"
-const defaultFrom = {alertRankId: ''}
+const defaultFrom = {alertRankId: '',processingStatus:38}
 export default {
   name: "UnableDeterAlarm",
   components:{
@@ -280,7 +280,7 @@ export default {
       ],
       showModal: false,
       title: '告警信息修正',
-      formOption: {alertRankId: ''},
+      formOption: {alertRankId: '',processingStatus:38},
       ruleValidate: {
         alertRankId: [{
           required: true,
@@ -462,6 +462,7 @@ export default {
       }
     },
     searchClick () {
+      this.tableParams.pageNum = 1
       this.getTableData()
       // this.$router.push({ path: '/MainPage/ApplicationManage',  query: {deptName: "2"}})
     },
@@ -471,6 +472,7 @@ export default {
      this.tableParams.endAlertTime = ''
      this.equipTypeData = [{ equipmentTypeId: '-1', equipmentName: '设备类型' }]
      this.$refs[name].resetFields()
+     this.tableParams.pageNum = 1
      this.getTableData()
     },   
     detailClick (row) {
@@ -529,7 +531,8 @@ export default {
             alertIds: this.alertIds,
             alertRankId: this.formOption.alertRankId,
             operationContent: '修正',
-            userId: utils.storage('sw_user').userId
+            userId: utils.storage('sw_user').userId,
+            processingStatus: 38
           }
           this.changeStateData(params)
           } else {

vue.config.js

@@ -7,7 +7,7 @@ module.exports = {
       open: false,//配置自动启动浏览器 
       proxy: { // 设置代理
       '/metroapi': {
-        target: 'http://192.168.20.58:8088',// http://192.168.20.58:8086 http://192.168.20.188:8088
+        target: 'http://192.168.20.188:8088',// http://192.168.20.58:8086 http://192.168.20.188:8088
         changeOrigin: true, //允许跨域
         pathRewrite: {
             '^/metroapi': ''