Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/assets/styles/pages/dashboard.scss

@@ -30,6 +30,52 @@ $transition: all .5s;
                     font-weight: bold;
                 }
             }
+            @media (max-width: 1688px) {
+                .item-header > p {
+                    font-size: 16px;
+                }
+                .item-body {
+                    & > span {
+                        font-size: 32px;
+                        font-weight: bold;
+                    }
+                }
+            }
+            @media (max-width: 1580px) {
+                .item-header > p {
+                    font-size: 14px;
+                }
+                .item-body {
+                    & > span {
+                        font-size: 30px;
+                    }
+                }
+                
+            }
+            @media (max-width: 1450px) {
+                .item-header > p {
+                    font-size: 12px;
+                }
+                .item-body {
+                    & > span {
+                        font-size: 28px;
+                    }
+                }
+            }
+            @media (max-width: 1288px) {
+                .item-header > p {
+                    white-space: normal;
+                    display: -webkit-box;
+                    -webkit-line-clamp: 3;
+                    -webkit-box-orient: vertical;
+                    overflow: hidden;
+                }
+                .item-body {
+                    & > span {
+                        font-size: 26px;
+                    }
+                }
+            }
         }
         
         // box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .2) !important;

src/views/component/environmentRange.vue

@@ -134,22 +134,22 @@ export default {
         packageObj() {
             const obj = {
                 temperature: {
-                    min: this.environmentInfo.temperatureMin || this.environmentInfo.minTemperature,
-                    max: this.environmentInfo.temperatureMax || this.environmentInfo.maxTemperature,
+                    min: this.environmentInfo.temperatureMin, // || this.environmentInfo.minTemperature,
+                    max: this.environmentInfo.temperatureMax // || this.environmentInfo.maxTemperature,
                 },
                 humidity: {
-                    min: this.environmentInfo.humidityMin || this.environmentInfo.minHumidity,
-                    max: this.environmentInfo.humidityMax || this.environmentInfo.maxHumidity,
+                    min: this.environmentInfo.humidityMin, // || this.environmentInfo.minHumidity,
+                    max: this.environmentInfo.humidityMax // || this.environmentInfo.maxHumidity,
                 },
             };
             return JSON.stringify(obj);
         },
         resolveObj(jsonString = "") {
             const data = jsonString.trim() !== "" && JSON.parse(jsonString);
-            this.environmentInfo.temperatureMin = data?.temperature?.min || this.environmentInfo.temperatureMin;
-            this.environmentInfo.temperatureMax = data?.temperature?.max || this.environmentInfo.temperatureMax;
-            this.environmentInfo.humidityMin = data?.humidity?.min || this.environmentInfo.humidityMin;
-            this.environmentInfo.humidityMax = data?.humidity?.max || this.environmentInfo.humidityMax;
+            this.environmentInfo.temperatureMin = data?.temperature?.min // || this.environmentInfo.temperatureMin;
+            this.environmentInfo.temperatureMax = data?.temperature?.max // || this.environmentInfo.temperatureMax;
+            this.environmentInfo.humidityMin = data?.humidity?.min // || this.environmentInfo.humidityMin;
+            this.environmentInfo.humidityMax = data?.humidity?.max // || this.environmentInfo.humidityMax;
         },
         // 关闭当前窗口
         closeDialog() {

src/views/component/environmentRangePlus.vue

@@ -133,22 +133,23 @@ export default {
         packageObj() {
             const obj = {
                 temperature: {
-                    min: this.environmentInfo.temperatureMin || this.environmentInfo.minTemperature,
-                    max: this.environmentInfo.temperatureMax || this.environmentInfo.maxTemperature,
+                    min: this.environmentInfo.temperatureMin, // || this.environmentInfo.minTemperature,
+                    max: this.environmentInfo.temperatureMax // || this.environmentInfo.maxTemperature,
                 },
                 humidity: {
-                    min: this.environmentInfo.humidityMin || this.environmentInfo.minHumidity,
-                    max: this.environmentInfo.humidityMax || this.environmentInfo.maxHumidity,
+                    min: this.environmentInfo.humidityMin, // || this.environmentInfo.minHumidity,
+                    max: this.environmentInfo.humidityMax // || this.environmentInfo.maxHumidity,
                 },
             };
             return JSON.stringify(obj);
         },
         resolveObj(jsonString = "") {
             const data = jsonString.trim() !== "" && JSON.parse(jsonString);
-            this.environmentInfo.temperatureMin = data?.temperature?.min || this.environmentInfo.temperatureMin;
-            this.environmentInfo.temperatureMax = data?.temperature?.max || this.environmentInfo.temperatureMax;
-            this.environmentInfo.humidityMin = data?.humidity?.min || this.environmentInfo.humidityMin;
-            this.environmentInfo.humidityMax = data?.humidity?.max || this.environmentInfo.humidityMax;
+            this.environmentInfo.temperatureMin = data?.temperature?.min // || this.environmentInfo.temperatureMin;
+            this.environmentInfo.temperatureMax = data?.temperature?.max // || this.environmentInfo.temperatureMax;
+            this.environmentInfo.humidityMin = data?.humidity?.min // || this.environmentInfo.humidityMin;
+            this.environmentInfo.humidityMax = data?.humidity?.max // || this.environmentInfo.humidityMax;
+            console.log(data,this.environmentInfo)
         },
         // 关闭当前窗口
         closeDialog() {

src/views/system/jbdScan/goods/neishenzhuangtai.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="bg">
-        <el-dialog width="70vw" height="50vh" :modal-append-to-body="false" title="内审进度查询" :visible.sync="scanVisible">
+        <el-dialog width="80vw" :modal-append-to-body="false" title="内审进度查询" :visible.sync="scanVisible" top style="margin-top:50px;overflow:auto">
             <!-- 表单是否显示 -->
-            <div style="height: 75vh; width: 98%">
+            <div style="height: 80vh; width: 98% ; overflow:auto">
                 <div id="box">
                     <div class="overall">
                         <!-- 步骤条盒子 -->
@@ -546,10 +546,10 @@ export default {
             var chartDom = document.getElementById('in-echarts')
             let width, height
             if (window.innerWidth > 1600) {
-                width = 590
+                width = 720
                 height = 450
             } else {
-                width = 480
+                width = 570
                 height = 400
             }
             const setEchartWH = {
@@ -567,9 +567,8 @@ export default {
                 grid: {
                 // 让图表占满容器
                     top: '50px',
-                    left: '100px',
-                    right: '80px',
-                    bottom: '40px'
+                    left: '0',
+                    containLabel: true
                 },
                 xAxis: {
                     name: '  条数',
@@ -578,6 +577,9 @@ export default {
                     nameRotate: 0,
                     nameTextStyle: {
                         fontSize: 10
+                    },
+                    axisLine: {
+                        show: true
                     }
                 },
                 yAxis: {
@@ -736,7 +738,9 @@ export default {
 
                 label: {
                     formatter: '{b}\n({c}项)',
-                    edgeDistance: '20%'
+                    edgeDistance: '20%',
+                    fontSize: 12,
+                    color: '#1f1f1f'
                 },
                 legend: {
                     orient: 'vertical',
@@ -1180,23 +1184,26 @@ export default {
     margin: 10px auto;
   }
   .table-echarts {
-    width: 90%;
-     margin: 10px auto 0px;
-  }
-  .table-echarts {
+    margin: 16px auto;
     width: 90%;
     display: flex;
     justify-content: space-between;
     .in-echarts {
-      width: 400px;
-      height: 300px;
-    }
-    #in-echarts {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      #in-CMAecharts {
       width: 100%;
       height: 100%;
     }
+    }
+
     .department {
-      margin-left: 40px;
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
     }
     // #department {
     //   width: 400px;