diff --git a/src/assets/images/usedEle/bg.png b/src/assets/images/usedEle/bg.png deleted file mode 100644 index 9e52db6..0000000 Binary files a/src/assets/images/usedEle/bg.png and /dev/null differ diff --git a/src/assets/images/usedEle/bpq_active.png b/src/assets/images/usedEle/bpq_active.png deleted file mode 100644 index 2e38fd9..0000000 Binary files a/src/assets/images/usedEle/bpq_active.png and /dev/null differ diff --git a/src/assets/images/usedEle/icon-all.png b/src/assets/images/usedEle/icon-all.png deleted file mode 100644 index 7c38ff0..0000000 Binary files a/src/assets/images/usedEle/icon-all.png and /dev/null differ diff --git a/src/assets/images/usedEle/icon-day.png b/src/assets/images/usedEle/icon-day.png deleted file mode 100644 index aa8d19c..0000000 Binary files a/src/assets/images/usedEle/icon-day.png and /dev/null differ diff --git a/src/assets/images/usedEle/icon-month.png b/src/assets/images/usedEle/icon-month.png deleted file mode 100644 index 3d475ae..0000000 Binary files a/src/assets/images/usedEle/icon-month.png and /dev/null differ diff --git a/src/components/content/airInfo/AirInfo.vue b/src/components/content/airInfo/AirInfo.vue index 63769b9..ead7cf5 100644 --- a/src/components/content/airInfo/AirInfo.vue +++ b/src/components/content/airInfo/AirInfo.vue @@ -403,10 +403,13 @@ const initAirChart = (type, values) => { //position: absolute; z-index: 100; width: 824px; + border: 2px solid #0f82af; + background: rgba(6, 34, 71, 0.78); + border-radius: 20px; //height: 400px; //top: 1003px; //right: 72px; - background-image: url(@/assets/images/airInfo/bg.png); + //background-image: url(@/assets/images/airInfo/bg.png); //padding: 25px 20px 1px 21px; .fan-speed { diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue index dd3b667..b2538ec 100644 --- a/src/components/content/fanInfo/FanInfo.vue +++ b/src/components/content/fanInfo/FanInfo.vue @@ -3,7 +3,7 @@
风机
- {{loading===0?'加载中...':'暂无数据~'}} + {{ loading === 0 ? '加载中...' : '暂无数据~' }}
@@ -15,10 +15,10 @@
-
-
+
+
- 状态：{{ item.breakdown ? '故障' : '运行' }} + 状态：{{ item.breakdown ? '故障' : '运行' }}
- + 自动 手动 @@ -68,32 +68,33 @@
-
- +
+
-
-
+
加载中...
- - - - - - - + + + + + + +
@@ -125,7 +126,7 @@ const showLoading = ref(false) const fanIndex = ref(0) let myEcharts = reactive({}); watch(() => props.loading, (now) => { - props.loading=now + props.loading = now }, {deep: true}); watch(() => props.transducerData, (now) => { getTransData(now.frequencyChangerList) @@ -162,20 +163,20 @@ watch(() => props.list, (now) => { }, {deep: true}); const getFanInfo = (equipmentId) => { isVisited.value = true - showLoading.value=true + showLoading.value = true getFanEchartsInfo(equipmentId).then(res => { if (res?.code === 1000) { - showLoading.value=false + showLoading.value = false nextTick(() => { - initChart(res.data.dates, res.data.currentsA,res.data.currentsB,res.data.currentsC) + initChart(res.data.dates, res.data.currentsA, res.data.currentsB, res.data.currentsC) }) } }) } -const handleOpenChart = (item,index) => { +const handleOpenChart = (item, index) => { getFanInfo(item.equipmentId) - fanIndex.value=index+1 + fanIndex.value = index + 1 } const getTransData = (data) => { let tranObj = {} @@ -313,7 +314,7 @@ const handleOnMounted = () => { } }, }, - max: 1000, + max: 50, splitLine: { show: false, }, @@ -364,7 +365,7 @@ const getImageUrl = (name) => { /** * 初始化echarts实例方法 */ -const initChart = (type, valueA,valueB,valueC) => { +const initChart = (type, valueA, valueB, valueC) => { //3.初始化container容器 myEcharts = echarts.init(document.getElementById('containerFan')); //5.传入数据 @@ -462,7 +463,7 @@ const initChart = (type, valueA,valueB,valueC) => { series: [ { // data: [56, 12, 89, 34, 71, 43, 67, 20, 98, 72, 19, 61, 3, 85, 47, 92, 17, 76, 69, 25, 31, 49, 81, 63], - name:'A相电流', + name: 'A相电流', data: valueA, type: 'line', smooth: true, @@ -472,7 +473,7 @@ const initChart = (type, valueA,valueB,valueC) => { }, }, { - name:'B相电流', + name: 'B相电流', data: valueB, type: 'line', smooth: true, @@ -482,7 +483,7 @@ const initChart = (type, valueA,valueB,valueC) => { }, }, { - name:'C相电流', + name: 'C相电流', data: valueC, type: 'line', smooth: true, @@ -530,10 +531,17 @@ input::-webkit-inner-spin-button { input[type="number"] { -moz-appearance: textfield; } +:deep(.el-radio-group){ + .el-radio{ + display: flex; + align-items: center; + } + +} :deep( .el-radio__input) { - width: 24px; - height: 24px; + width: 28px; + height: 28px; border: 2px solid #38cafb; border-radius: 50%; display: flex; @@ -544,7 +552,7 @@ input[type="number"] { :deep( .el-radio__label) { font-size: 28px; color: #38cafb; - line-height: 37px; + margin-top: -5px; } #fan_info { @@ -577,7 +585,7 @@ input[type="number"] { .fan-item { //height: 33.5%; height: 50%; - padding-bottom:10px; + padding-bottom: 10px; display: flex; flex-direction: column; font-size: 14px; @@ -631,55 +639,49 @@ input[type="number"] { display: flex; flex-direction: column; justify-content: center; - font-size: 26px; + font-size: 28px; color: #38cafb; line-height: 35px; gap: 40px; - .blue-state { - > div:first-child:hover { - color: #fff; - background-color: #127399; - width: 180px; - padding-left: 5px; - border-radius: 8px; - - > div:first-child { - background-image: url('../../../assets/images/fanInfo/white-state-icon.png') !important; - } - } + .stopColor { + background-color: red !important; } - > div:first-child { + .blue-state { display: flex; align-items: center; - padding-left: 5px; + height: 45px; + margin-right: 15px; + color: #fff; + background-color: #127399; + padding-left: 10px; + border-radius: 8px; + margin-left: -5px; - > div { + .state-icon { + width: 28px; + height: 28px; + background-image: url('../../../assets/images/fanInfo/white-state-icon.png') !important; margin-right: 10px; } + + .fan-state { + color: #FFFFFF; + } } - img { - margin-right: 4px; - transform: translateY(15%); - } - - .state-icon { - width: 26px; - height: 26px; - } .switch { display: flex; - width: 160px; - height: 40px; + width: 165px; + height: 45px; border-radius: 22px; border: 2px solid #0f82af; overflow: hidden; font-weight: bold; color: #127399; - line-height: 35px; + line-height: 40px; & > div { flex: 1; @@ -700,6 +702,13 @@ input[type="number"] { line-height: 37px; gap: 33px; + .check-box { + display: flex; + align-items: center; + justify-content: center; + //margin-left: 20px; + } + .edit-power { margin-top: 10px; @@ -793,8 +802,9 @@ input[type="number"] { font-size: 28px; color: #FFFFFF; cursor: pointer; - &:hover{ - background-color: #2E5589; + + &:hover { + background-color: #2E5589; border-radius: 6px; } } @@ -808,18 +818,15 @@ input[type="number"] { background: #0f7da9; } -.stopColor { - color: red; -} -.stopColor:hover { - color: #fff; - width: 180px; - background: #9B2222; - border-radius: 8px; - - > div:first-child { - background-image: url('../../../assets/images/fanInfo/white-state-icon.png') !important; - } -} +//.stopColor:hover { +// color: #fff; +// width: 180px; +// background: #9B2222; +// border-radius: 8px; +// +// > div:first-child { +// background-image: url('../../../assets/images/fanInfo/white-state-icon.png') !important; +// } +//} diff --git a/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js b/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js index 7103d7d..59b98c4 100644 --- a/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js +++ b/src/components/content/tunnelScene/sceneClass/previewTunnelInit/index.js @@ -10,7 +10,7 @@ export default function previewtunnelModeInit(equipmentList) { // this.scene.getObjectByName(wall).visible = false // } // } - console.log(equipmentList); + // console.log(equipmentList); equipmentList.forEach((item) => { this.addEquipment(this.scene.getObjectByName(item.position), item); @@ -26,4 +26,4 @@ export default function previewtunnelModeInit(equipmentList) { } }) } -} \ No newline at end of file +} diff --git a/src/components/content/usedEle/UsedEle.vue b/src/components/content/usedEle/UsedEle.vue index 10de6ca..00157a2 100644 --- a/src/components/content/usedEle/UsedEle.vue +++ b/src/components/content/usedEle/UsedEle.vue @@ -1,5 +1,5 @@