2 コミット a5fa01065e ... b17c3b2e5a

作者 SHA1 メッセージ 日付
  houzekong b17c3b2e5a [Mod 0000] 修改错报漏报历史数据表单 3 週間 前
  houzekong ad660c27a1 [Style 0000] 密闭监测实时详情样式优化 3 週間 前

BIN
src/assets/images/sealedGoaf/configurable/miniBoard/board-bg-G.png


BIN
src/assets/images/sealedGoaf/module/module-title-2.png


+ 21 - 0
src/components/Configurable/detail/MiniBoard.vue

@@ -82,6 +82,7 @@
     --image-board-bg-B: url('/@/assets/images/sealedGoaf/configurable/miniBoard/board-bg-B.png');
     --image-board-bg-D: url('/@/assets/images/sealedGoaf/configurable/miniBoard/board-bg-D.png');
     --image-board-bg-E: url('/@/assets/images/sealedGoaf/configurable/miniBoard/board-bg-E.png');
+    --image-board-bg-G: url('/@/assets/images/sealedGoaf/configurable/miniBoard/board-bg-G.png');
     height: 50px;
     line-height: 25px;
     width: 130px;
@@ -302,4 +303,24 @@
     padding-bottom: 10px;
     font-family: 'DDIN-Bold';
   }
+
+  .mini-board_G {
+    width: 95px;
+    height: 67px;
+    background-image: var(--image-board-bg-G);
+    background-size: 100% 100%;
+    padding-top: 4px;
+  }
+
+  .mini-board__label_G {
+    color: #000000;
+    font-size: 14px;
+    font-weight: 800;
+  }
+  .mini-board__value_G {
+    color: #2b6ff0;
+    font-size: 22px;
+    font-family: 'DDIN-Bold';
+    padding-bottom: 3px;
+  }
 </style>

+ 1 - 0
src/design/color.less

@@ -149,6 +149,7 @@ html {
 @gradient-primary-color: linear-gradient(#6fa1ff, #2b6ff0);
 // @gradient-primary-color: linear-gradient(lighten(@primary-color, 20%), @primary-color);
 @gradient-secondary-color: linear-gradient(#719fe3, #284877);
+@gradient-thirdary-color: linear-gradient(transparent, #e5f4fe);
 
 // =================================
 // ==============table==============

+ 31 - 16
src/views/analysis/warningAnalysis/reportAnalysis/index.vue

@@ -33,9 +33,6 @@
           <template #resetBefore>
             <a-button type="default" class="ml-8px" preIcon="mdi:download" @click="onExportXls"> 导出 </a-button>
           </template>
-          <template #form-goaf-select>
-            <a-select v-model:value="goafId" :options="goafOptions" placeholder="请选择" />
-          </template>
         </BasicTable>
       </TabPane>
     </Tabs>
@@ -49,16 +46,17 @@
 <script setup lang="ts">
   import { ref } from 'vue';
   import { BasicTable } from '/@/components/Table';
-  import { Tabs, TabPane, message } from 'ant-design-vue';
+  import { Tabs, TabPane } from 'ant-design-vue';
   import { SvgIcon } from '/@/components/Icon';
   // 引入模拟数据
   import { columns } from './reportAnalysis.data';
   import { getProvinceAlarm, getProvinceAlarmHistory } from './report.api';
   import { useInitForm } from '../../common/analysis';
   import { BasicModal } from '/@/components/Modal/index';
-  import { historicalFormSchema } from '/@/views/monitor/sealedMonitor/monitor.data';
+  // import { historicalFormSchema } from '/@/views/monitor/sealedMonitor/monitor.data';
   // import { useIntervalFn } from '@vueuse/core';
   import { useListPage } from '/@/hooks/system/useListPage';
+  import dayjs from 'dayjs';
 
   // 激活的Tab页签
   const activeTab = ref('realtime');
@@ -104,20 +102,13 @@
     },
   });
   const [registerRealtimeTable] = ctxRealtime;
-  const { goafOptions, goafId, hiscode, resolveValue, registerModal, openModal, initGoafOptions, handleResolve } = useInitForm();
+  const { hiscode, resolveValue, registerModal, openModal, initGoafOptions, handleResolve } = useInitForm();
   // 注册历史数据表格
   const { tableContext, onExportXls } = useListPage({
     tableProps: {
       columns,
       // columns: historyColumns,
-      api: (params) => {
-        if (!goafId.value) {
-          message.info('请先选择煤矿及老空区');
-          return Promise.reject();
-        }
-        params.goafId = goafId.value;
-        return getProvinceAlarmHistory(params);
-      },
+      api: getProvinceAlarmHistory,
       formConfig: {
         model: { customField: hiscode },
         labelWidth: 120,
@@ -140,7 +131,32 @@
             colProps: { span: 6 },
             rules: [],
           },
-          ...historicalFormSchema,
+          {
+            field: 'startTime',
+            label: '起始日期',
+            component: 'DatePicker',
+            componentProps: {
+              //日期格式化,页面上显示的值
+              format: 'YYYY-MM-DD',
+              //返回值格式化(绑定值的格式)
+              valueFormat: 'YYYY-MM-DD 00:00:00',
+            },
+            defaultValue: dayjs().add(-30, 'day').format('YYYY-MM-DD'),
+            colProps: { span: 6 },
+          },
+          {
+            field: 'endTime',
+            label: '结束日期',
+            component: 'DatePicker',
+            componentProps: {
+              //日期格式化,页面上显示的值
+              format: 'YYYY-MM-DD',
+              //返回值格式化(绑定值的格式)
+              valueFormat: 'YYYY-MM-DD 23:59:59',
+            },
+            defaultValue: dayjs().format('YYYY-MM-DD'),
+            colProps: { span: 6 },
+          },
         ],
         showAdvancedButton: false,
         schemaGroupNames: ['常规查询'],
@@ -157,7 +173,6 @@
       name: '历史数据',
       params: {
         alarmType: 'lateReport',
-        goafId,
       },
     },
   });

+ 11 - 3
src/views/monitor/sealedMonitor/components/RealtimeDetailsModal.vue

@@ -21,10 +21,10 @@
       <MiniBoard
         v-for="(item, index) in modalDetailsData.board"
         :key="index"
-        type="D"
+        type="G"
         :label="item.label"
         :value="dataRef[item.value] || '-'"
-        layout="val-top"
+        layout="label-top"
       />
     </div>
 
@@ -225,12 +225,15 @@
     border-radius: 10px;
     /* background: black; */
     background: @card-bg-color;
+    --image-title-2: url(/@/assets/images/sealedGoaf/module/module-title-2.png);
+    // --image-bg: linear-gradient();
   }
   .chart-item {
     flex: 1;
     // flex-basis: 6;
     // flex-shrink: 1;
     // min-width: 200px;
+    width: 300px;
     &:first-child {
       // flex-basis: 380px;
       flex: 0 0 380px;
@@ -241,15 +244,20 @@
   .chart-title {
     font-size: 14px;
     font-weight: 500;
-    margin-bottom: 8px;
+    // margin-bottom: 8px;
     font-weight: bold;
     color: @text-color-call-out;
+    background-image: var(--image-title-2);
+    background-size: 100% 100%;
+    height: 32px;
+    line-height: 32px;
   }
   .chart-placeholder {
     width: 100%;
     height: 200px;
     border-radius: 4px;
     overflow: hidden;
+    background-image: @gradient-thirdary-color;
   }
   .chart-placeholder img {
     width: 100%;