12

src/api/dfzy/dfzyrwk.js

+import { get, post,delete_util } from "../util/http_util";
\ No newline at end of file

src/api/dictitem.js

 import { get, post,delete_util } from "../util/http_util";
 //#region 公共
 //服务前缀
-const PREFIX = "api/rest/dictitem";
+const PREFIX = "api/rest/3z/dictitem";
 //#endregion
 
 

src/api/publicUrl.js

+/**
+ * 头像公共获取路径
+ */
+export const imgUrl = 'api/rest/file/path?bucket=AVATAR&filename=';
+
+/**
+* 新闻照片公共获取路径
+*/
+export const NewsPictureUrl = 'api/rest/document/viewPicture/NewsPicture?objectName=';
+/**
+* 照片公共获取路径
+*/
+export const LiteraturePictureUrl = 'api/rest/document/viewPicture/LiteraturePicture?objectName=';
\ No newline at end of file

src/components/common/bigfileUpload.vue

@@ -120,10 +120,10 @@ export default {
               fileType: _self.fileType
             },
             success: function (data) {
-                if(data.state.code == 90001){
+                if(data.code == 9000){
                   _self.$message.success("成功数据"+data.data + "条数据");
                 }else{
-                  _self.$message.warning(data.state.msg);
+                  _self.$message.warning(data.message);
                 }
             },
             error: function () {},

src/components/common/drdc_ATTENTION.vue

@@ -55,7 +55,7 @@ export default {
                 endLoading()
             }).catch(err => {
                 endLoading()
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common/drdc_COLLECTION_FOLDER.vue

@@ -46,7 +46,7 @@ export default {
                 endLoading()
             }).catch(err => {
                 endLoading()
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common/drdc_ORGANIZATION.vue

@@ -59,8 +59,8 @@ export default {
                 endLoading()
             }).catch(err => {
                 endLoading()
-                this.$message.warning(err.msg);
-                // this.$message.error(err.msg);
+                this.$message.warning(err.message);
+                // this.$message.error(err.message);
             })
         },
         //分页

src/components/common/drdc_THINK_TANK.vue

@@ -52,7 +52,7 @@ export default {
                 endLoading()
             }).catch(err => {
                 endLoading()
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common/drdc_character.vue

@@ -64,8 +64,8 @@ export default {
                 endLoading()
             }).catch(err => {
                 endLoading()
-                this.$message.warning(err.msg);
-                // this.$message.error(err.msg);
+                this.$message.warning(err.message);
+                // this.$message.error(err.message);
             })
         },
         //分页

src/components/common/drdc_collection.vue

@@ -54,7 +54,7 @@ export default {
                 endLoading()
             }).catch(err => {
                 endLoading()
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common/drdc_document.vue

@@ -61,7 +61,7 @@ export default {
                 endLoading()
             }).catch(err => {
                 endLoading()
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common/drdc_facebook.vue

@@ -52,7 +52,7 @@ export default {
                 endLoading()
             }).catch(err => {
                 endLoading()
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common/drdc_literature.vue

@@ -54,7 +54,7 @@ export default {
                 endLoading()
             }).catch(err => {
                 endLoading()
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common/drdc_mould.vue

@@ -49,7 +49,7 @@ export default {
                 endLoading()
             }).catch(err => {
                 endLoading()
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common/drdc_news.vue

@@ -67,8 +67,8 @@ export default {
                 endLoading()
             }).catch(err => {
                 endLoading()
-                this.$message.warning(err.msg);
-                // this.$message.error(err.msg);
+                this.$message.warning(err.message);
+                // this.$message.error(err.message);
             })
         },
         //分页

src/components/common/drdc_twitter.vue

@@ -54,7 +54,7 @@ export default {
                 endLoading()
             }).catch(err => {
                 endLoading()
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common/relevance_moudule.vue

@@ -27,11 +27,11 @@
 <script>
 import { get, post } from "../../util/http_util";
 import jh_bg from "../../assets/img/dfzy/zwtp.png";
+import { imgUrl } from "../../api/publicUrl";
 export default {
   name: "",
   data() {
     return {
-      PickerPath_url: "api/rest/document/viewPicture/ProfilePhotos?objectName=",
       errimg: "this.src='" + jh_bg + "'",
       mb_table: [],
       option_rwmb: [],
@@ -93,7 +93,7 @@ export default {
               .then((res) => {
                 res.list.forEach((item) => {
                   item.photos =
-                    this.PickerPath_url + item.baseProperty["photos"];
+                  imgUrl + item.baseProperty["photos"];
                   item.label =
                     item.extraProperty["标签"] == undefined
                       ? ""
@@ -128,12 +128,12 @@ export default {
                 });
               })
               .catch((err) => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
               });
           });
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     query_tree(type) {
@@ -147,7 +147,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     jsonToArray(nodes) {
@@ -181,7 +181,7 @@ export default {
           if (res.list.length > 0) {
             res.list.forEach((item) => {
               item.photos =
-                this.PickerPath_url +
+                imgUrl +
                 item.baseProperty["photos"];
               item.labels =
                 item.extraProperty["标签"] == undefined

src/components/common_search/dfzy/dfzy_nw_jgk_search.vue

@@ -20,11 +20,11 @@
 </template>
 <script>
 import { get, post, startLoading, endLoading } from '../../../util/http_util';
+import { imgUrl } from "../../../api/publicUrl";
 export default {
     components: { },
     data() {
         return {
-            PickerPath_url:'api/rest/document/viewPicture/ProfilePhotos?objectName=',
             currentPage: 1,
             everySize: 10,
             total: 0,
@@ -58,7 +58,7 @@ export default {
                 if (res.list.length > 0) {
                     res.list.forEach((item) => {
                     item.photos =
-                        this.PickerPath_url +
+                        imgUrl +
                         item.baseProperty["photos"];
                     item.labels =
                         item.extraProperty["标签"] == undefined
@@ -69,7 +69,7 @@ export default {
                     this.total = res.totals;
                 }
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common_search/dfzy/dfzy_nw_rwk_search.vue

@@ -20,11 +20,11 @@
 </template>
 <script>
 import { get, post, startLoading, endLoading } from '../../../util/http_util';
+import { imgUrl } from "../../../api/publicUrl";
 export default {
     components: { },
     data() {
         return {
-            PickerPath_url:'api/rest/document/viewPicture/ProfilePhotos?objectName=',
             currentPage: 1,
             everySize: 10,
             total: 0,
@@ -70,7 +70,7 @@ export default {
                     this.data_list = res.list;
                     this.data_list.forEach((item) => {
                     item.photos =
-                        this.PickerPath_url +
+                        imgUrl +
                         item.baseProperty["photos"];
                     item.label =
                         item.extraProperty["标签"] == undefined
@@ -91,7 +91,7 @@ export default {
                     this.total = res.totals;
                 })
                 .catch((err) => {
-                    this.$message.warning(err.msg);
+                    this.$message.warning(err.message);
                 });
             });
         },

src/components/common_search/dfzy/dfzy_ww_jgk_search.vue

@@ -20,11 +20,11 @@
 </template>
 <script>
 import { get, post, startLoading, endLoading } from '../../../util/http_util';
+import { imgUrl } from "../../../api/publicUrl";
 export default {
     components: { },
     data() {
         return {
-            PickerPath_url:'api/rest/document/viewPicture/ProfilePhotos?objectName=',
             currentPage: 1,
             everySize: 10,
             total: 0,
@@ -58,7 +58,7 @@ export default {
                 if (res.list.length > 0) {
                     res.list.forEach((item) => {
                     item.photos =
-                        this.PickerPath_url +
+                        imgUrl +
                         item.baseProperty["photos"];
                     item.labels =
                         item.extraProperty["标签"] == undefined
@@ -69,7 +69,7 @@ export default {
                     this.total = res.totals;
                 }
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common_search/dfzy/dfzy_ww_rwk_search.vue

@@ -20,11 +20,11 @@
 </template>
 <script>
 import { get, post, startLoading, endLoading } from '../../../util/http_util';
+import { imgUrl } from "../../../api/publicUrl";
 export default {
     components: { },
     data() {
         return {
-            PickerPath_url:'api/rest/document/viewPicture/ProfilePhotos?objectName=',
             currentPage: 1,
             everySize: 10,
             total: 0,
@@ -70,7 +70,7 @@ export default {
                     this.data_list = res.list;
                     this.data_list.forEach((item) => {
                     item.photos =
-                        this.PickerPath_url +
+                        imgUrl +
                         item.baseProperty["photos"];
                     item.label =
                         item.extraProperty["标签"] == undefined
@@ -91,7 +91,7 @@ export default {
                     this.total = res.totals;
                 })
                 .catch((err) => {
-                    this.$message.warning(err.msg);
+                    this.$message.warning(err.message);
                 });
             });
         },

src/components/common_search/dfzy/dfzy_wxk_search.vue

@@ -75,7 +75,7 @@ export default {
                     }
                 })
                 .catch((err) => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
                 });
         },
         //分页

src/components/common_search/flfg/flfg_search.vue

@@ -52,7 +52,7 @@ export default {
                 this.data_list = res.list;
                 this.total = res.totals;
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common_search/fzjc/fzjc_faya_wxk_search.vue

@@ -75,7 +75,7 @@ export default {
                     }
                 })
                 .catch((err) => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
                 });
         },
         //分页

src/components/common_search/fzjc/jczcya_search.vue

@@ -60,7 +60,7 @@ export default {
                     }
                 })
                 .catch((err) => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
                 });
         },
         //分页

src/components/common_search/wfzy/wfzy_jgk_search.vue

@@ -20,11 +20,11 @@
 </template>
 <script>
 import { get, post, startLoading, endLoading } from '../../../util/http_util';
+import { imgUrl } from "../../../api/publicUrl";
 export default {
     components: { },
     data() {
         return {
-            PickerPath_url:'api/rest/document/viewPicture/ProfilePhotos?objectName=',
             currentPage: 1,
             everySize: 10,
             total: 0,
@@ -58,7 +58,7 @@ export default {
                 if (res.list.length > 0) {
                     res.list.forEach((item) => {
                     item.photos =
-                        this.PickerPath_url +
+                        imgUrl +
                         item.baseProperty["photos"];
                     item.labels =
                         item.extraProperty["标签"] == undefined
@@ -69,7 +69,7 @@ export default {
                     this.total = res.totals;
                 }
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common_search/wfzy/wfzy_rwk_search.vue

@@ -20,11 +20,11 @@
 </template>
 <script>
 import { get, post, startLoading, endLoading } from '../../../util/http_util';
+import { imgUrl } from "../../../api/publicUrl";
 export default {
     components: { },
     data() {
         return {
-            PickerPath_url:'api/rest/document/viewPicture/ProfilePhotos?objectName=',
             currentPage: 1,
             everySize: 10,
             total: 0,
@@ -70,7 +70,7 @@ export default {
                     this.data_list = res.list;
                     this.data_list.forEach((item) => {
                         item.photos =
-                            this.PickerPath_url +
+                            imgUrl +
                             item.baseProperty["photos"];
                         item.label =
                             item.extraProperty["标签"] == undefined
@@ -88,7 +88,7 @@ export default {
                     this.total = res.totals;
                 })
                 .catch((err) => {
-                    this.$message.warning(err.msg);
+                    this.$message.warning(err.message);
                 });
             });
         },

src/components/common_search/wfzy/wfzy_wxk_search.vue

@@ -75,7 +75,7 @@ export default {
                     }
                 })
                 .catch((err) => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
                 });
         },
         //分页

src/components/common_search/xxxl/llxx_search.vue

@@ -52,7 +52,7 @@ export default {
                 this.data_list = res.list;
                 this.total = res.totals;
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common_search/yqjc/facebook_search.vue

@@ -73,7 +73,7 @@ export default {
                 this.data_list = res.list;
                 this.total = res.totals;
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common_search/yqjc/jblb_search.vue

@@ -61,7 +61,7 @@ export default {
                     }
                 })
                 .catch((err) => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
                 });
         },
         //分页

src/components/common_search/yqjc/new_search.vue

@@ -53,7 +53,7 @@ export default {
                 this.data_list = res.list;
                 this.total = res.totals;
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common_search/yqjc/thinkTank_search.vue

@@ -50,7 +50,7 @@ export default {
                 this.data_list = res.list;
                 this.total = res.totals;
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common_search/yqjc/twitter_search.vue

@@ -73,7 +73,7 @@ export default {
                 this.data_list = res.list;
                 this.total = res.totals;
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common_search/yqjc/ztfxbg_search.vue

@@ -66,7 +66,7 @@ export default {
                     }
                 })
                 .catch((err) => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
                 });
         },
         //分页

src/components/common_search/zchj/zchj_jgk_search.vue

@@ -20,11 +20,11 @@
 </template>
 <script>
 import { get, post, startLoading, endLoading } from '../../../util/http_util';
+import { imgUrl } from "../../../api/publicUrl";
 export default {
     components: { },
     data() {
         return {
-            PickerPath_url:'api/rest/document/viewPicture/ProfilePhotos?objectName=',
             currentPage: 1,
             everySize: 10,
             total: 0,
@@ -58,7 +58,7 @@ export default {
                 if (res.list.length > 0) {
                     res.list.forEach((item) => {
                     item.photos =
-                        this.PickerPath_url +
+                        imgUrl +
                         item.baseProperty["photos"];
                     item.labels =
                         item.extraProperty["标签"] == undefined
@@ -69,7 +69,7 @@ export default {
                     this.total = res.totals;
                 }
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //分页

src/components/common_search/zchj/zchj_rwk_search.vue

@@ -20,11 +20,11 @@
 </template>
 <script>
 import { get, post, startLoading, endLoading } from '../../../util/http_util';
+import { imgUrl } from "../../../api/publicUrl";
 export default {
     components: { },
     data() {
         return {
-            PickerPath_url:'api/rest/document/viewPicture/ProfilePhotos?objectName=',
             currentPage: 1,
             everySize: 10,
             total: 0,
@@ -70,7 +70,7 @@ export default {
                     this.data_list = res.list;
                     this.data_list.forEach((item) => {
                         item.photos =
-                            this.PickerPath_url +
+                            imgUrl +
                             item.baseProperty["photos"];
                         item.label =
                             item.extraProperty["标签"] == undefined
@@ -88,7 +88,7 @@ export default {
                     this.total = res.totals;
                 })
                 .catch((err) => {
-                    this.$message.warning(err.msg);
+                    this.$message.warning(err.message);
                 });
             });
         },

src/components/common_search/zchj/zchj_wxk_search.vue

@@ -75,7 +75,7 @@ export default {
                     }
                 })
                 .catch((err) => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
                 });
         },
         //分页

src/components/log/loggraph.vue

@@ -85,7 +85,7 @@ export default {
                 this.createEcharts_peoson(arrs_peoson);
             })
             .catch(err=>{
-               this.$message.warning(err.msg);
+               this.$message.warning(err.message);
             });
         },
         change(){

src/components/log/loggraph_new.vue

@@ -85,7 +85,7 @@ export default {
                 this.createEcharts__new_peoson(arrs_peoson);
             })
             .catch(err=>{
-               this.$message.warning(err.msg);
+               this.$message.warning(err.message);
             });
         },
         change(){

src/components/log/loggraph_new_edit.vue

@@ -88,7 +88,7 @@ export default {
                     // this.createEcharts__new_peoson(arr);
                 })
                 .catch(err=>{
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
                 });
             // countUserPerformance(this.currentPage, this.everySize,'NEWS', tmp)
             // .then(res=>{
@@ -103,7 +103,7 @@ export default {
             //     this.createEcharts__new_peoson(arrs_peoson);
             // })
             // .catch(err=>{
-            //    this.$message.warning(err.msg);
+            //    this.$message.warning(err.message);
             // });
         },
         change(){

src/components/log/logtable.vue

@@ -56,7 +56,7 @@ export default {
               this.total = res.totals;
           })
           .catch(err=>{
-            this.$message.warning(err.msg);
+            this.$message.warning(err.message);
           });
         },
         shiftModel(){

src/components/log/logtable_new.vue

@@ -57,7 +57,7 @@ export default {
               this.total = res.totals;
           })
           .catch(err=>{
-            this.$message.warning(err.msg);
+            this.$message.warning(err.message);
           });
         },
         shiftModel(){

src/constant/user.js

@@ -4,4 +4,4 @@
 export const ACCESS_TOKEN = "3ZTOKENFLAG";
 export const ACCESS_USER = "3ZUSERFLAG";
 export const SESSION_ID = "3ZSESSIONID";
-export const HTTP_STATUS = {msg: "服务请求失败", code:9004};
+export const HTTP_STATUS = {message: "服务请求失败", code:9004};
\ No newline at end of file

src/router/auth.js

@@ -4,7 +4,7 @@ export default [
       "icon": "el-icon-user-solid",
       "name": "用户管理",
       "url": "yhgl",
-      "parent_code": "070000",
+      "parentCode": "070000",
       "code": "070100",
       "idx": 1,
       "level": 2
@@ -14,7 +14,7 @@ export default [
       "icon": "el-icon-s-opportunity",
       "name": "战场环境地图",
       "url": "zchjdt",
-      "parent_code": "050000",
+      "parentCode": "050000",
       "code": "050100",
       "idx": 1,
       "level": 2
@@ -24,7 +24,7 @@ export default [
       "icon": "el-icon-user",
       "name": "人物库",
       "url": "rwk",
-      "parent_code": "030000",
+      "parentCode": "030000",
       "code": "030100",
       "idx": 1,
       "level": 2
@@ -34,7 +34,7 @@ export default [
       "icon": "el-icon-s-opportunity",
       "name": "法律法規",
       "url": "flfg",
-      "parent_code": "#",
+      "parentCode": "#",
       "code": "080000",
       "idx": 8,
       "level": 1
@@ -44,7 +44,7 @@ export default [
       "icon": "el-icon-s-opportunity",
       "name": "法律法規",
       "url": "flfg1",
-      "parent_code": "080000",
+      "parentCode": "080000",
       "code": "080100",
       "idx": 1,
       "level": 2
@@ -54,7 +54,7 @@ export default [
       "icon": "el-icon-s-data",
       "name": "舆情监测",
       "url": "yqjc",
-      "parent_code": "#",
+      "parentCode": "#",
       "code": "010000",
       "idx": 1,
       "level": 1
@@ -64,7 +64,7 @@ export default [
       "icon": "el-icon-s-opportunity",
       "name": "考试中心",
       "url": "kszx",
-      "parent_code": "060000",
+      "parentCode": "060000",
       "code": "060100",
       "idx": 1,
       "level": 2
@@ -74,7 +74,7 @@ export default [
       "icon": "el-icon-s-opportunity",
       "name": "热点事件",
       "url": "rdsj",
-      "parent_code": "010000",
+      "parentCode": "010000",
       "code": "010100",
       "idx": 1,
       "level": 2
@@ -84,7 +84,7 @@ export default [
       "icon": "el-icon-s-marketing",
       "name": "舆情资讯库",
       "url": "yqzxk",
-      "parent_code": "010000",
+      "parentCode": "010000",
       "code": "010200",
       "idx": 2,
       "level": 2
@@ -94,7 +94,7 @@ export default [
       "icon": "el-icon-s-grid",
       "name": "角色管理",
       "url": "jsgl",
-      "parent_code": "070000",
+      "parentCode": "070000",
       "code": "070200",
       "idx": 2,
       "level": 2
@@ -104,7 +104,7 @@ export default [
       "icon": "el-icon-s-finance",
       "name": "我方资源",
       "url": "wfzy",
-      "parent_code": "#",
+      "parentCode": "#",
       "code": "020000",
       "idx": 2,
       "level": 1
@@ -114,7 +114,7 @@ export default [
       "icon": "el-icon-s-management",
       "name": "机构库",
       "url": "jgk",
-      "parent_code": "030000",
+      "parentCode": "030000",
       "code": "030200",
       "idx": 2,
       "level": 2
@@ -124,7 +124,7 @@ export default [
       "icon": "el-icon-s-management",
       "name": "处置预案",
       "url": "czya",
-      "parent_code": "020000",
+      "parentCode": "020000",
       "code": "020200",
       "idx": 2,
       "level": 2
@@ -134,7 +134,7 @@ export default [
       "icon": "el-icon-s-opportunity",
       "name": "题目列表",
       "url": "tmlb",
-      "parent_code": "060000",
+      "parentCode": "060000",
       "code": "060200",
       "idx": 2,
       "level": 2
@@ -144,7 +144,7 @@ export default [
       "icon": "el-icon-s-claim",
       "name": "内部文献",
       "url": "nbwx",
-      "parent_code": "020000",
+      "parentCode": "020000",
       "code": "020300",
       "idx": 3,
       "level": 2
@@ -154,7 +154,7 @@ export default [
       "icon": "el-icon-s-opportunity",
       "name": "题库列表",
       "url": "tklb",
-      "parent_code": "060000",
+      "parentCode": "060000",
       "code": "060300",
       "idx": 3,
       "level": 3
@@ -164,7 +164,7 @@ export default [
       "icon": "el-icon-s-opportunity",
       "name": "敌方资源",
       "url": "dfzy",
-      "parent_code": "#",
+      "parentCode": "#",
       "code": "030000",
       "idx": 3,
       "level": 1
@@ -174,7 +174,7 @@ export default [
       "icon": "el-icon-s-data",
       "name": "主题分析",
       "url": "ztfx",
-      "parent_code": "010000",
+      "parentCode": "010000",
       "code": "010300",
       "idx": 3,
       "level": 2
@@ -184,7 +184,7 @@ export default [
       "icon": "",
       "name": "人物详情",
       "url": "rw_info",
-      "parent_code": "030000",
+      "parentCode": "030000",
       "code": "030200",
       "idx": 3,
       "level": 2
@@ -194,7 +194,7 @@ export default [
       "icon": "el-icon-s-marketing",
       "name": "内部情报",
       "url": "nbqb",
-      "parent_code": "020000",
+      "parentCode": "020000",
       "code": "020400",
       "idx": 4,
       "level": 2
@@ -204,7 +204,7 @@ export default [
       "icon": "el-icon-s-claim",
       "name": "主题管理",
       "url": "ztgl",
-      "parent_code": "010000",
+      "parentCode": "010000",
       "code": "010400",
       "idx": 4,
       "level": 2
@@ -214,7 +214,7 @@ export default [
       "icon": "el-icon-s-flag",
       "name": "战场环境",
       "url": "zchj",
-      "parent_code": "#",
+      "parentCode": "#",
       "code": "050000",
       "idx": 5,
       "level": 1
@@ -224,7 +224,7 @@ export default [
       "icon": "el-icon-s-claim",
       "name": "信息资料",
       "url": "xxzy",
-      "parent_code": "020000",
+      "parentCode": "020000",
       "code": "020500",
       "idx": 5,
       "level": 2
@@ -234,7 +234,7 @@ export default [
       "icon": "el-icon-connection",
       "name": "分析报告",
       "url": "fxbg",
-      "parent_code": "010000",
+      "parentCode": "010000",
       "code": "010500",
       "idx": 5,
       "level": 2
@@ -244,7 +244,7 @@ export default [
       "icon": "el-icon-s-platform",
       "name": "学习训练",
       "url": "xxxl",
-      "parent_code": "#",
+      "parentCode": "#",
       "code": "060000",
       "idx": 6,
       "level": 1
@@ -254,7 +254,7 @@ export default [
       "icon": "el-icon-s-data",
       "name": "内部人物",
       "url": "nbrw",
-      "parent_code": "020000",
+      "parentCode": "020000",
       "code": "020600",
       "idx": 6,
       "level": 2
@@ -264,7 +264,7 @@ export default [
       "icon": null,
       "name": "新闻详情",
       "url": "news_info",
-      "parent_code": "010000",
+      "parentCode": "010000",
       "code": "010200",
       "idx": 7,
       "level": 3
@@ -274,7 +274,7 @@ export default [
       "icon": null,
       "name": "推特详细",
       "url": "external_info",
-      "parent_code": "010000",
+      "parentCode": "010000",
       "code": "010200",
       "idx": 7,
       "level": 3
@@ -284,7 +284,7 @@ export default [
       "icon": "el-icon-user-solid",
       "name": "后台管理",
       "url": "user",
-      "parent_code": "#",
+      "parentCode": "#",
       "code": "070000",
       "idx": 7,
       "level": 1
@@ -294,7 +294,7 @@ export default [
       "icon": "el-icon-s-opportunity",
       "name": "内部机构",
       "url": "nbjg",
-      "parent_code": "020000",
+      "parentCode": "020000",
       "code": "020700",
       "idx": 7,
       "level": 2

src/router/index.js

@@ -6,13 +6,27 @@ import { loginByToken } from "../util/login_util"
 
 
 //解决ElementUI导航栏中的vue-router在3.0版本以上重复点菜单报错问题
-const originalPush = Router.prototype.push
-Router.prototype.push = function push(location) {
-    return originalPush.call(this, location).catch(err => err)
-}
+// const originalPush = Router.prototype.push
+// Router.prototype.push = function push(location) {
+//     return originalPush.call(this, location).catch(err => err)
+// }
+const originalPush = Router.prototype.push;
+const originalReplace = Router.prototype.replace; 
 
-Vue.use(Router);
+// push
+Router.prototype.push = function push(location, onResolve, onReject) {
+  if (onResolve || onReject)
+    return originalPush.call(this, location, onResolve, onReject);
+  return originalPush.call(this, location).catch(err => err);
+};
 
+//replace
+Router.prototype.replace = function push(location, onResolve, onReject) {
+  if (onResolve || onReject)
+    return originalReplace.call(this, location, onResolve, onReject);
+  return originalReplace.call(this, location).catch(err => err);
+};
+Vue.use(Router);
 
 //静态路由
 const constantRoutes = [{

src/store/actions.js

@@ -7,7 +7,7 @@ const actions = {
   setUserInfo: ({ commit }, userData) => commit('userInfo', userData), /* 用户信息存储 */
   getNavList: ({ commit, state }) => {
     return new Promise((resolve, reject) => {
-      post("api/rest/user/queryMenu", { type: "2", id: state.userInfo.role }).
+      post("api/rest/system/menu/queryMenu", { type: "2", id: state.userInfo.role }).
         then(res => {
           let homeRoute = generateHomeRoute(res);
           commit('navList', [homeRoute]);
@@ -15,7 +15,7 @@ const actions = {
         })
         .catch(err => {
           console.log(err);
-          if (err instanceof Object && (err.code == 90003 || err.code == 90009)) {
+          if (err instanceof Object && (err.code == 9003 || err.code == 9009)) {
             reject(err);
           } else {
             let homeRoute = generateHomeRoute([]);
@@ -62,7 +62,7 @@ function generateHomeRoute(list) {
 
     //过滤二级目录
     let route2 = [];
-    list.filter(e => e.parent_code == menu1[i].code).forEach((element, index) => {
+    list.filter(e => e.parentCode == menu1[i].code).forEach((element, index) => {
       route2.push({
         icon: element.icon,
         path: '/' + element.url,
@@ -94,7 +94,7 @@ function loadView(module, view) {
 
 function getInfoRoutes(ele) {
   // return infoRoutes.filter(e => e.meta && e.meta.parent_name == ele.name).map(e => {
-  //   e.meta.parent_code = ele.meta.code;
+  //   e.meta.parentCode = ele.meta.code;
   //   return e;
   // });
   let arr = [];
@@ -104,7 +104,7 @@ function getInfoRoutes(ele) {
       component: e.component,
       path :e.path + Math.ceil(Math.random()*10000),
       meta:{
-        parent_code:ele.meta.code,
+        parentCode:ele.meta.code,
         parent_name: ele.name
       }
     };

src/util/http_util.js

@@ -44,11 +44,11 @@ let get = (url, headers = {}) => {
             }
         }).then(res => {
             let result = JSON.parse(res);
-            if (result.state.code == 90001) {
+            if (result.code == 9000) {
                 resolve(result.data);
             } else {
                 console.log(result);
-                reject(result.state);
+                reject(result);
             }
         }).catch(err => reject(err));
 
@@ -69,11 +69,11 @@ let post = (url, data, headers = {}) => {
             }
         }).then(res => {
             let result = JSON.parse(res);
-            if (result.state.code == 90001) {
+            if (result.code == 9000) {
                 resolve(result.data);
             } else {
                 console.log(result);
-                reject(result.state);
+                reject(result);
             }
         }).catch(err => reject(err));
     })
@@ -94,11 +94,11 @@ let delete_util = (url, data, headers = {}) => {
             }
         }).then(res => {
             let result = JSON.parse(res);
-            if (result.state.code == 90001) {
+            if (result.code == 9000) {
                 resolve(result.data);
             } else {
                 console.log(result);
-                reject(result.state);
+                reject(result);
             }
         }).catch(err => reject(err));
     })
@@ -117,7 +117,7 @@ let fileUpload = (url, formData, headers = {}) => {
     }
     return new Promise((resolve, reject) => {
         fetch(url, {
-            method: "PUT",
+            method: "POST",
             body: formData,
             headers: new Headers(headers_target)
         }).then(res => {
@@ -129,11 +129,11 @@ let fileUpload = (url, formData, headers = {}) => {
             }
         }).then(res => {
             let result = JSON.parse(res);
-            if (result.state.code == 90001) {
+            if (result.code == 9000) {
                 resolve(result.data);
             } else {
                 console.log(result);
-                reject(result.state);
+                reject(result);
             }
         }).catch(err => reject(err));
     })

src/util/login_util.js

@@ -21,7 +21,7 @@ export function setLoginSuccessParam() {
 export function login(account, password) {
     return new Promise((resolve, reject) => {
         get(
-            "api/rest/user/login?account=" +
+            "api/rest/system/user/login?account=" +
             account + "&password=" + btoa(password)
         )
             .then(res => {
@@ -34,7 +34,7 @@ export function login(account, password) {
             })
             .catch(err => {
                 console.log(err);
-                reject(err.msg);
+                reject(err.message);
             });
     });
 }

src/view/bookMark/bookMark.vue

@@ -100,7 +100,7 @@ export default {
     },
     mounted() {
         this.module = this.$store.state.navList[0].children
-            .filter((e) => e.meta && e.meta.code == this.$route.meta.parent_code)[0]
+            .filter((e) => e.meta && e.meta.code == this.$route.meta.parentCode)[0]
             .children.filter((e) => e.icon);
     }
 };

src/view/bookMark/bookMark1.vue

@@ -189,7 +189,7 @@ export default {
                 this.collectionFolderNews = res;
             })
             .catch((err)=>{
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         //展示收藏的新闻详情
@@ -209,14 +209,14 @@ export default {
                     get('api/rest/document/queryLiterature?id=' + item.originId).then(resLi => {
                         window.open('api/rest/document/viewLiterature/' + resLi.list[0].folder + '/' + resLi.list[0].name);
                     }).catch(err => {
-                        this.$message.warning(err.msg);
+                        this.$message.warning(err.message);
                     });
                 }
                 endLoading();
             })
             .catch((err)=>{
                 endLoading();
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         },
         handleClose(done) {
@@ -234,7 +234,7 @@ export default {
                         this.reload();
                     }
                 }).catch(err => {
-                    this.$message.warning(err.msg);
+                    this.$message.warning(err.message);
                 })
             }).catch(() => {
                 this.$message({
@@ -259,7 +259,7 @@ export default {
             res[0].id && this.queryCollectionFolderNews(res[0].id, 0);
         })
         .catch((err)=>{
-            this.$message.warning(err.msg);
+            this.$message.warning(err.message);
         })
     }
 }

src/view/ddkz/ddkz.vue

@@ -92,7 +92,7 @@
     },
     mounted() {
       this.module = this.$store.state.navList[0].children.
-        filter(e => e.meta && e.meta.code == this.$route.meta.parent_code)[0].children.
+        filter(e => e.meta && e.meta.code == this.$route.meta.parentCode)[0].children.
         filter(e => e.icon);
     },
     computed: {

src/view/dfzy/dfwxk.vue

@@ -637,7 +637,7 @@ export default {
         // endLoading();
       })
       .catch((err)=>{
-        this.$message.warning(err.msg);
+        this.$message.warning(err.message);
       })
     },
     //列表分页
@@ -689,7 +689,7 @@ export default {
         })
         .catch((err) => {
           endLoading();
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
 

src/view/dfzy/dfzy.vue

@@ -92,7 +92,7 @@ export default {
   },
   mounted() {
     this.module = this.$store.state.navList[0].children.
-      filter(e => e.meta && e.meta.code == this.$route.meta.parent_code)[0].children.
+      filter(e => e.meta && e.meta.code == this.$route.meta.parentCode)[0].children.
       filter(e => e.icon);
   },
   computed: {

src/view/dfzy/dfzywxk.vue

@@ -73,7 +73,7 @@ export default {
           this.clientDetails = { type: arr };
         })
         .catch((err) => {
-          // this.$message.warning(err.msg);
+          // this.$message.warning(err.message);
         });
     },
     filterNode(value, data) {

src/view/dfzy/news_info_dfzy.vue

@@ -20,7 +20,7 @@
                         <span>发布时间：</span><span v-text="$route.params.key3=='新闻'?getNews.pubdate:getNews.pubTime"></span>
                     </div>
                     <div class="top-left-img" v-show="getNews.website_img!=null&&getNews.website_img.length>0">
-                        <el-image v-for="(item,index) in getNews.website_img" :src="PickerPath_url+item" :key="index"></el-image>
+                        <el-image v-for="(item,index) in getNews.website_img" :src="NewsPictureUrl+item" :key="index"></el-image>
                     </div>
                     <div class="top-left-content" ref="copy1" v-html="getNews.txt"></div>
                 </div>
@@ -170,11 +170,12 @@ import { queryDictType, queryDictItem } from '../../api/dictitem';
 import {} from "../../util/data_util";
 import * as echarts from "echarts";
 import {option_hot_word  } from "../../constant/echart-options";
+import { NewsPictureUrl } from "../../api/publicUrl";
 export default {
     name: "",
     data() {
         return {
-            PickerPath_url:'api/rest/document/viewPicture/NewsPicture?objectName=',
+            NewsPictureUrl: NewsPictureUrl,
             visible: false,
             top: 300,
             left: 300,
@@ -260,7 +261,7 @@ export default {
                 }
             })
             .catch((err)=>{
-                 this.$message.warning(err.msg); 
+                 this.$message.warning(err.message); 
             });
         },
         goBack() {
@@ -443,7 +444,7 @@ export default {
                     this.$message.error('关联人员失败！');
                 }
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             });
 
         },
@@ -463,7 +464,7 @@ export default {
                     this.$message.error('关联机构失败！');
                 }
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             });
         },
         handleClose(done) {
@@ -604,7 +605,7 @@ export default {
                         });
                     })
                     .catch((err) => {
-                        this.$message.warning(err.msg);
+                        this.$message.warning(err.message);
                         this.getNews = {};
                     });
             }

src/view/dfzy/seleteTree.vue

@@ -4,7 +4,6 @@
     ref="select"
     :value="value"
     placeholder="请选择"
-    clearable
     :disabled="disabled"
     :filterable="filterable"
     :filter-method="filterMethod"
@@ -149,8 +148,10 @@ export default {
             return;
           }
           const node = this.$refs.tree.getNode(val);
-          this.optionData.id = val;
-          this.optionData.name = node.label;
+          if(node!=null){
+            this.optionData.id = val;
+            this.optionData.name = node.label;
+          }
         });
       }
     },

src/view/dfzy/test.vue

@@ -115,6 +115,7 @@
                       <tr>
                         <td>出生日期</td>
                         <td>{{model_attribute.data.birth}}</td>
+                      </tr>
                       <tr>
                         <td>国籍</td>
                         <td>{{model_attribute.data.nationality}}</td>
@@ -152,6 +153,7 @@
                       <tr>
                         <td>联系方式</td>
                         <td>{{model_attribute.data.concatInfo}}</td>
+                      </tr>
                       <tr>
                         <td>官方网站地址</td>
                         <td>{{model_attribute.data.officialWebsiteAddress}}</td>
@@ -241,6 +243,7 @@
 import SeeksRelationGraph from "relation-graph";
 import { get, post, startLoading, endLoading } from "../../util/http_util";
 import jh_bg from "../../assets/img/dfzy/zwtp.png";
+import { imgUrl } from "../../api/publicUrl";
 export default {
   components: { SeeksRelationGraph },
   data() {
@@ -404,7 +407,6 @@ export default {
       zt_id: "", //存储关系图中关系衍生的核心节点ID
       db_zt_id:'',
       model_attribute:{type:'',data:''},
-      PickerPath_url:'api/rest/document/viewPicture/ProfilePhotos?objectName=',
       errimg: "this.src='" + jh_bg + "'",
       scTime:"",
     };
@@ -535,9 +537,9 @@ export default {
             let idp = arr_entity.filter(e=>e.uuid ==arr_p[index].uuid)[0].meaningTag;
             let idq = arr_entity.filter(e=>e.uuid ==arr_q[index].uuid)[0].meaningTag;
             let img_url = "";
-            img_url = this.PickerPath_url+arr_q[index].name+".jpg";
+            img_url = imgUrl + arr_q[index].name+".jpg";
             if(peopleOrOrganization_type=='organization'){
-                img_url = this.PickerPath_url+arr_q[index].name+".png";
+                img_url = imgUrl + arr_q[index].name+".png";
             }
             // item.meaningTag==null?item.meaningTag=Math.floor(Math.random()*(1000000-10000+1)+10000):item.meaningTag=item.meaningTag;
             arr_nodes.nodes.push({
@@ -575,9 +577,9 @@ export default {
         let arr_nodes = {};//所有节点以及线的集合
         let arr_entity = [];
         if(data.p.length>0){
-          let img_url = this.PickerPath_url+data.p[0].name+".jpg";
+          let img_url = imgUrl + data.p[0].name+".jpg";
           if(peopleOrOrganization_type=='organization'){
-              img_url = this.PickerPath_url+data.p[0].name+".png";
+              img_url = imgUrl + data.p[0].name+".png";
           }
           // img_url = data.opponent.photos == null ? "" : data.opponent.photos;
           let arr_nodes_ccjz = {//当前主节点的属性

src/view/dfzyjgxq.vue

@@ -672,11 +672,11 @@ import * as echarts from "echarts";
 import jh_bg from "../assets/img/dfzy/zwtp.png";
 import { uuid } from "../util/data_util";
 import navs_rwk from "./sjgl/gxt.vue";
+import { imgUrl } from "../api/publicUrl";
 export default {
   components: { SeeksRelationGraph ,navs_rwk},
   data() {
     return {
-      PickerPath_url:'api/rest/document/viewPicture/ProfilePhotos?objectName=',
       currentRole_rw: "navs_rwk",
       clientDetails_rw: {},
       errimg: "this.src='" + jh_bg + "'",
@@ -764,7 +764,7 @@ export default {
           }
         })
         .catch((err)=>{
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     handleSizeChange1(val) {
@@ -790,7 +790,7 @@ export default {
           }
         })
         .catch((err)=>{
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     handleSizeChange2(val) {
@@ -827,7 +827,7 @@ export default {
         .catch((err) => {
           this.$message({
             type: "warning",
-            message: err.msg,
+            message: err.message,
           });
         });
     },
@@ -935,7 +935,7 @@ export default {
           if (data.list.length > 0) {
             this.form = JSON.parse(JSON.stringify(data.list[0]));
             this.imageUrl =
-              this.PickerPath_url +
+              imgUrl +
               this.form.baseProperty["photos"];
             if(this.wzmk_data.length>0&&JSON.stringify(this.form.mouldTables)!='{}'){
               this.wzmk_data.forEach((item)=>{
@@ -1029,7 +1029,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     jsonToArray(nodes) {
@@ -1083,7 +1083,7 @@ export default {
                 })
                 this.xgnr_xgrw.forEach((item) => {
                   item.photos =
-                    this.PickerPath_url +
+                    imgUrl +
                     item.baseProperty["photos"];
                   item.label =
                     item.extraProperty["标签"] == undefined
@@ -1115,12 +1115,12 @@ export default {
                 });
               })
               .catch((err) => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
               });
           });
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     query_xgyl(id){
@@ -1170,7 +1170,7 @@ export default {
           .catch((err) => {
             this.$message({
               type: "warning",
-              message: err.msg,
+              message: err.message,
             });
           });
       })

src/view/dfzyrwxq.vue

@@ -523,11 +523,11 @@ import { get, post,startLoading,endLoading,rw_jg_IsConfirm } from "../util/http_
 import * as echarts from "echarts";
 import jh_bg from "../assets/img/dfzy/zwtp.png";
 import navs_rwk from "./sjgl/gxt.vue";
+import { imgUrl } from "../api/publicUrl";
 export default {
   components: { SeeksRelationGraph, navs_rwk },
   data() {
     return {
-      PickerPath_url:'api/rest/document/viewPicture/ProfilePhotos?objectName=',
       currentRole_rw: "navs_rwk",
       clientDetails_rw: {},
       errimg: "this.src='" + jh_bg + "'",
@@ -614,7 +614,7 @@ export default {
           }
         })
         .catch((err)=>{
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     handleSizeChange1(val) {
@@ -640,7 +640,7 @@ export default {
           }
         })
         .catch((err)=>{
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     handleSizeChange2(val) {
@@ -677,7 +677,7 @@ export default {
         .catch((err) => {
           this.$message({
             type: "warning",
-            message: err.msg,
+            message: err.message,
           });
         });
     },
@@ -823,7 +823,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     jsonToArray(nodes) {
@@ -878,7 +878,7 @@ export default {
                 })
                 this.xgnr_xgrw.forEach((item) => {
                   item.photos =
-                    this.PickerPath_url +
+                    imgUrl +
                     item.baseProperty["photos"];
                   item.label =
                     item.extraProperty["标签"] == undefined
@@ -910,12 +910,12 @@ export default {
                 });
               })
               .catch((err) => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
               });
           });
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     query_xgyl(id) {
@@ -951,7 +951,7 @@ export default {
             .catch((err) => {
               this.$message({
                 type: "warning",
-                message: err.msg,
+                message: err.message,
               });
             });
         })

src/view/flfg/flfg.vue

@@ -88,7 +88,7 @@ export default {
     },
     mounted() {
         this.module = this.$store.state.navList[0].children.
-            filter(e => e.meta && e.meta.code == this.$route.meta.parent_code)[0].children.
+            filter(e => e.meta && e.meta.code == this.$route.meta.parentCode)[0].children.
             filter(e => e.icon);
     },
     computed: {}

src/view/flfg/flfg1.vue

@@ -29,7 +29,7 @@
             <div class="card-content">
               <div class="content-img">
                 <div v-for="(item1, index1) in item.img">
-                  <img :src="PickerPath_url + item1.folder + '/' + item1.image" alt="" @click="viewLiterature(item1)"
+                  <img :src="LiteraturePictureUrl + item1.folder + '/' + item1.image" alt="" @click="viewLiterature(item1)"
                     @contextmenu.prevent.stop="showInfo(item1)" />
                 </div>
               </div>
@@ -65,7 +65,7 @@
             <div class="card-content">
               <div class="content-img">
                 <div v-for="(item1, index1) in item.img">
-                  <img :src="PickerPath_url + item1.folder + '/' + item1.image" alt="" @click="viewLiterature(item1)"
+                  <img :src="LiteraturePictureUrl + item1.folder + '/' + item1.image" alt="" @click="viewLiterature(item1)"
                     @dblclick="showInfo(item1)" />
                 </div>
               </div>
@@ -101,7 +101,7 @@
             <div class="card-content">
               <div class="content-img">
                 <div v-for="(item1, index1) in item.img">
-                  <img :src="PickerPath_url + item1.folder + '/' + item1.image" alt="" @click="viewLiterature(item1)"
+                  <img :src="LiteraturePictureUrl + item1.folder + '/' + item1.image" alt="" @click="viewLiterature(item1)"
                     @contextmenu.prevent.stop="showInfo(item1)" />
                 </div>
               </div>
@@ -1473,12 +1473,12 @@ import {
 import leftTitle from "../../assets/img/flfg/leftTitle.png";
 import rightTitle from "../../assets/img/flfg/rightTitle.png";
 import "animate.css";
+import { LiteraturePictureUrl } from "../../api/publicUrl";
 export default {
   name: "flfg",
   data() {
     return {
-      PickerPath_url:
-        "api/rest/document/viewPicture/LiteraturePicture?objectName=",
+      LiteraturePictureUrl: LiteraturePictureUrl,
       input: "",
       flag: 1,
       titleImg: [leftTitle, rightTitle],
@@ -1650,7 +1650,7 @@ export default {
         })
         .catch((err) => {
           endLoading();
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     showList(val) {
@@ -1691,7 +1691,7 @@ export default {
           this.total = res.totals;
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     //返回中文名
@@ -1721,7 +1721,7 @@ export default {
           this.totalKinds = res.totals;
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     handleCurrentChangeKinds(pageNum) {
@@ -1743,7 +1743,7 @@ export default {
           this.literatureObj = item;
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     xgtj_news(id) {
@@ -1757,7 +1757,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     openMenu(e) {
@@ -1817,7 +1817,7 @@ export default {
           }, 3000 * Math.random());
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
 
       post(
@@ -1842,7 +1842,7 @@ export default {
           }, 3000 * Math.random());
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     querySearchAsyncOrganization(queryString, cb) {
@@ -1868,7 +1868,7 @@ export default {
           }, 3000 * Math.random());
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
       post(
         "api/rest/resource/queryDynamicOrganization?pageNum=1&pageSize=100&multiFieldSearch=" +
@@ -1891,7 +1891,7 @@ export default {
           }, 3000 * Math.random());
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     createStateFilter(queryString) {
@@ -1929,7 +1929,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     //确定关联机构
@@ -1958,7 +1958,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     //添加标签
@@ -1999,7 +1999,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     handleClose(done) {
@@ -2064,7 +2064,7 @@ export default {
             }
           })
           .catch((err) => {
-            this.$message.warning(err.msg);
+            this.$message.warning(err.message);
           });
       } else {
         this.$message.warning("新增目录不能为空！");
@@ -2081,7 +2081,7 @@ export default {
           }
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     //全文检索
@@ -2216,14 +2216,14 @@ export default {
             this.domesticLaw[2].img = res[15];
           })
           .catch((err) => {
-            this.$message.error(err.msg);
+            this.$message.error(err.message);
           });
         //查询收藏夹
         this.searchCollectionFolder();
       })
       .catch((err) => {
         endLoading();
-        this.$message.warning(err.msg);
+        this.$message.warning(err.message);
       });
     var observer = new IntersectionObserver(function (changes) {
       changes.forEach(function (change) {

src/view/flfg/flfg1_bak.vue

@@ -749,7 +749,7 @@ export default {
     //默认查询数据
     // _this.searchs(1);
     _this.options = [];
-    get("api/rest/dictitem/queryDictItem/" + _this.type_classify).then(
+    get("api/rest/3z/dictitem/queryDictItem/" + _this.type_classify).then(
       (data) => {
         if (data.length != 0) {
           data.forEach((item) => {

src/view/fzjc/fzjc.vue

@@ -100,7 +100,7 @@ export default {
     },
     mounted() {
         this.module = this.$store.state.navList[0].children.
-            filter(e => e.meta && e.meta.code == this.$route.meta.parent_code)[0].children.
+            filter(e => e.meta && e.meta.code == this.$route.meta.parentCode)[0].children.
             filter(e => e.icon);
 
         for (let i = 0; i < this.module.length; i++) {
@@ -115,7 +115,7 @@ export default {
         //     // filter(n=>n.icon)//过滤掉默认
         //     // [3].children.filter(n=>n.icon);//
         //    return this.$store.state.navList[0].children.
-        //     filter(e=>e.meta && e.meta.code == this.$route.meta.parent_code)[0].children.
+        //     filter(e=>e.meta && e.meta.code == this.$route.meta.parentCode)[0].children.
         //     filter(e=>e.icon);
         // }
     }

src/view/fzjc/jczc.vue

@@ -554,7 +554,7 @@ export default {
                     this.dialogVisible = false;
                 }
             }).catch(err => {
-                this.$message.error(err.msg);
+                this.$message.error(err.message);
             });
         },
         //生成预案
@@ -570,7 +570,7 @@ export default {
             //         this.$message.success('生成成功！');
             //     }
             // }).catch(err => {
-            //     this.$message.error(err.msg);
+            //     this.$message.error(err.message);
             // });
         },
         search() {
@@ -606,7 +606,7 @@ export default {
                         this.search();
                     }
                 }).catch(err => {
-                    this.$message.error(err.msg);
+                    this.$message.error(err.message);
                 });
             }).catch(() => {
                 this.$message({
@@ -642,7 +642,7 @@ export default {
             this.search();
         })
             .catch((err) => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
         if (this.$route.params.selectText) {
             this.importText = this.$route.params.selectText

src/view/fzjc/wjfx.vue

@@ -255,7 +255,7 @@ export default {
           this.clientDetails = { type: 4 };
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     filterNode(value, data) {

src/view/fzjc/znfx.vue

@@ -707,7 +707,7 @@ export default {
           // endLoading();
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
     //列表分页
@@ -759,7 +759,7 @@ export default {
         })
         .catch((err) => {
           endLoading();
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
 

src/view/home.vue

@@ -142,7 +142,7 @@ export default {
             } else if (command == '数据管理') {
                 this.$router.push("sjgl");
             } else if (command == "安全退出") {
-                post("api/rest/user/logout", this.userInfo.account)
+                post("api/rest/system/user/logout", this.userInfo.account)
                     .then(res => { });
                 sessionStorage.setItem("isLogin", false);
                 //reload已经清除vuex中内容
@@ -175,7 +175,7 @@ export default {
         editPassword() {
             if (this.form.oldPwd.length != '' && this.form.newPwd.length != '' && this.form.definePwd != '') {
                 if (this.form.newPwd == this.form.definePwd) {
-                    get(`api/rest/user/updatePassword?oldPassword=${this.form.oldPwd}&newPassword=${this.form.newPwd}&account=${this.userInfo.account}`).then(res => {
+                    get(`api/rest/system/user/updatePassword?oldPassword=${this.form.oldPwd}&newPassword=${this.form.newPwd}&account=${this.userInfo.account}`).then(res => {
                         if (res == 1) {
                             this.$message.success('密码修改成功！');
                             this.dialogVisible = false;
@@ -183,7 +183,7 @@ export default {
                             this.$message.error('密码修改失败！');
                         }
                     }).catch(err => {
-                        this.$message.warning(err.msg);
+                        this.$message.warning(err.message);
                     });
                 } else {
                     this.$message.warning('两次密码不一致！');
@@ -247,15 +247,15 @@ export default {
             this.$message.warning("请联系管理员配置角色权限！");
         }
         //标题获取
-        queryDictItem('06').then(item => {
-            if (item.length == 2) {
-                this.title_top = item[0].name;
-                this.title_bottom = item[1].name;
-            } else {
-                this.title_top = "XXXXXXXXXXXXXXXXXXX";
-                this.title_bottom = "XXXXXXXXXXXX";
-            }
-        });
+        // queryDictItem('06').then(item => {
+        //     if (item.length == 2) {
+        //         this.title_top = item[0].name;
+        //         this.title_bottom = item[1].name;
+        //     } else {
+        //         this.title_top = "XXXXXXXXXXXXXXXXXXX";
+        //         this.title_bottom = "XXXXXXXXXXXX";
+        //     }
+        // });
         this.isSelected = this.activeIndex;
         this.choiceModule(this.activeIndex);
     },
@@ -287,13 +287,13 @@ export default {
         //ws创建
         this.$store.dispatch("initWebsocket");
         //获取通知消息数量
-        get("api/rest/user/countNotification?account=" + this.userInfo.account)
-            .then(res => {
-                this.$store.commit("noteNum", res);
-            })
-            .catch(err => {
-                this.$message.warning(err.msg);
-            });
+        // get("api/rest/system/user/countNotification?account=" + this.userInfo.account)
+        //     .then(res => {
+        //         this.$store.commit("noteNum", res);
+        //     })
+        //     .catch(err => {
+        //         this.$message.warning(err.message);
+        //     });
         // Push.Permission.request();
     },
     watch: {

src/view/home_search/home_search.vue

@@ -108,7 +108,7 @@ export default {
   },
   mounted() {
       this.module = this.$store.state.navList[0].children.
-      filter(e=>e.meta && e.meta.code == this.$route.meta.parent_code)[0].children.
+      filter(e=>e.meta && e.meta.code == this.$route.meta.parentCode)[0].children.
       filter(e=>e.icon);
   },
   computed:{

src/view/log/log.vue

@@ -88,7 +88,7 @@ export default {
     },
     mounted() {
        this.module = this.$store.state.navList[0].children.
-       filter(e=>e.meta && e.meta.code == this.$route.meta.parent_code)[0].children.
+       filter(e=>e.meta && e.meta.code == this.$route.meta.parentCode)[0].children.
        filter(e=>e.icon);
     },
     computed:{

src/view/login.vue

@@ -110,10 +110,10 @@ export default {
     }
   },
   activated() {
-    if (this.$route.params.code == 90003 || this.$route.params.code == 90009 || this.$route.params.code == 90008) {
+    if (this.$route.params.code == 9003 || this.$route.params.code == 9009 || this.$route.params.code == 9008) {
       this.$message({
         showClose: true,
-        message: this.$route.params.msg,
+        message: this.$route.params.message,
         type: "warning",
       });
     }

src/view/sjgl/drdc.vue

@@ -189,7 +189,7 @@ export default {
                 this.$message.success('上传成功' + res.success + '条数据！');
                 endLoading();
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
                 endLoading();
             });
             if(this.autoImportChecked){
@@ -208,7 +208,7 @@ export default {
                 this.$message.success('上传成功' + res.success + '条数据！');
                 // endLoading();
             }).catch(err => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
                 // endLoading();
             });
         },
@@ -224,7 +224,7 @@ export default {
         //         this.$message.success('上传成功' + res.success + '条数据！');
         //         endLoading();
         //     }).catch(err => {
-        //         this.$message.warning(err.msg);
+        //         this.$message.warning(err.message);
         //         endLoading();
         //     });
         // },

src/view/sjgl/fzjcgl_jczc.vue

@@ -533,7 +533,7 @@ export default {
                 this.fxypPagination.currentPage = res.pageNum;
             })
                 .catch((err) => {
-                    this.$message.warning(err.msg);
+                    this.$message.warning(err.message);
                 })
         },
         handleCurrentChangeFxyp(pageNum) {
@@ -571,7 +571,7 @@ export default {
                             this.$message.error('新增失败！');
                         }
                     }).catch(err => {
-                        this.$message.warning(err.msg);
+                        this.$message.warning(err.message);
                     });
                 }
             });
@@ -596,7 +596,7 @@ export default {
                         this.queryFxyp();
                     }
                 }).catch(err => {
-                    this.$message.warning(err.msg);
+                    this.$message.warning(err.message);
                 });
             }).catch(() => {
                 this.$message({
@@ -637,7 +637,7 @@ export default {
                 this.czyzPagination.currentPage = res.pageNum;
             })
                 .catch((err) => {
-                    this.$message.warning(err.msg);
+                    this.$message.warning(err.message);
                 })
         },
         handleCurrentChange(pageNum) {
@@ -678,7 +678,7 @@ export default {
                             this.$message.error('新增失败！');
                         }
                     }).catch(err => {
-                        this.$message.warning(err.msg);
+                        this.$message.warning(err.message);
                     });
                 }
             });
@@ -703,7 +703,7 @@ export default {
                         this.queryCzyz();
                     }
                 }).catch(err => {
-                    this.$message.warning(err.msg);
+                    this.$message.warning(err.message);
                 });
             }).catch(() => {
                 this.$message({
@@ -749,7 +749,7 @@ export default {
                 this.xxzpPagination.currentPage = res.pageNum;
             })
                 .catch((err) => {
-                    this.$message.warning(err.msg);
+                    this.$message.warning(err.message);
                 });
         },
         handleCurrentChangeXxzp(pageNum) {
@@ -786,7 +786,7 @@ export default {
                             this.$message.error('新增失败！');
                         }
                     }).catch(err => {
-                        this.$message.warning(err.msg);
+                        this.$message.warning(err.message);
                     });
                 }
             });
@@ -811,7 +811,7 @@ export default {
                         this.queryXxzp();
                     }
                 }).catch(err => {
-                    this.$message.warning(err.msg);
+                    this.$message.warning(err.message);
                 });
             }).catch(() => {
                 this.$message({
@@ -851,7 +851,7 @@ export default {
                 this.queryFxyp();
             })
             .catch((err) => {
-                this.$message.warning(err.msg);
+                this.$message.warning(err.message);
             })
     }
 }

src/view/sjgl/sjgl.vue

@@ -120,7 +120,7 @@ export default {
     },
     mounted() {
         this.module = this.$store.state.navList[0].children.
-            filter(e => e.meta && e.meta.code == this.$route.meta.parent_code)[0].children.
+            filter(e => e.meta && e.meta.code == this.$route.meta.parentCode)[0].children.
             filter(e => e.icon);
     },
     computed: {

src/view/sjgl/wfzygl.vue

@@ -404,7 +404,7 @@ export default {
           // this.query_CharacterMould();
         })
         .catch((err) => {
-          this.$message.warning(err.msg);
+          this.$message.warning(err.message);
         });
     },
   },