Merge branch 'dev_xzeq' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq

src/api/hbyp/hbyp.js

@@ -152,4 +152,12 @@ export const deleteXs = params =>
 
 //线索详情
 export const queryXs = params =>
-  postform(`${base.alyIP}/hcyprw/queryXs`, params);
+  postform(`${base.alyIP}/hcyprw/queryXs`, params);
\ No newline at end of file
+
+//研判要素导入
+export const importExcel = params =>
+  postform(`${base.alyIP}/hcyprw/importExcel`, params);
+
+//研判要素导出
+export const downloadExcel = params =>
+  post(`${base.alyIP}/hcyprw/downloadExcel`, params);

src/components/SearchGraph.vue

@@ -312,7 +312,7 @@ export default {
                         JSON.parse(sessionStorage.getItem('userInfo'))
                           .identitycard
                       )
-                      let path = `${base.alyIP19}/#/jump?path=/queryAjda&asjbh=${this.form.zjhm}&identitycard=${idcard}`
+                      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${this.form.zjhm}&identitycard=${idcard}`
                       window.open(path, '_blank')
                     } else if (this.pages == 'hxgc') {
                       // let base = encodeURIComponent(

src/components/ajbz/ptCxForm_components_tjaj.vue

@@ -728,7 +728,7 @@ export default {
       let idcard = encry.Encrypt(
         JSON.parse(sessionStorage.getItem("userInfo")).identitycard
       );
-      let path = `${base.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     export2Excel() {

src/components/ajbz/rgcb_wdxl/ptCxForm_components.vue

@@ -729,7 +729,7 @@ export default {
       let idcard = encry.Encrypt(
         JSON.parse(sessionStorage.getItem("userInfo")).identitycard
       );
-      let path = `${base.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
 
       window.open(path, "_blank");
     },

src/components/ptCxForm_components.vue

@@ -2539,36 +2539,36 @@
             <span style="margin-right: 16px"
                   v-if="scope.row.zhzt == '0'">未追回</span>
           </template>
-          <el-table-column v-if="pageBs == 'queryZw'"
-                           align="center"
-                           width="200"
-                           label="状态">
-            <template slot-scope="scope">
-              <div>
-                <div class="rwgl_s">
+        </el-table-column>
+        <el-table-column v-if="pageBs == 'queryZw'"
+                         align="center"
+                         width="200"
+                         label="状态">
+          <template slot-scope="scope">
+            <div>
+              <div class="rwgl_s">
                 <span v-if="scope.row.zzhwkbh != ''"
                       class="s_stop">可侦</span>
-                  <span v-if="scope.row.xyrZjhm != ''"
-                        class="s_runn">可研</span>
-                </div>
+                <span v-if="scope.row.xyrZjhm != ''"
+                      class="s_runn">可研</span>
               </div>
-            </template>
-          </el-table-column>
-          <el-table-column v-if="pageBs == 'queryDna'"
-                           align="center"
-                           width="200"
-                           label="状态">
-            <template slot-scope="scope">
-              <div>
-                <div class="rwgl_s">
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column v-if="pageBs == 'queryDna'"
+                         align="center"
+                         width="200"
+                         label="状态">
+          <template slot-scope="scope">
+            <div>
+              <div class="rwgl_s">
                 <span v-if="scope.row.bzajXkbh != ''"
                       class="s_stop">可侦</span>
-                  <span v-if="scope.row.bzrySfzh != ''"
-                        class="s_runn">可研</span>
-                </div>
+                <span v-if="scope.row.bzrySfzh != ''"
+                      class="s_runn">可研</span>
               </div>
-            </template>
-          </el-table-column>
+            </div>
+          </template>
         </el-table-column>
         <el-table-column v-if="pageBs == 'queryZw'"
                          align="center"
@@ -5145,6 +5145,7 @@ export default {
     },
   },
   mounted () {
+    console.log(this.pageBs)
     // if (this.menuIdPgbg == "dw") {
     //   this.pageShow = false;
     // }

src/views/brainPhoto/brainAsjzc.vue

@@ -774,7 +774,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     checkempty() {

src/views/shse/shseaj/queryShseaj.vue

@@ -457,7 +457,7 @@ export default {
           JSON.parse(sessionStorage.getItem("userInfo"))
             .identitycard
         );
-        let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+        let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
         window.open(path, "_blank");
       } else {
         window.open(

src/views/shse/shsexs/queryXsxx.vue

@@ -181,7 +181,7 @@ export default {
           JSON.parse(sessionStorage.getItem("userInfo"))
             .identitycard
         );
-      let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${obj.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${obj.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
       } else {
         this.$router.pushToTab({

src/views/shse/xxyj/ajxx.vue

@@ -176,7 +176,7 @@ export default {
           JSON.parse(sessionStorage.getItem("userInfo"))
             .identitycard
         );
-        let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+        let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
         window.open(path, "_blank");
       } else {
         window.open(

src/views/xshb/queryXshb/queryXshb.vue

@@ -702,7 +702,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${base.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     showDialogS(data) {

src/views/xshb/queryXshb/queryXshba.vue

@@ -344,7 +344,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${base.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     dele(scope) {

src/views/xshb/xsbk/queryXsbkResultNew.vue

@@ -857,7 +857,7 @@ export default {
           JSON.parse(sessionStorage.getItem("userInfo"))
             .identitycard
         );
-        let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope}&identitycard=${idcard}`;
+        let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope}&identitycard=${idcard}`;
         window.open(path, "_blank");
       } else {
               let idcard = encry.Encrypt(

src/views/xxtk/gzry/queryGzry.vue

@@ -1008,7 +1008,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${base.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     showDialogS(data) {

src/views/xxtk/gzry/queryGzrys.vue

@@ -1227,7 +1227,7 @@ export default {
       let idcard = encry.Encrypt(
         JSON.parse(sessionStorage.getItem("userInfo")).identitycard
       );
-      let path = `${this.$baseUrl.alyIP14}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     showDialogS (data) {

src/views/xxtk/queryCklz.vue

@@ -1202,7 +1202,7 @@ export default {
       let idcard = encry.Encrypt(
         JSON.parse(sessionStorage.getItem("userInfo")).identitycard
       );
-      let path = `${this.$baseUrl.alyIP14}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     showDialogS (data) {

src/views/xxtk/queryLklz.vue

@@ -1209,7 +1209,7 @@ export default {
       let idcard = encry.Encrypt(
         JSON.parse(sessionStorage.getItem("userInfo")).identitycard
       );
-      let path = `${this.$baseUrl.alyIP14}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     showDialogS (data) {

src/views/yzzfzxsyp/thxs/queryAjcc.vue

@@ -332,7 +332,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     login() {

src/views/zcxw/zwgl/ddfjdc.vue

@@ -212,7 +212,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     /**

src/views/zcxw/zwgl/dy.vue

@@ -194,7 +194,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     /**

src/views/zcxw/zwgl/jdc.vue

@@ -209,7 +209,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     /**

src/views/zcxw/zwgl/kl.vue

@@ -208,7 +208,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     /**

src/views/zcxw/zwgl/qtwp.vue

@@ -209,7 +209,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     /**

src/views/zcxw/zwgl/qz.vue

@@ -206,7 +206,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     /**

src/views/zcxw/zwgl/ww.vue

@@ -207,7 +207,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?ath=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     /**

src/views/zcxw/zwgl/ydtxsb.vue

@@ -397,7 +397,7 @@ export default {
       JSON.parse(sessionStorage.getItem("userInfo"))
         .identitycard
     );
-    let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+    let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
     window.open(path, "_blank");
     },
     /**

src/views/zcxw/zwgl/zj.vue

@@ -213,7 +213,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${this.$baseUrl.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope.asjbh}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     /**

src/views/zdxx/zdxxgl/xxypDetailNew.vue

@@ -394,7 +394,7 @@ export default {
           JSON.parse(sessionStorage.getItem("userInfo"))
             .identitycard
         );
-        let path = `${base.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope}&identitycard=${idcard}`;
+        let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope}&identitycard=${idcard}`;
         window.open(path, "_blank");
       } else if (scope.sfsfzxyr == '是' && type.toInfor && type.prop == 'sfsfzxyr') { //
         this.dialogVisible = true

src/views/ztyp/txxxyp/tableList.vue

@@ -126,7 +126,7 @@ export default {
         JSON.parse(sessionStorage.getItem("userInfo"))
           .identitycard
       );
-      let path = `${base.alyIP19}/#/jump?path=/queryAjda&asjbh=${scope}&identitycard=${idcard}`;
+      let path = `${this.$baseUrl.alyIP18}/#/jump?path=/queryAjda&asjbh=${scope}&identitycard=${idcard}`;
       window.open(path, "_blank");
     },
     doQuery() {