Merge branch 'develop_jzl'

gassafetyprogress-web/src/assets/styles/zehong.scss

@@ -256,7 +256,7 @@
  	float: right;
  }
 
- @media (max-width: 1100px) {
+ @media (max-width: 1300px) {
  	.amap-info {
  		transform-origin: 5% -100% !important;
  		transform: scale(.6) !important;

gassafetyprogress-web/src/views/bigWindow/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-01-11 13:44:17
- * @LastEditTime: 2022-08-24 13:43:01
+ * @LastEditTime: 2022-08-31 14:20:03
  * @LastEditors: 纪泽龙 jizelong@qq.com
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /test/hello-world/src/views/Home.vue
@@ -56,8 +56,8 @@
     <!-- 设备按钮 -->
     <div
       :class="{
-        'typelist-div': windowInnerWidth > 1100,
-        'typelist-divZ': windowInnerWidth < 1100,
+        'typelist-div': windowInnerWidth > 1300,
+        'typelist-divZ': windowInnerWidth < 1300,
       }"
     >
       <div
@@ -84,7 +84,7 @@
     </div>
 
     <!-- 头部 -->
-    <div class="banner-test" :style="{height:windowInnerWidth>1100?'85px':'70px'}">
+    <div class="banner-test" :style="{height:windowInnerWidth>1300?'85px':'70px'}">
       <!-- <dv-decoration-5 style="width:100%;height:100%;" /> -->
       <img src="@/assets/mapinages/tb.png" alt="" />
     </div>
@@ -92,17 +92,17 @@
     <!-- 左边 -->
     <div
       class="leftbar"
-      :style="{ width: windowInnerWidth > 1024 ? '470px' : '300px' }"
+      :style="{ width: windowInnerWidth > 1300 ? '470px' : '300px' }"
     >
-      <leftBar v-if="windowInnerWidth > 1024" ref="mychild2"></leftBar>
+      <leftBar v-if="windowInnerWidth > 1300" ref="mychild2"></leftBar>
       <leftBarZ v-else ref="mychild2"></leftBarZ>
     </div>
     <!-- 右边 -->
     <div
       class="rightbar"
-      :style="{ width: windowInnerWidth > 1024 ? '470px' : '300px' }"
+      :style="{ width: windowInnerWidth > 1300 ? '470px' : '300px' }"
     >
-      <rightBar v-if="windowInnerWidth > 1024" ref="mychild"></rightBar>
+      <rightBar v-if="windowInnerWidth > 1300" ref="mychild"></rightBar>
       <rightBarZ v-else ref="mychild"></rightBarZ>
     </div>
 

gassafetyprogress-web/src/views/examine/index.vue

@@ -359,7 +359,7 @@ export default {
   display: flex;
   justify-content: space-around;
 }
-@media (max-width: 1100px) {
+@media (max-width: 1300px) {
   .exaone {
     overflow: hidden !important;
   }

gassafetyprogress-web/src/views/index_v1.vue

@@ -90,7 +90,12 @@ export default {
   }
 }
 
-@media (max-width:1024px) {
+// @media (max-width:1024px) {
+//   .chart-wrapper {
+//     padding: 8px;
+//   }
+// }
+@media (max-width:1300px) {
   .chart-wrapper {
     padding: 8px;
   }

gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData/FilterVue.vue

 <!--
  * @Author: your name
  * @Date: 2022-03-29 09:41:23
- * @LastEditTime: 2022-08-25 17:06:40
+ * @LastEditTime: 2022-08-31 14:26: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/monitorData/component/charsData/Filter.vue
@@ -83,7 +83,7 @@ export default {
 .fliter-vue {
   display: flex;
 }
-@media (max-width: 1100px) {
+@media (max-width: 1300px) {
   .filter {
     margin-right: 20px !important;
   }

gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-03-25 13:46:23
- * @LastEditTime: 2022-08-25 17:02:07
+ * @LastEditTime: 2022-08-31 14:20:33
  * @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/monitorData/component/charsData.vue
 -->
 <template>
   <div class="chars-data">
-    <TopCard v-if="windowInnerWidth>1100" :cardList="cardList"/>
+    <TopCard v-if="windowInnerWidth>1300" :cardList="cardList"/>
     <TopCardZ v-else :cardList="cardList"/>
-    <CzCard v-if="windowInnerWidth>1100" />
+    <CzCard v-if="windowInnerWidth>1300" />
     <CzCardZ v-else />
     <Cg/>
     <Fmj/>

gassafetyprogress-web/src/views/operationMonitor/xunjianxuncha/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-11 14:11:04
- * @LastEditTime: 2022-08-25 15:24:33
+ * @LastEditTime: 2022-08-31 14:20:50
  * @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
@@ -11,21 +11,21 @@
     <div class="wrapper flex-h">
       <div class="top flex">
         <div class="left">
-          <Left v-if="windowInnerWidth > 1100" />
+          <Left v-if="windowInnerWidth > 1300" />
           <LeftZ v-else />
         </div>
-        <div class="middle" :class="{ z: windowInnerWidth < 1100 }">
-          <Middle v-if="windowInnerWidth > 1100" />
+        <div class="middle" :class="{ z: windowInnerWidth < 1300 }">
+          <Middle v-if="windowInnerWidth > 1300" />
           <MiddleZ v-else />
         </div>
-        <div class="right" :class="{ z: windowInnerWidth < 1100 }">
-          <Right v-if="windowInnerWidth > 1100" />
+        <div class="right" :class="{ z: windowInnerWidth < 1300 }">
+          <Right v-if="windowInnerWidth > 1300" />
           <RightZ v-else />
         </div>
       </div>
       <div class="middle"></div>
       <div class="bottom">
-        <MapBottom v-if="windowInnerWidth > 1100" />
+        <MapBottom v-if="windowInnerWidth > 1300" />
         <MapBottomZ v-else />
       </div>
     </div>

gassafetyprogress-web/src/views/statistic/overview/conponents/Left/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-18 18:00:22
- * @LastEditTime: 2022-08-26 13:54:17
+ * @LastEditTime: 2022-08-31 14:21:10
  * @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/statistic/overview/conponents/Left.vue
@@ -15,7 +15,7 @@
       <Scound title="双代设备" :left="two.left" :right="two.right" />
     </div>
     <div class="three">
-      <CharBoxA v-if="windowInnerWidth > 1100" />
+      <CharBoxA v-if="windowInnerWidth > 1300" />
       <CharBoxAZ v-else/>
     </div>
     <div class="four">

gassafetyprogress-web/src/views/statistic/overview/conponents/Middle/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-19 09:46:51
- * @LastEditTime: 2022-08-26 13:58:42
+ * @LastEditTime: 2022-08-31 14:21:16
  * @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/statistic/overview/conponents/Middle.vue
@@ -9,7 +9,7 @@
 <template>
   <div class="middle-components all-flex-h">
     <div class="top">
-      <img :style="{width:windowInnerWidth>1100 ?'100%':'80%'}" src="@/assets/image-overview/titlepic.jpg" alt="" />
+      <img :style="{width:windowInnerWidth>1300 ?'100%':'80%'}" src="@/assets/image-overview/titlepic.jpg" alt="" />
     </div>
     <div class="bottom">
       <CharsBoxE />

gassafetyprogress-web/src/views/statistic/overview/conponents/Right/index.vue

 <!--
  * @Author: your name
  * @Date: 2022-04-18 18:00:22
- * @LastEditTime: 2022-08-26 14:08:39
+ * @LastEditTime: 2022-08-31 14:21:24
  * @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/statistic/overview/conponents/Left.vue
@@ -9,14 +9,14 @@
 <template>
   <div class="all-flex-h right-component">
     <div class="one">
-      <One v-if="windowInnerWidth>1100"/>
+      <One v-if="windowInnerWidth>1300"/>
       <OneZ v-else/>
     </div>
     <div class="two">
       <Two />
     </div>
     <div class="three">
-      <CharBoxC v-if="windowInnerWidth>1100"/>
+      <CharBoxC v-if="windowInnerWidth>1300"/>
       <CharBoxCZ v-else/>
     </div>
     <div class="four">