冲突修改-提交

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

@@ -836,7 +836,7 @@ export const testConfigGasInjectCc: Config[] = [
       position: 'top:10px;left:10px;',
     },
   },
-   {
+  {
     deviceType: 'cc-detail',
     moduleName: '抽采单元详情',
     pageType: 'gas_injection',
@@ -903,225 +903,229 @@ export const testConfigGasInjectCc: Config[] = [
       position: 'top:350px;left:10px;',
     },
   },
-//  {
-//    deviceType: 'env-monitor',
-//    moduleName: '试验区环境监测',
-//    pageType: 'gas_injection_syq',
-//    moduleData: {
-//      header: {
-//        show: false,
-//        readFrom: '',
-//        selector: {
-//          show: false,
-//          value: '',
-//        },
-//        slot: {
-//          show: false,
-//          value: '',
-//        },
-//      },
-//      background: {
-//        show: false,
-//        type: 'video',
-//        link: '',
-//      },
-//      layout: {
-//        direction: 'row',
-//        items: [
-//          {
-//            name: 'list',
-//            basis: '100%',
-//          },
-//        ],
-//      },
-//      board: [],
-//      chart: [],
-//      gallery: [],
-//      gallery_list: [],
-//      table: [],
-//      list: [
-//        {
-//          type: 'inject-syq-list',
-//          readFrom: '',
-//          items: [
-//            {
-//              label: '试验区温度(℃)',
-//              value: 'xxxxxx',
-//              info: '',
-//            },
-//            {
-//              label: '氧气浓度',
-//              value: 'xxxxxx',
-//              info: '',
-//            },
-//            {
-//              label: '甲烷浓度',
-//              value: 'xxxxxx',
-//              info: '',
-//            },
-//          ],
-//        },
-//      ],
-//      complex_list: [],
-//      preset: [],
-//    },
-//    showStyle: {
-//      size: 'width:470px;height:240px;',
-//      version: '注气',
-//      position: 'top:600px;left:10px;',
-//    },
-// },
-// {
-//    deviceType: 'inject-status',
-//    moduleName: '注气驱替概况',
-//    pageType: 'gas_injection_syq',
-//    moduleData: {
-//      header: {
-//        show: false,
-//        readFrom: '',
-//        selector: {
-//          show: false,
-//          value: '${strinstallpos}',
-//        },
-//        slot: {
-//          show: false,
-//          value: '',
-//        },
-//      },
-//      background: {
-//        show: true,
-//        type: 'video',
-//        link: 'https://data.playground.edgeone.ai/resource/video/flv/demo-1/index.flv',
-//      },
-//      layout: {
-//        direction: 'row',
-//        items: [
-//          {
-//            name: 'chart',
-//            basis: '100%',
-//          },
-//        ],
-//      },
-//      board: [],
-//      chart: [
-//        {
-//          type: 'inject-syq-chart',
-//          readFrom: '',
-//          legend: { show: true },
-//          xAxis: [{ show: true }],
-//          yAxis: [{ show: true, name: '', position: 'left' }],
-//          series: [
-//            { readFrom: 'chartMock', xprop: 'time', yprop: 'inject', label: '总注气量' },
-//            { readFrom: 'chartMock', xprop: 'time', yprop: 'gas', label: '总抽采瓦斯纯量' },
-//            { readFrom: 'chartMock', xprop: 'time', yprop: 'rate', label: '注抽比' },
-//          ],
-//        },
-//      ],
-//      gallery: [],
-//      gallery_list: [],
-//      table: [],
-//      list: [],
-//      complex_list: [],
-//      preset: [],
-//      mock: {
-//        chartMock: [
-//          { time: '00:00', inject: 100, gas: 80, rate: 40 },
-//          { time: '02:00', inject: 160, gas: 120, rate: 60 },
-//          { time: '04:00', inject: 140, gas: 100, rate: 80 },
-//          { time: '06:00', inject: 150, gas: 130, rate: 50 },
-//          { time: '08:00', inject: 120, gas: 90, rate: 30 },
-//        ],
-//      },
-//    },
-//    showStyle: {
-//      size: 'width:470px;height:240px;',
-//      version: '注气',
-//      position: 'top:600px;left:490px;',
-//    },
-// },
-// {
-//    deviceType: 'inject-video',
-//    moduleName: '注气区视频监控',
-//    pageType: 'gas_injection_syq',
-//    moduleData: {
-//      header: {
-//        show: false,
-//        readFrom: '',
-//        selector: {
-//          show: false,
-//          value: '${strinstallpos}',
-//        },
-//        slot: {
-//          show: false,
-//          value: '',
-//        },
-//      },
-//      background: {
-//        show: true,
-//        type: 'video',
-//        link: 'https://data.playground.edgeone.ai/resource/video/flv/demo-1/index.flv',
-//      },
-//      layout: {
-//        direction: 'row',
-//        items: [],
-//      },
-//      board: [],
-//      chart: [],
-//      gallery: [],
-//      gallery_list: [],
-//      table: [],
-//      list: [],
-//      complex_list: [],
-//      preset: [],
-//    },
-//    showStyle: {
-//      size: 'width:470px;height:240px;',
-//      version: '注气',
-//      position: 'top:600px;right:490px;',
-//    },
-// },
-// {
-//    deviceType: 'extraction-video',
-//    moduleName: '抽采区视频监控',
-//    pageType: 'gas_injection_syq',
-//    moduleData: {
-//      header: {
-//        show: false,
-//        readFrom: '',
-//        selector: {
-//          show: false,
-//          value: '${strinstallpos}',
-//        },
-//        slot: {
-//          show: false,
-//          value: '',
-//        },
-//      },
-//      background: {
-//        show: true,
-//        type: 'video',
-//        link: 'https://data.playground.edgeone.ai/resource/video/flv/demo-1/index.flv',
-//      },
-//      layout: {
-//        direction: 'row',
-//        items: [],
-//      },
-//      board: [],
-//      chart: [],
-//      gallery: [],
-//      gallery_list: [],
-//      table: [],
-//      list: [],
-//      complex_list: [],
-//      preset: [],
-//    },
-//    showStyle: {
-//      size: 'width:470px;height:240px;',
-//      version: '注气',
-//      position: 'top:600px;right:10px;',
-//    },
-// },
+
 ];
+//注气驱替-试验
+export const testConfigGasInjectSy: Config[] = [
+  {
+    deviceType: 'env-monitor',
+    moduleName: '试验区环境监测',
+    pageType: 'gas_injection_syq',
+    moduleData: {
+      header: {
+        show: false,
+        readFrom: '',
+        selector: {
+          show: false,
+          value: '',
+        },
+        slot: {
+          show: false,
+          value: '',
+        },
+      },
+      background: {
+        show: false,
+        type: 'video',
+        link: '',
+      },
+      layout: {
+        direction: 'row',
+        items: [
+          {
+            name: 'list',
+            basis: '100%',
+          },
+        ],
+      },
+      board: [],
+      chart: [],
+      gallery: [],
+      gallery_list: [],
+      table: [],
+      list: [
+        {
+          type: 'inject-syq-list',
+          readFrom: '',
+          items: [
+            {
+              label: '试验区温度(℃)',
+              value: 'xxxxxx',
+              info: '',
+            },
+            {
+              label: '氧气浓度',
+              value: 'xxxxxx',
+              info: '',
+            },
+            {
+              label: '甲烷浓度',
+              value: 'xxxxxx',
+              info: '',
+            },
+          ],
+        },
+      ],
+      complex_list: [],
+      preset: [],
+    },
+    showStyle: {
+      size: 'width:470px;height:240px;',
+      version: '注气',
+      position: 'top:600px;left:10px;',
+    },
+  },
+  {
+    deviceType: 'inject-status',
+    moduleName: '注气驱替概况',
+    pageType: 'gas_injection_syq',
+    moduleData: {
+      header: {
+        show: false,
+        readFrom: '',
+        selector: {
+          show: false,
+          value: '${strinstallpos}',
+        },
+        slot: {
+          show: false,
+          value: '',
+        },
+      },
+      background: {
+        show: true,
+        type: 'video',
+        link: 'https://data.playground.edgeone.ai/resource/video/flv/demo-1/index.flv',
+      },
+      layout: {
+        direction: 'row',
+        items: [
+          {
+            name: 'chart',
+            basis: '100%',
+          },
+        ],
+      },
+      board: [],
+      chart: [
+        {
+          type: 'inject-syq-chart',
+          readFrom: '',
+          legend: { show: true },
+          xAxis: [{ show: true }],
+          yAxis: [{ show: true, name: '', position: 'left' }],
+          series: [
+            { readFrom: 'chartMock', xprop: 'time', yprop: 'inject', label: '总注气量' },
+            { readFrom: 'chartMock', xprop: 'time', yprop: 'gas', label: '总抽采瓦斯纯量' },
+            { readFrom: 'chartMock', xprop: 'time', yprop: 'rate', label: '注抽比' },
+          ],
+        },
+      ],
+      gallery: [],
+      gallery_list: [],
+      table: [],
+      list: [],
+      complex_list: [],
+      preset: [],
+      mock: {
+        chartMock: [
+          { time: '00:00', inject: 100, gas: 80, rate: 40 },
+          { time: '02:00', inject: 160, gas: 120, rate: 60 },
+          { time: '04:00', inject: 140, gas: 100, rate: 80 },
+          { time: '06:00', inject: 150, gas: 130, rate: 50 },
+          { time: '08:00', inject: 120, gas: 90, rate: 30 },
+        ],
+      },
+    },
+    showStyle: {
+      size: 'width:470px;height:240px;',
+      version: '注气',
+      position: 'top:600px;left:490px;',
+    },
+  },
+  {
+    deviceType: 'inject-video',
+    moduleName: '注气区视频监控',
+    pageType: 'gas_injection_syq',
+    moduleData: {
+      header: {
+        show: false,
+        readFrom: '',
+        selector: {
+          show: false,
+          value: '${strinstallpos}',
+        },
+        slot: {
+          show: false,
+          value: '',
+        },
+      },
+      background: {
+        show: true,
+        type: 'video',
+        link: 'https://data.playground.edgeone.ai/resource/video/flv/demo-1/index.flv',
+      },
+      layout: {
+        direction: 'row',
+        items: [],
+      },
+      board: [],
+      chart: [],
+      gallery: [],
+      gallery_list: [],
+      table: [],
+      list: [],
+      complex_list: [],
+      preset: [],
+    },
+    showStyle: {
+      size: 'width:470px;height:240px;',
+      version: '注气',
+      position: 'top:600px;right:490px;',
+    },
+  },
+  {
+    deviceType: 'extraction-video',
+    moduleName: '抽采区视频监控',
+    pageType: 'gas_injection_syq',
+    moduleData: {
+      header: {
+        show: false,
+        readFrom: '',
+        selector: {
+          show: false,
+          value: '${strinstallpos}',
+        },
+        slot: {
+          show: false,
+          value: '',
+        },
+      },
+      background: {
+        show: true,
+        type: 'video',
+        link: 'https://data.playground.edgeone.ai/resource/video/flv/demo-1/index.flv',
+      },
+      layout: {
+        direction: 'row',
+        items: [],
+      },
+      board: [],
+      chart: [],
+      gallery: [],
+      gallery_list: [],
+      table: [],
+      list: [],
+      complex_list: [],
+      preset: [],
+    },
+    showStyle: {
+      size: 'width:470px;height:240px;',
+      version: '注气',
+      position: 'top:600px;right:10px;',
+    },
+  },
+]
 
 export const testConfigVentSsl: Config[] = [
   {

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

@@ -39,7 +39,7 @@ import navMenu from './components/gasInject/navMenu.vue'
 import VentModal from '/@/components/vent/micro/ventModal.vue';
 import { getHomeData } from './configurable.api';
 // import { useRoute } from 'vue-router';
-import { testConfigGasInject, testConfigGasInjectZq,testConfigGasInjectCc } from './configurable.data';
+import { testConfigGasInject, testConfigGasInjectZq,testConfigGasInjectCc,testConfigGasInjectSy } from './configurable.data';
 const { configs, fetchConfigs } = useInitConfigs();
 const { mainTitle, data, updateData } = useInitPage('注气驱替智能管控系统');
 // const route = useRoute();
@@ -63,6 +63,7 @@ function toggleMenu(param) {
       configs.value = testConfigGasInject;
       break;
     case 'syq':
+       configs.value = testConfigGasInjectSy;
       break;
     case 'zqxt':
       configs.value = testConfigGasInjectZq;