Merge branch 'lifeline_develop_siping_v3' of http://192.168.10.18:3000/sooka_onest/visu_lifeline into lifeline_develop_siping_v3

src/api/sentinel.js

@@ -3,7 +3,7 @@ import request from '@/utils/request'
 // 查询监测设备列表(所有)
 export function brandPageList(params) {
   return request({
-    url: `/sooka-digital-construction/deviceInfo/brandPageList?brand=${params.brand}&pageNum=${params.pageNum}&deviceName=${params.deviceName}&pageSize=${params.pageSize}`,
+    url: `/sooka-digital-construction/deviceInfo/brandPageList?installationMethod=${params.installationMethod}&pageNum=${params.pageNum}&deviceName=${params.deviceName}&pageSize=${params.pageSize}`,
     method: 'get'
   })
 }

src/views/SenEquipmentCenter.vue

@@ -17,7 +17,7 @@
 		<!--主体-->
 		<div class="con_right">
 			<div class="list_tit">设备列表</div>
-			<el-select v-model="listParams.brand" placeholder="请选择品牌" @change="brandHasChanged" clearable
+			<el-select v-model="listParams.installationMethod" placeholder="请选择品牌" @change="brandHasChanged" clearable
 				style="width:100%;margin-bottom: 10px;">
 				<el-option v-for="dict in dict.type.sentinel_installation_method" :key="dict.value" :label="dict.label"
 					:value="dict.value">
@@ -110,7 +110,7 @@
 				deviceListSearch: [], // 设备列表检索
 				deviceTotal: 0,
 				listParams: {
-					brand: '',
+          installationMethod: '',
 					deviceName: '',
 					pageNum: 1,
 					pageSize: 10,
@@ -372,7 +372,7 @@
 			},
 			// 查询设备列表
 			getListDeviceAll() {
-        if(this.listParams.brand == '4'){
+        if(this.listParams.installationMethod == '4'){
           selectFmList(this.listParams).then(res => {
             this.deviceList = res.rows
             this.deviceListSearch = res.rows

src/views/industry/ThermalPower.vue

@@ -591,6 +591,18 @@
               <template #append></template>
             </el-input>
           </div>
+          <!-- 设备管理筛查项 -->
+          <div v-else-if="type=='哨兵设备'" class="dd">
+            <el-input v-model="searchCode" placeholder="设备名称" clearable class="input-width">
+              <template #append></template>
+            </el-input>
+          </div>
+          <!-- 设备管理筛查项 -->
+          <div v-else-if="type=='智慧阀门'" class="dd">
+            <el-input v-model="searchCode" placeholder="设备名称" clearable class="input-width">
+              <template #append></template>
+            </el-input>
+          </div>
           <!-- 阈值管理筛查项 -->
           <div v-else-if="type=='阈值管理'">
             <el-input v-model="searchCode" placeholder="设备编码" clearable class="input-width">
@@ -937,11 +949,12 @@ import supermap from '@/components/supermap-2.5d'
 import {getUserProfile} from "@/api/system/user";
 import {queryVectorTilesMapList} from "@/api/components/supermap";
 import Cookies from "js-cookie";
+import {brandPageList, selectFmList} from "@/api/sentinel";
 let echarts = require('echarts')
 export default {
   dicts: ['gas_pipeline_category','pressure_level','construction_tasks_status','lifeline_industry',
     'sys_notice_status','sys_notice_type','sys_normal_disable','sys_user_sex','lifeline_enterprise',
-    'task_issuing_dept','heating_device_type','material_type'],
+    'task_issuing_dept','heating_device_type','material_type','sentinel_installation_method','sentinel_device_type','sentinel_device_brand'],
   components:{
     supermap,
     DetailDialog,
@@ -983,6 +996,8 @@ export default {
         name:'监测系统',
         posts: [
           { title: '设备管理' },
+          { title: '哨兵设备' },
+          { title: '智慧阀门' },
         ]
       },{
         name:'监管平台',
@@ -1070,7 +1085,7 @@ export default {
       hasPositionLabels: [
         '管线管理', '窨井管理','场站管理','企业管理',
         '城市体检','维护监管', '基础事件', '设备预警', '催办事件', '督办事件',
-        '物资管理', '设备管理',
+        '物资管理', '设备管理','哨兵设备','智慧阀门'
       ],
       eventDialogVisible:false,
       eventInfo: {},
@@ -1994,6 +2009,64 @@ export default {
           }
         })
       }
+      else if(type=='哨兵设备'){
+        this.tableListVisible = true
+        brandPageList({
+            installationMethod: '',
+            deviceName: this.searchCode ? this.searchCode:'',
+            pageNum: pageNum || 1,
+            pageSize: 10,
+        }).then(res => {
+          this.tablePropAndLabel = [
+            {prop: 'id', label: '主键ID', hidden: true},
+            {prop: 'deviceName', label: '设备名称', },
+            {prop: 'deviceType',label: '设备类型',isDict: true,dictKey: 'sentinel_device_type'},
+            {prop: 'brand', label: '设备企业', isDict: true,dictKey: 'sentinel_device_brand'},
+            {prop: 'longitude', label: '安装经度', hidden: true},
+            {prop: 'latitude', label: '安装纬度', hidden: true},
+            {prop: 'address', label: '设备安装位置', hidden: true},
+            {prop: 'installationMethod', label: '安装方式',hidden: true,isDict: true,dictKey: 'sentinel_installation_method'},
+          ]
+          this.tableList = res.rows
+          this.total = res.total
+          this.latKey = 'latitude'
+          this.lonKey = 'longitude'
+          // 地图绑定落点
+          this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
+          if (res.rows) {
+            this.dataText = "暂无数据"
+          }
+        })
+      }
+      else if(type=='智慧阀门'){
+        this.tableListVisible = true
+        selectFmList({
+          pageNum: pageNum || 1,
+          pageSize: 10,
+          deviceName: this.searchCode ? this.searchCode:'',
+        }).then(res => {
+          this.tablePropAndLabel = [
+            {prop: 'id', label: '主键ID', hidden: true},
+            {prop: 'deviceModel', label: '设备型号', },
+            {prop: 'deviceName', label: '设备名称', },
+            {prop: 'valveNumber', label: '阀门编号', hidden: true},
+            {prop: 'installationLocation', label: '安装位置' },
+            {prop: 'longitude', label: '安装经度', hidden: true},
+            {prop: 'latitude', label: '安装纬度', hidden: true},
+            {prop: 'simCardNumber', label: 'SIM卡号', hidden: true},
+            {prop: 'valveOpening', label: '阀门开启数值', hidden: true},
+          ]
+          this.tableList = res.rows
+          this.total = res.total
+          this.latKey = 'latitude'
+          this.lonKey = 'longitude'
+          // 地图绑定落点
+          this.setMakersHandler(type, 'longitude', 'latitude', res.rows)
+          if (res.rows) {
+            this.dataText = "暂无数据"
+          }
+        })
+      }
         /****************************************************************设备管理end*******************************************************/
       /****************************************************************监管平台start*******************************************************/
       else if(type == '城市体检'){
@@ -3075,6 +3148,8 @@ export default {
             markersMap.icon = "yinjing";
             break;
           case "设备管理":
+          case "哨兵设备":
+          case "智慧阀门":
             markersMap.icon = "shebei";
             break;
           case "维修管理":
@@ -3341,6 +3416,33 @@ export default {
         this.$refs.detailDialog.openDetail(type,obj);
         return;
       }
+      else if (type == "哨兵设备") {
+        let obj = {
+          '设备名称': row.deviceName,
+          '设备类型': this.dict.type.sentinel_device_type.find(item => item.value == row.deviceType)?.label,
+          '设备企业': this.dict.type.sentinel_device_brand.find(item => item.value == row.brand)?.label,
+          '安装经度': row.longitude,
+          '安装纬度': row.latitude,
+          '设备安装位置': row.address,
+          '安装方式': this.dict.type.sentinel_installation_method.find(item => item.value == row.installationMethod)?.label,
+      };
+        this.$refs.detailDialog.openDetail(type,obj);
+        return;
+      }
+      else if (type == "智慧阀门") {
+        let obj = {
+          '设备型号': row.deviceModel,
+          '设备名称': row.deviceName,
+          '阀门编号': row.valveNumber,
+          '安装位置': row.installationLocation,
+          '安装经度': row.longitude,
+          '安装纬度': row.latitude,
+          'SIM卡号': row.simCardNumber,
+          '阀门开启数值': row.valveOpening,
+        };
+        this.$refs.detailDialog.openDetail(type,obj);
+        return;
+      }
         /****************************************************************设备管理end*******************************************************/
       /****************************************************************监管平台start*******************************************************/
       else if(type == '城市体检'){