Merge remote-tracking branch 'origin/dev_xzxt_huNan' into dev_xzxt_huNan

src/views/ryda/carDa/carDagj.vue

@@ -384,13 +384,13 @@ export default {
       iDays = parseInt(Math.abs(oDate1 - oDate2) / 1000 / 60 / 60 / 24);
 
       // return iDays;
-      if (iDays < 31) {
-        this.carwzQueryData.kssj = val[0];
-        this.carwzQueryData.jssj = val[1];
-        this.$refs.rightContents.doQuery("yes");
-      } else {
-        this.$message.error("时间超过30天, 请重新选择时间!");
-      }
+      // if (iDays < 31) {
+      this.carwzQueryData.kssj = val[0];
+      this.carwzQueryData.jssj = val[1];
+      this.$refs.rightContents.doQuery("yes");
+      // } else {
+      //   this.$message.error("时间超过30天, 请重新选择时间!");
+      // }
     },
   },
 };

src/views/ryda/carda.vue

@@ -1597,9 +1597,11 @@ export default {
           json = {};
       json["hphm"] = sessionStorage.getItem("cphm");
       self.postCarJbxx(JSON.stringify(json)).then((res) => {
-        if (res.code == 200) {
+        if (res.success) {
+          console.log(res)
           // debugger;
           self.formData.forEach((item) => {
+            console.log("prop", res.data.result.rows[item.prop])
             item.value = res.data.result.rows[item.prop];
           });
           for (let i in self.formDataCl) {
@@ -1779,7 +1781,8 @@ export default {
       let json = {};
       json["hphm"] = sessionStorage.getItem("cphm");
       self.postGetTbStCldaClbq(JSON.stringify(json)).then((res) => {
-        if (res.success == true) {
+        console.log("res",res)
+        if (res.success) {
           self.zdbqList = res.data.result.rows;
         } else {
           self.$message({
@@ -2082,8 +2085,8 @@ export default {
       json["kssj"] = self.valueCxgl[0] ? self.valueCxgl[0] : "";
       json["jssj"] = self.valueCxgl[1] ? self.valueCxgl[1] : "";
       self.postGetClcxsjgl(JSON.stringify(json)).then((res) => {
-        if (res.success == true) {
-          self.getCxgltjt(res.data.result.rows);
+        if (res.success) {
+          self.getCxgltjt(res.data.result?.rows);
         } else {
           self.$message.error("查询失败");
         }
@@ -2091,6 +2094,7 @@ export default {
     },
     // 出行规律统计图
     getCxgltjt(item) {
+      // if (!item) return false
       const _this = this;
       let myChart = this.$echarts.init(document.getElementById("charts"));
       // 绘制图表
@@ -2247,7 +2251,7 @@ export default {
           this.valueCxgl[0] = val[0];
           this.valueCxgl[1] = val[1];
           this.postGetClcxsjglLsit();
-        } else {
+        } else if (iDays > 31) {
           this.$message.error("时间超过30天, 请重新选择时间!");
         }
       },

vue.config.js

@@ -62,7 +62,7 @@ module.exports = {
     },
     proxy: {
       "/apiAjzb": {
-        target: "http://192.168.1.109:8501/", //统一的请求头部每次修改都要重启才会生效西藏：
+        target: "http://192.168.1.109:8502/", //统一的请求头部每次修改都要重启才会生效西藏：
         // target: "http://192.168.1.115:8002/", //统一的请求头部每次修改都要重启才会生效
         ws: true,
         changeOrigin: true,