Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

.env.development

@@ -26,5 +26,5 @@ VITE_GLOB_API_URL_PREFIX=
 
 #微前端qiankun应用,命名必须以VITE_APP_SUB_开头,jeecg-app-1为子应用的项目名称,也是子应用的路由父路径
 #VITE_APP_SUB_APP = [["micro-need-air", "//182.92.126.35:8099/"], ["micro-vent-3dModal", "//localhost:8091/"], ["micro-fire-front", "//localhost:8090/"]]
-# VITE_APP_SUB_APP = [["micro-vent-3dModal", "//182.92.126.35:8091/"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]
-VITE_APP_SUB_APP = [["micro-vent-3dModal", "localhost"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]
+VITE_APP_SUB_APP = [["micro-vent-3dModal", "//localhost:8091/"], ["micro-need-air", "//localhost:8099/"], ["micro-fire-front", "//localhost:8090/"]]
+

src/hooks/system/useListPage.ts

@@ -62,27 +62,31 @@ export function useListPage(options: ListPageOptions) {
   const [, { getForm, reload, setLoading }, { selectedRowKeys }] = tableContext;
 
   // 导出 excel
-  async function onExportXls() {
+  async function onExportXls(selectForm?) {
     //update-begin---author:wangshuai ---date:20220411  for：导出新增自定义参数------------
     const { url, name, params } = options?.exportConfig ?? {};
     const realUrl = typeof url === 'function' ? url() : url;
     if (realUrl) {
       const title = typeof name === 'function' ? name() : name;
       //update-begin-author:taoyan date:20220507 for: erp代码生成 子表 导出报错，原因未知-
-      let paramsForm:any = {};
+      let paramsForm: any = {};
       try {
-        paramsForm = await getForm().validate();
+        if (selectForm) {
+          paramsForm = selectForm;
+        } else {
+          paramsForm = await getForm().validate();
+        }
       } catch (e) {
         console.error(e);
       }
       //update-end-author:taoyan date:20220507 for: erp代码生成 子表 导出报错，原因未知-
-      
+
       //update-begin-author:liusq date:20230410 for:[/issues/409]导出功能没有按排序结果导出,设置导出默认排序，创建时间倒序
-      if(!paramsForm?.column){
-         Object.assign(paramsForm,{column:'createTime',order:'desc'});
+      if (!paramsForm?.column) {
+        Object.assign(paramsForm, { column: 'createTime', order: 'desc' });
       }
       //update-begin-author:liusq date:20230410 for: [/issues/409]导出功能没有按排序结果导出,设置导出默认排序，创建时间倒序
-      
+
       //如果参数不为空，则整合到一起
       //update-begin-author:taoyan date:20220507 for: erp代码生成 子表 导出动态设置mainId
       if (params) {
@@ -97,7 +101,7 @@ export function useListPage(options: ListPageOptions) {
       if (selectedRowKeys.value && selectedRowKeys.value.length > 0) {
         paramsForm['selections'] = selectedRowKeys.value.join(',');
       }
-      console.log()
+      console.log();
       return handleExportXls(title as string, realUrl, filterObj(paramsForm));
       //update-end---author:wangshuai ---date:20220411  for：导出新增自定义参数--------------
     } else {

src/views/vent/deviceManager/comment/NormalTable.vue

@@ -3,7 +3,7 @@
     <BasicTable @register="registerTable" :rowSelection="rowSelection">
       <template #tableTitle>
         <a-button preIcon="ant-design:plus-outlined" type="primary" @click="handleAdd">新增</a-button>
-        <a-button v-if="getExportUrl" type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+        <a-button v-if="getExportUrl" type="primary" preIcon="ant-design:export-outlined" @click="onExportXlsFn"> 导出</a-button>
         <j-upload-button v-if="getImportUrl" type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
         <a-dropdown v-if="selectedRowKeys.length > 0" :getPopupContainer="getPopupContainer">
           <template #overlay>
@@ -166,8 +166,18 @@ const { prefixCls, tableContext, onExportXls, onImportXls, doRequest } = useList
   },
 });
 
+const onExportXlsFn = () => {
+  const formData = getForm().getFieldsValue()
+  if(props.designScope == 'table-search-reset' && formData['devicetype']){
+    // 针对接口模糊查询的
+    onExportXls({...formData, devicetype: formData['devicetype']+'*'})
+  }else{
+    onExportXls()
+  }
+}
+
 //注册table数据
-const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+const [registerTable, { reload, getForm }, { rowSelection, selectedRowKeys }] = tableContext;
 
 const saveOrUpdateHandler = async (params) => {
   try {

src/views/vent/deviceManager/pointTabel/index.vue

@@ -10,7 +10,7 @@
       :deleteById="deleteById"
       :batchDelete="batchDeleteById"
       :saveOrUpdate="saveOrUpdate"
-      designScope="point-tabel"
+      designScope="table-search-reset"
       title="点表列表"
       :showTab="false"
     >

src/views/vent/deviceManager/tableColumns/index.vue

@@ -10,7 +10,7 @@
       :deleteById="deleteById"
       :batchDelete="batchDeleteById"
       :saveOrUpdate="saveOrUpdate"
-      designScope="tabel-columns"
+      designScope="table-search-reset"
       title="字段裂变"
       :showTab="false"
     />

src/views/vent/home/colliery/index.vue

@@ -120,6 +120,8 @@ const pageType = ref('home');
 let router = useRouter();
 
 function goDetail(deviceType) {
+  debugger
+
   // Modal.confirm({
   //   content: () => '暂未连接井下设备！',
   //   icon: () => createVNode(ExclamationCircleOutlined),
@@ -139,9 +141,15 @@ function goDetail(deviceType) {
   // pageType.value = deviceType;
   // changeModalBox();
   if (deviceType == 'fanMain') {
-    router.push('/monitorChannel/monitor-fanlocal');
-  } else if (deviceType == 'fanLocal') {
     router.push('/monitorChannel/monitor-fanmain');
+  } else if (deviceType == 'fanLocal') {
+    router.push('/monitorChannel/monitor-fanlocal');
+  } else if(deviceType == 'majorpath') {
+    
+  } else if(deviceType == 'work'){
+    router.push('/monitorChannel/wokerFace-home');
+  } else if (deviceType == 'warning') {
+    router.push('/monitorChannel/monitor-alarm-home');
   } else {
     router.push('/monitorChannel/monitor-gate');
   }
@@ -242,7 +250,8 @@ let timeDate = computed(() => {
 });
 
 function goModalDetail() {
-  go('/micro-vent-3dModal/dashboard/analysis?pageType=model3D')
+  history.pushState({}, '', '/micro-vent-3dModal/dashboard/analysis?deviceType=model3D');
+  // router.push('/micro-vent-3dModal/dashboard/analysis?deviceType=model3D')
 }
 
 onMounted(() => {

src/views/vent/monitorManager/compressor/components/nitrogenHome1.vue

@@ -366,7 +366,7 @@
       if (res.success) {
         modalIsShow.value = false;
         getDataSource(props.deviceId);
-        message.success('操作成功！');
+        message.success('指令下发成功！')
       }
     });
   }

src/views/vent/monitorManager/deviceMonitor/components/device/modal/mainPath.vue

@@ -81,9 +81,9 @@ function changeSelect(val) {
   echartData[0].value = (val['drag_1'] || Math.floor(Math.random() * (629 - 620 + 1)) + 620).toFixed(2);
   echartData[1].value = (val['drag_2'] || Math.floor(Math.random() * (949 - 940 + 1)) + 940).toFixed(2);
   echartData[2].value = (val['drag_3'] || Math.floor(Math.random() * (855 - 850 + 1)) + 850).toFixed(2);
-  tabList[0].val = ((val['m3_total'] / 60) || (Math.floor(Math.random() * (10700 - 10600 + 1)) + 10600)).toFixed(2);
+  tabList[0].val = ((val['m3_total']) || (Math.floor(Math.random() * (10700 - 10600 + 1)) + 10600)).toFixed(2);
   tabList[1].val = (val['drag_total'] || Math.floor(Math.random() * (2433 - 2423 + 1)) + 2423).toFixed(2);
-  tabList[2].val = formatNum(1.19 * Number(tabList[0].val) / Math.sqrt(Number(tabList[1].val)));
+  tabList[2].val = formatNum(1.19 * Number(tabList[0].val) / 60 / Math.sqrt(Number(tabList[1].val)));
   percentF.value = formatNum((Number(echartData[0].value) / (Number(echartData[0].value) + Number(echartData[1].value) + Number(echartData[2].value))) * 100);
   percentT.value = formatNum((Number(echartData[1].value) / (Number(echartData[0].value) + Number(echartData[1].value) + Number(echartData[2].value))) * 100)
   percentE.value = formatNum((echartData[2].value / (Number(echartData[0].value) + Number(echartData[1].value) + Number(echartData[2].value))) * 100)
@@ -106,8 +106,11 @@ function getOption() {
       xData.push(a.name);
       yData.push(a.value);
     });
-    var startColor = ['rgba(255, 224, 28,.6)', 'rgba(31, 248, 251,.6)', 'rgba(154, 255, 168,.6)'];
-    var borderStartColor = ['#ffe01c', '#1ff8fb', '#9affa8'];
+
+    var startColor = [ 'rgba(154, 255, 168,.6)', 'rgba(255, 224, 28,.6)', 'rgba(255, 54, 93, .6)'];
+    var borderStartColor = [ '#9affa8', '#ffe01c', '#FF365D',];
+    // var startColor = ['rgba(255, 224, 28,.6)', 'rgba(31, 248, 251,.6)', 'rgba(154, 255, 168,.6)'];
+    // var borderStartColor = ['#ffe01c', '#1ff8fb', '#9affa8'];
     var RealData = [];
     var borderData = [];
     echartData.map((item, index) => {
@@ -143,7 +146,7 @@ function getOption() {
           align: 'left',
           textStyle: {
             fontSize: 14,
-            color: '#b3b8cc',
+            color: '#9affa8',
           },
           data: ['进风区'],
         },
@@ -156,7 +159,7 @@ function getOption() {
           align: 'left',
           textStyle: {
             fontSize: 14,
-            color: '#b3b8cc',
+            color: '#ffe01c',
           },
           data: ['用风区'],
         },
@@ -169,7 +172,7 @@ function getOption() {
           align: 'left',
           textStyle: {
             fontSize: 14,
-            color: '#b3b8cc',
+            color: '#FF365D',
           },
           data: ['回风区'],
         },
@@ -336,19 +339,19 @@ onMounted(() => { });
         &:nth-child(1) {
           position: absolute;
           top: 12%;
-          color: #ffe01c;
+          color: #9affa8;
         }
 
         &:nth-child(2) {
           position: absolute;
           top: 42%;
-          color: #1ff8fb;
+          color: #ffe01c;
         }
 
         &:nth-child(3) {
           position: absolute;
           top: 70%;
-          color: #9affa8;
+          color: #FF365D;
         }
 
         .dw {

src/views/vent/monitorManager/fanLocalMonitor/index.vue

@@ -343,6 +343,7 @@
   import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
   import { getPopupContainer } from '/@/utils';
   import { getDictItemsByCode } from '/@/utils/dict';
+  import { message } from 'ant-design-vue';
 
   const globalConfig = inject('globalConfig');
 
@@ -659,8 +660,8 @@
       if (mainWindIsShow1.value === 'open' && mainWindIsShow2.value === 'stop') {
         // playSmoke(handType, 'top', frequency, 'open');
         data.paramcode = 'CtrlFan1Start';
-        deviceControlApi(data).then((res) => {
-          console.log('设备操作结果', res);
+        deviceControlApi(data).then(() => {
+          message.success('指令下发成功！')
           modalTitle.value = '';
           modalIsShow.value = false;
         }).catch((err) => {
@@ -669,8 +670,8 @@
       } else if (mainWindIsShow2.value === 'open' && mainWindIsShow1.value === 'stop') {
         // playSmoke(handType, 'down', frequency, 'open');
         data.paramcode = 'CtrlFan2Start';
-        deviceControlApi(data).then((res) => {
-          console.log('设备操作结果', res);
+        deviceControlApi(data).then(() => {
+          message.success('指令下发成功！')
           modalTitle.value = '';
           modalIsShow.value = false;
         }).catch((err) => {
@@ -690,7 +691,7 @@
       }
       
       deviceControlApi(data).then((res) => {
-        console.log('设备操作结果', res);
+        message.success('指令下发成功！')
         modalTitle.value = '';
         modalIsShow.value = false;
       }).catch((err) => {
@@ -700,7 +701,7 @@
       if(selectData['Fan1StartStatus'] == 0 || !selectData['Fan1StartStatus']){
         data.paramcode = 'CtrlFan1Start';
         deviceControlApi(data).then((res) => {
-          console.log('设备操作结果', res);
+          message.success('指令下发成功！')
           modalTitle.value = '';
           modalIsShow.value = false;
           mainWindIsShow1.value = 'stop';
@@ -712,7 +713,7 @@
       }else if(selectData['Fan2StartStatus'] == 0 || !selectData['Fan2StartStatus']){
         data.paramcode = 'CtrlFan2Start';
         deviceControlApi(data).then((res) => {
-          console.log('设备操作结果', res);
+          message.success('指令下发成功！')
           modalTitle.value = '';
           modalIsShow.value = false;
           mainWindIsShow1.value = 'open';

src/views/vent/monitorManager/gasPumpMonitor/components/DetailModal.vue

@@ -97,7 +97,7 @@ function handlerFn(paramcode) {
     value: value,
   };
   deviceControlApi(data).then((res) => {
-    message.success('控制成功成功！');
+    message.success('指令下发成功！')
   }).catch((err) => {
     // message.success('控制异常');
   });

src/views/vent/monitorManager/gasPumpMonitor/components/gasPumpHome.vue

@@ -255,7 +255,7 @@ function handler(passWord, paramcode) {
     value: value,
   };
   deviceControlApi(data).then((res) => {
-    message.success('控制成功成功！');
+    message.success('指令下发成功！')
   }).catch((err) => {
     message.success('控制异常');
   });

src/views/vent/monitorManager/gateMonitor/index.vue

@@ -56,7 +56,18 @@
               :dataSource="dataSource" design-scope="gate-monitor" @selectRow="getSelectRow" :scroll="{ y: scroll.y - 40 }" title="风门监测"
               :isShowPagination="true">
               <template #filterCell="{ column, record }">
-                <template v-if="record.frontGateOpenCtrl == 1 || record.frontGateOpenCtrl === true">
+                <template v-if="column.dataIndex === 'frontGateOpen'">
+                  <a-tag
+                    v-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 0 && record.frontGateClose == 0"
+                    color="red">正在运行</a-tag>
+                  <a-tag
+                    v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 1 && record.frontGateClose == 0"
+                    color="default">开到位</a-tag>
+                  <a-tag
+                    v-else-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 0 && record.frontGateClose == 1"
+                    color="default">关到位</a-tag>
+                </template>
+                <!-- <template v-if="record.frontGateOpenCtrl == 1 || record.frontGateOpenCtrl === true">
                   <a-tag
                     v-if="column.dataIndex === 'frontGateOpen' && record.frontGateOpen == 0 && record.frontGateClose == 0"
                     color="red">正在打开</a-tag>
@@ -96,7 +107,7 @@
                 }}</a-tag>
                 <a-tag v-if="column.dataIndex === 'netStatus'" :color="record.netStatus == 0 ? 'default' : 'green'">{{
                   record.netStatus == 0 ? '断开' : '连接'
-                }}</a-tag>
+                }}</a-tag> -->
               </template>
             </MonitorTable>
           </a-tab-pane>
@@ -457,7 +468,7 @@ function handleOK(passWord, handlerState) {
         // 模拟时开启
         if (res.success) {
           modalIsShow.value = false;
-          message.success('操作成功！')
+          message.success('指令下发成功！')
         }
       })
   }
@@ -582,7 +593,7 @@ function changeType() {
     value: selectData.autoRoManual,
   };
   deviceControlApi(data).then(() => {
-    message.success('状态切换成功！');
+    message.success('指令下发成功！')
   });
 };
 

src/views/vent/monitorManager/mainFanMonitor/index.vue

@@ -10,15 +10,15 @@
       <div style="position: relative">
         <div class="elementTag" id="inputBox">
           <div class="elementContent elementContent-r" v-if="selectData.DataPa && backMonitorIsShow">
-            <div class="element-item"><span class="data-title">风机气压(Pa)：</span><span>{{ selectData.DataPa ? selectData.DataPa : '-' }}</span></div>
-            <div class="element-item"><span class="data-title">风机负压(Pa)：</span><span>{{ selectData.Fan2Negative ? selectData.Fan2Negative : '-' }}</span></div>
+            <!-- <div class="element-item"><span class="data-title">风机气压(Pa)：</span><span>{{ selectData.DataPa ? selectData.DataPa : '-' }}</span></div> -->
+            <div class="element-item"><span class="data-title">风机负压(Pa)：</span><span>{{ (selectData.Fan2FanPre) ? selectData.Fan2FanPre : '-' }}</span></div>
             <div class="element-item"><span class="data-title">风机风量(m³/s)：</span><span>{{ selectData.Fan2m3 ? selectData.Fan2m3 : '-' }}</span></div>
           </div>
         </div>
         <div class="elementTag" id="inputBox1">
           <div class="elementContent elementContent-r" v-if="selectData.DataPa && frontMonitorIsShow">
-            <div class="element-item"><span class="data-title">风机全压(Pa)：</span><span>{{ selectData.DataPa ? selectData.DataPa : '-' }}</span></div>
-            <div class="element-item"><span class="data-title">风机负压(Pa)：</span><span>{{ selectData.Fan1Negative ? selectData.Fan1Negative : '-' }}</span></div>
+            <!-- <div class="element-item"><span class="data-title">风机全压(Pa)：</span><span>{{ selectData.DataPa ? selectData.DataPa : '-' }}</span></div> -->
+            <div class="element-item"><span class="data-title">风机负压(Pa)：</span><span>{{ (selectData.Fan1FanPre) ? selectData.Fan1FanPre : '-'  }}</span></div>
             <div class="element-item"><span class="data-title">风机风量(m³/s)：</span><span>{{ selectData.Fan1m3 ? selectData.Fan1m3 : '-' }}</span></div>
           </div>
         </div>
@@ -374,6 +374,8 @@
     Fan1m3: '-', //电机流量
     Fan2m3: '-', //电机流量
     deviceType: '',
+    Fan2FanPre: '-',
+    Fan1FanPre: '-'
   });
 
   const deviceType = ref(selectData.deviceType)

src/views/vent/monitorManager/obfurage1Monitor/index.vue

@@ -454,7 +454,7 @@ function handleOK(passWord, handlerState) {
         // 模拟时开启
         if (res.success) {
           modalIsShow.value = false;
-          message.success('操作成功！')
+          message.success('指令下发成功！')
         }
       })
   }
@@ -579,7 +579,7 @@ function changeType() {
     value: selectData.autoRoManual,
   };
   deviceControlApi(data).then(() => {
-    message.success('状态切换成功！');
+    message.success('指令下发成功！')
   });
 };
 

src/views/vent/monitorManager/safetyMonitor/index.vue

@@ -7,8 +7,8 @@
         </template>
         <template v-else-if="activeKey == '1' && deviceType">
           <MonitorTable ref="monitorTable" :columnsType="`${deviceType}_monitor`" :dataSource="dataSource"
-            design-scope="device_monitor" :isShowPagination="false" :isShowActionColumn="true" :is-show-select="false" title="设备监测"
-            :form-config="deviceType == 'safetymonitor' ? formConfig : undefined" >
+            design-scope="device_monitor" :isShowPagination="false" :isShowActionColumn="isHaveAction.includes(deviceType.split('_')[0]) ? false : true" :is-show-select="false" title="设备监测"
+            :form-config="deviceType == 'safetymonitor' ? formConfig : undefined" :scroll="{y: 650}">
             <template #filterCell="{ column, record }">
               <template v-if="deviceType.startsWith('gate')">
                 <template v-if="record.frontGateOpenCtrl == 1 || record.frontGateOpenCtrl === true">
@@ -60,6 +60,14 @@
                   <Progress v-else :percent="Number(record.isRun)" size="small" status="active" />
                 </template>
               </template>
+              <template v-if="deviceType.startsWith('safetymonitor')">
+                <div v-if="!record.devicename && column.dataIndex === 'devicename'">-</div>
+                <div v-if="!record.V && column.dataIndex === 'V'">-</div>
+                <div v-if="!record.PointUnit && column.dataIndex === 'PointUnit'">-</div>
+                <div v-if="!record.highRange && column.dataIndex === 'highRange'">-</div>
+                <div v-if="!record.lowRange && column.dataIndex === 'lowRange'">-</div>
+                <div v-if="!record.dataTypeName && column.dataIndex === 'dataTypeName'">-</div>
+              </template>
               <a-tag v-if="column.dataIndex === 'warnFlag'"
                 :color="record.warnFlag == 0 ? 'green' : record.warnFlag == 1 ? '#FF5812' : 'gray'"> {{
                   record.warnFlag == 0 ? '正常' : record.warnFlag == 1 ? '报警' : record.warnFlag == 2 ? '断开' : '未监测'
@@ -143,8 +151,8 @@ import MonitorTable from '../comment/MonitorTable.vue';
 import GroupMonitorTable from '../comment/GroupMonitorTable.vue';
 import { Progress } from 'ant-design-vue';
 import { useRouter } from 'vue-router';
-import { formConfig, chartsColumnsreal, chartsColumnsRect, chartsColumnsFan, chartsColumnsMain, chartsColumnsFiber, chartsColumnsObf, chartsColumnsBun } from './safety.data'
-
+import { formConfig, isHaveAction } from './safety.data'
+import { getDictItemsByCode } from '/@/utils/dict';
 
 // import { BorderBox8 as DvBorderBox8 } from '@kjgl77/datav-vue3';
 
@@ -231,11 +239,33 @@ async function getDataSource() {
   const formData = monitorTable.value.getForm()
   const res = await list({ devicetype: deviceType.value, filterParams: { ...formData.getFieldsValue() } })
   if (res.msgTxt.length > 0) {
-    dataSource.value = res.msgTxt[0].datalist || [];
-    dataSource.value.filter((data: any) => {
+    dataSource.value = []
+    const dataArr = res.msgTxt[0].datalist || [];
+    dataArr.filter((data: any) => {
       const readData = data.readData;
       return Object.assign(data, readData);
     });
+    if(deviceType.value == 'safetymonitor'){
+      // 如果是安全监控的数据时需要过滤常见设备数据，根据设定的常用安全监控字典去匹配
+      const dictCodes = getDictItemsByCode('safetynormal')
+      const searchForm = formData.getFieldsValue()
+      if(!searchForm['dataTypeName'] && dictCodes && dictCodes.length){
+        for(let i=0; i< dictCodes.length; i++){
+          const dict = dictCodes[i]
+          dataArr.forEach((item) => {
+            if(dict['value'] == item['dataTypeName']){
+              dataSource.value.push(item)
+            }
+          })
+        }
+      }else{
+        dataSource.value = dataArr
+      }
+    }else{
+      dataSource.value = dataArr
+    }
+    
+
   } else {
     dataSource.value = []
   }

src/views/vent/monitorManager/safetyMonitor/safety.data.ts

@@ -232,3 +232,4 @@ export const chartsColumnsreal = [
     dataIndex: 'sourcePressure',
   },
 ];
+export const isHaveAction = ['safetymonitor'];

src/views/vent/monitorManager/windowMonitor/index.vue

@@ -343,7 +343,7 @@
     };
     deviceControlApi(data)
       .then(() => {
-        message.success('设置成功')
+        message.success('指令下发成功！')
       })
       .finally(() => {
         handleCancel();

src/views/vent/monitorManager/windrectMonitor/index.vue

@@ -678,7 +678,7 @@
       .then((res) => {
         // 模拟时开启
         if (res.success) {
-          message.success('自清洁功能启动成功！')
+          message.success('指令下发成功！')
         }
       })
     }