Merge branch 'dev_xzeq' of http://47.92.108.28/changchao/founder_vue into dev_xzeq

src/api/zdry/yjrwGl.js

@@ -12,6 +12,6 @@ export const addYjgkTask = params =>
 
 //轨迹查询
 export const getRygjxxByAsjbh = params =>
-    post(`${base.alyIP}/ryyj/getRygjxxByAsjbh`, params);
+    post(`${base.alyIP2}/ryyj/getRygjxxByAsjbh`, params);
 
 

src/components/ptCxForm_components.vue

@@ -230,6 +230,7 @@
             @click="$emit('yjbtn')"
             style="background: #007aff; color: #ffffff"
             class="zdybtn"
+            v-if="pageBs == 'queryCheckBj'"
           >
             批量预警
           </div>
@@ -1725,7 +1726,7 @@ export default {
       /*post方法*/
       let currentUrl = "";
       if (this.pageBs == "yjrwGl") {
-        currentUrl = `${url.alyIP}${this.cxUrl}`;
+        currentUrl = `${url.alyIP2}${this.cxUrl}`;
       } else {
         currentUrl = `${url.alyIP}${this.cxUrl}`;
       }

src/views/zdry/addYjrw.vue

@@ -129,7 +129,7 @@ export default {
             confirmButtonText: "确定",
             type: "success",
             callback: () => {
-              sessionStorage.setItem("selectArr", []);
+              // sessionStorage.setItem("selectArr", []);
               this.$router.push("/yjrwGl");
               loading.close();
             },
@@ -159,14 +159,14 @@ export default {
     this.$set(
       this.formLabelAlign,
       "fsrXm",
-      JSON.parse(window.sessionStorage.getItem("userInfo")).realname
+      JSON.parse(window.sessionStorage.getItem("userInfo")).account
     );
     this.$set(
       this.formLabelAlign,
       "fsrDwdm",
       JSON.parse(window.sessionStorage.getItem("userInfo")).unitcode
     );
-    this.$set(this.formLabelAlign, "fssj", this.$moment().format("YYYY-MM-DD"));
+    this.$set(this.formLabelAlign, "fssj", this.$moment().format("YYYY-MM-DD HH:mm:ss"));
     this.$set(this.formLabelAlign, "kssj", this.$moment().format("YYYY-MM-DD"));
     this.$set(
       this.formLabelAlign,