From 10e22d9d58541163b2db4fa5a319bdc21e92d995 Mon Sep 17 00:00:00 2001 From: hzz Date: Wed, 24 May 2023 11:59:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/assembly/RotationTable.vue | 2 +- src/components/headerBox/header2.vue | 2 +- src/store/components/header.ts | 2 +- src/store/module/AerialView.ts | 4 +- src/store/module/InPlantProducts.ts | 2 +- src/store/module/Mechanics.ts | 2 +- src/store/moduleSocket.ts | 2 +- src/store/moduleSocketjixie.ts | 4 +- src/utils/time.ts | 2 +- src/utils/useDraw.ts | 2 +- src/views/AerialView/content/ThreeMap.vue | 7 +- src/views/AerialView/content/map.vue | 1 - src/views/AerialView/content/statusBar.vue | 1 - src/views/AerialView/content/tip2.vue | 1 - src/views/FactoryViewEdit/index.vue | 4 +- src/views/InPlantProducts/child/bottom.vue | 3 - .../child/component/Details.vue | 2 - .../child/component/RotationTable.vue | 1 - .../child/component/bottomtip.vue | 2 - .../child/component/origin.vue | 1 - src/views/InPlantProducts/child/top.vue | 2 - src/views/InPlantProducts/content/bottom.vue | 1 - .../content/chart/installtable.vue | 1 - src/views/InPlantProducts/content/top.vue | 1 - src/views/InPlantProducts/index.vue | 1 - src/views/MechanicalView/content/ThreeMap.vue | 2 - src/views/MechanicalView/content/map.vue | 1 - .../MechanicalView/content/statusBar.vue | 1 - src/views/MechanicalView/content/tip2.vue | 1 - src/views/MechanicalViewEdit/content/map.vue | 1 - .../MechanicalViewEdit/content/statusBar.vue | 1 - src/views/MechanicalViewEdit/content/tip2.vue | 2 - .../content/ThreeMap.vue | 1 - .../MechanicalView_dajian/content/map.vue | 1 - .../content/statusBar.vue | 1 - .../MechanicalView_dajian/content/tip2.vue | 1 - .../content/ThreeMap.vue | 1 - .../MechanicalView_hanjie/content/map.vue | 1 - .../content/statusBar.vue | 1 - .../MechanicalView_hanjie/content/tip2.vue | 1 - .../MechanicalView_jijia/content/ThreeMap.vue | 4 +- .../MechanicalView_jijia/content/map.vue | 1 - .../content/statusBar.vue | 1 - .../MechanicalView_jijia/content/tip2.vue | 1 - .../content/ThreeMap.vue | 4 +- .../MechanicalView_jingjia/content/map.vue | 1 - .../content/statusBar.vue | 1 - .../MechanicalView_jingjia/content/tip2.vue | 2 - .../content/ThreeMap.vue | 4 +- .../MechanicalView_jingshi/content/map.vue | 1 - .../content/statusBar.vue | 1 - .../MechanicalView_jingshi/content/tip2.vue | 2 - .../Mechanics/child/son/components/MTTF.vue | 1 - .../child/son/components/contrast.vue | 1 - .../child/son/components/progress.vue | 4 +- src/views/Mechanics/child/son/index.vue | 1 - src/views/Mechanics/content/bottom.vue | 4 +- src/views/Mechanics/index.vue | 3 +- .../Offsite/child/childContent/center.vue | 5 +- src/views/Offsite/content/chart/equipment.vue | 2 - src/views/Offsite/content/chart/mapEchart.vue | 1 - .../Offsite/content/chart/offsitegateway.vue | 2 - src/views/Offsite/index.vue | 3 +- .../PaintShopView/components/verticalNum.vue | 2 - src/views/PaintShopView/finishView/bottom.vue | 1 - src/views/PaintShopView/finishView/top.vue | 4 +- .../PaintShopView/machiningView/bottom.vue | 2 - src/views/Temp/GetonAgain/right.vue | 4 +- src/views/Temp/Large_Format/bottom.vue | 3 - .../Temp/Large_Format/component/Details.vue | 2 - .../Large_Format/component/RotationTable.vue | 1 - .../Temp/Large_Format/component/bottomtip.vue | 5 +- .../Temp/Large_Format/component/origin.vue | 2 - src/views/Temp/Large_Format/left.vue | 2 - src/views/Temp/Large_Format/top.vue | 2 - .../OffsiteDevList/childContent/center.vue | 2 - src/views/demo/content.vue | 1 - .../electronicControl/childContent/left.vue | 2 - src/views/electronicControlAmbient/index.vue | 1 - src/views/electronicControlAmbient/top.vue | 1 - .../energyConsume/content/chart/power2023.vue | 1 - .../content/child/content/left.vue | 2 - .../content/child/historyData.vue | 1 - src/views/energyConsume/content/left.vue | 2 - src/views/energyConsume/index.vue | 1 - .../content/chart/gas.vue | 1 - .../content/chart/power2023.vue | 1 - .../content/child/content/left.vue | 2 - .../content/child/historyData.vue | 1 - .../content/left.vue | 2 - .../content/top.vue | 1 - .../environment/content/chart/humiture.vue | 5 +- src/views/environment/content/chart/noise.vue | 1 - src/views/environment/content/chart/pipe.vue | 4 +- src/views/environment/content/chart/power.vue | 2 - .../environment/content/chart/verticalNum.vue | 96 ++++++++++--------- src/views/environment/content/left.vue | 1 - src/views/environment/index.vue | 4 +- .../generalEnvironment/content/right.vue | 2 - src/views/generalEnvironment/index.vue | 2 - .../generalEnvironmentjixiefenchang/index.vue | 2 - .../legionProducts/chart/scrollBoard.vue | 1 - src/views/pmData/index.vue | 4 +- .../realtimeSecurity/content/chart/pipe.vue | 3 - src/views/realtimeSecurity/index.vue | 4 +- .../content/chart/pipe.vue | 3 - .../content/chart/verticalNumLoop.vue | 3 +- .../content/content.vue | 3 - .../realtimeSecurityJixiefenchang/index.vue | 4 +- 109 files changed, 85 insertions(+), 231 deletions(-) diff --git a/src/components/assembly/RotationTable.vue b/src/components/assembly/RotationTable.vue index 76834fa..8c8c8ba 100644 --- a/src/components/assembly/RotationTable.vue +++ b/src/components/assembly/RotationTable.vue @@ -147,7 +147,7 @@ function setchartWH(width: any, height: any) { const dvClick = (value) => { // console.log(value.row[0]); - console.log(devList.value.dom); + // console.log(devList.value.dom); }; onMounted(() => {}); diff --git a/src/components/headerBox/header2.vue b/src/components/headerBox/header2.vue index 7e7cff6..33a1e07 100644 --- a/src/components/headerBox/header2.vue +++ b/src/components/headerBox/header2.vue @@ -314,7 +314,7 @@ function HeadergetWebsocket(val) { if (props.alarmType.some(e=>{return e==data.type})) { // console.log(props.alarmType); - console.log(props.alarmType.some(e=>{return e==data.type})); + // console.log(props.alarmType.some(e=>{return e==data.type})); storeheader.changeDataList(data) } } diff --git a/src/store/components/header.ts b/src/store/components/header.ts index ab4b59f..6fd6bd7 100644 --- a/src/store/components/header.ts +++ b/src/store/components/header.ts @@ -63,7 +63,7 @@ export const useHeaderStore = defineStore(Names.header,{ }else{ this.AlarmscrollBoardList.push(val) } - console.log(this.AlarmscrollBoardList,"共有这么多数据"); + // console.log(this.AlarmscrollBoardList,"共有这么多数据"); }, resetData(){ diff --git a/src/store/module/AerialView.ts b/src/store/module/AerialView.ts index b61e264..1a4eb0e 100644 --- a/src/store/module/AerialView.ts +++ b/src/store/module/AerialView.ts @@ -197,7 +197,7 @@ export const useAerialViewStore = defineStore(Names.AerialView, { //异步方法需要添加async和await actions: { setDataList(val: any) { - console.log(val,"store"); + // console.log(val,"store"); this.sensorList=[] for (let key in val) { @@ -267,7 +267,7 @@ export const useAerialViewStore = defineStore(Names.AerialView, { this.sensorList.push(res) }); } - console.log(this.iconList,"store"); + // console.log(this.iconList,"store"); }, diff --git a/src/store/module/InPlantProducts.ts b/src/store/module/InPlantProducts.ts index 854f7d6..844cfcf 100644 --- a/src/store/module/InPlantProducts.ts +++ b/src/store/module/InPlantProducts.ts @@ -69,7 +69,7 @@ export const useInPlantProductsStore = defineStore(Names.InPlantProducts, { this.newPageData.imgTip=val.imgTip this.newPageData.axleList=val.axleList this.newPageData.LedList=val.LedList - console.log(this.newPageData.devDetail); + // console.log(this.newPageData.devDetail); // this.newPageData.devinfo.unshift({name:'设备名称',value:val.productName}) } diff --git a/src/store/module/Mechanics.ts b/src/store/module/Mechanics.ts index 7bb8520..42f62c5 100644 --- a/src/store/module/Mechanics.ts +++ b/src/store/module/Mechanics.ts @@ -275,7 +275,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, { } this.devstatus = newdata; - console.log(newdata); + // console.log(newdata); }, changeImgSrc() { diff --git a/src/store/moduleSocket.ts b/src/store/moduleSocket.ts index c141e07..e852aab 100644 --- a/src/store/moduleSocket.ts +++ b/src/store/moduleSocket.ts @@ -281,7 +281,7 @@ export const useSocketStore = defineStore(Names.socket, { this.Pressure = val }, changePipe(val) { - console.log(val, "gengxinle "); + // console.log(val, "gengxinle "); if (this.pipe.listData.length == 0) { this.pipe.listData = val.listData diff --git a/src/store/moduleSocketjixie.ts b/src/store/moduleSocketjixie.ts index 93df8ab..e5e9254 100644 --- a/src/store/moduleSocketjixie.ts +++ b/src/store/moduleSocketjixie.ts @@ -191,7 +191,7 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{ * @函数备注: */ changeHumiture(val){ - console.log(this.humiture.Humiture); + // console.log(this.humiture.Humiture); if(this.humiture.Humiture.length==0){ this.humiture=val @@ -283,7 +283,7 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{ this.Pressure=val }, changePipe(val){ - console.log(val,"gengxinle "); + // console.log(val,"gengxinle "); if(this.pipe.listData.length==0){ this.pipe.listData=val.listData diff --git a/src/utils/time.ts b/src/utils/time.ts index 5e7d119..42824d4 100644 --- a/src/utils/time.ts +++ b/src/utils/time.ts @@ -23,7 +23,7 @@ export function gettime(data = null) { // 周日-周六(0-6) 刚好对应数字下标 var day = time.getDay(); - console.log(getStoredLanguage()); + // console.log(getStoredLanguage()); if (getStoredLanguage() == 'English/USD') { var arr = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]; diff --git a/src/utils/useDraw.ts b/src/utils/useDraw.ts index 23b4233..891cc97 100644 --- a/src/utils/useDraw.ts +++ b/src/utils/useDraw.ts @@ -30,7 +30,7 @@ export default function useDraw() { // 表示更高 scale.height = ((window.innerWidth / baseProportion) / baseHeight).toFixed(5) scale.width = (window.innerWidth / baseWidth).toFixed(5) - console.log(scale.height, scale.width); + // console.log(scale.height, scale.width); appRef.value.style.transform = `scale(${scale.width}, ${scale.height}) translate(-50%, -50%)` } } diff --git a/src/views/AerialView/content/ThreeMap.vue b/src/views/AerialView/content/ThreeMap.vue index d330005..6a0383e 100644 --- a/src/views/AerialView/content/ThreeMap.vue +++ b/src/views/AerialView/content/ThreeMap.vue @@ -2310,9 +2310,6 @@ function getclickMap(x, y) { var intersectsMap = raycasterMap.intersectObjects(ThreeObj.scene.children); if (intersectsMap.length > 0) { var selected = intersectsMap[0]; //取第一个物体 - console.log("x坐标:" + selected.point.x); - console.log("y坐标:" + selected.point.y); - console.log("z坐标:" + selected.point.z); } } /** @@ -2342,9 +2339,7 @@ function goPage(px, py) { } }); } -onMounted(() => { - console.log(store.iconList); - +onMounted(() => { //初始化场景 ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth); diff --git a/src/views/AerialView/content/map.vue b/src/views/AerialView/content/map.vue index 47dbc90..7ebe950 100644 --- a/src/views/AerialView/content/map.vue +++ b/src/views/AerialView/content/map.vue @@ -777,7 +777,6 @@ watch( watch( () => store.devdataList, (newVal, oldVal) => { - console.log(newVal,"设备数据"); newVal.forEach(res=>{ if(res.store=='机加车间'){ MachiningDev.push(...res.value) diff --git a/src/views/AerialView/content/statusBar.vue b/src/views/AerialView/content/statusBar.vue index 208cb03..4673eea 100644 --- a/src/views/AerialView/content/statusBar.vue +++ b/src/views/AerialView/content/statusBar.vue @@ -74,7 +74,6 @@ watch( iconList= reactive(newVal) - console.log(); numkey.value++ }, { deep: true, flush: "post" } diff --git a/src/views/AerialView/content/tip2.vue b/src/views/AerialView/content/tip2.vue index 17af6d3..edfa5b2 100644 --- a/src/views/AerialView/content/tip2.vue +++ b/src/views/AerialView/content/tip2.vue @@ -47,7 +47,6 @@ let content = null; watch( () => props.val, (newVal, oldVal) => { - console.log(newVal,"处理"); data = newVal; content = ""; diff --git a/src/views/FactoryViewEdit/index.vue b/src/views/FactoryViewEdit/index.vue index 20ee4c1..2462023 100644 --- a/src/views/FactoryViewEdit/index.vue +++ b/src/views/FactoryViewEdit/index.vue @@ -50,9 +50,7 @@ async function getSensorInfodatafun() { async function deviceDistributeInMachineryFactorydatafun() { let result: any = await deviceDistributeInMachineryFactorydata(); - if (result.code == 200) { - console.log(result.data,"设备列表"); - + if (result.code == 200) { store.setdevList(result.data); } } diff --git a/src/views/InPlantProducts/child/bottom.vue b/src/views/InPlantProducts/child/bottom.vue index 6b66956..6dcbe6a 100644 --- a/src/views/InPlantProducts/child/bottom.vue +++ b/src/views/InPlantProducts/child/bottom.vue @@ -53,7 +53,6 @@ watch( () => store.DeviceSensorinfo, (newVal, oldVal) => { //动态更新echarts - console.log(newVal, "数据2"); setdata(newVal); }, { deep: true, flush: "post" } @@ -88,7 +87,6 @@ function reset(val: any) { const remarksBox = (width: any, height: any) => { let a = calcWH(height, width, 1, 3, 0); - console.log(a); // a.oHeight=a.oHeight //修改高度 @@ -98,7 +96,6 @@ const remarksBox = (width: any, height: any) => { }; function setdata(val: any) { - console.log(val.Timestamp-0); bottomtip1.value.setData( reactive({name:val.name,severror:val.severror,Timestamp:val.Timestamp?gettime(val.Timestamp-0):'----.--.--',Alarlmnformation:val.Alarlmnformation}) diff --git a/src/views/InPlantProducts/child/component/Details.vue b/src/views/InPlantProducts/child/component/Details.vue index cacdc97..91a9de1 100644 --- a/src/views/InPlantProducts/child/component/Details.vue +++ b/src/views/InPlantProducts/child/component/Details.vue @@ -82,7 +82,6 @@ onMounted(() => { function setchartWH(width: any, height: any) { detailslistSize.height = height - 100 + "px"; detailslistSize.width = width - 80 + "px"; - console.log(detailslistSize); detailslistBoxSize.height = height-50 + "px"; detailslistBoxSize.width = width+ "px"; @@ -153,7 +152,6 @@ const dvmouseleave = () => { }; const dvClick = (value) => { // console.log(value.row[0]); - console.log(devList.value.dom); }; defineExpose({ setchartWH, diff --git a/src/views/InPlantProducts/child/component/RotationTable.vue b/src/views/InPlantProducts/child/component/RotationTable.vue index 67122b0..2d23a45 100644 --- a/src/views/InPlantProducts/child/component/RotationTable.vue +++ b/src/views/InPlantProducts/child/component/RotationTable.vue @@ -146,7 +146,6 @@ function setchartWH(width: any, height: any) { const dvClick = (value) => { // console.log(value.row[0]); - console.log(devList.value.dom); }; onMounted(() => {}); diff --git a/src/views/InPlantProducts/child/component/bottomtip.vue b/src/views/InPlantProducts/child/component/bottomtip.vue index d2ae556..788f300 100644 --- a/src/views/InPlantProducts/child/component/bottomtip.vue +++ b/src/views/InPlantProducts/child/component/bottomtip.vue @@ -70,7 +70,6 @@ watch( (newVal, oldVal) => { //动态更新echarts data.name=newVal.rackNumber - console.log(newVal); keynum.value++; }, @@ -86,7 +85,6 @@ function setchartWH(width: any, height: any) { } const setData = (value: any) => { - console.log(data); data = value; keynum.value++; diff --git a/src/views/InPlantProducts/child/component/origin.vue b/src/views/InPlantProducts/child/component/origin.vue index 64c8dfd..7ed5c30 100644 --- a/src/views/InPlantProducts/child/component/origin.vue +++ b/src/views/InPlantProducts/child/component/origin.vue @@ -148,7 +148,6 @@ const dvmouseleave = () => { }; const dvClick = (value) => { // console.log(value.row[0]); - console.log(devList.value.dom); }; const setData = (data: any, datatitle: any) => { title.value = datatitle; diff --git a/src/views/InPlantProducts/child/top.vue b/src/views/InPlantProducts/child/top.vue index 0f79d50..81a3bbf 100644 --- a/src/views/InPlantProducts/child/top.vue +++ b/src/views/InPlantProducts/child/top.vue @@ -111,7 +111,6 @@ let {t} = useI18n(); const title1box=(width:any,height:any)=>{ let a=calcWH(height,width,4,3,0) - console.log(a,"111"); // a.oHeight=a.oHeight //修改高度 @@ -120,7 +119,6 @@ let {t} = useI18n(); } const detailsBox=(width:any,height:any)=>{ let a=calcWH(height,width,1,3,0) - console.log(a,"222"); // a.oHeight=a.oHeight //修改高度 detailsRef.value.setchartWH(a.oWidth,a.oHeight) diff --git a/src/views/InPlantProducts/content/bottom.vue b/src/views/InPlantProducts/content/bottom.vue index ab35b9c..0900dcd 100644 --- a/src/views/InPlantProducts/content/bottom.vue +++ b/src/views/InPlantProducts/content/bottom.vue @@ -145,7 +145,6 @@ async function getprogressOfCorpsfun() { let result: any = await getprogressOfCorps(); if (result.code == 200) { - console.log(result); result.data.forEach((res) => { if (res.deptId == "15") { //医防 diff --git a/src/views/InPlantProducts/content/chart/installtable.vue b/src/views/InPlantProducts/content/chart/installtable.vue index ebade98..49f8239 100644 --- a/src/views/InPlantProducts/content/chart/installtable.vue +++ b/src/views/InPlantProducts/content/chart/installtable.vue @@ -30,7 +30,6 @@ const echartsData = reactive({ }); const setData = (value: any, type: number) => { - console.log(value, type); //任务完成百分比 let percentage = Math.floor((value.accomplish/value.counts)*100) diff --git a/src/views/InPlantProducts/content/top.vue b/src/views/InPlantProducts/content/top.vue index c436b11..a5a6b01 100644 --- a/src/views/InPlantProducts/content/top.vue +++ b/src/views/InPlantProducts/content/top.vue @@ -95,7 +95,6 @@ async function gatewayOfCorpsfun() { } } function setdata(val: any) { - console.log(val,"ddd"); val.forEach((res) => { if (res.name == '汽车军团') { diff --git a/src/views/InPlantProducts/index.vue b/src/views/InPlantProducts/index.vue index 37a42ab..df5999c 100644 --- a/src/views/InPlantProducts/index.vue +++ b/src/views/InPlantProducts/index.vue @@ -82,7 +82,6 @@ function getWebsocket(val) { // store.changenoise(data.msg) } if(data.type=="DeviceInPlant"){ - console.log(data.msg); store.changeDevList(data.msg) } } catch (err) {} diff --git a/src/views/MechanicalView/content/ThreeMap.vue b/src/views/MechanicalView/content/ThreeMap.vue index b52bbf0..b91feca 100644 --- a/src/views/MechanicalView/content/ThreeMap.vue +++ b/src/views/MechanicalView/content/ThreeMap.vue @@ -654,8 +654,6 @@ function goPage(px, py) { }); } onMounted(() => { - console.log(store.iconList); - //初始化场景 ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth); diff --git a/src/views/MechanicalView/content/map.vue b/src/views/MechanicalView/content/map.vue index 47dbc90..7ebe950 100644 --- a/src/views/MechanicalView/content/map.vue +++ b/src/views/MechanicalView/content/map.vue @@ -777,7 +777,6 @@ watch( watch( () => store.devdataList, (newVal, oldVal) => { - console.log(newVal,"设备数据"); newVal.forEach(res=>{ if(res.store=='机加车间'){ MachiningDev.push(...res.value) diff --git a/src/views/MechanicalView/content/statusBar.vue b/src/views/MechanicalView/content/statusBar.vue index d4cbfb5..2a29634 100644 --- a/src/views/MechanicalView/content/statusBar.vue +++ b/src/views/MechanicalView/content/statusBar.vue @@ -87,7 +87,6 @@ watch( iconList= reactive(newVal) - console.log(); numkey.value++ }, { deep: true, flush: "post" } diff --git a/src/views/MechanicalView/content/tip2.vue b/src/views/MechanicalView/content/tip2.vue index c42210a..c730a4c 100644 --- a/src/views/MechanicalView/content/tip2.vue +++ b/src/views/MechanicalView/content/tip2.vue @@ -47,7 +47,6 @@ let content = null; watch( () => props.val, (newVal, oldVal) => { - console.log(newVal,"处理"); data = newVal; content = ""; diff --git a/src/views/MechanicalViewEdit/content/map.vue b/src/views/MechanicalViewEdit/content/map.vue index 22c26d8..0b51062 100644 --- a/src/views/MechanicalViewEdit/content/map.vue +++ b/src/views/MechanicalViewEdit/content/map.vue @@ -777,7 +777,6 @@ watch( watch( () => store.devdataList, (newVal, oldVal) => { - console.log(newVal,"设备数据"); newVal.forEach(res=>{ if(res.store=='机加车间'){ MachiningDev.push(...res.value) diff --git a/src/views/MechanicalViewEdit/content/statusBar.vue b/src/views/MechanicalViewEdit/content/statusBar.vue index e2a9fd7..aa01184 100644 --- a/src/views/MechanicalViewEdit/content/statusBar.vue +++ b/src/views/MechanicalViewEdit/content/statusBar.vue @@ -89,7 +89,6 @@ watch( iconList= reactive(newVal) - console.log(); numkey.value++ }, { deep: true, flush: "post" } diff --git a/src/views/MechanicalViewEdit/content/tip2.vue b/src/views/MechanicalViewEdit/content/tip2.vue index 22f8b7d..e13e39a 100644 --- a/src/views/MechanicalViewEdit/content/tip2.vue +++ b/src/views/MechanicalViewEdit/content/tip2.vue @@ -47,8 +47,6 @@ let content = null; watch( () => props.val, (newVal, oldVal) => { - console.log(newVal,"处理"); - data = newVal; content = ""; newVal.forEach((res) => { diff --git a/src/views/MechanicalView_dajian/content/ThreeMap.vue b/src/views/MechanicalView_dajian/content/ThreeMap.vue index 3f294ad..becb715 100644 --- a/src/views/MechanicalView_dajian/content/ThreeMap.vue +++ b/src/views/MechanicalView_dajian/content/ThreeMap.vue @@ -612,7 +612,6 @@ function goPage(px, py) { }); } onMounted(() => { - console.log(store.iconList); //初始化场景 ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); diff --git a/src/views/MechanicalView_dajian/content/map.vue b/src/views/MechanicalView_dajian/content/map.vue index 47dbc90..7ebe950 100644 --- a/src/views/MechanicalView_dajian/content/map.vue +++ b/src/views/MechanicalView_dajian/content/map.vue @@ -777,7 +777,6 @@ watch( watch( () => store.devdataList, (newVal, oldVal) => { - console.log(newVal,"设备数据"); newVal.forEach(res=>{ if(res.store=='机加车间'){ MachiningDev.push(...res.value) diff --git a/src/views/MechanicalView_dajian/content/statusBar.vue b/src/views/MechanicalView_dajian/content/statusBar.vue index ed486c2..9330e16 100644 --- a/src/views/MechanicalView_dajian/content/statusBar.vue +++ b/src/views/MechanicalView_dajian/content/statusBar.vue @@ -89,7 +89,6 @@ watch( iconList= reactive(newVal) - console.log(); numkey.value++ }, { deep: true, flush: "post" } diff --git a/src/views/MechanicalView_dajian/content/tip2.vue b/src/views/MechanicalView_dajian/content/tip2.vue index 0cb77ea..57ba61a 100644 --- a/src/views/MechanicalView_dajian/content/tip2.vue +++ b/src/views/MechanicalView_dajian/content/tip2.vue @@ -47,7 +47,6 @@ let content = null; watch( () => props.val, (newVal, oldVal) => { - console.log(newVal,"处理"); data = newVal; content = ""; diff --git a/src/views/MechanicalView_hanjie/content/ThreeMap.vue b/src/views/MechanicalView_hanjie/content/ThreeMap.vue index 4e02ad0..3683727 100644 --- a/src/views/MechanicalView_hanjie/content/ThreeMap.vue +++ b/src/views/MechanicalView_hanjie/content/ThreeMap.vue @@ -614,7 +614,6 @@ function goPage(px, py) { }); } onMounted(() => { - console.log(store.iconList); //初始化场景 ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); diff --git a/src/views/MechanicalView_hanjie/content/map.vue b/src/views/MechanicalView_hanjie/content/map.vue index 92592c7..1049305 100644 --- a/src/views/MechanicalView_hanjie/content/map.vue +++ b/src/views/MechanicalView_hanjie/content/map.vue @@ -777,7 +777,6 @@ watch( watch( () => store.devdataList, (newVal, oldVal) => { - console.log(newVal,"设备数据"); newVal.forEach(res=>{ if(res.store=='机加车间'){ MachiningDev.push(...res.value) diff --git a/src/views/MechanicalView_hanjie/content/statusBar.vue b/src/views/MechanicalView_hanjie/content/statusBar.vue index 52983ba..abb7c2b 100644 --- a/src/views/MechanicalView_hanjie/content/statusBar.vue +++ b/src/views/MechanicalView_hanjie/content/statusBar.vue @@ -89,7 +89,6 @@ watch( iconList= reactive(newVal) - console.log(); numkey.value++ }, { deep: true, flush: "post" } diff --git a/src/views/MechanicalView_hanjie/content/tip2.vue b/src/views/MechanicalView_hanjie/content/tip2.vue index 744d7d2..a247f41 100644 --- a/src/views/MechanicalView_hanjie/content/tip2.vue +++ b/src/views/MechanicalView_hanjie/content/tip2.vue @@ -47,7 +47,6 @@ let content = null; watch( () => props.val, (newVal, oldVal) => { - console.log(newVal,"处理"); data = newVal; content = ""; diff --git a/src/views/MechanicalView_jijia/content/ThreeMap.vue b/src/views/MechanicalView_jijia/content/ThreeMap.vue index 8346645..651309f 100644 --- a/src/views/MechanicalView_jijia/content/ThreeMap.vue +++ b/src/views/MechanicalView_jijia/content/ThreeMap.vue @@ -611,9 +611,7 @@ function goPage(px, py) { } }); } -onMounted(() => { - console.log(store.iconList); - +onMounted(() => { //初始化场景 ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth); diff --git a/src/views/MechanicalView_jijia/content/map.vue b/src/views/MechanicalView_jijia/content/map.vue index 47dbc90..7ebe950 100644 --- a/src/views/MechanicalView_jijia/content/map.vue +++ b/src/views/MechanicalView_jijia/content/map.vue @@ -777,7 +777,6 @@ watch( watch( () => store.devdataList, (newVal, oldVal) => { - console.log(newVal,"设备数据"); newVal.forEach(res=>{ if(res.store=='机加车间'){ MachiningDev.push(...res.value) diff --git a/src/views/MechanicalView_jijia/content/statusBar.vue b/src/views/MechanicalView_jijia/content/statusBar.vue index 1bf8fd8..db77191 100644 --- a/src/views/MechanicalView_jijia/content/statusBar.vue +++ b/src/views/MechanicalView_jijia/content/statusBar.vue @@ -89,7 +89,6 @@ watch( iconList= reactive(newVal) - console.log(); numkey.value++ }, { deep: true, flush: "post" } diff --git a/src/views/MechanicalView_jijia/content/tip2.vue b/src/views/MechanicalView_jijia/content/tip2.vue index 3abdc08..9550968 100644 --- a/src/views/MechanicalView_jijia/content/tip2.vue +++ b/src/views/MechanicalView_jijia/content/tip2.vue @@ -47,7 +47,6 @@ let content = null; watch( () => props.val, (newVal, oldVal) => { - console.log(newVal,"处理"); data = newVal; content = ""; diff --git a/src/views/MechanicalView_jingjia/content/ThreeMap.vue b/src/views/MechanicalView_jingjia/content/ThreeMap.vue index 05f2723..e5645f1 100644 --- a/src/views/MechanicalView_jingjia/content/ThreeMap.vue +++ b/src/views/MechanicalView_jingjia/content/ThreeMap.vue @@ -612,9 +612,7 @@ function goPage(px, py) { } }); } -onMounted(() => { - console.log(store.iconList); - +onMounted(() => { //初始化场景 ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth); diff --git a/src/views/MechanicalView_jingjia/content/map.vue b/src/views/MechanicalView_jingjia/content/map.vue index 47dbc90..7ebe950 100644 --- a/src/views/MechanicalView_jingjia/content/map.vue +++ b/src/views/MechanicalView_jingjia/content/map.vue @@ -777,7 +777,6 @@ watch( watch( () => store.devdataList, (newVal, oldVal) => { - console.log(newVal,"设备数据"); newVal.forEach(res=>{ if(res.store=='机加车间'){ MachiningDev.push(...res.value) diff --git a/src/views/MechanicalView_jingjia/content/statusBar.vue b/src/views/MechanicalView_jingjia/content/statusBar.vue index 2ac68a9..a681835 100644 --- a/src/views/MechanicalView_jingjia/content/statusBar.vue +++ b/src/views/MechanicalView_jingjia/content/statusBar.vue @@ -91,7 +91,6 @@ watch( iconList= reactive(newVal) - console.log(); numkey.value++ }, { deep: true, flush: "post" } diff --git a/src/views/MechanicalView_jingjia/content/tip2.vue b/src/views/MechanicalView_jingjia/content/tip2.vue index 6fdb390..df007eb 100644 --- a/src/views/MechanicalView_jingjia/content/tip2.vue +++ b/src/views/MechanicalView_jingjia/content/tip2.vue @@ -47,8 +47,6 @@ let content = null; watch( () => props.val, (newVal, oldVal) => { - console.log(newVal,"处理"); - data = newVal; content = ""; newVal.forEach((res) => { diff --git a/src/views/MechanicalView_jingshi/content/ThreeMap.vue b/src/views/MechanicalView_jingshi/content/ThreeMap.vue index 791287b..9917234 100644 --- a/src/views/MechanicalView_jingshi/content/ThreeMap.vue +++ b/src/views/MechanicalView_jingshi/content/ThreeMap.vue @@ -612,9 +612,7 @@ function goPage(px, py) { } }); } -onMounted(() => { - console.log(store.iconList); - +onMounted(() => { //初始化场景 ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth); diff --git a/src/views/MechanicalView_jingshi/content/map.vue b/src/views/MechanicalView_jingshi/content/map.vue index 22c26d8..0b51062 100644 --- a/src/views/MechanicalView_jingshi/content/map.vue +++ b/src/views/MechanicalView_jingshi/content/map.vue @@ -777,7 +777,6 @@ watch( watch( () => store.devdataList, (newVal, oldVal) => { - console.log(newVal,"设备数据"); newVal.forEach(res=>{ if(res.store=='机加车间'){ MachiningDev.push(...res.value) diff --git a/src/views/MechanicalView_jingshi/content/statusBar.vue b/src/views/MechanicalView_jingshi/content/statusBar.vue index 52983ba..abb7c2b 100644 --- a/src/views/MechanicalView_jingshi/content/statusBar.vue +++ b/src/views/MechanicalView_jingshi/content/statusBar.vue @@ -89,7 +89,6 @@ watch( iconList= reactive(newVal) - console.log(); numkey.value++ }, { deep: true, flush: "post" } diff --git a/src/views/MechanicalView_jingshi/content/tip2.vue b/src/views/MechanicalView_jingshi/content/tip2.vue index d482493..b1f74c9 100644 --- a/src/views/MechanicalView_jingshi/content/tip2.vue +++ b/src/views/MechanicalView_jingshi/content/tip2.vue @@ -47,8 +47,6 @@ let content = null; watch( () => props.val, (newVal, oldVal) => { - console.log(newVal,"处理"); - data = newVal; content = ""; newVal.forEach((res) => { diff --git a/src/views/Mechanics/child/son/components/MTTF.vue b/src/views/Mechanics/child/son/components/MTTF.vue index af236a9..589c277 100644 --- a/src/views/Mechanics/child/son/components/MTTF.vue +++ b/src/views/Mechanics/child/son/components/MTTF.vue @@ -29,7 +29,6 @@ const echartsData = reactive({ }); const setData = (value: any) => { - console.log(value); value.value let name = [] let seriesVal = [] diff --git a/src/views/Mechanics/child/son/components/contrast.vue b/src/views/Mechanics/child/son/components/contrast.vue index 4354ec7..be41364 100644 --- a/src/views/Mechanics/child/son/components/contrast.vue +++ b/src/views/Mechanics/child/son/components/contrast.vue @@ -32,7 +32,6 @@ const setData = (value: any) => { let time = value.value.map((item: any) => { return (item / 60).toFixed(1); }); - console.log(value, time, 'value'); echartsData.contrast!.div = instatus.value; echartsData.contrast!.title = props.title; diff --git a/src/views/Mechanics/child/son/components/progress.vue b/src/views/Mechanics/child/son/components/progress.vue index 558b52f..6d9b180 100644 --- a/src/views/Mechanics/child/son/components/progress.vue +++ b/src/views/Mechanics/child/son/components/progress.vue @@ -121,9 +121,7 @@ Ebox.setOption(item.data); item.box = Ebox }; -function setchartWH(width:any,height:any){ - console.log("??????????????????????????"); - +function setchartWH(width:any,height:any){ echartsData.MTBF!.div=progress.value progress.value.style.height=height+'px' progress.value.style.width=width+'px' diff --git a/src/views/Mechanics/child/son/index.vue b/src/views/Mechanics/child/son/index.vue index fbd8d1a..d9e1aae 100644 --- a/src/views/Mechanics/child/son/index.vue +++ b/src/views/Mechanics/child/son/index.vue @@ -115,7 +115,6 @@ const router=useRouter() let result:any = await gatdeviceStatusInfoMF({id:route.params.dev}) if(result.code==200){ - console.log(result,"dadadadasdafafdsagdsgafg"); setdata(result.data) } } diff --git a/src/views/Mechanics/content/bottom.vue b/src/views/Mechanics/content/bottom.vue index f55e998..e2ea169 100644 --- a/src/views/Mechanics/content/bottom.vue +++ b/src/views/Mechanics/content/bottom.vue @@ -63,9 +63,7 @@ function reset(val: any) { box(val.width, val.height); } -const box = (width: any, height: any) => { - console.log(width,height); - +const box = (width: any, height: any) => { let a = calcWH(height, width, 1, 5, 0); // a.oHeight=a.oHeight diff --git a/src/views/Mechanics/index.vue b/src/views/Mechanics/index.vue index 9289317..b447d68 100644 --- a/src/views/Mechanics/index.vue +++ b/src/views/Mechanics/index.vue @@ -83,7 +83,6 @@ function getWebsocket(val){ // store.changenoise(data.msg) } if(data.type=='gatewayMF'){ - console.log(data.msg); store.changegateway(data.msg) store.changegatewaynum(data.msg) @@ -94,7 +93,7 @@ function getWebsocket(val){ // } }catch(err){ - + console.log(err); } } diff --git a/src/views/Offsite/child/childContent/center.vue b/src/views/Offsite/child/childContent/center.vue index 049a3d4..24fcfa1 100644 --- a/src/views/Offsite/child/childContent/center.vue +++ b/src/views/Offsite/child/childContent/center.vue @@ -133,9 +133,7 @@ const box = (width: any, height: any) => { // offsitegatewayref.value.setchartWH(a.oWidth, a.oHeight); }; function changedevlist(val: any) { - let list = []; - console.log(listWH.width); - + let list = []; val.forEach((res, index) => { list.push([ index + 1, @@ -177,7 +175,6 @@ function changedevlist(val: any) { tableref.value.changeData(tabledata.data); } function setDataList(val: any) { - console.log(val); let tipdata = { ison: 0, isall: 0, isoff: 0 }; //计算设备总量 val.devnum.forEach((res) => { diff --git a/src/views/Offsite/content/chart/equipment.vue b/src/views/Offsite/content/chart/equipment.vue index 6547081..436c329 100644 --- a/src/views/Offsite/content/chart/equipment.vue +++ b/src/views/Offsite/content/chart/equipment.vue @@ -73,8 +73,6 @@ const setData = (value: any) => { } ] }; - console.log(echartsData.equipment!.data); - change(echartsData.equipment); }; const change = (item: EDataPersonItem) => { diff --git a/src/views/Offsite/content/chart/mapEchart.vue b/src/views/Offsite/content/chart/mapEchart.vue index c22eae1..2f4d360 100644 --- a/src/views/Offsite/content/chart/mapEchart.vue +++ b/src/views/Offsite/content/chart/mapEchart.vue @@ -139,7 +139,6 @@ const setData = (val: any) => { change(echartsData.ismap); if (!echartsData.ismap!.box.isAddClick) { echartsData.ismap!.box.on("click", (params) => { - console.log(params.name); if(params.name=='浙江省'||params.name=='广东省'){ router.push({ name: "offSiteDevList", diff --git a/src/views/Offsite/content/chart/offsitegateway.vue b/src/views/Offsite/content/chart/offsitegateway.vue index 83d1560..66cb507 100644 --- a/src/views/Offsite/content/chart/offsitegateway.vue +++ b/src/views/Offsite/content/chart/offsitegateway.vue @@ -76,10 +76,8 @@ function setchartWH(width: any, height: any) { refborder6.value.resetWH(); } const setData = (value?: any) => { - console.log(value,"最新数据"); data=reactive([...value]) - console.log(data); keynum.value++; // data.value='设备名称' diff --git a/src/views/Offsite/index.vue b/src/views/Offsite/index.vue index dac6a69..f70a7a0 100644 --- a/src/views/Offsite/index.vue +++ b/src/views/Offsite/index.vue @@ -101,8 +101,7 @@ let {t} = useI18n(); headerref.value.HeadergetWebsocket(val) try{ let data=JSON.parse(val) - if(data.type=='deviceStatusCountsOfOutPlant'){ - console.log(data.msg); + if(data.type=='deviceStatusCountsOfOutPlant'){ data.msg.forEach(res=>{ if(res.deptId=='true'){ res.name=t('messages.OnProduct') diff --git a/src/views/PaintShopView/components/verticalNum.vue b/src/views/PaintShopView/components/verticalNum.vue index 6c228a0..8f21441 100644 --- a/src/views/PaintShopView/components/verticalNum.vue +++ b/src/views/PaintShopView/components/verticalNum.vue @@ -49,7 +49,6 @@ let props = defineProps<{ }>(); let i = ref(0) let item = computed(() => { - console.log(value.data[i.value]); return value.data[i.value] || { "name": "", "val": "0", "type": "", "field": "", "ts": 0, "status": false }; }); @@ -57,7 +56,6 @@ let icon = computed(() => { return value.iconname }); let iconcolor = computed(() => { - console.log(value.data[i.value]); //开始进入渲染是没有获取到该数据则需要判断 如果没有则返回空 if (value.data[i.value]) { return value.data[i.value].status ? +value.data[i.value].val > +value.quota ? "icon-red" : "icon-blue" : "icon-grey"; diff --git a/src/views/PaintShopView/finishView/bottom.vue b/src/views/PaintShopView/finishView/bottom.vue index 9e38327..babbe4d 100644 --- a/src/views/PaintShopView/finishView/bottom.vue +++ b/src/views/PaintShopView/finishView/bottom.vue @@ -261,7 +261,6 @@ function setcontentData(val){ show: true, color:'#fff', formatter: function(params){ - console.log(params); return params.value.toLocaleString() }, position: "top", diff --git a/src/views/PaintShopView/finishView/top.vue b/src/views/PaintShopView/finishView/top.vue index 87ddfd9..02dac30 100644 --- a/src/views/PaintShopView/finishView/top.vue +++ b/src/views/PaintShopView/finishView/top.vue @@ -270,9 +270,7 @@ let ductOption = reactive({ let pm_index = 0 let temp_humi_index = 0 - function setcontentData(val){ - console.log(val); - + function setcontentData(val){ let CH2O = val.TVOC_CH2O.map((item) => { return { name: item.name, val: item.CH2O,status:item.status }; }); diff --git a/src/views/PaintShopView/machiningView/bottom.vue b/src/views/PaintShopView/machiningView/bottom.vue index 1911008..d7bf389 100644 --- a/src/views/PaintShopView/machiningView/bottom.vue +++ b/src/views/PaintShopView/machiningView/bottom.vue @@ -219,7 +219,6 @@ function setcontentData(val){ show: true, color:'#fff', formatter: function(params){ - console.log(params); return params.value.toLocaleString() }, position: "top", @@ -263,7 +262,6 @@ function setcontentData(val){ show: true, color:'#fff', formatter: function(params){ - console.log(params); return params.value.toLocaleString() }, position: "top", diff --git a/src/views/Temp/GetonAgain/right.vue b/src/views/Temp/GetonAgain/right.vue index 7ca648c..bd19e8e 100644 --- a/src/views/Temp/GetonAgain/right.vue +++ b/src/views/Temp/GetonAgain/right.vue @@ -197,9 +197,7 @@ let {t} = useI18n(); // }) // Productionref.value.changeData(ProductionOption.option) - // pmref.value.setData({two:10,ten:10}) - console.log(val); - + // pmref.value.setData({two:10,ten:10}) pm25ref.value.setData(val.dust.pm25) pm10ref.value.setData(val.dust.pm10) // pmref.value.setData({two:val.dust.pm25,ten:val.dust.pm10}) diff --git a/src/views/Temp/Large_Format/bottom.vue b/src/views/Temp/Large_Format/bottom.vue index 6b66956..6dcbe6a 100644 --- a/src/views/Temp/Large_Format/bottom.vue +++ b/src/views/Temp/Large_Format/bottom.vue @@ -53,7 +53,6 @@ watch( () => store.DeviceSensorinfo, (newVal, oldVal) => { //动态更新echarts - console.log(newVal, "数据2"); setdata(newVal); }, { deep: true, flush: "post" } @@ -88,7 +87,6 @@ function reset(val: any) { const remarksBox = (width: any, height: any) => { let a = calcWH(height, width, 1, 3, 0); - console.log(a); // a.oHeight=a.oHeight //修改高度 @@ -98,7 +96,6 @@ const remarksBox = (width: any, height: any) => { }; function setdata(val: any) { - console.log(val.Timestamp-0); bottomtip1.value.setData( reactive({name:val.name,severror:val.severror,Timestamp:val.Timestamp?gettime(val.Timestamp-0):'----.--.--',Alarlmnformation:val.Alarlmnformation}) diff --git a/src/views/Temp/Large_Format/component/Details.vue b/src/views/Temp/Large_Format/component/Details.vue index c8783c2..1131c69 100644 --- a/src/views/Temp/Large_Format/component/Details.vue +++ b/src/views/Temp/Large_Format/component/Details.vue @@ -83,7 +83,6 @@ onMounted(() => { function setchartWH(width: any, height: any) { detailslistSize.height = height - 100 + "px"; detailslistSize.width = width - 80 + "px"; - console.log(detailslistSize); detailslistBoxSize.height = height-50 + "px"; detailslistBoxSize.width = width+ "px"; @@ -154,7 +153,6 @@ const dvmouseleave = () => { }; const dvClick = (value) => { // console.log(value.row[0]); - console.log(devList.value.dom); }; defineExpose({ setchartWH, diff --git a/src/views/Temp/Large_Format/component/RotationTable.vue b/src/views/Temp/Large_Format/component/RotationTable.vue index 67122b0..2d23a45 100644 --- a/src/views/Temp/Large_Format/component/RotationTable.vue +++ b/src/views/Temp/Large_Format/component/RotationTable.vue @@ -146,7 +146,6 @@ function setchartWH(width: any, height: any) { const dvClick = (value) => { // console.log(value.row[0]); - console.log(devList.value.dom); }; onMounted(() => {}); diff --git a/src/views/Temp/Large_Format/component/bottomtip.vue b/src/views/Temp/Large_Format/component/bottomtip.vue index d2ae556..2d955aa 100644 --- a/src/views/Temp/Large_Format/component/bottomtip.vue +++ b/src/views/Temp/Large_Format/component/bottomtip.vue @@ -70,7 +70,6 @@ watch( (newVal, oldVal) => { //动态更新echarts data.name=newVal.rackNumber - console.log(newVal); keynum.value++; }, @@ -85,9 +84,7 @@ function setchartWH(width: any, height: any) { // refborder1.value.resetWH() } -const setData = (value: any) => { - console.log(data); - +const setData = (value: any) => { data = value; keynum.value++; }; diff --git a/src/views/Temp/Large_Format/component/origin.vue b/src/views/Temp/Large_Format/component/origin.vue index edb183e..4f60a32 100644 --- a/src/views/Temp/Large_Format/component/origin.vue +++ b/src/views/Temp/Large_Format/component/origin.vue @@ -95,7 +95,6 @@ onMounted(() => { }); function setchartWH(width: any, height: any) { - console.log(width,"接收到的参数"); originlistSize.height = height + "px"; originlistSize.width = width-50 + "px"; @@ -151,7 +150,6 @@ const dvmouseleave = () => { }; const dvClick = (value) => { // console.log(value.row[0]); - console.log(devList.value.dom); }; const setData = (data: any, datatitle: any) => { title.value = datatitle; diff --git a/src/views/Temp/Large_Format/left.vue b/src/views/Temp/Large_Format/left.vue index f3bffb5..bbf2d87 100644 --- a/src/views/Temp/Large_Format/left.vue +++ b/src/views/Temp/Large_Format/left.vue @@ -116,7 +116,6 @@ function reset(val: any) { } function boxtop(val: any) { let a = calcWH(val.height, val.width, 1, 2, 0); - console.log(a,"leftboxtop"); // titleRef.value.setchartWH(a.oWidth, 100); originRef.value.setchartWH(a.oWidth-20, a.oHeight -100); @@ -124,7 +123,6 @@ function boxtop(val: any) { } function boxbottom(val: any) { let a = calcWH(val.height, val.width, 3, 2, 0); - console.log(a,"boxbottom"); toptip1Ref.value.setchartWH(a.oWidth+100, a.oHeight * 3); // detailsRef.value.setchartWH(a.oWidth-20, a.oHeight); // axleRef.value.setchartWH(a.oWidth-20, a.oHeight); diff --git a/src/views/Temp/Large_Format/top.vue b/src/views/Temp/Large_Format/top.vue index 0f79d50..81a3bbf 100644 --- a/src/views/Temp/Large_Format/top.vue +++ b/src/views/Temp/Large_Format/top.vue @@ -111,7 +111,6 @@ let {t} = useI18n(); const title1box=(width:any,height:any)=>{ let a=calcWH(height,width,4,3,0) - console.log(a,"111"); // a.oHeight=a.oHeight //修改高度 @@ -120,7 +119,6 @@ let {t} = useI18n(); } const detailsBox=(width:any,height:any)=>{ let a=calcWH(height,width,1,3,0) - console.log(a,"222"); // a.oHeight=a.oHeight //修改高度 detailsRef.value.setchartWH(a.oWidth,a.oHeight) diff --git a/src/views/Temp/OffsiteDevList/childContent/center.vue b/src/views/Temp/OffsiteDevList/childContent/center.vue index 0caf9a0..723e6af 100644 --- a/src/views/Temp/OffsiteDevList/childContent/center.vue +++ b/src/views/Temp/OffsiteDevList/childContent/center.vue @@ -134,7 +134,6 @@ const box = (width: any, height: any) => { }; function changedevlist(val: any) { let list = []; - console.log(listWH.width); val.forEach((res, index) => { list.push([ @@ -177,7 +176,6 @@ function changedevlist(val: any) { tableref.value.changeData(tabledata.data); } function setDataList(val: any) { - console.log(val); let tipdata = { ison: 0, isall: 0, isoff: 0 }; //计算设备总量 val.devnum.forEach((res) => { diff --git a/src/views/demo/content.vue b/src/views/demo/content.vue index c066d2a..868f284 100644 --- a/src/views/demo/content.vue +++ b/src/views/demo/content.vue @@ -325,7 +325,6 @@ echartsData.chartBox3.data={ echartsData.chartBox1.title='柱状图' echartsData.chartBox2.title='折线图' echartsData.chartBox3.title='仪表盘' - console.log(echartsData); } diff --git a/src/views/electronicControl/childContent/left.vue b/src/views/electronicControl/childContent/left.vue index b4b7af7..062f0f7 100644 --- a/src/views/electronicControl/childContent/left.vue +++ b/src/views/electronicControl/childContent/left.vue @@ -112,8 +112,6 @@ let data2 = [ function changedevlist(val: any) { let list = []; - console.log(listWH.width); - val.forEach((res, index) => { list.push([ index + 1, diff --git a/src/views/electronicControlAmbient/index.vue b/src/views/electronicControlAmbient/index.vue index ec28418..07b4ce6 100644 --- a/src/views/electronicControlAmbient/index.vue +++ b/src/views/electronicControlAmbient/index.vue @@ -113,7 +113,6 @@ function getWebsocket(val) { let data = JSON.parse(val); if (data.type == "electronicView") { // store.changenoise(data.msg); - console.log(data.msg, "电控监测"); topref.value.setcontentData(data.msg); bottomref.value.setcontentData(data.msg); diff --git a/src/views/electronicControlAmbient/top.vue b/src/views/electronicControlAmbient/top.vue index 733cbdb..a5f398b 100644 --- a/src/views/electronicControlAmbient/top.vue +++ b/src/views/electronicControlAmbient/top.vue @@ -259,7 +259,6 @@ function setcontentData(val) { let noise = val.noise.map((item) => { return { name: item.name, val: item.data, status: item.status || false }; }); - console.log(noise); // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"") verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB") diff --git a/src/views/energyConsume/content/chart/power2023.vue b/src/views/energyConsume/content/chart/power2023.vue index 7f8696c..27fba0b 100644 --- a/src/views/energyConsume/content/chart/power2023.vue +++ b/src/views/energyConsume/content/chart/power2023.vue @@ -65,7 +65,6 @@ for(let key in res.month){ }) //data0用于初始化计算的数据 let data0=[] -console.log(value); for(let i=1;i<=value.name.length;i++){ data0.push(0) diff --git a/src/views/energyConsume/content/child/content/left.vue b/src/views/energyConsume/content/child/content/left.vue index b898da9..69bbca8 100644 --- a/src/views/energyConsume/content/child/content/left.vue +++ b/src/views/energyConsume/content/child/content/left.vue @@ -121,7 +121,6 @@ watch( { deep: true, flush: "post" } ); function changepowerData(val:any){ - console.log(val); let x=[] let y={} @@ -146,7 +145,6 @@ series.push({ } powerData.option.xAxis.data=x powerData.option.series=series -console.log(series); powerhistory.value.changeData(powerData.option); } diff --git a/src/views/energyConsume/content/child/historyData.vue b/src/views/energyConsume/content/child/historyData.vue index d174c35..a75db9d 100644 --- a/src/views/energyConsume/content/child/historyData.vue +++ b/src/views/energyConsume/content/child/historyData.vue @@ -66,7 +66,6 @@ let {t} = useI18n(); async function getpowerhistoryDatafun() { let result: any = await getHistoryCurrentData(); if (result.code == 200) { - console.log(result.data); store.setList(result.data, "power"); } diff --git a/src/views/energyConsume/content/left.vue b/src/views/energyConsume/content/left.vue index 20bff28..02e93b4 100644 --- a/src/views/energyConsume/content/left.vue +++ b/src/views/energyConsume/content/left.vue @@ -239,7 +239,6 @@ watch( watch( () => store.powerRatio, (newVal, oldVal) => { - console.log(newVal, "dfsfsdf"); if (!newVal) { return; @@ -267,7 +266,6 @@ watch( } option1.list[key].push(res); } else { - console.log(index); if (!option2.list[key]) { option2.list[key] = []; } diff --git a/src/views/energyConsume/index.vue b/src/views/energyConsume/index.vue index 6d36f6f..23b04c5 100644 --- a/src/views/energyConsume/index.vue +++ b/src/views/energyConsume/index.vue @@ -81,7 +81,6 @@ async function getcurrentProductfun(){ res.month[key] = res.month[key].reverse(); } }); - console.log(result.data); store.setProduct(result.data) } } diff --git a/src/views/energyConsumeJixiefenchang/content/chart/gas.vue b/src/views/energyConsumeJixiefenchang/content/chart/gas.vue index a1b34fe..0025c03 100644 --- a/src/views/energyConsumeJixiefenchang/content/chart/gas.vue +++ b/src/views/energyConsumeJixiefenchang/content/chart/gas.vue @@ -42,7 +42,6 @@ const echartsData = reactive({ }) const setData=(value:any)=>{ - console.log(value); echartsData.gas!.div=gas.value echartsData.gas!.title=props.title diff --git a/src/views/energyConsumeJixiefenchang/content/chart/power2023.vue b/src/views/energyConsumeJixiefenchang/content/chart/power2023.vue index 7f8696c..27fba0b 100644 --- a/src/views/energyConsumeJixiefenchang/content/chart/power2023.vue +++ b/src/views/energyConsumeJixiefenchang/content/chart/power2023.vue @@ -65,7 +65,6 @@ for(let key in res.month){ }) //data0用于初始化计算的数据 let data0=[] -console.log(value); for(let i=1;i<=value.name.length;i++){ data0.push(0) diff --git a/src/views/energyConsumeJixiefenchang/content/child/content/left.vue b/src/views/energyConsumeJixiefenchang/content/child/content/left.vue index db548de..1be5f23 100644 --- a/src/views/energyConsumeJixiefenchang/content/child/content/left.vue +++ b/src/views/energyConsumeJixiefenchang/content/child/content/left.vue @@ -120,7 +120,6 @@ watch( { deep: true, flush: "post" } ); function changepowerData(val:any){ - console.log(val); let x=[] let y={} @@ -145,7 +144,6 @@ series.push({ } powerData.option.xAxis.data=x powerData.option.series=series -console.log(series); powerhistory.value.changeData(powerData.option); } diff --git a/src/views/energyConsumeJixiefenchang/content/child/historyData.vue b/src/views/energyConsumeJixiefenchang/content/child/historyData.vue index 2c6e4b4..2c36929 100644 --- a/src/views/energyConsumeJixiefenchang/content/child/historyData.vue +++ b/src/views/energyConsumeJixiefenchang/content/child/historyData.vue @@ -64,7 +64,6 @@ const store = useenergyUseStore(); async function getpowerhistoryDatafun() { let result: any = await getHistoryCurrentData(); if (result.code == 200) { - console.log(result.data); store.setList(result.data, "power"); } diff --git a/src/views/energyConsumeJixiefenchang/content/left.vue b/src/views/energyConsumeJixiefenchang/content/left.vue index 2358795..44793fd 100644 --- a/src/views/energyConsumeJixiefenchang/content/left.vue +++ b/src/views/energyConsumeJixiefenchang/content/left.vue @@ -246,7 +246,6 @@ watch( if(newVal.listData[key]){ newVal.listData[key].forEach((res,index)=>{ if(index!=storekey){ - console.log(index); if(!option1.list[key]){ option1.list[key]=[] @@ -332,7 +331,6 @@ watch( }) } } - console.log(option1,option2,storekey); gasOption.option.series=series gasOption2.option.series=series2 diff --git a/src/views/energyConsumeJixiefenchang/content/top.vue b/src/views/energyConsumeJixiefenchang/content/top.vue index 1c43885..d6aaa98 100644 --- a/src/views/energyConsumeJixiefenchang/content/top.vue +++ b/src/views/energyConsumeJixiefenchang/content/top.vue @@ -185,7 +185,6 @@ watch( if (newVal.listData[key]) { newVal.listData[key].forEach((res, index) => { if (index != storekey) { - console.log(index); if (!option1.list[key]) { option1.list[key] = []; diff --git a/src/views/environment/content/chart/humiture.vue b/src/views/environment/content/chart/humiture.vue index 88992fd..a2776c7 100644 --- a/src/views/environment/content/chart/humiture.vue +++ b/src/views/environment/content/chart/humiture.vue @@ -123,9 +123,7 @@ change(echartsData.humiture) } -const change = (item:EDataPersonItem) => { - console.log(item); - +const change = (item:EDataPersonItem) => { let Ebox=proxy.$echarts.init( item.div, "dark" @@ -146,7 +144,6 @@ async function getData(){ let result:any = await getHumitureData() if(result.code==200){ - console.log(result); // setData(room,year,result.title) } diff --git a/src/views/environment/content/chart/noise.vue b/src/views/environment/content/chart/noise.vue index 760e7e0..3f80780 100644 --- a/src/views/environment/content/chart/noise.vue +++ b/src/views/environment/content/chart/noise.vue @@ -73,7 +73,6 @@ change(echartsData.noise) const change = (item:EDataPersonItem) => { - console.log(item); let Ebox=proxy.$echarts.init( item.div, diff --git a/src/views/environment/content/chart/pipe.vue b/src/views/environment/content/chart/pipe.vue index 539ecc9..9701c28 100644 --- a/src/views/environment/content/chart/pipe.vue +++ b/src/views/environment/content/chart/pipe.vue @@ -89,9 +89,7 @@ change(echartsData.pipe) } -const change = (item:EDataPersonItem) => { - console.log(item); - +const change = (item:EDataPersonItem) => { let Ebox=proxy.$echarts.init( item.div, "dark" diff --git a/src/views/environment/content/chart/power.vue b/src/views/environment/content/chart/power.vue index ff3a22f..5fbff1b 100644 --- a/src/views/environment/content/chart/power.vue +++ b/src/views/environment/content/chart/power.vue @@ -22,8 +22,6 @@ const echartsData = reactive({ }) const setData=(y:any,x:any,title:any)=>{ - console.log(x); - let series=[] for(let key in x){ let year =key.split('-') diff --git a/src/views/environment/content/chart/verticalNum.vue b/src/views/environment/content/chart/verticalNum.vue index 1f84272..d880eaf 100644 --- a/src/views/environment/content/chart/verticalNum.vue +++ b/src/views/environment/content/chart/verticalNum.vue @@ -10,41 +10,39 @@ +} diff --git a/src/views/environment/content/left.vue b/src/views/environment/content/left.vue index 0dfb6f8..e178f30 100644 --- a/src/views/environment/content/left.vue +++ b/src/views/environment/content/left.vue @@ -472,7 +472,6 @@ const setData=()=>{ * @函数备注: */ const change = (item:EDataPersonItem) => { - console.log(item); let Ebox=proxy.$echarts.init( item.div, diff --git a/src/views/environment/index.vue b/src/views/environment/index.vue index 7f1f3b8..09de3aa 100644 --- a/src/views/environment/index.vue +++ b/src/views/environment/index.vue @@ -38,9 +38,7 @@ let size=reactive({ oWidth:0, oHeight:0 }); -function WH(div:HTMLElement){ - console.log( div ); - +function WH(div:HTMLElement){ let a=calcWH(div.offsetHeight,div.offsetWidth,1,2,0) size.oWidth=a.oWidth size.oHeight=a.oHeight diff --git a/src/views/generalEnvironment/content/right.vue b/src/views/generalEnvironment/content/right.vue index 72afffe..773937b 100644 --- a/src/views/generalEnvironment/content/right.vue +++ b/src/views/generalEnvironment/content/right.vue @@ -126,7 +126,6 @@ watch( () => store.pm, (newVal, oldVal) => { //动态更新echarts - console.log(newVal,'最新数据'); refwelding.value.setData(newVal.welding,2) refornaments.value.setData(newVal.ornaments,2) refstuff.value.setData(newVal.stuff,2) @@ -158,7 +157,6 @@ async function getPmData(){ // let resultten:any = await getPmtenData() let data=reactive({welding:{two:null,ten:null},stuff:{two:null,ten:null},ornaments:{two:null,ten:null}}) Promise.all([getPmtwoDatafun(),getPmtenDatafun()]).then((res)=>{ - console.log(res); if(res){ res[0].data.forEach(ele=>{ if(data[ele.enName]){ diff --git a/src/views/generalEnvironment/index.vue b/src/views/generalEnvironment/index.vue index d0fdfbb..6e4a594 100644 --- a/src/views/generalEnvironment/index.vue +++ b/src/views/generalEnvironment/index.vue @@ -58,8 +58,6 @@ let size = reactive({ oHeight: 0, }); function WH(div: HTMLElement) { - console.log(div); - let a = calcWH(div.offsetHeight, div.offsetWidth, 1, 2, 0); size.oWidth = a.oWidth; size.oHeight = a.oHeight; diff --git a/src/views/generalEnvironmentjixiefenchang/index.vue b/src/views/generalEnvironmentjixiefenchang/index.vue index eba728f..cb0fba8 100644 --- a/src/views/generalEnvironmentjixiefenchang/index.vue +++ b/src/views/generalEnvironmentjixiefenchang/index.vue @@ -71,8 +71,6 @@ let size = reactive({ oHeight: 0, }); function WH(div: HTMLElement) { - console.log(div); - let a = calcWH(div.offsetHeight, div.offsetWidth, 1, 2, 0); size.oWidth = a.oWidth; size.oHeight = a.oHeight; diff --git a/src/views/legionProducts/chart/scrollBoard.vue b/src/views/legionProducts/chart/scrollBoard.vue index a35425b..05f02d7 100644 --- a/src/views/legionProducts/chart/scrollBoard.vue +++ b/src/views/legionProducts/chart/scrollBoard.vue @@ -57,7 +57,6 @@ const dvmouseleave = () => { }; const dvClick = (value) => { - console.log(value,prop.severdata, "value"); if (value.row) { prop.severdata.forEach((res:any) => { diff --git a/src/views/pmData/index.vue b/src/views/pmData/index.vue index be5a365..aa0ad09 100644 --- a/src/views/pmData/index.vue +++ b/src/views/pmData/index.vue @@ -80,9 +80,7 @@ function getWebsocket(val) { try { let data = JSON.parse(val); - if (data.type == "dust") { - console.log(data.msg, "pm2.5/10"); - + if (data.type == "dust") { let index = pmData.findIndex(item => item.title == data.msg.name + "(PM2.5/PM10)") if (index != -1) { pmData[index].value.ten = data.msg.pm10 diff --git a/src/views/realtimeSecurity/content/chart/pipe.vue b/src/views/realtimeSecurity/content/chart/pipe.vue index bffd507..1c56961 100644 --- a/src/views/realtimeSecurity/content/chart/pipe.vue +++ b/src/views/realtimeSecurity/content/chart/pipe.vue @@ -335,7 +335,6 @@ const change = (item: EDataPersonItem) => { Ebox = item.box; } Ebox.setOption(item.data); - console.log(echartsData.pipe.box,"我拿到了数据"); item.box = Ebox; @@ -346,11 +345,9 @@ const updata = (item: EDataPersonItem) => { function setchartWH(width: any, height: any) { pipe.value.style.height = height + "px"; pipe.value.style.width = width + "px"; - console.log(echartsData.pipe.box,"我执行了"); refborder3.value.resetWH(); if (echartsData.pipe.box) { - console.log(width,"我执行了2"); nextTick(()=>{ echartsData.pipe.box.resize(); }) diff --git a/src/views/realtimeSecurity/index.vue b/src/views/realtimeSecurity/index.vue index 4d3dbc8..d9355fe 100644 --- a/src/views/realtimeSecurity/index.vue +++ b/src/views/realtimeSecurity/index.vue @@ -97,9 +97,7 @@ function getWebsocket(val) { store.changeNewVerticalNum({type:'Methane',data:verticalData}) } //甲醛TVOC - if (data.type == "TVOC_CH2O") { - console.log(data.msg,"甲醛TVOC"); - + if (data.type == "TVOC_CH2O") { store.changeTVOC_CH2O(data.msg); let verticalData_TVOC = {name:data.msg.TVOC.name,val:data.msg.TVOC.value} store.changeNewVerticalNum({type:'TVOC',data:verticalData_TVOC}) diff --git a/src/views/realtimeSecurityJixiefenchang/content/chart/pipe.vue b/src/views/realtimeSecurityJixiefenchang/content/chart/pipe.vue index ef58e1a..645a223 100644 --- a/src/views/realtimeSecurityJixiefenchang/content/chart/pipe.vue +++ b/src/views/realtimeSecurityJixiefenchang/content/chart/pipe.vue @@ -335,7 +335,6 @@ const change = (item: EDataPersonItem) => { Ebox = item.box; } Ebox.setOption(item.data); - console.log(echartsData.pipe.box,"我拿到了数据"); item.box = Ebox; @@ -346,11 +345,9 @@ const updata = (item: EDataPersonItem) => { function setchartWH(width: any, height: any) { pipe.value.style.height = height + "px"; pipe.value.style.width = width + "px"; - console.log(echartsData.pipe.box,"我执行了"); refborder3.value.resetWH(); if (echartsData.pipe.box) { - console.log(width,"我执行了2"); nextTick(()=>{ echartsData.pipe.box.resize(); }) diff --git a/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNumLoop.vue b/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNumLoop.vue index ab6c23b..4c605ab 100644 --- a/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNumLoop.vue +++ b/src/views/realtimeSecurityJixiefenchang/content/chart/verticalNumLoop.vue @@ -67,8 +67,7 @@ let timer = null; let item = computed(() => { return props.value[i.value]; }); -let iconcolor = computed(() => { - console.log(props); +let iconcolor = computed(() => { return props.value[i.value].status?props.value[i.value].val > props.limit ? "icon-red" : "icon-blue":"icon-grey"; }); diff --git a/src/views/realtimeSecurityJixiefenchang/content/content.vue b/src/views/realtimeSecurityJixiefenchang/content/content.vue index f552cca..9301e39 100644 --- a/src/views/realtimeSecurityJixiefenchang/content/content.vue +++ b/src/views/realtimeSecurityJixiefenchang/content/content.vue @@ -58,8 +58,6 @@ let verticalNum7 = ref() function reset(val: any) { //宽高为0时跳出该方法 - console.log(val); - if (!val.width && !val.height) return //重置盒子尺寸 @@ -219,7 +217,6 @@ async function getpipeDatafun() { let result: any = await getpipeData({ deptIds: pageValue }) if (result.code == 200) { - console.log(result); //设置组件样式 pipe1.value.setData({ listData: result.data.listData, top: result.data.top }, 1) diff --git a/src/views/realtimeSecurityJixiefenchang/index.vue b/src/views/realtimeSecurityJixiefenchang/index.vue index 78110be..4bedd2d 100644 --- a/src/views/realtimeSecurityJixiefenchang/index.vue +++ b/src/views/realtimeSecurityJixiefenchang/index.vue @@ -97,9 +97,7 @@ function getWebsocket(val) { store.changeNewVerticalNum({type:'Methane',data:verticalData}) } //甲醛TVOC - if (data.type == "TVOC_CH2O") { - console.log(data.msg,"甲醛TVOC"); - + if (data.type == "TVOC_CH2O") { store.changeTVOC_CH2O(data.msg); let verticalData_TVOC = {name:data.msg.TVOC.name,val:data.msg.TVOC.value} store.changeNewVerticalNum({type:'TVOC',data:verticalData_TVOC})