统计处理

src/api/business/OM/eventCenter/index.js

@@ -188,4 +188,4 @@ export function collectEventManage(data) {
         method: 'get',
         params: data
     })
-}
+}

src/views/business/OM/eventCenter/alarm/index.vue

@@ -262,7 +262,6 @@ export default {
   },
   created() {
     this.getList(); //初始化table
-    this.getCollect(); //初始化table
     // this.company();//初始化单位选项
     // this.facilityType();//初始化类别选项
   },
@@ -308,15 +307,17 @@ export default {
         data.endTime = data.params.endTime;
         data.startTime = data.params.beginTime;
       }
+      data.params = undefined
       getTbAlarm(data).then((response) => {
         this.adminList = response.data.records;
         this.total = response.data.total;
         this.loading = false;
       });
+      this.getCollect(data); //初始化table
     },
     /** 综合列表列表 */
-    getCollect() {
-      collectTbAlarm({ type: 2 }).then((response) => {
+    getCollect(data) {
+      collectTbAlarm(data).then((response) => {
         this.collectList = response.data;
         setTimeout(() => {
           this.loading2 = false;

src/views/business/OM/eventCenter/event/index.vue

@@ -302,7 +302,6 @@ export default {
   },
   created() {
     this.getList(); //初始化table
-    this.getCollect(); //初始化table
     // this.company();//初始化单位选项
     // this.facilityType();//初始化类别选项
   },
@@ -347,15 +346,17 @@ export default {
         data.endTime = data.params.endTime;
         data.startTime = data.params.beginTime;
       }
+      data.params = undefined
       getEventManage(data).then((response) => {
         this.adminList = response.data.records;
         this.total = response.data.total;
         this.loading = false;
       });
+      this.getCollect(data);
     },
     /** 综合列表列表 */
-    getCollect() {
-      collectEventManage().then((response) => {
+    getCollect(data) {
+      collectEventManage(data).then((response) => {
         this.collectList = response.data;
         setTimeout(() => {
           this.loading2 = false;

src/views/business/OM/eventCenter/hiddenDanger/index.vue

@@ -196,7 +196,6 @@ export default {
   },
   created() {
     this.getList();//初始化table
-    this.getCollect();//初始化table
   },
   methods: {
     //强制el-input刷新
@@ -240,15 +239,17 @@ export default {
         data.endTime = data.params.endTime
         data.startTime = data.params.beginTime
       }
+      data.params = undefined
       getTbAlarm(data).then(response => {
         this.adminList = response.data.records;
         this.total = response.data.total;
         this.loading = false;
       });
+      this.getCollect(data)
     },
     /** 综合列表列表 */
-    getCollect(){
-      collectTbAlarm({type:1}).then(response => {
+    getCollect(data){
+      collectTbAlarm(data).then(response => {
         this.collectList = response.data
         setTimeout(() => {
           this.loading2 = false

src/views/business/OM/workMange/index.vue

@@ -382,7 +382,6 @@ export default {
   },
   created() {
     this.init()//初始化
-    this.collectWorkOrder()
     if(JSON.stringify(this.$route.query) !="{}"){ //跳转至工单查询
       this.formData = this.$route.query
       this.workOrderOne(this.$route.query.id,this.$route.query.type)
@@ -442,11 +441,13 @@ export default {
         data.endTime = data.params.endTime
         data.startTime = data.params.beginTime
       }
+      data.params = undefined
       getWorkOrder(data).then(response => {
         this.adminList = response.data.records;
         this.total = response.data.total;
         this.loading = false;
       });
+      this.collectWorkOrder(data)
       this.getDevopsTeam()
     },
     /** 工单详情查询 */
@@ -623,8 +624,8 @@ export default {
       });
     },
     /** 综合列表列表 */
-    collectWorkOrder(){
-      collectWorkOrder({}).then(response => {
+    collectWorkOrder(data){
+      collectWorkOrder(data).then(response => {
         this.collectList = response.data
         setTimeout(() => {
           this.loading2 = false

src/views/business/deviceMange/deviceApi/index.vue

@@ -46,7 +46,7 @@
       <el-table-column label="接口参数" align="left" prop="interfaceParameter"  show-overflow-tooltip />
       <el-table-column label="接口传输方式" align="left" prop="interfaceTransmissionMode"  show-overflow-tooltip >
         <template slot-scope="scope">
-          <span>{{scope.row.interfaceTransmissionMode=="1"?"NB-IOT" : scope.row.interfaceTransmissionMode=="2"?"Lord-IOT" : "2G/4G/5G" }}</span>
+          <span>{{scope.row.interfaceTransmissionMode=="1"?"http" : scope.row.interfaceTransmissionMode=="2"?"mqtt" :""}}</span>
         </template>
       </el-table-column>
       <el-table-column label="接口说明" align="left" prop="interfaceExplain"  show-overflow-tooltip />
@@ -94,14 +94,14 @@
           </el-col>
           <el-col :span="12" >
             <el-form-item label="接口路径" prop="interfaceRoute">
-              <el-input v-model.trim="form.interfaceRoute" placeholder="请填写接口路径" @input="onInput()" maxlength="15" show-word-limit/>
+              <el-input v-model.trim="form.interfaceRoute" placeholder="请填写接口路径" @input="onInput()"  show-word-limit  type="textarea"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="接口参数" prop="interfaceParameter">
-              <el-input v-model.trim="form.interfaceParameter" placeholder="请填写接口参数" @input="onInput()" maxlength="15" show-word-limit/>
+              <el-input v-model.trim="form.interfaceParameter" placeholder="请填写接口参数" @input="onInput()" show-word-limit type="textarea"/>
             </el-form-item>
           </el-col>
           <el-col :span="12" >
@@ -120,7 +120,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="所属厂家" prop="business">
-              <el-input v-model.trim="form.business" placeholder="请填写所属建筑" @input="onInput()" maxlength="15" show-word-limit/>
+              <el-input v-model.trim="form.business" placeholder="请填写所属厂家" @input="onInput()" maxlength="15" show-word-limit/>
             </el-form-item>
           </el-col>
           <el-col :span="12" >
@@ -245,9 +245,8 @@ export default {
       selectCity: {},
       selectArea: {},
       transferTypeList:[
-        {id:'1',name:"NB-IOT",},
-        {id:'2',name:"Lord-IOT",},
-        {id:'3',name:"2G/4G/5G",},
+        {id:'1',name:"http",},
+        {id:'2',name:"mqtt",},
       ],
       dwtypeList:[
         {id:1,name:"火系统",},

src/views/business/deviceMange/deviceList/index.vue

@@ -111,7 +111,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="安装楼层" prop="louyu">
-              <el-select v-model="form.louyu"   placeholder="请选择所属建筑建筑">
+              <el-select v-model="form.louyu"   placeholder="请选择安装楼层">
                 <el-option
                   v-for="item in floorList"
                   :key="item.id"

src/views/business/deviceMange/devicePassageWay/index.vue

@@ -12,7 +12,7 @@
         />
       </el-form-item>
       <el-form-item label="设备类型:" prop="dwtype">
-        <el-select v-model="queryParams.dwtype"  size="small" style="width: 160px"  placeholder="请选择传输方式">
+        <el-select v-model="queryParams.dwtype"  size="small" style="width: 160px"  placeholder="请选择设备类型">
           <el-option
             v-for="item in dwtypeList"
             :key="item.id"
@@ -44,24 +44,44 @@
       <el-table-column label="通道名称" align="left" prop="passagewayName"  show-overflow-tooltip />
       <el-table-column label="设备类型" align="left" prop="dwtype"  show-overflow-tooltip >
         <template slot-scope="scope">
-          <span>{{ scope.row.dwtype=="1" ? "用户传输装置": scope.row.dwtype=="2"?"喷淋水压" : scope.row.dwtype=="3" ? "独立烟感" :
-            scope.row.dwtype=="4" ? "消火栓压力":   scope.row.dwtype=="7" ? "电器火灾监控":  scope.row.dwtype=="5" ?
-            "消防水箱液位" : scope.row.dwtype=="6" ? "RTU": scope.row.dwtype=="16" ? "消防视频监控": ""}}</span>
+          <span>{{ scope.row.dwtype=="1" ? "用户信息传输装置": scope.row.dwtype=="2"?"喷淋水压" :
+            scope.row.dwtype=="4" ? "消火栓压力监测设备":    scope.row.dwtype=="5" ?
+            "消防水箱液位监测设备" : scope.row.dwtype=="6" ? "RTU设备": scope.row.dwtype=="16" ? "消防视频监控": ""}}</span>
         </template>
       </el-table-column>
       <el-table-column label="通道类型" align="left" prop="passagewayType"  show-overflow-tooltip >
         <template slot-scope="scope">
           <span>
-            {{scope.row.dwtype=="1" && scope.row.passagewayType=="1" ?"待定义" :
+            {{
+            scope.row.dwtype=="1" && scope.row.passagewayType=="1" ?"设备状态" :
 
-            scope.row.dwtype=="2" && scope.row.passagewayType=="1" ?"设备状态" : scope.row.dwtype=="2" && scope.row.passagewayType=="2" ?"剩余电量"
-            : scope.row.dwtype=="2" && scope.row.passagewayType=="3" ?"无线信号" : scope.row.dwtype=="2" && scope.row.passagewayType=="4" ?"压力值" :
+            scope.row.dwtype=="2" && scope.row.passagewayType=="1" ?"电量" :
+            scope.row.dwtype=="2" && scope.row.passagewayType=="2" ?"信号" :
+            scope.row.dwtype=="2" && scope.row.passagewayType=="3" ?"水位/水压" :
+            scope.row.dwtype=="2" && scope.row.passagewayType=="4" ?"状态" :
 
-            scope.row.dwtype=="5" && scope.row.passagewayType=="1" ?"状态状态" : scope.row.dwtype=="5" && scope.row.passagewayType=="2" ?"剩余电量" :
-            scope.row.dwtype=="5" && scope.row.passagewayType=="3" ?"无线信号" : scope.row.dwtype=="5" && scope.row.passagewayType=="4" ?"液位值" :
+            scope.row.dwtype=="4" && scope.row.passagewayType=="1" ?"电量" :
+            scope.row.dwtype=="4" && scope.row.passagewayType=="2" ?"信号" :
+            scope.row.dwtype=="4" && scope.row.passagewayType=="3" ?"状态" :
+            scope.row.dwtype=="4" && scope.row.passagewayType=="4" ?"水压" :
+
+            scope.row.dwtype=="5" && scope.row.passagewayType=="1" ?"电量" :
+            scope.row.dwtype=="5" && scope.row.passagewayType=="2" ?"信号" :
+            scope.row.dwtype=="5" && scope.row.passagewayType=="3" ?"状态" :
+            scope.row.dwtype=="5" && scope.row.passagewayType=="4" ?"水位" :
+
+
+            scope.row.dwtype=="6" && scope.row.passagewayType=="1" ?"电源状态" :
+            scope.row.dwtype=="6" && scope.row.passagewayType=="2" ?"运行状态" :
+            scope.row.dwtype=="6" && scope.row.passagewayType=="3" ?"手自动状态" :
+            scope.row.dwtype=="6" && scope.row.passagewayType=="4" ?"故障" :
+            scope.row.dwtype=="6" && scope.row.passagewayType=="5" ?"水浸" :
+            scope.row.dwtype=="6" && scope.row.passagewayType=="6" ?"消防联动" :
+            scope.row.dwtype=="6" && scope.row.passagewayType=="7" ?"水压" :
+            scope.row.dwtype=="6" && scope.row.passagewayType=="8" ?"温度" :
+            scope.row.dwtype=="6" && scope.row.passagewayType=="9" ?"湿度" :
+            scope.row.dwtype=="6" && scope.row.passagewayType=="10" ?"液位" : ""
 
-            scope.row.dwtype=="6" && scope.row.passagewayType=="1" ?"1~16待定" : scope.row.dwtype=="6" && scope.row.passagewayType=="2" ?"65~72待定" :
-            scope.row.dwtype=="16" && scope.row.passagewayType=="1" ?"占到检测告警" : scope.row.dwtype=="16" && scope.row.passagewayType=="2" ?"火点检测告警" : ""
 
             }}</span>
         </template>
@@ -113,23 +133,34 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="通道类型" prop="passagewayType">
-              <el-select v-model="form.passagewayType"  placeholder="请选择系统类型" @change="selectPassagewayType">
-                  <el-option v-if="form.dwtype == 1"  value="1" label="待定" />
-                  <el-option v-if="form.dwtype == 2"  value="1" label="设备状态" />
-                  <el-option v-if="form.dwtype == 2"  value="2" label="剩余电量" />
-                  <el-option v-if="form.dwtype == 2"  value="3" label="无线信号" />
-                  <el-option v-if="form.dwtype == 2"  value="4" label="压力值" />
+              <el-select v-model="form.passagewayType"  placeholder="请选择通道类型" @change="selectPassagewayType">
+                  <el-option v-if="form.dwtype == 1"  value="1" label="设备状态" />
+
+                  <el-option v-if="form.dwtype == 2"  value="1" label="电量" />
+                  <el-option v-if="form.dwtype == 2"  value="2" label="信号" />
+                  <el-option v-if="form.dwtype == 2"  value="3" label="水位/水压" />
+                  <el-option v-if="form.dwtype == 2"  value="4" label="状态" />
 
-                  <el-option v-if="form.dwtype == 5"  value="1" label="设备状态" />
-                  <el-option v-if="form.dwtype == 5"  value="2" label="剩余电量" />
-                  <el-option v-if="form.dwtype == 5"  value="3" label="无线信号" />
-                  <el-option v-if="form.dwtype == 5"  value="4" label="液位值" />
+                  <el-option v-if="form.dwtype == 4"  value="1" label="电量" />
+                  <el-option v-if="form.dwtype == 4"  value="2" label="信号" />
+                  <el-option v-if="form.dwtype == 4"  value="3" label="状态" />
+                  <el-option v-if="form.dwtype == 4"  value="4" label="水压" />
 
-                  <el-option v-if="form.dwtype == 6"  value="1" label="1~16待定" />
-                  <el-option v-if="form.dwtype == 6"  value="2" label="65~72待定" />
+                  <el-option v-if="form.dwtype == 5"  value="1" label="电量" />
+                  <el-option v-if="form.dwtype == 5"  value="2" label="信号" />
+                  <el-option v-if="form.dwtype == 5"  value="3" label="状态" />
+                  <el-option v-if="form.dwtype == 5"  value="4" label="水位" />
 
-                  <el-option v-if="form.dwtype == 16"  value="1" label="占到检测告警" />
-                  <el-option v-if="form.dwtype == 16"  value="2" label="火点检测告警" />
+                  <el-option v-if="form.dwtype == 6"  value="1" label="电源状态" />
+                  <el-option v-if="form.dwtype == 6"  value="2" label="运行状态" />
+                  <el-option v-if="form.dwtype == 6"  value="3" label="手自动状态" />
+                  <el-option v-if="form.dwtype == 6"  value="4" label="故障" />
+                  <el-option v-if="form.dwtype == 6"  value="5" label="水浸" />
+                  <el-option v-if="form.dwtype == 6"  value="6" label="消防联动" />
+                  <el-option v-if="form.dwtype == 6"  value="7" label="水压" />
+                  <el-option v-if="form.dwtype == 6"  value="8" label="温度" />
+                  <el-option v-if="form.dwtype == 6"  value="9" label="湿度" />
+                  <el-option v-if="form.dwtype == 6"  value="10" label="液位" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -224,25 +255,6 @@ export default {
       selectProvince: {},
       selectCity: {},
       selectArea: {},
-      transferTypeList:[
-        {id:1,name:"NB-IOT",},
-        {id:2,name:"Lord-IOT",},
-        {id:3,name:"2G/4G/5G",},
-      ],
-      // dwtypeList:[
-      //   {id:1,name:"火系统",},
-      //   {id:2,name:"水系统",},
-      //   {id:3,name:"烟感系统",},
-      //   {id:4,name:"消防栓",},
-      //   {id:5,name:"液位",},
-      //   {id:6,name:"rtu",},
-      //   {id:7,name:"电气火灾",},
-      //   {id:8,name:"防火门",},
-      //   {id:9,name:"气体灭火",},
-      //   {id:10,name:"人脸识别",},
-      //   {id:16,name:"视频监控",},
-      //   {id:128,name:"井盖",},
-      // ],
       dwtypeList:[],
       companyList:[],
       passagewayTypeList:undefined,

src/views/business/deviceMange/deviceType/index.vue

@@ -45,7 +45,7 @@
       <el-table-column label="类型参数" align="left" prop="typeValue"  show-overflow-tooltip />
       <el-table-column label="传输方式" align="left" prop="transmissionModel"  show-overflow-tooltip >
         <template slot-scope="scope">
-          <span >{{scope.row.transmissionModel == 1 ? "NB-IOT" : scope.row.transmissionModel == 2 ? "Lord-IOT" : scope.row.transmissionModel == 3 ? "2G/4G/5G" :""}}</span>
+          <span >{{scope.row.transmissionModel == 1 ? "NB-IOT" : scope.row.transmissionModel == 2 ? "NB-IOT/4G" : scope.row.transmissionModel == 3 ? "2G/4G/5G" :""}}</span>
         </template>
       </el-table-column>
       <el-table-column label="厂家名称" align="left" prop="business"  show-overflow-tooltip />
@@ -189,7 +189,7 @@ export default {
       },
       transmissionModelyList:[
         {id:1,name:"NB-IOT",},
-        {id:2,name:"Lord-IOT",},
+        {id:2,name:"NB-IOT/4G",},
         {id:3,name:"2G/4G/5G",},
       ]
     };

src/views/index.vue

@@ -50,7 +50,7 @@
                         >
                             <div class="map" style="height: calc(48vh - 35px)">
                                 <!-- <iframe id="myIframe" style="width:100%;height:100%;border:none;" src='https://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9'></iframe> -->
-                                <!-- <iframe
+                                <iframe
                                     id="myIframe"
                                     style="
                                         width: 100%;
@@ -58,7 +58,7 @@
                                         border: none;
                                     "
                                     src="https://www.thingjs.com/s/b11227d4fd5505106989737c?params=105b0f77fd24654d4eebc434e9"
-                                ></iframe> -->
+                                ></iframe>
                             </div>
                         </el-card>
                         <el-card class="box-card card_center2 mg10">