红沙泉bug修改-更新

src/design/vent/antCss.less

@@ -141,116 +141,116 @@ tr.@{ventSpace}-table-expanded-row:hover > td {
   color: @vent-font-color !important;
 }
 
-// /* modal 组件 */
-// .@{ventSpace}-modal-content {
-//   color: @vent-font-color !important;
-//   background-color: @vent-modal-bg !important;
-//   border: 1px solid @vent-modal-border !important;
-//   box-shadow: 0px 0px 10px @vent-modal-box-shadow inset !important;
-//   backdrop-filter: blur(10px);
-// }
-// .@{ventSpace}-modal-header {
-//   color: @vent-font-color !important;
-//   box-shadow: 0px 0px 0px @vent-modal-box-shadow inset !important;
-//   border-color: #ffffff22 !important;
-//   backdrop-filter: blur(10px);
-//   background-color: transparent !important;
-//   .jeecg-basic-title {
-//     color: @vent-font-color !important;
-//   }
-//   .@{ventSpace}-modal-title {
-//     color: @vent-modal-title !important;
-//   }
-// }
-// .@{ventSpace}-modal-body {
-//   height: calc(100% - 48px) !important;
-//   .j-box-bottom-button-float {
-//     background-color: #ffffff00 !important;
-//   }
-//   .@{ventSpace}-modal-confirm-title {
-//     color: @vent-font-color !important;
-//   }
-//   .@{ventSpace}-form {
-//     label {
-//       color: @vent-font-color;
-//     }
-//     .anticon.@{ventSpace}-input-clear-icon,
-//     .anticon {
-//       color: @vent-font-color !important;
-//     }
-//     .@{ventSpace}-select-selector {
-//       color: @vent-font-color;
-//       background-color: #ffffff00 !important;
-//     }
-//     .@{ventSpace}-form-item-control-input-content {
-//       .@{ventSpace}-input-affix-wrapper {
-//         background-color: #ffffff00 !important;
-//       }
-//       .@{ventSpace}-input {
-//         color: @vent-font-color;
-//         background-color: #ffffff00 !important;
-//       }
-//       .@{ventSpace}-select-single.@{ventSpace}-select-show-arrow .@{ventSpace}-select-selection-item,
-//       .@{ventSpace}-select-single.@{ventSpace}-select-show-arrow .@{ventSpace}-select-selection-placeholder {
-//         color: @vent-font-color;
-//       }
-//     }
-//   }
-// }
-// .@{ventSpace}-modal-close {
-//   color: #ffffff !important; 
-// }
-
-// .@{ventSpace}-modal-footer {
-//   border-color: #ffffff22 !important;
-// }
-
-.zxm-modal-content {
-  // height: 700px;
-  border: none !important;
-  box-shadow: none !important;
-  background-color: transparent !important;
-  background-color: transparent !important;
-  background: url('@/assets/images/gasInjection/9-1.png') no-repeat;
-  background-size: 100% 100% !important;
+/* modal 组件 */
+.@{ventSpace}-modal-content {
+  color: @vent-font-color !important;
+  background-color: @vent-modal-bg !important;
+  border: 1px solid @vent-modal-border !important;
+  box-shadow: 0px 0px 10px @vent-modal-box-shadow inset !important;
+  backdrop-filter: blur(10px);
 }
-
-.zxm-modal-header {
+.@{ventSpace}-modal-header {
+  color: @vent-font-color !important;
+  box-shadow: 0px 0px 0px @vent-modal-box-shadow inset !important;
+  border-color: #ffffff22 !important;
+  backdrop-filter: blur(10px);
   background-color: transparent !important;
-  box-shadow: none !important;
-  border-color: none !important;
-  backdrop-filter: blur(0);
-  background: url('@/assets/images/gasInjection/9-2.png') no-repeat bottom !important;
-  border-bottom: 0px !important;
-
-  .zxm-modal-title {
-    display: flex;
-    justify-content: center;
-    color: #fff !important;
-    text-align: center;
-    font-size: 18px;
+  .jeecg-basic-title {
+    color: @vent-font-color !important;
+  }
+  .@{ventSpace}-modal-title {
+    color: @vent-modal-title !important;
   }
 }
-
-.zxm-modal-close {
-  position: absolute;
-  top: -26px !important;
-  right: -22px !important;
-  color: #2b9fce !important;
+.@{ventSpace}-modal-body {
+  height: calc(100% - 48px) !important;
+  .j-box-bottom-button-float {
+    background-color: #ffffff00 !important;
+  }
+  .@{ventSpace}-modal-confirm-title {
+    color: @vent-font-color !important;
+  }
+  .@{ventSpace}-form {
+    label {
+      color: @vent-font-color;
+    }
+    .anticon.@{ventSpace}-input-clear-icon,
+    .anticon {
+      color: @vent-font-color !important;
+    }
+    .@{ventSpace}-select-selector {
+      color: @vent-font-color;
+      background-color: #ffffff00 !important;
+    }
+    .@{ventSpace}-form-item-control-input-content {
+      .@{ventSpace}-input-affix-wrapper {
+        background-color: #ffffff00 !important;
+      }
+      .@{ventSpace}-input {
+        color: @vent-font-color;
+        background-color: #ffffff00 !important;
+      }
+      .@{ventSpace}-select-single.@{ventSpace}-select-show-arrow .@{ventSpace}-select-selection-item,
+      .@{ventSpace}-select-single.@{ventSpace}-select-show-arrow .@{ventSpace}-select-selection-placeholder {
+        color: @vent-font-color;
+      }
+    }
+  }
+}
+.@{ventSpace}-modal-close {
+  color: #ffffff !important; 
 }
 
-.zxm-modal-close-x {
-  display: inline-block;
-  width: 44px !important;
-  height: 44px !important;
-  line-height: 39px !important;
-  background-color: #00000b;
-  border-radius: 50%;
-  border: 3px solid #2b9fce;
-  font-size: 24px !important;
-  font-weight: 700 !important;
+.@{ventSpace}-modal-footer {
+  border-color: #ffffff22 !important;
 }
 
+// .zxm-modal-content {
+//   // height: 700px;
+//   border: none !important;
+//   box-shadow: none !important;
+//   background-color: transparent !important;
+//   background-color: transparent !important;
+//   background: url('@/assets/images/gasInjection/9-1.png') no-repeat;
+//   background-size: 100% 100% !important;
+// }
+
+// .zxm-modal-header {
+//   background-color: transparent !important;
+//   box-shadow: none !important;
+//   border-color: none !important;
+//   backdrop-filter: blur(0);
+//   background: url('@/assets/images/gasInjection/9-2.png') no-repeat bottom !important;
+//   border-bottom: 0px !important;
+
+//   .zxm-modal-title {
+//     display: flex;
+//     justify-content: center;
+//     color: #fff !important;
+//     text-align: center;
+//     font-size: 18px;
+//   }
+// }
+
+// .zxm-modal-close {
+//   position: absolute;
+//   top: -26px !important;
+//   right: -22px !important;
+//   color: #2b9fce !important;
+// }
+
+// .zxm-modal-close-x {
+//   display: inline-block;
+//   width: 44px !important;
+//   height: 44px !important;
+//   line-height: 39px !important;
+//   background-color: #00000b;
+//   border-radius: 50%;
+//   border: 3px solid #2b9fce;
+//   font-size: 24px !important;
+//   font-weight: 700 !important;
+// }
+
 
 /* 加载 */
 .@{ventSpace}-spin-container:hover {

src/views/system/role/index.vue

@@ -70,8 +70,8 @@ const { prefixCls, tableContext, onImportXls, onExportXls } = useListPage({
     columns: columns,
     formConfig: {
       // update-begin--author:liaozhiyang---date:20230803---for：【QQYUN-5873】查询区域lablel默认居左
-      labelWidth: 65,
-      rowProps: { gutter: 24 },
+      labelWidth:120,
+      rowProps: { gutter: 12 },
       // update-end--author:liaozhiyang---date:20230803---for：【QQYUN-5873】查询区域lablel默认居左
       schemas: searchFormSchema,
     },

src/views/vent/monitorManager/hsqHome/components/DeviceRight.vue

@@ -40,41 +40,41 @@
             <div class="warn-item">
               <div class="item-basic">
                 <div class="item-label">亮度 : </div>
-                <a-input class="item-input" v-model:value="formData.x" placeholder="请输入" size="small" />
+                <a-input class="item-input" v-model:value="formData.ld" placeholder="请输入" size="small" />
               </div>
               <div class="item-basic">
                 <div class="item-label">对比度 : </div>
-                <a-input class="item-input" v-model:value="formData.x" placeholder="请输入" size="small" />
+                <a-input class="item-input" v-model:value="formData.dbd" placeholder="请输入" size="small" />
               </div>
             </div>
             <div class="warn-item">
               <div class="item-basic">
                 <div class="item-label">饱和度 : </div>
-                <a-input class="item-input" v-model:value="formData.x" placeholder="请输入" size="small" />
+                <a-input class="item-input" v-model:value="formData.bhd" placeholder="请输入" size="small" />
               </div>
               <div class="item-basic">
                 <div class="item-label">锐度 : </div>
-                <a-input class="item-input" v-model:value="formData.x" placeholder="请输入" size="small" />
+                <a-input class="item-input" v-model:value="formData.sd" placeholder="请输入" size="small" />
               </div>
             </div>
             <div class="warn-item">
               <div class="item-basic">
                 <div class="item-label">色温 : </div>
-                <a-input class="item-input" v-model:value="formData.x" placeholder="请输入" size="small" />
+                <a-input class="item-input" v-model:value="formData.sw" placeholder="请输入" size="small" />
               </div>
               <div class="item-basic">
                 <div class="item-label">增益 : </div>
-                <a-input class="item-input" v-model:value="formData.x" placeholder="请输入" size="small" />
+                <a-input class="item-input" v-model:value="formData.zy" placeholder="请输入" size="small" />
               </div>
             </div>
             <div class="warn-item">
               <div class="item-basic">
                 <div class="item-label">曝光 : </div>
-                <a-input class="item-input" v-model:value="formData.x" placeholder="请输入" size="small" />
+                <a-input class="item-input" v-model:value="formData.bg" placeholder="请输入" size="small" />
               </div>
               <div class="item-basic">
                 <div class="item-label">白平衡 : </div>
-                <a-input class="item-input" v-model:value="formData.x" placeholder="请输入" size="small" />
+                <a-input class="item-input" v-model:value="formData.bph" placeholder="请输入" size="small" />
               </div>
             </div>
           </div>
@@ -86,41 +86,41 @@
             <div class="warn-item">
               <div class="item-basic">
                 <div class="item-label1">声光报警器联动 : </div>
-                <a-switch v-model:checked="formData.x" />
+                <a-switch v-model:checked="formData.sgbjq" />
               </div>
               <div class="item-basic">
                 <div class="item-label1">短信通知联动 : </div>
-                <a-switch v-model:checked="formData.x" />
+                <a-switch v-model:checked="formData.dxtz" />
               </div>
             </div>
             <div class="warn-item">
               <div class="item-basic">
                 <div class="item-label1">视频录制联动 : </div>
-                <a-switch v-model:checked="formData.x" />
+                <a-switch v-model:checked="formData.splz" />
               </div>
               <div class="item-basic">
                 <div class="item-label1">消防系统联动 : </div>
-                <a-switch v-model:checked="formData.x" />
+                <a-switch v-model:checked="formData.xfxt" />
               </div>
             </div>
             <div class="warn-item">
               <div class="item-basic">
                 <div class="item-label1">应急广播联动 : </div>
-                <a-switch v-model:checked="formData.x" />
+                <a-switch v-model:checked="formData.yjgb" />
               </div>
               <div class="item-basic">
                 <div class="item-label1">大屏显示联动 : </div>
-                <a-switch v-model:checked="formData.x" />
+                <a-switch v-model:checked="formData.dpxs" />
               </div>
             </div>
             <div class="warn-item">
               <div class="item-basic">
                 <div class="item-label1">GIS定位联动 : </div>
-                <a-switch v-model:checked="formData.x" />
+                <a-switch v-model:checked="formData.gis" />
               </div>
               <div class="item-basic">
                 <div class="item-label1">数据记录联动 : </div>
-                <a-switch v-model:checked="formData.x" />
+                <a-switch v-model:checked="formData.sjjl" />
               </div>
             </div>
           </div>

src/views/vent/monitorManager/hsqHome/components/EnvironmentMonitor.vue

@@ -40,11 +40,11 @@ let props = defineProps({
   overflow-y: auto;
 
   .basic-btn {
-    width: calc(50% - 10px);
+    width: 50%;
     height: 60px;
     background: var(--image-btn-bg) no-repeat bottom;
-    background-size: 100% auto;
-    margin: 5px;
+    // background-size: 100% auto;
+    // margin: 5px;
   }
 
   .btn-label {
@@ -57,7 +57,7 @@ let props = defineProps({
   .btn-value {
     display: flex;
     justify-content: center;
-    padding: 2px 0px;
+    padding: 5px 0px;
   }
 
   .text-value {

src/views/vent/monitorManager/hsqHome/components/QuickAction.vue

@@ -147,27 +147,13 @@ let props = defineProps({
 
     .card-box-text {
       display: flex;
-      // width: 126px;
       flex: 1;
+       justify-content: center;
+        align-items: center;
       height: 50px;
       background: var(--image-card-bg2) no-repeat;
       background-size: 100% 100%;
       cursor: pointer;
-
-      &:nth-child(1) {
-        justify-content: flex-start;
-        align-items: center;
-      }
-
-      &:nth-child(2) {
-        justify-content: center;
-        align-items: center;
-      }
-
-      &:nth-child(3) {
-        justify-content: flex-end;
-        align-items: center;
-      }
     }
   }
 }

src/views/vent/monitorManager/hsqHome/components/WarnBottom.vue

@@ -3,14 +3,176 @@
     <div class="list-title">
       报警趋势统计
     </div>
-     <div class="list-content">
-
-     </div>
+    <div ref="line" class="list-content"></div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { nextTick, onMounted, ref } from 'vue'
+import * as echarts from 'echarts';
+
+//获取dom元素节点
+let line = ref<any>();
+
+function getOption() {
+  nextTick(() => {
+    const myChart = echarts.init(line.value);
+    let option = {
+      grid: {
+        top: '8%',
+        left: '3%',
+        bottom: '14%',
+        right: '3%',
+        //   containLabel: true,
+      },
+      tooltip: {
+        trigger: 'axis',
+        backgroundColor: 'rgba(0, 0, 0, .6)',
+        textStyle: {
+          color: '#fff',
+          fontSize: 12,
+        },
+      },
+      legend: {
+        align: 'left',
+        right: '50%',
+        top: '0%',
+        type: 'plain',
+        textStyle: {
+          color: '#7ec7ff',
+          fontSize: 14,
+        },
+        // icon:'rect',
+        itemGap: 25,
+        itemWidth: 18,
+        icon: 'path://M0 2a2 2 0 0 1 2 -2h14a2 2 0 0 1 2 2v0a2 2 0 0 1 -2 2h-14a2 2 0 0 1 -2 -2z',
+        data: [
+          {
+            name: '报警趋势',
+          },
+        ],
+      },
+      xAxis: [
+        {
+          type: 'category',
+          boundaryGap: false,
+          axisLabel: {
+            // formatter: '{value}',
+            fontSize: 14,
+            margin: 10,
+            textStyle: {
+              color: '#b3b8cc',
+            },
+           
+          },
+          axisLine: {
+            lineStyle: {
+              color: '#244a94',
+            },
+          },
+          splitLine: {
+            show: true,
+            lineStyle: {
+              color: '#0d2973',
+              type: 'dashed',
+            },
+          },
+          axisTick: {
+            show: false,
+          },
+          data: ['202t6-01-01', '2026-01-02', '2026-01-03', '2026-01-04', '2026-01-05', '2026-01-06', '2026-01-07', '2026-01-08', '2026-01-09', '2026-01-10'],
+        },
+      ],
+      yAxis: [
+        {
+          boundaryGap: false,
+          name: '',
+          type: 'value',
+          max: 1,
+          min: 0,
+          axisLabel: {
+            textStyle: {
+              color: '#b3b8cc',
+            },
+          },
+          nameTextStyle: {
+            color: '#fff',
+            fontSize: 12,
+            lineHeight: 5,
+          },
+          splitLine: {
+            lineStyle: {
+              color: '#0d2973',
+              type: 'dashed',
+            },
+          },
+          axisLine: {
+            show: true,
+            lineStyle: {
+              color: '#244a94',
+            },
+          },
+          axisTick: {
+            show: false,
+          },
+        },
+      ],
+      series: [
+        {
+          name: '报警趋势',
+          type: 'line',
+          smooth: false,
+          showSymbol: false,
+          zlevel: 3,
+          itemStyle: {
+            color: '#02f2de',
+            borderColor: '#a3c8d8',
+          },
+          lineStyle: {
+            normal: {
+              width: 1,
+              color: '#02f2de',
+            },
+          },
+          areaStyle: {
+            normal: {
+              color: new echarts.graphic.LinearGradient(
+                0,
+                0,
+                0,
+                1,
+                [
+                  {
+                    offset: 0,
+                    color: 'rgba(2, 242, 222,0.8)',
+                  },
+                  {
+                    offset: 0.5,
+                    color: 'rgba(2, 242, 222,0.4)',
+                  },
+                  {
+                    offset: 0.9,
+                    color: 'rgba(2, 242, 222,0)',
+                  },
+                ],
+                false
+              ),
+            },
+          },
+          data: [0.1, 0.2,0.4,  0.3, 0.7, 0.5, 0.9,0.6, 0.8, 0.5, 1],
+        },
+      ],
+    };
+    myChart.setOption(option);
+    window.onresize = function () {
+      myChart.resize();
+    };
+  });
+}
+
+onMounted(() => {
+  getOption();
+});
 </script>
 
 <style lang="less" scoped>
@@ -22,7 +184,7 @@ import { ref } from 'vue'
 
 .echart-bar-new {
   --image-box-bg: url('@/assets/images/home-container/configurable/hsq/2-5.png');
-   --image-box-bg1: url('@/assets/images/home-container/configurable/hsq/ceshi.png');
+  --image-box-bg1: url('@/assets/images/home-container/configurable/hsq/ceshi.png');
   position: relative;
   width: 100%;
   height: 100%;
@@ -40,11 +202,10 @@ import { ref } from 'vue'
     background-size: 100% 100%;
     margin-bottom: 5px;
   }
-   .list-content {
+
+  .list-content {
     width: 100%;
     height: calc(100% - 35px);
-    background: var(--image-box-bg1) no-repeat;
-    background-size: 100% 100%;
   }
 }
 </style>