Skip to content

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

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

parent a982817e
Hide 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,93 +43,24 @@ export default { ...@@ -43,93 +43,24 @@ 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{
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{ }else{
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 } });
}else{
this.$router.push({ name: "我方资源机构详情" + this.$route.meta.type_name, params: { key: item } });
}
} }
}, },
query(name, module_name) { query(name, module_name) {
this.query_tree(); post(
get("api/rest/resource/queryResourceTree?module=" + module_name) `api/rest/mongo/character/query?pageNum=1&pageSize=100`,
{
module: "DFWW",
name:name,
}
)
.then((res) => { .then((res) => {
let optinon_s = []; res.records.forEach((item) => {
if (res.length > 0) { // item.module_names = module_name;
optinon_s = this.jsonToArray(res); this.mb_table.push(item);
} 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(
`api/rest/resource/queryDynamicCharacter?pageNum=${1}&pageSize=${100}&multiFieldSearch=${name}`,
{
// mould:"敌方外网资源",
// "baseProperty.姓名": name,
"baseProperty.所在机构": "",
}
)
.then((res) => {
res.list.forEach((item) => {
item.photos =
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);
});
})
.catch((err) => {
this.$message.warning(err.message);
});
}); });
}) })
.catch((err) => { .catch((err) => {
...@@ -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) {
this.typeCountryRegion = e; if(this.typeCountryRegion.value==e.value){
this.typeCountryRegion = {value:'',name:''};
}else{
this.typeCountryRegion = e;
}
this.query_qb(1);
}, },
/**军事政治类型切换 */ /**军事政治类型切换 */
MilitaryPolitics_fun(e) { MilitaryPolitics_fun(e) {
this.typeMilitaryPolitics = e; if(this.typeMilitaryPolitics.value==e.value){
this.typeMilitaryPolitics = {value:'',name:''};
}else{
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
...@@ -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 }}
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
style="position: relative; padding: 0px" style="position: relative; padding: 0px"
class="serch-div" class="serch-div"
> >
<el-input placeholder="请输入关键词" v-model="input3"></el-input> <el-input placeholder="请输入姓名或外文名" v-model="input3"></el-input>
<el-button <el-button
type="primary" type="primary"
@click="query(1)" @click="query(1)"
...@@ -119,15 +119,15 @@ ...@@ -119,15 +119,15 @@
</div> </div>
</div> --> </div> -->
<div class="img-div"> <div class="img-div">
<img class="tx-bg" :src="item.info.avatarUrl==null?'':item.info.avatarUrl" :onerror="errimg" /> <img class="tx-bg" :src="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="top-span"> <div class="top-span">
{{ item.baseProperty["姓名"] }} {{ item.xm.value }}
</div> </div>
<div class="bottom-span"> <div class="bottom-span">
{{ item.baseProperty["外文名"] }} {{ item.wwm.value }}
</div> </div>
</div> </div>
<!-- <div class="name-div"> <!-- <div class="name-div">
...@@ -332,7 +332,7 @@ export default { ...@@ -332,7 +332,7 @@ export default {
zyx: "", zyx: "",
}, },
show: false, show: false,
type_zhOrcx: false, type_zhOrcx: 3,
nodes_pub: {}, nodes_pub: {},
i_pub: 0, i_pub: 0,
type_arr_country: [ type_arr_country: [
...@@ -346,8 +346,8 @@ export default { ...@@ -346,8 +346,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: "",
...@@ -359,86 +359,38 @@ export default { ...@@ -359,86 +359,38 @@ export default {
this.show = !this.show; this.show = !this.show;
}, },
zhcx(pageNum) { zhcx(pageNum) {
this.input3 = ""; if(this.types==1){
this.type_zhOrcx = true; this.value_select = 1
this.query_tree(); }else{
this.value_select = 4
}
this.input3 = '';
this.typeCountryRegion = {value:'',name:''};
this.typeMilitaryPolitics = {value:'',name:''};
this.type_zhOrcx = 1;
// this.query_tree();
this.pageInfo.current_page = pageNum; this.pageInfo.current_page = pageNum;
let pageSize = this.pageInfo.pageSize; let pageSize = this.pageInfo.pageSize;
get("api/rest/resource/queryResourceTree") post(
.then((res) => { `api/rest/mongo/character/query?pageNum=${pageNum}&pageSize=${pageSize}`,
let optinon_s = []; {
if (res.length > 0) { module: this.types == 1 ? "DF" : "DFWW",
optinon_s = this.jsonToArray(res); combinationSearch:{
} else { chineseName: this.formInline.name,
this.optinon_s = []; foreignName: this.formInline.jc,
xzzw: this.formInline.xzzw,
rwjj: this.formInline.rwjj,
bq: this.formInline.bq,
zyx: this.formInline.zyx,
} }
get( }
"api/rest/resource/queryResourceTreeOnline" )
).then((res) => { .then((res) => {
let options_s_online = []; this.rwkxx = [];
if (res.length > 0) { setTimeout(() => {
options_s_online = this.jsonToArray(res); this.rwkxx = res.records;
} else { this.pageInfo.total = res.total;
options_s_online = []; }, 500);
}
post(
`api/rest/resource/queryDynamicCharacter?pageNum=${pageNum}&pageSize=${pageSize}`,
{
mould: this.types == 1 ? "敌方资源" : "敌方外网资源",
"baseProperty.姓名": this.formInline.name,
"baseProperty.外文名": this.formInline.wwm,
"baseProperty.行政职务": this.formInline.xzzw,
"textarea.人物简介": this.formInline.rwjj,
"extraProperty.标签": this.formInline.bq,
"extraProperty.重要性": this.formInline.zyx,
"baseProperty.所在机构":
this.jgName == 1 || this.jgName == 4 ? "" : this.jgName,
}
)
.then((res) => {
this.rwkxx = [];
setTimeout(() => {
this.rwkxx = res.list;
this.rwkxx.forEach((item) => {
item.photos =
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;
}
});
this.pageInfo.total = res.totals;
}, 500);
})
.catch((err) => {
this.$message.warning(err.message);
});
});
}) })
.catch((err) => { .catch((err) => {
this.$message.warning(err.message); this.$message.warning(err.message);
...@@ -452,34 +404,36 @@ export default { ...@@ -452,34 +404,36 @@ export default {
this.tree_data = []; this.tree_data = [];
get("api/rest/mongo/organization/queryTree?module=" + 'DF') get("api/rest/mongo/organization/queryTree?module=" + 'DF')
.then((res) => { .then((res) => {
this.tree_data = [ let arr = [
{ {
id: 1, id: 1,
label: "机构列表", label: "机构列表",
level: 0, level: 0,
type: 1, children: res,
children: this.initData(res, 1),
}, },
]; ];
this.tree_data = this.initData(arr, 1);
get( get(
"api/rest/mongo/organization/queryTree?module=" + "api/rest/mongo/organization/queryTree?module=" +
"DFWW" "DFWW"
) )
.then((ress) => { .then((res1) => {
this.tree_data.push({ let arr1 = {
id: 4, id: 4,
label: "外网机构列表", label: "外网机构列表",
level: 0, level: 0,
type: 2, type: 2,
children: this.initData(ress, 2), children: this.initData(res1, 2),
}); };
this.tree_data.push(arr1);
this.value_select = 4;
}) })
.catch((err) => { .catch((err) => {
// this.$message.warning(err.message); this.$message.warning(err.message);
}); });
}) })
.then((res) => { .then((res) => {
this.query(1); this.handleCurrentChange_lb(1);
}) })
.catch((err) => { .catch((err) => {
this.$message.warning(err.message); this.$message.warning(err.message);
...@@ -496,67 +450,74 @@ export default { ...@@ -496,67 +450,74 @@ export default {
}, },
//列表分页 //列表分页
handleCurrentChange_lb(pageNum) { handleCurrentChange_lb(pageNum) {
if (this.type_zhOrcx) { if (this.type_zhOrcx == 1) {
this.zhcx(pageNum); this.zhcx(pageNum);
} else { } else if(this.type_zhOrcx ==2) {
this.query_jg(pageNum);
}else{
this.query(pageNum); this.query(pageNum);
} }
}, },
query(pageNum) { query_jg(pageNum) {
this.formInline = { this.formInline = {
name: "", name: "",
wwm: "", wwm: "",
xzzw: "", xzzw: "",
rwjj: "", rwjj: "",
bq: "", bq: "",
zyx: "",
}; };
this.type_zhOrcx = false; this.input3 = '';
this.typeCountryRegion = {value:'',name:''};
this.typeMilitaryPolitics = {value:'',name:''};
this.type_zhOrcx = 2;
this.pageInfo.current_page = pageNum; this.pageInfo.current_page = pageNum;
let pageSize = this.pageInfo.pageSize; let pageSize = this.pageInfo.pageSize;
let name = this.input3; post(
get("api/rest/mongo/organization/queryTree?module=" + 'DF') `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,
}
)
.then((res) => { .then((res) => {
let optinon_s = []; this.rwkxx = [];
if (res.length > 0) { setTimeout(() => {
optinon_s = this.jsonToArray(res); this.rwkxx = res.records;
} else { this.pageInfo.total = res.total;
this.optinon_s = []; }, 500);
}
get(
"api/rest/mongo/organization/queryTree?module=" +
"DFWW"
).then((res) => {
let options_s_online = [];
if (res.length > 0) {
options_s_online = this.jsonToArray(res);
} else {
options_s_online = [];
}
this.query_circulate(
pageNum,
pageSize,
name,
);
});
}) })
.catch((err) => { .catch((err) => {
this.$message.warning(err.message); this.$message.warning(err.message);
}); });
}, },
query_circulate( query(pageNum) {
pageNum, this.formInline = {
pageSize, name: "",
name, wwm: "",
) { xzzw: "",
rwjj: "",
bq: "",
zyx: "",
};
if(this.types==1){
this.value_select = 1
}else{
this.value_select = 4
}
this.type_zhOrcx = 3;
this.pageInfo.current_page = pageNum;
let pageSize = this.pageInfo.pageSize;
post( post(
`api/rest/mongo/character/query?pageNum=${pageNum}&pageSize=${pageSize}`, `api/rest/mongo/character/query?pageNum=${pageNum}&pageSize=${pageSize}`,
{ {
module: this.types == 1 ? "DF" : "DFWW", module: this.types == 1 ? "DF" : "DFWW",
orgId:this.value_select==1||this.value_select==4?'':this.value_select, name:this.input3,
type:this.typeMilitaryPolitics.name,
nation:this.typeCountryRegion.name,
} }
) )
.then((res) => { .then((res) => {
// if( res.list.length > 0 ){
this.rwkxx = []; this.rwkxx = [];
setTimeout(() => { setTimeout(() => {
this.rwkxx = res.records; this.rwkxx = res.records;
...@@ -640,11 +601,21 @@ export default { ...@@ -640,11 +601,21 @@ export default {
}, },
/**国家地区切换 */ /**国家地区切换 */
dq_fun(e) { dq_fun(e) {
this.typeCountryRegion = e; if(this.typeCountryRegion.value==e.value){
this.typeCountryRegion = {value:'',name:''};
}else{
this.typeCountryRegion = e;
}
this.query(1);
}, },
/**军事政治类型切换 */ /**军事政治类型切换 */
MilitaryPolitics_fun(e) { MilitaryPolitics_fun(e) {
this.typeMilitaryPolitics = e; if(this.typeMilitaryPolitics.value==e.value){
this.typeMilitaryPolitics = {value:'',name:''};
}else{
this.typeMilitaryPolitics = e;
}
this.query(1);
}, },
/**人物机构切换 */ /**人物机构切换 */
qh_type_rwjg(e) { qh_type_rwjg(e) {
...@@ -660,7 +631,7 @@ export default { ...@@ -660,7 +631,7 @@ export default {
this.types = val.type; this.types = val.type;
this.jgName = val.code == undefined ? val.id : val.code; this.jgName = val.code == undefined ? val.id : val.code;
} }
this.type_zhOrcx = false; this.type_zhOrcx = 2;
this.input3 = ""; this.input3 = "";
this.nodes_pub = val; this.nodes_pub = val;
this.handleCurrentChange_lb(1); this.handleCurrentChange_lb(1);
...@@ -1183,11 +1154,21 @@ export default { ...@@ -1183,11 +1154,21 @@ 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 2s 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");
background-image: url("../../assets/img/dfzy/new/3.png");
.name-div{ .name-div{
background-image: url("../../assets/img/dfzy/new/5.png"); background-image: url("../../assets/img/dfzy/new/5.png");
} }
...@@ -1198,16 +1179,10 @@ export default { ...@@ -1198,16 +1179,10 @@ export default {
} }
} }
.table-active { .table-active {
background-image: url("../../assets/img/dfzy/new/3.png");
background-image: url("../../assets/img/dfzy/new/3.png"); background-image: url("../../assets/img/dfzy/new/3.png");
.name-div{ .name-div{
background-image: url("../../assets/img/dfzy/new/5.png"); background-image: url("../../assets/img/dfzy/new/5.png");
} }
.top-span {
background: linear-gradient(to bottom, #fffe7f, #54ff88);
-webkit-background-clip: text;
color: transparent;
}
} }
.img-div { .img-div {
width: 70px; width: 70px;
......
src/view/dfzy/jq_xq_dfzy.vue
View file @ 0e265c1c
...@@ -25,133 +25,61 @@ ...@@ -25,133 +25,61 @@
</div> </div>
<table class="table_jbxx"> <table class="table_jbxx">
<tr> <tr>
<td class="pub-td1">部队番号</td> <td class="pub-td1" style="width:60px">机构编号</td>
<td class="pub-td2">
<span>{{form.bddh ? form.bddh.value:''}}</span>
<i v-if="$route.meta.gly && form.bddh?!form.bddh.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.bddh?form.bddh.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td>
<td class="pub-td1">部队简称</td>
<td class="pub-td2">
<span>{{form.bdjc ? form.bdjc.value:''}}</span>
<i v-if="$route.meta.gly && form.bdjc?!form.bdjc.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.bdjc?form.bdjc.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td>
</tr>
<tr>
<td class="pub-td1">机构编号</td>
<td class="pub-td2" colspan="3"> <td class="pub-td2" colspan="3">
<span>{{form.jgbh ? form.jgbh.value:''}}</span> <span>{{
<i v-if="$route.meta.gly && form.jgbh?!form.jgbh.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> form.jgbh ? form.jgbh.value:''
<i v-if="$route.meta.gly && form.jgbh?form.jgbh.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> }}</span>
</td>
</tr>
<tr>
<td class="pub-td1">部队代号</td>
<td class="pub-td2">
<span>{{form.bddh ? form.bddh.value:''}}</span>
<i v-if="$route.meta.gly && form.bddh?!form.bddh.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.bddh?form.bddh.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td>
<td class="pub-td1">部队泛称</td>
<td class="pub-td2">
<span>{{form.bdfc ? form.bdfc.value:''}}</span>
<i v-if="$route.meta.gly && form.bdfc?!form.bdfc.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.bdfc?form.bdfc.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td>
</tr>
<tr>
<td class="pub-td1">编制番号</td>
<td class="pub-td2">
<span>{{form.bzfh ? form.bzfh.value:''}}</span>
<i v-if="$route.meta.gly && form.bzfh?!form.bzfh.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.bzfh?form.bzfh.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td>
<td class="pub-td1">战时代号</td>
<td class="pub-td2">
<span>{{form.zsdh ? form.zsdh.value:''}}</span>
<i v-if="$route.meta.gly && form.zsdh?!form.zsdh.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.zsdh?form.zsdh.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">密级</td> <td class="pub-td1" style="width:60px">机构番号</td>
<td class="pub-td2"> <td class="pub-td2">
<span>{{form.mj ? form.mj.value:''}}</span> <span>{{form.jgfh ? form.jgfh.value:''}}</span>
<i v-if="$route.meta.gly && form.mj?!form.mj.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> <i v-if="$route.meta.gly && form.jgfh?!form.jgfh.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.mj?form.mj.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> <i v-if="$route.meta.gly && form.jgfh?form.jgfh.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
<td class="pub-td1">部队类别</td> <td class="pub-td1" style="width:60px">机构简称</td>
<td class="pub-td2"> <td class="pub-td2">
<span>{{form.bdlb ? form.bdlb.value:''}}</span> <span>{{
<i v-if="$route.meta.gly && form.bdlb?!form.bdlb.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> form.jgjc ? form.jgjc.value:''
<i v-if="$route.meta.gly && form.bdlb?form.bdlb.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> }}</span>
<i v-if="$route.meta.gly && form.jgjc?!form.jgjc.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.jgjc?form.jgjc.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">兵种</td>
<td class="pub-td2">
<span>{{form.bz ? form.bz.value:''}}</span>
<i v-if="$route.meta.gly && form.bz?!form.bz.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.bz?form.bz.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td>
<td class="pub-td1">国家地区</td> <td class="pub-td1">国家地区</td>
<td class="pub-td2"> <td class="pub-td2">
<span>{{form.gjdq ? form.gjdq.value:''}}</span> <span>{{ form.gjdq ? form.gjdq.value:'' }}</span>
<i v-if="$route.meta.gly && form.gjdq?!form.gjdq.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> <i v-if="$route.meta.gly && form.gjdq?!form.gjdq.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.gjdq?form.gjdq.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> <i v-if="$route.meta.gly && form.gjdq?form.gjdq.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
</tr> <td class="pub-td1">机构类别</td>
<tr>
<td class="pub-td1">军种</td>
<td class="pub-td2">
<span>{{form.jz ? form.jz.value:''}}</span>
<i v-if="$route.meta.gly && form.jz?!form.jz.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.jz?form.jz.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td>
<td class="pub-td1">地名</td>
<td class="pub-td2"> <td class="pub-td2">
<span>{{form.dm ? form.dm.value:''}}</span> <span>{{ form.jglb ? form.jglb.value:'' }}</span>
<i v-if="$route.meta.gly && form.dm?!form.dm.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> <i v-if="$route.meta.gly && form.jglb?!form.jglb.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.dm?form.dm.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> <i v-if="$route.meta.gly && form.jglb?form.jglb.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
</tr> </tr>
<tr> <tr v-for="(item, index) in xzzd" style="position: relative" v-if="xzzd.length>0 && index<=Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1">
<td class="pub-td1">军队区分</td> <td class="pub-td1">{{ xzzd[2*index].comment }}</td>
<td class="pub-td2"> <td class="pub-td2" :colspan="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2==0?'':'3':''" v-if="form.extraProperty">
<span>{{form.jdqf ? form.jdqf.value:''}}</span> <span>{{
<i v-if="$route.meta.gly && form.jdqf?!form.jdqf.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> form.extraProperty[xzzd[2*index].comment]?form.extraProperty[xzzd[2*index].comment].value:''
<i v-if="$route.meta.gly && form.jdqf?form.jdqf.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> }}</span>
</td> <i v-if="$route.meta.gly && form.extraProperty[xzzd[2*index].comment]?!form.extraProperty[xzzd[2*index].comment].confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<td class="pub-td1">情报提供单位</td> <i v-if="$route.meta.gly && form.extraProperty[xzzd[2*index].comment]?form.extraProperty[xzzd[2*index].comment].confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<td class="pub-td2">
<span>{{form.qbtgdw ? form.qbtgdw.value:''}}</span>
<i v-if="$route.meta.gly && form.qbtgdw?!form.qbtgdw.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.qbtgdw?form.qbtgdw.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td>
</tr>
<tr>
<td class="pub-td1">部队等级</td>
<td class="pub-td2">
<span>{{form.bddj ? form.bddj.value:''}}</span>
<i v-if="$route.meta.gly && form.bddj?!form.bddj.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.bddj?form.bddj.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td>
<td class="pub-td1">战备等级</td>
<td class="pub-td2">
<span>{{form.zbdj ? form.zbdj.value:''}}</span>
<i v-if="$route.meta.gly && form.zbdj?!form.zbdj.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.zbdj?form.zbdj.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
</tr>
<tr v-for="(item, index) in xzzd" style="position: relative">
<td class="pub-td1 test-td-pub-td1">{{ item.comment }}</td> <td class="pub-td1" v-if="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2!=0?false:true:true">{{ xzzd[2*index+1].comment }}</td>
<td class="pub-td2 test-td-pub-td2" colspan="3" v-if="form.extraProperty"> <td class="pub-td2" v-if="form.extraProperty&&index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2!=0?false:true:true">
<span>{{ <span>{{
form.extraProperty[item.comment] ? form.extraProperty[item.comment].value:'' form.extraProperty[xzzd[2*index+1].comment]?form.extraProperty[xzzd[2*index+1].comment].value:''
}}</span> }}</span>
<i v-if="$route.meta.gly && form.extraProperty[item.comment]?!form.extraProperty[item.comment].confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> <i v-if="$route.meta.gly && form.extraProperty[xzzd[2*index+1].comment]?!form.extraProperty[xzzd[2*index+1].comment].confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.extraProperty[item.comment]?form.extraProperty[item.comment].confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> <i v-if="$route.meta.gly && form.extraProperty[xzzd[2*index+1].comment]?form.extraProperty[xzzd[2*index+1].comment].confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -204,7 +132,7 @@ ...@@ -204,7 +132,7 @@
</div> </div>
</div> </div>
</div> </div>
<div style="width: 300px; float: left; margin-left: 20px"> <div style="width: 280px; float: left; margin-left: 20px;">
<div class="xgnr-span" style="margin-top: 0px"> <div class="xgnr-span" style="margin-top: 0px">
<span>相关人物</span> <span>相关人物</span>
</div> </div>
...@@ -213,18 +141,18 @@ ...@@ -213,18 +141,18 @@
<span>暂无数据接入</span> <span>暂无数据接入</span>
</div> </div>
<ul v-if="xgnr_xgrw.length != 0"> <ul v-if="xgnr_xgrw.length != 0">
<li v-for="item in xgnr_xgrw" :title="item.baseProperty['外文名'] == undefined || <li v-for="item in xgnr_xgrw" :title="item.xm.value == undefined ||
item.baseProperty['外文名'] == '' || item.xm.value == '' ||
item.baseProperty['外文名'] == null item.xm.value == null
? item.baseProperty['姓名'] ? item.wwm.value
: item.baseProperty['外文名'] : item.xm.value
"> ">
<span @click="rw_xq(item)">{{ <span @click="rw_xq(item)">{{
item.baseProperty["外文名"] == undefined || item.xm.value == undefined ||
item.baseProperty["外文名"] == "" || item.xm.value == "" ||
item.baseProperty["外文名"] == null item.xm.value == null
? item.baseProperty["姓名"] ? item.wwm.value
: item.baseProperty["外文名"] + " 相关人员" : item.xm.value + " 相关人员"
}}</span> }}</span>
</li> </li>
</ul> </ul>
...@@ -483,7 +411,7 @@ ...@@ -483,7 +411,7 @@
<el-button size="mini" @click="dialogVisible_gd = false">关闭</el-button> <el-button size="mini" @click="dialogVisible_gd = false">关闭</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog title="账号动态" :visible.sync="dialogVisible_gd1" width="40%" :modal-append-to-body="false" id="_plscs"> <el-dialog title="账号动态" :visible.sync="dialogVisible_gd1" width="50%" :modal-append-to-body="false" id="_plscs">
<el-table style="width: 100%" class="table-div" :data="tableData_gd1" :header-cell-style="{ <el-table style="width: 100%" class="table-div" :data="tableData_gd1" :header-cell-style="{
color: '#ffffffc7', color: '#ffffffc7',
fontSize: '14px', fontSize: '14px',
...@@ -622,7 +550,7 @@ export default { ...@@ -622,7 +550,7 @@ export default {
query_zhdt_data(pageNum) { query_zhdt_data(pageNum) {
this.current_page = pageNum; this.current_page = pageNum;
get( get(
`api/rest/fulltext/queryRelationTwitter?pageNum=${pageNum}&pageSize=${this.pageSize}&characterId=${this.form.extraProperty.id}` `api/rest/elastic/queryRelationTwitter?pageNum=${pageNum}&pageSize=${this.pageSize}&twitterAccount=${this.form.extraProperty['Twitter账号'].value}`
) )
.then((data) => { .then((data) => {
if (data.list.length > 0) { if (data.list.length > 0) {
...@@ -648,7 +576,7 @@ export default { ...@@ -648,7 +576,7 @@ export default {
query_xgyq_data(pageNum) { query_xgyq_data(pageNum) {
this.current_page1 = pageNum; this.current_page1 = pageNum;
get( get(
`api/rest/resource/queryRelatedInfo?pageNum=${pageNum}&pageSize=${this.pageSize1}&subject=${this.form._id}&relation=${this.title_gd}` `api/rest/3z/resource/queryRelatedInfo?pageNum=${pageNum}&pageSize=${this.pageSize1}&subject=${this.form.jgbh.value}&relation=${this.title_gd}`
) )
.then((data) => { .then((data) => {
if (data.list.length > 0) { if (data.list.length > 0) {
...@@ -673,15 +601,15 @@ export default { ...@@ -673,15 +601,15 @@ export default {
query_xgyq_data2(pageNum) { query_xgyq_data2(pageNum) {
this.current_page2 = pageNum; this.current_page2 = pageNum;
let condition = { let condition = {
txt: txt:
this.form.baseProperty["部队番号"] == "" || this.form.jgfh.value == "" ||
this.form.baseProperty["部队番号"] == null || this.form.jgfh.value == null ||
this.form.baseProperty["部队番号"] == undefined this.form.jgfh.value == undefined
? this.form.baseProperty["部队简称"] ? this.form.jgjc.value
: this.form.baseProperty["部队番号"], : this.form.jgfh.value,
}; };
post( post(
"api/rest/fulltext/queryNews?pageNum=" + "api/rest/elastic/queryNews?pageNum=" +
pageNum + pageNum +
"&pageSize=" + "&pageSize=" +
this.pageSize2 + this.pageSize2 +
...@@ -725,7 +653,11 @@ export default { ...@@ -725,7 +653,11 @@ export default {
if (item == "账号动态") { if (item == "账号动态") {
this.pageSize = 10; this.pageSize = 10;
this.current_page = 1; this.current_page = 1;
this.query_zhdt_data(1); if(this.form.extraProperty['Twitter账号'].value==''){
this.$message.warning('Twitter账号不能为空！');
}else{
this.query_zhdt_data(1);
}
} else { } else {
this.dialogVisible_gd = true; this.dialogVisible_gd = true;
this.title_gd = item; this.title_gd = item;
...@@ -861,10 +793,10 @@ export default { ...@@ -861,10 +793,10 @@ export default {
} }
}); });
} }
// this.query_xgyl(this.form._id);右侧信息 this.query_xgyl(this.form.jgbh.value);
}, },
query_Twitter(id) { query_Twitter(account) {
get("api/rest/fulltext/queryRelationTwitter?characterId=" + id) get("api/rest/elastic/queryRelationTwitter?pageNum=1&pageSize=10&twitterAccount=" + account)
.then((data) => { .then((data) => {
let arr_news_twitter = []; let arr_news_twitter = [];
if (data.list.length > 0) { if (data.list.length > 0) {
...@@ -926,79 +858,17 @@ export default { ...@@ -926,79 +858,17 @@ export default {
return r; return r;
}, },
query_rw() { query_rw() {
get("api/rest/resource/queryResourceTree?module=" + this.module_name) post(
`api/rest/mongo/character/query?pageNum=${1}&pageSize=${20}`,
{
module: this.form.module,
orgId: this.form.jgbh.value,
}
)
.then((res) => { .then((res) => {
let optinon_s = []; this.xgnr_xgrw = [];
if (res.length > 0) { res.records.forEach((item) => {
optinon_s = this.jsonToArray(res); this.xgnr_xgrw.push(item);
} 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(
`api/rest/resource/queryDynamicCharacter?pageNum=${1}&pageSize=${20}`,
{
mould:
this.form.mould == "敌方外网资源机构"
? "敌方外网资源"
: "敌方资源",
// "baseProperty.姓名": "",
"baseProperty.所在机构": this.form.baseProperty["机构编号"],
}
)
.then((res) => {
this.xgnr_xgrw = [];
res.list.forEach((item) => {
if (this.form._id != item._id) {
this.xgnr_xgrw.push(item);
}
});
this.xgnr_xgrw.forEach((item) => {
item.photos =
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.templateId) {
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;
}
});
})
.catch((err) => {
this.$message.warning(err.message);
});
}); });
}) })
.catch((err) => { .catch((err) => {
...@@ -1006,20 +876,11 @@ export default { ...@@ -1006,20 +876,11 @@ export default {
}); });
}, },
query_xgyl(id) { query_xgyl(id) {
// get(
// "api/rest/resource/queryRelatedInfo?subject="+id+"&relation="+"相关人物",
// )
// .then((data)=>{
// this.xgnr_xgrw = data;
// })
// .catch((err)=>{
// console.log(err)
// });
let _this = this; let _this = this;
_this.query_tree(); // _this.query_tree();
_this.query_rw(); _this.query_rw();
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"所属基地" "所属基地"
...@@ -1031,7 +892,7 @@ export default { ...@@ -1031,7 +892,7 @@ export default {
this.$message.warning(err.message); this.$message.warning(err.message);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"所属部队" "所属部队"
...@@ -1043,7 +904,7 @@ export default { ...@@ -1043,7 +904,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"所属装备" "所属装备"
...@@ -1055,7 +916,7 @@ export default { ...@@ -1055,7 +916,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"相关舆情" "相关舆情"
...@@ -1063,14 +924,15 @@ export default { ...@@ -1063,14 +924,15 @@ export default {
this.xgnr_xgyq = data.list; this.xgnr_xgyq = data.list;
let condition = { let condition = {
txt: txt:
this.form.baseProperty["部队番号"] == "" || this.form.jgfh.value == "" ||
this.form.baseProperty["部队番号"] == null || this.form.jgfh.value == null ||
this.form.baseProperty["部队番号"] == undefined this.form.jgfh.value == undefined
? this.form.baseProperty["部队简称"] ? this.form.jgjc.value
: this.form.baseProperty["部队番号"], : this.form.jgfh.value,
// txt:'新华社',
}; };
post( post(
"api/rest/fulltext/queryNews?pageNum=" + 1 + "&pageSize=" + 10 + "", "api/rest/elastic/queryNews?pageNum=" + 1 + "&pageSize=" + 10 + "",
condition condition
) )
.then((data) => { .then((data) => {
...@@ -1092,7 +954,7 @@ export default { ...@@ -1092,7 +954,7 @@ export default {
}); });
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"历史文献" "历史文献"
...@@ -1104,7 +966,7 @@ export default { ...@@ -1104,7 +966,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"证据资料" "证据资料"
...@@ -1116,7 +978,7 @@ export default { ...@@ -1116,7 +978,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"关键影响人物" "关键影响人物"
...@@ -1128,7 +990,7 @@ export default { ...@@ -1128,7 +990,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"攻击建议" "攻击建议"
...@@ -1140,7 +1002,7 @@ export default { ...@@ -1140,7 +1002,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"评价言论" "评价言论"
...@@ -1152,7 +1014,7 @@ export default { ...@@ -1152,7 +1014,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"机构分析报告" "机构分析报告"
...@@ -1263,7 +1125,7 @@ export default { ...@@ -1263,7 +1125,7 @@ export default {
this.organization = obj_item.info; this.organization = obj_item.info;
this.module = obj_item.info.module this.module = obj_item.info.module
this.query_CharacterMould(this.templateId); this.query_CharacterMould(this.templateId);
// this.query_Twitter(obj_item.extraProperty.id); this.organization.extraProperty['Twitter账号'].value!=''?this.query_Twitter(this.organization.extraProperty['Twitter账号'].value):'';
}, },
query_selector(selector) { query_selector(selector) {
return Array.from(document.querySelectorAll(selector)); return Array.from(document.querySelectorAll(selector));
...@@ -1864,5 +1726,8 @@ export default { ...@@ -1864,5 +1726,8 @@ export default {
} }
} }
} }
#_plscs .el-dialog__body{
padding: 0px 20px;
}
} }
</style> </style>
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
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
<div style="width: calc(100% - 360px); float: left; padding: 20px"> <div style="width: calc(100% - 360px); float: left; padding: 20px">
<div style="width: calc(100% - 20px); float: left; padding: 20px"> <div style="width: calc(100% - 20px); float: left; padding: 20px">
<div class="img-div"> <div class="img-div">
<img :src="form.photos" class="rw-img" :onerror="errimg" /> <img :src="imageUrl" class="rw-img" :onerror="errimg" />
<div class="top-left-div"> <div class="top-left-div">
<span style="font-size: 22px">{{ form.baseProperty["姓名"] }}</span> <span style="font-size: 22px">{{ form.xm?form.xm.value:'' }}</span>
<span style="font-size: 19px">{{ <span style="font-size: 19px">{{
form.baseProperty["外文名"] form.wwm?form.wwm.value:''
}}</span> }}</span>
</div> </div>
<!-- <img :src="form.photos" class="rw-img" :onerror="errimg" /> --> <!-- <img :src="form.photos" class="rw-img" :onerror="errimg" /> -->
...@@ -33,120 +33,99 @@ ...@@ -33,120 +33,99 @@
<td class="pub-td1">姓名</td> <td class="pub-td1">姓名</td>
<td class="pub-td2"> <td class="pub-td2">
<span>{{form.xm ? form.xm.value:''}}</span> <span>{{form.xm ? form.xm.value:''}}</span>
<i v-if="$route.meta.gly && form.xm?!form.xm.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.xm?form.xm.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
<td class="pub-td1">外文名</td> <td class="pub-td1">外文名</td>
<td class="pub-td2"> <td class="pub-td2">
<span>{{form.wwm ? form.wwm.value:''}}</span> <span>{{form.wwm ? form.wwm.value:''}}</span>
<i v-if="$route.meta.gly && form.wwm?!form.wwm.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.wwm?form.wwm.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">所在机构</td> <td class="pub-td1">所在机构</td>
<td class="pub-td2" colspan="3"> <td class="pub-td2" colspan="3">
<span>{{form.orgId}}</span> <!-- <span>{{form.orgId}}</span> -->
</td> <span>{{form.orgId1}}</span>
</tr>
<tr>
<td class="pub-td1">身份证号码</td>
<td class="pub-td2">
<span>{{form.sfzhm ? form.sfzhm.value:''}}</span>
</td>
<td class="pub-td1">军官证号码</td>
<td class="pub-td2">
<span>{{form.jgzhm ? form.jgzhm.value:''}}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">级别</td> <td class="pub-td1" style="width: 70px">人物编号</td>
<td class="pub-td2"> <td class="pub-td2" colspan="3">
<span>{{form.jb ? form.jb.value:''}}</span>
</td>
<td class="pub-td1">人物编号</td>
<td class="pub-td2">
<span>{{form.rwbh ? form.rwbh.value:''}}</span> <span>{{form.rwbh ? form.rwbh.value:''}}</span>
<!-- <span>{{form.rwbh ? form.rwbh.value:''}}</span>
<i v-if="$route.meta.gly && form.rwbh?!form.rwbh.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.rwbh?form.rwbh.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.rwbh.value"
placeholder="请输入内容"
:disabled="form.rwbh.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.rwbh" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('rwbh',true)"></i>
<i v-if="true_edit && !arr_table_comment.rwbh" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('rwbh',false)"></i> -->
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">性别</td> <td class="pub-td1">性别</td>
<td class="pub-td2"> <td class="pub-td2">
<span>{{form.xb ? form.xb.value:''}}</span> <span>{{form.xb ? form.xb.value:''}}</span>
<i v-if="$route.meta.gly && form.xb?!form.xb.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.xb?form.xb.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
<td class="pub-td1">民族</td> <td class="pub-td1">民族</td>
<td class="pub-td2"> <td class="pub-td2">
<span>{{form.mz ? form.mz.value:''}}</span> <span>{{form.mz ? form.mz.value:''}}</span>
<i v-if="$route.meta.gly && form.mz?!form.mz.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.mz?form.mz.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">籍贯</td> <td class="pub-td1">籍贯</td>
<td class="pub-td2"> <td class="pub-td2">
<span>{{form.jg ? form.jg.value:''}}</span> <span>{{form.jg ? form.jg.value:''}}</span>
<i v-if="$route.meta.gly && form.jg?!form.jg.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.jg?form.jg.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
<td class="pub-td1">出生日期</td> <td class="pub-td1">出生日期</td>
<td class="pub-td2"> <td class="pub-td2">
<span>{{form.csrq ? form.csrq.value:''}}</span> <span>{{form.csrq ? form.csrq.value:''}}</span>
</td> <i v-if="$route.meta.gly && form.csrq?!form.csrq.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
</tr> <i v-if="$route.meta.gly && form.csrq?form.csrq.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<tr>
<td class="pub-td1">入伍日期</td>
<td class="pub-td2">
<span>{{form.rwrq ? form.rwrq.value:''}}</span>
</td>
<td class="pub-td1">第一学历</td>
<td class="pub-td2">
<span>{{form.dyxl ? form.dyxl.value:''}}</span>
</td>
</tr>
<tr>
<td class="pub-td1">政治面貌</td>
<td class="pub-td2">
<span>{{form.zzmm ? form.zzmm.value:''}}</span>
</td>
<td class="pub-td1">文化程度</td>
<td class="pub-td2">
<span>{{form.whcd ? form.whcd.value:''}}</span>
</td>
</tr>
<tr>
<td class="pub-td1">部队番号</td>
<td class="pub-td2" colspan="5">
<span>{{form.bdfh ? form.bdfh.value:''}}</span>
</td>
</tr>
<tr>
<td class="pub-td1">军衔等级</td>
<td class="pub-td2">
<span>{{form.jxdj ? form.jxdj.value:''}}</span>
</td>
<td class="pub-td1">任现军衔时间</td>
<td class="pub-td2" colspan="2">
<span>{{form.rxjxsj ? form.rxjxsj.value:''}}</span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">行政职务</td> <td class="pub-td1">行政职务</td>
<td class="pub-td2"> <td class="pub-td2">
<span>{{form.xzzw ? form.xzzw.value:''}}</span> <span>{{form.xzzw ? form.xzzw.value:''}}</span>
<i v-if="$route.meta.gly && form.xzzw?!form.xzzw.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.xzzw?form.xzzw.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
<td class="pub-td1">任现职务时间</td> <td class="pub-td1">人物类别</td>
<td class="pub-td2" colspan="2">
<span>{{form.rxzwsj ? form.rxzwsj.value:''}}</span>
</td>
</tr>
<tr>
<td class="pub-td1">岗位职务层级</td>
<td class="pub-td2"> <td class="pub-td2">
<span>{{form.gwzwcj ? form.gwzwcj.value:''}}</span> <span>{{form.rwlb ? form.rwlb.value:''}}</span>
</td> <i v-if="$route.meta.gly && form.rwlb?!form.rwlb.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<td class="pub-td1">任现职级时间</td> <i v-if="$route.meta.gly && form.rwlb?form.rwlb.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<td class="pub-td2" colspan="2">
<span>{{form.rxzjsj ? form.rxzjsj.value:''}}</span>
</td> </td>
</tr> </tr>
<tr v-for="(item, index) in xzzd" style="position: relative"> <tr v-for="(item, index) in xzzd" style="position: relative" v-if="xzzd.length>0 && index<=Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1">
<td class="pub-td1 test-td-pub-td1">{{ item.comment }}</td> <td class="pub-td1">{{ xzzd[2*index].comment }}</td>
<td class="pub-td2 test-td-pub-td2" colspan="5"> <td class="pub-td2" :colspan="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2==0?'':'3':''" v-if="form.extraProperty">
<span>{{form.extraProperty[item.comment] ? form.extraProperty[item.comment].value:''}}</span> <span>{{
form.extraProperty[xzzd[2*index].comment]?form.extraProperty[xzzd[2*index].comment].value:''
}}</span>
<i v-if="$route.meta.gly && form.extraProperty[xzzd[2*index].comment]?!form.extraProperty[xzzd[2*index].comment].confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.extraProperty[xzzd[2*index].comment]?form.extraProperty[xzzd[2*index].comment].confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td>
<td class="pub-td1" v-if="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2!=0?false:true:true">{{ xzzd[2*index+1].comment }}</td>
<td class="pub-td2" v-if="form.extraProperty&&index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2!=0?false:true:true">
<span>{{
form.extraProperty[xzzd[2*index+1].comment]?form.extraProperty[xzzd[2*index+1].comment].value:''
}}</span>
<i v-if="$route.meta.gly && form.extraProperty[xzzd[2*index+1].comment]?!form.extraProperty[xzzd[2*index+1].comment].confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && form.extraProperty[xzzd[2*index+1].comment]?form.extraProperty[xzzd[2*index+1].comment].confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -174,18 +153,13 @@ ...@@ -174,18 +153,13 @@
></span> ></span>
</div> </div>
<div v-if="item.type == 2" class="tablesss"> <div v-if="item.type == 2" class="tablesss">
<el-table <el-table style="width: 100%" :data="item.table_column" border>
style="width: 100%" <el-table-column :prop="items" :label="items" v-for="(items, indexs) in item.table_tab" :key="indexs"
:data="form.mouldTables[item.comment]" align="center">
border <template slot-scope="scope">
> <span>{{ scope.row[items] }}</span>
<el-table-column </template>
:prop="items" </el-table-column>
:label="items"
v-for="(items, indexs) in item.table_tab"
:key="indexs"
align="center"
></el-table-column>
</el-table> </el-table>
</div> </div>
<div v-if="item.type == 3" style="height: 700px"> <div v-if="item.type == 3" style="height: 700px">
...@@ -210,8 +184,8 @@ ...@@ -210,8 +184,8 @@
<span>暂无数据接入</span> <span>暂无数据接入</span>
</div> </div>
<ul v-if="xgnr_xgrw.length != 0"> <ul v-if="xgnr_xgrw.length != 0">
<li v-for="item in xgnr_xgrw" :title="item.wwm==undefined||item.wwm==''||item.wwm==null?item.xm:wwm"> <li v-for="item in xgnr_xgrw" :title="item.wwm.value==undefined||item.wwm.value==''||item.wwm.value==null?item.xm.value:item.wwm.value">
<span>{{ item.wwm==undefined||item.wwm==''||item.wwm==null?item.xm:item.wwm + ' 同事'}}</span> <span @click="rw_xq(item)">{{ (item.wwm.value==undefined||item.wwm.value==''||item.wwm.value==null?item.xm.value:item.wwm.value) + ' 同事'}}</span>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -685,6 +659,7 @@ export default { ...@@ -685,6 +659,7 @@ export default {
true_edit: false, true_edit: false,
editableTabsValues: false, editableTabsValues: false,
editableTabsValue: "", editableTabsValue: "",
imageUrl:'',
}; };
}, },
methods: { methods: {
...@@ -705,7 +680,7 @@ export default { ...@@ -705,7 +680,7 @@ export default {
query_zhdt_data(pageNum) { query_zhdt_data(pageNum) {
this.current_page = pageNum; this.current_page = pageNum;
get( get(
`api/rest/fulltext/queryRelationTwitter?pageNum=${pageNum}&pageSize=${this.pageSize}&characterId=${this.form.extraProperty.id}` `api/rest/elastic/queryRelationTwitter?pageNum=${pageNum}&pageSize=${this.pageSize}&twitterAccount=${this.form.extraProperty['Twitter账号'].value}`
) )
.then((data) => { .then((data) => {
if (data.list.length > 0) { if (data.list.length > 0) {
...@@ -731,7 +706,7 @@ export default { ...@@ -731,7 +706,7 @@ export default {
query_xgyq_data(pageNum) { query_xgyq_data(pageNum) {
this.current_page1 = pageNum; this.current_page1 = pageNum;
get( get(
`api/rest/resource/queryRelatedInfo?pageNum=${pageNum}&pageSize=${this.pageSize1}&subject=${this.form._id}&relation=${this.title_gd}` `api/rest/3z/resource/queryRelatedInfo?pageNum=${pageNum}&pageSize=${this.pageSize1}&subject=${this.form.rwbh.value}&relation=${this.title_gd}`
) )
.then((data) => { .then((data) => {
if (data.list.length > 0) { if (data.list.length > 0) {
...@@ -758,14 +733,14 @@ export default { ...@@ -758,14 +733,14 @@ export default {
this.current_page2 = pageNum; this.current_page2 = pageNum;
let condition = { let condition = {
txt: txt:
this.form.baseProperty["外文名"] == "" || this.form.wwm.value == "" ||
this.form.baseProperty["外文名"] == null || this.form.wwm.value == null ||
this.form.baseProperty["外文名"] == undefined this.form.wwm.value == undefined
? this.form.baseProperty["姓名"] ? this.form.xm.value
: this.form.baseProperty["外文名"], : this.form.wwm.value,
}; };
post( post(
"api/rest/fulltext/queryNews?pageNum=" + "api/rest/elastic/queryNews?pageNum=" +
pageNum + pageNum +
"&pageSize=" + "&pageSize=" +
this.pageSize2 + this.pageSize2 +
...@@ -809,7 +784,11 @@ export default { ...@@ -809,7 +784,11 @@ export default {
if (item == "账号动态") { if (item == "账号动态") {
this.pageSize = 10; this.pageSize = 10;
this.current_page = 1; this.current_page = 1;
this.query_zhdt_data(1); if(this.form.extraProperty['Twitter账号'].value==''){
this.$message.warning('Twitter账号不能为空！');
}else{
this.query_zhdt_data(1);
}
} else { } else {
this.dialogVisible_gd = true; this.dialogVisible_gd = true;
this.title_gd = item; this.title_gd = item;
...@@ -838,6 +817,7 @@ export default { ...@@ -838,6 +817,7 @@ export default {
}, },
query_CharacterMould(id) { query_CharacterMould(id) {
let _this = this;
get("api/rest/mongo/template/query?id=" + id) get("api/rest/mongo/template/query?id=" + id)
.then((datas) => { .then((datas) => {
this.xzzd = []; this.xzzd = [];
...@@ -893,14 +873,28 @@ export default { ...@@ -893,14 +873,28 @@ export default {
}); });
}); });
} }
if (this.wzmk_data.length > 0) {
this.wzmk_data.forEach((item) => {
if (item.type == 3) {
this.currentRole_rw = "navs_rwk";
setTimeout(() => {
_this.clientDetails_rw = {
module_id: _this.form.rwbh.value,
types: "1",
peopleOrOrganization: "character",
};
}, 500);
}
});
}
} }
}) })
.catch((err) => { .catch((err) => {
this.$message.warning(err.message); this.$message.warning(err.message);
}); });
}, },
query_Twitter(id) { query_Twitter(account) {
get("api/rest/fulltext/queryRelationTwitter?characterId=" + id) get("api/rest/elastic/queryRelationTwitter?pageNum=1&pageSize=10&twitterAccount=" + account)
.then((data) => { .then((data) => {
let arr_news_twitter = []; let arr_news_twitter = [];
if (data.list.length > 0) { if (data.list.length > 0) {
...@@ -962,76 +956,18 @@ export default { ...@@ -962,76 +956,18 @@ export default {
return r; return r;
}, },
query_rw() { query_rw() {
get("api/rest/resource/queryResourceTree?module=" + this.module_name) post(
`api/rest/mongo/character/query?pageNum=${1}&pageSize=${20}`,
{
module: this.form.module,
orgId: this.form.orgId,
}
)
.then((res) => { .then((res) => {
let optinon_s = []; this.xgnr_xgrw = [];
if (res.length > 0) { res.records.forEach((item) => {
optinon_s = this.jsonToArray(res); if(this.form._id!=item._id)
} else { this.xgnr_xgrw.push(item);
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(
`api/rest/resource/queryDynamicCharacter?pageNum=${1}&pageSize=${20}`,
{
mould: this.form.mould,
// "baseProperty.姓名": "",
"baseProperty.所在机构": this.form.baseProperty["所在机构编号"],
}
)
.then((res) => {
this.xgnr_xgrw = [];
res.list.forEach((item) => {
if (this.form._id != item._id) {
this.xgnr_xgrw.push(item);
}
});
this.xgnr_xgrw.forEach((item) => {
item.photos =
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;
}
});
})
.catch((err) => {
this.$message.warning(err.message);
});
}); });
}) })
.catch((err) => { .catch((err) => {
...@@ -1040,10 +976,10 @@ export default { ...@@ -1040,10 +976,10 @@ export default {
}, },
query_xgyl(id) { query_xgyl(id) {
let _this = this; let _this = this;
_this.query_tree(); // _this.query_tree();
_this.query_rw(); _this.query_rw();
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"相关舆情" "相关舆情"
...@@ -1052,14 +988,14 @@ export default { ...@@ -1052,14 +988,14 @@ export default {
this.xgnr_xgyq = data.list; this.xgnr_xgyq = data.list;
let condition = { let condition = {
txt: txt:
this.form.baseProperty["外文名"] == "" || this.form.wwm.value == "" ||
this.form.baseProperty["外文名"] == null || this.form.wwm.value == null ||
this.form.baseProperty["外文名"] == undefined this.form.wwm.value == undefined
? this.form.baseProperty["姓名"] ? this.form.xm.value
: this.form.baseProperty["外文名"], : this.form.wwm.value,
}; };
post( post(
"api/rest/fulltext/queryNews?pageNum=" + 1 + "&pageSize=" + 10 + "", "api/rest/elastic/queryNews?pageNum=" + 1 + "&pageSize=" + 10 + "",
condition condition
) )
.then((data) => { .then((data) => {
...@@ -1084,7 +1020,7 @@ export default { ...@@ -1084,7 +1020,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"相关活动" "相关活动"
...@@ -1096,7 +1032,7 @@ export default { ...@@ -1096,7 +1032,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"相关专著" "相关专著"
...@@ -1108,7 +1044,7 @@ export default { ...@@ -1108,7 +1044,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"相关言论" "相关言论"
...@@ -1120,7 +1056,7 @@ export default { ...@@ -1120,7 +1056,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"关键影响人物" "关键影响人物"
...@@ -1132,7 +1068,7 @@ export default { ...@@ -1132,7 +1068,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"攻击建议" "攻击建议"
...@@ -1144,27 +1080,13 @@ export default { ...@@ -1144,27 +1080,13 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"评价言论" "评价言论"
) )
.then((data) => { .then((data) => {
this.xgnr_pjyl = data.list; this.xgnr_pjyl = data.list;
if (this.wzmk_data.length > 0) {
this.wzmk_data.forEach((item) => {
if (item.type == 3) {
this.currentRole_rw = "navs_rwk";
setTimeout(() => {
_this.clientDetails_rw = {
module_id: parseInt(_this.form.extraProperty["id"]),
types: "2",
peopleOrOrganization: "character",
};
}, 500);
}
});
}
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
...@@ -1195,7 +1117,7 @@ export default { ...@@ -1195,7 +1117,7 @@ export default {
get("api/rest/document/queryLiterature?id=" + item.objectFrom) get("api/rest/document/queryLiterature?id=" + item.objectFrom)
.then((data) => { .then((data) => {
if (data.list.length == 0) { if (data.list.length == 0) {
this.$message.warning("当前关联文献未找到"); this.$message.warning("当前关联文献未找到！！！");
} else { } else {
window.open( window.open(
"api/rest/document/viewLiterature/" + "api/rest/document/viewLiterature/" +
...@@ -1276,14 +1198,11 @@ export default { ...@@ -1276,14 +1198,11 @@ export default {
let obj_item = this.$route.params.key; let obj_item = this.$route.params.key;
this.form = obj_item; this.form = obj_item;
this.imageUrl = this.form.avatarUrl==null?'':this.form.avatarUrl; this.imageUrl = this.form.avatarUrl==null?'':this.form.avatarUrl;
obj_item.templateId == undefined this.query_CharacterMould(obj_item.templateId);
? ""
: this.query_CharacterMould(obj_item.templateId);
// obj_item._id == undefined ? "" : this.query_xgyl(obj_item._id); this.query_xgyl(obj_item.rwbh.value);
// obj_item.extraProperty.id == undefined this.query_jg();
// ? "" this.form.extraProperty['Twitter账号'].value!=''?this.query_Twitter(this.form.extraProperty['Twitter账号'].value):'';
// : this.query_Twitter(obj_item.extraProperty.id);
}, },
jsonToArray(nodes) { jsonToArray(nodes) {
var r = []; var r = [];
...@@ -1304,6 +1223,25 @@ export default { ...@@ -1304,6 +1223,25 @@ export default {
query_selector(selector) { query_selector(selector) {
return Array.from(document.querySelectorAll(selector)); return Array.from(document.querySelectorAll(selector));
}, },
query_jg(){
get("api/rest/mongo/organization/queryTree?module=" + this.form.module)
.then((res) => {
let options_online = [];
if (res.length > 0) {
options_online = this.jsonToArray(res);
}
if (this.form.orgId != "") {
let jg_name = options_online.find(
(e) => e.code == this.form.orgId
);
this.form.orgId1 =
jg_name == undefined ? "此机构已删除，无法匹配" : jg_name.label;
}
})
.catch((err) => {
this.$message.warning(err.message);
});
}
}, },
mounted() { mounted() {
// this.query(); // this.query();
...@@ -1325,14 +1263,23 @@ export default { ...@@ -1325,14 +1263,23 @@ export default {
} }
}); });
}); });
this.query_selector(".pub-td2").forEach(function (item) {
observer.observe(item);
});
this.query_selector(".img-div").forEach(function (item) {
observer.observe(item);
});
let _this = this; let _this = this;
let timesaa = setInterval(function () {
if (_this.query_selector(".pub-td2").length > 0) {
_this.query_selector(".pub-td2").forEach(function (item) {
observer.observe(item);
});
clearInterval(timesaa);
}
}, 100);
let timesaa1 = setInterval(function () {
if (_this.query_selector(".img-div").length > 0) {
_this.query_selector(".img-div").forEach(function (item) {
observer.observe(item);
});
clearInterval(timesaa1);
}
}, 100);
let times = setInterval(function () { let times = setInterval(function () {
if (_this.query_selector(".tablesss").length > 0) { if (_this.query_selector(".tablesss").length > 0) {
_this.query_selector(".tablesss").forEach(function (item) { _this.query_selector(".tablesss").forEach(function (item) {
...@@ -1357,7 +1304,7 @@ export default { ...@@ -1357,7 +1304,7 @@ export default {
clearInterval(times2); clearInterval(times2);
} }
}, 100); }, 100);
var observer1 = new IntersectionObserver(function (changes) { var observer1 = new IntersectionObserver(function (changes) {
changes.forEach(function (change) { changes.forEach(function (change) {
var container = change.target; var container = change.target;
...@@ -1371,7 +1318,7 @@ export default { ...@@ -1371,7 +1318,7 @@ export default {
} }
}); });
}); });
let times1 = setInterval(function () { let times1 = setInterval(function () {
if (_this.query_selector(".test-td-pub-td1").length > 0) { if (_this.query_selector(".test-td-pub-td1").length > 0) {
_this.query_selector(".test-td-pub-td1").forEach(function (item) { _this.query_selector(".test-td-pub-td1").forEach(function (item) {
...@@ -1380,15 +1327,33 @@ export default { ...@@ -1380,15 +1327,33 @@ export default {
clearInterval(times1); clearInterval(times1);
} }
}, 100); }, 100);
this.query_selector(".pub-td1").forEach(function (item) {
observer1.observe(item); let times21 = setInterval(function () {
}); if (_this.query_selector(".pub-td1").length > 0) {
this.query_selector(".xgnr-div").forEach(function (item) { _this.query_selector(".pub-td1").forEach(function (item) {
observer1.observe(item); observer1.observe(item);
}); });
this.query_selector(".xgnr-span").forEach(function (item) { clearInterval(times21);
observer1.observe(item); }
}); }, 100);
let times22 = setInterval(function () {
if (_this.query_selector(".xgnr-div").length > 0) {
_this.query_selector(".xgnr-div").forEach(function (item) {
observer1.observe(item);
});
clearInterval(times22);
}
}, 100);
let times23 = setInterval(function () {
if (_this.query_selector(".test-td-pub-td2").length > 0) {
_this.query_selector(".xgnr-span").forEach(function (item) {
observer1.observe(item);
});
clearInterval(times23);
}
}, 100);
}, },
}; };
</script> </script>
...@@ -1821,5 +1786,8 @@ export default { ...@@ -1821,5 +1786,8 @@ export default {
} }
} }
} }
#_plscs .el-dialog__body{
padding: 0px 20px;
}
} }
</style> </style>
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
...@@ -76,147 +76,43 @@ ...@@ -76,147 +76,43 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1" style="width:60px">部队代号</td> <td class="pub-td1" style="width:60px">机构番号</td>
<td class="pub-td2"> <td class="pub-td2">
<span v-if="!true_edit">{{form.bddh ? form.bddh.value:''}}</span> <span v-if="!true_edit">{{form.jgfh ? form.jgfh.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && !form.bddh.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.jgfh?!form.jgfh.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.bddh.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.jgfh?form.jgfh.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input <el-input
v-if="true_edit" v-if="true_edit"
v-model="form.bddh.value" v-model="form.jgfh.value"
placeholder="请输入内容" placeholder="请输入内容"
:readonly="form.bddh.confirmed" :readonly="form.jgfh.confirmed"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment.bddh" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bddh',true)"></i> <i v-if="true_edit && !arr_table_comment.jgfh" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jgfh',true)"></i>
<i v-if="true_edit && !arr_table_comment.bddh" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bddh',false)"></i> <i v-if="true_edit && !arr_table_comment.jgfh" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jgfh',false)"></i>
</td> </td>
<td class="pub-td1" style="width:60px">部队泛称</td> <td class="pub-td1" style="width:60px">机构简称</td>
<td class="pub-td2"> <td class="pub-td2">
<span v-if="!true_edit">{{ <span v-if="!true_edit">{{
form.bdfc ? form.bdfc.value:'' form.jgjc ? form.jgjc.value:''
}}</span> }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.bdfc.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.jgjc?!form.jgjc.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.bdfc.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.jgjc?form.jgjc.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input <el-input
v-if="true_edit" v-if="true_edit"
v-model="form.bdfc.value" v-model="form.jgjc.value"
placeholder="请输入内容" placeholder="请输入内容"
:readonly="form.bdfc.confirmed" :readonly="form.jgjc.confirmed"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment.bdfc" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bdfc',true)"></i> <i v-if="true_edit && !arr_table_comment.jgjc" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jgjc',true)"></i>
<i v-if="true_edit && !arr_table_comment.bdfc" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bdfc',false)"></i> <i v-if="true_edit && !arr_table_comment.jgjc" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jgjc',false)"></i>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">部队番号</td>
<td class="pub-td2">
<span v-if="!true_edit">{{ form.bdfh ? form.bdfh.value:'' }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.bdfh.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.bdfh.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.bdfh.value"
placeholder="请输入内容"
:readonly="form.bdfh.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.bdfh" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bdfh',true)"></i>
<i v-if="true_edit && !arr_table_comment.bdfh" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bdfh',false)"></i>
</td>
<td class="pub-td1">部队简称</td>
<td class="pub-td2">
<span v-if="!true_edit">{{ form.bdjc ? form.bdjc.value:'' }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.bdjc.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.bdjc.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.bdjc.value"
placeholder="请输入内容"
:readonly="form.bdjc.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.bdjc" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bdjc',true)"></i>
<i v-if="true_edit && !arr_table_comment.bdjc" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bdjc',false)"></i>
</td>
</tr>
<tr>
<td class="pub-td1">编制番号</td>
<td class="pub-td2">
<span v-if="!true_edit">{{ form.bzfh ? form.bzfh.value:'' }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.bzfh.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.bzfh.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.bzfh.value"
placeholder="请输入内容"
:readonly="form.bzfh.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.bzfh" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bzfh',true)"></i>
<i v-if="true_edit && !arr_table_comment.bzfh" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bzfh',false)"></i>
</td>
<td class="pub-td1">战时代号</td>
<td class="pub-td2">
<span v-if="!true_edit">{{ form.zsdh ? form.zsdh.value:'' }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.zsdh.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.zsdh.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.zsdh.value"
placeholder="请输入内容"
:readonly="form.zsdh.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.zsdh" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('zsdh',true)"></i>
<i v-if="true_edit && !arr_table_comment.zsdh" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('zsdh',false)"></i>
</td>
</tr>
<tr>
<td class="pub-td1">密级</td>
<td class="pub-td2">
<span v-if="!true_edit">{{ form.mj ? form.mj.value:'' }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.mj.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.mj.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.mj.value"
placeholder="请输入内容"
:readonly="form.mj.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.mj" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('mj',true)"></i>
<i v-if="true_edit && !arr_table_comment.mj" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('mj',false)"></i>
</td>
<td class="pub-td1">部队类别</td>
<td class="pub-td2">
<span v-if="!true_edit">{{ form.bdlb ? form.bdlb.value:'' }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.bdlb.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.bdlb.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.bdlb.value"
placeholder="请输入内容"
:readonly="form.bdlb.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.bdlb" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bdlb',true)"></i>
<i v-if="true_edit && !arr_table_comment.bdlb" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bdlb',false)"></i>
</td>
</tr>
<tr>
<td class="pub-td1">兵种</td>
<td class="pub-td2">
<span v-if="!true_edit">{{ form.bz ? form.bz.value:'' }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.bz.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.bz.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.bz.value"
placeholder="请输入内容"
:readonly="form.bz.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.bz" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bz',true)"></i>
<i v-if="true_edit && !arr_table_comment.bz" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bz',false)"></i>
</td>
<td class="pub-td1">国家地区</td> <td class="pub-td1">国家地区</td>
<td class="pub-td2"> <td class="pub-td2">
<span v-if="!true_edit">{{ form.gjdq ? form.gjdq.value:'' }}</span> <span v-if="!true_edit">{{ form.gjdq ? form.gjdq.value:'' }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.gjdq.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.gjdq?!form.gjdq.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.gjdq.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.gjdq?form.gjdq.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input <el-input
v-if="true_edit" v-if="true_edit"
v-model="form.gjdq.value" v-model="form.gjdq.value"
...@@ -226,113 +122,55 @@ ...@@ -226,113 +122,55 @@
<i v-if="true_edit && !arr_table_comment.gjdq" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('gjdq',true)"></i> <i v-if="true_edit && !arr_table_comment.gjdq" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('gjdq',true)"></i>
<i v-if="true_edit && !arr_table_comment.gjdq" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('gjdq',false)"></i> <i v-if="true_edit && !arr_table_comment.gjdq" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('gjdq',false)"></i>
</td> </td>
</tr> <td class="pub-td1">机构类别</td>
<tr>
<td class="pub-td1">军种</td>
<td class="pub-td2">
<span v-if="!true_edit">{{ form.jz ? form.jz.value:'' }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.jz.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.jz.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.jz.value"
placeholder="请输入内容"
:readonly="form.jz.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.jz" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jz',true)"></i>
<i v-if="true_edit && !arr_table_comment.jz" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jz',false)"></i>
</td>
<td class="pub-td1">地名</td>
<td class="pub-td2" colspan="3">
<span v-if="!true_edit">{{ form.dm ? form.dm.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && !form.dm.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.dm.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.dm.value"
placeholder="请输入内容"
:readonly="form.dm.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.dm" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('dm',true)"></i>
<i v-if="true_edit && !arr_table_comment.dm" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('dm',false)"></i>
</td>
</tr>
<tr>
<td class="pub-td1">军队区分</td>
<td class="pub-td2"> <td class="pub-td2">
<span v-if="!true_edit">{{ form.jdqf ? form.jdqf.value:'' }}</span> <span v-if="!true_edit">{{ form.jglb ? form.jglb.value:'' }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.jdqf.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.jglb?!form.jglb.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.jdqf.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.jglb?form.jglb.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input <el-input
v-if="true_edit" v-if="true_edit"
v-model="form.jdqf.value" v-model="form.jglb.value"
placeholder="请输入内容" placeholder="请输入内容"
:readonly="form.jdqf.confirmed" :readonly="form.jglb.confirmed"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment.jdqf" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jdqf',true)"></i> <i v-if="true_edit && !arr_table_comment.jglb" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jglb',true)"></i>
<i v-if="true_edit && !arr_table_comment.jdqf" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jdqf',false)"></i> <i v-if="true_edit && !arr_table_comment.jglb" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jglb',false)"></i>
</td>
<td class="pub-td1">情报提供单位</td>
<td class="pub-td2" colspan="3">
<span v-if="!true_edit">{{ form.qbtgdw ? form.qbtgdw.value:'' }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.qbtgdw.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.qbtgdw.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.qbtgdw.value"
placeholder="请输入内容"
:readonly="form.qbtgdw.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.qbtgdw" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('qbtgdw',true)"></i>
<i v-if="true_edit && !arr_table_comment.qbtgdw" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('qbtgdw',false)"></i>
</td> </td>
</tr> </tr>
<tr> <tr v-for="(item, index) in xzzd" style="position: relative" v-if="xzzd.length>0 && index<=Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1">
<td class="pub-td1">部队等级</td> <td class="pub-td1">{{ xzzd[2*index].comment }}</td>
<td class="pub-td2"> <td class="pub-td2" :colspan="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2==0?'':'3':''" v-if="form.extraProperty">
<span v-if="!true_edit">{{ form.bddj ? form.bddj.value:'' }}</span> <span v-if="!true_edit">{{
<i v-if="$route.meta.gly && !true_edit && !form.bddj.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> form.extraProperty[xzzd[2*index].comment]?form.extraProperty[xzzd[2*index].comment].value:''
<i v-if="$route.meta.gly && !true_edit && form.bddj.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> }}</span>
<el-input <i v-if="$route.meta.gly && !true_edit && form.extraProperty[xzzd[2*index].comment]?!form.extraProperty[xzzd[2*index].comment].confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
v-if="true_edit" <i v-if="$route.meta.gly && !true_edit && form.extraProperty[xzzd[2*index].comment]?form.extraProperty[xzzd[2*index].comment].confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
v-model="form.bddj.value"
placeholder="请输入内容"
:readonly="form.bddj.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.bddj" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bddj',true)"></i>
<i v-if="true_edit && !arr_table_comment.bddj" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bddj',false)"></i>
</td>
<td class="pub-td1">战备等级</td>
<td class="pub-td2" colspan="3">
<span v-if="!true_edit">{{ form.zbdj ? form.zbdj.value:'' }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.zbdj.confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.zbdj.confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input <el-input
v-if="true_edit" v-if="true_edit"
v-model="form.zbdj.value" v-model="form.extraProperty[xzzd[2*index].comment].value"
placeholder="请输入内容" placeholder="请输入内容"
:readonly="form.zbdj.confirmed" :readonly="form.extraProperty[xzzd[2*index].comment]?form.extraProperty[xzzd[2*index].comment].confirmed:false"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment.zbdj" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('zbdj',true)"></i> <i v-if="true_edit && !arr_table_comment[xzzd[2*index].comment]" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm(xzzd[2*index].comment,true,true)"></i>
<i v-if="true_edit && !arr_table_comment.zbdj" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('zbdj',false)"></i> <i v-if="true_edit && !arr_table_comment[xzzd[2*index].comment]" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm(xzzd[2*index].comment,false,true)"></i>
</td> </td>
</tr>
<tr v-for="(item, index) in xzzd" style="position: relative">
<td class="pub-td1">{{ item.comment }}</td> <td class="pub-td1" v-if="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2!=0?false:true:true">{{ xzzd[2*index+1].comment }}</td>
<td class="pub-td2" colspan="5" v-if="form.extraProperty"> <td class="pub-td2" v-if="form.extraProperty&&index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2!=0?false:true:true">
<span v-if="!true_edit">{{ <span v-if="!true_edit">{{
form.extraProperty[item.comment] ? form.extraProperty[item.comment].value:'' form.extraProperty[xzzd[2*index+1].comment]?form.extraProperty[xzzd[2*index+1].comment].value:''
}}</span> }}</span>
<i v-if="$route.meta.gly && !true_edit && !form.extraProperty[item.comment].confirmed" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.extraProperty[xzzd[2*index+1].comment]?!form.extraProperty[xzzd[2*index+1].comment].confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.extraProperty[item.comment].confirmed" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.extraProperty[xzzd[2*index+1].comment]?form.extraProperty[xzzd[2*index+1].comment].confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input <el-input
v-if="true_edit" v-if="true_edit"
v-model="form.extraProperty[item.comment].value" v-model="form.extraProperty[xzzd[2*index+1].comment].value"
placeholder="请输入内容" placeholder="请输入内容"
:readonly="form.extraProperty[item.comment].confirmed" :readonly="form.extraProperty[xzzd[2*index+1].comment]?form.extraProperty[xzzd[2*index+1].comment].confirmed:false"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment[item.comment]" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm(item.comment,true,true)"></i> <i v-if="true_edit && !arr_table_comment[xzzd[2*index+1].comment]" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm(xzzd[2*index+1].comment,true,true)"></i>
<i v-if="true_edit && !arr_table_comment[item.comment]" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm(item.comment,false,true)"></i> <i v-if="true_edit && !arr_table_comment[xzzd[2*index+1].comment]" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm(xzzd[2*index+1].comment,false,true)"></i>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -453,22 +291,18 @@ ...@@ -453,22 +291,18 @@
<span>暂无数据接入</span> <span>暂无数据接入</span>
</div> </div>
<ul v-if="xgnr_xgrw.length != 0"> <ul v-if="xgnr_xgrw.length != 0">
<li <li v-for="item in xgnr_xgrw" :title="item.xm.value == undefined ||
v-for="item in xgnr_xgrw" item.xm.value == '' ||
:title=" item.xm.value == null
item.baseProperty['外文名'] == undefined || ? item.wwm.value
item.baseProperty['外文名'] == '' || : item.xm.value
item.baseProperty['外文名'] == null ">
? item.baseProperty['姓名']
: item.baseProperty['外文名']
"
>
<span>{{ <span>{{
item.baseProperty["外文名"] == undefined || item.xm.value == undefined ||
item.baseProperty["外文名"] == "" || item.xm.value == "" ||
item.baseProperty["外文名"] == null item.xm.value == null
? item.baseProperty["姓名"] ? item.wwm.value
: item.baseProperty["外文名"] + " 相关人员" : item.xm.value + " 相关人员"
}}</span> }}</span>
</li> </li>
</ul> </ul>
...@@ -731,24 +565,10 @@ export default { ...@@ -731,24 +565,10 @@ export default {
selectText: "", selectText: "",
organization: {}, organization: {},
arr_table_comment_jgk: { arr_table_comment_jgk: {
bddh:false, jgfh:false,
bdfh:false, jgjc:false,
jgbh:false,
bdfc:false,
bzfh:false,
bdjc:false,
zsdh:false,
mj:false,
bdlb:false,
bz:false,
gjdq:false, gjdq:false,
jz:false, jglb:false,
dm:false,
jdqf:false,
qbtgdw:false,
bddj:false,
zbdj:false,
photos:false,
}, },
arr_table_comment:{ arr_table_comment:{
...@@ -803,7 +623,7 @@ export default { ...@@ -803,7 +623,7 @@ export default {
if (res == 1) { if (res == 1) {
this.$message.success("攻击建议新增成功！"); this.$message.success("攻击建议新增成功！");
this.dialogVisibleOrganization = false; this.dialogVisibleOrganization = false;
this.query_xgyl(this.form._id); this.query_xgyl(this.form.jgbh);
} else { } else {
this.$message.error("关联机构失败！"); this.$message.error("关联机构失败！");
} }
...@@ -905,7 +725,7 @@ export default { ...@@ -905,7 +725,7 @@ export default {
}, },
edit_onSubmit() { edit_onSubmit() {
let obj_from = JSON.parse(JSON.stringify(this.form)); let obj_from = JSON.parse(JSON.stringify(this.form));
obj_from.label = obj_from.bdfh.value; obj_from.label = obj_from.jgfh.value;
obj_from.code = obj_from.jgbh.value; obj_from.code = obj_from.jgbh.value;
let obj_froms = JSON.parse(JSON.stringify(obj_from)); let obj_froms = JSON.parse(JSON.stringify(obj_from));
let obj_mouldTables = {}; let obj_mouldTables = {};
...@@ -956,24 +776,11 @@ export default { ...@@ -956,24 +776,11 @@ export default {
this.upload_head(obj_from,obj_froms); this.upload_head(obj_from,obj_froms);
}, },
edit(obj_from,forms) { edit(obj_from,forms) {
obj_from.bddh = obj_from.bddh.value; obj_from.jgfh = obj_from.jgfh.value;
obj_from.bdfh = obj_from.bdfh.value; obj_from.jgjc = obj_from.jgjc.value;
obj_from.jgbh = obj_from.jgbh.value; obj_from.jgbh = obj_from.jgbh.value;
obj_from.bdfc = obj_from.bdfc.value;
obj_from.bzfh = obj_from.bzfh.value;
obj_from.bdjc = obj_from.bdjc.value;
obj_from.zsdh = obj_from.zsdh.value;
obj_from.mj = obj_from.mj.value;
obj_from.bdlb = obj_from.bdlb.value;
obj_from.bz = obj_from.bz.value;
obj_from.gjdq = obj_from.gjdq.value; obj_from.gjdq = obj_from.gjdq.value;
obj_from.jz = obj_from.jz.value; obj_from.jglb = obj_from.jglb.value;
obj_from.dm = obj_from.dm.value;
obj_from.jdqf = obj_from.jdqf.value;
obj_from.qbtgdw = obj_from.qbtgdw.value;
obj_from.bddj = obj_from.bddj.value;
obj_from.zbdj = obj_from.zbdj.value;
obj_from.avatar = obj_from.avatar;
let paramDatas = { let paramDatas = {
...obj_from ...obj_from
}; };
...@@ -1094,6 +901,17 @@ export default { ...@@ -1094,6 +901,17 @@ export default {
} }
} }
}); });
if (this.wzmk_data.length > 0) {
this.wzmk_data.forEach((item) => {
if (item.type == 3) {
this.clientDetails_rw = {
module_id: this.form.jgbh.value,
types: "1",
peopleOrOrganization: "organization",
};
}
});
}
} }
this.xgnr_wd = []; this.xgnr_wd = [];
this.xgnr_ssjd = []; this.xgnr_ssjd = [];
...@@ -1104,15 +922,36 @@ export default { ...@@ -1104,15 +922,36 @@ export default {
this.xgnr_pjyl = []; this.xgnr_pjyl = [];
this.xgnr_jgfxbg = []; this.xgnr_jgfxbg = [];
this.xgnr_gjyxrw = []; this.xgnr_gjyxrw = [];
// this.form.extraProperty != undefined this.organization.extraProperty['Twitter账号'].value!=''?this.query_Twitter(this.organization.extraProperty['Twitter账号'].value):'';
// ? this.query_Twitter(this.form.extraProperty.id) // this.query_xgyl(this.form.jgbh.value);//右侧信息
// : "";//Twitter信息
// this.query_xgyl(this.form._id);//右侧信息
}, },
query_Twitter(id) { query_Twitter(account) {
get("api/rest/fulltext/queryRelationTwitter?characterId=" + id) get("api/rest/elastic/queryRelationTwitter?pageNum=1&pageSize=10&twitterAccount=" + account)
.then((data) => { .then((data) => {
this.xgnr_wd = data.list; let arr_news_twitter = [];
if (data.list.length > 0) {
data.list.forEach((item) => {
arr_news_twitter.push({
title: "", //标题
txt: item.txt_zh, //内容
site_name: item.fullname, //来自
pubdate: item.timestr, //发布时间
snatch_time: item.input_time, //抓取时间
highLight: item.highLight, //高亮
cmtcnt: item.cmtcnt, //评论数
rpscnt: item.rpscnt, //转发数
atdcnt: item.atdcnt, //点赞数
isori: item.isori, //是否原创
tweets_id: item.tweets_id, //是twitter_id
blogger_id: item.blogger_id, //用户查询用户信息
tweets_url: item.tweets_url, //原文链接
txt_zh: item.txt_zh,
title_zh: "", //标题
emotion1: item.emotion1,
});
});
}
this.xgnr_wd = arr_news_twitter;
}) })
.catch((err) => { .catch((err) => {
this.$message.warning(err.message); this.$message.warning(err.message);
...@@ -1149,76 +988,17 @@ export default { ...@@ -1149,76 +988,17 @@ export default {
return r; return r;
}, },
query_rw() { query_rw() {
get("api/rest/resource/queryResourceTree?module=" + "DF") post(
`api/rest/mongo/character/query?pageNum=${1}&pageSize=${20}`,
{
module: this.form.module,
orgId: this.form.jgbh.value,
}
)
.then((res) => { .then((res) => {
let optinon_s = []; this.xgnr_xgrw = [];
if (res.length > 0) { res.records.forEach((item) => {
optinon_s = this.jsonToArray(res); this.xgnr_xgrw.push(item);
} else {
this.optinon_s = [];
}
get(
"api/rest/resource/queryResourceTreeOnline?module=" + "DFWW"
).then((res) => {
let options_s_online = [];
if (res.length > 0) {
options_s_online = this.jsonToArray(res);
} else {
options_s_online = [];
}
post(
`api/rest/resource/queryDynamicCharacter?pageNum=${1}&pageSize=${20}`,
{
mould:
this.form.mould == "敌方外网资源机构"
? "敌方外网资源"
: "敌方资源",
"baseProperty.所在机构": this.form.baseProperty["机构编号"],
}
)
.then((res) => {
this.xgnr_xgrw = [];
res.list.forEach((item) => {
if (this.form._id != item._id) {
this.xgnr_xgrw.push(item);
}
});
this.xgnr_xgrw.forEach((item) => {
item.photos = 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.templateId) {
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;
}
});
})
.catch((err) => {
this.$message.warning(err.message);
});
}); });
}) })
.catch((err) => { .catch((err) => {
...@@ -1229,7 +1009,7 @@ export default { ...@@ -1229,7 +1009,7 @@ export default {
this.query_tree(); this.query_tree();
this.query_rw(); this.query_rw();
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"所属基地" "所属基地"
...@@ -1241,7 +1021,7 @@ export default { ...@@ -1241,7 +1021,7 @@ export default {
this.$message.warning(err.message); this.$message.warning(err.message);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"所属部队" "所属部队"
...@@ -1253,7 +1033,7 @@ export default { ...@@ -1253,7 +1033,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"相关舆情" "相关舆情"
...@@ -1265,7 +1045,7 @@ export default { ...@@ -1265,7 +1045,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"证据资料" "证据资料"
...@@ -1277,7 +1057,7 @@ export default { ...@@ -1277,7 +1057,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"攻击建议" "攻击建议"
...@@ -1289,7 +1069,7 @@ export default { ...@@ -1289,7 +1069,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"评价言论" "评价言论"
...@@ -1301,7 +1081,7 @@ export default { ...@@ -1301,7 +1081,7 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"关键影响人物" "关键影响人物"
...@@ -1313,24 +1093,13 @@ export default { ...@@ -1313,24 +1093,13 @@ export default {
console.log(err); console.log(err);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject=" + "api/rest/3z/resource/queryRelatedInfo?subject=" +
id + id +
"&relation=" + "&relation=" +
"机构分析报告" "机构分析报告"
) )
.then((data) => { .then((data) => {
this.xgnr_jgfxbg = data.list; this.xgnr_jgfxbg = data.list;
if (this.wzmk_data.length > 0) {
this.wzmk_data.forEach((item) => {
if (item.type == 3) {
this.clientDetails_rw = {
module_id: parseInt(this.form.extraProperty["id"]),
types: "2",
peopleOrOrganization: "organization",
};
}
});
}
}) })
.catch((err) => { .catch((err) => {
console.log(err); console.log(err);
......
src/view/sjgl/jgk_data_public.vue
View file @ 0e265c1c
...@@ -100,40 +100,22 @@ ...@@ -100,40 +100,22 @@
</el-tooltip> </el-tooltip>
<table class="table_jbxx"> <table class="table_jbxx">
<tr> <tr>
<td class="pub-td1">部队代号</td>
<td class="pub-td2">
<el-input
v-model="form_add_ww[0].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1"> <td class="pub-td1">
<span style="margin-right: 5px; color: #de3333">*</span>部队番号 <span style="margin-right: 5px; color: #de3333">*</span>机构编号
</td> </td>
<td class="pub-td2"> <td class="pub-td2">
<el-input <el-input
v-model="form_add_ww[1].value" v-model="form_add_ww[0].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
></el-input> ></el-input>
</td> </td>
</tr>
<tr>
<td class="pub-td1"> <td class="pub-td1">
<span style="margin-right: 5px; color: #de3333">*</span>机构编号 <span style="margin-right: 5px; color: #de3333">*</span>机构番号
</td> </td>
<td class="pub-td2"> <td class="pub-td2">
<el-input <el-input
v-model="form_add_ww[2].value" v-model="form_add_ww[1].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1">部队泛称</td>
<td class="pub-td2">
<el-input
v-model="form_add_ww[3].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
></el-input> ></el-input>
...@@ -158,54 +140,10 @@ ...@@ -158,54 +140,10 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">编制番号</td> <td class="pub-td1">机构简称</td>
<td class="pub-td2"> <td class="pub-td2" colspan="3">
<el-input
v-model="form_add_ww[4].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1">部队简称</td>
<td class="pub-td2">
<el-input
v-model="form_add_ww[5].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
</tr>
<tr>
<td class="pub-td1">战时代号</td>
<td class="pub-td2">
<el-input
v-model="form_add_ww[6].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1">密级</td>
<td class="pub-td2">
<el-input
v-model="form_add_ww[7].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
</tr>
<tr>
<td class="pub-td1">部队类别</td>
<td class="pub-td2">
<el-input
v-model="form_add_ww[8].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1">兵种</td>
<td class="pub-td2">
<el-input <el-input
v-model="form_add_ww[9].value" v-model="form_add_ww[2].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
></el-input> ></el-input>
...@@ -215,74 +153,35 @@ ...@@ -215,74 +153,35 @@
<td class="pub-td1">国家地区</td> <td class="pub-td1">国家地区</td>
<td class="pub-td2"> <td class="pub-td2">
<el-input <el-input
v-model="form_add_ww[10].value" v-model="form_add_ww[3].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1">军种</td>
<td class="pub-td2">
<el-input
v-model="form_add_ww[11].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
</tr>
<tr>
<td class="pub-td1">地名</td>
<td class="pub-td2">
<el-input
v-model="form_add_ww[12].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1">军队区分</td>
<td class="pub-td2">
<el-input
v-model="form_add_ww[13].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
</tr>
<tr>
<td class="pub-td1">情报提供单位</td>
<td class="pub-td2">
<el-input
v-model="form_add_ww[14].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1">部队等级</td>
<td class="pub-td2">
<el-input
v-model="form_add_ww[15].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
></el-input> ></el-input>
</td> </td>
</tr> <td class="pub-td1">机构类别</td>
<tr>
<td class="pub-td1">战备等级</td>
<td class="pub-td2"> <td class="pub-td2">
<el-input <el-input
v-model="form_add_ww[16].value" v-model="form_add_ww[4].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
></el-input> ></el-input>
</td> </td>
</tr> </tr>
<tr v-for="(item, index) in xzzd" style="position: relative"> <tr v-for="(item, index) in xzzd" style="position: relative" v-if="xzzd.length>0 && index<=Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1">
<td class="pub-td1">{{ item.comment }}</td> <td class="pub-td1">{{ xzzd[2*index].comment }}</td>
<td class="pub-td2" colspan="5"> <td class="pub-td2" :colspan="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2==0?'':'3':''">
<el-input <el-input
v-model="item.value" v-model="xzzd[2*index].value"
placeholder="请输入内容" placeholder="请输入内容"
></el-input> ></el-input>
</td> </td>
<td class="pub-td1" v-if="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2!=0?false:true:true">{{ xzzd[2*index+1].comment }}</td>
<td class="pub-td2" v-if="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2!=0?false:true:true">
<el-input
v-model="xzzd[2*index+1].value"
placeholder="请输入内容"
></el-input>
</td>
</tr> </tr>
</table> </table>
</div> </div>
...@@ -459,66 +358,19 @@ export default { ...@@ -459,66 +358,19 @@ export default {
clientDetails_jg_data: {}, clientDetails_jg_data: {},
form_add: [], form_add: [],
form_add_ww: [ form_add_ww: [
{ comment: "bddh", value: "" },
{ comment: "bdfh", value: "" },
{ comment: "jgbh", value: "" }, { comment: "jgbh", value: "" },
{ comment: "bdfc", value: "" }, { comment: "jgfh", value: "" },
{ comment: "bzfh", value: "" }, { comment: "jgjc", value: "" },
{ comment: "bdjc", value: "" },
{ comment: "zsdh", value: "" },
{ comment: "mj", value: "" },
{ comment: "bdlb", value: "" },
{ comment: "bz", value: "" },
{ comment: "gjdq", value: "" }, { comment: "gjdq", value: "" },
{ comment: "jz", value: "" }, { comment: "jglb", value: "" },
{ comment: "dm", value: "" },
{ comment: "jdqf", value: "" },
{ comment: "qbtgdw", value: "" },
{ comment: "bddj", value: "" },
{ comment: "zbdj", value: "" },
{ comment: "avatar", value: "" },
],
form_add_nw: [
{ comment: "部队内码", value: "" },
{ comment: "部队番号", value: "" },
{ comment: "机构编号", value: "" },
{ comment: "编制番号", value: "" },
{ comment: "部队序号", value: "" },
{ comment: "编制序号", value: "" },
{ comment: "编制简称", value: "" },
{ comment: "部队代号", value: "" },
{ comment: "部队简称", value: "" },
{ comment: "武装力量区分", value: "" },
{ comment: "军种", value: "" },
{ comment: "兵种", value: "" },
{ comment: "级别", value: "" },
{ comment: "部队类别", value: "" },
{ comment: "建制类别", value: "" },
{ comment: "编成类别", value: "" },
{ comment: "隶属战区", value: "" },
{ comment: "保障区", value: "" },
{ comment: "供应性质", value: "" },
{ comment: "photos", value: "" },
], ],
form_add_ww_comment:[ form_add_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: "部队等级" },
{ comment: "战备等级" },
], ],
dialogVisible_people: false, dialogVisible_people: false,
dialogVisible_pldr: false, dialogVisible_pldr: false,
...@@ -788,30 +640,18 @@ export default { ...@@ -788,30 +640,18 @@ export default {
} }
}); });
let obj = { let obj = {
bddh:obj_baseProperty['部队代号'],
bdfh:obj_baseProperty['部队番号'],
jgbh:obj_baseProperty['机构编号'], jgbh:obj_baseProperty['机构编号'],
bdfc:obj_baseProperty['部队泛称'], jgfh:obj_baseProperty['机构番号'],
bzfh:obj_baseProperty['编制番号'], jgjc:obj_baseProperty['机构简称'],
bdjc:obj_baseProperty['部队简称'],
zsdh:obj_baseProperty['战时代号'],
mj:obj_baseProperty['密级'],
bdlb:obj_baseProperty['部队类别'],
bz:obj_baseProperty['兵种'],
gjdq:obj_baseProperty['国家地区'], gjdq:obj_baseProperty['国家地区'],
jz:obj_baseProperty['军种'], jglb:obj_baseProperty['机构类别'],
dm:obj_baseProperty['地名'],
jdqf:obj_baseProperty['军队区分'],
qbtgdw:obj_baseProperty['情报提供单位'],
bddj:obj_baseProperty['部队等级'],
zbdj:obj_baseProperty['战备等级'],
extraProperty: obj_extraProperty, extraProperty: obj_extraProperty,
textareaProperty: obj_textarea, textareaProperty: obj_textarea,
tableProperty: obj_mouldTables, tableProperty: obj_mouldTables,
templateId: this.option_value_rwmb_pl, templateId: this.option_value_rwmb_pl,
}; };
let a_obj = { let a_obj = {
label: item["部队番号"] + "", label: item["机构番号"] + "",
code: item["机构编号"] + "", code: item["机构编号"] + "",
module: this.type_tree_port ? "DFWW" : "DF", module: this.type_tree_port ? "DFWW" : "DF",
parentCode: item["上级机构编号"], parentCode: item["上级机构编号"],
...@@ -924,7 +764,7 @@ export default { ...@@ -924,7 +764,7 @@ export default {
this.form_add.forEach((item) => { this.form_add.forEach((item) => {
obj_jbzd[item.comment] = item.value; obj_jbzd[item.comment] = item.value;
}); });
if (obj_jbzd.bdfh == "" || obj_jbzd.jgbh == "") { if (obj_jbzd.jgfh == "" || obj_jbzd.jgbh == "") {
this.$message({ this.$message({
message: "机构编号、部队番号都不能为空", message: "机构编号、部队番号都不能为空",
type: "warning", type: "warning",
...@@ -983,7 +823,7 @@ export default { ...@@ -983,7 +823,7 @@ export default {
obj.templateId = this.option_value_rwmb; obj.templateId = this.option_value_rwmb;
let paramDatas = []; let paramDatas = [];
paramDatas.push(obj); paramDatas.push(obj);
this.upload_head(paramDatas, obj_jbzd.bdfh, obj_jbzd.jgbh); this.upload_head(paramDatas, obj_jbzd.jgfh, obj_jbzd.jgbh);
} else { } else {
this.$message({ this.$message({
message: "机构编号与数据库中重复，请修改", message: "机构编号与数据库中重复，请修改",
......
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
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
v-if="true_edit" v-if="true_edit"
v-model="form.xm.value" v-model="form.xm.value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="form.xm.confirmed" :disabled="form.xm?form.xm.confirmed:false"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment.xm" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('xm',true)"></i> <i v-if="true_edit && !arr_table_comment.xm" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('xm',true)"></i>
<i v-if="true_edit && !arr_table_comment.xm" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('xm',false)"></i> <i v-if="true_edit && !arr_table_comment.xm" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('xm',false)"></i>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
v-if="true_edit" v-if="true_edit"
v-model="form.wwm.value" v-model="form.wwm.value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="form.wwm.confirmed" :disabled="form.wwm?form.wwm.confirmed:false"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment.wwm" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('wwm',true)"></i> <i v-if="true_edit && !arr_table_comment.wwm" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('wwm',true)"></i>
<i v-if="true_edit && !arr_table_comment.wwm" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('wwm',false)"></i> <i v-if="true_edit && !arr_table_comment.wwm" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('wwm',false)"></i>
...@@ -130,52 +130,8 @@ ...@@ -130,52 +130,8 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1" style="width: 70px">身份证号码</td>
<td class="pub-td2">
<span v-if="!true_edit">{{form.sfzhm ? form.sfzhm.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && form.sfzhm?!form.sfzhm.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.sfzhm?form.sfzhm.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.sfzhm.value"
placeholder="请输入内容"
:disabled="form.sfzhm.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.sfzhm" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('sfzhm',true)"></i>
<i v-if="true_edit && !arr_table_comment.sfzhm" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('sfzhm',false)"></i>
</td>
<td class="pub-td1" style="width: 70px">军官证号码</td>
<td class="pub-td2">
<span v-if="!true_edit">{{form.jgzhm ? form.jgzhm.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && form.jgzhm?!form.jgzhm.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.jgzhm?form.jgzhm.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.jgzhm.value"
placeholder="请输入内容"
:disabled="form.jgzhm.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.jgzhm" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jgzhm',true)"></i>
<i v-if="true_edit && !arr_table_comment.jgzhm" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jgzhm',false)"></i>
</td>
</tr>
<tr>
<td class="pub-td1" style="width: 70px">级别</td>
<td class="pub-td2">
<span v-if="!true_edit">{{form.jb ? form.jb.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && form.jb?!form.jb.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.jb?form.jb.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.jb.value"
placeholder="请输入内容"
:disabled="form.jb.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.jb" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jb',true)"></i>
<i v-if="true_edit && !arr_table_comment.jb" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jb',false)"></i>
</td>
<td class="pub-td1" style="width: 70px">人物编号</td> <td class="pub-td1" style="width: 70px">人物编号</td>
<td class="pub-td2"> <td class="pub-td2" colspan="3">
<span>{{form.rwbh ? form.rwbh.value:''}}</span> <span>{{form.rwbh ? form.rwbh.value:''}}</span>
<!-- <span v-if="!true_edit">{{form.rwbh ? form.rwbh.value:''}}</span> <!-- <span v-if="!true_edit">{{form.rwbh ? form.rwbh.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && form.rwbh?!form.rwbh.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.rwbh?!form.rwbh.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
...@@ -200,7 +156,7 @@ ...@@ -200,7 +156,7 @@
v-if="true_edit" v-if="true_edit"
v-model="form.xb.value" v-model="form.xb.value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="form.xb.confirmed" :disabled="form.xb?form.xb.confirmed:false"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment.xb" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('xb',true)"></i> <i v-if="true_edit && !arr_table_comment.xb" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('xb',true)"></i>
<i v-if="true_edit && !arr_table_comment.xb" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('xb',false)"></i> <i v-if="true_edit && !arr_table_comment.xb" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('xb',false)"></i>
...@@ -214,7 +170,7 @@ ...@@ -214,7 +170,7 @@
v-if="true_edit" v-if="true_edit"
v-model="form.mz.value" v-model="form.mz.value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="form.mz.confirmed" :disabled="form.mz?form.mz.confirmed:false"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment.mz" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('mz',true)"></i> <i v-if="true_edit && !arr_table_comment.mz" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('mz',true)"></i>
<i v-if="true_edit && !arr_table_comment.mz" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('mz',false)"></i> <i v-if="true_edit && !arr_table_comment.mz" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('mz',false)"></i>
...@@ -230,7 +186,7 @@ ...@@ -230,7 +186,7 @@
v-if="true_edit" v-if="true_edit"
v-model="form.jg.value" v-model="form.jg.value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="form.jg.confirmed" :disabled="form.jg?form.jg.confirmed:false"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment.jg" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jg',true)"></i> <i v-if="true_edit && !arr_table_comment.jg" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jg',true)"></i>
<i v-if="true_edit && !arr_table_comment.jg" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jg',false)"></i> <i v-if="true_edit && !arr_table_comment.jg" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jg',false)"></i>
...@@ -244,118 +200,12 @@ ...@@ -244,118 +200,12 @@
v-if="true_edit" v-if="true_edit"
v-model="form.csrq.value" v-model="form.csrq.value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="form.csrq.confirmed" :disabled="form.csrq?form.csrq.confirmed:false"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment.csrq" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('csrq',true)"></i> <i v-if="true_edit && !arr_table_comment.csrq" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('csrq',true)"></i>
<i v-if="true_edit && !arr_table_comment.csrq" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('csrq',false)"></i> <i v-if="true_edit && !arr_table_comment.csrq" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('csrq',false)"></i>
</td> </td>
</tr> </tr>
<tr>
<td class="pub-td1">入伍日期</td>
<td class="pub-td2">
<span v-if="!true_edit">{{form.rwrq ? form.rwrq.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && form.rwrq?!form.rwrq.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.rwrq?form.rwrq.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.rwrq.value"
placeholder="请输入内容"
:disabled="form.rwrq.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.rwrq" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('rwrq',true)"></i>
<i v-if="true_edit && !arr_table_comment.rwrq" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('rwrq',false)"></i>
</td>
<td class="pub-td1">第一学历</td>
<td class="pub-td2">
<span v-if="!true_edit">{{form.dyxl ? form.dyxl.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && form.dyxl?!form.dyxl.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.dyxl?form.dyxl.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.dyxl.value"
placeholder="请输入内容"
:disabled="form.dyxl.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.dyxl" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('dyxl',true)"></i>
<i v-if="true_edit && !arr_table_comment.dyxl" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('dyxl',false)"></i>
</td>
</tr>
<tr>
<td class="pub-td1">政治面貌</td>
<td class="pub-td2">
<span v-if="!true_edit">{{form.zzmm ? form.zzmm.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && form.zzmm?!form.zzmm.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.zzmm?form.zzmm.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.zzmm.value"
placeholder="请输入内容"
:disabled="form.zzmm.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.zzmm" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('zzmm',true)"></i>
<i v-if="true_edit && !arr_table_comment.zzmm" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('zzmm',false)"></i>
</td>
<td class="pub-td1">文化程度</td>
<td class="pub-td2">
<span v-if="!true_edit">{{form.whcd ? form.whcd.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && form.whcd?!form.whcd.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.whcd?form.whcd.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.whcd.value"
placeholder="请输入内容"
:disabled="form.whcd.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.whcd" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('whcd',true)"></i>
<i v-if="true_edit && !arr_table_comment.whcd" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('whcd',false)"></i>
</td>
</tr>
<tr>
<td class="pub-td1">部队番号</td>
<td class="pub-td2">
<span v-if="!true_edit">{{form.bdfh ? form.bdfh.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && form.bdfh?!form.bdfh.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.bdfh?form.bdfh.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.bdfh.value"
placeholder="请输入内容"
:disabled="form.bdfh.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.bdfh" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bdfh',true)"></i>
<i v-if="true_edit && !arr_table_comment.bdfh" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('bdfh',false)"></i>
</td>
</tr>
<tr>
<td class="pub-td1">军衔等级</td>
<td class="pub-td2">
<span v-if="!true_edit">{{form.jxdj ? form.jxdj.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && form.jxdj?!form.jxdj.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.jxdj?form.jxdj.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.jxdj.value"
placeholder="请输入内容"
:disabled="form.jxdj.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.jxdj" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jxdj',true)"></i>
<i v-if="true_edit && !arr_table_comment.jxdj" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('jxdj',false)"></i>
</td>
<td class="pub-td1">任现军衔时间</td>
<td class="pub-td2">
<span v-if="!true_edit">{{form.rxjxsj ? form.rxjxsj.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && form.rxjxsj?!form.rxjxsj.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.rxjxsj?form.rxjxsj.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input
v-if="true_edit"
v-model="form.rxjxsj.value"
placeholder="请输入内容"
:disabled="form.rxjxsj.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.rxjxsj" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('rxjxsj',true)"></i>
<i v-if="true_edit && !arr_table_comment.rxjxsj" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('rxjxsj',false)"></i>
</td>
</tr>
<tr> <tr>
<td class="pub-td1">行政职务</td> <td class="pub-td1">行政职务</td>
<td class="pub-td2"> <td class="pub-td2">
...@@ -366,72 +216,60 @@ ...@@ -366,72 +216,60 @@
v-if="true_edit" v-if="true_edit"
v-model="form.xzzw.value" v-model="form.xzzw.value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="form.xzzw.confirmed" :disabled="form.xzzw?form.xzzw.confirmed:false"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment.xzzw" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('xzzw',true)"></i> <i v-if="true_edit && !arr_table_comment.xzzw" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('xzzw',true)"></i>
<i v-if="true_edit && !arr_table_comment.xzzw" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('xzzw',false)"></i> <i v-if="true_edit && !arr_table_comment.xzzw" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('xzzw',false)"></i>
</td> </td>
<td class="pub-td1">任现职务时间</td> <td class="pub-td1">人物类别</td>
<td class="pub-td2"> <td class="pub-td2">
<span v-if="!true_edit">{{form.rxzwsj ? form.rxzwsj.value:''}}</span> <span v-if="!true_edit">{{form.rwlb ? form.rwlb.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && form.rxzwsj?!form.rxzwsj.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.rwlb?!form.rwlb.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.rxzwsj?form.rxzwsj.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.rwlb?form.rwlb.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input <el-input
v-if="true_edit" v-if="true_edit"
v-model="form.rxzwsj.value" v-model="form.rwlb.value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="form.rxzwsj.confirmed" :disabled="form.rwlb?form.rwlb.confirmed:false"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment.rxzwsj" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('rxzwsj',true)"></i> <i v-if="true_edit && !arr_table_comment.rwlb" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('rwlb',true)"></i>
<i v-if="true_edit && !arr_table_comment.rxzwsj" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('rxzwsj',false)"></i> <i v-if="true_edit && !arr_table_comment.rwlb" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('rwlb',false)"></i>
</td> </td>
</tr> </tr>
<tr> <tr v-for="(item, index) in xzzd" style="position: relative" v-if="xzzd.length>0 && index<=Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1">
<td class="pub-td1">岗位职务层级</td> <td class="pub-td1">{{ xzzd[2*index].comment }}</td>
<td class="pub-td2"> <td class="pub-td2" :colspan="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2==0?'':'3':''" v-if="form.extraProperty">
<span v-if="!true_edit">{{form.gwzwcj ? form.gwzwcj.value:''}}</span> <span v-if="!true_edit">{{
<i v-if="$route.meta.gly && !true_edit && form.gwzwcj?!form.gwzwcj.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> form.extraProperty[xzzd[2*index].comment]?form.extraProperty[xzzd[2*index].comment].value:''
<i v-if="$route.meta.gly && !true_edit && form.gwzwcj?form.gwzwcj.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> }}</span>
<el-input <i v-if="$route.meta.gly && !true_edit && form.extraProperty[xzzd[2*index].comment]?!form.extraProperty[xzzd[2*index].comment].confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
v-if="true_edit" <i v-if="$route.meta.gly && !true_edit && form.extraProperty[xzzd[2*index].comment]?form.extraProperty[xzzd[2*index].comment].confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
v-model="form.gwzwcj.value"
placeholder="请输入内容"
:disabled="form.gwzwcj.confirmed"
></el-input>
<i v-if="true_edit && !arr_table_comment.gwzwcj" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('gwzwcj',true)"></i>
<i v-if="true_edit && !arr_table_comment.gwzwcj" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('gwzwcj',false)"></i>
</td>
<td class="pub-td1">任现职级时间</td>
<td class="pub-td2">
<span v-if="!true_edit">{{form.rxzjsj ? form.rxzjsj.value:''}}</span>
<i v-if="$route.meta.gly && !true_edit && form.rxzjsj?!form.rxzjsj.confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.rxzjsj?form.rxzjsj.confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input <el-input
v-if="true_edit" v-if="true_edit"
v-model="form.rxzjsj.value" v-model="form.extraProperty[xzzd[2*index].comment].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="form.rxzjsj.confirmed" :readonly="form.extraProperty[xzzd[2*index].comment]?form.extraProperty[xzzd[2*index].comment].confirmed:false"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment.rxzjsj" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('rxzjsj',true)"></i> <i v-if="true_edit && !arr_table_comment[xzzd[2*index].comment]" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm(xzzd[2*index].comment,true,true)"></i>
<i v-if="true_edit && !arr_table_comment.rxzjsj" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm('rxzjsj',false)"></i> <i v-if="true_edit && !arr_table_comment[xzzd[2*index].comment]" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm(xzzd[2*index].comment,false,true)"></i>
</td> </td>
</tr>
<tr v-for="(item, index) in xzzd" style="position: relative">
<td class="pub-td1">{{ item.comment }}</td> <td class="pub-td1" v-if="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2!=0?false:true:true">{{ xzzd[2*index+1].comment }}</td>
<td class="pub-td2" colspan="5" v-if="form.extraProperty"> <td class="pub-td2" v-if="form.extraProperty&&index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2!=0?false:true:true">
<span v-if="!true_edit">{{ <span v-if="!true_edit">{{
form.extraProperty[item.comment] ? form.extraProperty[item.comment].value:'' form.extraProperty[xzzd[2*index+1].comment]?form.extraProperty[xzzd[2*index+1].comment].value:''
}}</span> }}</span>
<i v-if="$route.meta.gly && !true_edit && form.extraProperty[item.comment]?!form.extraProperty[item.comment].confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.extraProperty[xzzd[2*index+1].comment]?!form.extraProperty[xzzd[2*index+1].comment].confirmed:false" class="el-icon-question" style="color: #9a9ca0;font-size: 20px;"></i>
<i v-if="$route.meta.gly && !true_edit && form.extraProperty[item.comment]?form.extraProperty[item.comment].confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i> <i v-if="$route.meta.gly && !true_edit && form.extraProperty[xzzd[2*index+1].comment]?form.extraProperty[xzzd[2*index+1].comment].confirmed:false" class="el-icon-success" style="color: #12dc00;font-size: 20px;"></i>
<el-input <el-input
v-if="true_edit" v-if="true_edit"
v-model="form.extraProperty[item.comment].value" v-model="form.extraProperty[xzzd[2*index+1].comment].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="form.extraProperty[item.comment].confirmed" :readonly="form.extraProperty[xzzd[2*index+1].comment]?form.extraProperty[xzzd[2*index+1].comment].confirmed:false"
></el-input> ></el-input>
<i v-if="true_edit && !arr_table_comment[item.comment]" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm(item.comment,true,true)"></i> <i v-if="true_edit && !arr_table_comment[xzzd[2*index+1].comment]" class="el-icon-circle-check" style="color: #56ff7a;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm(xzzd[2*index+1].comment,true,true)"></i>
<i v-if="true_edit && !arr_table_comment[item.comment]" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm(item.comment,false,true)"></i> <i v-if="true_edit && !arr_table_comment[xzzd[2*index+1].comment]" class="el-icon-circle-close" style="color: #ff5656;font-size: 20px;margin-top: 10px;cursor: pointer;" @click="qr_Confirm(xzzd[2*index+1].comment,false,true)"></i>
</td> </td>
</tr> </tr>
</table> </table>
...@@ -534,8 +372,8 @@ ...@@ -534,8 +372,8 @@
<span>暂无数据接入</span> <span>暂无数据接入</span>
</div> </div>
<ul v-if="xgnr_xgrw.length!=0"> <ul v-if="xgnr_xgrw.length!=0">
<li v-for="item in xgnr_xgrw" :title="item.wwm==undefined||item.wwm==''||item.wwm==null?item.xm:wwm"> <li v-for="item in xgnr_xgrw" :title="item.wwm.value==undefined||item.wwm.value==''||item.wwm.value==null?item.xm.value:item.wwm.value">
<span>{{ item.wwm==undefined||item.wwm==''||item.wwm==null?item.xm:item.wwm + ' 同事'}}</span> <span>{{ (item.wwm.value==undefined||item.wwm.value==''||item.wwm.value==null?item.xm.value:item.wwm.value) + ' 同事'}}</span>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -809,7 +647,7 @@ export default { ...@@ -809,7 +647,7 @@ export default {
this.$message.success('攻击建议新增成功！'); this.$message.success('攻击建议新增成功！');
this.dialogVisibleOrganization = false; this.dialogVisibleOrganization = false;
get( get(
"api/rest/resource/queryRelatedInfo?subject="+this.form._id+"&relation="+"攻击建议", "api/rest/3z/resource/queryRelatedInfo?subject="+this.form._id+"&relation="+"攻击建议",
) )
.then((data)=>{ .then((data)=>{
this.xgnr_gjjy = data.list; this.xgnr_gjjy = data.list;
...@@ -839,7 +677,7 @@ export default { ...@@ -839,7 +677,7 @@ export default {
delete_util("api/rest/resource/removeRelatedInfo", paramDatas) delete_util("api/rest/resource/removeRelatedInfo", paramDatas)
.then((data) => { .then((data) => {
get( get(
"api/rest/resource/queryRelatedInfo?subject="+this.form._id+"&relation="+"攻击建议", "api/rest/3z/resource/queryRelatedInfo?subject="+this.form._id+"&relation="+"攻击建议",
) )
.then((data)=>{ .then((data)=>{
this.xgnr_gjjy = data.list; this.xgnr_gjjy = data.list;
...@@ -961,28 +799,15 @@ export default { ...@@ -961,28 +799,15 @@ export default {
this.upload_head(obj_from,obj_froms); this.upload_head(obj_from,obj_froms);
}, },
edit(obj_from,forms) { edit(obj_from,forms) {
obj_from.sfzhm = obj_from.sfzhm.value;
obj_from.jgzhm = obj_from.jgzhm.value;
obj_from.jb = obj_from.jb.value;
obj_from.rwbh = obj_from.rwbh.value; obj_from.rwbh = obj_from.rwbh.value;
obj_from.xm = obj_from.xm.value; obj_from.xm = obj_from.xm.value;
obj_from.wwm = obj_from.wwm.value; obj_from.wwm = obj_from.wwm.value;
obj_from.xb = obj_from.xb.value; obj_from.xzzw = obj_from.xzzw.value;
obj_from.mz = obj_from.mz.value; obj_from.mz = obj_from.mz.value;
obj_from.jg = obj_from.jg.value; obj_from.xb = obj_from.xb.value;
obj_from.csrq = obj_from.csrq.value; obj_from.csrq = obj_from.csrq.value;
obj_from.rwrq = obj_from.rwrq.value; obj_from.jg = obj_from.jg.value;
obj_from.dyxl = obj_from.dyxl.value; obj_from.rwlb = obj_from.rwlb.value;
obj_from.bdfh = obj_from.bdfh.value;
obj_from.whcd = obj_from.whcd.value;
obj_from.zzmm = obj_from.zzmm.value;
obj_from.jxdj = obj_from.jxdj.value;
obj_from.rxjxsj = obj_from.rxjxsj.value;
obj_from.xzzw = obj_from.xzzw.value;
obj_from.rxzwsj = obj_from.rxzwsj.value;
obj_from.gwzwcj = obj_from.gwzwcj.value;
obj_from.rxzjsj = obj_from.rxzjsj.value;
obj_from.avatar = obj_from.avatar;
post( post(
"api/rest/mongo/character/update?templateId=" + this.obj_dx.templateId, "api/rest/mongo/character/update?templateId=" + this.obj_dx.templateId,
obj_from obj_from
...@@ -1115,23 +940,24 @@ export default { ...@@ -1115,23 +940,24 @@ export default {
} }
}); });
} }
let names = "";
this.option_rwmb.find((item1) => {
if (item1.value == this.form.templateId) {
names = item1.label;
}
});
if (this.wzmk_data.length > 0) { if (this.wzmk_data.length > 0) {
this.wzmk_data.forEach((item) => { this.wzmk_data.forEach((item) => {
if (item.type == 3) { if (item.type == 3) {
(this.clientDetails_rw = { (this.clientDetails_rw = {
module_id: parseInt(this.form.extraProperty["id"].value), module_id: this.form.rwbh.value,
types: "2", types: "1",
peopleOrOrganization:'character', peopleOrOrganization:'character',
}); });
} }
}); });
} }
let names = "";
this.option_rwmb.find((item1) => {
if (item1.value == this.form.templateId) {
names = item1.label;
}
});
let param = "api/rest/mongo/organization/queryTree?module=" + "DF"; let param = "api/rest/mongo/organization/queryTree?module=" + "DF";
if(names=='外网人物模板'){ if(names=='外网人物模板'){
param = "api/rest/mongo/organization/queryTree?module=" + "DFWW"; param = "api/rest/mongo/organization/queryTree?module=" + "DFWW";
...@@ -1165,23 +991,44 @@ export default { ...@@ -1165,23 +991,44 @@ export default {
this.xgnr_gjyxrw = []; this.xgnr_gjyxrw = [];
this.xgnr_gjjy = []; this.xgnr_gjjy = [];
this.xgnr_pjyl =[]; this.xgnr_pjyl =[];
// this.query_Twitter(this.form.extraProperty.id); this.form.extraProperty['Twitter账号'].value!=''?this.query_Twitter(this.form.extraProperty['Twitter账号'].value):'';
// this.query_xgyl(this.form._id); this.query_xgyl(this.form.rwbh.value);
}) })
.catch((err) => { .catch((err) => {
this.$message.warning(err.message); this.$message.warning(err.message);
}); });
}, },
query_Twitter(id){ query_Twitter(account) {
get( get("api/rest/elastic/queryRelationTwitter?pageNum=1&pageSize=10&twitterAccount=" + account)
"api/rest/fulltext/queryRelationTwitter?characterId="+id, .then((data) => {
) let arr_news_twitter = [];
.then((data)=>{ if (data.list.length > 0) {
this.xgnr_wd = data.list; data.list.forEach((item) => {
}) arr_news_twitter.push({
.catch((err)=>{ title: "", //标题
this.$message.warning(err.message); txt: item.txt_zh, //内容
}) site_name: item.fullname, //来自
pubdate: item.timestr, //发布时间
snatch_time: item.input_time, //抓取时间
highLight: item.highLight, //高亮
cmtcnt: item.cmtcnt, //评论数
rpscnt: item.rpscnt, //转发数
atdcnt: item.atdcnt, //点赞数
isori: item.isori, //是否原创
tweets_id: item.tweets_id, //是twitter_id
blogger_id: item.blogger_id, //用户查询用户信息
tweets_url: item.tweets_url, //原文链接
txt_zh: item.txt_zh,
title_zh: "", //标题
emotion1: item.emotion1,
});
});
}
this.xgnr_wd = arr_news_twitter;
})
.catch((err) => {
this.$message.warning(err.message);
});
}, },
jsonToArray(nodes) { jsonToArray(nodes) {
var r = []; var r = [];
...@@ -1200,74 +1047,18 @@ export default { ...@@ -1200,74 +1047,18 @@ export default {
return r; return r;
}, },
query_rw() { query_rw() {
get("api/rest/resource/queryResourceTree?module=" + this.module_name) post(
`api/rest/mongo/character/query?pageNum=${1}&pageSize=${20}`,
{
module: this.form.module,
orgId: this.form.orgId,
}
)
.then((res) => { .then((res) => {
let optinon_s = []; this.xgnr_xgrw = [];
if (res.length > 0) { res.records.forEach((item) => {
optinon_s = this.jsonToArray(res); if(this.form._id!=item._id)
} else { this.xgnr_xgrw.push(item);
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(
`api/rest/resource/queryDynamicCharacter?pageNum=${1}&pageSize=${20}`,
{
mould: this.form.mould,
// "baseProperty.姓名": "",
"baseProperty.所在机构": this.obj_dx.baseProperty["所在机构编号"],
}
)
.then((res) => {
this.xgnr_xgrw = [];
res.list.forEach((item)=>{
if(this.form._id!=item._id){
this.xgnr_xgrw.push(item);
}
})
this.xgnr_xgrw.forEach((item) => {
item.photos =
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.templateId) {
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;
}
});
})
.catch((err) => {
this.$message.warning(err.message);
});
}); });
}) })
.catch((err) => { .catch((err) => {
...@@ -1290,7 +1081,7 @@ export default { ...@@ -1290,7 +1081,7 @@ export default {
// } // }
// ] // ]
// post( // post(
// "api/rest/resource/queryRelatedInfoByCTP",paramDatas // "api/rest/3z/resource/queryRelatedInfoByCTP",paramDatas
// ) // )
// .then((datas)=>{ // .then((datas)=>{
...@@ -1355,7 +1146,7 @@ export default { ...@@ -1355,7 +1146,7 @@ export default {
// this.$message.warning(err.message); // this.$message.warning(err.message);
// }); // });
get( get(
"api/rest/resource/queryRelatedInfo?subject="+id+"&relation="+"相关舆情", "api/rest/3z/resource/queryRelatedInfo?subject="+id+"&relation="+"相关舆情",
) )
.then((data)=>{ .then((data)=>{
this.xgnr_xgyq = data.list; this.xgnr_xgyq = data.list;
...@@ -1364,7 +1155,7 @@ export default { ...@@ -1364,7 +1155,7 @@ export default {
this.$message.warning(err.message); this.$message.warning(err.message);
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject="+id+"&relation="+"相关活动", "api/rest/3z/resource/queryRelatedInfo?subject="+id+"&relation="+"相关活动",
) )
.then((data)=>{ .then((data)=>{
this.xgnr_xghd = data.list; this.xgnr_xghd = data.list;
...@@ -1373,7 +1164,7 @@ export default { ...@@ -1373,7 +1164,7 @@ export default {
console.log(err) console.log(err)
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject="+id+"&relation="+"相关专著", "api/rest/3z/resource/queryRelatedInfo?subject="+id+"&relation="+"相关专著",
) )
.then((data)=>{ .then((data)=>{
this.xgnr_xgzz = data.list; this.xgnr_xgzz = data.list;
...@@ -1382,7 +1173,7 @@ export default { ...@@ -1382,7 +1173,7 @@ export default {
console.log(err) console.log(err)
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject="+id+"&relation="+"相关言论", "api/rest/3z/resource/queryRelatedInfo?subject="+id+"&relation="+"相关言论",
) )
.then((data)=>{ .then((data)=>{
this.xgnr_xgyl = data.list; this.xgnr_xgyl = data.list;
...@@ -1391,7 +1182,7 @@ export default { ...@@ -1391,7 +1182,7 @@ export default {
console.log(err) console.log(err)
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject="+id+"&relation="+"关键影响人物", "api/rest/3z/resource/queryRelatedInfo?subject="+id+"&relation="+"关键影响人物",
) )
.then((data)=>{ .then((data)=>{
this.xgnr_gjyxrw = data.list; this.xgnr_gjyxrw = data.list;
...@@ -1400,7 +1191,7 @@ export default { ...@@ -1400,7 +1191,7 @@ export default {
console.log(err) console.log(err)
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject="+id+"&relation="+"攻击建议", "api/rest/3z/resource/queryRelatedInfo?subject="+id+"&relation="+"攻击建议",
) )
.then((data)=>{ .then((data)=>{
this.xgnr_gjjy = data.list; this.xgnr_gjjy = data.list;
...@@ -1409,7 +1200,7 @@ export default { ...@@ -1409,7 +1200,7 @@ export default {
console.log(err) console.log(err)
}); });
get( get(
"api/rest/resource/queryRelatedInfo?subject="+id+"&relation="+"评价言论", "api/rest/3z/resource/queryRelatedInfo?subject="+id+"&relation="+"评价言论",
) )
.then((data)=>{ .then((data)=>{
this.xgnr_pjyl = data.list; this.xgnr_pjyl = data.list;
...@@ -1477,30 +1268,7 @@ export default { ...@@ -1477,30 +1268,7 @@ export default {
Change_select(value) {}, Change_select(value) {},
query(){ query(){
this.form = { this.form = {
sfzhm:"", extraProperty:[],
jgzhm:"",
jb:"",
rwbh:"",
xm:"",
wwm:"",
orgId:"",
xb:"",
mz:"",
jg:"",
csrq:"",
rwrq:"",
dyxl:"",
bdfh:"",
whcd:"",
zzmm:"",
jxdj:"",
rxjxsj:"",
xzzw:"",
rxzwsj:"",
gwzwcj:"",
rxzjsj:"",
avatar:"",
avatarUrl:'',
} }
this.true_edit = false; this.true_edit = false;
this.obj_dx = this.$route.params.key; this.obj_dx = this.$route.params.key;
......
src/view/sjgl/rwk_data_public.vue
View file @ 0e265c1c
...@@ -126,64 +126,16 @@ ...@@ -126,64 +126,16 @@
</el-select> </el-select>
</el-tooltip> </el-tooltip>
<table class="table_jbxx"> <table class="table_jbxx">
<tr>
<td class="pub-td1">身份证号码</td>
<td class="pub-td2">
<el-input
v-model="form_add[0].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1">军官证号码</td>
<td class="pub-td2">
<el-input
v-model="form_add[1].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
</tr>
<tr> <tr>
<td class="pub-td1">
级别
</td>
<td class="pub-td2">
<el-input
v-model="form_add[2].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1"> <td class="pub-td1">
<span style="margin-right: 5px; color: #de3333">*</span>人物编号 <span style="margin-right: 5px; color: #de3333">*</span>人物编号
</td> </td>
<td class="pub-td2"> <td class="pub-td2" colspan="3">
<el-input
v-model="form_add[3].value"
placeholder="请输入内容"
:disabled="is_true"
@input="form_add[3].value = form_add[3].value.replace(/[^\w\.]/g,' ')"
></el-input>
</td>
</tr>
<tr>
<td class="pub-td1">
<span style="margin-right: 5px; color: #de3333">*</span>姓名
</td>
<td class="pub-td2">
<el-input
v-model="form_add[4].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1">外文名</td>
<td class="pub-td2">
<el-input <el-input
v-model="form_add[5].value" v-model="form_add[0].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
@input="form_add[0].value = form_add[0].value.replace(/[^\w\.]/g,' ')"
></el-input> ></el-input>
</td> </td>
<td rowspan="6" style="border: none"> <td rowspan="6" style="border: none">
...@@ -209,12 +161,7 @@ ...@@ -209,12 +161,7 @@
<td class="pub-td1"> <td class="pub-td1">
<span style="margin-right: 5px; color: #de3333">*</span>所在机构 <span style="margin-right: 5px; color: #de3333">*</span>所在机构
</td> </td>
<td colspan="3" class="pub-td2"> <td class="pub-td2" colspan="3">
<!-- <el-input
v-model="form_add[6].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input> -->
<div :style="{ 'pointer-events': !is_true ? 'all' : 'none' }"> <div :style="{ 'pointer-events': !is_true ? 'all' : 'none' }">
<el-cascader <el-cascader
v-model="value_szjg" v-model="value_szjg"
...@@ -233,149 +180,94 @@ ...@@ -233,149 +180,94 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">性别</td> <td class="pub-td1">
<td class="pub-td2"> <span style="margin-right: 5px; color: #de3333">*</span>姓名
<el-input
v-model="form_add[7].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1">民族</td>
<td class="pub-td2">
<el-input
v-model="form_add[8].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
</tr>
<tr>
<td class="pub-td1">籍贯</td>
<td class="pub-td2" colspan="3">
<el-input
v-model="form_add[9].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
</tr>
<tr>
<td class="pub-td1">出生日期</td>
<td class="pub-td2">
<el-input
v-model="form_add[10].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1">入伍日期</td>
<td class="pub-td2">
<el-input
v-model="form_add[11].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
</tr>
<tr>
<td class="pub-td1">第一学历</td>
<td class="pub-td2">
<el-input
v-model="form_add[12].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td>
<td class="pub-td1">部队番号</td>
<td class="pub-td2">
<el-input
v-model="form_add[13].value"
placeholder="请输入内容"
:disabled="is_true"
></el-input>
</td> </td>
</tr>
<tr>
<td class="pub-td1">文化程度</td>
<td class="pub-td2"> <td class="pub-td2">
<el-input <el-input
v-model="form_add[14].value" v-model="form_add[2].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
></el-input> ></el-input>
</td> </td>
<td class="pub-td1">政治面貌</td> <td class="pub-td1">外文名</td>
<td class="pub-td2"> <td class="pub-td2">
<el-input <el-input
v-model="form_add[15].value" v-model="form_add[3].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
></el-input> ></el-input>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">军衔等级</td> <td class="pub-td1">行政职务</td>
<td class="pub-td2"> <td class="pub-td2">
<el-input <el-input
v-model="form_add[16].value" v-model="form_add[4].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
></el-input> ></el-input>
</td> </td>
<td class="pub-td1">任现军衔时间</td> <td class="pub-td1">民族</td>
<td class="pub-td2"> <td class="pub-td2">
<el-input <el-input
v-model="form_add[17].value" v-model="form_add[5].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
></el-input> ></el-input>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">行政职务</td> <td class="pub-td1">性别</td>
<td class="pub-td2"> <td class="pub-td2">
<el-input <el-input
v-model="form_add[18].value" v-model="form_add[6].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
></el-input> ></el-input>
</td> </td>
<td class="pub-td1">任现职务时间</td> <td class="pub-td1">出生日期</td>
<td class="pub-td2"> <td class="pub-td2">
<el-input <el-input
v-model="form_add[19].value" v-model="form_add[7].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
></el-input> ></el-input>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="pub-td1">岗位职务层级</td> <td class="pub-td1">籍贯</td>
<td class="pub-td2"> <td class="pub-td2">
<el-input <el-input
v-model="form_add[20].value" v-model="form_add[8].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
></el-input> ></el-input>
</td> </td>
<td class="pub-td1">任现职级时间</td> <td class="pub-td1">人物类别</td>
<td class="pub-td2"> <td class="pub-td2">
<el-input <el-input
v-model="form_add[21].value" v-model="form_add[9].value"
placeholder="请输入内容" placeholder="请输入内容"
:disabled="is_true" :disabled="is_true"
></el-input> ></el-input>
</td> </td>
</tr> </tr>
<tr v-for="(item, index) in xzzd" style="position: relative"> <tr v-for="(item, index) in xzzd" style="position: relative" v-if="xzzd.length>0 && index<=Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1">
<td class="pub-td1">{{ item.comment }}</td> <td class="pub-td1">{{ xzzd[2*index].comment }}</td>
<td class="pub-td2" colspan="5"> <td class="pub-td2" :colspan="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2==0?'':'3':''">
<el-input <el-input
v-model="item.value" v-model="xzzd[2*index].value"
placeholder="请输入内容" placeholder="请输入内容"
></el-input> ></el-input>
</td> </td>
<td class="pub-td1" v-if="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2!=0?false:true:true">{{ xzzd[2*index+1].comment }}</td>
<td class="pub-td2" v-if="index==Math.trunc(xzzd.length/2)+Math.trunc(xzzd.length%2)-1?xzzd.length%2!=0?false:true:true">
<el-input
v-model="xzzd[2*index+1].value"
placeholder="请输入内容"
></el-input>
</td>
</tr> </tr>
</table> </table>
</div> </div>
...@@ -559,55 +451,30 @@ export default { ...@@ -559,55 +451,30 @@ export default {
}, },
multipleSelection: [], multipleSelection: [],
form_add_new: [ form_add_new: [,
{ comment: "身份证号码", value: "" },
{ comment: "军官证号码", value: "" },
{ comment: "级别", value: "" },
{ comment: "人物编号", value: "" }, { comment: "人物编号", value: "" },
{ comment: "所在机构", value: "" },
{ comment: "姓名", value: "" }, { comment: "姓名", value: "" },
{ comment: "外文名", value: "" }, { comment: "外文名", value: "" },
{ comment: "所在机构", value: "" }, { comment: "行政职务", value: "" },
{ comment: "性别", value: "" },
{ comment: "民族", value: "" }, { comment: "民族", value: "" },
{ comment: "籍贯", value: "" }, { comment: "性别", value: "" },
{ comment: "出生日期", value: "" }, { comment: "出生日期", value: "" },
{ comment: "入伍日期", value: "" }, { comment: "籍贯", value: "" },
{ comment: "第一学历", value: "" }, { comment: "人物类别", value: "" },
{ comment: "部队番号", value: "" },
{ comment: "文化程度", value: "" },
{ comment: "政治面貌", value: "" },
{ comment: "军衔等级", value: "" },
{ comment: "任现军衔时间", value: "" },
{ comment: "行政职务", value: "" },
{ comment: "任现职务时间", value: "" },
{ comment: "岗位职务层级", value: "" },
{ comment: "任现职级时间", value: "" },
], ],
form_add: [ form_add: [
{ comment: "sfzhm", value: "" },
{ comment: "jgzhm", value: "" },
{ comment: "jb", value: "" },
{ comment: "rwbh", value: "" }, { comment: "rwbh", value: "" },
{ comment: "orgId", value: "" },
{ comment: "xm", value: "" }, { comment: "xm", value: "" },
{ comment: "wwm", value: "" }, { comment: "wwm", value: "" },
{ comment: "orgId", value: "" }, { comment: "xzzw", value: "" },
{ comment: "xb", value: "" },
{ comment: "mz", value: "" }, { comment: "mz", value: "" },
{ comment: "jg", value: "" }, { comment: "xb", value: "" },
{ comment: "csrq", value: "" }, { comment: "csrq", value: "" },
{ comment: "rwrq", value: "" }, { comment: "jg", value: "" },
{ comment: "dyxl", value: "" }, { comment: "rwlb", value: "" },
{ comment: "bdfh", value: "" },
{ comment: "whcd", value: "" },
{ comment: "zzmm", value: "" },
{ comment: "jxdj", value: "" },
{ comment: "rxjxsj", value: "" },
{ comment: "xzzw", value: "" },
{ comment: "rxzwsj", value: "" },
{ comment: "gwzwcj", value: "" },
{ comment: "rxzjsj", value: "" },
{ comment: "avatar", value: "" },
], ],
dialogVisible_people: false, dialogVisible_people: false,
dialogVisible_pldr: false, dialogVisible_pldr: false,
...@@ -891,9 +758,6 @@ export default { ...@@ -891,9 +758,6 @@ export default {
} }
}); });
let obj = { let obj = {
sfzhm:obj_baseProperty['身份证号码'],
jgzhm:obj_baseProperty['军官证号码'],
jb:obj_baseProperty['级别'],
rwbh:obj_baseProperty['人物编号'], rwbh:obj_baseProperty['人物编号'],
xm:obj_baseProperty['姓名'], xm:obj_baseProperty['姓名'],
wwm:obj_baseProperty['外文名'], wwm:obj_baseProperty['外文名'],
...@@ -902,17 +766,8 @@ export default { ...@@ -902,17 +766,8 @@ export default {
mz:obj_baseProperty['民族'], mz:obj_baseProperty['民族'],
jg:obj_baseProperty['籍贯'], jg:obj_baseProperty['籍贯'],
csrq:obj_baseProperty['出生日期'], csrq:obj_baseProperty['出生日期'],
rwrq:obj_baseProperty['入伍日期'],
dyxl:obj_baseProperty['第一学历'],
bdfh:obj_baseProperty['部队番号'],
whcd:obj_baseProperty['文化程度'],
zzmm:obj_baseProperty['政治面貌'],
jxdj:obj_baseProperty['军衔等级'],
rxjxsj:obj_baseProperty['任现军衔时间'],
xzzw:obj_baseProperty['行政职务'], xzzw:obj_baseProperty['行政职务'],
rxzwsj:obj_baseProperty['任现职务时间'], rwlb:obj_baseProperty['人物类别'],
gwzwcj:obj_baseProperty['岗位职务层级'],
rxzjsj:obj_baseProperty['任现职级时间'],
avatar:'', avatar:'',
baseProperty: obj_baseProperty, baseProperty: obj_baseProperty,
extraProperty: obj_extraProperty, extraProperty: obj_extraProperty,
...@@ -1323,7 +1178,7 @@ export default { ...@@ -1323,7 +1178,7 @@ export default {
return r; return r;
}, },
Change_select(value) { Change_select(value) {
this.form_add[6].value = value + ""; this.form_add[1].value = value + "";
}, },
}, },
mounted() { mounted() {
......
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>
<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>
<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-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;
this.pageNum++; if(arr.list.length>0){
this.message = this.message.concat(arr.list);
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