[Feat 0000]代码冲突解决

src/views/analysis/warningAnalysis/airLeakStatus/index.vue

@@ -41,10 +41,16 @@
     <a-table></a-table>
   </a-modal>
   <!-- 弹窗组件 -->
-  <a-modal style="height: 400px" v-model:visible="visibleresolveModal" :width="600" centered title="密闭漏风处理情况"
-    @ok="handleOkEdit" @cancel="handleCancelEdit">
-    <a-textarea style="width: 90%; margin-left: 20px; margin-right: 20px" v-model:value="resolveValue"
-      placeholder="请输入解决情况" :rows="4" />
+  <a-modal
+    style="height: 400px"
+    v-model:visible="visibleresolveModal"
+    :width="600"
+    centered
+    title="密闭漏风处理情况"
+    @ok="handleOkEdit"
+    @cancel="handleCancelEdit"
+  >
+    <a-textarea style="width: 90%; margin-left: 20px; margin-right: 20px" v-model:value="resolveValue" placeholder="请输入解决情况" :rows="4" />
   </a-modal>
 </template>
 
@@ -322,34 +328,22 @@ onUnmounted(() => {
 </script>
 
 <style lang="less" scoped>
-// .board-info {
-//   display: flex;
-//   padding: 10px;
-//   background-color: @white;
-//   // margin: 0 10px;
-//   margin-bottom: 5px;
-//   gap: 10px;
-//   box-sizing: border-box;
-// }
-// .board-item {
-//   flex: 1;
-//   box-sizing: border-box;
-// }
 .board-info {
-  width: 100%;
   display: flex;
-  flex-wrap: wrap;
-  margin-bottom: 8px;
+  padding: 10px;
+  background-color: @white;
+  // margin: 0 10px;
+  margin-bottom: 5px;
+  gap: 10px;
+  box-sizing: border-box;
 }
-
 .board-item {
-  margin-right: 80px;
+  flex: 1;
+  box-sizing: border-box;
 }
-
 :deep(.jeecg-basic-table-form-container .ant-form) {
   border: none !important;
 }
-
 :where(.css-dev-only-do-not-override-x9w3vz).ant-form-item .ant-form-item-label {
   margin-top: 10px !important;
 }

src/views/analysis/warningAnalysis/autoFireAnalysis/index.vue

@@ -4,8 +4,15 @@
     <Tabs v-model:activeKey="activeTab" type="line" class="common-page-tabs">
       <TabPane tab="实时监测" key="realtime">
         <div class="board-info">
-          <MiniBoard :key="index" v-for="(item, index) in boardData" type="A" :label="item.label" :value="item.value"
-            layout="label-top" class="board-item" />
+          <MiniBoard
+            :key="index"
+            v-for="(item, index) in boardData"
+            type="A"
+            :label="item.label"
+            :value="item.value"
+            layout="label-top"
+            class="board-item"
+          />
         </div>
         <!-- 实时数据表格 -->
         <BasicTable @register="registerTable" :scroll="{ x: 'max-content' }" :style="{ padding: 0 }">
@@ -34,10 +41,16 @@
       </TabPane>
     </Tabs>
     <!-- 弹窗组件 -->
-    <a-modal style="height: 400px" v-model:visible="visibleresolveModal" :width="600" centered title="密闭漏风处理情况"
-      @ok="handleOkEdit()" @cancel="handleCancelEdit">
-      <a-textarea style="width: 90%; margin-left: 20px; margin-right: 20px" v-model:value="resolveValue"
-        placeholder="请输入解决情况" :rows="4" />
+    <a-modal
+      style="height: 400px"
+      v-model:visible="visibleresolveModal"
+      :width="600"
+      centered
+      title="密闭漏风处理情况"
+      @ok="handleOkEdit()"
+      @cancel="handleCancelEdit"
+    >
+      <a-textarea style="width: 90%; margin-left: 20px; margin-right: 20px" v-model:value="resolveValue" placeholder="请输入解决情况" :rows="4" />
     </a-modal>
   </div>
 </template>
@@ -308,32 +321,20 @@ onUnmounted(() => {
 </script>
 
 <style lang="less" scoped>
-// .board-info {
-//   display: grid;
-//   grid-template-columns: repeat(5, auto);
-//   /* 3列：改5则为5列 */
-//   gap: auto;
-//   justify-content: start;
-//   flex-wrap: wrap;
-//   box-sizing: border-box;
-//   background-color: @white;
-//   padding: 10px;
-//   gap: 100px;
-//   // margin: 0 10px;
-//   margin-bottom: 8px;
-// }
-
-// .board-item {
-//   box-sizing: border-box;
-// }
 .board-info {
-  width: 100%;
-  display: flex;
+  display: grid;
+  grid-template-columns: repeat(5, auto); /* 3列：改5则为5列 */
+  gap: auto;
+  justify-content: start;
   flex-wrap: wrap;
-  margin-bottom: 8px;
+  box-sizing: border-box;
+  background-color: @white;
+  padding: 10px;
+  gap: 100px;
+  // margin: 0 10px;
+  margin-bottom: 5px;
 }
-
 .board-item {
-  margin-right: 80px;
+  box-sizing: border-box;
 }
 </style>

src/views/analysis/warningAnalysis/fireAreaJudgeAnalysis/index.vue

@@ -4,8 +4,15 @@
   <Tabs v-model:activeKey="activeTab" type="line" class="common-page-tabs">
     <TabPane tab="实时监测" key="realtime">
       <div class="board-info">
-        <MiniBoard :key="index" v-for="(item, index) in boardData" type="A" :label="item.label" :value="item.value"
-          layout="label-top" class="board-item" />
+        <MiniBoard
+          :key="index"
+          v-for="(item, index) in boardData"
+          type="A"
+          :label="item.label"
+          :value="item.value"
+          layout="label-top"
+          class="board-item"
+        />
       </div>
       <!-- 实时数据表格 -->
       <BasicTable @register="registerTable" :scroll="{ x: 'max-content' }" :style="{ padding: 0 }">
@@ -34,10 +41,16 @@
     </TabPane>
   </Tabs>
   <!-- 弹窗组件 -->
-  <a-modal style="height: 400px" v-model:visible="visibleresolveModal" :width="600" centered title="密闭漏风处理情况"
-    @ok="handleOkEdit()" @cancel="handleCancelEdit">
-    <a-textarea style="width: 90%; margin-left: 20px; margin-right: 20px" v-model:value="resolveValue"
-      placeholder="请输入解决情况" :rows="4" />
+  <a-modal
+    style="height: 400px"
+    v-model:visible="visibleresolveModal"
+    :width="600"
+    centered
+    title="密闭漏风处理情况"
+    @ok="handleOkEdit()"
+    @cancel="handleCancelEdit"
+  >
+    <a-textarea style="width: 90%; margin-left: 20px; margin-right: 20px" v-model:value="resolveValue" placeholder="请输入解决情况" :rows="4" />
   </a-modal>
 </template>
 
@@ -296,30 +309,20 @@ onUnmounted(() => {
 </script>
 
 <style lang="less" scoped>
-// .board-info {
-//   display: grid;
-//   grid-template-columns: repeat(5, auto); /* 3列：改5则为5列 */
-//   gap: auto;
-//   justify-content: start;
-//   flex-wrap: wrap;
-//   box-sizing: border-box;
-//   background-color: @white;
-//   padding: 10px;
-//   gap: 100px;
-//   // margin: 0 10px;
-//   margin-bottom: 5px;
-// }
-// .board-item {
-//   box-sizing: border-box;
-// }
 .board-info {
-  width: 100%;
-  display: flex;
+  display: grid;
+  grid-template-columns: repeat(5, auto); /* 3列：改5则为5列 */
+  gap: auto;
+  justify-content: start;
   flex-wrap: wrap;
-  margin-bottom: 8px;
+  box-sizing: border-box;
+  background-color: @white;
+  padding: 10px;
+  gap: 100px;
+  // margin: 0 10px;
+  margin-bottom: 5px;
 }
-
 .board-item {
-  margin-right: 80px;
+  box-sizing: border-box;
 }
 </style>

src/views/analysis/warningAnalysis/overlimitAlarm/index.vue

@@ -4,8 +4,15 @@
   <Tabs v-model:activeKey="activeTab" type="line" class="common-page-tabs">
     <TabPane tab="实时监测" key="realtime">
       <div class="board-info">
-        <MiniBoard :key="index" v-for="(item, index) in boardData" type="A" :label="item.label" :value="item.value"
-          layout="label-top" class="board-item" />
+        <MiniBoard
+          :key="index"
+          v-for="(item, index) in boardData"
+          type="A"
+          :label="item.label"
+          :value="item.value"
+          layout="label-top"
+          class="board-item"
+        />
       </div>
       <!-- 实时数据表格 -->
       <BasicTable @register="registerTable" :scroll="{ x: 'max-content' }" :style="{ padding: 0 }">
@@ -34,8 +41,14 @@
     </TabPane>
   </Tabs>
   <!-- 弹窗组件 -->
-  <a-modal style="top: 30%; left: 170px" v-model:visible="visibleModal" :width="450" title="实时监测数据" @ok="handleOkEdit"
-    @cancel="handleCancelEdit">
+  <a-modal
+    style="top: 30%; left: 170px"
+    v-model:visible="visibleModal"
+    :width="450"
+    title="实时监测数据"
+    @ok="handleOkEdit"
+    @cancel="handleCancelEdit"
+  >
     <a-table></a-table>
   </a-modal>
 </template>
@@ -304,30 +317,21 @@ onUnmounted(() => {
 </script>
 
 <style lang="less" scoped>
-// .board-info {
-//   display: grid;
-//   grid-template-columns: repeat(5, auto); /* 3列：改5则为5列 */
-//   gap: auto;
-//   justify-content: start;
-//   flex-wrap: wrap;
-//   box-sizing: border-box;
-//   background-color: @white;
-//   padding: 10px;
-//   gap: 100px;
-//   // margin: 0 10px;
-//   margin-bottom: 5px;
-// }
-// .board-item {
-//   box-sizing: border-box;
-// }
 .board-info {
-  width: 100%;
-  display: flex;
+  display: grid;
+  grid-template-columns: repeat(5, auto); /* 3列：改5则为5列 */
+  gap: auto;
+  justify-content: start;
   flex-wrap: wrap;
-  margin-bottom: 8px;
+  box-sizing: border-box;
+  background-color: @white;
+  padding: 10px;
+  gap: 100px;
+  // margin: 0 10px;
+  margin-bottom: 5px;
 }
-
 .board-item {
-  margin-right: 80px;
+  box-sizing: border-box;
 }
 </style>
+

src/views/analysis/warningAnalysis/pressureDiffAnalysis/index.vue

@@ -4,8 +4,15 @@
   <Tabs v-model:activeKey="activeTab" type="line" class="common-page-tabs">
     <TabPane tab="实时监测" key="realtime">
       <div class="board-info">
-        <MiniBoard :key="index" v-for="(item, index) in boardData" type="A" :label="item.label" :value="item.value"
-          layout="label-top" class="board-item" />
+        <MiniBoard
+          :key="index"
+          v-for="(item, index) in boardData"
+          type="A"
+          :label="item.label"
+          :value="item.value"
+          layout="label-top"
+          class="board-item"
+        />
       </div>
       <!-- 实时数据表格 -->
       <BasicTable @register="registerTable" :scroll="{ x: 'max-content' }" :style="{ padding: 0 }">
@@ -38,15 +45,27 @@
     </TabPane>
   </Tabs>
   <!-- 弹窗组件 -->
-  <a-modal style="top: 30%; left: 170px" v-model:visible="visibleModal" :width="450" title="实时监测数据" @ok="handleOkEdit"
-    @cancel="handleCancelEdit">
+  <a-modal
+    style="top: 30%; left: 170px"
+    v-model:visible="visibleModal"
+    :width="450"
+    title="实时监测数据"
+    @ok="handleOkEdit"
+    @cancel="handleCancelEdit"
+  >
     <a-table></a-table>
   </a-modal>
   <!-- 弹窗组件 -->
-  <a-modal style="height: 400px" v-model:visible="visibleresolveModal" :width="600" centered title="密闭漏风处理情况"
-    @ok="handleOkEdit()" @cancel="handleCancelEdit">
-    <a-textarea style="width: 90%; margin-left: 20px; margin-right: 20px" v-model:value="resolveValue"
-      placeholder="请输入解决情况" :rows="4" />
+  <a-modal
+    style="height: 400px"
+    v-model:visible="visibleresolveModal"
+    :width="600"
+    centered
+    title="密闭漏风处理情况"
+    @ok="handleOkEdit()"
+    @cancel="handleCancelEdit"
+  >
+    <a-textarea style="width: 90%; margin-left: 20px; margin-right: 20px" v-model:value="resolveValue" placeholder="请输入解决情况" :rows="4" />
   </a-modal>
 </template>
 
@@ -316,13 +335,20 @@ onUnmounted(() => {
 
 <style lang="less" scoped>
 .board-info {
-  width: 100%;
-  display: flex;
+  display: grid;
+  grid-template-columns: repeat(5, auto); /* 3列：改5则为5列 */
+  gap: auto;
+  justify-content: start;
   flex-wrap: wrap;
-  margin-bottom: 8px;
+  box-sizing: border-box;
+  background-color: @white;
+  padding: 10px;
+  gap: 100px;
+  // margin: 0 10px;
+  margin-bottom: 5px;
 }
-
 .board-item {
-  margin-right: 80px;
+  box-sizing: border-box;
 }
 </style>
+

src/views/analysis/warningAnalysis/sealRiskJudgeAnalysis/index.vue

@@ -4,8 +4,15 @@
   <Tabs v-model:activeKey="activeTab" type="line" class="common-page-tabs">
     <TabPane tab="实时监测" key="realtime">
       <div class="board-info">
-        <MiniBoard :key="index" v-for="(item, index) in boardData" type="A" :label="item.label" :value="item.value"
-          layout="label-top" class="board-item" />
+        <MiniBoard
+          :key="index"
+          v-for="(item, index) in boardData"
+          type="A"
+          :label="item.label"
+          :value="item.value"
+          layout="label-top"
+          class="board-item"
+        />
       </div>
       <!-- 实时数据表格 -->
       <BasicTable @register="registerTable" :scroll="{ x: 'max-content' }" :style="{ padding: 0 }">
@@ -36,8 +43,14 @@
     </TabPane>
   </Tabs>
   <!-- 弹窗组件 -->
-  <a-modal style="top: 30%; left: 170px" v-model:visible="visibleModal" :width="450" title="实时监测数据" @ok="handleOkEdit"
-    @cancel="handleCancelEdit">
+  <a-modal
+    style="top: 30%; left: 170px"
+    v-model:visible="visibleModal"
+    :width="450"
+    title="实时监测数据"
+    @ok="handleOkEdit"
+    @cancel="handleCancelEdit"
+  >
     <a-table></a-table>
   </a-modal>
 </template>
@@ -307,30 +320,20 @@ onUnmounted(() => {
 </script>
 
 <style lang="less" scoped>
-// .board-info {
-//   display: grid;
-//   grid-template-columns: repeat(5, auto); /* 3列：改5则为5列 */
-//   gap: auto;
-//   justify-content: start;
-//   flex-wrap: wrap;
-//   box-sizing: border-box;
-//   background-color: @white;
-//   padding: 10px;
-//   gap: 100px;
-//   // margin: 0 10px;
-//   margin-bottom: 5px;
-// }
-// .board-item {
-//   box-sizing: border-box;
-// }
 .board-info {
-  width: 100%;
-  display: flex;
+  display: grid;
+  grid-template-columns: repeat(5, auto); /* 3列：改5则为5列 */
+  gap: auto;
+  justify-content: start;
   flex-wrap: wrap;
-  margin-bottom: 8px;
+  box-sizing: border-box;
+  background-color: @white;
+  padding: 10px;
+  gap: 100px;
+  // margin: 0 10px;
+  margin-bottom: 5px;
 }
-
 .board-item {
-  margin-right: 80px;
+  box-sizing: border-box;
 }
 </style>