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

src/views/vent/gas/gasVerify/gasPumpSetting.api.ts

@@ -1,69 +1,100 @@
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
-  addGasDrainageParam = '/safety/gasDrainage/addGasDrainageParam',
-  createParam = '/safety/gasDrainage/createParam',
-  deleteGasDrainageParam = '/safety/gasDrainage/deleteGasDrainageParam',
-  getGasDrainageParamList = '/safety/gasDrainage/getGasDrainageParamList',
-  updateGasDrainageParam = '/safety/gasDrainage/updateGasDrainageParam',
-  getEvaluationUnitList = '/safety/evaluationUnit/getEvaluationUnitList',
+  addGasMainApproval = '/ventanaly-jingtaifengliang/productionApprovalController/addGasMainApproval',
+  addGasMainpipesystem = '/ventanaly-jingtaifengliang/productionApprovalController/addGasMainpipesystem',
+  addGasPumpstation = '/ventanaly-jingtaifengliang/productionApprovalController/addGasPumpstation',
+  deleteGasMain = '/ventanaly-jingtaifengliang/productionApprovalController/deleteGasMain',
+  deleteGasMainpipesystem = '/ventanaly-jingtaifengliang/productionApprovalController/deleteGasMainpipesystem',
+  deleteGasPumpstation = '/ventanaly-jingtaifengliang/productionApprovalController/deleteGasPumpstation',
+  getGasMainAllInfo = '/ventanaly-jingtaifengliang/productionApprovalController/getGasMainAllInfo',
+  getGasMainpipesystemAllInfo = '/ventanaly-jingtaifengliang/productionApprovalController/getGasMainpipesystemAllInfo',
+  getGasPumpstationAllInfo = '/ventanaly-jingtaifengliang/productionApprovalController/getGasPumpstationAllInfo',
+  updateGasMain = '/ventanaly-jingtaifengliang/productionApprovalController/updateGasMain',
+  updateGasMainpipesystem = '/ventanaly-jingtaifengliang/productionApprovalController/updateGasMainpipesystem',
+  updateGasPumpstation = '/ventanaly-jingtaifengliang/productionApprovalController/updateGasPumpstation',
 }
-/**
- * 新增接口
- * @param data
- */
-export const addGasDrainageParam = (data) => {
+
+export const addGasMainApproval = (data) => {
   return defHttp.post({
-    url: Api.addGasDrainageParam,
+    url: Api.addGasMainApproval,
     params: data,
   });
 };
-/**
- * 计算接口
- * @param data
- */
-export const createParam = (data) => {
+
+export const addGasMainpipesystem = (data) => {
   return defHttp.post({
-    url: Api.createParam,
+    url: Api.addGasMainpipesystem,
     params: data,
   });
 };
-/**
- * 删除接口
- * @param data
- */
-export const deleteGasDrainageParam = (data) => {
-  return defHttp.get({
-    url: Api.deleteGasDrainageParam,
+
+export const addGasPumpstation = (data) => {
+  return defHttp.post({
+    url: Api.addGasPumpstation,
     params: data,
   });
 };
-/**
- * 查询接口
- * @param data
- */
-export const getGasDrainageParamList = (data) => {
+
+export const deleteGasMain = (data) => {
   return defHttp.post({
-    url: Api.getGasDrainageParamList,
+    url: Api.deleteGasMain,
     params: data,
   });
 };
-/**
- * 修改接口
- * @param data
- */
-export const updateGasDrainageParam = (data) => {
+
+export const deleteGasMainpipesystem = (data) => {
   return defHttp.post({
-    url: Api.updateGasDrainageParam,
+    url: Api.deleteGasMainpipesystem,
     params: data,
   });
 };
-/**
- *
- */
-export const getEvaluationUnitList = (data) => {
+
+export const deleteGasPumpstation = (data) => {
+  return defHttp.post({
+    url: Api.deleteGasPumpstation,
+    params: data,
+  });
+};
+
+export const getGasMainAllInfo = (data) => {
+  return defHttp.post({
+    url: Api.getGasMainAllInfo,
+    params: data,
+  });
+};
+
+export const getGasMainpipesystemAllInfo = (data) => {
+  return defHttp.post({
+    url: Api.getGasMainpipesystemAllInfo,
+    params: data,
+  });
+};
+
+export const getGasPumpstationAllInfo = (data) => {
+  return defHttp.post({
+    url: Api.getGasPumpstationAllInfo,
+    params: data,
+  });
+};
+
+export const updateGasMain = (data) => {
+  return defHttp.post({
+    url: Api.updateGasMain,
+    params: data,
+  });
+};
+
+export const updateGasMainpipesystem = (data) => {
+  return defHttp.post({
+    url: Api.updateGasMainpipesystem,
+    params: data,
+  });
+};
+
+export const updateGasPumpstation = (data) => {
   return defHttp.post({
-    url: Api.getEvaluationUnitList,
+    url: Api.updateGasPumpstation,
     params: data,
   });
 };

src/views/vent/gas/gasVerify/gasPumpSetting.data.ts

@@ -11,37 +11,31 @@ export const publicFormSchema: FormSchema[] = [
   },
   {
     label: 'q(m³/t)',
-    field: 'q',
+    field: 'mine_relative_gas_emission',
     component: 'Input',
     helpMessage: '矿井相对瓦斯涌出量',
   },
   {
-    label: '矿井瓦斯抽采率',
-    field: 'ccl',
+    label: 'η(%)',
+    field: 'mine_gas_extraction_rate',
     component: 'Input',
-    helpMessage: '',
+    helpMessage: '矿井瓦斯抽采率',
   },
   {
     label: 'C1(%)',
-    field: 'c1',
-    component: 'Input',
-    helpMessage: '矿井总回瓦斯浓度',
-  },
-  {
-    label: 'Qf(m³/min)',
-    field: 'qf',
+    field: 'mine_total_return_air_gas_concentration',
     component: 'Input',
-    helpMessage: '矿井最大总回风风量',
+    helpMessage: '矿井总回风巷瓦斯浓度',
   },
   {
     label: '当地大气压(kPa)',
-    field: 'lpa',
+    field: 'local_atmospheric_pressure',
     component: 'Input',
     helpMessage: '',
   },
   {
     label: '标准大气压(kPa)',
-    field: 'spa',
+    field: 'standard_atmospheric_pressure',
     component: 'Input',
     helpMessage: '',
   },
@@ -57,19 +51,19 @@ export const valFormSchema: FormSchema[] = [
   },
   {
     label: 'Qs(m³)',
-    field: 'qs',
+    field: 'mine_previous_year_actual_gas_extraction',
     component: 'Input',
-    helpMessage: '矿井上年度实际瓦斯抽采量',
+    helpMessage: '矿井上年度实际抽采瓦斯量',
   },
   {
     label: 'q0',
-    field: 'q0',
+    field: 'max_gas_content_coal_seam_to_be_extracted',
     component: 'Input',
-    helpMessage: '最大应抽煤瓦斯量',
+    helpMessage: '预开采区域瓦斯含量最大煤层应抽瓦斯吨煤含量',
   },
   {
     label: '超前抽采系数',
-    field: 'over',
+    field: 'mine_advance_extraction_coefficient',
     component: 'Input',
   },
 ];
@@ -82,23 +76,17 @@ export const rateFormSchema: FormSchema[] = [
     show: false,
     component: 'Input',
   },
-  {
-    label: 'q(m³/t)',
-    field: 'q',
-    component: 'Input',
-    helpMessage: '矿井相对瓦斯涌出量',
-  },
   {
     label: 'η(%)',
-    field: 'n',
+    field: 'mine_gas_extraction_rate',
     component: 'Input',
     helpMessage: '上年度矿井瓦斯抽采率',
   },
   {
     label: 'Q(m³/min)',
-    field: 'q',
+    field: 'max_allowable_absolute_gas_emission',
     component: 'Input',
-    helpMessage: '矿井抽采达标允许最大矿井绝对瓦斯涌出量',
+    helpMessage: '瓦斯抽采达标允许最大矿井绝对瓦斯涌出量',
   },
 ];
 
@@ -148,61 +136,76 @@ export const checkFormSchema: FormSchema[] = [
   },
 ];
 
-export const tableFormSchema: FormSchema[] = [
+/** 管道系统能力核定表单 */
+export const pipeFormSchema: FormSchema[] = [
   {
     label: '抽采泵站',
     field: 'ccbz',
     component: 'Input',
   },
   {
-    label: '单台泵',
-    field: 'ddb',
+    label: '抽采系统',
+    field: 'ccxt',
     component: 'Input',
   },
   {
-    label: '装机能力Qbe(m³/min)',
-    field: 'zznl',
+    label: '主管内径D(m)',
+    field: 'd',
+    component: 'Input',
+  },
+  {
+    label: '经济流速v(m/s)',
+    field: 'v',
+    component: 'Input',
+  },
+  {
+    label: '赋予系数k',
+    field: 'kk',
     component: 'Input',
   },
   {
     label: '平均抽采瓦斯浓度C2(%)',
-    field: 'wsnd',
+    field: 'wsnd2',
     component: 'Input',
   },
+];
+
+/** 装机能力核定表单 */
+export const pumpFormSchema: FormSchema[] = [
   {
-    label: '年均运行负压Pb(kPa)',
-    field: 'yxfy',
+    label: '抽采泵站',
+    field: 'ccbz',
     component: 'Input',
   },
   {
-    label: '抽采工况系数',
-    field: 'k',
+    label: '单台泵',
+    field: 'ddb',
     component: 'Input',
   },
   {
-    label: '抽采系统',
-    field: 'ccxt',
+    label: '装机能力Qbe(m³/min)',
+    field: 'zznl',
     component: 'Input',
   },
   {
-    label: '主管内径D(m)',
-    field: 'd',
+    label: '平均抽采瓦斯浓度C2(%)',
+    field: 'wsnd',
     component: 'Input',
   },
   {
-    label: '经济流速v(m/s)',
-    field: 'v',
+    label: '年均运行负压Pb(kPa)',
+    field: 'yxfy',
     component: 'Input',
   },
   {
-    label: '赋予系数k',
-    field: 'kk',
+    label: '抽采工况系数',
+    field: 'k',
     component: 'Input',
   },
 ];
 
 /** 装机能力核定表 */
-export const installTableColumns: BasicColumn[] = [
+export const pumpTableColumns: BasicColumn[] = [
   {
     title: '抽采泵站',
     dataIndex: 'ccbz',

src/views/vent/gas/gasVerify/index.vue

@@ -50,40 +50,41 @@
           <BasicForm :model="basicFormModel" :schemas="checkFormSchema" @register="regCheckForm" />
         </template>
 
-        <template v-if="actived === 'product'">
-          <div class="flex flex-justify-between flex-items-center">
-            <FormTitle class="flex-grow-1" :title="`按矿井瓦斯抽采泵站装机能力核定：test`" />
-            <Button type="primary" @click="editHandler()">添加</Button>
-          </div>
-        </template>
-        <template v-if="actived === 'extract'">
-          <div class="flex flex-justify-between flex-items-center">
-            <FormTitle class="flex-grow-1" :title="`按瓦斯抽采泵站装机能力核定：test`" />
-            <Button type="primary" @click="editHandler()">添加</Button>
-          </div>
-        </template>
-        <BasicTable class="mb-20px" :columns="installTableColumns" :data-source="tableData" @register="regTable">
+        <div class="flex flex-justify-between flex-items-center">
+          <FormTitle
+            class="flex-grow-1"
+            :title="
+              {
+                extract: `按瓦斯抽采泵站装机能力核定：test`,
+                product: `按矿井瓦斯抽采泵站装机能力核定：test`,
+              }[actived]
+            "
+          />
+          <Button type="primary" @click="editPumpHandler()">添加</Button>
+        </div>
+        <BasicTable class="mb-20px" :columns="pumpTableColumns" :data-source="pumpTableData" @register="regPumpTable">
           <template #action="{ record }">
-            <a class="mr-5px" @click.prevent="editHandler(record)">编辑</a>
-            <Popconfirm @confirm="deleteHandler(record)"><a>删除</a></Popconfirm>
+            <a class="mr-5px" @click.prevent="editPumpHandler(record)">编辑</a>
+            <Popconfirm @confirm="deletePumpHandler(record)"><a>删除</a></Popconfirm>
           </template>
         </BasicTable>
-        <template v-if="actived === 'product'">
-          <div class="flex flex-justify-between flex-items-center">
-            <FormTitle class="flex-grow-1" :title="`按矿井瓦斯抽采主管道系统能力核定：test`" />
-            <Button type="primary" @click="editHandler()">添加</Button>
-          </div>
-        </template>
-        <template v-if="actived === 'extract'">
-          <div class="flex flex-justify-between flex-items-center">
-            <FormTitle class="flex-grow-1" :title="`按矿井瓦斯主管道系统能力核定：test`" />
-            <Button type="primary" @click="editHandler()">添加</Button>
-          </div>
-        </template>
-        <BasicTable :columns="pipeTableColumns" :data-source="tableData" @register="regTable">
+
+        <div class="flex flex-justify-between flex-items-center">
+          <FormTitle
+            class="flex-grow-1"
+            :title="
+              {
+                extract: `按矿井瓦斯主管道系统能力核定：test`,
+                product: `按矿井瓦斯抽采主管道系统能力核定：test`,
+              }[actived]
+            "
+          />
+          <Button type="primary" @click="editPipeHandler()">添加</Button>
+        </div>
+        <BasicTable :columns="pipeTableColumns" :data-source="pipeTableData" @register="regPipeTable">
           <template #action="{ record }">
-            <a class="mr-5px" @click.prevent="editHandler(record)">编辑</a>
-            <Popconfirm @confirm="deleteHandler(record)"><a>删除</a></Popconfirm>
+            <a class="mr-5px" @click.prevent="editPipeHandler(record)">编辑</a>
+            <Popconfirm @confirm="deletePipeHandler(record)"><a>删除</a></Popconfirm>
           </template>
         </BasicTable>
         <!-- <BasicTable :columns="workfaceTableColumns" :data-source="[{ ccbz: `1111` }, { ccbz: `2222` }]" @register="regTable">
@@ -93,8 +94,11 @@
           </template>
         </BasicTable> -->
 
-        <BasicModal @register="regModal" title="能力核定表单" @ok="submitCommonForm">
-          <BasicForm @register="regCommonForm" />
+        <BasicModal @register="regPipeModal" title="能力核定表单" @ok="submitPipeForm">
+          <BasicForm @register="regPipeForm" />
+        </BasicModal>
+        <BasicModal @register="regPumpModal" title="能力核定表单" @ok="submitPumpForm">
+          <BasicForm @register="regPumpForm" />
         </BasicModal>
       </div>
     </div>
@@ -109,19 +113,32 @@
   import FormTitle from '@/views/vent/gas/components/form/formTitle.vue';
   import { useForm, BasicForm, FormSchema } from '/@/components/Form';
   import Bar from '/@/components/chart/Bar.vue';
-  import {} from './gasPumpSetting.api';
+  import {
+    getGasMainAllInfo,
+    getGasMainpipesystemAllInfo,
+    getGasPumpstationAllInfo,
+    addGasMainpipesystem,
+    addGasPumpstation,
+    deleteGasMainpipesystem,
+    deleteGasPumpstation,
+    updateGasMain,
+    updateGasMainpipesystem,
+    updateGasPumpstation,
+  } from './gasPumpSetting.api';
   import {
     publicFormSchema,
     valFormSchema,
     rateFormSchema,
-    installTableColumns,
+    pumpTableColumns,
     pipeTableColumns,
-    tableFormSchema,
     checkFormSchema,
+    pipeFormSchema,
+    pumpFormSchema,
     // workfaceTableColumns,
   } from './gasPumpSetting.data';
   import { BasicTable, useTable } from '/@/components/Table';
   import { BasicModal, useModal } from '/@/components/Modal';
+  import { get } from 'lodash-es';
 
   const actived = ref<'extract' | 'product'>('product');
 
@@ -135,19 +152,33 @@
       flex: '20%',
     },
   };
+
   const [regBasicForm, ctxBasicForm] = useForm(formProps);
   function submitBasicForm() {
     ctxBasicForm.validate().then(() => {
-      calculate();
+      calculateHandler();
     });
   }
+  function calculateHandler() {
+    const airVolumeStr = get(basicFormModel.value, 'returnAirVolume', []).join(',');
+    updateGasMain({
+      ...basicFormModel.value,
+      returnAirVolume: airVolumeStr,
+    })
+      .then(() => {
+        refresh();
+      })
+      .catch(() => {
+        message.error('操作失败');
+      });
+  }
 
   /** 根据矿井实际抽采瓦斯量核定的表单数据 */
   // const gasvalFormModel = ref<any>({});
   const [regGasvalForm, ctxGasvalForm] = useForm(formProps);
   function submitGasvalForm() {
     ctxGasvalForm.validate().then(() => {
-      calculate();
+      calculateHandler();
     });
   }
 
@@ -156,7 +187,7 @@
   const [regGasrateForm, ctxGasrateForm] = useForm(formProps);
   function submitGasrateForm() {
     ctxGasrateForm.validate().then(() => {
-      calculate();
+      calculateHandler();
     });
   }
 
@@ -165,29 +196,16 @@
   const [regCheckForm, ctxCheckForm] = useForm(formProps);
   function submitCheckForm() {
     ctxCheckForm.validate().then(() => {
-      calculate();
-    });
-  }
-
-  /** 两个表格对应的表单数据 */
-  const commonFormModel = ref<any>({});
-  const [regCommonForm, ctxCommonForm] = useForm({
-    model: commonFormModel,
-    schemas: tableFormSchema,
-    showActionButtonGroup: false,
-    labelCol: { span: 10 },
-  });
-  function submitCommonForm() {
-    ctxCommonForm.validate().then(() => {
-      calculate();
+      calculateHandler();
     });
   }
 
   /** 矿井基本信息的表单配置，需要动态添加回风井 */
-  const pubFormSchema = ref<FormSchema[]>([]);
+  const pubFormSchema = ref<FormSchema[]>(publicFormSchema);
   /** 根据表单数据设置矿井基本信息的表单配置 */
   function initPubFormSchema() {
-    const extra: FormSchema[] = data.value.arr.map((num, inx) => {
+    const airVolumeArr = data.value.returnAirVolume;
+    const extra: FormSchema[] = airVolumeArr.map((num, inx) => {
       return {
         label: `回风井${inx + 1}`,
         field: `__${inx + 1}`,
@@ -195,81 +213,129 @@
         component: 'Input',
         componentProps: {
           onChange: ({ target }) => {
-            data.value.arr[inx] = target.value;
-            ctxBasicForm.setFieldsValue({ total: data.value.arr.reduce((t, n) => t + parseFloat(n), 0) });
+            airVolumeArr[inx] = target.value;
+            ctxBasicForm.setFieldsValue({ total: airVolumeArr.reduce((t, n) => t + parseFloat(n), 0) });
           },
         },
       };
     });
     const total: FormSchema = {
-      label: '总计',
-      field: 'total',
-      defaultValue: 0,
+      label: 'Qf(m³/min)',
+      field: 'mine_max_total_returnAirVolume',
       component: 'Input',
+      helpMessage: '矿井最大总回风风量',
+      defaultValue: 0,
     };
     // @ts-ignore-next-line
     pubFormSchema.value = publicFormSchema.concat(...extra, total);
   }
   /** 添加一项公用参数表单项 */
   function addPubFormSchema() {
-    data.value.arr.push(0);
+    if (!data.value.returnAirVolume) return;
+    data.value.returnAirVolume.push('0');
     initPubFormSchema();
   }
 
   /** 生产能力核定/抽采能力核定的数据，也是组件的数据依赖其一 */
-  const data = ref({
-    q: 1,
-    ccl: 1,
-    c1: 1,
-    qf: 1,
-    lpa: 1,
-    spa: 1,
-    total: 1,
-    arr: [1, 12],
-    dbscnl: 123,
-    ccnl: 321,
-    ccxtnl: 12,
-    sjccl: 13,
-    wsclv: 14,
-    ftcc: 11,
-    wsccbzznl: 20,
-    wscczgdxtnl: 10,
-  });
-  /** 两个表格依赖的数据，是组件的数据依赖其二，它们依赖相同的数据 */
-  const tableData = ref<any[]>([]);
+  const data = ref<Record<string, any>>({});
 
-  const [regTable] = useTable({
+  /** 按矿井瓦斯抽采主管道系统能力核定的表格 */
+  const pipeTableData = ref<any[]>([]);
+  const pipeFormModel = ref<any>({});
+
+  const [regPipeModal, { openModal: openPipeModal }] = useModal();
+  const [regPipeTable] = useTable({
     pagination: false,
   });
-  const [regModal, { openModal }] = useModal();
-
-  /** 表格编辑处理 */
-  function editHandler(record?: Record<string, any>) {
+  const [regPipeForm, ctxPipeForm] = useForm({
+    model: pipeFormModel,
+    schemas: pipeFormSchema,
+    showActionButtonGroup: false,
+    labelCol: { span: 10 },
+  });
+  function submitPipeForm() {
+    ctxPipeForm.validate().then(() => {
+      const req = pumpFormModel.value['id'] ? updateGasPumpstation : addGasPumpstation;
+      req(pumpFormModel.value)
+        .then(() => {
+          refresh();
+        })
+        .catch(() => {
+          message.error('操作失败');
+        });
+    });
+  }
+  function editPipeHandler(record?: Record<string, any>) {
     if (record) {
-      ctxCommonForm.setFieldsValue(record);
-      commonFormModel.value = record;
-      openModal();
+      ctxPipeForm.setFieldsValue(record);
+      pipeFormModel.value = record;
+      openPipeModal();
     } else {
-      ctxCommonForm.resetFields();
-      commonFormModel.value = {};
-      openModal();
+      ctxPipeForm.resetFields();
+      pipeFormModel.value = {};
+      openPipeModal();
     }
   }
-  /** 表格删除处理 */
-  function deleteHandler({ id }) {
-    message.info('提交删除请求');
-    console.log('debug', id);
+  function deletePipeHandler({ id }) {
+    deleteGasPumpstation(id).catch(() => {
+      message.error('操作失败');
+    });
   }
-  function refresh() {
-    basicFormModel.value = data.value;
-    tableData.value = [{ ccbz: 1111 }, { ccbz: 2222 }];
-    initPubFormSchema();
+
+  /** 按矿井瓦斯抽采泵站装机能力核定的表格 */
+  const pumpTableData = ref<any[]>([]);
+  const pumpFormModel = ref<any>({});
+
+  const [regPumpModal, { openModal: openPumpModal }] = useModal();
+  const [regPumpTable] = useTable({
+    pagination: false,
+  });
+  const [regPumpForm, ctxPumpForm] = useForm({
+    model: pumpFormModel,
+    schemas: pumpFormSchema,
+    showActionButtonGroup: false,
+    labelCol: { span: 10 },
+  });
+  function submitPumpForm() {
+    ctxPumpForm.validate().then(() => {
+      const req = pumpFormModel.value['id'] ? updateGasMainpipesystem : addGasMainpipesystem;
+      req(pumpFormModel.value)
+        .then(() => {
+          refresh();
+        })
+        .catch(() => {
+          message.error('操作失败');
+        });
+    });
+  }
+  function editPumpHandler(record?: Record<string, any>) {
+    if (record) {
+      ctxPumpForm.setFieldsValue(record);
+      pumpFormModel.value = record;
+      openPumpModal();
+    } else {
+      ctxPumpForm.resetFields();
+      pumpFormModel.value = {};
+      openPumpModal();
+    }
+  }
+  function deletePumpHandler({ id }) {
+    deleteGasMainpipesystem(id).catch(() => {
+      message.error('操作失败');
+    });
   }
 
-  /** 提交参数进行核定值计算 */
-  function calculate() {
-    message.info('提交计算请求');
-    refresh();
+  function refresh() {
+    Promise.all([getGasMainAllInfo({}), getGasMainpipesystemAllInfo({}), getGasPumpstationAllInfo({})]).then((res) => {
+      const [r1, r2, r3] = res.map((e) => e.obj);
+      r1[0].returnAirVolume = r1[0].returnAirVolume.split(',');
+      basicFormModel.value = r1[0];
+      pipeTableData.value = r2;
+      pumpTableData.value = r3;
+      data.value = r1[0];
+      console.log('debug', r1[0]);
+      initPubFormSchema();
+    });
   }
 
   const productChartData = computed(() => {

src/views/vent/home/configurable/configurable.data.ts

@@ -427,7 +427,7 @@ export const testConfigVent: Config[] = [
       ],
       gallery_list: [],
       complex_list: [],
-      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=sys_surface_caimei',
+      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=sys_surface_caimei&deviceid=${deviceID}',
     },
     showStyle: {
       size: 'width:450px;height:280px;',
@@ -1859,7 +1859,7 @@ export const testConfigVentRealtime: Config[] = [
       ],
       gallery_list: [],
       complex_list: [],
-      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=sys_surface_caimei',
+      to: '/micro-vent-3dModal/dashboard/analysis?type=tunMonitor&deviceType=sys_surface_caimei&deviceid=${deviceID}',
     },
     showStyle: {
       size: 'width:450px;height:280px;',

src/views/vent/home/configurable/hooks/helper.ts

@@ -2,7 +2,8 @@ import { get, isNil } from 'lodash-es';
 
 /** 根据配置中的 formatter 将文本格式并返回 */
 export function getFormattedText(data: any, formatter: string, trans?: Record<string, string>, defaultValue?: any): string {
-  if (!data) return formatter;
+  const defval = defaultValue === undefined ? '-' : defaultValue;
+  if (!data) return defval;
 
   // e.g. 'pre${prop[0].name}suf' => ['pre${prop[0].name}suf', 'prop[0].name']
   const exp = /\$\{([\w|\.|\[|\]]*)\}/g;
@@ -12,7 +13,6 @@ export function getFormattedText(data: any, formatter: string, trans?: Record<st
   if (!res) return formatter;
 
   const [__, prop] = res;
-  const val = defaultValue === undefined ? '-' : defaultValue;
   const txt = get(data, prop);
 
   // 如果指明了需要进行翻译，那么根据 txt 的值查找翻译内容，必要时进行二次翻译
@@ -21,9 +21,9 @@ export function getFormattedText(data: any, formatter: string, trans?: Record<st
     // 如果查不出翻译内容则返回原本的值
     if (translated === undefined) return txt;
     const result = getFormattedText(data, translated);
-    return formatter.replace(exp, isNil(result) ? val : result);
+    return formatter.replace(exp, isNil(result) ? defval : result);
   }
-  return formatter.replace(exp, isNil(txt) ? val : txt);
+  return formatter.replace(exp, isNil(txt) ? defval : txt);
 }
 
 /** 获取 formatter 需要取的源 prop，用于在一些不支持 formatter 的组件中使用 */

src/views/vent/home/configurable/vent_v5.vue

@@ -1,10 +1,17 @@
 <!-- eslint-disable vue/multi-word-component-names -->
 <template>
   <div class="company-home">
-    <div v-if="!route.query.embed" class="top-bg">
-      <div class="main-title">{{ mainTitle }}</div>
-    </div>
-    <!-- <a-dropdown class="module-dropdown" :class="{ 'module-dropdown-original': isOriginal }" :trigger="['click']" placement="bottomRight">
+    <!-- 如果是有 deviceType、type 等 query，认为是详情页，不需要展示普通模块，只需要模型 -->
+    <template v-if="route.query.deviceType">
+      <div style="width: 100%; height: 100%; position: absolute; left: 0; top: 0">
+        <VentModal />
+      </div>
+    </template>
+    <template v-else>
+      <div v-if="!route.query.embed" class="top-bg">
+        <div class="main-title">{{ mainTitle }}</div>
+      </div>
+      <!-- <a-dropdown class="module-dropdown" :class="{ 'module-dropdown-original': isOriginal }" :trigger="['click']" placement="bottomRight">
       <a class="ant-dropdown-link" @click.prevent>
         全矿井通风检测
         <CaretDownOutlined />
@@ -13,13 +20,7 @@
         <MonitorCenter />
       </template>
     </a-dropdown> -->
-    <!-- 如果是有 deviceType、type 等 query，认为是详情页，不需要展示普通模块，只需要模型 -->
-    <template v-if="route.query.deviceType">
-      <div style="width: 100%; height: 100%; position: absolute; left: 0; top: 0">
-        <VentModal />
-      </div>
-    </template>
-    <template v-else>
+
       <!-- 采用定位方式以避免出现各个模块隐藏时其他模块下移的问题 -->
       <template v-if="isOriginal">
         <ModuleOriginal