Skip to content

X
XWSQ_20230718
Commit ea099f67 authored by 夏敏伟's avatar 夏敏伟
Browse files
Options

更改

parent 2c469566
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 68 deletions
application.js
View file @ ea099f67
...@@ -53,7 +53,7 @@ var community_conf={ ...@@ -53,7 +53,7 @@ var community_conf={
}, },
//vue组件注册 //vue组件注册
viewNameList:["hjws","jmzx","gdgl","spaq","dagl","zsysq","wyryfb","hdgl","hjbh","zaaq","aqsc","rkgl","zdry","dqfwzx","ggfw","zyzfwz","sbsx","dwzx","list","fyry","rmfx","tygl","doublezero","fivetype","flgl","fyryzwq","ssfytj","mdtc","sqjw"], viewNameList:["hjws","jmzx","gdgl","spaq","dagl","zsysq","wyryfb","hdgl","hjbh","zaaq","aqsc","rkgl","zdry","dqfwzx","ggfw","zyzfwz","sbsx","dwzx","list","fyry","rmfx","tygl","doublezero","fivetype","flgl","fyryzwq","ssfytj","mdtc","sqjw"],
leftviewNameList:["list","tree","tree_dq","treezyz","tree_rmfx","tree_aby","tree_ty","tree_fl","tree_hjbh","tree_wmcj","tree_mdtc","tree_jwrh"], leftviewNameList:["list","tree","tree_dq","treezyz","tree_rmfx","tree_aby","tree_ty","tree_fl","tree_hjbh","tree_wmcj","tree_mdtc","tree_jwrh","tree_hswy"],
} }
//党小组 //党小组
var party_conf = [ var party_conf = [
...@@ -345,7 +345,9 @@ var serviceLayers_conf=[ ...@@ -345,7 +345,9 @@ var serviceLayers_conf=[
"http": "area/7", "http": "area/7",
"icon": {"color":0.3,"img":"icon_wy.png"}, "icon": {"color":0.3,"img":"icon_wy.png"},
"event":"rightview", "event":"rightview",
"rightview":"wyryfb", "rightview":"wyryfb",
"width":"400px",
"height":"750px"
}, { }, {
"index":9, "index":9,
'text': '志愿者', 'text': '志愿者',
...@@ -361,7 +363,7 @@ var serviceLayers_conf=[ ...@@ -361,7 +363,7 @@ var serviceLayers_conf=[
"status": false, "status": false,
"http": "zdry/1,2", "http": "zdry/1,2",
"icon": {"color":0.3,"img":"icon_zdry.png"}, "icon": {"color":0.3,"img":"icon_zdry.png"},
"event":"building" "event":"building",
}, { }, {
"index":11, "index":11,
'text': '党群服务', 'text': '党群服务',
...@@ -780,7 +782,7 @@ var modules_conf = [{ ...@@ -780,7 +782,7 @@ var modules_conf = [{
"children":[], "children":[],
// "leftView":{"mark": "tree",data:zdry_conf.concat(zdry_conf1),"index":10,"position":{"start":0,"end":8}}, // "leftView":{"mark": "tree",data:zdry_conf.concat(zdry_conf1),"index":10,"position":{"start":0,"end":8}},
"leftView":{"view": "tree","index":[10]}, "leftView":{"view": "tree","index":[10]},
"rightView":"" "rightView":"zdry"
},{ },{
"show": false, "show": false,
"text": '矛盾调处', "text": '矛盾调处',
...@@ -866,7 +868,7 @@ var modules_conf = [{ ...@@ -866,7 +868,7 @@ var modules_conf = [{
"color":"red", "color":"red",
"children":[], "children":[],
"leftView":{"view": "tree_hswy","index":[8]}, "leftView":{"view": "tree_hswy","index":[8]},
"rightView":"" "rightView":"",
},{ },{
"text": '志愿者服务站', "text": '志愿者服务站',
"show": false, "show": false,
......
public/components/leftview/tree_dq.vue
View file @ ea099f67
...@@ -150,9 +150,11 @@ module.exports = { ...@@ -150,9 +150,11 @@ module.exports = {
parent.vue_right.widthData = item.width + 'px'; parent.vue_right.widthData = item.width + 'px';
parent.vue_right.heightData = item.height + 'px'; parent.vue_right.heightData = item.height + 'px';
//延迟加载以便能够保证子组件已经加载完毕再调用其方法 //延迟加载以便能够保证子组件已经加载完毕再调用其方法
if(parent.vue_right.$refs!=undefined && parent.vue_right.$refs.mychild !=undefined ){
setTimeout(() => { setTimeout(() => {
parent.vue_right.$refs.mychild.show(item); parent.vue_right.$refs.mychild.show(item);
}, 300); }, 300);
}
}, open: function (item, n, dom) { }, open: function (item, n, dom) {
parent.vue_left.showright(item); parent.vue_left.showright(item);
// if (item.name == '红色网格') { // if (item.name == '红色网格') {
......
public/components/leftview/tree_hswy.vue
View file @ ea099f67
...@@ -31,15 +31,14 @@ ...@@ -31,15 +31,14 @@
<h2 class="layui-colla-title" v-bind:style="{ backgroundColor: item.color }" @click="open(item, index, $event)"> <h2 class="layui-colla-title" v-bind:style="{ backgroundColor: item.color }" @click="open(item, index, $event)">
{{ item.name }} </h2> {{ item.name }} </h2>
<div class="layui-colla-content" style="height: 217px; margin-left: 0px" v-bind:title="item.name" > <div class="layui-colla-content" style="height: 217px; margin-left: 0px" v-bind:title="item.name" >
<div style="width: 100%; height: 225px"> <div style="width: 100%; height: 225px">
<div class="layui-colla-item" v-for="(item2, index) in item.children" @click="locate(item2)" > <div class="TreeWrap">
<div class="layui-colla-title" > <div style="cursor:pointer" v-for="(item2, index) in item.children">
{{ item2.name }} <a @click="locate(item2)"> {{ item2.name }}</a>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -68,7 +67,7 @@ module.exports = { ...@@ -68,7 +67,7 @@ module.exports = {
marktype: "49", marktype: "49",
text1: "红队伍-红服务", text1: "红队伍-红服务",
name: "红队伍-红服务", name: "红队伍-红服务",
color: "turquoise", color: "coral",
show: true, show: true,
layers: [], layers: [],
children: [ ] children: [ ]
...@@ -79,7 +78,7 @@ module.exports = { ...@@ -79,7 +78,7 @@ module.exports = {
marktype: "7", marktype: "7",
text1: "物业管理处", text1: "物业管理处",
name: "物业管理处", name: "物业管理处",
color: "coral", color: "turquoise",
show: true, show: true,
layers: [], layers: [],
children: [] children: []
...@@ -173,8 +172,9 @@ module.exports = { ...@@ -173,8 +172,9 @@ module.exports = {
}, },
}, },
mounted() { mounted() {
that=this; debugger
that.daylist.children=that.datax; that=this;
that.daylist[0].children=that.datax.data[0].data;
getByAjax("./business/queryAreaphotos/48,49",function(list){ getByAjax("./business/queryAreaphotos/48,49",function(list){
for (var i = 0; i < that.tree_list.length; i++) { for (var i = 0; i < that.tree_list.length; i++) {
let tempList = list.filter(items => {return items.typeid==that.tree_list[i].marktype}); let tempList = list.filter(items => {return items.typeid==that.tree_list[i].marktype});
......
public/components/leftview/tree_jwrh.vue
View file @ ea099f67
...@@ -134,9 +134,11 @@ module.exports = { ...@@ -134,9 +134,11 @@ module.exports = {
parent.vue_right.widthData = item.width + 'px'; parent.vue_right.widthData = item.width + 'px';
parent.vue_right.heightData = item.height + 'px'; parent.vue_right.heightData = item.height + 'px';
//延迟加载以便能够保证子组件已经加载完毕再调用其方法 //延迟加载以便能够保证子组件已经加载完毕再调用其方法
if(parent.vue_right.$refs!=undefined && parent.vue_right.$refs.mychild !=undefined ){
setTimeout(() => { setTimeout(() => {
parent.vue_right.$refs.mychild.show(item); parent.vue_right.$refs.mychild.show(item);
}, 300); }, 300);
}
}, },
show:function(item,index){ show:function(item,index){
debugger debugger
......
public/components/leftview/tree_ty.vue
View file @ ea099f67
...@@ -206,15 +206,11 @@ module.exports = { ...@@ -206,15 +206,11 @@ module.exports = {
}, },
showphotos: function (item) { showphotos: function (item) {
if(item!=null){ if(item!=null){
var playsrc={data: []}; var playsrc={data: []};
var arrayname=item.name.split(",") ;
if(arrayname.length>1){
name=arrayname[1];
}else{name=arrayname[0]; }
var array=item.src.split(","); var array=item.src.split(",");
for(var j = 0; j <array.length ; j++ ) for(var j = 0; j <array.length ; j++ )
{ {
playsrc.data.push({ src: array[j],alt: name }); playsrc.data.push({ src: array[j],alt: item.name1});
} }
layer.photos({ layer.photos({
photos: playsrc, photos: playsrc,
...@@ -326,26 +322,34 @@ module.exports = { ...@@ -326,26 +322,34 @@ module.exports = {
} }
//遍历本模块的一级树 // //遍历本模块的一级树
var tempList = []; // var tempList = [];
for (var j = 0; j < this.data_filter.data[0].data.length; j++) { // for (var j = 0; j < this.data_filter.data[0].data.length; j++) {
//遍历集合数据，塞入一级树结构中、 // //遍历集合数据，塞入一级树结构中、
if ( // if (
this.data_filter.data[0].data[j].ldls && // this.data_filter.data[0].data[j].ldls &&
this.data_filter.data[0].data[j].ldls.strcontains("1" // this.data_filter.data[0].data[j].ldls.strcontains("1"
) && j<44 // ) && j<44
) { // ) {
tempList.push(this.data_filter.data[0].data[j]); // tempList.push(this.data_filter.data[0].data[j]);
} // }
} // }
//chilren tianchong // //chilren tianchong
this.tree_list[2].children = tempList; // this.tree_list[2].children = tempList;
that=this; that=this;
getByAjax("./business/queryAreaphotos/34,35,36,37,38",function(list){ getByAjax("./business/queryAreaphotos/34,35,36,37,38",function(list){
for (var i = 0; i < that.daylist[0].children.length; i++) { for (var i = 0; i < that.daylist[0].children.length; i++) {
let tempList = list.filter(items => {return items.typeid==that.daylist[0].children[i].marktype}); let tempList = list.filter(items => {return items.typeid==that.daylist[0].children[i].marktype});
console.log(tempList); console.log(tempList);
debugger
tempList.forEach(element => {
let array=element.name.split(",");
if(array.length>0){
element.name=array[0];
} else if(array.length>1){ element.name1=array[1];}
return element;
});
that.daylist[0].children[i].children = tempList; that.daylist[0].children[i].children = tempList;
} }
}); });
......
public/components/leftview/treezyz.vue
View file @ ea099f67
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<div style="height: calc(100% - 60px);overflow-y:auto"> <div style="height: calc(100% - 60px);overflow-y:auto">
<div class="layui-collapse collaps" lay-filter="test3" lay-accordion=""> <div class="layui-collapse collaps" lay-filter="test3" lay-accordion="">
<div class="layui-colla-item" v-for="(item,index) in tree_list" > <div class="layui-colla-item" v-for="(item,index) in tree_list" >
<h2 class="layui-colla-title" v-bind:style="{backgroundColor:item.color}" @click="open(item,$event)"> <h2 class="layui-colla-title" v-bind:style="{backgroundColor:item.color}" @click="open(item,index,$event)">
{{item.name}} {{item.name}}
<img v-show="item.icon&&index>2" style="height:20px;width:20px;margin-top: 10px;float: right" v-bind:src="item.icon"> <img v-show="item.icon&&index>2" style="height:20px;width:20px;margin-top: 10px;float: right" v-bind:src="item.icon">
</h2> </h2>
<div class="layui-colla-content" style="height:217px;height:99%;margin-left: 20px;" v-bind:title="item.name" > <div class="layui-colla-content" style="height:217px;height:99%;margin-left: 20px;" v-bind:title="item.name" >
<div style="width:100%;height:99%;"> <div style="width:100%;height:40%;">
<div class="TreeWrap"> <div class="TreeWrap">
<div v-for="(item1,index1) in item.children" @click="locate(item1)" style="cursor:pointer"> <div v-for="(item1,index1) in item.children" @click="locate(item1)" style="cursor:pointer">
{{item1.name}} {{item1.name}}
...@@ -21,20 +21,51 @@ ...@@ -21,20 +21,51 @@
</div> </div>
</div> </div>
</div> </div>
<div class="layui-colla-item" v-for="(item, index) in daylist">
<h2 class="layui-colla-title" v-bind:style="{ backgroundColor: item.color }" @click="open(item, index, $event)">
<div class="layui-colla-item" v-for="(item, index) in daylist">
<h2 class="layui-colla-title" v-bind:style="{ backgroundColor: item.color }" @click="open(item, index+1, $event)">
{{ item.name }} </h2> {{ item.name }} </h2>
<div class="layui-colla-content" style="height: 217px; margin-left: 0px" v-bind:title="item.name" > <div class="layui-colla-content" style="height: 217px; margin-left: 0px" v-bind:title="item.name" >
<div style="width: 100%; height: 225px"> <div style="width: 100%; height: 225px">
<div class="layui-colla-item" v-for="(item2, index) in item.children" @click="showphotos(item2.children)" > <div class="layui-colla-item" v-for="(item2, index) in item.children" >
<div class="layui-colla-title" > <h2 class="layui-colla-title" v-bind:style="{ backgroundColor: item2.color }" @click="open2(item2, index, $event)"
>
{{ item2.name }} {{ item2.name }}
<img v-show="item.icon"
style="height: 20px;
width: 20px;
margin-top: 10px;
float: right;
"
v-bind:src="item2.icon"
/>
</h2>
<div
class="layui-colla-content"
name="layui"
style="height: 217px; margin-left: 0px"
v-bind:title="item2.name">
<div style="width: 100%; height: 225px">
<div class="TreeWrap">
<div
v-for="(item3, index1) in item2.children"
style="cursor: pointer"
>
<a @click="showphotos(item3) " > {{item3.name}}</a>
<!-- <a @click="showphotos(item3) " v-text="getData(item3)" > </a>
<div @click="showphotos(item3) " v-text="getData(item3)"></div>
<a @click="showphotos(item3) " v-text="item3.name!=''?item3.name.split(',')[0]:''" > </a> -->
<img v-show="item3.monitor" src="/img/monitor.png" width="12px" height="12px" @click="play(item3.monitor)">
</div>
</div>
</div>
</div> </div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div>
</div> </div>
...@@ -71,7 +102,9 @@ ...@@ -71,7 +102,9 @@
text1: "兴潮青年大学生志愿服务队", text1: "兴潮青年大学生志愿服务队",
name: "兴潮青年大学生志愿服务队", name: "兴潮青年大学生志愿服务队",
show: true, show: true,
children: [] , children: [
{name:"2019"}
] ,
}, },
{ {
marktype: "46", marktype: "46",
...@@ -98,16 +131,24 @@ ...@@ -98,16 +131,24 @@
locate:function(item){ locate:function(item){
parent.vue_left.locate(item); parent.vue_left.locate(item);
}, },
open:function(item,dom){ open:function(item,index,dom){
$(".layui-colla-content").css("display","none"); $(".layui-colla-content").css("display", "none");
if(item.show){ if (item.show) {
$(dom.srcElement).next().css("display","block"); $(dom.srcElement).next().css("display", "block");
}else{ } else {
$(dom.srcElement).next().css("display","none"); $(dom.srcElement).next().css("display", "none");
} }
//其他逻辑 //其他逻辑
item.show=!item.show; item.show = !item.show;
},
open2: function (item, n, dom) {
$("#layui").css("display", "none");
if (item.show) {
$(dom.srcElement).next().css("display", "block");
} else {
$(dom.srcElement).next().css("display", "none");
}
item.show = !item.show;
}, },
showphotos: function (items) { showphotos: function (items) {
var playsrc={data: []}; var playsrc={data: []};
...@@ -136,14 +177,16 @@ ...@@ -136,14 +177,16 @@
} }
}, },
mounted(){//挂载的时候执行 mounted(){//挂载的时候执行
debugger
this.tree_list[0].children=this.data_filter.data[0].data;
that=this; that=this;
getByAjax("./business/queryAreaphotos/45,46,47",function(list){ getByAjax("./business/queryAreaphotos/45,46,47",function(list){
for (var i = 0; i < that.daylist[0].children.length; i++) { // for (var i = 0; i < that.daylist[0].children.length; i++) {
let tempList = list.filter(items => {return items.typeid==that.daylist[0].children[i].marktype}); // let tempList = list.filter(items => {return items.typeid==that.daylist[0].children[i].marktype});
console.log(tempList); // console.log(tempList);
that.daylist[0].children[i].children = tempList; // that.daylist[0].children[i].children = tempList;
} // }
}); });
} }
......
public/components/rightview/dqfwzx.vue
View file @ ea099f67
<template> <template>
<div> <div>
<h1 class="bt_h1">党群服务中心</h1> <h1 class="bt_h1">兴卫村社区党建红色网格</h1>
<div class="table-a" style="height: 700px; overflow-y: auto;"> <div class="table-a" style="height: 700px; overflow-y: auto;">
<table class="layui-table" style="background-color: #ece5e500;"> <table class="layui-table" style="background-color: #ece5e500;">
<colgroup> <colgroup>
......
public/components/rightview/dwzx.vue
View file @ ea099f67
...@@ -94,9 +94,8 @@ ...@@ -94,9 +94,8 @@
{ {
this.datax.lxfs1=templxfs[1]; this.datax.lxfs1=templxfs[1];
} }
let reg=new RegExp('*(',‘g‘) debugger
this.datax.foreach(item=>{ item=item.substring(indexOf("(")"+1,item.lastIndexOf(")")) ; this.datax.ejzb='兴卫村社区居民'+this.datax.ejzb.substring(this.datax.ejzb.indexOf('(')+1,this.datax.ejzb.lastIndexOf(")")) ;
return '兴卫村社区居民'+item; })
} }
......
public/components/rightview/gdgl.vue
View file @ ea099f67
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<tbody class="bg_tr"> <tbody class="bg_tr">
<tr v-for="(item,index) in datax"> <tr v-for="(item,index) in datax">
<td v-text="item.管理员"></td> <td v-text="item.管理员"></td>
<td ><div>item.工地名称</div></td> <td ><div style="text-align: left;">①大地土壤修复<br/>②大地土壤修复2<br/>③北京建工土壤修复<br/>④兴卫保障房三期项目<br/>⑤兴卫一待出让地块</div></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
......
public/components/rightview/zyzfwz.vue
View file @ ea099f67
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</thead> </thead>
</table> </table>
</div> </div>
<div class="table-a" style="overflow-y:auto;height: 362px"> <div class="table-a" style="overflow-y:auto;height: 79%">
<table class="layui-table" style="background-color: #ece5e500;"> <table class="layui-table" style="background-color: #ece5e500;">
<colgroup> <colgroup>
<col width="40"> <col width="40">
......
public/js_src/index_src.js
View file @ ea099f67
...@@ -910,10 +910,15 @@ function listenLayer(v_layer, layerdata) { ...@@ -910,10 +910,15 @@ function listenLayer(v_layer, layerdata) {
require(["js/bundle/incident.bundle.js"], function ($root) { require(["js/bundle/incident.bundle.js"], function ($root) {
incident = $root['incident']; incident = $root['incident'];
vue_right.currentView = layerdata.rightview; vue_right.currentView = layerdata.rightview;
vue_right.widthData = layerdata.width;
vue_right.heightData = layerdata.height;
//延迟加载以便能够保证子组件已经加载完毕再调用其方法 //延迟加载以便能够保证子组件已经加载完毕再调用其方法
if(vue_right.$refs!=undefined && vue_right.$refs.mychild !=undefined ){
setTimeout(() => { setTimeout(() => {
vue_right.$refs.mychild.show(evt.graphic.attributes.data); vue_right.$refs.mychild.show(evt.graphic.attributes.data);
}, 300); document.getElementById('rightvue').style.display = 'block';
}, 100);
}
}); });
}); });
v_layer.on('mouse-move', function (evt) { v_layer.on('mouse-move', function (evt) {
...@@ -952,9 +957,11 @@ function listenLayer(v_layer, layerdata) { ...@@ -952,9 +957,11 @@ function listenLayer(v_layer, layerdata) {
incident = $root['incident']; incident = $root['incident'];
vue_right.currentView = layerdata.rightview; vue_right.currentView = layerdata.rightview;
//延迟加载以便能够保证子组件已经加载完毕再调用其方法 //延迟加载以便能够保证子组件已经加载完毕再调用其方法
if(vue_right.$refs!=undefined && vue_right.$refs.mychild !=undefined ){
setTimeout(() => { setTimeout(() => {
vue_right.$refs.mychild.show(evt.graphic.attributes.data); vue_right.$refs.mychild.show(evt.graphic.attributes.data);
}, 300); }, 300);
}
}); });
evt.graphic.setSymbol(null); evt.graphic.setSymbol(null);
...@@ -1039,9 +1046,11 @@ function listenLayer(v_layer, layerdata) { ...@@ -1039,9 +1046,11 @@ function listenLayer(v_layer, layerdata) {
vue_right.widthData = layerdata.width; vue_right.widthData = layerdata.width;
vue_right.heightData = layerdata.height; vue_right.heightData = layerdata.height;
//延迟加载以便能够保证子组件已经加载完毕再调用其方法 //延迟加载以便能够保证子组件已经加载完毕再调用其方法
if(vue_right.$refs!=undefined && vue_right.$refs.mychild !=undefined ){
setTimeout(() => { setTimeout(() => {
vue_right.$refs.mychild.show(data.data1, data.data2); vue_right.$refs.mychild.show(data.data1, data.data2);
}, 300); }, 300);
}
}); });
}); });
// evt.graphic.setSymbol(null); // evt.graphic.setSymbol(null);
......
util/logs/info.log
View file @ ea099f67
...@@ -280,3 +280,7 @@ ...@@ -280,3 +280,7 @@
[2023-07-17T10:01:36.545] [INFO] info - system/edit/gtqydata/0/GT////////begin [2023-07-17T10:01:36.545] [INFO] info - system/edit/gtqydata/0/GT////////begin
[2023-07-17T10:02:22.459] [INFO] info - system/edit/gtqydata/0/GT////////begin [2023-07-17T10:02:22.459] [INFO] info - system/edit/gtqydata/0/GT////////begin
[2023-07-17T10:03:22.454] [INFO] info - system/edit/gtqydata/0/GT////////begin [2023-07-17T10:03:22.454] [INFO] info - system/edit/gtqydata/0/GT////////begin
[2023-07-18T20:39:36.327] [INFO] info - system/edit/areabaseedit////////begin
[2023-07-18T20:39:36.486] [INFO] info - system/edit/areabaseedit////////end
[2023-07-18T20:41:54.079] [INFO] info - system/edit/areabaseedit////////begin
[2023-07-18T20:41:54.171] [INFO] info - system/edit/areabaseedit////////end
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