Merge remote-tracking branch 'origin/master'

zh-baseversion-web/src/views/operationMonitor/xunjianxuncha/components/Left.vue

@@ -93,7 +93,7 @@ export default {
             type: 'category',
             data: [],
             axisLabel: {
-              fontSize: 12,
+              fontSize: 10,
               interval: 0,
               rotate: 30, // 如果公司名称太长，可以旋转角度
               width: 80,
@@ -107,7 +107,7 @@ export default {
             type: 'value',
             name: '巡检次数',
             axisLabel: {
-              fontSize: 12
+              fontSize: 10
             }
           },
           series: [

zh-baseversion-web/src/views/operationMonitor/xunjianxuncha/components/Middle.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-11 15:07:47
- * @LastEditTime: 2022-04-20 11:09:34
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2026-05-07 10:28:17
+ * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/topChars/left.vue
 -->
@@ -165,11 +165,13 @@ export default {
             this.hiddenBookInfo= res.data;
             this.option.series[0].data = [{value: res.data.finishNum, name: '整改'},{value: res.data.unFinishNum, name: '未整改'}];
             this.bottomData = [
-              [{ name: "漏气", value: res.data.blowNum, color: "#604AFF" },
+              [
+              { name: "漏气", value: res.data.blowNum, color: "#604AFF" },
               { name: "腐蚀", value: res.data.corrosionNum, color: "#FFC337" },
               { name: "裂缝", value: res.data.crackNum, color: "#86FF5B" },
-              { name: "设备故障", value: res.data.deviceNum, color: "#03C4F1" },
               { name: "安全距离不足", value: res.data.distanceNum, color: "#1F8DF3" },
+              { name: "设备故障", value: res.data.deviceNum, color: "#03C4F1" },
+
               { name: "管道承重", value: res.data.pipeNum, color: "#03C4F1" },
               { name: "其他", value: res.data.otherNum, color: "#1F8DF3" }]
             ],

zh-baseversion-web/src/views/operationMonitor/xunjianxuncha/components/Scroll.vue

@@ -69,7 +69,7 @@ export default {
 
         // 当内容完全滚出容器时，重置位置
         if (Math.abs(this.translateY) >= this.contentHeight) {
-          this.translateY = this.containerHeight;
+          this.translateY = 0;
         }
       }, this.interval);
     },

zh-baseversion-web/src/views/operationMonitor/xunjianxuncha/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-11 14:11:04
- * @LastEditTime: 2022-04-14 10:45:52
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2026-05-07 10:19:28
+ * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/index.vue
 -->
 <template>
   <div class="app-container xjxc">
-    <div class="wrapper flex-h">
+    <div class="wrapper-b flex-h">
       <div class="top flex">
         <div class="left">
           <Left />
@@ -54,20 +54,33 @@ export default {
 <style lang="scss" scoped>
 .app-main {
 }
+.app-container {
+  display: flex;
+  flex-direction: column;
+}
 .xjxc {
   height: calc(100vh - 50px) !important;
+  overflow: auto;
+
 }
 .flex {
   display: flex;
   justify-content: space-between;
 }
-.flex-h {
+.wrapper-b-wrapper{
+  flex:1;
+  // border:1px solid red
+  // background: red;
+}
+.wrapper-b {
   display: flex;
   // justify-content: space-around;
   flex-direction: column;
+   min-height: 818px;
+  height: 100%;
   height: 100%;
   .top {
-    height: 38.7%;
+    height: 42%;
 
     .left {
       width: 36.5%;
@@ -75,7 +88,7 @@ export default {
     }
     .middle {
       width: 35.3%;
-      padding: 15px 80px 19px 71px;
+      padding: 15px 20px 0px 20px;
     }
     .right {
       width: 25.2%;

zh-baseversion-web/src/views/supervise/analysis/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-11 14:11:04
- * @LastEditTime: 2022-04-14 10:45:52
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2026-05-07 10:07:18
+ * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/index.vue
 -->
 <template>
   <div class="app-container xjxc">
-    <div class="shai" >
+    <div class="shai">
       <el-select
         clearable
         v-model="danwei"
         placeholder="请选择单位"
         @change="selectcompanyId"
       >
-          <el-option
-            v-for="item in enterprises"
-            :key="item.enterpriseId"
-            :label="item.enterpriseName"
-            :value="item.enterpriseId"
-          ></el-option>
-        </el-select>
-
+        <el-option
+          v-for="item in enterprises"
+          :key="item.enterpriseId"
+          :label="item.enterpriseName"
+          :value="item.enterpriseId"
+        ></el-option>
+      </el-select>
     </div>
     <el-tabs v-model="activeName" style="width: 300px" @tab-click="handleClick">
       <el-tab-pane label="2026年度" name="2026"></el-tab-pane>
@@ -30,23 +29,23 @@
       <el-tab-pane label="2024年度" name="2024"></el-tab-pane>
       <el-tab-pane label="2023年度" name="2023"></el-tab-pane>
     </el-tabs>
-
-    <div class="wrapper flex-h">
-      <div class="top flex">
-        <div class="right">
-          <Right :annual="activeName" :companyInfoId="companyInfoId" />
+    <div class="wrapper-b-wrapper">
+      <div class="wrapper-b flex-h">
+        <div class="top flex">
+          <div class="right">
+            <Right :annual="activeName" :companyInfoId="companyInfoId" />
+          </div>
+          <div class="left">
+            <Left :annual="activeName" :companyInfoId="companyInfoId" />
+          </div>
+          <!--<div class="middle">-->
+          <!--<Middle />-->
+          <!--</div>-->
         </div>
-        <div class="left">
-          <Left :annual="activeName" :companyInfoId="companyInfoId" />
+        <div class="middle"></div>
+        <div class="bottom">
+          <Middle :annual="activeName" :companyInfoId="companyInfoId" />
         </div>
-        <!--<div class="middle">-->
-          <!--<Middle />-->
-        <!--</div>-->
-
-      </div>
-      <div class="middle"></div>
-      <div class="bottom">
-        <Middle :annual="activeName" :companyInfoId="companyInfoId"  />
       </div>
     </div>
   </div>
@@ -61,69 +60,89 @@ export default {
   components: {
     Left,
     Middle,
-    Right
+    Right,
   },
   data() {
     return {
-      danwei:null,
+      danwei: null,
       enterprises: [],
-      activeName: '2025',
-      companyInfoId:''
+      activeName: "2025",
+      companyInfoId: "",
     };
   },
   created() {
     this.getEnterpriseLists();
   },
   methods: {
-    selectcompanyId(e){
+    selectcompanyId(e) {
       this.companyInfoId = e;
     },
     //所属单位
-    getEnterpriseLists(){
+    getEnterpriseLists() {
       const param = {};
-      enterpriseLists(param).then(response => {
+      enterpriseLists(param).then((response) => {
         this.enterprises = response.rows;
       });
     },
     handleClick(tab, event) {
       console.log(tab, event);
-    }
+    },
   },
-  mounted(){
-
-  }
+  mounted() {},
 };
 </script>
 
 <style lang="scss" scoped>
 .app-main {
 }
+.app-container {
+  display: flex;
+  flex-direction: column;
+}
 .xjxc {
   height: calc(100vh - 50px) !important;
+  overflow: auto;
 }
+
 .flex {
   display: flex;
   justify-content: space-between;
 }
-.flex-h {
+.wrapper-b-wrapper {
+  flex: 1;
+  // border:1px solid red
+  // background: red;
+}
+
+.wrapper-b {
   display: flex;
   // justify-content: space-around;
   flex-direction: column;
+  min-height: 818px;
+  min-width: 1400px;
+  width: 100%;
   height: 100%;
   .top {
-    height: 38.7%;
+    height: 40%;
+
 
     .left {
       width: 70%;
+      box-sizing: border-box;
+
       padding: 15px 24px 19px;
     }
     .middle {
       width: 35.3%;
+      box-sizing: border-box;
+
       padding: 15px 80px 19px 71px;
     }
     .right {
       width: 30.2%;
-      padding: 15px 29px;
+      box-sizing: border-box;
+
+      padding: 15px 10px;
     }
     > div {
       // box-shadow: 2px 0px 13px 1px rgba(0, 0, 0, 0.1);
@@ -131,26 +150,31 @@ export default {
       border-radius: 3px;
     }
   }
-  >.middle {
+  > .middle {
     margin: 5px 0;
-    background: repeating-linear-gradient(135deg, transparent, transparent 3px, #D6D6D6 3px, #D6D6D6 8px);
+    background: repeating-linear-gradient(
+      135deg,
+      transparent,
+      transparent 3px,
+      #d6d6d6 3px,
+      #d6d6d6 8px
+    );
     height: 2px;
   }
   .bottom {
     flex: 1;
-
   }
   > div {
     // height: 50%;
   }
 }
-  .shai{
-    position: fixed;
-    right: 20px;
-    width: 300px;
-    height: 40px;
-  }
-::v-deep .el-select{
+.shai {
+  position: fixed;
+  right: 20px;
+  width: 300px;
+  height: 40px;
+}
+::v-deep .el-select {
   width: 300px;
 }
 </style>

zh-baseversion-web/src/views/supervise/summary/components/Right.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-11 15:07:47
- * @LastEditTime: 2022-04-14 18:00:06
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2026-05-07 10:33:41
+ * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/topChars/left.vue
 -->
@@ -151,12 +151,12 @@
     height: 30vh;
   }
   .right{
-    width: 55%;
+    width: 60%;
     height: 30vh;
   }
   .onehang{
     width: 100%;
-    font-size: 14px;
+    font-size: 12px;
     display: flex;
   }
   .one{

zh-baseversion-web/src/views/supervision/safetysupervise/components/Left.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-11 15:07:47
- * @LastEditTime: 2022-04-14 18:00:06
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2026-05-07 10:38:55
+ * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/topChars/left.vue
 -->
 <template>
-  <div style="display:flex; ">
+  <div class="l-r" style="display:flex; ">
     <div class="upon" >物联监测设备</div>
     <div class="left" id ="main2">
       <Chars :options="option"/>
@@ -143,6 +143,9 @@
 </script>
 
 <style lang="scss" scoped>
+.l-r{
+  position:relative
+}
   .left{
     width: 40%;
     height: 30vh;
@@ -174,8 +177,9 @@
     margin-right: 5px;
   }
   .upon{
-    position: fixed;
-    width: 30%;
+    position: absolute;
+    left:50%;
+    transform: translateX(-50%);
     text-align: center;
     font-size: 24px;
   }

zh-baseversion-web/src/views/supervision/safetysupervise/components/Middle.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-11 15:07:47
- * @LastEditTime: 2022-04-20 11:09:34
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2026-05-07 10:40:57
+ * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/topChars/left.vue
 -->
@@ -121,7 +121,7 @@ export default {
 .two {
   // flex: 1;
   > .left {
-    margin-right: 70px;
+    margin-right: 20px;
     .first {
       margin-bottom: 6px;
     }
@@ -156,7 +156,7 @@ export default {
     }
     .chars-box {
       width: 220px;
-      height: 220px;
+      height: 200px;
       margin: 0 auto;
     }
   }
@@ -171,6 +171,7 @@ export default {
     // display: flex;
     // flex-direction: column;
     // justify-content: space-between;
+
     .first {
       text-align: left;
       .text {

zh-baseversion-web/src/views/supervision/safetysupervise/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-11 14:11:04
- * @LastEditTime: 2022-04-14 10:45:52
- * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2026-05-07 10:37:02
+ * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/index.vue
 -->
@@ -56,6 +56,8 @@ export default {
 }
 .xjxc {
   height: calc(100vh - 50px) !important;
+  overflow: auto;
+
 }
 .flex {
   display: flex;
@@ -65,6 +67,8 @@ export default {
   display: flex;
   // justify-content: space-around;
   flex-direction: column;
+  min-width: 1400px;;
+  width: 100%;
   height: 100%;
   .top {
     height: 38.7%;