fix：拖动条挡住日期修改

src/components/RightPanel/GuiDaoQS/index.vue

@@ -46,7 +46,7 @@ export default {
           },
           grid: {
             right: 45,
-            bottom: "3%",
+            bottom: "16%",
             containLabel: true,
           },
           xAxis: {
@@ -125,7 +125,7 @@ export default {
           },
           grid: {
             right: 45,
-            bottom: "3%",
+            bottom: "16%",
             containLabel: true,
           },
           xAxis: {

src/components/RightPanel/JieChuWangQS/index.vue

@@ -15,6 +15,7 @@ export default {
     return {
       queryType: "b.totalworkmax,b.totalworkmin,b.totalworkavg",
       selectedType: "ZHZG",
+      dcbh: '9/11#-9#                      '
     };
   },
   methods: {
@@ -55,7 +56,7 @@ export default {
       };
       axios
         .post("/EchartRouter/getGlCurrent", {
-          dcbh: 1, //val.dcbh
+          dcbh: this.dcbh, //val.dcbh
           value: this.queryType,
         })
         .then((res) => {
@@ -130,6 +131,28 @@ export default {
       option.series[2].data = this.dataarr.totalworkavg;
       myChart1.setOption(option);
     },
+    getDefaultData(val) {
+      //获取默认数据
+      this.dcbh = val.dcbh;
+
+      axios
+        .post("/EchartRouter/getGlCurrent", {
+          dcbh: val.dcbh, //val.dcbh
+          value: this.queryType,
+        })
+        .then((res) => {
+          let sortdata = res.rows; //.sort(this.compare('riqi'));
+          for (let i = 0; i < sortdata.length; i++) {
+            this.dataarr.riqi.push(
+              this.DateToStr(this.ConvertDateByCNZdate(sortdata[i]["time"]))
+            );
+            this.dataarr.totalworkmax.push(sortdata[i]["totalworkmax"]);
+            this.dataarr.totalworkmin.push(sortdata[i]["totalworkmin"]);
+            this.dataarr.totalworkavg.push(sortdata[i]["totalworkavg"]);
+          }
+          this.refreshData();
+        });
+      }
   },
   mounted() {
     /*     document.getElementById("bdfcglbh1031").className = "bodongfocus";
@@ -501,33 +524,23 @@ export default {
         myChart1.setOption(changshow);
       }
     });
+    const val = {
+      dcbh: '9/11#-9#'
+    }
+    setTimeout(() => {
+      this.getDefaultData(val);
+    }, 1000);
   },
   watch: {
     "$store.state.defaultPoint": function (val) {
-      if (val.type !== "gl") return;
+      if (val.type !== "功率") return;
       this.dataarr = {
         riqi: [],
         totalworkmax: [],
         totalworkmin: [],
         totalworkavg: [],
       };
-      axios
-        .post("/EchartRouter/getGlCurrent", {
-          dcbh: 1, //val.dcbh
-          value: this.queryType,
-        })
-        .then((res) => {
-          let sortdata = res.rows; //.sort(this.compare('riqi'));
-          for (let i = 0; i < sortdata.length; i++) {
-            this.dataarr.riqi.push(
-              this.DateToStr(this.ConvertDateByCNZdate(sortdata[i]["time"]))
-            );
-            this.dataarr.totalworkmax.push(sortdata[i]["totalworkmax"]);
-            this.dataarr.totalworkmin.push(sortdata[i]["totalworkmin"]);
-            this.dataarr.totalworkavg.push(sortdata[i]["totalworkavg"]);
-          }
-          this.refreshData();
-        });
+      this.getDefaultData(val);
     },
   },
 };

src/components/TopPanel/uploadBtn.vue

@@ -13,6 +13,12 @@
         cancel-text="关闭"
       >
         <div class="clearfix">
+          <!-- 选择类型 -->
+          <a-select v-model="fileType" style="margin-right: 10px" placeholder="选择类型">
+            <a-select-option value="工务">工务</a-select-option>
+            <a-select-option value="功率">功率</a-select-option>
+            <a-select-option value="缺口">缺口</a-select-option>
+          </a-select>
           <a-upload
             :file-list="fileList"
             :remove="handleRemove"
@@ -21,12 +27,6 @@
           >
             <a-button> <a-icon type="upload" />选择文件</a-button>
           </a-upload>
-           <!-- 选择类型 -->
-           <a-select v-model="fileType" style="margin-left: 10px" placeholder="选择类型">
-              <a-select-option value="工务">工务</a-select-option>
-              <a-select-option value="功率">功率</a-select-option>
-              <a-select-option value="缺口">缺口</a-select-option>
-            </a-select>
           <div>
             <a-progress :percent="percent" v-show="precentflag" />
           </div>
@@ -82,9 +82,7 @@ export default {
     },
     beforeUpload(file) {
       //filetemp是文件名的数组，用于存储文件名中的信息
-      var filetemp = file.name
-        .substring(0, file.name.lastIndexOf("."))
-        .split("-");
+      var filetemp = file.name.substring(0, file.name.lastIndexOf(".")).split("-");
       // 判断文件名的后缀名
       if (file.name.substring(file.name.lastIndexOf(".") + 1) != "geo") {
         this.$message.error("请上传geo文件");
@@ -185,10 +183,8 @@ export default {
       var num = 1024.0; //byte
       if (size < num) return size + "B";
       if (size < Math.pow(num, 2)) return (size / num).toFixed(2) + "KB"; //kb
-      if (size < Math.pow(num, 3))
-        return (size / Math.pow(num, 2)).toFixed(2) + "MB"; //M
-      if (size < Math.pow(num, 4))
-        return (size / Math.pow(num, 3)).toFixed(2) + "G"; //G
+      if (size < Math.pow(num, 3)) return (size / Math.pow(num, 2)).toFixed(2) + "MB"; //M
+      if (size < Math.pow(num, 4)) return (size / Math.pow(num, 3)).toFixed(2) + "G"; //G
       return (size / Math.pow(num, 4)).toFixed(2) + "T"; //T
     },
   },