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

src/api/ajbzDetail.js

@@ -21,7 +21,9 @@ const getFwbzhList = params =>
   post("/api/newAsjbz/getFwbzhList", params);
 
 const updateBsh = params =>
-  postform("/api/newAsjbz/updateBsh", params);
+postJson("/api/newAsjbz/updateBsh", params);
+  const insertFwbsh = params =>
+  postJson("/api/newAsjbz/insertFwbsh", params);
 
 const saveAsjbzxx = params =>
   post("/api/newAsjbz/saveAsjbzxx", params);
@@ -29,6 +31,14 @@ const saveAsjbzxx = params =>
 const getAsjbzxx = params =>
   post("/api/newAsjbz/getAsjbzxx", params);
 
+  const getRybhList = params =>
+  post("/api/newAsjbz/getRybhList", params);
+
+  const getBarxxList = params =>
+  post("/api/newAsjbz/getBarxxList", params);
+
+  const deleteBsh = params =>
+  post("/api/newAsjbz/deleteBsh", params);
 
 
 export {
@@ -38,6 +48,10 @@ export {
   getGjcList,
   getFwbzhList,
   updateBsh,
+  insertFwbsh,
   saveAsjbzxx,
-  getAsjbzxx
+  getAsjbzxx,
+  getRybhList,
+  getBarxxList,
+  deleteBsh
 }
\ No newline at end of file

src/api/cbyp.js

 import { get, post , postJson} from "@/utils/http.js";
 
 export const toQueryXszxx = params =>
-  post("/api/cbxsz/toQueryXszxx", params);
+  post("/api3/cbxsz/toQueryXszxx", params);
 
 export const queryTreeDataByType = params =>
-  get("/api/queryTreeDataByType", params);
+  get("/api3/queryTreeDataByType", params);
 
    

src/api/dictionaryCode.js

@@ -3,13 +3,13 @@ import url from "@/api/base";
 
 
 export const esAsjQuery = params =>
-  post("/api/bz/esAsjQuery", params);
+  post("/api2/bz/esAsjQuery", params);
 
 export const queryTreeDataByType = params =>
-  get("/api/queryTreeDataByType", params);
+  get("/api2/queryTreeDataByType", params);
 
 export const saveTableTitleRedis = params =>
-  post("/api/saveTableTitleRedis", params);
+  post("/api2/saveTableTitleRedis", params);
 
 export const EsAsjQuery = params =>
   postJson("/api2/EsAsjQuery", params);
@@ -21,12 +21,12 @@ export const EsShrQuery = params =>
   postJson("/api2/EsShrQuery", params);
 
   export const queryDictItem = params =>
-  post("http://192.168.0.112:5177/dic/queryDictItem", params);
+  post("http://47.92.225.109:5177/dic/queryDictItem", params);
 
   export const getDictitemByCode = params =>
   post("http://47.92.225.109:5177/dic/getDictitemByCode", params);
 
 export const getTableTitleRedis = params =>
-  post("/api/getTableTitleRedis", params);
+  post("/api2/getTableTitleRedis", params);
 
 

src/api/home.js

 import { get, post } from "@/utils/http.js";
-import base from "@/api/base";
 // import qs from "qs";
 
-export const Home = params => post(`${base.test}/getNewRelationInfo`, params);
-
-export const test = params =>
-  post("http://39.99.159.210:8052/getCarRyxx", params);
-
-export const test1 = params =>
-  get("http://39.99.159.210:8051/getXyrSaxxDg", params);
-
-
 export const login = params =>
   post("/api/blade-auth/token", params);
   

src/api/zdgl.js

 import { get, post, postJson, postform } from "@/utils/http.js";
 
 export const dictitemEdit = params =>
-    post("/api/dic/dictitemEdit", params);
+    post("http://47.92.225.109:5177/dic/dictitemEdit", params);
 
 export const UpdateRedisRest = params =>
-    post("/api/UpdateRedisRest", params);
+    post("http://47.92.225.109:5177/UpdateRedisRest", params);
 
 export const xalbJoinGWDQ = params =>
-    post("/api/dic/xalbJoinGWDQ", params);
+    post("http://47.92.225.109:5177/dic/xalbJoinGWDQ", params);
+
+export const queryXalbJoinGWDQ = params =>
+    post("http://47.92.225.109:5177/dic/queryXalbJoinGWDQ", params);
+
+    
     
\ No newline at end of file

src/utils/http.js

@@ -26,7 +26,6 @@ axios.interceptors.request.use(
   config => {
     config.headers["Content-Type"] = "application/x-www-form-urlencoded";
     let token = sessionStorage.getItem("token")
-    debugger
     if (config.url.indexOf("/api/blade-auth/token") === -1) {
       config.headers["blade-auth"] = token;
     }

src/views/zdgl.vue

@@ -118,8 +118,8 @@
               placeholder="请选择"
             >
               <el-option
-                v-for="item in optionxz"
-                :key="item.value"
+                v-for="(item,index) in optionxz"
+                :key="index"
                 :label="item.label"
                 :value="item.value"
               >
@@ -139,8 +139,8 @@
               placeholder="请选择"
             >
               <el-option
-                v-for="item in optionzb"
-                :key="item.value"
+                v-for="(item,index) in optionzb"
+                :key="index"
                 :label="item.label"
                 :value="item.value"
               >

vue.config.js

@@ -58,7 +58,7 @@ module.exports = {
     },
     proxy: {
       "/api": {
-        target: "http://47.92.225.109:5176/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
+        target: "http://47.92.225.109:5176/", //案件标注
         ws: true,
         changeOrigin: true,
         pathRewrite: {
@@ -66,19 +66,27 @@ module.exports = {
         }
       },
       "/api2": {
-        target: "http://47.92.225.109:3002/",
+        target: "http://47.92.225.109:3002/",  //多维查询
         ws: true,
         changeOrigin: true,
         pathRewrite: {
           '^/api2': '/'
         }
       },
-      "/cbypApi": {
-        target: "http://47.92.225.109:8762/",
+      "/api3": {
+        target: "http://47.92.225.109:8762/",  //串并研判
         ws: true,
         changeOrigin: true,
         pathRewrite: {
-          '^/cbypApi': '/'
+          '^/api3': '/'
+        }
+      },
+      "/api4": {
+        target: "http://47.92.225.109:5177/",  //字典管理
+        ws: true,
+        changeOrigin: true,
+        pathRewrite: {
+          '^/api4': '/'
         }
       }
     },