Skip to content

X
xxx_phase2_web
Commit 0e265c1c authored by 高飞's avatar 高飞
Browse files
Options

修改人物机构新闻详情页信息

parent a982817e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 991 additions and 2119 deletions
src/assets/css/home.css
View file @ 0e265c1c
...@@ -22,7 +22,6 @@ div::-webkit-scrollbar-thumb:hover { ...@@ -22,7 +22,6 @@ div::-webkit-scrollbar-thumb:hover {
div::-webkit-scrollbar-corner { div::-webkit-scrollbar-corner {
background: #a1dcf7; background: #a1dcf7;
} }
/* input 边框*/ /* input 边框*/
.public-input>.el-input__inner, .public-input>.el-input__inner,
.public-input>.el-input--suffix>.el-input__inner { .public-input>.el-input--suffix>.el-input__inner {
...@@ -42,6 +41,9 @@ div::-webkit-scrollbar-corner { ...@@ -42,6 +41,9 @@ div::-webkit-scrollbar-corner {
box-shadow: 0 0 10px #3a5f94c9; box-shadow: 0 0 10px #3a5f94c9;
border: 1px solid #3a5f94c9 !important; border: 1px solid #3a5f94c9 !important;
} }
.el-table__body tr:hover > td{
background-color: #89898954 !important;
}
/* 按钮样式 */ /* 按钮样式 */
.myButton { .myButton {
...@@ -169,6 +171,7 @@ div::-webkit-scrollbar-corner { ...@@ -169,6 +171,7 @@ div::-webkit-scrollbar-corner {
border-radius: 0px 11px; border-radius: 0px 11px;
border: 1px solid #47ebe4; border: 1px solid #47ebe4;
animation: clippathss 5s infinite linear; animation: clippathss 5s infinite linear;
pointer-events: none;
} }
&::after { &::after {
...@@ -181,6 +184,7 @@ div::-webkit-scrollbar-corner { ...@@ -181,6 +184,7 @@ div::-webkit-scrollbar-corner {
border-radius: 0px 11px; border-radius: 0px 11px;
border: 1px solid #47ebe4; border: 1px solid #47ebe4;
animation: clippathss 6s infinite linear reverse; animation: clippathss 6s infinite linear reverse;
pointer-events: none;
} }
} }
...@@ -217,6 +221,7 @@ div::-webkit-scrollbar-corner { ...@@ -217,6 +221,7 @@ div::-webkit-scrollbar-corner {
border-radius: 0px 13px; border-radius: 0px 13px;
border: 1px solid #47ebe4; border: 1px solid #47ebe4;
animation: clippathss 5s infinite linear; animation: clippathss 5s infinite linear;
pointer-events: none;
} }
&::after { &::after {
...@@ -229,6 +234,7 @@ div::-webkit-scrollbar-corner { ...@@ -229,6 +234,7 @@ div::-webkit-scrollbar-corner {
border-radius: 0px 13px; border-radius: 0px 13px;
border: 1px solid #47ebe4; border: 1px solid #47ebe4;
animation: clippathss 6s infinite linear reverse; animation: clippathss 6s infinite linear reverse;
pointer-events: none;
} }
} }
...@@ -244,6 +250,7 @@ div::-webkit-scrollbar-corner { ...@@ -244,6 +250,7 @@ div::-webkit-scrollbar-corner {
border-radius: 0px 13px; border-radius: 0px 13px;
border: 1px solid #47ebe4; border: 1px solid #47ebe4;
animation: clippathss 5s infinite linear; animation: clippathss 5s infinite linear;
pointer-events: none;
} }
&::after { &::after {
...@@ -256,6 +263,7 @@ div::-webkit-scrollbar-corner { ...@@ -256,6 +263,7 @@ div::-webkit-scrollbar-corner {
border-radius: 0px 13px; border-radius: 0px 13px;
border: 1px solid #47ebe4; border: 1px solid #47ebe4;
animation: clippathss 6s infinite linear reverse; animation: clippathss 6s infinite linear reverse;
pointer-events: none;
} }
} }
.bk-bmdx-animation { .bk-bmdx-animation {
...@@ -270,6 +278,7 @@ div::-webkit-scrollbar-corner { ...@@ -270,6 +278,7 @@ div::-webkit-scrollbar-corner {
border-radius: 0px 13px; border-radius: 0px 13px;
border: 1.5px dotted #03bdfe; border: 1.5px dotted #03bdfe;
animation: clippathss 6s infinite linear; animation: clippathss 6s infinite linear;
pointer-events: none;
} }
&::after { &::after {
...@@ -282,5 +291,6 @@ div::-webkit-scrollbar-corner { ...@@ -282,5 +291,6 @@ div::-webkit-scrollbar-corner {
border-radius: 0px 13px; border-radius: 0px 13px;
border: 1.5px dotted #03bdfe; border: 1.5px dotted #03bdfe;
animation: clippathss 5s infinite linear reverse; animation: clippathss 5s infinite linear reverse;
pointer-events: none;
} }
} }
\ No newline at end of file
src/components/common/relevance_moudule.vue
View file @ 0e265c1c
...@@ -3,21 +3,21 @@ ...@@ -3,21 +3,21 @@
<div class="rwxx"> <div class="rwxx">
<div class="rwxx-div" @click="rwxq(item, index)" v-for="(item, index) in mb_table"> <div class="rwxx-div" @click="rwxq(item, index)" v-for="(item, index) in mb_table">
<div class="img-div"> <div class="img-div">
<img class="tx-bg" :src="item.photos" :onerror="errimg" /> <img class="tx-bg" :src="!types_?(item.info.avatarUrl==null?'':item.info.avatarUrl):(item.avatarUrl==null?'':item.avatarUrl)" :onerror="errimg" />
</div> </div>
<div class="text-div"> <div class="text-div">
<div class="name-div"> <div class="name-div">
<div class="class1">{{ types_?item.baseProperty["姓名"]:item.baseProperty["部队番号"] }}</div> <div class="class1">{{ types_?item.xm.value:item.info.jgfh.value }}</div>
<div class="class1" style="margin-left: 20px"> <div class="class1" style="margin-left: 20px">
{{ types_?item.baseProperty["外文名"]:item.baseProperty["部队简称"] }} {{ types_?item.wwm.value:item.info.jgjc.value }}
</div> </div>
</div> </div>
<div class="synopsis-div"> <div class="synopsis-div">
<span v-text=' <span v-text='
types_?item.textarea["人物简介"]:item.textarea["机构简介"] == "" || types_?item.textareaProperty["人物简介"].value:item.info.textareaProperty["机构简介"].value == "" ||
types_?item.textarea["人物简介"]:item.textarea["机构简介"] == undefined types_?item.textareaProperty["人物简介"].value:item.info.textareaProperty["机构简介"].value == undefined
? "暂无简介" ? "暂无简介"
: types_?item.textarea["人物简介"]:item.textarea["机构简介"]'></span> : types_?item.textareaProperty["人物简介"].value:item.info.textareaProperty["机构简介"].value'></span>
</div> </div>
</div> </div>
</div> </div>
...@@ -43,98 +43,29 @@ export default { ...@@ -43,98 +43,29 @@ export default {
this.mb_table = []; this.mb_table = [];
}, },
rwxq(item) { rwxq(item) {
if(item.mould=='敌方外网资源机构'||item.mould=='敌方资源机构'||item.mould=='敌方资源'||item.mould=='敌方外网资源'){
if(this.types_){ if(this.types_){
this.$router.push({ name: "人物详情" + this.$route.meta.type_name, params: { key: item,types:true } }); this.$router.push({ name: "人物详情" + this.$route.meta.type_name, params: { key: item,types:true } });
}else{ }else{
this.$router.push({ name: "敌方资源机构详情" + this.$route.meta.type_name, params: { key: item ,types:true } }); this.$router.push({ name: "敌方资源机构详情" + this.$route.meta.type_name, params: { key: item ,types:true } });
} }
}else if(item.mould=='战场环境机构'||item.mould=='战场环境'){
if(this.types_){
this.$router.push({ name: "战场环境人物详情" + this.$route.meta.type_name, params: { key: item } });
}else{
this.$router.push({ name: "战场环境机构详情" + this.$route.meta.type_name, params: { key: item } });
}
}else{
if(this.types_){
this.$router.push({ name: "我方人物详情" + this.$route.meta.type_name, params: { key: item } });
}else{
this.$router.push({ name: "我方资源机构详情" + this.$route.meta.type_name, params: { key: item } });
}
}
}, },
query(name, module_name) { query(name, module_name) {
this.query_tree();
get("api/rest/resource/queryResourceTree?module=" + module_name)
.then((res) => {
let optinon_s = [];
if (res.length > 0) {
optinon_s = this.jsonToArray(res);
} else {
this.optinon_s = [];
}
get(
"api/rest/resource/queryResourceTreeOnline?module="+'敌方外网资源机构'
).then((res) => {
let options_s_online = [];
if (res.length > 0) {
options_s_online = this.jsonToArray(res);
} else {
options_s_online = [];
}
post( post(
`api/rest/resource/queryDynamicCharacter?pageNum=${1}&pageSize=${100}&multiFieldSearch=${name}`, `api/rest/mongo/character/query?pageNum=1&pageSize=100`,
{ {
// mould:"敌方外网资源", module: "DFWW",
// "baseProperty.姓名": name, name:name,
"baseProperty.所在机构": "",
} }
) )
.then((res) => { .then((res) => {
res.list.forEach((item) => { res.records.forEach((item) => {
item.photos = // item.module_names = module_name;
imgUrl + item.baseProperty["photos"];
item.label =
item.extraProperty["标签"] == undefined
? ""
: item.extraProperty["标签"].split("|");
let names = "";
let options_type = [];
this.option_rwmb.find((item1) => {
if (item1.value == item.mouldId) {
names = item1.label;
}
});
if (names == "外网人物模板") {
options_type = options_s_online;
} else {
options_type = optinon_s;
}
if (item.baseProperty["所在机构"] != "") {
this.value_szjg = item.baseProperty["所在机构"];
let jg_names = options_type.find(
(e) => e.code == item.baseProperty["所在机构"]
);
item.baseProperty["所在机构"] =
jg_names == undefined ||
jg_names == "" ||
jg_names == null
? item.baseProperty["所在机构"]
: jg_names.label;
item.baseProperty["所在机构编号"] = this.value_szjg;
}
item.module_names = module_name;
this.mb_table.push(item); this.mb_table.push(item);
}); });
}) })
.catch((err) => { .catch((err) => {
this.$message.warning(err.message); this.$message.warning(err.message);
}); });
});
})
.catch((err) => {
this.$message.warning(err.message);
});
}, },
query_tree(type) { query_tree(type) {
get("api/rest/resource/queryCharacterMould") get("api/rest/resource/queryCharacterMould")
...@@ -169,24 +100,16 @@ export default { ...@@ -169,24 +100,16 @@ export default {
query_qb(name) { query_qb(name) {
this.type_qf = true; this.type_qf = true;
post( post(
`api/rest/resource/queryDynamicOrganization?pageNum=${1}&pageSize=${100}&multiFieldSearch=${name}`, `api/rest/mongo/organization/queryOrganization?pageNum=1&pageSize=100`,
{ {
// mould: this.jgName_public==1?'敌方资源机构':'敌方外网资源机构', module: "DFWW",
// "baseProperty.姓名": name, name:name,
// "baseProperty.所在机构": "",
} }
) )
.then((res) => { .then((res) => {
this.mb_table = []; this.mb_table = [];
if (res.list.length > 0) { if (res.records.length > 0) {
res.list.forEach((item) => { res.records.forEach((item) => {
item.photos =
imgUrl +
item.baseProperty["photos"];
item.labels =
item.extraProperty["标签"] == undefined
? ""
: item.extraProperty["标签"].split("|");
this.mb_table.push(item); this.mb_table.push(item);
}); });
} }
......
src/view/dfzy/dfzyjgk.vue
View file @ 0e265c1c
...@@ -20,9 +20,9 @@ ...@@ -20,9 +20,9 @@
<div class="top-type-div"> <div class="top-type-div">
<div <div
v-for="item in this.type_arr_country" v-for="item in this.type_arr_country"
@click="dq_fun(item.value)" @click="dq_fun(item)"
:class="{ :class="{
'active-CountryRegion': typeCountryRegion == item.value, 'active-CountryRegion': typeCountryRegion.value == item.value,
}" }"
> >
{{ item.name }} {{ item.name }}
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
<div class="top-type-div"> <div class="top-type-div">
<div <div
v-for="item in this.type_arr" v-for="item in this.type_arr"
@click="MilitaryPolitics_fun(item.value)" @click="MilitaryPolitics_fun(item)"
:class="{ :class="{
'active-MilitaryPolitics': 'active-MilitaryPolitics':
typeMilitaryPolitics == item.value, typeMilitaryPolitics.value == item.value,
}" }"
> >
{{ item.name }} {{ item.name }}
...@@ -150,10 +150,10 @@ ...@@ -150,10 +150,10 @@
<div class="text-div"> <div class="text-div">
<div class="name-div"> <div class="name-div">
<div class="top-span"> <div class="top-span">
{{ item.info.bdfh.value }} {{ item.info.jgfh.value }}
</div> </div>
<div class="bottom-span"> <div class="bottom-span">
{{ item.info.bdjc.value }} {{ item.info.jgjc.value }}
</div> </div>
</div> </div>
<!-- <div class="xq-div"> <!-- <div class="xq-div">
...@@ -193,17 +193,17 @@ ...@@ -193,17 +193,17 @@
<div class="gjcx-div" v-show="show"> <div class="gjcx-div" v-show="show">
<el-form :inline="true" :model="formInline" class="demo-form-inline"> <el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item> <el-form-item>
<label>部队番号</label> <label>机构番号</label>
<el-input <el-input
v-model="formInline.name" v-model="formInline.name"
placeholder="部队番号" placeholder="机构番号"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<label>部队简称</label> <label>机构简称</label>
<el-input <el-input
v-model="formInline.jc" v-model="formInline.jc"
placeholder="部队简称" placeholder="机构简称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -329,8 +329,8 @@ export default { ...@@ -329,8 +329,8 @@ export default {
{ name: "政治", value: "2" }, { name: "政治", value: "2" },
], ],
type_rw_jg: 0, type_rw_jg: 0,
typeCountryRegion: "", typeCountryRegion: {value:'',name:''},
typeMilitaryPolitics: "", typeMilitaryPolitics: {value:'',name:''},
tab_actives: "-1", //表格切换 tab_actives: "-1", //表格切换
categoryId: null, categoryId: null,
valueTitle: "", valueTitle: "",
...@@ -344,19 +344,27 @@ export default { ...@@ -344,19 +344,27 @@ export default {
zhcx(pageNum) { zhcx(pageNum) {
this.input3 = ""; this.input3 = "";
this.type_qf = 3; this.type_qf = 3;
this.typeCountryRegion = {value:'',name:''};
this.typeMilitaryPolitics = {value:'',name:''};
this.pageInfo.current_page = pageNum; this.pageInfo.current_page = pageNum;
let pageSize = this.pageInfo.pageSize; let pageSize = this.pageInfo.pageSize;
if(this.jgName_public==1){
this.value_select = 1
}else{
this.value_select = 4
}
post( post(
`api/rest/mongo/organization/queryOrganization?pageNum=${pageNum}&pageSize=${pageSize}`, `api/rest/mongo/organization/queryOrganization?pageNum=${pageNum}&pageSize=${pageSize}`,
{ {
module: this.jgName_public == 1 ? "DF" : "DFWW", module: this.jgName_public == 1 ? "DF" : "DFWW",
"bdfh": this.formInline.name, combinationSearch:{
"bdjc": this.formInline.jc, jgfh: this.formInline.name,
"gjdq": this.formInline.gj, jgjc: this.formInline.jc,
"textarea.'机构简介'": this.formInline.jgjj, gjdq: this.formInline.gj,
"extraProperty.'标签'": this.formInline.bq, jgjj: this.formInline.jgjj,
"extraProperty.'重要性'": this.formInline.zyx, bq: this.formInline.bq,
// "baseProperty.所在机构": "", zyx: this.formInline.zyx,
}
} }
).then((res) => { ).then((res) => {
this.rwkxx = []; this.rwkxx = [];
...@@ -467,11 +475,19 @@ export default { ...@@ -467,11 +475,19 @@ export default {
this.pageInfo.current_page = pageNum; this.pageInfo.current_page = pageNum;
let pageSize = this.pageInfo.pageSize; let pageSize = this.pageInfo.pageSize;
let name = this.input3; let name = this.input3;
if(this.jgName_public==1){
this.value_select = 1
}else{
this.value_select = 4
}
post( post(
`api/rest/mongo/organization/queryOrganization?pageNum=${pageNum}&pageSize=${pageSize}`, `api/rest/mongo/organization/queryOrganization?pageNum=${pageNum}&pageSize=${pageSize}`,
{ {
module: this.jgName_public == 1 ? "DF" : "DFWW", module: this.jgName_public == 1 ? "DF" : "DFWW",
name:name, name:name,
type:this.typeMilitaryPolitics.name,
nation:this.typeCountryRegion.name,
} }
).then((res) => { ).then((res) => {
this.rwkxx = []; this.rwkxx = [];
...@@ -488,6 +504,14 @@ export default { ...@@ -488,6 +504,14 @@ export default {
}, },
query(pageNum) {//查询当前机构下的子机构 query(pageNum) {//查询当前机构下的子机构
this.formInline = {
name: "",
jc: "",
gj: "",
jgjj: "",
bq: "",
};
this.input3 = '';
this.pageInfo.current_page = pageNum; this.pageInfo.current_page = pageNum;
let pageSize = this.pageInfo.pageSize; let pageSize = this.pageInfo.pageSize;
let ids = ""; let ids = "";
...@@ -576,11 +600,21 @@ export default { ...@@ -576,11 +600,21 @@ export default {
}, },
/**国家地区切换 */ /**国家地区切换 */
dq_fun(e) { dq_fun(e) {
if(this.typeCountryRegion.value==e.value){
this.typeCountryRegion = {value:'',name:''};
}else{
this.typeCountryRegion = e; this.typeCountryRegion = e;
}
this.query_qb(1);
}, },
/**军事政治类型切换 */ /**军事政治类型切换 */
MilitaryPolitics_fun(e) { MilitaryPolitics_fun(e) {
if(this.typeMilitaryPolitics.value==e.value){
this.typeMilitaryPolitics = {value:'',name:''};
}else{
this.typeMilitaryPolitics = e; this.typeMilitaryPolitics = e;
}
this.query_qb(1);
}, },
/**人物机构切换 */ /**人物机构切换 */
qh_type_rwjg(e) { qh_type_rwjg(e) {
...@@ -816,7 +850,19 @@ export default { ...@@ -816,7 +850,19 @@ export default {
background-size: 100% 100%; background-size: 100% 100%;
cursor: pointer; cursor: pointer;
// transform: perspective(1000px); // transform: perspective(1000px);
.img-div{
animation:scaleDraw ease-in-out infinite 1.5s alternate;
}
}
@keyframes scaleDraw {
0%{
transform: scale(1);
}
100%{
transform: scale(1.1);
}
} }
.tilts:hover { .tilts:hover {
// transform-style: preserve-3d; // transform-style: preserve-3d;
background-image: url("../../assets/img/dfzy/new/3.png"); background-image: url("../../assets/img/dfzy/new/3.png");
...@@ -834,11 +880,11 @@ export default { ...@@ -834,11 +880,11 @@ export default {
.name-div{ .name-div{
background-image: url("../../assets/img/dfzy/new/5.png"); background-image: url("../../assets/img/dfzy/new/5.png");
} }
.top-span { // .top-span {
background: linear-gradient(to bottom, #fffe7f, #54ff88); // background: linear-gradient(to bottom, #fffe7f, #54ff88);
-webkit-background-clip: text; // -webkit-background-clip: text;
color: transparent; // color: transparent;
} // }
} }
.img-div { .img-div {
width: 70px; width: 70px;
......
src/view/dfzy/dfzyrwk.vue
View file @ 0e265c1c
This diff is collapsed.
src/view/dfzy/jq_xq_dfzy.vue
View file @ 0e265c1c
This diff is collapsed.
src/view/dfzy/news_info_dfzy.vue
View file @ 0e265c1c
...@@ -251,7 +251,7 @@ export default { ...@@ -251,7 +251,7 @@ export default {
}, },
xgtj_news(id){ xgtj_news(id){
this.xgtj_news_data = []; this.xgtj_news_data = [];
post("api/rest/fulltext/queryRecommendNews?id="+id) post("api/rest/elastic/queryRecommendNews?id="+id)
.then(res => { .then(res => {
if(res.length>0){ if(res.length>0){
this.xgtj_news_data = res; this.xgtj_news_data = res;
...@@ -270,7 +270,7 @@ export default { ...@@ -270,7 +270,7 @@ export default {
// 点击导出word // 点击导出word
exportWord: function () { exportWord: function () {
//后台下载 //后台下载
fileDownload("api/rest/fulltext/"+this.$route.params.key3=='新闻'?'exportNews':'exportThinkTank'+"?id=" + this.getNews.id, this.tmpTitle ? this.tmpTitle : '未知', 'doc'); fileDownload("api/rest/elastic/"+(this.$route.params.key3=='新闻'?'exportNews':'exportThinkTank')+"?id=" + this.getNews.id, this.tmpTitle ? this.tmpTitle : '未知', 'doc');
}, },
copy(val) { copy(val) {
let clipboard = ""; let clipboard = "";
...@@ -338,20 +338,19 @@ export default { ...@@ -338,20 +338,19 @@ export default {
this.state = ''; this.state = '';
this.dialogVisibleOrganization = true; this.dialogVisibleOrganization = true;
}, },
querySearchAsync(queryString, cb) { querySearchAsync(queryString, cb) {
let personList = []; let personList = [];
post( post(
`api/rest/resource/queryDynamicCharacter?pageNum=1&pageSize=100&multiFieldSearch=`+queryString, `api/rest/mongo/character/query?pageNum=1&pageSize=100`,
{ {
mould: "敌方资源", module:'DF',
// "baseProperty.姓名": queryString name:queryString,
} }
).then(res => { ).then(res => {
res.list.forEach(item => { res.records.forEach(item => {
let personObj = {}; let personObj = {};
personObj['value'] = item.baseProperty.姓名; personObj['value'] = item.xm.value;
personObj['address'] = item._id; personObj['address'] = item.rwbh.value;
personList.push(personObj); personList.push(personObj);
}) })
// var results = queryString ? personList.filter(this.createStateFilter(queryString)) : personList; // var results = queryString ? personList.filter(this.createStateFilter(queryString)) : personList;
...@@ -359,19 +358,22 @@ export default { ...@@ -359,19 +358,22 @@ export default {
this.timeout = setTimeout(() => { this.timeout = setTimeout(() => {
cb(personList); cb(personList);
}, 3000 * Math.random()); }, 3000 * Math.random());
})
.catch((err)=>{
this.$message.warning(err.message);
}); });
post( post(
`api/rest/resource/queryDynamicCharacter?pageNum=1&pageSize=100&multiFieldSearch=`+queryString, `api/rest/mongo/character/query?pageNum=1&pageSize=100`,
{ {
mould: "敌方外网资源", module:'DFWW',
// "baseProperty.姓名": queryString name:queryString,
} }
).then(res => { ).then(res => {
res.list.forEach(item => { res.records.forEach(item => {
let personObj = {}; let personObj = {};
personObj['value'] = item.baseProperty.姓名; personObj['value'] = item.xm.value;
personObj['address'] = item._id; personObj['address'] = item.rwbh.value;
personList.push(personObj); personList.push(personObj);
}) })
// var results = queryString ? personList.filter(this.createStateFilter(queryString)) : personList; // var results = queryString ? personList.filter(this.createStateFilter(queryString)) : personList;
...@@ -379,20 +381,24 @@ export default { ...@@ -379,20 +381,24 @@ export default {
this.timeout = setTimeout(() => { this.timeout = setTimeout(() => {
cb(personList); cb(personList);
}, 3000 * Math.random()); }, 3000 * Math.random());
})
.catch((err)=>{
this.$message.warning(err.message);
}); });
}, },
querySearchAsyncOrganization(queryString, cb) { querySearchAsyncOrganization(queryString, cb) {
let organizationList = []; let organizationList = [];
post( post(
"api/rest/resource/queryDynamicOrganization?pageNum=1&pageSize=100&multiFieldSearch="+queryString, `api/rest/mongo/organization/queryOrganization?pageNum=1&pageSize=100`,
{ {
mould: "敌方外网资源机构", module: "DFWW",
name:queryString,
} }
).then(res => { ).then(res => {
res.list.forEach(item => { res.records.forEach(item => {
let organizationObj = {}; let organizationObj = {};
organizationObj['value'] = item.baseProperty.部队番号; organizationObj['value'] = item.jgfh.value;
organizationObj['address'] = item._id; organizationObj['address'] = item.jgbh.value;
organizationList.push(organizationObj); organizationList.push(organizationObj);
}) })
// var results = queryString ? organizationList.filter(this.createStateFilter(queryString)) : organizationList; // var results = queryString ? organizationList.filter(this.createStateFilter(queryString)) : organizationList;
...@@ -400,17 +406,21 @@ export default { ...@@ -400,17 +406,21 @@ export default {
this.timeout = setTimeout(() => { this.timeout = setTimeout(() => {
cb(organizationList); cb(organizationList);
}, 3000 * Math.random()); }, 3000 * Math.random());
})
.catch((err)=>{
this.$message.warning(err.message);
}); });
post( post(
"api/rest/resource/queryDynamicOrganization?pageNum=1&pageSize=100&multiFieldSearch="+queryString, `api/rest/mongo/organization/queryOrganization?pageNum=1&pageSize=100`,
{ {
mould: "敌方资源机构", module: "DF",
name:queryString,
} }
).then(res => { ).then(res => {
res.list.forEach(item => { res.records.forEach(item => {
let organizationObj = {}; let organizationObj = {};
organizationObj['value'] = item.baseProperty.部队番号; organizationObj['value'] = item.jgfh.value;
organizationObj['address'] = item._id; organizationObj['address'] = item.jgbh.value;
organizationList.push(organizationObj); organizationList.push(organizationObj);
}) })
// var results = queryString ? organizationList.filter(this.createStateFilter(queryString)) : organizationList; // var results = queryString ? organizationList.filter(this.createStateFilter(queryString)) : organizationList;
...@@ -418,6 +428,9 @@ export default { ...@@ -418,6 +428,9 @@ export default {
this.timeout = setTimeout(() => { this.timeout = setTimeout(() => {
cb(organizationList); cb(organizationList);
}, 3000 * Math.random()); }, 3000 * Math.random());
})
.catch((err)=>{
this.$message.warning(err.message);
}); });
}, },
createStateFilter(queryString) { createStateFilter(queryString) {
...@@ -436,7 +449,7 @@ export default { ...@@ -436,7 +449,7 @@ export default {
obj['subject'] = this.pickItem.address; obj['subject'] = this.pickItem.address;
obj['relation'] = this.personType; obj['relation'] = this.personType;
obj['objectType'] = '新闻'; obj['objectType'] = '新闻';
post(`api/rest/resource/addRelatedInfo`, obj).then(res => { post(`api/rest/3z/resource/addRelatedInfo`, obj).then(res => {
if (res == 1) { if (res == 1) {
this.$message.success('关联人员成功！'); this.$message.success('关联人员成功！');
this.dialogVisiblePerson = false; this.dialogVisiblePerson = false;
...@@ -456,7 +469,7 @@ export default { ...@@ -456,7 +469,7 @@ export default {
obj['subject'] = this.pickItem.address; obj['subject'] = this.pickItem.address;
obj['relation'] = this.organizationType; obj['relation'] = this.organizationType;
obj['objectType'] = '新闻'; obj['objectType'] = '新闻';
post(`api/rest/resource/addRelatedInfo`, obj).then(res => { post(`api/rest/3z/resource/addRelatedInfo`, obj).then(res => {
if (res == 1) { if (res == 1) {
this.$message.success('关联机构成功！'); this.$message.success('关联机构成功！');
this.dialogVisibleOrganization = false; this.dialogVisibleOrganization = false;
...@@ -473,7 +486,7 @@ export default { ...@@ -473,7 +486,7 @@ export default {
//收藏 //收藏
//查询收藏目录 //查询收藏目录
searchCollectionFolder() { searchCollectionFolder() {
get('api/rest/resource/queryCollectionFolder?collector=' + this.userInfo.account).then(res => { get('api/rest/3z/resource/queryCollectionFolder?collector=' + this.userInfo.account).then(res => {
this.collectionFolder = res; this.collectionFolder = res;
}) })
}, },
...@@ -549,7 +562,7 @@ export default { ...@@ -549,7 +562,7 @@ export default {
this.myChart1 == null; this.myChart1 == null;
this.echarts_1([]); this.echarts_1([]);
if (this.$route.params.key != null) { if (this.$route.params.key != null) {
get("api/rest/fulltext/"+this.$route.params.key2+"?Id=" + this.$route.params.key) get("api/rest/elastic/"+this.$route.params.key2+"?id=" + this.$route.params.key)
.then((res) => { .then((res) => {
if(res==null){ if(res==null){
this.$message.warning('关联的新闻已删除'); this.$message.warning('关联的新闻已删除');
......
src/view/dfzy/rw_info.vue
View file @ 0e265c1c
This diff is collapsed.
src/view/home.vue
View file @ 0e265c1c
...@@ -497,7 +497,7 @@ export default { ...@@ -497,7 +497,7 @@ export default {
.home-content { .home-content {
width: 100%; width: 100%;
height: calc(100% - 120px); height: calc(100% - 200px);
padding: 0px 60px; padding: 0px 60px;
background-color: transparent; background-color: transparent;
} }
......
src/view/homepage.vue
View file @ 0e265c1c
...@@ -409,6 +409,7 @@ export default { ...@@ -409,6 +409,7 @@ export default {
border-radius: 13px; border-radius: 13px;
border: 1px solid #17ab9e; border: 1px solid #17ab9e;
animation: clippathss 12s infinite linear; animation: clippathss 12s infinite linear;
pointer-events: none;
} }
&::after { &::after {
...@@ -421,6 +422,7 @@ export default { ...@@ -421,6 +422,7 @@ export default {
border-radius: 13px; border-radius: 13px;
border: 1px solid #1598c5; border: 1px solid #1598c5;
animation: clippathss 12s infinite linear reverse; animation: clippathss 12s infinite linear reverse;
pointer-events: none;
} }
} }
......
src/view/sjgl/dfzygl.vue
View file @ 0e265c1c
...@@ -141,49 +141,8 @@ export default { ...@@ -141,49 +141,8 @@ export default {
clientDetails_wx_data: {}, clientDetails_wx_data: {},
type_node: "", type_node: "",
arr_table_comment_rwk:{ arr_table_comment_rwk:{
sfzhm:'',
jgzhm:'',
jb:'',
rwbh:'',
xm:'',
wwm:'',
szjg:'',
xb:'',
mz:'',
jg:'',
csrq:'',
rwrq:'',
dyxl:'',
bdfh:'',
whcd:'',
zzmm:'',
jxdj:'',
rxjxsj:'',
xzzw:'',
rxzwsj:'',
gwzwcj:'',
rxzjsj:'',
avatar:'',
}, },
arr_table_comment_jgk:{ arr_table_comment_jgk:{
bddh:'',
bdfh:'',
jgbh:'',
bdfc:'',
bzfh:'',
bdjc:'',
zsdh:'',
mj:'',
bdlb:'',
bz:'',
gjdq:'',
jz:'',
dm:'',
jdqf:'',
qbtgdw:'',
bddj:'',
zbdj:'',
avatar:'',
}, },
editableTabsValue:"", editableTabsValue:"",
rules: { rules: {
...@@ -247,16 +206,16 @@ export default { ...@@ -247,16 +206,16 @@ export default {
}); });
return; return;
} else { } else {
let arr_item = this.arr_table_comment_jgk; let extraProperty = ['标签','重要性','Twitter账号','Facebook账号'];
let textareaProperty = ['机构简介'];
if (this.type_node == 'CHARACTER') { if (this.type_node == 'CHARACTER') {
arr_item = this.arr_table_comment_rwk; textareaProperty = ['人物简介'];
} }
let paramDatas = { let paramDatas = {
...arr_item, extraProperty: extraProperty,
extraProperty: [],
tableProperty: [], tableProperty: [],
name: this.form_add_type.mbmc.trim(), name: this.form_add_type.mbmc.trim(),
textareaProperty: [], textareaProperty: textareaProperty,
id: uuid(32, 32), id: uuid(32, 32),
type: this.type_node, type: this.type_node,
}; };
......
src/view/sjgl/gxt.vue
View file @ 0e265c1c
...@@ -179,7 +179,7 @@ export default { ...@@ -179,7 +179,7 @@ export default {
arr_z.forEach((item,index) => { arr_z.forEach((item,index) => {
let idp = arr_entity.filter(e=>e.uuid ==arr_p[index].uuid)[0].meaningTag; 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 idq = arr_entity.filter(e=>e.uuid ==arr_q[index].uuid)[0].meaningTag;
let img_url = imgUrl + arr_q[index].img; let img_url = arr_q[index].imgUrl==undefined?'':arr_q[index].imgUrl;
arr_nodes.nodes.push({ arr_nodes.nodes.push({
id: idq, id: idq,
// name: item.name, // name: item.name,
...@@ -238,7 +238,7 @@ export default { ...@@ -238,7 +238,7 @@ export default {
let arr_nodes = {};//所有节点以及线的集合 let arr_nodes = {};//所有节点以及线的集合
let arr_entity = []; let arr_entity = [];
if(data.p.length>0){ if(data.p.length>0){
let img_url = imgUrl + data.p[0].img; let img_url = data.p[0].imgUrl==undefined?'':data.p[0].imgUrl;
let arr_nodes_ccjz = {//当前主节点的属性 let arr_nodes_ccjz = {//当前主节点的属性
rootId: data.p[0].meaningTag, rootId: data.p[0].meaningTag,
nodes: [ nodes: [
......
src/view/sjgl/jg_xq.vue
View file @ 0e265c1c
This diff is collapsed.
src/view/sjgl/jgk_data_public.vue
View file @ 0e265c1c
This diff is collapsed.
src/view/sjgl/jgk_mb_public.vue
View file @ 0e265c1c
...@@ -33,51 +33,15 @@ ...@@ -33,51 +33,15 @@
<td class="pub-td2"></td> <td class="pub-td2"></td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">部队代号</td> <td class="pub-td1">机构番号</td>
<td class="pub-td2"></td> <td class="pub-td2"></td>
<td class="pub-td1">部队泛称</td> <td class="pub-td1">机构简称</td>
<td class="pub-td2"></td> <td class="pub-td2"></td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">部队番号</td>
<td class="pub-td2"></td>
<td class="pub-td1">部队简称</td>
<td class="pub-td2"></td>
</tr>
<tr>
<td class="pub-td1">编制番号</td>
<td class="pub-td2"></td>
<td class="pub-td1">战时代号</td>
<td class="pub-td2"></td>
</tr>
<tr>
<td class="pub-td1">密级</td>
<td class="pub-td2"></td>
<td class="pub-td1">部队类别</td>
<td class="pub-td2"></td>
</tr>
<tr>
<td class="pub-td1">兵种</td>
<td class="pub-td2"></td>
<td class="pub-td1">国家地区</td> <td class="pub-td1">国家地区</td>
<td class="pub-td2"></td> <td class="pub-td2"></td>
</tr> <td class="pub-td1">机构类别</td>
<tr>
<td class="pub-td1">军种</td>
<td class="pub-td2"></td>
<td class="pub-td1">地名</td>
<td class="pub-td2"></td>
</tr>
<tr>
<td class="pub-td1">军队区分</td>
<td class="pub-td2"></td>
<td class="pub-td1">情报提供单位</td>
<td class="pub-td2"></td>
</tr>
<tr>
<td class="pub-td1">部队等级</td>
<td class="pub-td2"></td>
<td class="pub-td1">战备等级</td>
<td class="pub-td2"></td> <td class="pub-td2"></td>
</tr> </tr>
<tr v-for="(item, index) in xzzd" style="position: relative"> <tr v-for="(item, index) in xzzd" style="position: relative">
...@@ -87,7 +51,7 @@ ...@@ -87,7 +51,7 @@
class="el-icon-remove" class="el-icon-remove"
title="删除此字段" title="删除此字段"
@click="remove_zd(index)" @click="remove_zd(index)"
v-if="edit_switch" v-if="edit_switch && item.comment!='标签' && item.comment!='重要性' && item.comment!='Twitter账号'"
></i> ></i>
<div class="button-div"> <div class="button-div">
<el-button <el-button
...@@ -139,7 +103,7 @@ ...@@ -139,7 +103,7 @@
type="danger" type="danger"
@click="remove_wzmk(index)" @click="remove_wzmk(index)"
size="mini" size="mini"
v-if="edit_switch" v-if="edit_switch && item.comment!='机构简介'"
>删除</el-button >删除</el-button
> >
<!-- <el-button <!-- <el-button
...@@ -388,14 +352,25 @@ export default { ...@@ -388,14 +352,25 @@ export default {
dialogVisible_wzms_edit: false, dialogVisible_wzms_edit: false,
dialogVisible_table: false, dialogVisible_table: false,
dialogVisible_type: false, dialogVisible_type: false,
xzzd: [], xzzd: [
{comment:'标签',},
{comment:'重要性'},
{comment:'Twitter账号'},
// {comment:'Facebook账号'},
],
form_add: { form_add: {
comment: "", comment: "",
}, },
form_edit: { form_edit: {
comment: "", comment: "",
}, },
wzmk_data: [], wzmk_data: [
{
comment:'机构简介',
type:'1',
table_tab: [],
}
],
form_add_wzms: { form_add_wzms: {
comment: "", comment: "",
style: "1", style: "1",
...@@ -412,64 +387,19 @@ export default { ...@@ -412,64 +387,19 @@ export default {
arr_table_comment_ww: [ arr_table_comment_ww: [
{ comment: "机构编号" }, { comment: "机构编号" },
{ comment: "上级机构编号" }, { comment: "上级机构编号" },
{ comment: "部队代号" }, { comment: "机构番号" },
{ comment: "部队番号" }, { comment: "机构简称" },
{ comment: "部队泛称" },
{ comment: "编制番号" },
{ comment: "部队简称" },
{ comment: "战时代号" },
{ comment: "密级" },
{ comment: "部队类别" },
{ comment: "兵种" },
{ comment: "国家地区" }, { comment: "国家地区" },
{ comment: "军种" }, { comment: "机构类别" },
{ comment: "地名" },
{ comment: "军队区分" },
{ comment: "情报提供单位" },
{ comment: "部队等级" },
{ comment: "战备等级" },
],//外网字段 ],//外网字段
arr_table_comment_nw: [
{ comment: "机构编号" },
{ comment: "上级机构编号" },
{ comment: "部队内码" },
{ comment: "部队序号" },
{ comment: "编制序号" },
{ comment: "编制番号" },
{ comment: "编制简称" },
{ comment: "部队代号" },
{ comment: "部队番号" },
{ comment: "部队简称" },
{ comment: "武装力量区分" },
{ comment: "军种" },
{ comment: "兵种" },
{ comment: "级别" },
{ comment: "部队类别" },
{ comment: "建制类别" },
{ comment: "编成类别" },
{ comment: "隶属战区" },
{ comment: "保障区" },
{ comment: "供应性质" },
],//内网字段
arr_table_comment_jgk:{ arr_table_comment_jgk:{
bddh:'',
bdfh:'',
jgbh:'', jgbh:'',
bdfc:'', sjjgbh:'',
bzfh:'', jgfh:'',
bdjc:'', gjjc:'',
zsdh:'',
mj:'',
bdlb:'',
bz:'',
gjdq:'', gjdq:'',
jz:'', jglb:'',
dm:'', avatar:'',
jdqf:'',
qbtgdw:'',
bddj:'',
zbdj:'',
photos:'',
}, },
current: { currentNodeKey: "", currentNodeName: "",currentModuleName:"" }, //915O88LL4LVPL0IB60CBS306Q745S3LE current: { currentNodeKey: "", currentNodeName: "",currentModuleName:"" }, //915O88LL4LVPL0IB60CBS306Q745S3LE
edit_switch: false, edit_switch: false,
...@@ -486,7 +416,6 @@ export default { ...@@ -486,7 +416,6 @@ export default {
let arr_multiHeader = []; let arr_multiHeader = [];
let arr_tHeader = []; let arr_tHeader = [];
let arr_JH = []; let arr_JH = [];
this.arr_table_comment.forEach((item) => { this.arr_table_comment.forEach((item) => {
arr_JH.push(item.comment); arr_JH.push(item.comment);
}); });
...@@ -510,7 +439,6 @@ export default { ...@@ -510,7 +439,6 @@ export default {
}); });
arr_multiHeader.unshift(arr_JH); arr_multiHeader.unshift(arr_JH);
arr_tHeader.unshift("基础信息列表"); arr_tHeader.unshift("基础信息列表");
console.log(12);
// return // return
import("../../util/Export2Excel").then((excel) => { import("../../util/Export2Excel").then((excel) => {
const multiHeader2 = arr_multiHeader; const multiHeader2 = arr_multiHeader;
...@@ -649,10 +577,8 @@ export default { ...@@ -649,10 +577,8 @@ export default {
let arr = this.wzmk_data[index]; let arr = this.wzmk_data[index];
let arr1 = this.wzmk_data.splice(index, 1); let arr1 = this.wzmk_data.splice(index, 1);
this.wzmk_data.push(arr); this.wzmk_data.push(arr);
// this.swapArray(index,this.wzmk_data.length-1);
} else if (inx == 4) { } else if (inx == 4) {
//置顶 //置顶
// this.swapArray(index,0);
let arr = this.wzmk_data[index]; let arr = this.wzmk_data[index];
let arr1 = this.wzmk_data.splice(index, 1); let arr1 = this.wzmk_data.splice(index, 1);
this.wzmk_data.splice(0, 0, arr); this.wzmk_data.splice(0, 0, arr);
...@@ -972,7 +898,6 @@ export default { ...@@ -972,7 +898,6 @@ export default {
this.current.currentNodeName = val.NodeName; this.current.currentNodeName = val.NodeName;
this.current.currentNodeKey = val.NodeKey; this.current.currentNodeKey = val.NodeKey;
this.current.currentModuleName = val.moduleName; this.current.currentModuleName = val.moduleName;
// this.current.currentModuleName=='敌方资源'||this.current.currentModuleName=='战场环境'?this.arr_table_comment = this.arr_table_comment_ww:this.arr_table_comment = this.arr_table_comment_nw
this.arr_table_comment = this.arr_table_comment_ww; this.arr_table_comment = this.arr_table_comment_ww;
this.s_switch = val.type; this.s_switch = val.type;
this.edit_switch = false; this.edit_switch = false;
......
src/view/sjgl/news_info.vue
View file @ 0e265c1c
...@@ -298,7 +298,7 @@ export default { ...@@ -298,7 +298,7 @@ export default {
// 点击导出word // 点击导出word
exportWord: function () { exportWord: function () {
//后台下载 //后台下载
fileDownload("api/rest/fulltext/exportNews?id=" + this.getNews.id, this.tmpTitle ? this.tmpTitle : '未知', 'doc'); fileDownload("api/rest/elastic/exportNews?id=" + this.getNews.id, this.tmpTitle ? this.tmpTitle : '未知', 'doc');
}, },
copy(val) { copy(val) {
let clipboard = ""; let clipboard = "";
......
src/view/sjgl/rw_xq.vue
View file @ 0e265c1c
This diff is collapsed.
src/view/sjgl/rwk_data_public.vue
View file @ 0e265c1c
This diff is collapsed.
src/view/sjgl/rwk_mb_public.vue
View file @ 0e265c1c
...@@ -27,16 +27,10 @@ ...@@ -27,16 +27,10 @@
</div> </div>
<table class="table_jbxx"> <table class="table_jbxx">
<tr> <tr>
<td class="pub-td1">身份证号码</td>
<td class="pub-td2"></td>
<td class="pub-td1">军官证号码</td>
<td class="pub-td2"></td>
</tr>
<tr>
<td class="pub-td1">级别</td>
<td class="pub-td2"></td>
<td class="pub-td1">人物编号</td> <td class="pub-td1">人物编号</td>
<td class="pub-td2"></td> <td class="pub-td2"></td>
<td class="pub-td1">所在机构</td>
<td class="pub-td2"></td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">姓名</td> <td class="pub-td1">姓名</td>
...@@ -45,59 +39,21 @@ ...@@ -45,59 +39,21 @@
<td class="pub-td2"></td> <td class="pub-td2"></td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">所在机构</td> <td class="pub-td1">行政职务</td>
<td colspan="3" class="pub-td2"></td>
</tr>
<tr>
<td class="pub-td1">性别</td>
<td class="pub-td2"></td> <td class="pub-td2"></td>
<td class="pub-td1">民族</td> <td class="pub-td1">民族</td>
<td class="pub-td2"></td> <td class="pub-td2"></td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">籍贯</td> <td class="pub-td1">性别</td>
<td class="pub-td2"></td> <td class="pub-td2" ></td>
<td class="pub-td1">出生日期</td> <td class="pub-td1">出生日期</td>
<td class="pub-td2"></td> <td class="pub-td2" ></td>
</tr>
<tr>
<td class="pub-td1">入伍日期</td>
<td class="pub-td2"></td>
<td class="pub-td1">第一学历</td>
<td class="pub-td2"></td>
</tr>
<tr>
<td class="pub-td1">部队番号</td>
<td class="pub-td2" colspan="3"></td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">文化程度</td> <td class="pub-td1">籍贯</td>
<td class="pub-td2"></td>
<td class="pub-td1">政治面貌</td>
<td class="pub-td2"></td>
</tr>
<tr>
<td class="pub-td1">军衔等级</td>
<td class="pub-td2"></td>
<td class="pub-td1">任现军衔时间</td>
<td class="pub-td2"></td>
</tr>
<tr>
<td class="pub-td1">行政职务</td>
<td class="pub-td2"></td>
<td class="pub-td1">任现职务时间</td>
<td class="pub-td2"></td>
</tr>
<tr>
<td class="pub-td1">岗位职务层级</td>
<td class="pub-td2"></td>
<td class="pub-td1">任现职务时间</td>
<td class="pub-td2"></td>
</tr>
<tr>
<td class="pub-td1">岗位职务层级</td>
<td class="pub-td2"></td> <td class="pub-td2"></td>
<td class="pub-td1">任现职级时间</td> <td class="pub-td1">人物类别</td>
<td class="pub-td2"></td> <td class="pub-td2"></td>
</tr> </tr>
<tr v-for="(item, index) in xzzd" style="position: relative"> <tr v-for="(item, index) in xzzd" style="position: relative">
...@@ -107,7 +63,7 @@ ...@@ -107,7 +63,7 @@
class="el-icon-remove" class="el-icon-remove"
title="删除此字段" title="删除此字段"
@click="remove_zd(index)" @click="remove_zd(index)"
v-if="edit_switch" v-if="edit_switch && item.comment!='标签' && item.comment!='重要性' && item.comment!='Twitter账号'"
></i> ></i>
<!-- <i <!-- <i
class="el-icon-edit" class="el-icon-edit"
...@@ -175,7 +131,7 @@ ...@@ -175,7 +131,7 @@
type="danger" type="danger"
@click="remove_wzmk(index)" @click="remove_wzmk(index)"
size="mini" size="mini"
v-if="edit_switch" v-if="edit_switch && item.comment!='人物简介'"
>删除</el-button >删除</el-button
> >
<!-- <el-button <!-- <el-button
...@@ -430,14 +386,25 @@ export default { ...@@ -430,14 +386,25 @@ export default {
dialogVisible_wzms_edit: false, dialogVisible_wzms_edit: false,
dialogVisible_table: false, dialogVisible_table: false,
dialogVisible_type: false, dialogVisible_type: false,
xzzd: [], xzzd: [
{comment:'标签',},
{comment:'重要性'},
{comment:'Twitter账号'},
// {comment:'Facebook账号'},
],
form_add: { form_add: {
comment: "", comment: "",
}, },
form_edit: { form_edit: {
comment: "", comment: "",
}, },
wzmk_data: [], wzmk_data: [
{
comment:'人物简介',
type:'1',
table_tab: [],
}
],
form_add_wzms: { form_add_wzms: {
comment: "", comment: "",
style: "1", style: "1",
...@@ -445,15 +412,6 @@ export default { ...@@ -445,15 +412,6 @@ export default {
form_edit_wzms: { form_edit_wzms: {
comment: "", comment: "",
}, },
// xgrw_data: [
// { title: "美国总统拜登" },
// { title: "美国总统拜登" },
// { title: "美国总统拜登" },
// { title: "美国总统拜登" },
// { title: "美国总统拜登" },
// { title: "美国总统拜登" },
// { title: "美国总统拜登" },
// ],
form_add_table: { form_add_table: {
comment: "", comment: "",
}, },
...@@ -461,29 +419,16 @@ export default { ...@@ -461,29 +419,16 @@ export default {
index_bk_edit: "", //板块编辑的index index_bk_edit: "", //板块编辑的index
index_people_edit: "", //基础编辑的index index_people_edit: "", //基础编辑的index
arr_table_comment: [ arr_table_comment: [
{ comment: "身份证号码" },
{ comment: "军官证号码" },
{ comment: "级别" },
{ comment: "人物编号" }, { comment: "人物编号" },
{ comment: "所在机构" },
{ comment: "姓名" }, { comment: "姓名" },
{ comment: "外文名" }, { comment: "外文名" },
{ comment: "所在机构" }, { comment: "行政职务" },
{ comment: "性别" },
{ comment: "民族" }, { comment: "民族" },
{ comment: "籍贯" }, { comment: "性别" },
{ comment: "出生日期" }, { comment: "出生日期" },
{ comment: "入伍日期" }, { comment: "籍贯" },
{ comment: "第一学历" }, { comment: "人物类别" },
{ comment: "部队番号" },
{ comment: "文化程度" },
{ comment: "政治面貌" },
{ comment: "军衔等级" },
{ comment: "任现军衔时间" },
{ comment: "行政职务" },
{ comment: "任现职务时间" },
{ comment: "岗位职务层级" },
{ comment: "任现职级时间" },
// { comment: "photos" },
], ],
arr_table_comment_rwk:{ arr_table_comment_rwk:{
sfzhm:'', sfzhm:'',
......
src/view/yqjc/external_info.vue
View file @ 0e265c1c
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<span><i class="el-icon-star-on"></i><span v-text="data_info[0].feeling"></span></span>&emsp; <span><i class="el-icon-star-on"></i><span v-text="data_info[0].feeling"></span></span>&emsp;
<span repeat feeling comment><i class="el-icon-chat-dot-square"></i><span v-text="data_info[0].comment"></span></span>&emsp; <span repeat feeling comment><i class="el-icon-chat-dot-square"></i><span v-text="data_info[0].comment"></span></span>&emsp;
</div> </div>
<div class="left-part-center-left" > <div class="left-part-center-left" v-infinite-scroll="load">
<li v-for="(item, index) in message"> <li v-for="(item, index) in message">
<img class="figure" v-show="item.img!=''&&item.img!=undefined" :src="item.img" alt="" /> <img class="figure" v-show="item.img!=''&&item.img!=undefined" :src="item.img" alt="" />
<i class="el-icon-s-custom figure" v-show="item.img==''||item.img==undefined"></i> <i class="el-icon-s-custom figure" v-show="item.img==''||item.img==undefined"></i>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</div> </div>
</div> </div>
<div class="right-part"> <div class="right-part">
<img class="figure" :src="imgHead" alt="" /> <img class="figure" :src="imgHead" alt="" :onerror="errimg"/>
<table> <table>
<tr> <tr>
<td>发文数</td> <td>发文数</td>
...@@ -215,14 +215,14 @@ ...@@ -215,14 +215,14 @@
text-align: right; text-align: right;
box-sizing: border-box; box-sizing: border-box;
padding-right: 20px; padding-right: 20px;
background-color: #2A3f5f; background-color: #e7e7e712;
border-bottom: 2px solid #1d2d46; border-bottom: 2px solid #1d2d46;
} }
.left-part-center-left { .left-part-center-left {
width: 100%; width: 100%;
height: calc(100% - 20px); height: calc(100% - 20px);
color: #cccccc; color: #cccccc;
background-color: #2a3f5f; background-color: #e7e7e712;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
border-bottom: 2px solid #1d2d46; border-bottom: 2px solid #1d2d46;
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
text-align: center; text-align: center;
background-color: #2A3f5f; background-color: #e7e7e712;
.left-part-bottom-feeling { .left-part-bottom-feeling {
width: 80px; width: 80px;
height: 100%; height: 100%;
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
text-align: center; text-align: center;
background: url(../../assets/img/yqjc/012.png) no-repeat; background: url(../../assets/img/yqjc/012.png) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
background-color: #2A3f5f; background-color: #e7e7e712;
.figure { .figure {
width: 60%; width: 60%;
height: 20%; height: 20%;
...@@ -450,6 +450,7 @@ export default { ...@@ -450,6 +450,7 @@ export default {
name: "external-info", name: "external-info",
data() { data() {
return { return {
errimg: "this.src='" + jh_bg + "'",
img1: img1, img1: img1,
imgHead: img2, imgHead: img2,
img3: img3, img3: img3,
...@@ -485,6 +486,7 @@ export default { ...@@ -485,6 +486,7 @@ export default {
userUrl: "", userUrl: "",
userAddr: "", userAddr: "",
}, },
pageNum_load:0,
}; };
}, },
methods: { methods: {
...@@ -492,21 +494,24 @@ export default { ...@@ -492,21 +494,24 @@ export default {
this.$router.go(-1); this.$router.go(-1);
}, },
load() { load() {
this.message = []; if(this.pageNum_load != this.pageNum)
if(this.$route.params.tweets_url) if(this.$route.params.tweets_url)
get( get(
"api/rest/fulltext/queryTwitterComments"+ "api/rest/elastic/queryTwitterComments"+
"?tweets_url="+ "?tweets_url="+
this.$route.params.tweets_url+ this.$route.params.tweets_url+
// "https://twitter.com/rolita64/status/1467904625776857090" + // "https://twitter.com/AP/status/1644325423927418880" +
"&pageNum=" + "&pageNum=" +
this.pageNum + this.pageNum +
"&pageSize=" + "&pageSize=" +
this.pageSize this.pageSize
) )
.then((arr) => { .then((arr) => {
this.message = this.message.concat(arr); this.pageNum_load = this.pageNum;
if(arr.list.length>0){
this.message = this.message.concat(arr.list);
this.pageNum++; this.pageNum++;
}
}) })
.catch((err) => {this.$message.warning(err.message); }); .catch((err) => {this.$message.warning(err.message); });
}, },
...@@ -524,7 +529,7 @@ export default { ...@@ -524,7 +529,7 @@ export default {
userAddr: "", userAddr: "",
}; };
if(id) if(id)
post("api/rest/resource/queryTwitterUser", { bloggerId: id }) post("api/rest/3z/resource/queryTwitterUser", { bloggerId: id })
.then((arr) => { .then((arr) => {
if (arr.length > 0) { if (arr.length > 0) {
this.imgHead = img2; this.imgHead = img2;
...@@ -541,7 +546,7 @@ export default { ...@@ -541,7 +546,7 @@ export default {
gz_query(id) { gz_query(id) {
//todo //todo
if(id) if(id)
get("api/rest/resource/queryTwitterFans/" + id + "?pageNum=" + this.pageNum_gz + "&pageSize=" + this.pageSize_gz).then((arr) => { get("api/rest/3z/resource/queryTwitterFans/" + id + "?pageNum=" + this.pageNum_gz + "&pageSize=" + this.pageSize_gz).then((arr) => {
if (arr.length > 0) { if (arr.length > 0) {
arr.forEach(item => { arr.forEach(item => {
this.fans.push(item.fullname); this.fans.push(item.fullname);
......
src/view/yqjc/news_info.vue
View file @ 0e265c1c
...@@ -390,12 +390,12 @@ export default { ...@@ -390,12 +390,12 @@ export default {
}, },
xgtj_news(id){ xgtj_news(id){
this.xgtj_news_data = []; this.xgtj_news_data = [];
post("api/rest/fulltext/queryRecommendNews?id="+id) post("api/rest/elastic/queryRecommendNews?id="+id)
.then(res => { .then(res => {
if(res.length>0){ if(res.list.length>0){
this.xgtj_news_data = res; this.xgtj_news_data = res.list;
if(res.length>10){ if(res.list.length>10){
this.xgtj_news_data = res.slice(0,10); this.xgtj_news_data = res.list.slice(0,10);
} }
} }
}) })
...@@ -409,7 +409,7 @@ export default { ...@@ -409,7 +409,7 @@ export default {
// 点击导出word // 点击导出word
exportWord: function () { exportWord: function () {
//后台下载 //后台下载
fileDownload("api/rest/fulltext/exportNews?id=" + this.getNews.id, this.tmpTitle ? this.tmpTitle : '未知', 'doc'); fileDownload("api/rest/elastic/exportNews?id=" + this.getNews.id, this.tmpTitle ? this.tmpTitle : '未知', 'doc');
}, },
copy(val) { copy(val) {
let clipboard = ""; let clipboard = "";
...@@ -481,15 +481,16 @@ export default { ...@@ -481,15 +481,16 @@ export default {
querySearchAsync(queryString, cb) { querySearchAsync(queryString, cb) {
let personList = []; let personList = [];
post( post(
`api/rest/resource/queryDynamicCharacter?pageNum=1&pageSize=100&multiFieldSearch=`+queryString, `api/rest/mongo/character/query?pageNum=1&pageSize=100`,
{ {
mould: "敌方资源", module:'DF',
name:queryString,
} }
).then(res => { ).then(res => {
res.list.forEach(item => { res.records.forEach(item => {
let personObj = {}; let personObj = {};
personObj['value'] = item.baseProperty.姓名; personObj['value'] = item.xm.value;
personObj['address'] = item._id; personObj['address'] = item.rwbh.value;
personList.push(personObj); personList.push(personObj);
}) })
// var results = queryString ? personList.filter(this.createStateFilter(queryString)) : personList; // var results = queryString ? personList.filter(this.createStateFilter(queryString)) : personList;
...@@ -503,15 +504,16 @@ export default { ...@@ -503,15 +504,16 @@ export default {
}); });
post( post(
`api/rest/resource/queryDynamicCharacter?pageNum=1&pageSize=100&multiFieldSearch=`+queryString, `api/rest/mongo/character/query?pageNum=1&pageSize=100`,
{ {
mould: "敌方外网资源", module:'DFWW',
name:queryString,
} }
).then(res => { ).then(res => {
res.list.forEach(item => { res.records.forEach(item => {
let personObj = {}; let personObj = {};
personObj['value'] = item.baseProperty.姓名; personObj['value'] = item.xm.value;
personObj['address'] = item._id; personObj['address'] = item.rwbh.value;
personList.push(personObj); personList.push(personObj);
}) })
// var results = queryString ? personList.filter(this.createStateFilter(queryString)) : personList; // var results = queryString ? personList.filter(this.createStateFilter(queryString)) : personList;
...@@ -527,15 +529,16 @@ export default { ...@@ -527,15 +529,16 @@ export default {
querySearchAsyncOrganization(queryString, cb) { querySearchAsyncOrganization(queryString, cb) {
let organizationList = []; let organizationList = [];
post( post(
"api/rest/resource/queryDynamicOrganization?pageNum=1&pageSize=100&multiFieldSearch="+queryString, `api/rest/mongo/organization/queryOrganization?pageNum=1&pageSize=100`,
{ {
mould: "敌方外网资源机构", module: "DFWW",
name:queryString,
} }
).then(res => { ).then(res => {
res.list.forEach(item => { res.records.forEach(item => {
let organizationObj = {}; let organizationObj = {};
organizationObj['value'] = item.baseProperty.部队番号; organizationObj['value'] = item.jgfh.value;
organizationObj['address'] = item._id; organizationObj['address'] = item.jgbh.value;
organizationList.push(organizationObj); organizationList.push(organizationObj);
}) })
// var results = queryString ? organizationList.filter(this.createStateFilter(queryString)) : organizationList; // var results = queryString ? organizationList.filter(this.createStateFilter(queryString)) : organizationList;
...@@ -548,15 +551,16 @@ export default { ...@@ -548,15 +551,16 @@ export default {
this.$message.warning(err.message); this.$message.warning(err.message);
}); });
post( post(
"api/rest/resource/queryDynamicOrganization?pageNum=1&pageSize=100&multiFieldSearch="+queryString, `api/rest/mongo/organization/queryOrganization?pageNum=1&pageSize=100`,
{ {
mould: "敌方资源机构", module: "DF",
name:queryString,
} }
).then(res => { ).then(res => {
res.list.forEach(item => { res.records.forEach(item => {
let organizationObj = {}; let organizationObj = {};
organizationObj['value'] = item.baseProperty.部队番号; organizationObj['value'] = item.jgfh.value;
organizationObj['address'] = item._id; organizationObj['address'] = item.jgbh.value;
organizationList.push(organizationObj); organizationList.push(organizationObj);
}) })
// var results = queryString ? organizationList.filter(this.createStateFilter(queryString)) : organizationList; // var results = queryString ? organizationList.filter(this.createStateFilter(queryString)) : organizationList;
...@@ -585,7 +589,7 @@ export default { ...@@ -585,7 +589,7 @@ export default {
obj['subject'] = this.pickItem.address; obj['subject'] = this.pickItem.address;
obj['relation'] = this.personType; obj['relation'] = this.personType;
obj['objectType'] = '新闻'; obj['objectType'] = '新闻';
post(`api/rest/resource/addRelatedInfo`, obj).then(res => { post(`api/rest/3z/resource/addRelatedInfo`, obj).then(res => {
if (res == 1) { if (res == 1) {
this.$message.success('关联人员成功！'); this.$message.success('关联人员成功！');
this.dialogVisiblePerson = false; this.dialogVisiblePerson = false;
...@@ -605,7 +609,7 @@ export default { ...@@ -605,7 +609,7 @@ export default {
obj['subject'] = this.pickItem.address; obj['subject'] = this.pickItem.address;
obj['relation'] = this.organizationType; obj['relation'] = this.organizationType;
obj['objectType'] = '新闻'; obj['objectType'] = '新闻';
post(`api/rest/resource/addRelatedInfo`, obj).then(res => { post(`api/rest/3z/resource/addRelatedInfo`, obj).then(res => {
if (res == 1) { if (res == 1) {
this.$message.success('关联机构成功！'); this.$message.success('关联机构成功！');
this.dialogVisibleOrganization = false; this.dialogVisibleOrganization = false;
...@@ -622,7 +626,7 @@ export default { ...@@ -622,7 +626,7 @@ export default {
//收藏 //收藏
//查询收藏目录 //查询收藏目录
searchCollectionFolder() { searchCollectionFolder() {
get('api/rest/resource/queryCollectionFolder?collector=' + this.userInfo.account).then(res => { get('api/rest/3z/resource/queryCollectionFolder?collector=' + this.userInfo.account).then(res => {
this.collectionFolder = res; this.collectionFolder = res;
}).catch((err)=>{ }).catch((err)=>{
this.$message.warning(err.message); this.$message.warning(err.message);
...@@ -805,7 +809,7 @@ export default { ...@@ -805,7 +809,7 @@ export default {
this.getNews = {}; this.getNews = {};
this.myChart1 == null; this.myChart1 == null;
this.echarts_1([]); this.echarts_1([]);
get("api/rest/fulltext/queryOneNews?Id=" + this.$route.params.key) get("api/rest/elastic/queryOneNews?id=" + this.$route.params.key)
.then((res) => { .then((res) => {
if(res==null){ if(res==null){
this.$message.warning('关联的新闻已删除'); this.$message.warning('关联的新闻已删除');
......
src/view/yqjc/zk_info.vue
View file @ 0e265c1c
...@@ -252,7 +252,7 @@ export default { ...@@ -252,7 +252,7 @@ export default {
// 点击导出word // 点击导出word
exportWord: function () { exportWord: function () {
//后台下载 //后台下载
fileDownload("api/rest/fulltext/exportThinkTank?id=" + this.getNews.id, this.tmpTitle ? this.tmpTitle : '未知', 'doc'); fileDownload("api/rest/elastic/exportThinkTank?id=" + this.getNews.id, this.tmpTitle ? this.tmpTitle : '未知', 'doc');
}, },
copy(val) { copy(val) {
let clipboard = ""; let clipboard = "";
......
webpack.config.js
View file @ 0e265c1c
...@@ -86,7 +86,7 @@ module.exports = { ...@@ -86,7 +86,7 @@ module.exports = {
//后台代理 //后台代理
proxy: { proxy: {
'/api/': { '/api/': {
target: 'http://192.168.168.106:8081', target: 'http://192.168.168.110:8081',
ws: true, ws: true,
secure: false, secure: false,
changeOrigin: true, changeOrigin: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment