Merge branch 'master' of http://39.97.59.228:8013/lxh/gas-injection

src/views/vent/home/configurable/components/detail/MiniBoard.vue

@@ -818,7 +818,7 @@ defineEmits(['click']);
   .mini-board__label_E {
     background-image: var(--image-jdjl);
   }
-
+}
   .mini-board_inject-syq {
     width: 100px;
     height: auto;
@@ -873,5 +873,4 @@ defineEmits(['click']);
       }
     }
   }
-}
 </style>

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

@@ -959,8 +959,68 @@ export const testConfigGasInjectCc: Config[] = [
 //注气驱替-试验
 export const testConfigGasInjectSy: Config[] = [
   {
-    deviceType: 'cc-detail',
-    moduleName: '抽采单元详情',
+    deviceType: 'workface-info',
+    moduleName: '工作面信息',
+    pageType: 'gas_injection',
+    showDetail: true,
+    moduleData: {
+      header: {
+        show: false,
+        readFrom: '',
+        selector: {
+          show: false,
+          value: '${strinstallpos}',
+        },
+        slot: {
+          show: false,
+          value: '',
+        },
+      },
+      background: {
+        show: false,
+        type: 'video',
+        link: '',
+      },
+      layout: {
+        direction: 'row',
+        items: [
+          {
+            name: 'gas_inject_list',
+            basis: '100%',
+          },
+        ],
+      },
+      board: [],
+      chart: [],
+      gallery: [],
+      gallery_list: [],
+      table: [],
+      list: [],
+      complex_list: [],
+      preset: [
+        {
+          readFrom: '',
+          option: [
+            { label: '瓦斯浓度', value: '12304' },
+            { label: '试验区范围', value: '2号煤' },
+            { label: '瓦斯储量', value: '2924.6' },
+            { label: '采面宽度', value: '300.4' },
+            { label: '剩余可开采长度', value: '900' },
+            { label: '甲烷气体标况瞬量', value: '3.40' },
+            { label: '累计流量', value: '100' },
+          ],
+        },
+      ],
+    },
+    showStyle: {
+      size: 'width:460px;height:315px;',
+      version: '注气',
+      position: 'top:10px;left:10px;',
+    },
+  },
+  {
+    deviceType: 'device-status',
+    moduleName: '设备及管路状态',
     pageType: 'gas_injection',
     showDetail: true,
     moduleData: {
@@ -1020,7 +1080,7 @@ export const testConfigGasInjectSy: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:470px;height:220px;',
+      size: 'width:460px;height:220px;',
       version: '注气',
       position: 'top:350px;left:10px;',
     },
@@ -1088,7 +1148,7 @@ export const testConfigGasInjectSy: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:470px;height:240px;',
+      size: 'width:460px;height:240px;',
       version: '注气',
       position: 'top:600px;left:10px;',
     },
@@ -1156,7 +1216,7 @@ export const testConfigGasInjectSy: Config[] = [
       },
     },
     showStyle: {
-      size: 'width:470px;height:240px;',
+      size: 'width:460px;height:240px;',
       version: '注气',
       position: 'top:600px;left:490px;',
     },
@@ -1197,7 +1257,7 @@ export const testConfigGasInjectSy: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:470px;height:240px;',
+      size: 'width:460px;height:240px;',
       version: '注气',
       position: 'top:600px;right:490px;',
     },
@@ -1238,7 +1298,7 @@ export const testConfigGasInjectSy: Config[] = [
       preset: [],
     },
     showStyle: {
-      size: 'width:470px;height:240px;',
+      size: 'width:460px;height:240px;',
       version: '注气',
       position: 'top:600px;right:10px;',
     },