Commit 7cba5b50 authored by xinzhedeai's avatar xinzhedeai

fix:设备类型列表取消, 尾矿库改为水库大坝

parent c6927552
...@@ -2525,7 +2525,7 @@ var reqApis = function () { ...@@ -2525,7 +2525,7 @@ var reqApis = function () {
}, },
system: { system: {
pondManage: { // 尾矿库管理 pondManage: { // 水库大坝管理
Dict: { Dict: {
baseInfo: { baseInfo: {
"province": { "province": {
...@@ -2554,11 +2554,11 @@ var reqApis = function () { ...@@ -2554,11 +2554,11 @@ var reqApis = function () {
Dict.codeSplitJoint(fitem); Dict.codeSplitJoint(fitem);
} }
}, },
"tailingno": { name: "尾矿库编号", must: true, form: 0 }, "tailingno": { name: "水库大坝编号", must: true, form: 0 },
"tailingname": { name: "尾矿库名称", must: true }, "tailingname": { name: "水库大坝名称", must: true },
"risk_entrance": { name: "风险大屏入口", type: 'select' }, "risk_entrance": { name: "风险大屏入口", type: 'select' },
"address": { "address": {
name: "尾矿库地址", /* must:true, */disabled: true, type: 'map', style: "display:flex", name: "水库大坝地址", /* must:true, */disabled: true, type: 'map', style: "display:flex",
mapConfig: { mapConfig: {
options: { options: {
zoom: 6, zoom: 6,
...@@ -2627,7 +2627,7 @@ var reqApis = function () { ...@@ -2627,7 +2627,7 @@ var reqApis = function () {
"securityofficertel": { name: "安全负责人电话", must: true }, "securityofficertel": { name: "安全负责人电话", must: true },
"designheight": { name: "设计总坝高(m)", table: 0, must: true }, "designheight": { name: "设计总坝高(m)", table: 0, must: true },
"stackheight": { name: "现状总坝高(m)", table: 0, must: true }, "stackheight": { name: "现状总坝高(m)", table: 0, must: true },
"defaults": { name: "默认尾矿库", type: 'select' }, "defaults": { name: "默认水库大坝", type: 'select' },
"unifcreditcode": { name: "企业统一信用码", table: 0, placeholder: '(gb 32100-2015)' }, "unifcreditcode": { name: "企业统一信用码", table: 0, placeholder: '(gb 32100-2015)' },
"unitname": { name: "管理单位", table: 0 }, "unitname": { name: "管理单位", table: 0 },
"unitadress": { name: "企业所在地", table: 0 }, "unitadress": { name: "企业所在地", table: 0 },
...@@ -2650,7 +2650,7 @@ var reqApis = function () { ...@@ -2650,7 +2650,7 @@ var reqApis = function () {
"safetypermitno": { name: "安全生产许可证", table: 0 }, "safetypermitno": { name: "安全生产许可证", table: 0 },
"safetypermitdate": { name: "安全生产许可证有效期", type: "date", table: 0 }, "safetypermitdate": { name: "安全生产许可证有效期", type: "date", table: 0 },
"safetypermitunit": { name: "安全生产许可证发证机关", table: 0 }, "safetypermitunit": { name: "安全生产许可证发证机关", table: 0 },
"storetypeno": { name: "尾矿库类型", type: 'select', table: 0 }, "storetypeno": { name: "水库大坝类型", type: 'select', table: 0 },
"designlevel": { name: "设计等级", type: 'select', table: 0 }, "designlevel": { name: "设计等级", type: 'select', table: 0 },
"grade": { name: "现状等级", type: 'select', table: 0 }, "grade": { name: "现状等级", type: 'select', table: 0 },
"plancapability": { name: "设计库容(万立方米)", table: 0 }, "plancapability": { name: "设计库容(万立方米)", table: 0 },
...@@ -2660,7 +2660,7 @@ var reqApis = function () { ...@@ -2660,7 +2660,7 @@ var reqApis = function () {
"floodmethod": { name: "库外排洪型式", table: 0 }, "floodmethod": { name: "库外排洪型式", table: 0 },
"floodfacilitydischarge": { name: "排洪设施泄流量(立方米/秒)", table: 0 }, "floodfacilitydischarge": { name: "排洪设施泄流量(立方米/秒)", table: 0 },
"waterarea": { name: "汇水面积(平方公里)", table: 0 }, "waterarea": { name: "汇水面积(平方公里)", table: 0 },
"area": { name: "尾矿库面积(平方公里)", table: 0 }, "area": { name: "水库大坝面积(平方公里)", table: 0 },
"floodcontrolstandard": { name: "设计防洪标准(年)", table: 0 }, "floodcontrolstandard": { name: "设计防洪标准(年)", table: 0 },
"damtype": { name: "初期坝类型", type: 'select', table: 0 }, "damtype": { name: "初期坝类型", type: 'select', table: 0 },
"initialdamtype": { name: "初期坝坝型", type: 'select', table: 0 }, "initialdamtype": { name: "初期坝坝型", type: 'select', table: 0 },
...@@ -2784,7 +2784,7 @@ var reqApis = function () { ...@@ -2784,7 +2784,7 @@ var reqApis = function () {
formWidth: '840px', formWidth: '840px',
labelWidth: '120', labelWidth: '120',
operWidth: '180', operWidth: '180',
title: '尾矿库', title: '水库大坝',
buttons: [ // tableBtn buttons: [ // tableBtn
//{'fn':'', 'type':'success', 'icon':'el-icon-more'}, //{'fn':'', 'type':'success', 'icon':'el-icon-more'},
{ {
...@@ -2831,7 +2831,7 @@ var reqApis = function () { ...@@ -2831,7 +2831,7 @@ var reqApis = function () {
], ],
otherBtn: [ otherBtn: [
{ {
'type': 'primary', 'icon': 'el-icon-plus', 'name': '添加尾矿库', 'callback': function () { 'type': 'primary', 'icon': 'el-icon-plus', 'name': '添加水库大坝', 'callback': function () {
reqApi.common.toAdd.call(this); reqApi.common.toAdd.call(this);
// 地图 // 地图
...@@ -2842,7 +2842,7 @@ var reqApis = function () { ...@@ -2842,7 +2842,7 @@ var reqApis = function () {
], ],
search: [ search: [
{ {
'type': 'string', 'name': '尾矿库名称', 'word': 'tailingname', 'mode': 0, 'width': '200px', 'clear': function () { 'type': 'string', 'name': '水库大坝名称', 'word': 'tailingname', 'mode': 0, 'width': '200px', 'clear': function () {
this.loadData() this.loadData()
} }
}, },
...@@ -2862,7 +2862,7 @@ var reqApis = function () { ...@@ -2862,7 +2862,7 @@ var reqApis = function () {
Dict: { Dict: {
baseInfo: { baseInfo: {
"equipname": { name: "设备名称", must: true }, "equipname": { name: "设备名称", must: true },
"devicetype": { name: "设备类型", type: 'select', must: true }, "devicetype": { name: "设备类型", type: 'select', must: true, table: 0, },
"equipno": { name: "设备编号", must: true }, "equipno": { name: "设备编号", must: true },
"eqdanwei": { name: "数值单位", must: true }, "eqdanwei": { name: "数值单位", must: true },
"installationdata": { name: "安装日期", type: "date", must: true }, "installationdata": { name: "安装日期", type: "date", must: true },
...@@ -2931,7 +2931,7 @@ var reqApis = function () { ...@@ -2931,7 +2931,7 @@ var reqApis = function () {
}, },
}, },
}, },
//"tailingid":{name:"所属尾矿库", type:'select', must:true, table:0}, //"tailingid":{name:"所属水库大坝", type:'select', must:true, table:0},
"longitude": { name: "经度", table: 0, form: 0 }, "longitude": { name: "经度", table: 0, form: 0 },
"latitude": { name: "纬度", table: 0, form: 0 }, "latitude": { name: "纬度", table: 0, form: 0 },
"installheight": { name: "安装高度", table: 0 }, "installheight": { name: "安装高度", table: 0 },
......
...@@ -91,7 +91,7 @@ export default { ...@@ -91,7 +91,7 @@ export default {
reqApi.common.requstEdge('get', 'tab/tailpondinfor/dryinfo', {}).then(function(res){ reqApi.common.requstEdge('get', 'tab/tailpondinfor/dryinfo', {}).then(function(res){
var body = res.body || {}; var body = res.body || {};
var tailingname = body.tailingname; var tailingname = body.tailingname;
//self.pondName = tailingname.indexOf('尾矿库') > -1 ? tailingname : (tailingname||'') + '尾矿库'; //self.pondName = tailingname.indexOf('水库大坝') > -1 ? tailingname : (tailingname||'') + '水库大坝';
self.pondName = tailingname; self.pondName = tailingname;
self.risk_entrance = body.risk_entrance; self.risk_entrance = body.risk_entrance;
self.d3_screnn = !body.d3_screnn; self.d3_screnn = !body.d3_screnn;
......
...@@ -2,7 +2,7 @@ module.exports = { ...@@ -2,7 +2,7 @@ module.exports = {
/** /**
* @description 网站标题 * @description 网站标题
*/ */
title: '尾矿库安全监测系统', title: '水库大坝安全监测系统',
/** /**
* @description 是否显示 tagsView * @description 是否显示 tagsView
*/ */
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<div class="b_0"> <div class="b_0">
<header> <header>
<div class="b1_a"> <div class="b1_a">
<h1>尾矿库数据风险预警监控平台</h1> <h1>水库大坝数据风险预警监控平台</h1>
</div> </div>
<div class="b1_b"> <div class="b1_b">
<a href="/dashboard">返回</a> <a href="/dashboard">返回</a>
...@@ -50,10 +50,10 @@ ...@@ -50,10 +50,10 @@
</div> </div>
</div> </div>
<div class="b2_a2" id="b2_a2"> <div class="b2_a2" id="b2_a2">
<div class="b2a_2a text-abs"><a class="">尾矿库风险等级</a></div> <div class="b2a_2a text-abs"><a class="">水库大坝风险等级</a></div>
<div class="b2a_2b text-abs"><a class="">在线监测</a></div> <div class="b2a_2b text-abs"><a class="">在线监测</a></div>
<div class="b2a_2c text-abs"><a class="">实时监测</a></div> <div class="b2a_2c text-abs"><a class="">实时监测</a></div>
<div class="b2a_2d text-abs"><a class="">尾矿库安全</a></div> <div class="b2a_2d text-abs"><a class="">水库大坝安全</a></div>
</div> </div>
<div class="b2_a3 abs-flex"> <div class="b2_a3 abs-flex">
<div class="flex-disf panle-seat"> <div class="flex-disf panle-seat">
...@@ -227,7 +227,7 @@ export default { ...@@ -227,7 +227,7 @@ export default {
var scrollMsg = this.$el.querySelector("#scrollMsg"); var scrollMsg = this.$el.querySelector("#scrollMsg");
var listBox = scrollMsg.firstElementChild.firstElementChild; var listBox = scrollMsg.firstElementChild.firstElementChild;
var risk = this.getHighAlarmLevel(body); var risk = this.getHighAlarmLevel(body);
listBox.innerHTML = '<li><h5><i></i>尾矿库风险等级</h5><span class="level'+(risk.level)+'">'+risk.text+'</span></li>'; listBox.innerHTML = '<li><h5><i></i>水库大坝风险等级</h5><span class="level'+(risk.level)+'">'+risk.text+'</span></li>';
Tools.singleViewSeamlessScroll(scrollMsg); Tools.singleViewSeamlessScroll(scrollMsg);
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
/> />
<div class="b_0"> <div class="b_0">
<ul> <ul>
<li><span>尾矿库名称:</span><span>{{unitInfo.tailingname}}</span></li> <li><span>水库大坝名称:</span><span>{{unitInfo.tailingname}}</span></li>
<li><span>尾矿库编号:</span><span>{{unitInfo.tailingno}}</span></li> <li><span>水库大坝编号:</span><span>{{unitInfo.tailingno}}</span></li>
<li><span>尾矿库地址:</span><span>{{unitInfo.address}}</span></li> <li><span>水库大坝地址:</span><span>{{unitInfo.address}}</span></li>
<li><span>值班电话:</span><span>{{unitInfo.ondutytel}}</span></li> <li><span>值班电话:</span><span>{{unitInfo.ondutytel}}</span></li>
<li><span>安全负责人姓名:</span><span>{{unitInfo.securityofficer}}</span></li> <li><span>安全负责人姓名:</span><span>{{unitInfo.securityofficer}}</span></li>
<li><span>安全负责人电话:</span><span>{{unitInfo.securityofficertel}}</span></li> <li><span>安全负责人电话:</span><span>{{unitInfo.securityofficertel}}</span></li>
...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
var index = extData.index, tagMarker = cmap.getTargetMarker(); var index = extData.index, tagMarker = cmap.getTargetMarker();
var unitItem = self.UnitList[index]; var unitItem = self.UnitList[index];
if(tagMarker !== e.target){ if(tagMarker !== e.target){
// 请求切换尾矿库接口 // 请求切换水库大坝接口
self.pageApi.switchPond({tailingno:unitItem.tailingno}).then((res)=>{ self.pageApi.switchPond({tailingno:unitItem.tailingno}).then((res)=>{
if(res.code === 200){ if(res.code === 200){
// 重置中心点 // 重置中心点
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
/> />
<div class="b_0"> <div class="b_0">
<ul> <ul>
<li><span>尾矿库名称:</span><span>{{unitInfo.tailingname}}</span></li> <li><span>水库大坝名称:</span><span>{{unitInfo.tailingname}}</span></li>
<li><span>尾矿库编号:</span><span>{{unitInfo.tailingno}}</span></li> <li><span>水库大坝编号:</span><span>{{unitInfo.tailingno}}</span></li>
<li><span>尾矿库地址:</span><span>{{unitInfo.address}}</span></li> <li><span>水库大坝地址:</span><span>{{unitInfo.address}}</span></li>
<li><span>值班电话:</span><span>{{unitInfo.ondutytel}}</span></li> <li><span>值班电话:</span><span>{{unitInfo.ondutytel}}</span></li>
<li><span>安全负责人姓名:</span><span>{{unitInfo.securityofficer}}</span></li> <li><span>安全负责人姓名:</span><span>{{unitInfo.securityofficer}}</span></li>
<li><span>安全负责人电话:</span><span>{{unitInfo.securityofficertel}}</span></li> <li><span>安全负责人电话:</span><span>{{unitInfo.securityofficertel}}</span></li>
...@@ -181,7 +181,7 @@ export default { ...@@ -181,7 +181,7 @@ export default {
var index = extData.index, tagMarker = cmap.getTargetMarker(); var index = extData.index, tagMarker = cmap.getTargetMarker();
var unitItem = self.UnitList[index]; var unitItem = self.UnitList[index];
if(tagMarker !== e.target){ if(tagMarker !== e.target){
// 请求切换尾矿库接口 // 请求切换水库大坝接口
self.pageApi.switchPond({tailingno:unitItem.tailingno}).then((res)=>{ self.pageApi.switchPond({tailingno:unitItem.tailingno}).then((res)=>{
if(res.code === 200){ if(res.code === 200){
// 重置中心点 // 重置中心点
......
...@@ -548,7 +548,7 @@ export default { ...@@ -548,7 +548,7 @@ export default {
}, },
// 删除背景图片 // 删除背景图片
deleteBg(e){ deleteBg(e){
this.$confirm('确定要删除尾矿库图片吗?', '提示', { this.$confirm('确定要删除水库大坝图片吗?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
...@@ -661,7 +661,7 @@ export default { ...@@ -661,7 +661,7 @@ export default {
min-width:40%;padding:.50rem;border:1px dashed rgba(0, 0, 0, 0.1);background-color:rgba(0, 0, 0, 0.05);z-index:0; min-width:40%;padding:.50rem;border:1px dashed rgba(0, 0, 0, 0.1);background-color:rgba(0, 0, 0, 0.05);z-index:0;
text-align:center;cursor:pointer;color:#999; text-align:center;cursor:pointer;color:#999;
&:before{display:block;font-size:.54rem;} &:before{display:block;font-size:.54rem;}
&:after{display:block;content:"上传尾矿库全景图片";margin-top:20px;line-height:22px;} &:after{display:block;content:"上传水库大坝全景图片";margin-top:20px;line-height:22px;}
} }
&.show{display:flex;} &.show{display:flex;}
} }
......
...@@ -133,12 +133,12 @@ ...@@ -133,12 +133,12 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item style="margin-bottom: 0;" label="尾矿库" prop="ponds" v-if="form.username !== 'admin'"> <el-form-item style="margin-bottom: 0;" label="水库大坝" prop="ponds" v-if="form.username !== 'admin'">
<el-select <el-select
v-model="pondDatas" v-model="pondDatas"
style="width: 437px" style="width: 437px"
multiple multiple
placeholder="请选择尾矿库" placeholder="请选择水库大坝"
@remove-tag="deletePonds" @remove-tag="deletePonds"
@change="changePonds" @change="changePonds"
> >
...@@ -324,7 +324,7 @@ export default { ...@@ -324,7 +324,7 @@ export default {
} }
this.getRoleLevel() this.getRoleLevel()
this.getJobs() this.getJobs()
// 获取尾矿库列表和权限 // 获取水库大坝列表和权限
this.getUserOnPonds({username:form.username}, form); this.getUserOnPonds({username:form.username}, form);
form.enabled = form.enabled.toString() form.enabled = form.enabled.toString()
}, },
...@@ -488,7 +488,7 @@ export default { ...@@ -488,7 +488,7 @@ export default {
}).catch(() => { }) }).catch(() => { })
}, },
// 获取尾矿库列表 // 获取水库大坝列表
getUserOnPonds(param, form) { getUserOnPonds(param, form) {
getUserOnPonds(param).then(res => { getUserOnPonds(param).then(res => {
var self = this; var self = this;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="login" > <div class="login" >
<div class="login-ctn"> <div class="login-ctn">
<div class="headder"> <div class="headder">
<h2>尾矿库数据在线监测系统</h2> <h2>水库大坝数据在线监测系统</h2>
<h4>ONLINE MONITORING SYSTEM FOR TAILINGS POND DATA</h4> <h4>ONLINE MONITORING SYSTEM FOR TAILINGS POND DATA</h4>
</div> </div>
<div class="logo-place"> <div class="logo-place">
......
<template> <template>
<div class="login" :style="'background-image:url('+ Background +');'"> <div class="login" :style="'background-image:url('+ Background +');'">
<div class="headder"> <div class="headder">
<h2>尾矿库数据在线监测系统</h2> <h2>水库大坝数据在线监测系统</h2>
<h4>ONLINE MONITORING SYSTEM FOR TAILINGS POND DATA</h4> <h4>ONLINE MONITORING SYSTEM FOR TAILINGS POND DATA</h4>
<!-- <h2>边坡数据在线监测系统</h2> <!-- <h2>边坡数据在线监测系统</h2>
<h4>ONLINE MONITORING SYSTEM FOR SIDE SLOPE DATA</h4> --> <h4>ONLINE MONITORING SYSTEM FOR SIDE SLOPE DATA</h4> -->
......
<template> <template>
<div class="login" :style="'background-image:url('+ Background +');'"> <div class="login" :style="'background-image:url('+ Background +');'">
<div class="headder"> <div class="headder">
<h2>尾矿库数据在线监测系统</h2> <h2>水库大坝数据在线监测系统</h2>
<h4>ONLINE MONITORING SYSTEM FOR TAILINGS POND DATA</h4> <h4>ONLINE MONITORING SYSTEM FOR TAILINGS POND DATA</h4>
<!-- <h2>边坡数据在线监测系统</h2> <!-- <h2>边坡数据在线监测系统</h2>
<h4>ONLINE MONITORING SYSTEM FOR SIDE SLOPE DATA</h4> --> <h4>ONLINE MONITORING SYSTEM FOR SIDE SLOPE DATA</h4> -->
......
<template> <template>
<div class="login" :style="'background-image:url('+ Background +');'"> <div class="login" :style="'background-image:url('+ Background +');'">
<div class="headder"> <div class="headder">
<h2>尾矿库数据在线监测系统</h2> <h2>水库大坝数据在线监测系统</h2>
<h4>ONLINE MONITORING SYSTEM FOR TAILINGS POND DATA</h4> <h4>ONLINE MONITORING SYSTEM FOR TAILINGS POND DATA</h4>
</div> </div>
<div class="logo-place"> <div class="logo-place">
......
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