Browse Source

[Fix 0000]预警分析模块样式调整

bobo04052021@163.com 5 months ago
parent
commit
37c45910df

+ 4 - 85
src/views/analysis/warningAnalysis/airLeakStatus/airLeakStatus.data.ts

@@ -1,20 +1,5 @@
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
-import { TreeItem } from '/@/components/Tree/index';
-export const boardData = [
-  {
-    label: '存在风险情况数量',
-    value: '10',
-  },
-  {
-    label: '闭内气体涌出',
-    value: '27',
-  },
-  {
-    label: '闭外气体涌出',
-    value: '27',
-  },
-];
 // 实时数据相关
 // 实时数据相关
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
@@ -49,12 +34,12 @@ export const columns: BasicColumn[] = [
     width: 100,
     width: 100,
   },
   },
   {
   {
-    title: '密闭内压力',
+    title: '密闭内压力(Pa)',
     dataIndex: 'sourcePressure',
     dataIndex: 'sourcePressure',
     width: 100,
     width: 100,
   },
   },
   {
   {
-    title: '密闭外压力',
+    title: '密闭外压力(Pa)',
     dataIndex: 'sourcePressure',
     dataIndex: 'sourcePressure',
     width: 100,
     width: 100,
   },
   },
@@ -63,8 +48,7 @@ export const columns: BasicColumn[] = [
     dataIndex: 'alarmName',
     dataIndex: 'alarmName',
     width: 100,
     width: 100,
     customRender: ({ text }) => {
     customRender: ({ text }) => {
-      // 解构获取真正的 text 字符串值
-      // 先校验 text 是字符串类型,再处理分割逻辑
+      // 解构获取字符串值
       if (typeof text !== 'string') {
       if (typeof text !== 'string') {
         return '-';
         return '-';
       }
       }
@@ -96,6 +80,7 @@ export const columns: BasicColumn[] = [
   },
   },
   {
   {
     title: '是否解决',
     title: '是否解决',
+    dataIndex: 'content',
     customRender: () => '未解决',
     customRender: () => '未解决',
     width: 100,
     width: 100,
   },
   },
@@ -160,69 +145,3 @@ export const historyColumns: BasicColumn[] = [
     width: 100,
     width: 100,
   },
   },
 ];
 ];
-export const searchFormSchema: FormSchema[] = [
-  {
-    field: 'mineName',
-    label: '所属执法处',
-    component: 'Select',
-    componentProps: {
-      options: [
-        { label: '执法一处', value: '0' },
-        { label: '执法二处', value: '1' },
-        { label: '执法三处', value: '2' },
-      ],
-    },
-    colProps: { span: 6 },
-  },
-  {
-    field: 'mineName',
-    label: '所属区域',
-    component: 'Select',
-    componentProps: {
-      options: [
-        { label: '执法一处', value: '0' },
-        { label: '执法二处', value: '1' },
-        { label: '执法三处', value: '2' },
-      ],
-    },
-    colProps: { span: 6 },
-  },
-  {
-    field: 'mineName',
-    label: '煤矿名称',
-    component: 'Input',
-    colProps: { span: 6 },
-  },
-  {
-    field: 'mineNameAbbr',
-    label: '煤矿简称',
-    component: 'Input',
-    colProps: { span: 6 },
-  },
-  {
-    field: 'productStatus',
-    label: '生产状态',
-    component: 'Select',
-    componentProps: {
-      options: [
-        { label: '拟建矿井', value: '0' },
-        { label: '正常生产矿井', value: '1' },
-        { label: '长期停产矿井', value: '2' },
-      ],
-    },
-    colProps: { span: 6 },
-  },
-  {
-    field: 'riskLevel',
-    label: '自燃情况',
-    component: 'Select',
-    componentProps: {
-      options: [
-        { label: 'Ⅰ类容易自燃', value: '0' },
-        { label: 'Ⅱ类自燃', value: '1' },
-        { label: 'Ⅲ类不易自燃', value: '2' },
-      ],
-    },
-    colProps: { span: 6 },
-  },
-];

+ 2 - 2
src/views/analysis/warningAnalysis/airLeakStatus/index.vue

@@ -16,8 +16,8 @@
             <span class="action-text">详情</span>
             <span class="action-text">详情</span>
           </button> -->
           </button> -->
           <!-- 已解决按钮 -->
           <!-- 已解决按钮 -->
-          <button @click="openModal(record, 'resolved')" class="action-btn resolved-btn" title="已解决">
-            <span class="action-text">解决</span>
+          <button @click="openModal(record, 'resolved')" class="resolved-btn" title="已解决">
+            <span class="action-text">解决</span>
           </button>
           </button>
         </template>
         </template>
       </BasicTable>
       </BasicTable>

+ 2 - 2
src/views/analysis/warningAnalysis/autoFireAnalysis/index.vue

@@ -19,8 +19,8 @@
           <template #action="{ record }">
           <template #action="{ record }">
             <div class="action-buttons">
             <div class="action-buttons">
               <!-- 操作按钮 -->
               <!-- 操作按钮 -->
-              <button @click="openModal(record, 'resolved')" class="action-btn resolved-btn" title="已解决">
-                <span class="action-text">解决</span>
+              <button @click="openModal(record, 'resolved')" class="resolved-btn" title="已解决">
+                <span class="action-text">解决</span>
               </button>
               </button>
             </div>
             </div>
           </template>
           </template>

+ 9 - 9
src/views/analysis/warningAnalysis/fireAreaJudgeAnalysis/index.vue

@@ -19,8 +19,8 @@
         <template #action="{ record }">
         <template #action="{ record }">
           <div class="action-buttons">
           <div class="action-buttons">
             <!-- 已解决按钮 -->
             <!-- 已解决按钮 -->
-            <button @click="openModal(record, 'resolved')" class="action-btn resolved-btn" title="已解决">
-              <span class="action-text">解决</span>
+            <button @click="openModal(record, 'resolved')" class="resolved-btn" title="已解决">
+              <span class="action-text">解决</span>
             </button>
             </button>
           </div>
           </div>
         </template>
         </template>
@@ -211,13 +211,13 @@ const [registerHistoryTable] = useTable({
   useSearchForm: true,
   useSearchForm: true,
   bordered: true,
   bordered: true,
   showIndexColumn: false,
   showIndexColumn: false,
-  actionColumn: {
-    width: 60,
-    title: '操作',
-    dataIndex: 'action',
-    slots: { customRender: 'action' },
-    fixed: undefined,
-  },
+  // actionColumn: {
+  //   width: 60,
+  //   title: '操作',
+  //   dataIndex: 'action',
+  //   slots: { customRender: 'action' },
+  //   fixed: undefined,
+  // },
 });
 });
 
 
 // 弹窗引用
 // 弹窗引用

+ 9 - 8
src/views/analysis/warningAnalysis/overlimitAlarm/index.vue

@@ -19,8 +19,8 @@
         <template #action="{ record }">
         <template #action="{ record }">
           <div class="action-buttons">
           <div class="action-buttons">
             <!-- 操作按钮 -->
             <!-- 操作按钮 -->
-            <button @click="openModal(record, 'resolved')" class="action-btn detail-btn" title="已解决">
-              <span class="action-text">解决</span>
+            <button @click="openModal(record, 'resolved')" class="resolved-btn" title="已解决">
+              <span class="action-text">解决</span>
             </button>
             </button>
           </div>
           </div>
         </template>
         </template>
@@ -42,14 +42,15 @@
   </Tabs>
   </Tabs>
   <!-- 弹窗组件 -->
   <!-- 弹窗组件 -->
   <a-modal
   <a-modal
-    style="top: 30%; left: 170px"
-    v-model:visible="visibleModal"
-    :width="450"
-    title="实时监测数据"
-    @ok="handleOkEdit"
+    style="height: 400px"
+    v-model:visible="visibleresolveModal"
+    :width="600"
+    centered
+    title="密闭漏风处理情况"
+    @ok="handleOkEdit()"
     @cancel="handleCancelEdit"
     @cancel="handleCancelEdit"
   >
   >
-    <a-table></a-table>
+    <a-textarea style="width: 90%; margin-left: 20px; margin-right: 20px" v-model:value="resolveValue" placeholder="请输入解决情况" :rows="4" />
   </a-modal>
   </a-modal>
 </template>
 </template>
 
 

+ 2 - 2
src/views/analysis/warningAnalysis/pressureDiffAnalysis/index.vue

@@ -23,8 +23,8 @@
               <span class="action-text">详情</span>
               <span class="action-text">详情</span>
             </button> -->
             </button> -->
             <!-- 已解决按钮 -->
             <!-- 已解决按钮 -->
-            <button @click="openModal(record, 'resolved')" class="action-btn resolved-btn" title="已解决">
-              <span class="action-text">解决</span>
+            <button @click="openModal(record, 'resolved')" class="resolved-btn" title="已解决">
+              <span class="action-text">解决</span>
             </button>
             </button>
           </div>
           </div>
         </template>
         </template>

+ 4 - 2
src/views/analysis/warningAnalysis/sealRiskJudgeAnalysis/index.vue

@@ -18,8 +18,8 @@
       <BasicTable @register="registerTable" :scroll="{ x: 'max-content' }" :style="{ padding: 0 }">
       <BasicTable @register="registerTable" :scroll="{ x: 'max-content' }" :style="{ padding: 0 }">
         <!-- 核心:判断record是否有有效数据,无则显示- -->
         <!-- 核心:判断record是否有有效数据,无则显示- -->
         <template #action="{ record }">
         <template #action="{ record }">
-          <button @click="openModal(record, 'resolved')" class="action-btn detail-btn" title="已解决">
-            <span class="action-text">解决</span>
+          <button @click="openModal(record, 'resolved')" class="resolved-btn" title="已解决">
+            <span class="action-text">解决</span>
           </button>
           </button>
         </template>
         </template>
         <template #empty>
         <template #empty>
@@ -168,6 +168,7 @@ const [registerHistoryTable] = useTable({
       {
       {
         label: '煤矿名称',
         label: '煤矿名称',
         field: 'mineCode', // 对应组件的value.mineCode(最终传给Table的查询参数)
         field: 'mineCode', // 对应组件的value.mineCode(最终传给Table的查询参数)
+        defaultValue: deviceOptions.value[0] ? deviceOptions.value[0]['value'] : '',
         component: 'MineCascader', // 自定义组件名
         component: 'MineCascader', // 自定义组件名
         componentProps: {
         componentProps: {
           onChange: async (e, option) => {
           onChange: async (e, option) => {
@@ -182,6 +183,7 @@ const [registerHistoryTable] = useTable({
         label: '采空区查询',
         label: '采空区查询',
         field: 'goafId',
         field: 'goafId',
         component: 'Select',
         component: 'Select',
+        defaultValue: goafOptions.value[0] ? goafOptions.value[0]['value'] : '',
         componentProps: {
         componentProps: {
           options: goafOptions,
           options: goafOptions,
           onChange: async (e, option) => {
           onChange: async (e, option) => {