Commit 6be14290 authored by 李苏's avatar 李苏 💬

中广

parent 7558f9db
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Author: lisu lisu@gavelinfo.com * @Author: lisu lisu@gavelinfo.com
* @Date: 2024-09-19 10:55:27 * @Date: 2024-09-19 10:55:27
* @LastEditors: lisu lisu@gavelinfo.com * @LastEditors: lisu lisu@gavelinfo.com
* @LastEditTime: 2024-10-30 10:15:06 * @LastEditTime: 2024-12-27 10:23:04
* @FilePath: /zghywpc-vue/src/views/fmegl/fmekpigl/index.vue * @FilePath: /zghywpc-vue/src/views/fmegl/fmekpigl/index.vue
--> -->
<template> <template>
...@@ -42,6 +42,12 @@ ...@@ -42,6 +42,12 @@
} }
</script> </script>
<style >
#LOADING {
display: none!important;
}
</style>
<style lang="scss" scoped> <style lang="scss" scoped>
.fmezbpgl { .fmezbpgl {
position: relative position: relative
......
...@@ -91,6 +91,9 @@ ...@@ -91,6 +91,9 @@
} }
}, },
beforeDestroy() {
clearInterval(this.timer)
},
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
this.edckpi = this.$echarts.init(this.$refs.dckpi) this.edckpi = this.$echarts.init(this.$refs.dckpi)
...@@ -99,9 +102,9 @@ ...@@ -99,9 +102,9 @@
this.efmetj = this.$echarts.init(this.$refs.fmetj) this.efmetj = this.$echarts.init(this.$refs.fmetj)
/* 生成图表*/ /* 生成图表*/
this.initAll() this.initAll()
// this.timer = setInterval(() => { this.timer = setInterval(() => {
// this.initAll() this.initAll()
// }, 1000 * 10) }, 1000 * 5)
}) })
}, },
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* @Author: lisu lisu@gavelinfo.com * @Author: lisu lisu@gavelinfo.com
* @Date: 2024-09-19 10:55:27 * @Date: 2024-09-19 10:55:27
* @LastEditors: lisu lisu@gavelinfo.com * @LastEditors: lisu lisu@gavelinfo.com
* @LastEditTime: 2024-10-29 15:28:24 * @LastEditTime: 2024-12-27 10:19:42
* @FilePath: /zghywpc-vue/src/views/fmegl/fmezbpgl/index.vue * @FilePath: /zghywpc-vue/src/views/fmegl/fmezbpgl/index.vue
--> -->
<template> <template>
...@@ -41,7 +41,11 @@ ...@@ -41,7 +41,11 @@
} }
</script> </script>
<style >
#LOADING {
display: none!important;
}
</style>
<style lang="scss" scoped> <style lang="scss" scoped>
.fmezbpgl { .fmezbpgl {
position: relative position: relative
......
...@@ -232,6 +232,7 @@ ...@@ -232,6 +232,7 @@
export default { export default {
data() { data() {
return { return {
timer:null,
optionsData: [{ optionsData: [{
id: 1, id: 1,
name: "一月份" name: "一月份"
...@@ -304,11 +305,20 @@ ...@@ -304,11 +305,20 @@
} }
}, },
beforeDestroy() {
clearInterval(this.timer)
},
mounted() { mounted() {
this.queryAll()
this.timer = setInterval(()=>{
this.queryAll()
},5*1000)
},
methods: {
queryAll(){
this.init() this.init()
this.initMonth() this.initMonth()
}, },
methods: {
init() { init() {
this.$post('fme/ufmezbp/query', { this.$post('fme/ufmezbp/query', {
year: this.queryParams.year, year: this.queryParams.year,
...@@ -368,6 +378,7 @@ ...@@ -368,6 +378,7 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.showMain { .showMain {
height: calc(100% - 50px); height: calc(100% - 50px);
width: 100%; width: 100%;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Description: * @Description:
* @Author: lisu lisu@gavelinfo.com * @Author: lisu lisu@gavelinfo.com
* @LastEditors: lisu lisu@gavelinfo.com * @LastEditors: lisu lisu@gavelinfo.com
* @LastEditTime: 2024-11-11 16:11:27 * @LastEditTime: 2024-12-27 10:36:43
* @FilePath: /zghywpc-vue/src/views/yhlywsytst/yhlywsytst/index.vue * @FilePath: /zghywpc-vue/src/views/yhlywsytst/yhlywsytst/index.vue
--> -->
<template> <template>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
一回路异物溯源态势图 一回路异物溯源态势图
</div> </div>
<!-- 视角工具栏--> <!-- 视角工具栏-->
<div v-show="tdloading==false" class="toolButton animate__animated animate__fadeInRight" > <div v-show="tdloading==false" class="toolButton animate__animated animate__fadeInRight">
<div class="flex1 text-center"> <div class="flex1 text-center">
<div class="menu"> <div class="menu">
<span style="cursor: pointer;" @click="toFullPage('jyfkgl/jyfkgl')"> <span style="cursor: pointer;" @click="toFullPage('jyfkgl/jyfkgl')">
...@@ -296,8 +296,7 @@ ...@@ -296,8 +296,7 @@
<div class="full flex " style="height: calc(100% - 14px);padding-top: 6px;padding-left: 10px;"> <div class="full flex " style="height: calc(100% - 14px);padding-top: 6px;padding-left: 10px;">
<div class="search-item flex1"> <div class="search-item flex1">
<span class="search-span-r"> <span class="search-span-r">
<span <span style="color: rgb(255, 73, 73); margin-right: 4px;position: absolute;left: 4px;">*</span>功能位置</span>
style="color: rgb(255, 73, 73); margin-right: 4px;position: absolute;left: 4px;">*</span>功能位置</span>
<el-input v-model="sypcQueryParams.gnwz"></el-input> <el-input v-model="sypcQueryParams.gnwz"></el-input>
</div> </div>
<div class="search-item flex1 "> <div class="search-item flex1 ">
...@@ -340,8 +339,8 @@ ...@@ -340,8 +339,8 @@
<div class="search-item flex1 "> <div class="search-item flex1 ">
<span class="search-span-r"> <span class="search-span-r">
机组状态</span> 机组状态</span>
<RelSelect @change="kshZtChange" placeholder='' style="width: 100%;" src='ywxxgl/uywxx/init/zt ' filterable clearable <RelSelect @change="kshZtChange" placeholder='' style="width: 100%;" src='ywxxgl/uywxx/init/zt ' filterable
:match="{value:'id',label:'name'}" v-model='sypcQueryParams.kshZt'></RelSelect> clearable :match="{value:'id',label:'name'}" v-model='sypcQueryParams.kshZt'></RelSelect>
</div> </div>
<div class="search-item flex1 "> <div class="search-item flex1 ">
...@@ -349,11 +348,11 @@ ...@@ -349,11 +348,11 @@
备用设备状态</span> 备用设备状态</span>
<!-- <!--
/sbgl/usbxx/init/zt/by--> /sbgl/usbxx/init/zt/by-->
<RelSelect placeholder='' :collapseTags='false' multiple style="width: 100%;" src='sbgl/usbxx/init/zt/by' filterable clearable <RelSelect placeholder='' :collapseTags='false' multiple style="width: 100%;" src='sbgl/usbxx/init/zt/by'
:match="{value:'id',label:'name'}" v-model='sypcQueryParams.byZts'></RelSelect> filterable clearable :match="{value:'id',label:'name'}" v-model='sypcQueryParams.byZts'></RelSelect>
</div> </div>
<div class="search-item " style="padding-top: 18px;margin-right: 0px;width: 200px;" > <div class="search-item " style="padding-top: 18px;margin-right: 0px;width: 200px;">
<el-button style="background-color: rgba(7,32,96,0.0);border: 1px solid #68D8FE; color: #68D8FE;" <el-button style="background-color: rgba(7,32,96,0.0);border: 1px solid #68D8FE; color: #68D8FE;"
size="mini" @click="sypc()" type="primary">排查</el-button> size="mini" @click="sypc()" type="primary">排查</el-button>
<el-button style="background-color: rgba(7,32,96,0.0);border: 1px solid #68D8FE; color: #68D8FE;" <el-button style="background-color: rgba(7,32,96,0.0);border: 1px solid #68D8FE; color: #68D8FE;"
...@@ -551,6 +550,11 @@ ...@@ -551,6 +550,11 @@
<div id="container" ref="container" class="full"> <div id="container" ref="container" class="full">
</div> </div>
<!-- 退出系统-->
<div class="out">
<i style="cursor: pointer;" @click="logout" class="el-icon-switch-button"></i>
</div>
</div> </div>
</template> </template>
...@@ -578,10 +582,10 @@ ...@@ -578,10 +582,10 @@
czDialog czDialog
}, },
computed: { computed: {
selectedModelName(){ selectedModelName() {
return this.selectedModel.name return this.selectedModel.name
}, },
byZts(){ byZts() {
return this.sypcQueryParams.byZts return this.sypcQueryParams.byZts
}, },
optionSingleHeight() { optionSingleHeight() {
...@@ -597,9 +601,9 @@ ...@@ -597,9 +601,9 @@
data() { data() {
return { return {
/* 最近的排查信息*/ /* 最近的排查信息*/
lastRes:{}, lastRes: {},
czmxzt:'A', czmxzt: 'A',
showLeft:false, showLeft: false,
/* 材质辅助输入*/ /* 材质辅助输入*/
cztypeConfig: { cztypeConfig: {
...@@ -632,7 +636,7 @@ ...@@ -632,7 +636,7 @@
gg: '', gg: '',
cz: '', cz: '',
kshZt: '', kshZt: '',
byZts:'' byZts: ''
// ywName: '异物1RIS0218', // ywName: '异物1RIS0218',
// jzbm: '1', // jzbm: '1',
// kshZt:'QT' // kshZt:'QT'
...@@ -652,8 +656,8 @@ ...@@ -652,8 +656,8 @@
}, },
/* 加载相关动画*/ /* 加载相关动画*/
loading: true, loading: true,
tdloading:true, tdloading: true,
loadingText: '正在加载模型,请等待!', loadingText: '正在加载模型,请稍等!',
viewer: null, viewer: null,
scene: null, scene: null,
/* 模型加载器*/ /* 模型加载器*/
...@@ -669,20 +673,20 @@ ...@@ -669,20 +673,20 @@
} }
}, },
watch: { watch: {
selectedModelName(val){ selectedModelName(val) {
if(val){ if (val) {
this.showLeft=true this.showLeft = true
}else{ } else {
this.showLeft=false this.showLeft = false
} }
}, },
byZts(val){ byZts(val) {
if(val){ if (val) {
if(this.sypcQueryParams.kshZt){ if (this.sypcQueryParams.kshZt) {
}else{ } else {
this.$warning('请先选择机组状态') this.$warning('请先选择机组状态')
this.sypcQueryParams.byZts='' this.sypcQueryParams.byZts = ''
} }
} }
}, },
...@@ -710,16 +714,30 @@ ...@@ -710,16 +714,30 @@
} }
}, },
methods: { methods: {
hiddenLeft(){ async logout() {
this.showLeft=false this.$confirm('确定注销并退出系统吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$post('/logout').finally(() => {
localStorage.clear()
this.$store.dispatch('LogOut').then(() => {
location.href = '/index';
})
})
})},
hiddenLeft() {
this.showLeft = false
}, },
toFullPage(hash) { toFullPage(hash) {
const url = `${location.origin}/#/${hash}` const url = `${location.origin}/#/${hash}`
window.open(url, '_blank'); // 第二个参数 '_blank' 表示在新窗口或标签页中打开 window.open(url, '_blank'); // 第二个参数 '_blank' 表示在新窗口或标签页中打开
}, },
kshZtChange(va){ kshZtChange(va) {
if(!va){ if (!va) {
this.sypcQueryParams.byZts='' this.sypcQueryParams.byZts = ''
} }
}, },
getSave(str) { getSave(str) {
...@@ -733,7 +751,7 @@ ...@@ -733,7 +751,7 @@
czmx() { czmx() {
/* A 代表初始状态 和查询后状态*/ /* A 代表初始状态 和查询后状态*/
if(this.czmxzt=='A'){ if (this.czmxzt == 'A') {
this.viewer.scene.traverse((model) => { this.viewer.scene.traverse((model) => {
if (model.isMesh) { if (model.isMesh) {
...@@ -747,18 +765,18 @@ ...@@ -747,18 +765,18 @@
}); });
this.allFlowObject = []; this.allFlowObject = [];
} }
if(Object.keys(this.lastRes).length==0){ if (Object.keys(this.lastRes).length == 0) {
this.$warning('暂无最近的溯源数据') this.$warning('暂无最近的溯源数据')
}else{ } else {
this.czmxzt='B' this.czmxzt = 'B'
} }
}else{ } else {
/* 如果是B的话代表 模型处理过,还原回去了*/ /* 如果是B的话代表 模型处理过,还原回去了*/
this.sypcMethods2(this.lastRes) this.sypcMethods2(this.lastRes)
this.czmxzt='A' this.czmxzt = 'A'
} }
}, },
...@@ -811,7 +829,7 @@ ...@@ -811,7 +829,7 @@
this.$warning('请溯源后,再保存为排查日志') this.$warning('请溯源后,再保存为排查日志')
} }
}, },
sypcMethods2(res){ sypcMethods2(res) {
let sbxxList = res.data.records.kshSbInfos || [] let sbxxList = res.data.records.kshSbInfos || []
const sbxxCodeList = sbxxList.map(item => item.sbxxCode) const sbxxCodeList = sbxxList.map(item => item.sbxxCode)
this.viewer.scene.traverse((model) => { this.viewer.scene.traverse((model) => {
...@@ -834,9 +852,9 @@ ...@@ -834,9 +852,9 @@
}); });
}, },
sypcMethods(res) { sypcMethods(res) {
this.lastRes=res this.lastRes = res
this.pdfBytes = res.data.records.pdfBytes this.pdfBytes = res.data.records.pdfBytes
let gnwz=res.data.records.gnwz let gnwz = res.data.records.gnwz
let sbxxList = res.data.records.kshSbInfos || [] let sbxxList = res.data.records.kshSbInfos || []
let zbInfos = res.data.records.zbInfos || [] let zbInfos = res.data.records.zbInfos || []
this.$success(`已标记${sbxxList.length}个设备`) this.$success(`已标记${sbxxList.length}个设备`)
...@@ -892,9 +910,10 @@ ...@@ -892,9 +910,10 @@
// this.clickTag(this.jzReMaterialQue[0].model.name) // this.clickTag(this.jzReMaterialQue[0].model.name)
let model = false let model = false
let sbxxCode = gnwz|| this.sypcQueryParams.gnwz.replace(/\s+/g, ''); let sbxxCode = gnwz || this.sypcQueryParams.gnwz.replace(/\s+/g, '');
this.jzReMaterialQue.forEach(jzitem => { this.jzReMaterialQue.forEach(jzitem => {
if (jzitem.model && jzitem.model.name && this.getFirstPartOfString(jzitem.model.name) == sbxxCode) { if (jzitem.model && jzitem.model.name && this.getFirstPartOfString(jzitem.model.name) ==
sbxxCode) {
model = jzitem.model model = jzitem.model
} }
}) })
...@@ -971,10 +990,10 @@ ...@@ -971,10 +990,10 @@
this.loading = true this.loading = true
this.loadingText = '正在处理,请稍等。' this.loadingText = '正在处理,请稍等。'
/* 展示重置模型*/ /* 展示重置模型*/
this.czmxzt='A' this.czmxzt = 'A'
/* 如果流动特性只能从高到底*/ /* 如果流动特性只能从高到底*/
if(this.sypcQueryParams.ldtx=='B'){ if (this.sypcQueryParams.ldtx == 'B') {
this.$post('ksh/query/highToLow', this.$post('ksh/query/highToLow',
this.sypcQueryParams this.sypcQueryParams
).then(res => { ).then(res => {
...@@ -1471,7 +1490,8 @@ ...@@ -1471,7 +1490,8 @@
}, },
viewCenter() { viewCenter() {
this.cameraTo(this.viewer.camera.position.x, this.viewer.camera.position.y, this.viewer.camera.position.z, this.cameraTo(this.viewer.camera.position.x, this.viewer.camera.position.y, this.viewer.camera.position
.z,
0, 0, 0, 0,
0) 0)
}, },
...@@ -1549,7 +1569,7 @@ ...@@ -1549,7 +1569,7 @@
model.addEventListener("loaded", () => { model.addEventListener("loaded", () => {
this.loading = false this.loading = false
this.tdloading=false this.tdloading = false
/* 解决共用showleft控制没有关闭效果 /* 解决共用showleft控制没有关闭效果
放置默认不控制,初始dom是存在的直接出现关闭特效 放置默认不控制,初始dom是存在的直接出现关闭特效
*/ */
...@@ -1640,7 +1660,8 @@ ...@@ -1640,7 +1660,8 @@
} }
try { try {
let model let model
let modelIndex = intersects.findIndex(item => item.object.name !== '' && item.object.visible == true) let modelIndex = intersects.findIndex(item => item.object.name !== '' && item.object
.visible == true)
if (modelIndex != -1) { if (modelIndex != -1) {
rconsole.log(`当前选中${modelIndex}`) rconsole.log(`当前选中${modelIndex}`)
model = intersects[modelIndex].object model = intersects[modelIndex].object
...@@ -1655,7 +1676,7 @@ ...@@ -1655,7 +1676,7 @@
return return
} }
this.selectedModel = model this.selectedModel = model
this.showLeft=true this.showLeft = true
// model.visible=false // model.visible=false
/* 执行并情况材料队列 */ /* 执行并情况材料队列 */
...@@ -1714,7 +1735,7 @@ ...@@ -1714,7 +1735,7 @@
model = intersects[0].object model = intersects[0].object
} }
this.selectedModel = model this.selectedModel = model
this.showLeft=true this.showLeft = true
/* 执行并情况材料队列 */ /* 执行并情况材料队列 */
this.reMaterialQue.forEach(item => { this.reMaterialQue.forEach(item => {
...@@ -1755,7 +1776,8 @@ ...@@ -1755,7 +1776,8 @@
/* reMaterialQue 相关操作*/ /* reMaterialQue 相关操作*/
getCameraPosition(d, point) { getCameraPosition(d, point) {
// 确保point是一个对象,并且包含x, y, z属性 // 确保point是一个对象,并且包含x, y, z属性
if (!point || typeof point.x !== 'number' || typeof point.y !== 'number' || typeof point.z !== 'number') { if (!point || typeof point.x !== 'number' || typeof point.y !== 'number' || typeof point.z !==
'number') {
throw new Error('Invalid point object'); throw new Error('Invalid point object');
} }
...@@ -1826,17 +1848,17 @@ ...@@ -1826,17 +1848,17 @@
} }
</script> </script>
<style > <style>
#LOADING { #LOADING {
display: none!important; display: none !important;
} }
</style> </style>
<style scoped lang="scss"> <style scoped lang="scss">
.hiddenButton {
.hiddenButton{
float: right; float: right;
color: #68D8FE; color: #68D8FE;
} }
.search-span { .search-span {
min-width: 60px; min-width: 60px;
float: right; float: right;
...@@ -1894,17 +1916,20 @@ ...@@ -1894,17 +1916,20 @@
::v-deep .el-switch__core::after { ::v-deep .el-switch__core::after {
height: 12px; height: 12px;
} }
::v-deep .el-tag.el-tag--info { ::v-deep .el-tag.el-tag--info {
background-color: rgba(0, 0, 0, 0.6) !important; background-color: rgba(0, 0, 0, 0.6) !important;
color:#68D8FE ; color: #68D8FE;
border: 1px solid #68D8FE; border: 1px solid #68D8FE;
} }
::v-deep .el-select-dropdown__list{
::v-deep .el-select-dropdown__list {
background-color: rgba(0, 0, 0, 0.6) !important; background-color: rgba(0, 0, 0, 0.6) !important;
color:#68D8FE ; color: #68D8FE;
border: 1px solid #68D8FE; border: 1px solid #68D8FE;
} }
::v-deep .el-switch__label { ::v-deep .el-switch__label {
color: #fff; color: #fff;
...@@ -1929,8 +1954,9 @@ ...@@ -1929,8 +1954,9 @@
min-height: 36px; min-height: 36px;
// height: 30px!important; // height: 30px!important;
} }
.is-disabled{
background-color: rgba(0, 0, 0, 0.0)!important; .is-disabled {
background-color: rgba(0, 0, 0, 0.0) !important;
} }
.nullbp { .nullbp {
...@@ -2257,4 +2283,13 @@ ...@@ -2257,4 +2283,13 @@
background-color: rgba(0, 0, 0, 0.6); background-color: rgba(0, 0, 0, 0.6);
color: #68D8FE; color: #68D8FE;
} }
.out {
position: absolute;
right: 23px;
bottom: 18px;
color: #68D8FE;
cursor: pointer;
font-size: 20px;
}
</style> </style>
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