Skip to content

Z
zhxf_vue
Commit ecf27e41 authored by xiexingan's avatar xiexingan
Browse files
Options

tj

parent 2035bae8
Hide whitespace changes
Inline Side-by-side
Showing with 108 additions and 34 deletions
src/pages/ol/demo/index.vue
View file @ ecf27e41
...@@ -681,7 +681,7 @@ export default { ...@@ -681,7 +681,7 @@ export default {
this.queryDetail(item.id) this.queryDetail(item.id)
} else { } else {
// console.log('2') // console.log('2')
this.noQueryDetail(item.id) this.noQueryDetail(item)
} }
} }
this.activeChooseResourceBox(item.id) this.activeChooseResourceBox(item.id)
...@@ -1004,12 +1004,12 @@ export default { ...@@ -1004,12 +1004,12 @@ export default {
this.list.forEach((res) => { this.list.forEach((res) => {
Vue.set(res, 'active', false) Vue.set(res, 'active', false)
}) })
console.log(this.list) // console.log(this.list)
this.changeVectorLayer(this.list) this.changeVectorLayer(this.list)
// 点亮对应的marker // 点亮对应的marker
let feature = this.vectorLayer.getSource().getFeatureById(id) let feature = this.vectorLayer.getSource().getFeatureById(id)
console.log(feature) // console.log(feature)
if (feature) { if (feature) {
for (let i in this.list) { for (let i in this.list) {
if (feature.id_ == that.list[i].id) { if (feature.id_ == that.list[i].id) {
...@@ -1144,11 +1144,11 @@ export default { ...@@ -1144,11 +1144,11 @@ export default {
this.$refs.queryDetail.init(id, this.checkedData.sId) this.$refs.queryDetail.init(id, this.checkedData.sId)
}) })
}, },
noQueryDetail(id) { noQueryDetail(item) {
this.noQueryDetailVisible = true this.noQueryDetailVisible = true
this.queryDetailVisible = false this.queryDetailVisible = false
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.noQueryDetail.init(id, this.checkedData.sId) this.$refs.noQueryDetail.init(item, this.checkedData.sId)
}) })
}, },
closeQueryDetailVisible() { closeQueryDetailVisible() {
......
src/pages/ol/demo/no-query-detail.vue
View file @ ecf27e41
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<el-button icon="el-icon-close" style="float:right;" type="text" @click="closeQueryDetailVisible"></el-button> <el-button icon="el-icon-close" style="float:right;" type="text" @click="closeQueryDetailVisible"></el-button>
</div> </div>
<div style="height:40px; width:100%;padding-top:10px"> <div style="height:40px; width:100%;padding-top:10px">
<div style="width:80px; float:left; line-height:40px; padding-left:10px;">关联监控:</div> <div style="width:80px; float:left; line-height:30px; padding-left:10px;">关联监控:</div>
<div style="float:left"> <div style="float:left">
<el-select v-model="camera" placeholder="请选择" @change="cameraChange"> <el-select size='mini' v-model="camera" placeholder="请选择" @change="cameraChange">
<el-option v-for="item in dataForm.list" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in dataForm.list" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</div> </div>
...@@ -82,20 +82,63 @@ ...@@ -82,20 +82,63 @@
<div class='info-title'>监控点信息</div> <div class='info-title'>监控点信息</div>
<div class='info-form'> <div class='info-form'>
<div class="quDetailM"> <div class="quDetailM">
<p class="leftP">设备名称&nbsp;:&nbsp;&nbsp;<span class='title'>{{dataForm.name}} 喷淋监测点</span></p> <p class="leftP">设备名称&nbsp;:&nbsp;&nbsp;<span class='title'>{{dataForm.name}}</span></p>
</div> </div>
<div class='typeInfoBox'> <div class='typeInfoBox' v-if="dataForm.type!='c788ce98c1f248f590434394da485ce4'">
<div class="typeInfo"> <div class="typeInfo" v-if="dataForm.type=='b45827c068254695864ee3c1d42573cb'">
<div class='title'>末端流量</div> <div class='title'>水流流量</div>
<div><span class='num'>9</span>&nbsp;<span class='unit'>L/s</span></div> <div><span class='num'>9</span>&nbsp;<span class='unit'>L/s</span></div>
<div class='scope'>参考值：5~20 L/s</div> <div class='scope'>参考值：5~20 L/s</div>
</div> </div>
<div class="typeInfo">
<div class='title'>当前压力</div> <div class="typeInfo" v-if="dataForm.type=='b47661ca1d454f9792ba5369f3cb2bc5'">
<div class='title'>水流压力</div>
<div><span class='num'>0.78</span>&nbsp;<span class='unit'>Mpa</span></div>
<div class='scope'>参考值：0.35~1.45 Mpa</div>
</div>
<div class="typeInfo" v-if="dataForm.type=='303310efddb34a2e9bf269bdff8a7dc5'">
<div class='title'>水位高度</div>
<div><span class='num'>0.78</span>&nbsp;<span class='unit'>Mpa</span></div>
<div class='scope'>参考值：0.35~1.45 Mpa</div>
</div>
<div class="typeInfo" v-if="dataForm.type=='f4c840711eae4bcb9536a890cdfda493'">
<div class='title'>风速</div>
<div><span class='num'>0.78</span>&nbsp;<span class='unit'>Mpa</span></div>
<div class='scope'>参考值：0.35~1.45 Mpa</div>
</div>
<div class="typeInfo" v-if="dataForm.type=='5b26f6c8f2a143048bd0e327ca5c186d'">
<div class='title'>风压</div>
<div><span class='num'>0.78</span>&nbsp;<span class='unit'>Mpa</span></div> <div><span class='num'>0.78</span>&nbsp;<span class='unit'>Mpa</span></div>
<div class='scope'>参考值：0.35~1.45 Mpa</div> <div class='scope'>参考值：0.35~1.45 Mpa</div>
</div> </div>
</div>
<div class='typeInfoBox' v-if="dataForm.type=='c788ce98c1f248f590434394da485ce4'">
<div class="typeInfo">
<div class='title'>一氧化碳</div>
<div><span class='num'>0.78</span>&nbsp;<span class='unit'>Mpa</span></div>
<div class='scope'>参考值：0.35~1.45 Mpa</div>
</div>
<div class="typeInfo">
<div class='title'>二氧化碳</div>
<div><span class='num'>0.78</span>&nbsp;<span class='unit'>Mpa</span></div>
<div class='scope'>参考值：0.35~1.45 Mpa</div>
</div>
<div class="typeInfo">
<div class='title'>温度</div>
<div><span class='num'>0.78</span>&nbsp;<span class='unit'>Mpa</span></div>
<div class='scope'>参考值：0.35~1.45 Mpa</div>
</div>
<div class="typeInfo">
<div class='title'>湿度</div>
<div><span class='num'>0.78</span>&nbsp;<span class='unit'>Mpa</span></div>
<div class='scope'>参考值：0.35~1.45 Mpa</div>
</div>
</div> </div>
<div class="quDetailM"> <div class="quDetailM">
<p class="leftP">资源点状态&nbsp;:&nbsp;&nbsp;<span>{{dataForm.status==1?'正常':'异常'}}</span></p> <p class="leftP">资源点状态&nbsp;:&nbsp;&nbsp;<span>{{dataForm.status==1?'正常':'异常'}}</span></p>
</div> </div>
...@@ -111,10 +154,39 @@ export default { ...@@ -111,10 +154,39 @@ export default {
computed: { computed: {
...mapState('d2admin/user', [ ...mapState('d2admin/user', [
'info' 'info'
]) ]),
fsyList() {
return this.$store.state.d2admin.typeList.typeList.fsyList
},
fyyList() {
return this.$store.state.d2admin.typeList.typeList.fyyList
},
hjtcqList() {
return this.$store.state.d2admin.typeList.typeList.hjtcqList
},
lljList() {
return this.$store.state.d2admin.typeList.typeList.lljList
},
wxyljList() {
return this.$store.state.d2admin.typeList.typeList.wxyljList
},
wxywyList() {
return this.$store.state.d2admin.typeList.typeList.wxywyList
}
}, },
watch: {
typeList: {
handler(n, o) {
if (n) {
}
},
deep: true
}
},
data () { data () {
return { return {
params: [],
video1: 0, video1: 0,
stationId: localStorage.getItem('stationId'), stationId: localStorage.getItem('stationId'),
//11=焦距变大，12=焦距变小，13=焦点前调，14=焦点后调，15=光圈扩大，16=光圈扩小 //11=焦距变大，12=焦距变小，13=焦点前调，14=焦点后调，15=光圈扩大，16=光圈扩小
...@@ -145,18 +217,19 @@ export default { ...@@ -145,18 +217,19 @@ export default {
} }
}, },
created() { created() {
console.log(this.typeList)
}, },
methods: { methods: {
init (id, stationId) { init (item, stationId) {
console.log('id', id) console.log('item', item)
this.clickFlag = false this.clickFlag = false
this.dataForm.id = id this.dataForm.name = item.name
this.dataForm.type = item.type
this.dataForm.status = item.status
// this.stationId = stationId // this.stationId = stationId
this.cameraCur = {} this.cameraCur = {}
this.camera = '' this.camera = ''
// this.initResource() // this.initResource()
this.dataForm.operatorName = this.info.name
}, },
initResource() { initResource() {
this.video1 = 0//初始化显示默认图片 this.video1 = 0//初始化显示默认图片
...@@ -368,10 +441,10 @@ export default { ...@@ -368,10 +441,10 @@ export default {
font-weight:bold; font-weight:bold;
} }
.info-video{ .info-video{
padding: 10px; height: 160px; padding: 0 10px 10px; height: 160px;
} }
.info-form{ .info-form{
padding: 10px; padding: 10px 10px 0;
} }
.info-block{ .info-block{
border: 1px solid #cccccc; border: 1px solid #cccccc;
...@@ -405,16 +478,18 @@ export default { ...@@ -405,16 +478,18 @@ export default {
} }
.typeInfoBox{ .typeInfoBox{
display: flex; display: flex;
flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
margin-bottom: 10px; margin-bottom: 5px;
.typeInfo{ .typeInfo{
width: 48%; width: 48%;
height: 100px; height: 75px;
background: #fff; background: #fff;
border:1px solid #BDCAD1; border:1px solid #BDCAD1;
text-align:center; text-align:center;
margin-bottom: 5px;
div{ div{
margin:10px 0; margin:5px 0;
} }
.title{ .title{
font-size: 16px; font-size: 16px;
...@@ -442,10 +517,10 @@ export default { ...@@ -442,10 +517,10 @@ export default {
border-radius:10px; border-radius:10px;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
justify-content: flex-start; justify-content: space-around;
.btns{ .btns{
width:194px; width:150px;
height:194px; height:150px;
position:relative; position:relative;
img{ img{
width:100%; width:100%;
......
src/pages/ol/demo/query-detail.vue
View file @ ecf27e41
...@@ -357,8 +357,7 @@ export default { ...@@ -357,8 +357,7 @@ export default {
font-weight: bold; font-weight: bold;
} }
.info-video { .info-video {
padding: 10px; padding: 10px; height: 160px;
height: 175px;
} }
.info-form { .info-form {
padding: 10px; padding: 10px;
...@@ -370,8 +369,8 @@ export default { ...@@ -370,8 +369,8 @@ export default {
width: 100%; width: 100%;
} }
.video { .video {
width: 310px; width: 100%;height: 180px;
height: 175px;
} }
.animation { .animation {
animation: myfirst 1s; animation: myfirst 1s;
...@@ -423,10 +422,10 @@ export default { ...@@ -423,10 +422,10 @@ export default {
border-radius: 10px; border-radius: 10px;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
justify-content: flex-start; justify-content: space-around;
.btns { .btns {
width: 194px; width: 150px;
height: 194px; height: 150px;
position: relative; position: relative;
img { img {
width: 100%; width: 100%;
......
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