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

src/views/vent/gas/components/list/listItem.vue

@@ -5,7 +5,7 @@
         {{ label }}
       </slot>
     </div>
-    <div class="list-item__value" :class="{ 'list-item__border': bordered }">
+    <div class="list-item__value" :class="{ 'list-item__border': bordered }" :style="valueStyle">
       <slot name="value">
         <!-- 状态灯 -->
         <div v-if="type === 'status-light'" :class="statusLightConfig.class">
@@ -43,6 +43,8 @@
       type?: 'input' | 'default' | 'status-light';
       /** 输入框的固定宽度 */
       labelWidth?: number | string;
+      /** 输入框的固定宽度 */
+      valueWidth?: number | string;
       /** 状态灯配置，第一项配置激活状态，第二项配置失活状态 */
       status?: [{ label: string; value: any }, { label: string }];
     }>(),
@@ -73,6 +75,11 @@
     const width = typeof w === 'string' ? w : `${w}px`;
     return { width };
   });
+  const valueStyle = computed(() => {
+    const w = props.valueWidth;
+    const width = typeof w === 'string' ? w : `${w}px`;
+    return { width };
+  });
 </script>
 
 <style lang="less" scoped>

src/views/vent/gas/gasPumpSetting/components/settingForm.vue

@@ -1,6 +1,21 @@
 <template>
   <div class="setting-form">
     <div class="setting-form__wrapper">
+      <FormTitle icon="pump" title="基础参数" />
+      <BasicForm :model="model" :schemas="paramsFormSchema" @register="regEUForm" @submit="submitHandler">
+        <template #input="{ model: m, field, schema }">
+          <ListItem class="w-100%" v-model:value="m[field]" type="input" bordered :label-width="180" :value-width="80">
+            <template #label>
+              {{ schema.label }}
+              <Tooltip v-if="schema.helpMessage" :title="schema.helpMessage">
+                <InfoCircleOutlined />
+              </Tooltip>
+            </template>
+          </ListItem>
+        </template>
+      </BasicForm>
+    </div>
+    <!-- <div class="setting-form__wrapper">
       <FormTitle icon="gas-pump" title="工作面参数" />
       <BasicForm :model="model" :schemas="workSurfaceFormSchema" @register="regWSForm" @submit="submitHandler">
         <template #input="{ model: m, field, schema }">
@@ -29,7 +44,7 @@
           </ListItem>
         </template>
       </BasicForm>
-    </div>
+    </div> -->
     <div class="setting-form__wrapper">
       <FormTitle icon="water-pump" title="计算参数" />
       <BasicForm :model="model" :schemas="calculationFormSchema" @register="regCCForm" @submit="submitHandler">
@@ -42,7 +57,14 @@
           </ListItem>
         </template> -->
         <template #input="{ model: m, field, schema }">
-          <ListItem class="w-100%" v-model:value="m[field]" type="input" :label="schema.label" bordered :label-width="200" />
+          <ListItem class="w-100%" v-model:value="m[field]" type="input" bordered :label-width="180" :value-width="80">
+            <template #label>
+              {{ schema.label }}
+              <Tooltip v-if="schema.helpMessage" :title="schema.helpMessage">
+                <InfoCircleOutlined />
+              </Tooltip>
+            </template>
+          </ListItem>
         </template>
       </BasicForm>
     </div>
@@ -59,7 +81,7 @@
   import ListItem from '@/views/vent/gas/components/list/listItem.vue';
   import FormTitle from '@/views/vent/gas/components/form/formTitle.vue';
   import { useForm, BasicForm } from '/@/components/Form';
-  import { workSurfaceFormSchema, extractionUnitFormSchema, calculationFormSchema } from '../gasPumpSetting.data';
+  import { /** workSurfaceFormSchema, extractionUnitFormSchema, */ calculationFormSchema, paramsFormSchema } from '../gasPumpSetting.data';
   import { ref } from 'vue';
   import { InfoCircleOutlined } from '@ant-design/icons-vue';
 
@@ -77,7 +99,7 @@
   };
 
   const formData = ref<Record<string, any>>({});
-  const [regWSForm, { submit: submitWSForm }] = useForm(defaultFormProp);
+  // const [regWSForm, { submit: submitWSForm }] = useForm(defaultFormProp);
   const [regEUForm, { submit: submitEUForm }] = useForm(defaultFormProp);
   const [regCCForm, { submit: submitCCForm }] = useForm(defaultFormProp);
   function submitHandler(v) {
@@ -91,13 +113,13 @@
   //   emit('cancel');
   // }
   function calculate() {
-    Promise.all([submitWSForm(), submitEUForm()]).then(() => {
+    Promise.all([/** submitWSForm(), */ submitEUForm()]).then(() => {
       emit('calculate', { ...props.model, ...formData.value });
     });
   }
 
   function submit() {
-    Promise.all([submitWSForm(), submitEUForm(), submitCCForm()]).then(() => {
+    Promise.all([/** submitWSForm(), */ submitEUForm(), submitCCForm()]).then(() => {
       emit('submit', { ...props.model, ...formData.value });
     });
   }

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

@@ -6,6 +6,7 @@ enum Api {
   deleteGasDrainageParam = 'safety/gasDrainage/deleteGasDrainageParam',
   getGasDrainageParamList = 'safety/gasDrainage/getGasDrainageParamList',
   updateGasDrainageParam = 'safety/gasDrainage/updateGasDrainageParam',
+  getEvaluationUnitList = '/ventanaly-device/safety/evaluationUnit/getEvaluationUnitList',
 }
 /**
  * 新增接口
@@ -57,3 +58,12 @@ export const updateGasDrainageParam = (data) => {
     params: data,
   });
 };
+/**
+ *
+ */
+export const getEvaluationUnitList = (data) => {
+  return defHttp.post({
+    url: Api.getEvaluationUnitList,
+    params: data,
+  });
+};

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

@@ -1,13 +1,84 @@
 import { FormSchema } from '@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 
-/** 工作面参数表单配置项 */
-export const workSurfaceFormSchema: FormSchema[] = [
+/** 参数表单配置项 */
+export const paramsFormSchema: FormSchema[] = [
   {
-    label: '煤的灰分',
-    field: 'Ad',
+    label: 'L1',
+    field: 'workingFaceLengeh',
+    component: 'Input',
+    slot: 'input',
+    helpMessage: '工作面长度(m)',
+  },
+  {
+    label: 'L2',
+    field: 'evaluationUnitDirectionLength',
+    component: 'Input',
+    slot: 'input',
+    helpMessage: '评价单元走向长度(m)',
+  },
+  {
+    label: 'h',
+    field: 'coalSeamThickness',
     component: 'Input',
     slot: 'input',
+    helpMessage: '煤层厚度(m)',
+  },
+  {
+    label: 'ρ',
+    field: 'coalSeamThickness',
+    component: 'Input',
+    slot: 'input',
+    helpMessage: '煤的密度(t/m³)',
+  },
+  {
+    label: 'η',
+    field: 'workingFaceRecoveryRate',
+    component: 'Input',
+    slot: 'input',
+    helpMessage: '工作面回采率(%)',
+  },
+  {
+    label: 'W',
+    field: 'originalGasContent',
+    component: 'Input',
+    slot: 'input',
+    helpMessage: '单元原始瓦斯含量(m³/t)',
+  },
+  {
+    label: 'W0',
+    field: 'W0',
+    component: 'Input',
+    slot: 'input',
+    helpMessage: '回采前煤体瓦斯含量',
+  },
+  {
+    label: 'W01',
+    field: 'W01',
+    component: 'Input',
+    slot: 'input',
+    helpMessage: '煤的原始瓦斯含量',
+  },
+  {
+    label: 'W0i',
+    field: 'W0i',
+    component: 'Input',
+    slot: 'input',
+    helpMessage: '第i个邻近层煤层原始瓦斯含量',
+  },
+  {
+    label: 'Wc',
+    field: 'Wc',
+    component: 'Input',
+    slot: 'input',
+    helpMessage: '运出矿井后煤的残存瓦斯含量',
+  },
+  {
+    label: 'Wci',
+    field: 'Wci',
+    component: 'Input',
+    slot: 'input',
+    helpMessage: '第i个邻近层煤层残存瓦斯含量	',
   },
   {
     label: 'K1',
@@ -52,23 +123,18 @@ export const workSurfaceFormSchema: FormSchema[] = [
     helpMessage: '分层开采第i分层瓦斯涌出影响系数,面无分层开采该值取1',
   },
   {
-    label: '煤的水分',
-    field: 'Mad',
-    component: 'Input',
-    slot: 'input',
-  },
-  {
-    label: '标准大气压',
+    label: 'Pa',
     field: 'Pa',
     component: 'Input',
     slot: 'input',
+    helpMessage: '标准大气压力(Pa)',
   },
   {
     label: 'Pcy',
     field: 'Pcy',
     component: 'Input',
     slot: 'input',
-    helpMessage: '煤层残余相对瓦斯压力',
+    helpMessage: '煤层残余相对瓦斯压力(Pa)',
   },
   {
     label: 'Q',
@@ -85,310 +151,288 @@ export const workSurfaceFormSchema: FormSchema[] = [
     helpMessage: '下分层相对瓦斯涌出量,回采工作面无分层开采该值取0',
   },
   {
-    label: '吸附常数A',
-    field: 'a',
-    component: 'Input',
-    slot: 'input',
-  },
-  {
-    label: '吸附常数B',
-    field: 'b',
-    component: 'Input',
-    slot: 'input',
-  },
-  {
-    label: '煤的密度',
-    field: 'coalDensity',
+    label: 'R',
+    field: 'R',
     component: 'Input',
     slot: 'input',
+    helpMessage: '抽采钻孔的有效影响半径(m)',
   },
   {
-    label: '煤的厚度',
-    field: 'coalSeamThickness',
+    label: 'TMax',
+    field: 'TMax',
     component: 'Input',
     slot: 'input',
+    helpMessage: '预抽时间最长的钻孔抽采天数',
   },
   {
-    label: '达标含量',
-    field: 'complianceContent',
+    label: 'Tmin',
+    field: 'Tmin',
     component: 'Input',
     slot: 'input',
+    helpMessage: '预抽时间最短的钻孔抽采天数',
   },
   {
     label: 'daH1',
     field: 'daH1',
     component: 'Input',
     slot: 'input',
-    helpMessage: '评价单元正向两端巷道瓦斯预排等值宽度',
+    helpMessage: '分别为评价单元走向方向两端巷道瓦斯预排等值宽度(m)',
   },
   {
     label: 'daH2',
     field: 'daH2',
     component: 'Input',
     slot: 'input',
-    helpMessage: '评价单元反向两端巷道瓦斯预排等值宽度',
-  },
-  {
-    label: 'daH',
-    field: 'daH',
-    component: 'Input',
-    slot: 'input',
-    helpMessage: '评价单元煤层走向长度',
+    helpMessage: '分别为评价单元走向方向两端巷道瓦斯预排等值宽度(m)',
   },
   {
-    label: '评价单元煤炭储量',
-    field: 'evaluationUnitCoalReserves',
+    label: 'daL',
+    field: 'daL',
     component: 'Input',
     slot: 'input',
+    helpMessage: '评价单元煤层走向长度(m)',
   },
   {
     label: 'h',
     field: 'h',
     component: 'Input',
     slot: 'input',
-    helpMessage: '邻近层与开采层垂直距离',
+    helpMessage: '邻近层与开采层垂直距离(m)',
   },
   {
     label: 'm',
     field: 'm',
     component: 'Input',
     slot: 'input',
-    helpMessage: '评价单元平均煤层厚度',
+    helpMessage: '评价单元平均煤层厚度(m)',
   },
   {
     label: 'm1',
     field: 'm1',
     component: 'Input',
     slot: 'input',
-    helpMessage: '割煤高度',
+    helpMessage: '割煤高度(m)',
   },
   {
     label: 'm2',
     field: 'm2',
     component: 'Input',
     slot: 'input',
-    helpMessage: '放顶煤高度',
+    helpMessage: '放顶煤高度(m)',
   },
   {
-    label: '煤的孔隙率',
-    field: 'meiDeKongXiLv',
+    label: 'mi',
+    field: 'mi',
     component: 'Input',
     slot: 'input',
+    helpMessage: '第i个邻近层煤层厚度(m)',
   },
   {
-    label: '煤的容重',
-    field: 'meiDeRongZhong',
+    label: 'xiaoH1',
+    field: 'xiaoH1',
     component: 'Input',
     slot: 'input',
+    helpMessage: '评价单元走向方向两端巷道瓦斯预排等值宽度1(m)',
   },
   {
-    label: 'mi',
-    field: 'mi',
+    label: 'xiaoH2',
+    field: 'xiaoH2',
     component: 'Input',
     slot: 'input',
-    helpMessage: '第i个邻近层煤层厚度',
+    helpMessage: '评价单元走向方向两端巷道瓦斯预排等值宽度2(m)',
   },
   {
-    label: '工作面瓦斯储量',
-    field: 'workingFaceGasReserves',
+    label: 'xiaoL',
+    field: 'xiaoL',
     component: 'Input',
     slot: 'input',
+    helpMessage: '评价单元抽采钻孔控制范围内煤层平均倾向长度(m)',
   },
   {
-    label: '工作面长度',
-    field: 'workingFaceLengeh',
+    label: '吸附常数a(cm³/g)',
+    field: 'a',
     component: 'Input',
     slot: 'input',
   },
-];
-
-/** 计算参数表单配置项 */
-export const calculationFormSchema: FormSchema[] = [
   {
-    label: '预抽瓦斯达标量',
-    field: 'preDrainageGasReachingStandardQuantity',
+    label: '吸附常数b(MPa-1)',
+    field: 'b',
     component: 'Input',
     slot: 'input',
   },
   {
-    label: '割煤相对瓦斯涌出量',
-    field: 'relativeGasEmissionDuringCoalCutting',
+    label: '抽采半径(m)',
+    field: 'drainageRadius',
     component: 'Input',
     slot: 'input',
   },
   {
-    label: '放煤相对瓦斯涌出量',
-    field: 'relativeGasEmissionFromCoalDischarge',
+    label: '钻孔施工长度(m)',
+    field: 'drillWorkLength',
     component: 'Input',
     slot: 'input',
   },
   {
-    label: '采空区相对瓦斯涌出量',
-    field: 'relativeGasEmissionFromGoaf',
+    label: '钻孔设计长度(m)',
+    field: 'drillDesignLength',
     component: 'Input',
     slot: 'input',
   },
   {
-    label: '邻近层相对瓦斯涌出量',
-    field: 'relativeGasEmissionFromAdjacentLayers',
+    label: '单元原始瓦斯压力(MPa)',
+    field: 'originalGasPressure',
     component: 'Input',
     slot: 'input',
   },
   {
-    label: '邻近层瓦斯排放率',
-    field: 'gasEmissionRateOfAdjacentLayers',
+    label: '残余瓦斯含量(m³/t)',
+    field: 'residualGasContent',
     component: 'Input',
     slot: 'input',
   },
   {
-    label: '残余瓦斯压力',
-    field: 'residualGasPressure',
+    label: '残余可解吸瓦斯量(m³/t)',
+    field: 'residualGasDesorptionCapacity',
     component: 'Input',
     slot: 'input',
   },
   {
-    label: '残余瓦斯含量',
-    field: 'residualGasContent',
+    label: '工作面日产量(t/d)',
+    field: 'workingFaceDailyOutput',
     component: 'Input',
     slot: 'input',
   },
-  // {
-  //   label: '煤的灰分',
-  //   field: 'Ad',
-  //   component: 'Input',
-  //   slot: 'input',
-  // },
   {
-    label: 'K1',
-    field: 'K1',
+    label: '煤的灰分(%)',
+    field: 'Ad',
     component: 'Input',
     slot: 'input',
   },
   {
-    label: 'K2',
-    field: 'K2',
+    label: '煤的水分(%)',
+    field: 'Mad',
     component: 'Input',
     slot: 'input',
   },
   {
-    label: 'K3',
-    field: 'K3',
+    label: '煤的孔隙率',
+    field: 'meiDeKongXiLv',
     component: 'Input',
     slot: 'input',
   },
   {
-    label: 'K4',
-    field: 'K4',
+    label: '煤的容重',
+    field: 'meiDeRongZhong',
     component: 'Input',
     slot: 'input',
   },
-  // {
-  //   label: 'Q',
-  //   field: 'Q',
-  //   component: 'Input',
-  //   slot: 'input',
-  // },
-  // {
-  //   label: 'R',
-  //   field: 'R',
-  //   component: 'Input',
-  //   slot: 'input',
-  // },
-  // {
-  //   label: '吸附常数a',
-  //   field: 'a',
-  //   component: 'Input',
-  //   slot: 'input',
-  // },
-  // {
-  //   label: '吸附常数b',
-  //   field: 'b',
-  //   component: 'Input',
-  //   slot: 'input',
-  // },
 ];
 
-/** 抽采单元参数表单配置项 */
-export const extractionUnitFormSchema: FormSchema[] = [
+/** 工作面参数表单配置项 */
+export const workSurfaceFormSchema: FormSchema[] = [
   {
-    label: 'R',
-    field: 'R',
+    label: 'm2',
+    field: 'm2',
     component: 'Input',
     slot: 'input',
-    helpMessage: '抽采钻孔的有效影响半径',
+    helpMessage: '放顶煤高度',
   },
   {
-    label: 'TMax',
-    field: 'TMax',
+    label: 'mi',
+    field: 'mi',
     component: 'Input',
     slot: 'input',
-    helpMessage: '预抽时间最长的钻孔抽采天数',
+    helpMessage: '第i个邻近层煤层厚度',
   },
   {
-    label: 'Tmin',
-    field: 'Tmin',
+    label: '工作面瓦斯储量',
+    field: 'workingFaceGasReserves',
     component: 'Input',
     slot: 'input',
-    helpMessage: '预抽时间最短的钻孔抽采天数',
   },
+  {
+    label: '工作面长度',
+    field: 'workingFaceLengeh',
+    component: 'Input',
+    slot: 'input',
+  },
+];
 
+/** 计算参数表单配置项 */
+export const calculationFormSchema: FormSchema[] = [
   {
-    label: 'W0',
-    field: 'W0',
+    label: 'Z',
+    field: 'evaluationUnitCoalReserves',
     component: 'Input',
     slot: 'input',
-    helpMessage: '回采前煤体瓦斯含量',
+    helpMessage: '评价单元煤炭储量(万吨)',
   },
   {
-    label: '煤的原始瓦斯含量',
-    field: 'W01',
+    label: 'q',
+    field: 'absoluteSurgeVolume',
     component: 'Input',
     slot: 'input',
+    helpMessage: '工作面预测绝对涌出量(m³/min)',
   },
   {
-    label: 'W0i',
-    field: 'W0i',
+    label: 'q1',
+    field: 'relativeGasEmissionDuringCoalCutting',
     component: 'Input',
     slot: 'input',
-    helpMessage: '第i个邻近层煤层原始瓦斯含量',
+    helpMessage: '割煤相对瓦斯涌出量(m³/t)',
   },
   {
-    label: 'Wc',
-    field: 'Wc',
+    label: 'q2',
+    field: 'relativeGasEmissionFromCoalDischarge',
     component: 'Input',
     slot: 'input',
-    helpMessage: '运出矿井后煤的残存瓦斯含量',
+    helpMessage: '放煤相对瓦斯涌出量(m³/t)',
   },
   {
-    label: 'Wci',
-    field: 'Wci',
+    label: 'q3',
+    field: 'relativeGasEmissionFromGoaf',
     component: 'Input',
     slot: 'input',
-    helpMessage: '第i个邻近层煤层残存瓦斯含量	',
+    helpMessage: '采空区相对瓦斯涌出量(m³/t)',
   },
   {
-    label: 'xiaoH1',
-    field: 'xiaoH1',
+    label: 'q4',
+    field: 'relativeGasEmissionFromAdjacentLayers',
     component: 'Input',
     slot: 'input',
-    helpMessage: '评价单元走向方向两端巷道瓦斯预排等值宽度1',
+    helpMessage: '邻近层相对瓦斯涌出量(m³/t)',
   },
   {
-    label: 'xiaoH2',
-    field: 'xiaoH2',
+    label: 'qc',
+    field: 'relativeSurgeVolume',
     component: 'Input',
     slot: 'input',
-    helpMessage: '评价单元走向方向两端巷道瓦斯预排等值宽度2',
+    helpMessage: '工作面预测相对涌出量(m³/t)',
   },
   {
-    label: 'xiaoL',
-    field: 'xiaoL',
+    label: 'ηi',
+    field: 'gasEmissionRateOfAdjacentLayers',
+    component: 'Input',
+    slot: 'input',
+    helpMessage: '邻近层瓦斯排放率(%)',
+  },
+  {
+    label: '工作面瓦斯储量(m³)',
+    field: 'workingFaceGasReserves',
+    component: 'Input',
+    slot: 'input',
+  },
+  {
+    label: '预抽瓦斯达标量(m³)',
+    field: 'workingFaceGasReserves',
     component: 'Input',
     slot: 'input',
-    helpMessage: '评价单元抽采钻孔控制范围内煤层平均倾向长度',
   },
 ];
 
+/** 抽采单元参数表单配置项 */
+export const extractionUnitFormSchema: FormSchema[] = [];
+
 export const ManualSettingHeaderConfig = {
   summary: {
     title: '工作面日产量',

src/views/vent/gas/gasPumpSetting/manual.vue

@@ -7,7 +7,7 @@
     <UnitBoard v-for="(unit, i) in units" :key="`vggpsmh-${i}`" class="mr-20px" :label="unit.label" :contents="unit.contents" />
     <!-- </div> -->
   </div>
-  <div class="flex flex-justify-around mt-20px">
+  <div class="flex flex-justify-around">
     <div class="manual__maincontent">
       <span class="font-size-26px">现场测点布置图</span>
     </div>
@@ -30,6 +30,7 @@
   import { computed, ref } from 'vue';
   import { ManualSettingHeaderConfig } from './gasPumpSetting.data';
   import { onMounted } from 'vue';
+  // import { getEvaluationUnitList } from './gasPumpSetting.api';
 
   const data = ref([
     {
@@ -72,7 +73,9 @@
     return { label: ManualSettingHeaderConfig.summary.title, value: '123' };
   });
 
-  onMounted(() => {});
+  onMounted(() => {
+    // getEvaluationUnitList();
+  });
 </script>
 
 <style lang="less" scoped>
@@ -90,16 +93,17 @@
     background-image: url('/@/assets/images/vent/gas/square-border-1.png');
     background-repeat: no-repeat;
     background-position: center center;
-    background-size: 100% auto;
+    background-size: 100% 100%;
     width: 941px;
-    height: 806px;
+    height: 656px;
     text-align: center;
     padding: 10px;
+    margin-top: 10px;
     color: @white;
   }
 
   .manual__mainbadge {
-    margin: 10px 0;
+    // margin: 10px 0;
     padding: 20px 10px;
     text-align: center;
     background-image: linear-gradient(to right, #123e69, #123e6955, #123e69);