Merge branch 'dev' of http://172.16.100.139/new-business/drp-web into dev

package.json

@@ -88,6 +88,7 @@
     "connect": "3.6.6",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",
+    "html-webpack-plugin": "^5.6.0",
     "lint-staged": "10.5.3",
     "regenerator-runtime": "^0.14.0",
     "runjs": "4.4.2",

src/components/popover-select-v2/multiple_liu1tian.vue

@@ -104,11 +104,13 @@ export default {
     },
     // hide dialog
     async hide() {
+      this.selectData = [];
+      this.jsData = [];
       this.visible = false;
     },
     // fetch list
     async fetchList(prop, page) {
-      
+
       try {
         this.selectData.forEach(element => {
           this.jsData.push({"code":element.code,"name":element.name})
@@ -159,7 +161,7 @@ export default {
     useDelete(prop) {
       this.lastSelectData.splice(prop, 1);
       this.useConfirm(this.lastSelectData);
-      
+
     },
     // confirm
     useConfirm(prop) {

src/views/WMS/historical-route/index.vue

@@ -31,7 +31,7 @@
                 <el-descriptions-item label="车牌号">{{ item[0].measuringPointName }}</el-descriptions-item>
                 <el-descriptions-item label="探头">{{ item[0].measuringPointAddr }}</el-descriptions-item>
               </el-descriptions>
-              <el-table :data="item" stripe border style="width: 97%">
+              <el-table :data="item" stripe border style="width: 96%; font-size: 20px">
                 <el-table-column prop="hisDate" label="时间点" align="center" min-width="160"/>
                 <el-table-column prop="temperature" label="温度" align="center" min-width="60"/>
                 <el-table-column prop="hisDate1" label="时间点" align="center" min-width="160"/>
@@ -69,7 +69,7 @@
                 <el-descriptions-item label="保温箱号">{{ item[0].measuringPointName }}</el-descriptions-item>
                 <el-descriptions-item label="探头">{{ item[0].measuringPointAddr }}</el-descriptions-item>
               </el-descriptions>
-              <el-table :data="item" stripe border style="width: 97%">
+              <el-table :data="item" stripe border style="width: 96%; font-size: 20px">
                 <el-table-column prop="hisDate" label="时间点" align="center" min-width="160"/>
                 <el-table-column prop="temperature" label="温度" align="center" min-width="60"/>
                 <el-table-column prop="hisDate1" label="时间点" align="center" min-width="160"/>
@@ -114,7 +114,7 @@
           <el-timeline>
             <br>
             <h2>订单温湿度列表</h2>
-            <el-table :data="tableData1" height="200" style="width: 97%">
+            <el-table :data="tableData1" height="200" style="width: 96%; font-size: 20px">
               <el-table-column prop="maxTemperature" label="温度最大值" align="center" min-width="100"/>
               <el-table-column prop="avgTemperature" label="温度平均值" align="center" min-width="100"/>
               <el-table-column prop="minTemperature" label="温度最小值" align="center" min-width="100"/>
@@ -876,6 +876,11 @@ export default {
 </script>
 
 <style scoped>
+
+.el-descriptions {
+  font-size: 22px;
+}
+
 #container {
   padding: 100px;
   margin: 10px;