Browse Source

预警设备管理更新

lxh 1 year ago
parent
commit
d78fe9fd77

+ 6 - 6
src/views/vent/home/clique/components/file-share.vue

@@ -41,12 +41,12 @@ import { getAssetURL } from '/@/utils/ui';
 let fileTitle = ref('文件共享中心')
 
 let fileData = reactive([
-    { title: "大柳塔井", imgSrc: getAssetURL('company/file2.png'), imgSrc1: getAssetURL('company/file1.png'), label: '文件总数', label1: '待审批文件', value: 10, value1: 10 },
-    { title: "大柳塔井", imgSrc: getAssetURL('company/file2.png'), imgSrc1: getAssetURL('company/file1.png'), label: '文件总数', label1: '待审批文件', value: 10, value1: 10 },
-    { title: "大柳塔井", imgSrc: getAssetURL('company/file2.png'), imgSrc1: getAssetURL('company/file1.png'), label: '文件总数', label1: '待审批文件', value: 10, value1: 10 },
-    { title: "大柳塔井", imgSrc: getAssetURL('company/file2.png'), imgSrc1: getAssetURL('company/file1.png'), label: '文件总数', label1: '待审批文件', value: 10, value1: 10 },
-    { title: "大柳塔井", imgSrc: getAssetURL('company/file2.png'), imgSrc1: getAssetURL('company/file1.png'), label: '文件总数', label1: '待审批文件', value: 10, value1: 10 },
-    { title: "大柳塔井", imgSrc: getAssetURL('company/file2.png'), imgSrc1: getAssetURL('company/file1.png'), label: '文件总数', label1: '待审批文件', value: 10, value1: 10 }
+    { title: "大柳塔井", imgSrc: getAssetURL('company/file2.png'), imgSrc1: getAssetURL('company/file1.png'), label: '文件总数', label1: '待审批文件', value: 10, value1: 10 },
+    { title: "大柳塔井", imgSrc: getAssetURL('company/file2.png'), imgSrc1: getAssetURL('company/file1.png'), label: '文件总数', label1: '待审批文件', value: 10, value1: 10 },
+    { title: "大柳塔井", imgSrc: getAssetURL('company/file2.png'), imgSrc1: getAssetURL('company/file1.png'), label: '文件总数', label1: '待审批文件', value: 10, value1: 10 },
+    { title: "大柳塔井", imgSrc: getAssetURL('company/file2.png'), imgSrc1: getAssetURL('company/file1.png'), label: '文件总数', label1: '待审批文件', value: 10, value1: 10 },
+    { title: "大柳塔井", imgSrc: getAssetURL('company/file2.png'), imgSrc1: getAssetURL('company/file1.png'), label: '文件总数', label1: '待审批文件', value: 10, value1: 10 },
+    { title: "大柳塔井", imgSrc: getAssetURL('company/file2.png'), imgSrc1: getAssetURL('company/file1.png'), label: '文件总数', label1: '待审批文件', value: 10, value1: 10 }
 ])
 
 

+ 3 - 2
src/views/vent/home/clique/components/scene-key.vue

@@ -211,8 +211,9 @@ let selectList1 = reactive([
   background-color: transparent;
  border-top: 0px;
  border-bottom: 0px;
- border-left: 3px solid;
- border-right: 3px solid;
+ border-left: 2px solid ;
+ border-right: 2px solid;
+ border-image: linear-gradient(to bottom, transparent, rgba(49, 184, 255, 1), transparent) 1 1 1;
 
 }
 ::v-deep .zxm-select-arrow{

+ 28 - 5
src/views/vent/monitorManager/alarmMonitor/AlarmHistoryTable.vue

@@ -17,6 +17,7 @@
   import { getTableHeaderColumns } from '/@/hooks/web/useWebColumns';
   import { warningHistoryList } from './alarm.api'
   import dayjs from 'dayjs';
+  import { getAutoScrollContainer } from '/@/utils/common/compUtils';
 
   const historyTable = ref();
 
@@ -112,17 +113,39 @@
           xxl: 4,
         },
         schemas: props.formSchemas.length > 0 ? props.formSchemas : [
+          // {
+          //   label: '报警时间区间',
+          //   field: 'tickectDate',
+          //   component: 'TimeRangePicker',
+          //   componentProps: {
+          //     placeholder: ['报警开始时间', '报警结束时间'],
+          //     valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          //   },
+          // },
           {
-            label: '报警时间区间',
-            field: 'tickectDate',
-            component: 'TimeRangePicker',
+            field: 'starttime_begin',
+            label: '开始时间',
+            component: 'DatePicker',
+            required: true,
             componentProps: {
-              placeholder: ['报警开始时间', '报警结束时间'],
+              showTime: true,
               valueFormat: 'YYYY-MM-DD HH:mm:ss',
+              getPopupContainer: getAutoScrollContainer,
+            },
+          },
+          {
+            field: 'starttime_end',
+            label: '结束时间',
+            component: 'DatePicker',
+            required: true,
+            componentProps: {
+              showTime: true,
+              valueFormat: 'YYYY-MM-DD HH:mm:ss',
+              getPopupContainer: getAutoScrollContainer,
             },
           },
         ],
-        fieldMapToTime: [['tickectDate', ['starttime_begin', 'starttime_end'], '']],
+        // fieldMapToTime: [['tickectDate', ['starttime_begin', 'starttime_end'], '']],
       },
       fetchSetting: {
         listField: 'list.records',

+ 7 - 0
src/views/vent/monitorManager/alarmMonitor/alarm.data.ts

@@ -3,6 +3,7 @@ import { BasicColumn, FormSchema } from '/@/components/Table';
 import echarts from '/@/utils/lib/echarts';
 import type { EChartsOption } from 'echarts';
 import { getAssetURL } from '/@/utils/ui';
+import { render } from '/@/utils/common/renderUtils';
 
 export const formConfig = {
   labelAlign: 'left',
@@ -36,9 +37,15 @@ export const levelColumns: BasicColumn[] = [
     width: 100,
     align: 'center',
   },
+
+  
   {
     title: '报警类型',
     dataIndex: 'nwartype',
+    customRender: ({ record }) => {
+      return render.renderDict(record.nwartype , 'leveltype');
+    
+    },
     width: 100,
     align: 'center',
   },

+ 1 - 1
src/views/vent/monitorManager/alarmMonitor/index.vue

@@ -375,7 +375,7 @@ function getMonitor(flag = false) {
         }
         getMonitor();
       },
-      flag ? 0 : 1000
+      flag ? 0 : 10000
     );
   }
 }