Merge branch 'master' of http://192.168.168.218/xiaminwei/xxx_phase2_web

src/api/xxxl/llxx.js

@@ -98,9 +98,11 @@ export const queryRecommendLiterature = id => {
 
 //分页检索文献列表
 export const searchLiterature = (module, pageNum, pageSize, text) => {
-    let url = `${PREFIX_ELASTIC}queryRecommendLiterature`;
-    url += addParam({ module, pageNum, pageSize, text });
-    return post(url);
+    // let url = `${PREFIX_ELASTIC}queryRecommendLiterature`;
+    // url += addParam({ module, pageNum, pageSize, text });
+    let url = `${PREFIX_ELASTIC}searchLiterature`;
+    url += addParam({ module, pageNum, pageSize });
+    return post(url,text);
 }
 
 //根据文献name获取文献

src/view/dfzy/dfzyjgk.vue

@@ -486,8 +486,8 @@ export default {
         {
           module: this.jgName_public == 1 ? "DF" : "DFWW",
           name:name,
-          type:this.typeMilitaryPolitics.name,
-          nation:this.typeCountryRegion.name,
+          type:this.typeMilitaryPolitics.name==''?null:this.typeMilitaryPolitics.name,
+          nation:this.typeCountryRegion.name==''?null:this.typeCountryRegion.name,
         }
       ).then((res) => {
         this.rwkxx = [];
@@ -626,7 +626,7 @@ export default {
         this.jgName = "1";
         this.jgName_public = 2;
       }else{
-        this.value_select = val.code;
+        this.value_select = val.id;
         this.jgName = val.id;
         this.jgName_public = val.type;
       }

src/view/dfzy/dfzyrwk.vue

@@ -352,6 +352,7 @@ export default {
       categoryId: null,
       valueTitle: "",
       value_select:4,
+      value_selects:'',
     };
   },
   methods: {
@@ -368,7 +369,6 @@ export default {
       this.typeCountryRegion = {value:'',name:''};
       this.typeMilitaryPolitics = {value:'',name:''};
       this.type_zhOrcx = 1;
-      // this.query_tree();
       this.pageInfo.current_page = pageNum;
       let pageSize = this.pageInfo.pageSize;
       post(
@@ -477,7 +477,7 @@ export default {
         `api/rest/mongo/character/query?pageNum=${pageNum}&pageSize=${pageSize}`,
         {
           module: this.types == 1 ? "DF" : "DFWW",
-          orgId:this.value_select==1||this.value_select==4?null:this.value_select,
+          orgId:this.value_select==1||this.value_select==4?null:this.value_selects,
         }
       )
         .then((res) => {
@@ -624,10 +624,12 @@ export default {
     NodeClick(val){
       if( JSON.stringify(val) == "{}"){
         this.value_select = undefined;
+        this.value_selects = undefined;
         this.types = 2;
         this.jgName = "1";
       }else{
-        this.value_select = val.code;
+        this.value_select = val.id;
+        this.value_selects = val.code;
         this.types = val.type;
         this.jgName = val.code == undefined ? val.id : val.code;
       }

src/view/dfzy/jq_xq_dfzy.vue

@@ -1048,15 +1048,13 @@ export default {
         });
         endLoading();
       } else if (item.objectType == "文献") {
-        get("api/rest/document/queryLiterature?id=" + item.objectFrom)
+        get("api/rest/3z/document/queryLiterature?id=" + item.objectFrom)
           .then((data) => {
             if (data.list.length == 0) {
               this.$message.warning("当前关联文献未找到！！！");
             } else {
               window.open(
-                "api/rest/document/viewLiterature/" +
-                data.list[0].folder +
-                "/" +
+                "api/rest/file/pdf/LiteraturePDF?objectName=" +
                 data.list[0].name
               );
             }
@@ -1080,15 +1078,13 @@ export default {
     },
     showInfo_s(item) {
       if (item.objectType == "文献") {
-        get("api/rest/document/queryLiterature?id=" + item.objectFrom)
+        get("api/rest/3z/document/queryLiterature?id=" + item.objectFrom)
           .then((data) => {
             if (data.list.length == 0) {
               this.$message.warning("当前关联文献未找到");
             } else {
               window.open(
-                "api/rest/document/viewLiterature/" +
-                data.list[0].folder +
-                "/" +
+                "api/rest/file/pdf/LiteraturePDF?objectName=" +
                 data.list[0].name
               );
             }

src/view/dfzyjgxq.vue

@@ -978,7 +978,7 @@ export default {
           this.xgnr_gjjy = [];
           this.xgnr_jgfxbg = [];
           this.query_Twitter(this.form.extraProperty.id);
-          this.query_xgyl(this.form._id);
+          this.query_xgyl(this.form.jgbh.value);
         })
         .catch((err) => {
           console.log(err);

src/view/dfzyrwxq.vue

@@ -1113,7 +1113,7 @@ export default {
       this.xgnr_pjyl=[];
       this.form = JSON.parse(this.$route.query.obj);
       this.form.mouldId && this.query_CharacterMould(this.form.mouldId);
-      this.query_xgyl(this.form._id);
+      this.query_xgyl(this.form.rwbh.value);
       this.query_Twitter(this.form.extraProperty.id);
     }
   },

src/view/flfg/flfg1.vue

@@ -1633,7 +1633,7 @@ export default {
     },
     //根据文本信息查询文件
     searchLiterature() {
-      searchLiterature(this.fulltextPagination.currentPage, this.fulltextPagination.everySize, this.input).then((res) => {
+      searchLiterature('法律法规',this.fulltextPagination.currentPage, this.fulltextPagination.everySize, this.input).then((res) => {
         res.list.forEach((item) => {
           item.createTime = dateChangeFormat(
             "YYYY-mm-dd HH:MM:SS",

src/view/home.vue

@@ -23,13 +23,13 @@
                     <!-- <div class="top-nav3-content-user" @click="dialogVisible = true;">
                         <i class="el-icon-user-solid"></i>
                         <span v-text="userInfo.username"></span>
-                    </div>
-                    <div class="top-nav3-content-user" v-if="noteNum > 0">
+                    </div> -->
+                    <!-- <div class="top-nav3-content-user" v-if="noteNum > 0">
                         <a @click="queryNotification()" class="nav-link">
                             <div class="nav-counter nav-counter-red" v-text="noteNum"></div>
                         </a>
-                    </div>
-                    &emsp; -->
+                    </div> -->
+                    &emsp;
                     <el-dropdown @command="handleCommand" style="float: left;margin-top:10px;margin-left: 10px;">
                         <span class="el-dropdown-link">
                             <i class="el-icon-more setting_button"></i>
@@ -37,6 +37,7 @@
                         <el-dropdown-menu slot="dropdown" class="hide-drop">
                             <el-dropdown-item v-for="(item, index) in manager_module_backstage" v-text="item.name"
                                 :command="item.name" :key="index"></el-dropdown-item>
+                            <el-dropdown-item command="修改密码">修改密码</el-dropdown-item>
                             <el-dropdown-item command="安全退出">安全退出</el-dropdown-item>
                         </el-dropdown-menu>
                     </el-dropdown>
@@ -160,6 +161,8 @@ export default {
                 this.$router.push("countfileupload");
             } else if (command == '消息') {
                 this.$router.push("xx");
+            } else if (command == '修改密码') {
+                this.dialogVisible = true;
             }
         },
         handleClose(key, keyPath) { },
@@ -217,7 +220,6 @@ export default {
         }
     },
     mounted() {
-        console.log(this.$store.state.navList);
         let arr = this.$store.state.navList[0].children.filter((e) => e.path == '/sjgl');
         this.$store.state.navList[0].children.forEach((item) => {
             if (item.children.length > 0) {

src/view/sjgl/jg_xq.vue

@@ -615,15 +615,15 @@ export default {
         let obj = {};
         obj["object"] = this.selectText;
         obj["objectFrom"] = "";
-        obj["subject"] = this.form._id;
+        obj["subject"] = this.form.jgbh.value;
         obj["relation"] = "攻击建议";
         obj["objectType"] = "攻击建议";
-        post(`api/rest/resource/addRelatedInfo`, obj)
+        post(`api/rest/3z/resource/addRelatedInfo`, obj)
           .then((res) => {
             if (res == 1) {
               this.$message.success("攻击建议新增成功！");
               this.dialogVisibleOrganization = false;
-              this.query_xgyl(this.form.jgbh);
+              this.query_xgyl(this.form.jgbh.value);
             } else {
               this.$message.error("关联机构失败！");
             }
@@ -645,7 +645,7 @@ export default {
           // return
           delete_util("api/rest/resource/removeRelatedInfo", paramDatas)
             .then((data) => {
-              this.query_xgyl(this.form._id);
+              this.query_xgyl(this.form.jgbh.value);
               this.$message({
                 message: "删除成功！！！",
                 type: "success",

src/view/sjgl/news_info.vue

@@ -465,7 +465,7 @@ export default {
             obj['subject'] = this.pickItem.address;
             obj['relation'] = this.personType;
             obj['objectType'] = '新闻';
-            post(`api/rest/resource/addRelatedInfo`, obj).then(res => {
+            post(`api/rest/3z/resource/addRelatedInfo`, obj).then(res => {
                 if (res == 1) {
                     this.$message.success('关联人员成功！');
                     this.dialogVisiblePerson = false;
@@ -485,7 +485,7 @@ export default {
             obj['subject'] = this.pickItem.address;
             obj['relation'] = this.organizationType;
             obj['objectType'] = '新闻';
-            post(`api/rest/resource/addRelatedInfo`, obj).then(res => {
+            post(`api/rest/3z/resource/addRelatedInfo`, obj).then(res => {
                 if (res == 1) {
                     this.$message.success('关联机构成功！');
                     this.dialogVisibleOrganization = false;

src/view/sjgl/rw_xq.vue

@@ -639,15 +639,15 @@ export default {
         let obj = {};
         obj['object'] = this.selectText;
         obj['objectFrom'] = '';
-        obj['subject'] = this.form._id;
+        obj['subject'] = this.form.rwbh.value;
         obj['relation'] = '攻击建议';
         obj['objectType'] = '攻击建议';
-        post(`api/rest/resource/addRelatedInfo`, obj).then(res => {
+        post(`api/rest/3z/resource/addRelatedInfo`, obj).then(res => {
             if (res == 1) {
                 this.$message.success('攻击建议新增成功！');
                 this.dialogVisibleOrganization = false;
                 get(
-                  "api/rest/3z/resource/queryRelatedInfo?subject="+this.form._id+"&relation="+"攻击建议",
+                  "api/rest/3z/resource/queryRelatedInfo?subject="+this.form.rwbh.value+"&relation="+"攻击建议",
                 )
                 .then((data)=>{
                   this.xgnr_gjjy = data.list;
@@ -677,7 +677,7 @@ export default {
           delete_util("api/rest/resource/removeRelatedInfo", paramDatas)
             .then((data) => {
               get(
-                "api/rest/3z/resource/queryRelatedInfo?subject="+this.form._id+"&relation="+"攻击建议",
+                "api/rest/3z/resource/queryRelatedInfo?subject="+this.form.rwbh.value+"&relation="+"攻击建议",
               )
               .then((data)=>{
                 this.xgnr_gjjy = data.list;
@@ -1489,6 +1489,7 @@ export default {
       color: #8cd4ff;
       text-overflow: ellipsis;
       overflow: hidden;
+      width: 200px;
     }
   }
   .title-divs {

src/view/yqjc/news_info.vue

@@ -537,8 +537,8 @@ export default {
             ).then(res => {
                 res.records.forEach(item => {
                     let organizationObj = {};
-                    organizationObj['value'] = item.jgfh.value;
-                    organizationObj['address'] = item.jgbh.value;
+                    organizationObj['value'] = item.info.jgfh.value;
+                    organizationObj['address'] = item.info.jgbh.value;
                     organizationList.push(organizationObj);
                 })
                 // var results = queryString ? organizationList.filter(this.createStateFilter(queryString)) : organizationList;
@@ -559,8 +559,8 @@ export default {
             ).then(res => {
                 res.records.forEach(item => {
                     let organizationObj = {};
-                    organizationObj['value'] = item.jgfh.value;
-                    organizationObj['address'] = item.jgbh.value;
+                    organizationObj['value'] = item.info.jgfh.value;
+                    organizationObj['address'] = item.info.jgbh.value;
                     organizationList.push(organizationObj);
                 })
                 // var results = queryString ? organizationList.filter(this.createStateFilter(queryString)) : organizationList;

src/view/yqjc/rdsj.vue

@@ -1476,7 +1476,7 @@ export default {
             obj['subject'] = this.pickItem.address;
             obj['relation'] = this.personType;
             obj['objectType'] = '文献';
-            post(`api/rest/resource/addRelatedInfo`, obj).then(res => {
+            post(`api/rest/3z/resource/addRelatedInfo`, obj).then(res => {
                 if (res == 1) {
                     this.$message.success('关联人员成功！');
                     this.dialogVisiblePerson = false;
@@ -1500,7 +1500,7 @@ export default {
             obj['subject'] = this.pickItem.address;
             obj['relation'] = this.organizationType;
             obj['objectType'] = '文献';
-            post(`api/rest/resource/addRelatedInfo`, obj).then(res => {
+            post(`api/rest/3z/resource/addRelatedInfo`, obj).then(res => {
                 if (res == 1) {
                     this.$message.success('关联机构成功！');
                     this.dialogVisibleOrganization = false;

src/view/yqjc/zk_info.vue

@@ -428,7 +428,7 @@ export default {
             obj['subject'] = this.pickItem.address;
             obj['relation'] = this.personType;
             obj['objectType'] = '智库';
-            post(`api/rest/resource/addRelatedInfo`, obj).then(res => {
+            post(`api/rest/3z/resource/addRelatedInfo`, obj).then(res => {
                 if (res == 1) {
                     this.$message.success('关联人员成功！');
                     this.dialogVisiblePerson = false;
@@ -449,7 +449,7 @@ export default {
             obj['subject'] = this.pickItem.address;
             obj['relation'] = this.organizationType;
             obj['objectType'] = '智库';
-            post(`api/rest/resource/addRelatedInfo`, obj).then(res => {
+            post(`api/rest/3z/resource/addRelatedInfo`, obj).then(res => {
                 if (res == 1) {
                     this.$message.success('关联机构成功！');
                     this.dialogVisibleOrganization = false;