修复虫情分析

pingpu_vue/config/index.js

@@ -13,7 +13,7 @@ module.exports = {
       '/api': {
         // target: 'http://192.168.1.77:8003', //曹世祥本地服务
         target: ' http://106.119.196.18:10004', //线上
-        // target: 'http://192.168.1.52:8005',
+        // target: 'http://192.168.1.52:10004',
         changeOrigin: true,
         pathRewrite: {
           '^/api': '/api' //重写接口

pingpu_vue/index.html

@@ -49,8 +49,11 @@
   </script>
   <script
     src="https://webapi.amap.com/maps?v=2.0&key=c907b4265ae043cbdbf64304f1f80b2b&plugin=AMap.PolygonEditor,AMap.MarkerClusterer,AMap.DistrictSearch"></script>
-  <script src="https://webstaticimg.oss-cn-hangzhou.aliyuncs.com/bigdata_app/js/ezuikit.js"></script>
-  <script src="https://webstaticimg.oss-cn-hangzhou.aliyuncs.com/bigdata_app/js/jsencrypt.min.js"></script>
+  <!-- <script src="https://webstaticimg.oss-cn-hangzhou.aliyuncs.com/bigdata_app/js/ezuikit.js"></script> -->
+  <script src="https://webstaticimg.oss-cn-hangzhou.aliyuncs.com/bigdata_app/js/ezuikit.js" integrity="sha384-c04Hx/aw5tjO2+wOkP0qgfBIDSsOde7j/NMmkkZhsRN1oR5uGPb8/JPGGgqqfDu8" crossorigin="anonymous"></script>
+  <!-- <script src="https://webstaticimg.oss-cn-hangzhou.aliyuncs.com/bigdata_app/js/jsencrypt.min.js"></script>
+   -->
+   <script src="https://webstaticimg.oss-cn-hangzhou.aliyuncs.com/bigdata_app/js/jsencrypt.min.js" integrity="sha384-um7kEhiTTYAZgvwNbwMpjPLGNzw2e3iHdjr2CKg/vGkH6o3M7z8Y4+CvLaCeI9pe" crossorigin="anonymous"></script>
   <script src="./static/imouplayer.js"></script>
 </body>
 

pingpu_vue/src/page/cbd/analyse.vue

@@ -417,6 +417,7 @@ export default {
       }
       if (this.slidermax == 366) {
         this.marks = {
+          0: '1月1日',
           31: "1月31日",
           60: "2月29日",
           91: "3月31日",
@@ -432,6 +433,7 @@ export default {
         };
       } else if (this.slidermax == 365) {
         this.marks = {
+          0: '1月1日',
           31: "1月31日",
           59: "2月28日",
           90: "3月31日",
@@ -446,10 +448,17 @@ export default {
           365: "12月31日",
         };
       }
-      this.slidervalue = [
-        this.getsliserindex(oldMonth, olddate),
-        this.getsliserindex(Month, date),
-      ];
+      if (Month == 0) {
+        this.slidervalue = [
+          0,
+          this.getsliserindex(Month, date),
+        ];
+      } else {
+        this.slidervalue = [
+          this.getsliserindex(oldMonth, olddate),
+          this.getsliserindex(Month, date),
+        ];
+      }
       var state = this.formatTooltip(this.slidervalue[0]);
       var end = this.formatTooltip(this.slidervalue[1]);
       state = state.replace("月", "-");
@@ -487,7 +496,11 @@ export default {
       for (var key in this.marks) {
         arr.push(key);
       }
-      return Number(arr[month - 1]) + Number(date) - 1;
+      if (month == 0) {
+        return Number(date) - 1;
+      } else {
+        return Number(arr[month]) + Number(date) - 1;
+      }
     },
     // 年份发生改变
     yearchange(e) {

pingpu_vue/src/page/login/login.vue

@@ -39,7 +39,7 @@
 
 <script>
 //这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
-
+import Base64 from "../../util/base64";
 export default {
   //import引入的组件需要注入到对象中才能使用
   components: {},
@@ -65,12 +65,13 @@ export default {
     register() {
       this.$refs["ruleForm"].validate((valid) => {
         if (valid) {
+          var base = new Base64();
           this.$axios({
             method: "POST",
             url: "/api/api_gateway?method=user.login.login_user",
             data: this.qs.stringify({
-              username: this.ruleForm.username,
-              password: this.ruleForm.password,
+              username: base.encode(this.ruleForm.username),
+              password: base.encode(this.ruleForm.password),
             }),
           }).then((res) => {
             if (res.data.message == "") {

pingpu_vue/src/page/monitor/Monitor.vue

@@ -2079,9 +2079,9 @@ li {
       }
       .direc {
         text-align: center;
-        width: 100%;
+        width: 180px;
         height: 180px;
-        margin: 5% 0 5% 0;
+        margin: 5% auto;
         position: relative;
         background: url(../../assets/images/forecasting/monitor/direction-btn.png)
           no-repeat center;
@@ -2104,12 +2104,12 @@ li {
         }
         .leftCtr {
           top: 50%;
-          left: 112px;
+          left: 8px;
           margin-top: -25px;
         }
         .rightCtr {
           top: 50%;
-          right: 118px;
+          right: 8px;
           margin-top: -25px;
         }
         .cameraCtr {

pingpu_vue/src/page/qxz/envi.vue

@@ -334,8 +334,8 @@ export default {
     //这里存放数据
     return {
       queryInfo: {
-        page_size: "10",
-        page: "1",
+        page_size: 10,
+        page: 1,
         is_online: "",
         f_id: "",
         pagekey:1
@@ -358,7 +358,9 @@ export default {
       loading: false,
       setDialogVisible: false,
       parameterLoading: false,
-      setFrom: {},
+      setFrom: {
+        interval:0
+      },
       equipInfo: {},
       setDialogTxt: "请求中",
       simCodeVisible: false,
@@ -503,7 +505,7 @@ export default {
           this.getEquipList()
         } else {
           if (document.getElementsByClassName("el-message").length == 0) {
-            this.$message.err("操作失败");
+            this.$message.error(res.data.message);
           }
         }
         this.setDialogVisible = false;

pingpu_vue/src/page/sqz/sqz.vue

@@ -356,7 +356,9 @@ export default {
       loading: false,
       setDialogVisible: false,
       parameterLoading: false,
-      setFrom: {},
+      setFrom: {
+        interval:0
+      },
       equipInfo: {},
       setDialogTxt: "请求中",
       simCodeVisible: false,

pingpu_vue/src/page/user/userlist.vue

@@ -214,7 +214,7 @@ export default {
     return {
       username: "",
       page: 1,
-      page_size: 1,
+      page_size: 10,
       pagekey: 1,
       userlist: [],
       totalnum: 10,

pingpu_vue/src/util/base64.js

@@ -0,0 +1,122 @@
+//1.加密解密方法使用：
+
+//1.加密
+// var str = '124中文内容';
+// var base = new Base64();
+// var result = base.encode(str);
+// //document.write(result);
+
+// //2.解密
+// var result2 = base.decode(result);
+// document.write(result2);
+// //2.加密、解密算法封装：
+
+function Base64() {
+
+  // private property
+  var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+
+  // public method for encoding
+  this.encode = function (input) {
+    if (!input) { //console.log('请传入要加密的值') 
+      return
+    }
+    var output = "";
+    var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+    var i = 0;
+    input = _utf8_encode(input);
+    while (i < input.length) {
+      chr1 = input.charCodeAt(i++);
+      chr2 = input.charCodeAt(i++);
+      chr3 = input.charCodeAt(i++);
+      enc1 = chr1 >> 2;
+      enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+      enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+      enc4 = chr3 & 63;
+      if (isNaN(chr2)) {
+        enc3 = enc4 = 64;
+      } else if (isNaN(chr3)) {
+        enc4 = 64;
+      }
+      output = output +
+        _keyStr.charAt(enc1) + _keyStr.charAt(enc2) +
+        _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
+    }
+    return output;
+  }
+
+  // public method for decoding
+  this.decode = function (input) {
+    if (!input) { //console.log('请传入要解密的值')
+      return
+    }
+    var output = "";
+    var chr1, chr2, chr3;
+    var enc1, enc2, enc3, enc4;
+    var i = 0;
+    input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+    while (i < input.length) {
+      enc1 = _keyStr.indexOf(input.charAt(i++));
+      enc2 = _keyStr.indexOf(input.charAt(i++));
+      enc3 = _keyStr.indexOf(input.charAt(i++));
+      enc4 = _keyStr.indexOf(input.charAt(i++));
+      chr1 = (enc1 << 2) | (enc2 >> 4);
+      chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+      chr3 = ((enc3 & 3) << 6) | enc4;
+      output = output + String.fromCharCode(chr1);
+      if (enc3 != 64) {
+        output = output + String.fromCharCode(chr2);
+      }
+      if (enc4 != 64) {
+        output = output + String.fromCharCode(chr3);
+      }
+    }
+    output = _utf8_decode(output);
+    return output;
+  }
+
+  // private method for UTF-8 encoding
+  var _utf8_encode = function (string) {
+    string = string.replace(/\r\n/g, "\n");
+    var utftext = "";
+    for (var n = 0; n < string.length; n++) {
+      var c = string.charCodeAt(n);
+      if (c < 128) {
+        utftext += String.fromCharCode(c);
+      } else if ((c > 127) && (c < 2048)) {
+        utftext += String.fromCharCode((c >> 6) | 192);
+        utftext += String.fromCharCode((c & 63) | 128);
+      } else {
+        utftext += String.fromCharCode((c >> 12) | 224);
+        utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+        utftext += String.fromCharCode((c & 63) | 128);
+      }
+    }
+    return utftext;
+  }
+  // private method for UTF-8 decoding
+  var _utf8_decode = function (utftext) {
+    var string = "";
+    var i = 0;
+    let c = 0, c1 = 0, c2 = 0;
+    while (i < utftext.length) {
+      c = utftext.charCodeAt(i);
+      if (c < 128) {
+        string += String.fromCharCode(c);
+        i++;
+      } else if ((c > 191) && (c < 224)) {
+        c2 = utftext.charCodeAt(i + 1);
+        string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+        i += 2;
+      } else {
+        c2 = utftext.charCodeAt(i + 1);
+        c1 = utftext.charCodeAt(i + 2);
+        string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c1 & 63));
+        i += 3;
+      }
+    }
+    return string;
+  }
+}
+export default Base64
+