Skip to content

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

1

parent 4a6e91b2
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 35 deletions
src/assets/css/home.css
View file @ d3c50273
......@@ -245,7 +245,7 @@ div::-webkit-scrollbar-corner {
position: absolute;
top: 7.6%;
left: 4.2%;
right: 3.5%;
right: 3.8%;
bottom: 6.4%;
border-radius: 0px 13px;
border: 1px solid #47ebe4;
......@@ -258,7 +258,7 @@ div::-webkit-scrollbar-corner {
position: absolute;
top: 7.6%;
left: 4.2%;
right: 3.5%;
right: 3.8%;
bottom: 6.4%;
border-radius: 0px 13px;
border: 1px solid #47ebe4;
......@@ -266,15 +266,23 @@ div::-webkit-scrollbar-corner {
pointer-events: none;
}
}
.bk-xjs-animation:hover{
&::before {
border-color: #ff9933;
}
&::after {
border-color:#ff9933;
}
}
.bk-bmdx-animation {
position: relative;
&::before {
content: "";
position: absolute;
top: 12.6%;
left: 6.2%;
top: 12.5%;
left: 6.3%;
right: 4.5%;
bottom: 14.6%;
bottom: 15%;
border-radius: 0px 13px;
border: 1.5px dotted #03bdfe;
animation: clippathss 6s infinite linear;
......@@ -284,16 +292,30 @@ div::-webkit-scrollbar-corner {
&::after {
content: "";
position: absolute;
top: 12.6%;
left: 6.2%;
top: 12.5%;
left: 6.3%;
right: 4.5%;
bottom: 14.6%;
bottom: 15%;
border-radius: 0px 13px;
border: 1.5px dotted #03bdfe;
animation: clippathss 5s infinite linear reverse;
pointer-events: none;
}
}
.bk-bmdx-animation:hover{
&::before {
left: 6.4%;
right: 4.8%;
bottom: 15.6%;
border-color: #03fe37;
}
&::after {
left: 6.4%;
right: 4.8%;
bottom: 15.6%;
border-color:#03fe37;
}
}
.bk-ddkz-animation {
position: relative;
&::before {
......@@ -321,4 +343,12 @@ div::-webkit-scrollbar-corner {
animation: clippathss 5s infinite linear reverse;
pointer-events: none;
}
}
.bk-ddkz-animation:hover{
&::before {
border-color: #ff9933;
}
&::after {
border-color:#ff9933;
}
}
\ No newline at end of file
src/view/ddkz/ddkzzs.vue
View file @ d3c50273
......@@ -16,7 +16,7 @@
</el-form>
</div>
<div class="ddkz-content">
<div v-for="item in analogData" class="content-card bk-ddkz-animation" @click="showInfo(true)">
<div v-for="item in analogData" class="content-card bk-ddkz-animation animate__animated animate__zoomIn" @click="showInfo(true)">
<div class="card-title" v-text="item.title" :title="item.title"></div>
<div class="card-date" v-text="item.date"></div>
<div class="card-text" v-text="item.text" :title="item.text"></div>
......@@ -152,6 +152,7 @@ import goBack from '../../assets/img/xjs/4.png';
import arrow from '../../assets/img/ddkz/8.png';
import avatar from '../../assets/img/ddkz/headPhoto.jpg';
import NoticeDialog from '../../view/ddkz/components/noticeDialog.vue';
import "animate.css";
export default {
data() {
return {
......@@ -555,9 +556,37 @@ export default {
},
sendNotice() {
this.visible = true;
}
},
query_selector(selector) {
return Array.from(document.querySelectorAll(selector));
},
},
mounted() {
},
activated() {
/**动画效果 */
// var observer = new IntersectionObserver(function (changes) {
// changes.forEach(function (change) {
// var container = change.target;
// // var content = container.querySelector("template").content;
// if (change.isIntersecting) {
// container.classList.add("animate__animated");
// container.classList.add("animate__lightSpeedInLeft");
// } else {
// container.classList.remove("animate__animated");
// container.classList.remove("animate__lightSpeedInLeft");
// }
// });
// });
// let _this = this;
// let timesaa = setInterval(function () {
// if (_this.query_selector(".everyDayNewCard").length > 0) {
// _this.query_selector(".everyDayNewCard").forEach(function (item) {
// observer.observe(item);
// });
// clearInterval(timesaa);
// }
// }, 100);
}
}
</script>
......
src/view/dfzy/test.vue
View file @ d3c50273
......@@ -617,7 +617,7 @@ export default {
if(level=="1"){
arr_entity = [{uuid:data.p[0].uuid,meaningTag:data.p[0].meaningTag,name:data.p[0].name,url:data.p[0].url}];
if(data.q.length>0){
arr_entity = _this.arr_unique(arr_entity.concat(data.q));
arr_entity = arr_entity.concat(data.q);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
......@@ -638,7 +638,7 @@ export default {
if(level=="2"){
arr_entity = [{uuid:data.p[0].uuid,meaningTag:data.p[0].meaningTag,name:data.p[0].name,url:data.p[0].url}];
if(data.q.length>0){
arr_entity = _this.arr_unique(arr_entity.concat(data.q));
arr_entity = arr_entity.concat(data.q);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
......@@ -656,7 +656,7 @@ export default {
);
}
if(data.q2.length>0){
arr_entity = _this.arr_unique(arr_entity.concat(data.q2));
arr_entity = arr_entity.concat(data.q2);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
......@@ -677,8 +677,7 @@ export default {
if(level=="3"){
arr_entity = [{uuid:data.p[0].uuid,meaningTag:data.p[0].meaningTag,name:data.p[0].name,url:data.p[0].url}];
if(data.q.length>0){
arr_entity.concat(data.q)
arr_entity = _this.arr_unique(arr_entity.concat(data.q));
arr_entity = arr_entity.concat(data.q);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
......@@ -696,7 +695,7 @@ export default {
);
}
if(data.q2.length>0){
arr_entity = _this.arr_unique(arr_entity.concat(data.q2));
arr_entity = arr_entity.concat(data.q2);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
......@@ -714,7 +713,7 @@ export default {
);
}
if(data.q3.length>0){
arr_entity = _this.arr_unique(arr_entity.concat(data.q3));
arr_entity = arr_entity.concat(data.q3);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
......@@ -738,7 +737,7 @@ export default {
if(level=="1"){
arr_entity = [{uuid:data.p[0].uuid,meaningTag:data.p[0].meaningTag,name:data.p[0].name,url:data.p[0].url}];
if(data.q.length>0){
arr_entity = _this.arr_unique(arr_entity.concat(data.q));
arr_entity = arr_entity.concat(data.q);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
......
src/view/home.vue
View file @ d3c50273
......@@ -231,7 +231,7 @@ export default {
})
}
});
debugger
this.manager_module = this.$store.state.navList[0].children.filter(
(e) => e.meta.type == "1"
);
......
src/view/sjgl/gxt.vue
View file @ d3c50273
......@@ -274,11 +274,15 @@ export default {
if(level=="1"){
arr_entity = [{uuid:data.p[0].uuid,meaningTag:data.p[0].meaningTag,name:data.p[0].name}];
if(data.q.length>0){
arr_entity = _this.arr_unique(arr_entity.concat(data.q));
arr_entity = arr_entity.concat(data.q);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''||item.meaningTag==undefined){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
}
if(item.uuid=='null'||item.uuid==''||item.uuid==undefined){
arr_entity[index].uuid = Math.round(Math.random()*10000)+'';
}
console.log(arr_entity[index].uuid)
});
arr_nodes = this.arr_push(
arr_entity,
......@@ -295,11 +299,14 @@ export default {
if(level=="2"){
arr_entity = [{uuid:data.p[0].uuid,meaningTag:data.p[0].meaningTag,name:data.p[0].name}];
if(data.q.length>0){
arr_entity = _this.arr_unique(arr_entity.concat(data.q));
arr_entity = arr_entity.concat(data.q);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''||item.meaningTag==undefined){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
}
if(item.uuid=='null'||item.uuid==''||item.uuid==undefined){
arr_entity[index].uuid = Math.round(Math.random()*10000)+'';
}
});
arr_nodes = this.arr_push(
arr_entity,
......@@ -313,11 +320,14 @@ export default {
);
}
if(data.q2.length>0){
arr_entity = _this.arr_unique(arr_entity.concat(data.q2));
arr_entity = arr_entity.concat(data.q2);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''||item.meaningTag==undefined){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
}
if(item.uuid=='null'||item.uuid==''||item.uuid==undefined){
arr_entity[index].uuid = Math.round(Math.random()*10000)+'';
}
});
arr_nodes = this.arr_push(
arr_entity,
......@@ -334,12 +344,14 @@ export default {
if(level=="3"){
arr_entity = [{uuid:data.p[0].uuid,meaningTag:data.p[0].meaningTag,name:data.p[0].name}];
if(data.q.length>0){
arr_entity.concat(data.q)
arr_entity = _this.arr_unique(arr_entity.concat(data.q));
arr_entity = arr_entity.concat(data.q);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''||item.meaningTag==undefined){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
}
if(item.uuid=='null'||item.uuid==''||item.uuid==undefined){
arr_entity[index].uuid = Math.round(Math.random()*10000)+'';
}
});
arr_nodes = this.arr_push(
arr_entity,
......@@ -353,11 +365,14 @@ export default {
);
}
if(data.q2.length>0){
arr_entity = _this.arr_unique(arr_entity.concat(data.q2));
arr_entity = arr_entity.concat(data.q2);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''||item.meaningTag==undefined){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
}
if(item.uuid=='null'||item.uuid==''||item.uuid==undefined){
arr_entity[index].uuid = Math.round(Math.random()*10000)+'';
}
});
arr_nodes = this.arr_push(
arr_entity,
......@@ -371,11 +386,14 @@ export default {
);
}
if(data.q3.length>0){
arr_entity = _this.arr_unique(arr_entity.concat(data.q3));
arr_entity = arr_entity.concat(data.q3);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''||item.meaningTag==undefined){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
}
if(item.uuid=='null'||item.uuid==''||item.uuid==undefined){
arr_entity[index].uuid = Math.round(Math.random()*10000)+'';
}
});
arr_nodes = this.arr_push(
arr_entity,
......@@ -395,11 +413,14 @@ export default {
if(level=="1"){
arr_entity = [{uuid:data.p[0].uuid,meaningTag:data.p[0].meaningTag,name:data.p[0].name}];
if(data.q.length>0){
arr_entity = _this.arr_unique(arr_entity.concat(data.q));
arr_entity = arr_entity.concat(data.q);
arr_entity.forEach((item,index)=>{
if(item.meaningTag=='null'||item.meaningTag==''||item.meaningTag==undefined){
arr_entity[index].meaningTag = Math.round(Math.random()*10000)+'';
}
if(item.uuid=='null'||item.uuid==''||item.uuid==undefined){
arr_entity[index].uuid = Math.round(Math.random()*10000)+'';
}
});
arr_nodes = this.arr_push(
arr_entity,
......
src/view/sjgl/jg_xq.vue
View file @ d3c50273
......@@ -878,10 +878,18 @@ export default {
this.$message.warning(err.message);
});
},
query_avatar(avatar){
get("api/rest/file/viewPicture/AVATAR?objectName=" + avatar)
.then((arr) => {
this.imageUrl=arr;
}).catch(err=>{
this.imageUrl=''
})
},
query_grxx() {
this.form = JSON.parse(JSON.stringify(this.organization));
// this.imageUrl = imgUrl + this.form.avatar;
this.imageUrl = this.form.avatarUrl==null?'':this.form.avatarUrl;
this.form.avatar==null?(this.imageUrl=''):this.query_avatar(this.form.avatar);
if (
this.wzmk_data.length > 0 &&
JSON.stringify(this.form.tableProperty) != "{}"
......
src/view/sjgl/jgk_data_public.vue
View file @ d3c50273
......@@ -514,11 +514,11 @@ export default {
this.tree_data.push(a);
})
.then((res) => {
this.query_tree_jg1();
})
.catch((err) => {
this.$message.warning(err.message);
});
this.query_tree_jg1();
},
query_tree_jg1() {
get("api/rest/mongo/organization/queryTree?module=" + "DFWW")
......@@ -645,6 +645,8 @@ export default {
jgjc:obj_baseProperty['机构简称'],
gjdq:obj_baseProperty['国家地区'],
jglb:obj_baseProperty['机构类别'],
avatar:obj_baseProperty['机构编号'],
// multiLanguage:obj_baseProperty['多语言名称'],
extraProperty: obj_extraProperty,
textareaProperty: obj_textarea,
tableProperty: obj_mouldTables,
......@@ -654,7 +656,7 @@ export default {
label: item["机构番号"] + "",
code: item["机构编号"] + "",
module: this.type_tree_port ? "DFWW" : "DF",
parentCode: item["上级机构编号"],
parentCode: item["上级机构编号"]==''||item["上级机构编号"]==undefined?'#':item["上级机构编号"],
...obj,
};
paramDatas.push(a_obj);
......@@ -718,6 +720,21 @@ export default {
item["机构编号"] == undefined
) {
item["状态"] = "异常";
}
if(item['部队番号']!=undefined){
item['机构番号'] = item['部队番号'];
}
if(item['部队简称']!=undefined){
item['机构简称'] = item['部队简称'];
}
if(item['部队代号']!=undefined){
item['机构代号'] = item['部队代号'];
}
if(item['部队泛称']!=undefined){
item['机构泛称'] = item['部队泛称'];
}
if(item['部队等级']!=undefined){
item['机构等级'] = item['部队等级'];
}
});
this.tableData = obj_tab;
......
src/view/sjgl/rw_xq.vue
View file @ d3c50273
......@@ -910,6 +910,14 @@ export default {
this.$message.warning(err.message);
});
},
query_avatar(avatar){
get("api/rest/file/viewPicture/AVATAR?objectName=" + avatar)
.then((arr) => {
this.imageUrl=arr;
}).catch(err=>{
this.imageUrl=''
})
},
query_grxx() {
let paramDatas = { _id: this.obj_dx._id };
post(
......@@ -919,7 +927,8 @@ export default {
.then((data) => {
if (data.records.length > 0) {
this.form = JSON.parse(JSON.stringify(data.records[0]));
this.imageUrl = this.form.avatarUrl==null?'':this.form.avatarUrl;
// this.imageUrl = this.form.avatarUrl==null?'':this.form.avatarUrl;
this.form.avatar==null?(this.imageUrl=''):this.query_avatar(this.form.avatar);
if (
this.wzmk_data.length > 0 &&
JSON.stringify(this.form.tableProperty) != "{}"
......
src/view/sjgl/rwk_data_public.vue
View file @ d3c50273
......@@ -768,7 +768,7 @@ export default {
csrq:obj_baseProperty['出生日期'],
xzzw:obj_baseProperty['行政职务'],
rwlb:obj_baseProperty['人物类别'],
avatar:'',
avatar:obj_baseProperty['人物编号'],
baseProperty: obj_baseProperty,
extraProperty: obj_extraProperty,
textareaProperty: obj_textarea,
......
src/view/user/yhgl.vue
View file @ d3c50273
......@@ -495,7 +495,6 @@ export default {
}
})
.catch((err) => {
debugger
this.$message.warning(err.message);
});
})
......
src/view/xjssy/xjsyf.vue
View file @ d3c50273
......@@ -10,7 +10,7 @@
<template v-for="(item, index) in tableData">
<div class="cards-div animate__animated bk-xjs-animation animate__zoomIn" @click="eyes(item)">
<div :class="['tilts']">
<div style="width: 80%; height: 72%; padding: 10%">
<div style="width: 80%; height: 72%; padding: 7.4% 10%">
<div class="top-div">
<!-- <img class="tx-bg" :src="item.photos" :onerror="errimg" /> -->
<div class="animate__animated animate__infinite animate__pulse animate__slower">
......
src/view/xxxl/xdzylb.vue
View file @ d3c50273
......@@ -169,7 +169,6 @@ export default {
methods: {
//历史记录弹框
history_div(row) {
debugger
this.dialogVisible_lsjl = true;
queryAnswerQuestionRecord(row.id, 1, 10).then((res) => {
this.tableData_history = res.list.map((e) => {
......
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