Просмотр исходного кода

[Feat 0000]皮带巷三级防灭火接口对接

bobo04052021@163.com 1 неделя назад
Родитель
Сommit
26a3276573

+ 0 - 88
src/views/vent/home/configurable/belt/belt.vue

@@ -46,94 +46,6 @@ function refresh() {
           .join(','),
       })
     ).then((res: any) => {
-      res.gate_control = [
-        {
-          sysId: 2028657172566073346,
-          systemName: '皮带巷三级防灭火系统总',
-          gateMap: [
-            {
-              frontGateOpen: '1',
-              rearGateOpen: '0',
-              positon: '风门1',
-              status: '1',
-            },
-            {
-              frontGateOpen: '0',
-              rearGateOpen: '1',
-              positon: '五盘区402辅运大巷风门',
-              status: '1',
-            },
-            {
-              frontGateOpen: '1',
-              rearGateOpen: '1',
-              positon: '风门3',
-              status: '1',
-            },
-            {
-              frontGateOpen: '0',
-              rearGateOpen: '0',
-              positon: '风门4',
-              status: '1',
-            },
-            {
-              frontGateOpen: '0',
-              rearGateOpen: '0',
-              positon: '风门5',
-              status: '1',
-            },
-            {
-              frontGateOpen: '1',
-              rearGateOpen: '1',
-              positon: '风门6',
-              status: '1',
-            },
-          ],
-        },
-      ];
-      res.monitor_alert = [
-        {
-          devTypeMap: [
-            {
-              name: 'CO传感器',
-              alarmLevel: '101',
-            },
-            {
-              name: '温度传感器',
-              alarmLevel: '101',
-            },
-            {
-              name: '火焰传感器',
-              alarmLevel: '101',
-            },
-            {
-              name: '微震测声传感器',
-              alarmLevel: '101',
-            },
-            {
-              name: '光纤测温传感器',
-              alarmLevel: '101',
-            },
-            {
-              name: 'HCI传感器',
-              alarmLevel: '101',
-            },
-            {
-              name: '烟雾传感器',
-              alarmLevel: '101',
-            },
-            {
-              name: '多参数传感器',
-              alarmLevel: '101',
-            },
-            {
-              name: 'AI视频火焰分析',
-              alarmLevel: '101',
-            },
-          ],
-          sysId: '2028657172566073346',
-          sysName: '皮带巷三级防灭火系统总',
-        },
-      ];
       res.spray_control = [
         {
           systemName: '皮带巷1',

+ 12 - 98
src/views/vent/home/configurable/belt/configurable.data.ts

@@ -107,7 +107,7 @@ export const testBeltLaneFire: Config[] = [
       complex_list: [
         {
           type: 'C',
-          readFrom: 'devTypeMap',
+          readFrom: 'devJSONAarry',
           mapFromData: true,
           pagetype: 'Belt',
           items: [
@@ -116,7 +116,7 @@ export const testBeltLaneFire: Config[] = [
               contents: [
                 {
                   label: '${name}',
-                  value: '${alarmLevel}',
+                  value: '${value}',
                 },
               ],
             },
@@ -261,7 +261,7 @@ export const testBeltLaneFire: Config[] = [
       table: [
         {
           type: 'C',
-          readFrom: 'gateMap',
+          readFrom: 'gateArray',
           pageType: 'Belt',
           columns: [
             {
@@ -443,7 +443,7 @@ export const testYjkf: Config[] = [
 export const testBeltNew: Config[] = [
   // ==================== 左侧栏:火灾监测设备状态 ====================
   {
-    deviceType: 'fire_risk_warn',
+    deviceType: 'fire_risk_warn_mma',
     moduleName: '火灾监测设备报警与分析',
     pageType: 'fireMonitorLeft',
     moduleData: {
@@ -482,7 +482,7 @@ export const testBeltNew: Config[] = [
       list: [],
       preset: [
         {
-          readFrom: 'fire_risk_warn',
+          readFrom: 'fire_risk_warn_mma',
           list: [
             {
               title: '光纤测温传感器',
@@ -562,50 +562,6 @@ export const testBeltNew: Config[] = [
                 },
               ],
             },
-            {
-              title: '火焰传感器',
-              contentTop: [
-                { label: '平均值', code: '${modelsensor_fire.avg}', color: 'white' },
-                { label: '最大值', code: '${modelsensor_fire.max}', color: 'white' },
-                { label: '最小值', code: '${modelsensor_fire.min}', color: 'white' },
-              ],
-              contents: [
-                {
-                  label: '是否报警',
-                  code: '${modelsensor_fire.flag}',
-                  trans: { true: '报警', false: '正常' },
-                  color: 'green',
-                },
-                {
-                  label: '最大值产生于',
-                  code: '${modelsensor_fire.time}',
-                  color: 'white',
-                  info: { code: '${modelsensor_fire.position}' },
-                },
-              ],
-            },
-            {
-              title: '烟雾传感器',
-              contentTop: [
-                { label: '平均值', code: '${modelsensor_smoke.avg}', color: 'white' },
-                { label: '最大值', code: '${modelsensor_smoke.max}', color: 'white' },
-                { label: '最小值', code: '${modelsensor_smoke.min}', color: 'white' },
-              ],
-              contents: [
-                {
-                  label: '是否报警',
-                  code: '${modelsensor_smoke.flag}',
-                  trans: { true: '报警', false: '正常' },
-                  color: 'green',
-                },
-                {
-                  label: '最大值产生于',
-                  code: '${modelsensor_smoke.time}',
-                  color: 'white',
-                  info: { code: '${modelsensor_smoke.position}' },
-                },
-              ],
-            },
             {
               title: '温度传感器',
               contentTop: [
@@ -682,7 +638,7 @@ export const testBeltNew: Config[] = [
         {
           readFrom: '',
           type: 'C',
-          tableReadFrom: '',
+          tableReadFrom: 'warn_result',
           columns: [
             {
               name: '时间',
@@ -692,19 +648,22 @@ export const testBeltNew: Config[] = [
             {
               name: '区域',
               prop: 'area',
-              width: '120px',
+              width: '130px',
             },
             {
               name: '预警类型',
-              prop: 'type',
+              prop: 'status',
             },
             {
               name: '状态',
               prop: 'status',
+              align: 'center',
+              width: '80px',
             },
             {
               name: '处置意见',
               prop: 'advice',
+              width: '180px',
             },
             {
               name: '操作',
@@ -724,7 +683,7 @@ export const testBeltNew: Config[] = [
     showStyle: {
       size: 'width:1030px;height:300px;',
       version: '原版',
-      position: 'bottom:25px;left:445px;',
+      position: 'bottom:70px;left:445px;',
     },
   },
 
@@ -770,36 +729,6 @@ export const testBeltNew: Config[] = [
         {
           readFrom: 'fire_risk_warn',
           config: [
-            {
-              title: '光纤测温传感器',
-              items: [
-                {
-                  label: '是否报警',
-                  code: '${fiber_v1.flag}',
-                  trans: { true: '报警', false: '正常' },
-                },
-                {
-                  label: '最大值产生于',
-                  code: '${fiber_v1.time}',
-                  info: { code: '${fiber_v1.position}' },
-                },
-              ],
-            },
-            {
-              title: 'CO传感器',
-              items: [
-                {
-                  label: '是否报警',
-                  code: '${modelsensor_co.flag}',
-                  trans: { true: '报警', false: '正常' },
-                },
-                {
-                  label: '最大值产生于',
-                  code: '${modelsensor_co.time}',
-                  info: { code: '${modelsensor_co.position}' },
-                },
-              ],
-            },
             {
               title: '火焰传感器',
               items: [
@@ -815,21 +744,6 @@ export const testBeltNew: Config[] = [
                 },
               ],
             },
-            {
-              title: '温度传感器',
-              items: [
-                {
-                  label: '是否报警',
-                  code: '${modelsensor_temp.flag}',
-                  trans: { true: '报警', false: '正常' },
-                },
-                {
-                  label: '最大值产生于',
-                  code: '${modelsensor_temp.time}',
-                  info: { code: '${modelsensor_temp.position}' },
-                },
-              ],
-            },
             {
               title: '烟雾传感器',
               items: [

+ 1 - 1
src/views/vent/home/configurable/components/belt/CustomTableBelt.vue

@@ -4,7 +4,7 @@
       <div class="label-t" v-for="(item, index) in columns" :key="`svvhbcth-${index}`" :style="{ flexBasis }">{{ item.name }}</div>
     </div>
     <div ref="scrollRef" class="table__content_list" :class="`table__content_list_${type}`">
-      <div class="table__content_list_row" v-for="(item, index) in data.data.gateMap" :key="`svvhbct-${index}`">
+      <div class="table__content_list_row" v-for="(item, index) in data.data.gateArray" :key="`svvhbct-${index}`">
         <div v-for="(t, i) in columns" :key="`svvhbctr-${i}`" :style="{ flexBasis }" :class="`table__content__list_item_${type}`">
           <slot :name="t.prop" :scope="item">
             <span>

+ 0 - 2
src/views/vent/home/configurable/components/belt/SensorStatusPanel.vue

@@ -111,12 +111,10 @@ onMounted(() => {
 
 <style scoped lang="less">
 .sensor-analysis-board {
-  background: linear-gradient(180deg, #0b2b4a 0%, #020f1a 100%);
   color: #fff;
   font-family: 'Microsoft YaHei', sans-serif;
   padding: 10px;
   border-radius: 8px;
-  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.5);
 }
 
 .sensor-group {

+ 18 - 9
src/views/vent/home/configurable/components/belt/WarningResultList.vue

@@ -8,8 +8,8 @@
       <div class="header-right">
         <span class="title-text">{{ config.otherProps.title }}</span>
         <div class="risk-tag high-risk">
-          <div class="status-dot"></div>
-          <span v-if="!!data" class="risk-text">{{ data[config.otherProps.prop] }}</span>
+          <!-- <div class="status-dot"></div> -->
+          <!-- <span v-if="!!data" class="risk-text">{{ data[config.otherProps.prop] }}</span> -->
         </div>
       </div>
     </div>
@@ -29,7 +29,7 @@
             <td v-for="col in config.columns" :key="col.prop" class="table-cell">
               <!-- 如果是 render 函数,且需要渲染 HTML,使用 v-html -->
               <span v-if="col.render" v-html="col.render(row)"></span>
-              <span v-else>{{ row[col.prop] }}</span>
+              <span v-else>{{ row[col.prop] ? row[col.prop] : '-' }}</span>
             </td>
           </tr>
         </tbody>
@@ -59,7 +59,9 @@ const props = defineProps<{
     [key: string]: any;
   };
 }>();
-onMounted(() => {});
+onMounted(() => {
+  console.log(props.config, '======');
+});
 </script>
 
 <style scoped lang="less">
@@ -159,11 +161,13 @@ onMounted(() => {});
 .warning-table {
   width: 100%;
   min-width: 900px; // 防止内容太少表格塌陷
+  border-collapse: collapse;
 }
 
 thead {
   background: url('@/assets/images/beltFire/2-8.png') no-repeat;
   background-size: 100% 100%;
+  height: 25px;
 }
 
 /* 表头 */
@@ -171,12 +175,16 @@ thead tr {
   color: #38e4ef;
 }
 
-th {
-  padding: 5px;
-  text-align: center;
+:deep(.warning-table thead th) {
+  padding: 5px 10px;
+  text-align: center !important;
   font-size: 14px;
   font-weight: bold;
+  color: #38e4ef;
   vertical-align: middle;
+  line-height: 30px;
+  position: relative;
+  z-index: 1;
 }
 
 /* 表格主体 */
@@ -186,11 +194,12 @@ th {
   background-size: 100% 100%;
 }
 
-.table-cell {
-  padding: 12px 15px;
+:deep(.table-cell) {
+  padding: 8px;
   font-size: 14px;
   color: #fff;
   vertical-align: middle;
+  text-align: center !important;
 }
 
 /* 操作列按钮样式 */