Skip to content

Z
ZiBoYingJI
Commit 302712d3 authored by Kimber's avatar Kimber
Browse files
Options

'update'

parent e780df3e
Show whitespace changes
Inline Side-by-side
Showing with 205 additions and 221 deletions
public/datav/index.html
View file @ 302712d3
...@@ -169,9 +169,9 @@ ...@@ -169,9 +169,9 @@
background-image:linear-gradient(to bottom, rgba(20, 72, 247, .4), transparent); background-image:linear-gradient(to bottom, rgba(20, 72, 247, .4), transparent);
} }
.selects select{ .selects select{
position:relative;z-index:2;max-width:150px; position:relative;z-index:2;max-width:150px;margin:0 10px;
background-color:transparent;color:#92f9ff; background-color:transparent;color:#92f9ff;
border-color:transparent;outline:none; border-color:#C99B03;outline:none;
option{ option{
background-color:rgba(20, 72, 247, .5); background-color:rgba(20, 72, 247, .5);
} }
...@@ -250,7 +250,6 @@ ...@@ -250,7 +250,6 @@
style="height: 120px;background-image: url('static/title.png');background-size: 100% 100%;"> style="height: 120px;background-image: url('static/title.png');background-size: 100% 100%;">
<div style="margin-top: -44px;">中和地信应急管理平台</div> <div style="margin-top: -44px;">中和地信应急管理平台</div>
<!-- <div class="floating-text">中和地信有限公司欢迎您</div> --> <!-- <div class="floating-text">中和地信有限公司欢迎您</div> -->
<!-- <div class="a0a_" id="h_tab"> <!-- <div class="a0a_" id="h_tab">
<ul> <ul>
<li data-id="2" class="" >自然资源</li> <li data-id="2" class="" >自然资源</li>
...@@ -265,18 +264,6 @@ ...@@ -265,18 +264,6 @@
<!-- 选择列表 --> <!-- 选择列表 -->
<div class="selects" id="mselect"> <div class="selects" id="mselect">
<select style="margin:0 20px;" id="province">
<option v-for="(item, i) in province" :value="item.id">{{item.name}}</option>
</select>
<select style="margin:0 20px;" id="city">
<option v-for="(item, i) in city" :value="item.id">{{item.name}}</option>
</select>
<select style="margin:0 20px;" id="area">
<option v-for="(item, i) in area" :value="item.id">{{item.name}}</option>
</select>
<select style="margin:0 20px;" id="scompany">
<option v-for="(item, i) in scompany" :value="item.id">{{item.name}}</option>
</select>
</div> </div>
<div> <div>
...@@ -1033,11 +1020,6 @@ ...@@ -1033,11 +1020,6 @@
markerTypeName: ['应急队伍', '应急物资', '应急预案', '应急演练'], markerTypeName: ['应急队伍', '应急物资', '应急预案', '应急演练'],
markerSearchName: '', // 搜索的对应 应急队伍、应急物资、应急预案、应急演练 名称 markerSearchName: '', // 搜索的对应 应急队伍、应急物资、应急预案、应急演练 名称
province:[],
city:[],
area:[],
scompany:[],
mineType:void 0, mineType:void 0,
} }
}, },
...@@ -1112,13 +1094,13 @@ ...@@ -1112,13 +1094,13 @@
}; };
}; */ }; */
// 区域选择列表
var mselect = document.getElementById("mselect");
var selects = mselect.children;
// 请求三级联动 // 请求三级联动
this.reqSelectArea(selects); var arealist = [
{type:'province'},
{type:'city'},
{type:'area'},
];
this.reqSelectArea(arealist);
// left3 daterange event // left3 daterange event
...@@ -1160,56 +1142,79 @@ ...@@ -1160,56 +1142,79 @@
})(); })();
}, },
methods: { methods: {
reqSelectArea(selects){ reqSelectArea(guides){
var that = this, i = 0; var that = this, i = 0, compselect;
// 区域选择列表
var selectbox = this.$el.querySelector("#mselect");
return (function reqiust(id, i){ return (function reqiust(id, i){
var gitem = guides[i], pervItem = guides[i-1];
gitem.select = gitem.select || document.createElement("select");
var req = { var req = {
params: { params: {id:id}
id:id
}
}; };
var select = selects[i];
axios.get(host + '/api/yingji/deptandenterprise/dept', req).then(res => { axios.get(host + '/api/yingji/deptandenterprise/dept', req).then(res => {
res = res.data, list = res.body; var res = res.data, list = res.body;
i++;
that[select.id] = list;
select.onchange = function(e){ // 添加全部
var tag = e.target || e.srcElement; if(i !== 0){
var value = tag.selectedOptions[0].value; list.unshift({
name: "全部",
label: "全部",
id: id,
});
};
gitem.id = id;
if(i<3){ if(gitem.id === (pervItem && pervItem.id)){
reqiust(value, i); gitem.select.style.display = 'none';
}else{ }else{
that.reqEnterprise(value, selects[i]); gitem.select.style.display = 'block';
};
}; };
if(i < 3){ gitem.select.dataset.type = gitem.type;
reqiust(list[0].id, i); !selectbox.contains(gitem.select) && selectbox.appendChild(gitem.select);
qf.UI.selectRender(gitem.select, list, {
'value':'id',
onchange: function(val){
if(i<3){
reqiust(~~val, i);
}else{ }else{
var item = { that.reqEnterprise(~~val, compselect);
name: "全部",
label: "全部",
id: 24,
}; };
},
});
// increase
i++;
list.unshift(item); // 判断是否为最后一级
that.reqEnterprise(list[0] && list[0].id || 0, selects[i]); if(guides[i]){
reqiust(list[0].id, i);
}else{
compselect = compselect || document.createElement("select");
!selectbox.contains(compselect) && selectbox.appendChild(compselect);
that.reqEnterprise(list[0] && list[0].id || 0, compselect);
}; };
}); });
})(0, i); })(0, i);
}, },
reqEnterprise(value, select){ reqEnterprise(value, select){
var that = this;
var req = { var req = {
params: { params: {deptId:(this.deptId = value || 0),}
deptId:(this.deptId = value || 0),
}
}; };
axios.get(host + '/api/yingji/deptandenterprise/enterprise', req).then(res => { axios.get(host + '/api/yingji/deptandenterprise/enterprise', req).then(res => {
res = res.data; res = res.data;
var list = res.body || []; var list = res.body || [];
this[select.id] = list; qf.UI.selectRender(select, list, {
'value':'id',
onchange: function(val){
that.reqMines(that.enterpriseId = ~~val);
},
});
this.isReady = true; this.isReady = true;
if(list[0]){ if(list[0]){
this.enterpriseId = list[0].id; this.enterpriseId = list[0].id;
...@@ -1220,16 +1225,6 @@ ...@@ -1220,16 +1225,6 @@
// 矿山数据 // 矿山数据
this.reqMines(); this.reqMines();
//this.setMap();
});
var that = this;
!select.onchange && (select.onchange = function(e){
var tag = e.target || e.srcElement;
var value = tag.selectedOptions[0].value;
that.enterpriseId = value;
that.reqMines(that.enterpriseId);
}); });
}, },
left1(){ left1(){
...@@ -1312,7 +1307,6 @@ ...@@ -1312,7 +1307,6 @@
}); });
}, },
left2(){ left2(){
var req = { var req = {
params: { params: {
......
public/datav/natural.html
View file @ 302712d3
...@@ -169,9 +169,9 @@ ...@@ -169,9 +169,9 @@
background-image:linear-gradient(to bottom, rgba(20, 72, 247, .4), transparent); background-image:linear-gradient(to bottom, rgba(20, 72, 247, .4), transparent);
} }
.selects select{ .selects select{
position:relative;z-index:2;max-width:150px; position:relative;z-index:2;max-width:150px;margin:0 10px;
background-color:transparent;color:#92f9ff; background-color:transparent;color:#92f9ff;
border-color:transparent;outline:none; border-color:#C99B03;outline:none;
option{ option{
background-color:rgba(20, 72, 247, .5); background-color:rgba(20, 72, 247, .5);
} }
...@@ -275,18 +275,6 @@ ...@@ -275,18 +275,6 @@
<!-- 选择列表 --> <!-- 选择列表 -->
<div class="selects" id="mselect"> <div class="selects" id="mselect">
<select style="margin:0 20px;" id="province">
<option v-for="(item, i) in province" :value="item.id">{{item.name}}</option>
</select>
<select style="margin:0 20px;" id="city">
<option v-for="(item, i) in city" :value="item.id">{{item.name}}</option>
</select>
<select style="margin:0 20px;" id="area">
<option v-for="(item, i) in area" :value="item.id">{{item.name}}</option>
</select>
<select style="margin:0 20px;" id="scompany">
<option v-for="(item, i) in scompany" :value="item.id">{{item.name}}</option>
</select>
</div> </div>
<div> <div>
...@@ -895,11 +883,6 @@ ...@@ -895,11 +883,6 @@
markerTypeName: ['应急队伍', '应急物资', '应急预案', '应急演练'], markerTypeName: ['应急队伍', '应急物资', '应急预案', '应急演练'],
markerSearchName: '', // 搜索的对应 应急队伍、应急物资、应急预案、应急演练 名称 markerSearchName: '', // 搜索的对应 应急队伍、应急物资、应急预案、应急演练 名称
province:[],
city:[],
area:[],
scompany:[],
mineType:void 0, mineType:void 0,
} }
}, },
...@@ -958,15 +941,13 @@ ...@@ -958,15 +941,13 @@
}, 10 * 1000); }, 10 * 1000);
// 区域选择列表
var mselect = document.getElementById("mselect");
var selects = mselect.children;
// 请求三级联动 // 请求三级联动
this.reqSelectArea(selects, onloadDataFinish); var arealist = [
{type:'province'},
function onloadDataFinish(){ {type:'city'},
} {type:'area'},
];
this.reqSelectArea(arealist);
// left3 daterange event // left3 daterange event
var left3t2 = rightbar.querySelector("#daterage1>.m-t2"); var left3t2 = rightbar.querySelector("#daterage1>.m-t2");
...@@ -1007,81 +988,92 @@ ...@@ -1007,81 +988,92 @@
})(); })();
}, },
methods: { methods: {
reqSelectArea(selects, callback){ reqSelectArea(guides){
var that = this, i = 0; var that = this, i = 0, compselect;
// 区域选择列表
var selectbox = this.$el.querySelector("#mselect");
return (function reqiust(id, i){ return (function reqiust(id, i){
var gitem = guides[i], pervItem = guides[i-1];
gitem.select = gitem.select || document.createElement("select");
var req = { var req = {
params: { params: {id:id}
id:id
}
}; };
var select = selects[i];
axios.get(host + '/api/yingji/deptandenterprise/dept', req).then(res => { axios.get(host + '/api/yingji/deptandenterprise/dept', req).then(res => {
res = res.data, list = res.body; var res = res.data, list = res.body;
i++;
that[select.id] = list;
select.onchange = function(e){ // 添加全部
var tag = e.target || e.srcElement; if(i !== 0){
var value = tag.selectedOptions[0].value; list.unshift({
name: "全部",
label: "全部",
id: id,
});
};
gitem.id = id;
if(i<3){ if(gitem.id === (pervItem && pervItem.id)){
reqiust(value, i); gitem.select.style.display = 'none';
}else{ }else{
that.reqEnterprise(value, selects[i]); gitem.select.style.display = 'block';
};
}; };
if(i < 3){ gitem.select.dataset.type = gitem.type;
reqiust(list[0].id, i); !selectbox.contains(gitem.select) && selectbox.appendChild(gitem.select);
qf.UI.selectRender(gitem.select, list, {
'value':'id',
onchange: function(val){
if(i<3){
reqiust(~~val, i);
}else{ }else{
var item = { that.reqEnterprise(~~val, compselect);
name: "全部",
label: "全部",
id: 24,
}; };
},
});
list.unshift(item); // increase
that.reqEnterprise(list[0] && list[0].id || 0, selects[i], callback); i++;
// 判断是否为最后一级
if(guides[i]){
reqiust(list[0].id, i);
}else{
compselect = compselect || document.createElement("select");
!selectbox.contains(compselect) && selectbox.appendChild(compselect);
that.reqEnterprise(list[0] && list[0].id || 0, compselect);
}; };
}); });
})(0, i); })(0, i);
}, },
reqEnterprise(value, select, callback){ reqEnterprise(value, select){
var that = this;
var req = { var req = {
params: { params: {deptId:(this.deptId = value || 0),}
deptId:(this.deptId = value || 0)
}
}; };
axios.get(host + '/api/yingji/deptandenterprise/enterprise', req).then(res => { axios.get(host + '/api/yingji/deptandenterprise/enterprise', req).then(res => {
var res = res.data, list = res.body; res = res.data;
var list = res.body || [];
qf.UI.selectRender(select, list, {
'value':'id',
onchange: function(val){
that.reqMines(that.enterpriseId = ~~val);
},
});
this[select.id] = list;
this.isReady = true; this.isReady = true;
if(list[0]){ if(list[0]){
this.enterpriseId = list[0].id; this.enterpriseId = list[0].id;
}else{ }else{
this.enterpriseId = 0; this.enterpriseId = 0;
this.marker = []; this.marker = [];
}; }
this.reqDispense(this.enterpriseId);
// 设置地图
this.setMap();
callback && callback();
});
var that = this; // 矿山数据
!select.onchange && (select.onchange = function(e){ this.reqMines();
var tag = e.target || e.srcElement;
var value = tag.selectedOptions[0].value;
that.enterpriseId = value;
that.reqDispense(that.enterpriseId);
}); });
}, },
reqDeviceStatus(){ reqDeviceStatus(){
var req = { var req = {
params: { params: {
......
public/datav/watersource.html
View file @ 302712d3
...@@ -169,9 +169,9 @@ ...@@ -169,9 +169,9 @@
background-image:linear-gradient(to bottom, rgba(20, 72, 247, .4), transparent); background-image:linear-gradient(to bottom, rgba(20, 72, 247, .4), transparent);
} }
.selects select{ .selects select{
position:relative;z-index:2;max-width:150px; position:relative;z-index:2;max-width:150px;margin:0 10px;
background-color:transparent;color:#92f9ff; background-color:transparent;color:#92f9ff;
border-color:transparent;outline:none; border-color:#C99B03;outline:none;
option{ option{
background-color:rgba(20, 72, 247, .5); background-color:rgba(20, 72, 247, .5);
} }
...@@ -322,28 +322,17 @@ ...@@ -322,28 +322,17 @@
<div id="app" class="natural"> <div id="app" class="natural">
<div class="fixed wp100 hv100" style="background-color: #000000;left: 0;top: 0;z-index: 1999;" v-show="!isReady"></div> <div class="fixed wp100 hv100" style="background-color: #000000;left: 0;top: 0;z-index: 1999;" v-show="!isReady"></div>
<!-- title --> <!-- main -->
<div class="wp100 hv100" style="display:flex;justify-content:center;"> <div class="wp100 hv100" style="display:flex;justify-content:center;">
<!-- title -->
<div class="flex-text color-theme f30 wp100 relative maxIndex fixed" <div class="flex-text color-theme f30 wp100 relative maxIndex fixed"
:class="isFullScreen?'tr-top':'tr-top-re'" :class="isFullScreen?'tr-top':'tr-top-re'"
style="height: 120px;background-image: url('static/title.png');background-size: 100% 100%;"> style="height:120px;background-image:url('static/title.png');background-size:100% 100%;pointer-events:none;">
<div style="margin-top: -44px;">中和地信水利系统管理平台</div> <div style="margin-top:-44px;">中和地信水利系统管理平台</div>
</div> </div>
<!-- 选择列表 --> <!-- 选择列表 -->
<div class="selects" id="mselect"> <div class="selects" id="mselect">
<select style="margin:0 20px;" id="province">
<option v-for="(item, i) in province" :value="item.id">{{item.name}}</option>
</select>
<select style="margin:0 20px;" id="city">
<option v-for="(item, i) in city" :value="item.id">{{item.name}}</option>
</select>
<select style="margin:0 20px;" id="area">
<option v-for="(item, i) in area" :value="item.id">{{item.name}}</option>
</select>
<select style="margin:0 20px;" id="scompany">
<option v-for="(item, i) in scompany" :value="item.id">{{item.name}}</option>
</select>
</div> </div>
<div> <div>
...@@ -1008,11 +997,6 @@ ...@@ -1008,11 +997,6 @@
markerTypeName: ['应急队伍', '应急物资', '应急预案', '应急演练'], markerTypeName: ['应急队伍', '应急物资', '应急预案', '应急演练'],
markerSearchName: '', // 搜索的对应 应急队伍、应急物资、应急预案、应急演练 名称 markerSearchName: '', // 搜索的对应 应急队伍、应急物资、应急预案、应急演练 名称
province:[],
city:[],
area:[],
scompany:[],
mineType:void 0, mineType:void 0,
} }
}, },
...@@ -1085,13 +1069,16 @@ ...@@ -1085,13 +1069,16 @@
this.noticeIndex = this.noticeIndex + 1; this.noticeIndex = this.noticeIndex + 1;
}, 10 * 1000); }, 10 * 1000);
var mselect = document.getElementById("mselect");
var selects = mselect.children;
// 请求三级联动 // 请求三级联动
this.reqSelectArea(selects, onloadDataFinish); var arealist = [
{type:'province'},
{type:'city'},
{type:'area'},
];
this.reqSelectArea(arealist);
function onloadDataFinish(){ function onloadDataFinish(){
...@@ -1199,6 +1186,8 @@ ...@@ -1199,6 +1186,8 @@
})(); })();
} }
onloadDataFinish();
this.seriesDataFormat = function(data, opts){ this.seriesDataFormat = function(data, opts){
var names = data.names || [], list = data.list || data.lists, series = [], categories = [], maxVal = 0; var names = data.names || [], list = data.list || data.lists, series = [], categories = [], maxVal = 0;
if(names[0] && list){ if(names[0] && list){
...@@ -1229,79 +1218,88 @@ ...@@ -1229,79 +1218,88 @@
}; };
}, },
methods: { methods: {
reqSelectArea(selects, callback){ reqSelectArea(guides, callback){
var that = this, i = 0; var that = this, i = 0, compselect;
// 区域选择列表
var selectbox = this.$el.querySelector("#mselect");
return (function reqiust(id, i){ return (function reqiust(id, i){
var gitem = guides[i], pervItem = guides[i-1];
gitem.select = gitem.select || document.createElement("select");
var req = { var req = {
params: { params: {id:id}
id:id
}
}; };
var select = selects[i];
axios.get(host + '/api/yingji/deptandenterprise/dept', req).then(res => { axios.get(host + '/api/yingji/deptandenterprise/dept', req).then(res => {
res = res.data, list = res.body; var res = res.data, list = res.body;
i++;
that[select.id] = list;
select.onchange = function(e){ // 添加全部
var tag = e.target || e.srcElement; if(i !== 0){
var value = tag.selectedOptions[0].value; list.unshift({
name: "全部",
label: "全部",
id: id,
});
};
gitem.id = id;
if(i<3){ if(gitem.id === (pervItem && pervItem.id)){
reqiust(value, i); gitem.select.style.display = 'none';
}else{ }else{
that.reqEnterprise(value, selects[i]); gitem.select.style.display = 'block';
};
}; };
if(i < 3){ gitem.select.dataset.type = gitem.type;
reqiust(list[0].id, i); !selectbox.contains(gitem.select) && selectbox.appendChild(gitem.select);
qf.UI.selectRender(gitem.select, list, {
'value':'id',
onchange: function(val){
if(i<3){
reqiust(~~val, i);
}else{ }else{
var item = { that.reqEnterprise(~~val, compselect);
name: "全部",
label: "全部",
id: 24,
}; };
},
});
list.unshift(item); // increase
that.reqEnterprise(list[0] && list[0].id || 0, selects[i], callback); i++;
// 判断是否为最后一级
if(guides[i]){
reqiust(list[0].id, i);
}else{
compselect = compselect || document.createElement("select");
!selectbox.contains(compselect) && selectbox.appendChild(compselect);
that.reqEnterprise(list[0] && list[0].id || 0, compselect);
}; };
}); });
})(0, i); })(0, i);
}, },
reqEnterprise(value, select, callback){ reqEnterprise(value, select){
var that = this;
var req = { var req = {
params: { params: {deptId:(this.deptId = value || 0),}
deptId:(this.deptId = value || 0)
}
}; };
axios.get(host + '/api/yingji/deptandenterprise/enterprise', req).then(res => { axios.get(host + '/api/yingji/deptandenterprise/enterprise', req).then(res => {
var res = res.data, list = res.body; res = res.data;
var list = res.body || [];
qf.UI.selectRender(select, list, {
'value':'id',
onchange: function(val){
that.reqMines(that.enterpriseId = ~~val);
},
});
this[select.id] = list;
this.isReady = true; this.isReady = true;
if(list[0]){ if(list[0]){
this.enterpriseId = list[0].id; this.enterpriseId = list[0].id;
}else{ }else{
this.enterpriseId = 0; this.enterpriseId = 0;
this.marker = []; this.marker = [];
}; }
this.reqDispense(this.enterpriseId); this.reqDispense(this.enterpriseId);
// 设置地图
this.setMap();
callback && callback();
});
var that = this;
!select.onchange && (select.onchange = function(e){
var tag = e.target || e.srcElement;
var value = tag.selectedOptions[0].value;
that.enterpriseId = value;
that.reqDispense(that.enterpriseId);
}); });
}, },
......
src/views/home4Index.vue
View file @ 302712d3
...@@ -127,7 +127,7 @@ export default { ...@@ -127,7 +127,7 @@ export default {
location.href = host + "/datav/watersource.html"; location.href = host + "/datav/watersource.html";
} else if (type === "电子档案馆") { } else if (type === "电子档案馆") {
// this.$router.push({ path: "home4Center" }); // this.$router.push({ path: "home4Center" });
this.$router.push({ path: "/user/center" }); this.$router.push({ path: "/1/edoc" });
}else if (type === "生态环境") { }else if (type === "生态环境") {
// this.$router.push({ path: "home4Center" }); // this.$router.push({ path: "home4Center" });
// this.$router.push({ path: "/user/center" }); // this.$router.push({ path: "/user/center" });
......
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