[Mod 0000] API及文本调整

src/api/common/api.ts

@@ -14,7 +14,7 @@ enum Api {
   getDictItems = '/sys/dict/getDictItems/',
   getTableList = '/sys/user/queryUserComponentData',
   getCategoryData = '/sys/category/loadAllData',
-  refreshDragCache = '/province/device/refreshProvince',
+  refreshDragCache = '/workingface/device/refreshProvince',
   // refreshDragCache = '/drag/page/refreshCache',
   refreshDefaultIndexCache = '/sys/sysRoleIndex/cleanDefaultIndexCache',
   //异步获取部门和岗位

src/layouts/default/feature/SimpleMap.vue

@@ -13,21 +13,21 @@
     ></a-select>
   </div>
   <!-- 省域地图监测区图例（图3-1） -->
-  <div v-if="!cadOpened" class="map-legend">
+  <!-- <div v-if="!cadOpened" class="map-legend">
     <div class="legend-title">图例</div>
     <div class="legend-row"><span class="legend-dot legend-dot-red"></span>疑似隐蔽工作面</div>
-    <div class="legend-row"><span class="legend-dot legend-dot-orange"></span>风量异常</div>
+    <div class="legend-row"><span class="legend-dot legend-dot-orange"></span>风量不足</div>
     <div class="legend-row"><span class="legend-dot legend-dot-yellow"></span>数据掉线</div>
     <div class="legend-row"><span class="legend-dot legend-dot-green"></span>监测正常</div>
-  </div>
+  </div> -->
   <!-- 矿端通风系统图监测区图例（图3-3） -->
-  <div v-if="cadOpened" class="map-legend">
+  <!-- <div v-if="cadOpened" class="map-legend">
     <div class="legend-title">图例</div>
     <div class="legend-row"><span class="legend-dot legend-dot-green"></span>测风正常</div>
-    <div class="legend-row"><span class="legend-dot legend-dot-orange"></span>风量异常</div>
+    <div class="legend-row"><span class="legend-dot legend-dot-orange"></span>风量不足</div>
     <div class="legend-row"><span class="legend-dot legend-dot-red-dashed"></span>缺失测风点</div>
     <div class="legend-row"><span class="legend-line-red"></span>疑似隐蔽巷道</div>
-  </div>
+  </div> -->
 </template>
 
 <script lang="ts" setup>
@@ -426,7 +426,7 @@
   .map-legend {
     position: fixed;
     bottom: 24px;
-    left: 24px;
+    right: 24px;
     z-index: @simple-map-z-index + 1;
     background: rgba(255, 255, 255, 0.92);
     border-radius: 8px;

src/layouts/default/feature/SimpleMapTest.bak.txt

@@ -62,7 +62,7 @@
   <div v-if="!cadOpened" class="map-legend">
     <div class="legend-title">图例</div>
     <div class="legend-row"><span class="legend-dot legend-dot-red"></span>疑似隐蔽工作面</div>
-    <div class="legend-row"><span class="legend-dot legend-dot-orange"></span>风量异常</div>
+    <div class="legend-row"><span class="legend-dot legend-dot-orange"></span>风量不足</div>
     <div class="legend-row"><span class="legend-dot legend-dot-yellow"></span>数据掉线</div>
     <div class="legend-row"><span class="legend-dot legend-dot-green"></span>监测正常</div>
   </div>
@@ -70,7 +70,7 @@
   <div v-if="cadOpened" class="map-legend">
     <div class="legend-title">图例</div>
     <div class="legend-row"><span class="legend-dot legend-dot-green"></span>测风正常</div>
-    <div class="legend-row"><span class="legend-dot legend-dot-orange"></span>风量异常</div>
+    <div class="legend-row"><span class="legend-dot legend-dot-orange"></span>风量不足</div>
     <div class="legend-row"><span class="legend-dot legend-dot-red-dashed"></span>缺失测风点</div>
     <div class="legend-row"><span class="legend-line-red"></span>疑似隐蔽巷道</div>
   </div>

src/layouts/default/feature/SimpleMapTest.vue

@@ -27,7 +27,7 @@
   <div v-if="!cadOpened" class="map-legend">
     <div class="legend-title">图例</div>
     <div class="legend-row"><span class="legend-dot legend-dot-red"></span>疑似隐蔽工作面</div>
-    <div class="legend-row"><span class="legend-dot legend-dot-orange"></span>风量异常</div>
+    <div class="legend-row"><span class="legend-dot legend-dot-orange"></span>风量不足</div>
     <div class="legend-row"><span class="legend-dot legend-dot-yellow"></span>数据掉线</div>
     <div class="legend-row"><span class="legend-dot legend-dot-green"></span>监测正常</div>
   </div>
@@ -35,7 +35,7 @@
   <div v-if="cadOpened" class="map-legend">
     <div class="legend-title">图例</div>
     <div class="legend-row"><span class="legend-dot legend-dot-green"></span>测风正常</div>
-    <div class="legend-row"><span class="legend-dot legend-dot-orange"></span>风量异常</div>
+    <div class="legend-row"><span class="legend-dot legend-dot-orange"></span>风量不足</div>
     <div class="legend-row"><span class="legend-dot legend-dot-red-dashed"></span>缺失测风点</div>
     <div class="legend-row"><span class="legend-line-red"></span>疑似隐蔽巷道</div>
   </div>

src/layouts/default/feature/components/LeafPopup.vue

@@ -15,7 +15,7 @@
       <div>{{ node.windrectList?.length ?? '-' }}</div>
     </div>
     <div class="vjmapgis-popup-content__board mb-1">
-      <div class="mr-5px">风量异常</div>
+      <div class="mr-5px">风量不足</div>
       <div>{{ node.m3Exception ?? '-' }}</div>
     </div>
     <div class="vjmapgis-popup-content__board">

src/views/dashboard/HiddenSurface/configurable.data.ts

@@ -39,14 +39,19 @@ export const testConfigProvinceMonitor: Config[] = [
               to: '/basicinfo/mines-info?accessStatus=1',
             },
             {
-              label: '测风点在线数',
-              value: '${areaOnlineNum}',
+              label: '测风装置总数',
+              value: '${areaNum}',
               to: '/warningAnalysis/wind-point-manage',
             },
             {
               label: '风量不足数量',
               value: '${exceptionNum}',
-              to: '/warningAnalysis/global-alarm',
+              to: '/warningAnalysis/global-alarm?alarmType=m3Lack',
+            },
+            {
+              label: '测风装置在线',
+              value: '${areaOnlineNum}',
+              to: '/warningAnalysis/wind-point-manage',
             },
             {
               label: '疑似隐蔽工作面',
@@ -54,12 +59,7 @@ export const testConfigProvinceMonitor: Config[] = [
               to: '/basicinfo/mines-info?judgeResult=1',
             },
             {
-              label: '测风点总数',
-              value: '${areaNum}',
-              to: '/warningAnalysis/wind-point-manage',
-            },
-            {
-              label: '掉线测风点',
+              label: '测风装置掉线',
               value: '${disconnectNum.length}',
               to: '/warningAnalysis/wind-point-manage',
             },
@@ -98,7 +98,7 @@ export const testConfigProvinceMonitor: Config[] = [
           columns: [
             { name: '执法处', prop: 'name', path: '/basicinfo/mines-info?deptId=${deptId}' },
             { name: '矿井数', prop: 'mineNum' },
-            // { name: '风量异常', prop: 'exceptionNum' },
+            // { name: '风量不足', prop: 'exceptionNum' },
             { name: '疑似隐蔽工作面', prop: 'suspectedNum', path: '/basicinfo/mines-info?judgeResult=1&deptId=${deptId}' },
           ],
         },
@@ -228,19 +228,19 @@ export const testConfigVentilationMonitor: Config[] = [
           readFrom: '',
           items: [
             {
-              label: '测风点总数',
+              label: '测风装置总数',
               value: '${areaNum}',
               to: '/warningAnalysis/wind-point-manage',
             },
             {
-              label: '在线测风点',
-              value: '${areaOnlineNum}',
-              to: '/warningAnalysis/wind-point-manage',
+              label: '风量不足',
+              value: '${exceptionNum}',
+              to: '/warningAnalysis/global-alarm?alarmType=m3Lack',
             },
             {
-              label: '风量异常',
-              value: '${exceptionNum}',
-              to: '/warningAnalysis/global-alarm',
+              label: '测风装置在线',
+              value: '${areaOnlineNum}',
+              to: '/warningAnalysis/wind-point-manage',
             },
             {
               label: '疑似隐蔽工作面',
@@ -248,15 +248,15 @@ export const testConfigVentilationMonitor: Config[] = [
               to: '/basicinfo/mines-info?judgeResult=1',
             },
             {
-              label: '风速超限',
-              value: '${vaOverLimitNum}',
-              to: '/warningAnalysis/global-alarm',
-            },
-            {
-              label: '掉线测风点',
+              label: '测风装置掉线',
               value: '${disconnectNum.length}',
               to: '/warningAnalysis/wind-point-manage',
             },
+            {
+              label: '风速超限',
+              value: '${vaOverLimitNum}',
+              to: '/warningAnalysis/global-alarm?alarmType=vaOverLimit',
+            },
           ],
         },
       ],

src/views/monitor/sensorMonitor/sensorMonitor.data.ts

@@ -9,7 +9,7 @@ export const boardData = [
   { label: '在线测风装置', value: '-' },
   { label: '测风点总数', value: '-' },
   { label: '风速超限报警', value: '-' },
-  { label: '风量异常报警', value: '-' },
+  { label: '风量不足报警', value: '-' },
 ];
 
 /** 数据状态映射（WindrectData.status：1正常、0已删除） */

src/views/monitor/surfaceMonitor/surfaceMonitor.data.ts

@@ -7,7 +7,7 @@ import dayjs from 'dayjs';
 export const boardData = [
   { label: '接入矿井总数', value: '-', model: { accessStatus: 1 } },
   // { label: '在线率', value: '-' },
-  // { label: '风量异常矿井', value: '-' },
+  // { label: '风量不足矿井', value: '-' },
   { label: '疑似隐蔽工作面', value: '-', model: { judgeResult: 1 } },
 ];
 
@@ -75,7 +75,7 @@ export const columns: BasicColumn[] = [
     },
   },
   {
-    title: '风量异常数',
+    title: '风量不足数',
     dataIndex: 'm3Exception',
     width: 110,
   },

src/views/system/cadFile/cad.api.ts

@@ -3,12 +3,12 @@ import { defHttp } from '/@/utils/http/axios';
 export enum Api {
   getMineAreaList = '/workingface/mineArea/getMineAreaList',
   updateMineArea = '/workingface/mineArea/updateMineArea',
-  getGoafData = '/province/device/getGoafData',
+  getGoafData = '/workingface/device/getGoafData',
   getMineFileList = '/workingface/mineData/getMineFileList',
   uploadFile = '/sys/common/upload',
-  updateMineFile = '/province/mineData/updateMineFile',
-  addMineFile = '/province/mineData/addMineFile',
-  deleteMineFile = '/province/mineData/deleteMineFile',
+  updateMineFile = '/workingface/mineData/updateMineFile',
+  addMineFile = '/workingface/mineData/addMineFile',
+  deleteMineFile = '/workingface/mineData/deleteMineFile',
 }
 // 查询测风地点列表（布点管理）
 export function getMineAreaList(params: any) {

src/views/system/cadFile/cad.data.ts

@@ -15,11 +15,11 @@ export function getColumns(): BasicColumn[] {
       dataIndex: 'fileName',
       width: 100,
     },
-    {
-      title: '图纸类型',
-      dataIndex: 'fileType',
-      width: 100,
-    },
+    // {
+    //   title: '图纸类型',
+    //   dataIndex: 'fileType',
+    //   width: 100,
+    // },
     {
       title: '更新时间',
       dataIndex: 'createTime',
@@ -48,21 +48,21 @@ export function getSearchFormSchema(): FormSchema[] {
       component: 'Input',
       colProps: { span: 6 },
     },
-    {
-      field: 'fileType',
-      label: '图纸分类',
-      component: 'Select',
-      componentProps: {
-        options: [
-          { label: '安全监控部署图', value: '安全监控部署图' },
-          { label: '通风系统图', value: '通风系统图' },
-          { label: '防灭火图', value: '防灭火图' },
-          { label: '人员位置监测系统图', value: '人员位置监测系统图' },
-          { label: '采掘工程平面图', value: '采掘工程平面图' },
-        ],
-      },
-      colProps: { span: 6 },
-    },
+    // {
+    //   field: 'fileType',
+    //   label: '图纸分类',
+    //   component: 'Select',
+    //   componentProps: {
+    //     options: [
+    //       { label: '安全监控部署图', value: '安全监控部署图' },
+    //       { label: '通风系统图', value: '通风系统图' },
+    //       { label: '防灭火图', value: '防灭火图' },
+    //       { label: '人员位置监测系统图', value: '人员位置监测系统图' },
+    //       { label: '采掘工程平面图', value: '采掘工程平面图' },
+    //     ],
+    //   },
+    //   colProps: { span: 6 },
+    // },
   ];
 }
 
@@ -124,21 +124,21 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     required: true,
   },
-  {
-    label: '文件类型',
-    field: 'fileType',
-    component: 'Select',
-    componentProps: {
-      options: [
-        { label: '安全监控部署图', value: '安全监控部署图' },
-        { label: '通风系统图', value: '通风系统图' },
-        { label: '防灭火图', value: '防灭火图' },
-        { label: '人员位置监测系统图', value: '人员位置监测系统图' },
-        { label: '采掘工程平面图', value: '采掘工程平面图' },
-      ],
-    },
-    required: true,
-  },
+  // {
+  //   label: '文件类型',
+  //   field: 'fileType',
+  //   component: 'Select',
+  //   componentProps: {
+  //     options: [
+  //       { label: '安全监控部署图', value: '安全监控部署图' },
+  //       { label: '通风系统图', value: '通风系统图' },
+  //       { label: '防灭火图', value: '防灭火图' },
+  //       { label: '人员位置监测系统图', value: '人员位置监测系统图' },
+  //       { label: '采掘工程平面图', value: '采掘工程平面图' },
+  //     ],
+  //   },
+  //   required: true,
+  // },
   {
     label: '文件',
     field: 'fileAttach',
@@ -181,22 +181,22 @@ export const mapEditForm: FormSchema[] = [
     groupName: '常规查询',
   },
 
-  {
-    field: 'fileType',
-    label: '图纸类型',
-    component: 'Select',
-    componentProps: {
-      options: [
-        { label: '安全监控部署图', value: '安全监控部署图' },
-        { label: '通风系统图', value: '通风系统图' },
-        { label: '防灭火图', value: '防灭火图' },
-        { label: '人员位置监测系统图', value: '人员位置监测系统图' },
-        { label: '采掘工程平面图', value: '采掘工程平面图' },
-      ],
-    },
-    colProps: { span: 6 },
-    groupName: '常规查询',
-  },
+  // {
+  //   field: 'fileType',
+  //   label: '图纸类型',
+  //   component: 'Select',
+  //   componentProps: {
+  //     options: [
+  //       { label: '安全监控部署图', value: '安全监控部署图' },
+  //       { label: '通风系统图', value: '通风系统图' },
+  //       { label: '防灭火图', value: '防灭火图' },
+  //       { label: '人员位置监测系统图', value: '人员位置监测系统图' },
+  //       { label: '采掘工程平面图', value: '采掘工程平面图' },
+  //     ],
+  //   },
+  //   colProps: { span: 6 },
+  //   groupName: '常规查询',
+  // },
   {
     field: 'fileAttach',
     label: '附件',