删除无用的控制台打印

This commit is contained in:
hzz 2023-05-24 11:59:27 +08:00
parent 6722c22c72
commit 10e22d9d58
109 changed files with 85 additions and 231 deletions

View File

@ -147,7 +147,7 @@ function setchartWH(width: any, height: any) {
const dvClick = (value) => { const dvClick = (value) => {
// console.log(value.row[0]); // console.log(value.row[0]);
console.log(devList.value.dom); // console.log(devList.value.dom);
}; };
onMounted(() => {}); onMounted(() => {});

View File

@ -314,7 +314,7 @@ function HeadergetWebsocket(val) {
if (props.alarmType.some(e=>{return e==data.type})) { if (props.alarmType.some(e=>{return e==data.type})) {
// console.log(props.alarmType); // 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) storeheader.changeDataList(data)
} }
} }

View File

@ -63,7 +63,7 @@ export const useHeaderStore = defineStore(Names.header,{
}else{ }else{
this.AlarmscrollBoardList.push(val) this.AlarmscrollBoardList.push(val)
} }
console.log(this.AlarmscrollBoardList,"共有这么多数据"); // console.log(this.AlarmscrollBoardList,"共有这么多数据");
}, },
resetData(){ resetData(){

View File

@ -197,7 +197,7 @@ export const useAerialViewStore = defineStore(Names.AerialView, {
//异步方法需要添加async和await //异步方法需要添加async和await
actions: { actions: {
setDataList(val: any) { setDataList(val: any) {
console.log(val,"store"); // console.log(val,"store");
this.sensorList=[] this.sensorList=[]
for (let key in val) { for (let key in val) {
@ -267,7 +267,7 @@ export const useAerialViewStore = defineStore(Names.AerialView, {
this.sensorList.push(res) this.sensorList.push(res)
}); });
} }
console.log(this.iconList,"store"); // console.log(this.iconList,"store");
}, },

View File

@ -69,7 +69,7 @@ export const useInPlantProductsStore = defineStore(Names.InPlantProducts, {
this.newPageData.imgTip=val.imgTip this.newPageData.imgTip=val.imgTip
this.newPageData.axleList=val.axleList this.newPageData.axleList=val.axleList
this.newPageData.LedList=val.LedList this.newPageData.LedList=val.LedList
console.log(this.newPageData.devDetail); // console.log(this.newPageData.devDetail);
// this.newPageData.devinfo.unshift({name:'设备名称',value:val.productName}) // this.newPageData.devinfo.unshift({name:'设备名称',value:val.productName})
} }

View File

@ -275,7 +275,7 @@ export const useMechanicsStore = defineStore(Names.Mechanics, {
} }
this.devstatus = newdata; this.devstatus = newdata;
console.log(newdata); // console.log(newdata);
}, },
changeImgSrc() { changeImgSrc() {

View File

@ -281,7 +281,7 @@ export const useSocketStore = defineStore(Names.socket, {
this.Pressure = val this.Pressure = val
}, },
changePipe(val) { changePipe(val) {
console.log(val, "gengxinle "); // console.log(val, "gengxinle ");
if (this.pipe.listData.length == 0) { if (this.pipe.listData.length == 0) {
this.pipe.listData = val.listData this.pipe.listData = val.listData

View File

@ -191,7 +191,7 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{
* @函数备注: * @函数备注:
*/ */
changeHumiture(val){ changeHumiture(val){
console.log(this.humiture.Humiture); // console.log(this.humiture.Humiture);
if(this.humiture.Humiture.length==0){ if(this.humiture.Humiture.length==0){
this.humiture=val this.humiture=val
@ -283,7 +283,7 @@ export const useSocketStore = defineStore(Names.socketjixiefenchang,{
this.Pressure=val this.Pressure=val
}, },
changePipe(val){ changePipe(val){
console.log(val,"gengxinle "); // console.log(val,"gengxinle ");
if(this.pipe.listData.length==0){ if(this.pipe.listData.length==0){
this.pipe.listData=val.listData this.pipe.listData=val.listData

View File

@ -23,7 +23,7 @@ export function gettime(data = null) {
// 周日-周六(0-6) 刚好对应数字下标 // 周日-周六(0-6) 刚好对应数字下标
var day = time.getDay(); var day = time.getDay();
console.log(getStoredLanguage()); // console.log(getStoredLanguage());
if (getStoredLanguage() == 'English/USD') { if (getStoredLanguage() == 'English/USD') {
var arr = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]; var arr = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];

View File

@ -30,7 +30,7 @@ export default function useDraw() {
// 表示更高 // 表示更高
scale.height = ((window.innerWidth / baseProportion) / baseHeight).toFixed(5) scale.height = ((window.innerWidth / baseProportion) / baseHeight).toFixed(5)
scale.width = (window.innerWidth / baseWidth).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%)` appRef.value.style.transform = `scale(${scale.width}, ${scale.height}) translate(-50%, -50%)`
} }
} }

View File

@ -2310,9 +2310,6 @@ function getclickMap(x, y) {
var intersectsMap = raycasterMap.intersectObjects(ThreeObj.scene.children); var intersectsMap = raycasterMap.intersectObjects(ThreeObj.scene.children);
if (intersectsMap.length > 0) { if (intersectsMap.length > 0) {
var selected = intersectsMap[0]; // var selected = intersectsMap[0]; //
console.log("x坐标:" + selected.point.x);
console.log("y坐标:" + selected.point.y);
console.log("z坐标:" + selected.point.z);
} }
} }
/** /**
@ -2343,8 +2340,6 @@ function goPage(px, py) {
}); });
} }
onMounted(() => { onMounted(() => {
console.log(store.iconList);
// //
ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth);
cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth); cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth);

View File

@ -777,7 +777,6 @@ watch(
watch( watch(
() => store.devdataList, () => store.devdataList,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"设备数据");
newVal.forEach(res=>{ newVal.forEach(res=>{
if(res.store=='机加车间'){ if(res.store=='机加车间'){
MachiningDev.push(...res.value) MachiningDev.push(...res.value)

View File

@ -74,7 +74,6 @@ watch(
iconList= reactive(newVal) iconList= reactive(newVal)
console.log();
numkey.value++ numkey.value++
}, },
{ deep: true, flush: "post" } { deep: true, flush: "post" }

View File

@ -47,7 +47,6 @@ let content = null;
watch( watch(
() => props.val, () => props.val,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"处理");
data = newVal; data = newVal;
content = ""; content = "";

View File

@ -51,8 +51,6 @@ async function deviceDistributeInMachineryFactorydatafun() {
let result: any = await deviceDistributeInMachineryFactorydata(); let result: any = await deviceDistributeInMachineryFactorydata();
if (result.code == 200) { if (result.code == 200) {
console.log(result.data,"设备列表");
store.setdevList(result.data); store.setdevList(result.data);
} }
} }

View File

@ -53,7 +53,6 @@ watch(
() => store.DeviceSensorinfo, () => store.DeviceSensorinfo,
(newVal, oldVal) => { (newVal, oldVal) => {
//echarts //echarts
console.log(newVal, "数据2");
setdata(newVal); setdata(newVal);
}, },
{ deep: true, flush: "post" } { deep: true, flush: "post" }
@ -88,7 +87,6 @@ function reset(val: any) {
const remarksBox = (width: any, height: any) => { const remarksBox = (width: any, height: any) => {
let a = calcWH(height, width, 1, 3, 0); let a = calcWH(height, width, 1, 3, 0);
console.log(a);
// a.oHeight=a.oHeight // a.oHeight=a.oHeight
// //
@ -98,7 +96,6 @@ const remarksBox = (width: any, height: any) => {
}; };
function setdata(val: any) { function setdata(val: any) {
console.log(val.Timestamp-0);
bottomtip1.value.setData( bottomtip1.value.setData(
reactive({name:val.name,severror:val.severror,Timestamp:val.Timestamp?gettime(val.Timestamp-0):'----.--.--',Alarlmnformation:val.Alarlmnformation}) reactive({name:val.name,severror:val.severror,Timestamp:val.Timestamp?gettime(val.Timestamp-0):'----.--.--',Alarlmnformation:val.Alarlmnformation})

View File

@ -82,7 +82,6 @@ onMounted(() => {
function setchartWH(width: any, height: any) { function setchartWH(width: any, height: any) {
detailslistSize.height = height - 100 + "px"; detailslistSize.height = height - 100 + "px";
detailslistSize.width = width - 80 + "px"; detailslistSize.width = width - 80 + "px";
console.log(detailslistSize);
detailslistBoxSize.height = height-50 + "px"; detailslistBoxSize.height = height-50 + "px";
detailslistBoxSize.width = width+ "px"; detailslistBoxSize.width = width+ "px";
@ -153,7 +152,6 @@ const dvmouseleave = () => {
}; };
const dvClick = (value) => { const dvClick = (value) => {
// console.log(value.row[0]); // console.log(value.row[0]);
console.log(devList.value.dom);
}; };
defineExpose({ defineExpose({
setchartWH, setchartWH,

View File

@ -146,7 +146,6 @@ function setchartWH(width: any, height: any) {
const dvClick = (value) => { const dvClick = (value) => {
// console.log(value.row[0]); // console.log(value.row[0]);
console.log(devList.value.dom);
}; };
onMounted(() => {}); onMounted(() => {});

View File

@ -70,7 +70,6 @@ watch(
(newVal, oldVal) => { (newVal, oldVal) => {
//echarts //echarts
data.name=newVal.rackNumber data.name=newVal.rackNumber
console.log(newVal);
keynum.value++; keynum.value++;
}, },
@ -86,7 +85,6 @@ function setchartWH(width: any, height: any) {
} }
const setData = (value: any) => { const setData = (value: any) => {
console.log(data);
data = value; data = value;
keynum.value++; keynum.value++;

View File

@ -148,7 +148,6 @@ const dvmouseleave = () => {
}; };
const dvClick = (value) => { const dvClick = (value) => {
// console.log(value.row[0]); // console.log(value.row[0]);
console.log(devList.value.dom);
}; };
const setData = (data: any, datatitle: any) => { const setData = (data: any, datatitle: any) => {
title.value = datatitle; title.value = datatitle;

View File

@ -111,7 +111,6 @@ let {t} = useI18n();
const title1box=(width:any,height:any)=>{ const title1box=(width:any,height:any)=>{
let a=calcWH(height,width,4,3,0) let a=calcWH(height,width,4,3,0)
console.log(a,"111");
// a.oHeight=a.oHeight // a.oHeight=a.oHeight
// //
@ -120,7 +119,6 @@ let {t} = useI18n();
} }
const detailsBox=(width:any,height:any)=>{ const detailsBox=(width:any,height:any)=>{
let a=calcWH(height,width,1,3,0) let a=calcWH(height,width,1,3,0)
console.log(a,"222");
// a.oHeight=a.oHeight // a.oHeight=a.oHeight
// //
detailsRef.value.setchartWH(a.oWidth,a.oHeight) detailsRef.value.setchartWH(a.oWidth,a.oHeight)

View File

@ -145,7 +145,6 @@ async function getprogressOfCorpsfun() {
let result: any = await getprogressOfCorps(); let result: any = await getprogressOfCorps();
if (result.code == 200) { if (result.code == 200) {
console.log(result);
result.data.forEach((res) => { result.data.forEach((res) => {
if (res.deptId == "15") { if (res.deptId == "15") {
// //

View File

@ -30,7 +30,6 @@ const echartsData = reactive<EDataPerson>({
}); });
const setData = (value: any, type: number) => { const setData = (value: any, type: number) => {
console.log(value, type);
// //
let percentage = Math.floor((value.accomplish/value.counts)*100) let percentage = Math.floor((value.accomplish/value.counts)*100)

View File

@ -95,7 +95,6 @@ async function gatewayOfCorpsfun() {
} }
} }
function setdata(val: any) { function setdata(val: any) {
console.log(val,"ddd");
val.forEach((res) => { val.forEach((res) => {
if (res.name == '汽车军团') { if (res.name == '汽车军团') {

View File

@ -82,7 +82,6 @@ function getWebsocket(val) {
// store.changenoise(data.msg) // store.changenoise(data.msg)
} }
if(data.type=="DeviceInPlant"){ if(data.type=="DeviceInPlant"){
console.log(data.msg);
store.changeDevList(data.msg) store.changeDevList(data.msg)
} }
} catch (err) {} } catch (err) {}

View File

@ -654,8 +654,6 @@ function goPage(px, py) {
}); });
} }
onMounted(() => { onMounted(() => {
console.log(store.iconList);
// //
ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth);
cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth); cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth);

View File

@ -777,7 +777,6 @@ watch(
watch( watch(
() => store.devdataList, () => store.devdataList,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"设备数据");
newVal.forEach(res=>{ newVal.forEach(res=>{
if(res.store=='机加车间'){ if(res.store=='机加车间'){
MachiningDev.push(...res.value) MachiningDev.push(...res.value)

View File

@ -87,7 +87,6 @@ watch(
iconList= reactive(newVal) iconList= reactive(newVal)
console.log();
numkey.value++ numkey.value++
}, },
{ deep: true, flush: "post" } { deep: true, flush: "post" }

View File

@ -47,7 +47,6 @@ let content = null;
watch( watch(
() => props.val, () => props.val,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"处理");
data = newVal; data = newVal;
content = ""; content = "";

View File

@ -777,7 +777,6 @@ watch(
watch( watch(
() => store.devdataList, () => store.devdataList,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"设备数据");
newVal.forEach(res=>{ newVal.forEach(res=>{
if(res.store=='机加车间'){ if(res.store=='机加车间'){
MachiningDev.push(...res.value) MachiningDev.push(...res.value)

View File

@ -89,7 +89,6 @@ watch(
iconList= reactive(newVal) iconList= reactive(newVal)
console.log();
numkey.value++ numkey.value++
}, },
{ deep: true, flush: "post" } { deep: true, flush: "post" }

View File

@ -47,8 +47,6 @@ let content = null;
watch( watch(
() => props.val, () => props.val,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"处理");
data = newVal; data = newVal;
content = ""; content = "";
newVal.forEach((res) => { newVal.forEach((res) => {

View File

@ -612,7 +612,6 @@ function goPage(px, py) {
}); });
} }
onMounted(() => { onMounted(() => {
console.log(store.iconList);
// //
ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth);

View File

@ -777,7 +777,6 @@ watch(
watch( watch(
() => store.devdataList, () => store.devdataList,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"设备数据");
newVal.forEach(res=>{ newVal.forEach(res=>{
if(res.store=='机加车间'){ if(res.store=='机加车间'){
MachiningDev.push(...res.value) MachiningDev.push(...res.value)

View File

@ -89,7 +89,6 @@ watch(
iconList= reactive(newVal) iconList= reactive(newVal)
console.log();
numkey.value++ numkey.value++
}, },
{ deep: true, flush: "post" } { deep: true, flush: "post" }

View File

@ -47,7 +47,6 @@ let content = null;
watch( watch(
() => props.val, () => props.val,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"处理");
data = newVal; data = newVal;
content = ""; content = "";

View File

@ -614,7 +614,6 @@ function goPage(px, py) {
}); });
} }
onMounted(() => { onMounted(() => {
console.log(store.iconList);
// //
ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth);

View File

@ -777,7 +777,6 @@ watch(
watch( watch(
() => store.devdataList, () => store.devdataList,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"设备数据");
newVal.forEach(res=>{ newVal.forEach(res=>{
if(res.store=='机加车间'){ if(res.store=='机加车间'){
MachiningDev.push(...res.value) MachiningDev.push(...res.value)

View File

@ -89,7 +89,6 @@ watch(
iconList= reactive(newVal) iconList= reactive(newVal)
console.log();
numkey.value++ numkey.value++
}, },
{ deep: true, flush: "post" } { deep: true, flush: "post" }

View File

@ -47,7 +47,6 @@ let content = null;
watch( watch(
() => props.val, () => props.val,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"处理");
data = newVal; data = newVal;
content = ""; content = "";

View File

@ -612,8 +612,6 @@ function goPage(px, py) {
}); });
} }
onMounted(() => { onMounted(() => {
console.log(store.iconList);
// //
ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth);
cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth); cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth);

View File

@ -777,7 +777,6 @@ watch(
watch( watch(
() => store.devdataList, () => store.devdataList,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"设备数据");
newVal.forEach(res=>{ newVal.forEach(res=>{
if(res.store=='机加车间'){ if(res.store=='机加车间'){
MachiningDev.push(...res.value) MachiningDev.push(...res.value)

View File

@ -89,7 +89,6 @@ watch(
iconList= reactive(newVal) iconList= reactive(newVal)
console.log();
numkey.value++ numkey.value++
}, },
{ deep: true, flush: "post" } { deep: true, flush: "post" }

View File

@ -47,7 +47,6 @@ let content = null;
watch( watch(
() => props.val, () => props.val,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"处理");
data = newVal; data = newVal;
content = ""; content = "";

View File

@ -613,8 +613,6 @@ function goPage(px, py) {
}); });
} }
onMounted(() => { onMounted(() => {
console.log(store.iconList);
// //
ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth);
cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth); cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth);

View File

@ -777,7 +777,6 @@ watch(
watch( watch(
() => store.devdataList, () => store.devdataList,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"设备数据");
newVal.forEach(res=>{ newVal.forEach(res=>{
if(res.store=='机加车间'){ if(res.store=='机加车间'){
MachiningDev.push(...res.value) MachiningDev.push(...res.value)

View File

@ -91,7 +91,6 @@ watch(
iconList= reactive(newVal) iconList= reactive(newVal)
console.log();
numkey.value++ numkey.value++
}, },
{ deep: true, flush: "post" } { deep: true, flush: "post" }

View File

@ -47,8 +47,6 @@ let content = null;
watch( watch(
() => props.val, () => props.val,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"处理");
data = newVal; data = newVal;
content = ""; content = "";
newVal.forEach((res) => { newVal.forEach((res) => {

View File

@ -613,8 +613,6 @@ function goPage(px, py) {
}); });
} }
onMounted(() => { onMounted(() => {
console.log(store.iconList);
// //
ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth); ThreeObj = initThree(map.value.clientHeight, map.value.clientWidth);
cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth); cssThreeObj = initCss3DScene(map.value.clientHeight, map.value.clientWidth);

View File

@ -777,7 +777,6 @@ watch(
watch( watch(
() => store.devdataList, () => store.devdataList,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"设备数据");
newVal.forEach(res=>{ newVal.forEach(res=>{
if(res.store=='机加车间'){ if(res.store=='机加车间'){
MachiningDev.push(...res.value) MachiningDev.push(...res.value)

View File

@ -89,7 +89,6 @@ watch(
iconList= reactive(newVal) iconList= reactive(newVal)
console.log();
numkey.value++ numkey.value++
}, },
{ deep: true, flush: "post" } { deep: true, flush: "post" }

View File

@ -47,8 +47,6 @@ let content = null;
watch( watch(
() => props.val, () => props.val,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal,"处理");
data = newVal; data = newVal;
content = ""; content = "";
newVal.forEach((res) => { newVal.forEach((res) => {

View File

@ -29,7 +29,6 @@ const echartsData = reactive<EDataPerson>({
}); });
const setData = (value: any) => { const setData = (value: any) => {
console.log(value);
value.value value.value
let name = [] let name = []
let seriesVal = [] let seriesVal = []

View File

@ -32,7 +32,6 @@ const setData = (value: any) => {
let time = value.value.map((item: any) => { let time = value.value.map((item: any) => {
return (item / 60).toFixed(1); return (item / 60).toFixed(1);
}); });
console.log(value, time, 'value');
echartsData.contrast!.div = instatus.value; echartsData.contrast!.div = instatus.value;
echartsData.contrast!.title = props.title; echartsData.contrast!.title = props.title;

View File

@ -122,8 +122,6 @@ item.box = Ebox
}; };
function setchartWH(width:any,height:any){ function setchartWH(width:any,height:any){
console.log("??????????????????????????");
echartsData.MTBF!.div=progress.value echartsData.MTBF!.div=progress.value
progress.value.style.height=height+'px' progress.value.style.height=height+'px'
progress.value.style.width=width+'px' progress.value.style.width=width+'px'

View File

@ -115,7 +115,6 @@ const router=useRouter()
let result:any = await gatdeviceStatusInfoMF({id:route.params.dev}) let result:any = await gatdeviceStatusInfoMF({id:route.params.dev})
if(result.code==200){ if(result.code==200){
console.log(result,"dadadadasdafafdsagdsgafg");
setdata(result.data) setdata(result.data)
} }
} }

View File

@ -64,8 +64,6 @@ function reset(val: any) {
} }
const box = (width: any, height: any) => { const box = (width: any, height: any) => {
console.log(width,height);
let a = calcWH(height, width, 1, 5, 0); let a = calcWH(height, width, 1, 5, 0);
// a.oHeight=a.oHeight // a.oHeight=a.oHeight

View File

@ -83,7 +83,6 @@ function getWebsocket(val){
// store.changenoise(data.msg) // store.changenoise(data.msg)
} }
if(data.type=='gatewayMF'){ if(data.type=='gatewayMF'){
console.log(data.msg);
store.changegateway(data.msg) store.changegateway(data.msg)
store.changegatewaynum(data.msg) store.changegatewaynum(data.msg)
@ -94,7 +93,7 @@ function getWebsocket(val){
// } // }
}catch(err){ }catch(err){
console.log(err);
} }
} }

View File

@ -134,8 +134,6 @@ const box = (width: any, height: any) => {
}; };
function changedevlist(val: any) { function changedevlist(val: any) {
let list = []; let list = [];
console.log(listWH.width);
val.forEach((res, index) => { val.forEach((res, index) => {
list.push([ list.push([
index + 1, index + 1,
@ -177,7 +175,6 @@ function changedevlist(val: any) {
tableref.value.changeData(tabledata.data); tableref.value.changeData(tabledata.data);
} }
function setDataList(val: any) { function setDataList(val: any) {
console.log(val);
let tipdata = { ison: 0, isall: 0, isoff: 0 }; let tipdata = { ison: 0, isall: 0, isoff: 0 };
// //
val.devnum.forEach((res) => { val.devnum.forEach((res) => {

View File

@ -73,8 +73,6 @@ const setData = (value: any) => {
} }
] ]
}; };
console.log(echartsData.equipment!.data);
change(echartsData.equipment); change(echartsData.equipment);
}; };
const change = (item: EDataPersonItem) => { const change = (item: EDataPersonItem) => {

View File

@ -139,7 +139,6 @@ const setData = (val: any) => {
change(echartsData.ismap); change(echartsData.ismap);
if (!echartsData.ismap!.box.isAddClick) { if (!echartsData.ismap!.box.isAddClick) {
echartsData.ismap!.box.on("click", (params) => { echartsData.ismap!.box.on("click", (params) => {
console.log(params.name);
if(params.name=='浙江省'||params.name=='广东省'){ if(params.name=='浙江省'||params.name=='广东省'){
router.push({ router.push({
name: "offSiteDevList", name: "offSiteDevList",

View File

@ -76,10 +76,8 @@ function setchartWH(width: any, height: any) {
refborder6.value.resetWH(); refborder6.value.resetWH();
} }
const setData = (value?: any) => { const setData = (value?: any) => {
console.log(value,"最新数据");
data=reactive([...value]) data=reactive([...value])
console.log(data);
keynum.value++; keynum.value++;
// data.value='' // data.value=''

View File

@ -102,7 +102,6 @@ let {t} = useI18n();
try{ try{
let data=JSON.parse(val) let data=JSON.parse(val)
if(data.type=='deviceStatusCountsOfOutPlant'){ if(data.type=='deviceStatusCountsOfOutPlant'){
console.log(data.msg);
data.msg.forEach(res=>{ data.msg.forEach(res=>{
if(res.deptId=='true'){ if(res.deptId=='true'){
res.name=t('messages.OnProduct') res.name=t('messages.OnProduct')

View File

@ -49,7 +49,6 @@ let props = defineProps<{
}>(); }>();
let i = ref(0) let i = ref(0)
let item = computed(() => { let item = computed(() => {
console.log(value.data[i.value]);
return value.data[i.value] || { "name": "", "val": "0", "type": "", "field": "", "ts": 0, "status": false }; return value.data[i.value] || { "name": "", "val": "0", "type": "", "field": "", "ts": 0, "status": false };
}); });
@ -57,7 +56,6 @@ let icon = computed(() => {
return value.iconname return value.iconname
}); });
let iconcolor = computed(() => { let iconcolor = computed(() => {
console.log(value.data[i.value]);
// //
if (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"; return value.data[i.value].status ? +value.data[i.value].val > +value.quota ? "icon-red" : "icon-blue" : "icon-grey";

View File

@ -261,7 +261,6 @@ function setcontentData(val){
show: true, show: true,
color:'#fff', color:'#fff',
formatter: function(params){ formatter: function(params){
console.log(params);
return params.value.toLocaleString() return params.value.toLocaleString()
}, },
position: "top", position: "top",

View File

@ -271,8 +271,6 @@ let pm_index = 0
let temp_humi_index = 0 let temp_humi_index = 0
function setcontentData(val){ function setcontentData(val){
console.log(val);
let CH2O = val.TVOC_CH2O.map((item) => { let CH2O = val.TVOC_CH2O.map((item) => {
return { name: item.name, val: item.CH2O,status:item.status }; return { name: item.name, val: item.CH2O,status:item.status };
}); });

View File

@ -219,7 +219,6 @@ function setcontentData(val){
show: true, show: true,
color:'#fff', color:'#fff',
formatter: function(params){ formatter: function(params){
console.log(params);
return params.value.toLocaleString() return params.value.toLocaleString()
}, },
position: "top", position: "top",
@ -263,7 +262,6 @@ function setcontentData(val){
show: true, show: true,
color:'#fff', color:'#fff',
formatter: function(params){ formatter: function(params){
console.log(params);
return params.value.toLocaleString() return params.value.toLocaleString()
}, },
position: "top", position: "top",

View File

@ -198,8 +198,6 @@ let {t} = useI18n();
// Productionref.value.changeData(ProductionOption.option) // Productionref.value.changeData(ProductionOption.option)
// pmref.value.setData({two:10,ten:10}) // pmref.value.setData({two:10,ten:10})
console.log(val);
pm25ref.value.setData(val.dust.pm25) pm25ref.value.setData(val.dust.pm25)
pm10ref.value.setData(val.dust.pm10) pm10ref.value.setData(val.dust.pm10)
// pmref.value.setData({two:val.dust.pm25,ten:val.dust.pm10}) // pmref.value.setData({two:val.dust.pm25,ten:val.dust.pm10})

View File

@ -53,7 +53,6 @@ watch(
() => store.DeviceSensorinfo, () => store.DeviceSensorinfo,
(newVal, oldVal) => { (newVal, oldVal) => {
//echarts //echarts
console.log(newVal, "数据2");
setdata(newVal); setdata(newVal);
}, },
{ deep: true, flush: "post" } { deep: true, flush: "post" }
@ -88,7 +87,6 @@ function reset(val: any) {
const remarksBox = (width: any, height: any) => { const remarksBox = (width: any, height: any) => {
let a = calcWH(height, width, 1, 3, 0); let a = calcWH(height, width, 1, 3, 0);
console.log(a);
// a.oHeight=a.oHeight // a.oHeight=a.oHeight
// //
@ -98,7 +96,6 @@ const remarksBox = (width: any, height: any) => {
}; };
function setdata(val: any) { function setdata(val: any) {
console.log(val.Timestamp-0);
bottomtip1.value.setData( bottomtip1.value.setData(
reactive({name:val.name,severror:val.severror,Timestamp:val.Timestamp?gettime(val.Timestamp-0):'----.--.--',Alarlmnformation:val.Alarlmnformation}) reactive({name:val.name,severror:val.severror,Timestamp:val.Timestamp?gettime(val.Timestamp-0):'----.--.--',Alarlmnformation:val.Alarlmnformation})

View File

@ -83,7 +83,6 @@ onMounted(() => {
function setchartWH(width: any, height: any) { function setchartWH(width: any, height: any) {
detailslistSize.height = height - 100 + "px"; detailslistSize.height = height - 100 + "px";
detailslistSize.width = width - 80 + "px"; detailslistSize.width = width - 80 + "px";
console.log(detailslistSize);
detailslistBoxSize.height = height-50 + "px"; detailslistBoxSize.height = height-50 + "px";
detailslistBoxSize.width = width+ "px"; detailslistBoxSize.width = width+ "px";
@ -154,7 +153,6 @@ const dvmouseleave = () => {
}; };
const dvClick = (value) => { const dvClick = (value) => {
// console.log(value.row[0]); // console.log(value.row[0]);
console.log(devList.value.dom);
}; };
defineExpose({ defineExpose({
setchartWH, setchartWH,

View File

@ -146,7 +146,6 @@ function setchartWH(width: any, height: any) {
const dvClick = (value) => { const dvClick = (value) => {
// console.log(value.row[0]); // console.log(value.row[0]);
console.log(devList.value.dom);
}; };
onMounted(() => {}); onMounted(() => {});

View File

@ -70,7 +70,6 @@ watch(
(newVal, oldVal) => { (newVal, oldVal) => {
//echarts //echarts
data.name=newVal.rackNumber data.name=newVal.rackNumber
console.log(newVal);
keynum.value++; keynum.value++;
}, },
@ -86,8 +85,6 @@ function setchartWH(width: any, height: any) {
} }
const setData = (value: any) => { const setData = (value: any) => {
console.log(data);
data = value; data = value;
keynum.value++; keynum.value++;
}; };

View File

@ -95,7 +95,6 @@ onMounted(() => {
}); });
function setchartWH(width: any, height: any) { function setchartWH(width: any, height: any) {
console.log(width,"接收到的参数");
originlistSize.height = height + "px"; originlistSize.height = height + "px";
originlistSize.width = width-50 + "px"; originlistSize.width = width-50 + "px";
@ -151,7 +150,6 @@ const dvmouseleave = () => {
}; };
const dvClick = (value) => { const dvClick = (value) => {
// console.log(value.row[0]); // console.log(value.row[0]);
console.log(devList.value.dom);
}; };
const setData = (data: any, datatitle: any) => { const setData = (data: any, datatitle: any) => {
title.value = datatitle; title.value = datatitle;

View File

@ -116,7 +116,6 @@ function reset(val: any) {
} }
function boxtop(val: any) { function boxtop(val: any) {
let a = calcWH(val.height, val.width, 1, 2, 0); let a = calcWH(val.height, val.width, 1, 2, 0);
console.log(a,"leftboxtop");
// titleRef.value.setchartWH(a.oWidth, 100); // titleRef.value.setchartWH(a.oWidth, 100);
originRef.value.setchartWH(a.oWidth-20, a.oHeight -100); originRef.value.setchartWH(a.oWidth-20, a.oHeight -100);
@ -124,7 +123,6 @@ function boxtop(val: any) {
} }
function boxbottom(val: any) { function boxbottom(val: any) {
let a = calcWH(val.height, val.width, 3, 2, 0); let a = calcWH(val.height, val.width, 3, 2, 0);
console.log(a,"boxbottom");
toptip1Ref.value.setchartWH(a.oWidth+100, a.oHeight * 3); toptip1Ref.value.setchartWH(a.oWidth+100, a.oHeight * 3);
// detailsRef.value.setchartWH(a.oWidth-20, a.oHeight); // detailsRef.value.setchartWH(a.oWidth-20, a.oHeight);
// axleRef.value.setchartWH(a.oWidth-20, a.oHeight); // axleRef.value.setchartWH(a.oWidth-20, a.oHeight);

View File

@ -111,7 +111,6 @@ let {t} = useI18n();
const title1box=(width:any,height:any)=>{ const title1box=(width:any,height:any)=>{
let a=calcWH(height,width,4,3,0) let a=calcWH(height,width,4,3,0)
console.log(a,"111");
// a.oHeight=a.oHeight // a.oHeight=a.oHeight
// //
@ -120,7 +119,6 @@ let {t} = useI18n();
} }
const detailsBox=(width:any,height:any)=>{ const detailsBox=(width:any,height:any)=>{
let a=calcWH(height,width,1,3,0) let a=calcWH(height,width,1,3,0)
console.log(a,"222");
// a.oHeight=a.oHeight // a.oHeight=a.oHeight
// //
detailsRef.value.setchartWH(a.oWidth,a.oHeight) detailsRef.value.setchartWH(a.oWidth,a.oHeight)

View File

@ -134,7 +134,6 @@ const box = (width: any, height: any) => {
}; };
function changedevlist(val: any) { function changedevlist(val: any) {
let list = []; let list = [];
console.log(listWH.width);
val.forEach((res, index) => { val.forEach((res, index) => {
list.push([ list.push([
@ -177,7 +176,6 @@ function changedevlist(val: any) {
tableref.value.changeData(tabledata.data); tableref.value.changeData(tabledata.data);
} }
function setDataList(val: any) { function setDataList(val: any) {
console.log(val);
let tipdata = { ison: 0, isall: 0, isoff: 0 }; let tipdata = { ison: 0, isall: 0, isoff: 0 };
// //
val.devnum.forEach((res) => { val.devnum.forEach((res) => {

View File

@ -325,7 +325,6 @@ echartsData.chartBox3.data={
echartsData.chartBox1.title='柱状图' echartsData.chartBox1.title='柱状图'
echartsData.chartBox2.title='折线图' echartsData.chartBox2.title='折线图'
echartsData.chartBox3.title='仪表盘' echartsData.chartBox3.title='仪表盘'
console.log(echartsData);
} }

View File

@ -112,8 +112,6 @@ let data2 = [
function changedevlist(val: any) { function changedevlist(val: any) {
let list = []; let list = [];
console.log(listWH.width);
val.forEach((res, index) => { val.forEach((res, index) => {
list.push([ list.push([
index + 1, index + 1,

View File

@ -113,7 +113,6 @@ function getWebsocket(val) {
let data = JSON.parse(val); let data = JSON.parse(val);
if (data.type == "electronicView") { if (data.type == "electronicView") {
// store.changenoise(data.msg); // store.changenoise(data.msg);
console.log(data.msg, "电控监测");
topref.value.setcontentData(data.msg); topref.value.setcontentData(data.msg);
bottomref.value.setcontentData(data.msg); bottomref.value.setcontentData(data.msg);

View File

@ -259,7 +259,6 @@ function setcontentData(val) {
let noise = val.noise.map((item) => { let noise = val.noise.map((item) => {
return { name: item.name, val: item.data, status: item.status || false }; return { name: item.name, val: item.data, status: item.status || false };
}); });
console.log(noise);
// verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"") // verticalNum3.value.setData(val.FIRE,'icon-ranqi',5,"")
verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB") verticalNum4.value.setData(noise, 'icon-shengyin', 120, "dB")

View File

@ -65,7 +65,6 @@ for(let key in res.month){
}) })
//data0 //data0
let data0=[] let data0=[]
console.log(value);
for(let i=1;i<=value.name.length;i++){ for(let i=1;i<=value.name.length;i++){
data0.push(0) data0.push(0)

View File

@ -121,7 +121,6 @@ watch(
{ deep: true, flush: "post" } { deep: true, flush: "post" }
); );
function changepowerData(val:any){ function changepowerData(val:any){
console.log(val);
let x=[] let x=[]
let y={} let y={}
@ -146,7 +145,6 @@ series.push({
} }
powerData.option.xAxis.data=x powerData.option.xAxis.data=x
powerData.option.series=series powerData.option.series=series
console.log(series);
powerhistory.value.changeData(powerData.option); powerhistory.value.changeData(powerData.option);
} }

View File

@ -66,7 +66,6 @@ let {t} = useI18n();
async function getpowerhistoryDatafun() { async function getpowerhistoryDatafun() {
let result: any = await getHistoryCurrentData(); let result: any = await getHistoryCurrentData();
if (result.code == 200) { if (result.code == 200) {
console.log(result.data);
store.setList(result.data, "power"); store.setList(result.data, "power");
} }

View File

@ -239,7 +239,6 @@ watch(
watch( watch(
() => store.powerRatio, () => store.powerRatio,
(newVal, oldVal) => { (newVal, oldVal) => {
console.log(newVal, "dfsfsdf");
if (!newVal) { if (!newVal) {
return; return;
@ -267,7 +266,6 @@ watch(
} }
option1.list[key].push(res); option1.list[key].push(res);
} else { } else {
console.log(index);
if (!option2.list[key]) { if (!option2.list[key]) {
option2.list[key] = []; option2.list[key] = [];
} }

View File

@ -81,7 +81,6 @@ async function getcurrentProductfun(){
res.month[key] = res.month[key].reverse(); res.month[key] = res.month[key].reverse();
} }
}); });
console.log(result.data);
store.setProduct(result.data) store.setProduct(result.data)
} }
} }

View File

@ -42,7 +42,6 @@ const echartsData = reactive<EDataPerson>({
}) })
const setData=(value:any)=>{ const setData=(value:any)=>{
console.log(value);
echartsData.gas!.div=gas.value echartsData.gas!.div=gas.value
echartsData.gas!.title=props.title echartsData.gas!.title=props.title

View File

@ -65,7 +65,6 @@ for(let key in res.month){
}) })
//data0 //data0
let data0=[] let data0=[]
console.log(value);
for(let i=1;i<=value.name.length;i++){ for(let i=1;i<=value.name.length;i++){
data0.push(0) data0.push(0)

View File

@ -120,7 +120,6 @@ watch(
{ deep: true, flush: "post" } { deep: true, flush: "post" }
); );
function changepowerData(val:any){ function changepowerData(val:any){
console.log(val);
let x=[] let x=[]
let y={} let y={}
@ -145,7 +144,6 @@ series.push({
} }
powerData.option.xAxis.data=x powerData.option.xAxis.data=x
powerData.option.series=series powerData.option.series=series
console.log(series);
powerhistory.value.changeData(powerData.option); powerhistory.value.changeData(powerData.option);
} }

View File

@ -64,7 +64,6 @@ const store = useenergyUseStore();
async function getpowerhistoryDatafun() { async function getpowerhistoryDatafun() {
let result: any = await getHistoryCurrentData(); let result: any = await getHistoryCurrentData();
if (result.code == 200) { if (result.code == 200) {
console.log(result.data);
store.setList(result.data, "power"); store.setList(result.data, "power");
} }

View File

@ -246,7 +246,6 @@ watch(
if(newVal.listData[key]){ if(newVal.listData[key]){
newVal.listData[key].forEach((res,index)=>{ newVal.listData[key].forEach((res,index)=>{
if(index!=storekey){ if(index!=storekey){
console.log(index);
if(!option1.list[key]){ if(!option1.list[key]){
option1.list[key]=[] option1.list[key]=[]
@ -332,7 +331,6 @@ watch(
}) })
} }
} }
console.log(option1,option2,storekey);
gasOption.option.series=series gasOption.option.series=series
gasOption2.option.series=series2 gasOption2.option.series=series2

View File

@ -185,7 +185,6 @@ watch(
if (newVal.listData[key]) { if (newVal.listData[key]) {
newVal.listData[key].forEach((res, index) => { newVal.listData[key].forEach((res, index) => {
if (index != storekey) { if (index != storekey) {
console.log(index);
if (!option1.list[key]) { if (!option1.list[key]) {
option1.list[key] = []; option1.list[key] = [];

View File

@ -124,8 +124,6 @@ change(echartsData.humiture)
const change = (item:EDataPersonItem) => { const change = (item:EDataPersonItem) => {
console.log(item);
let Ebox=proxy.$echarts.init( let Ebox=proxy.$echarts.init(
item.div, item.div,
"dark" "dark"
@ -146,7 +144,6 @@ async function getData(){
let result:any = await getHumitureData() let result:any = await getHumitureData()
if(result.code==200){ if(result.code==200){
console.log(result);
// setData(room,year,result.title) // setData(room,year,result.title)
} }

View File

@ -73,7 +73,6 @@ change(echartsData.noise)
const change = (item:EDataPersonItem) => { const change = (item:EDataPersonItem) => {
console.log(item);
let Ebox=proxy.$echarts.init( let Ebox=proxy.$echarts.init(
item.div, item.div,

View File

@ -90,8 +90,6 @@ change(echartsData.pipe)
const change = (item:EDataPersonItem) => { const change = (item:EDataPersonItem) => {
console.log(item);
let Ebox=proxy.$echarts.init( let Ebox=proxy.$echarts.init(
item.div, item.div,
"dark" "dark"

View File

@ -22,8 +22,6 @@ const echartsData = reactive<EDataPerson>({
}) })
const setData=(y:any,x:any,title:any)=>{ const setData=(y:any,x:any,title:any)=>{
console.log(x);
let series=[] let series=[]
for(let key in x){ for(let key in x){
let year =key.split('-') let year =key.split('-')

View File

@ -10,41 +10,39 @@
<template> <template>
<div class="box"> <div class="box">
<h2>{{ title }}</h2> <h2>{{ title }}</h2>
<i :class="data>quota?'iconfont '+iconname+' icon-red':'iconfont '+iconname+' icon-blue'"></i> <i :class="data > quota ? 'iconfont ' + iconname + ' icon-red' : 'iconfont ' + iconname + ' icon-blue'"></i>
<!-- <div :class="data>quota?'icon-box-red':'icon-box-blue'"> <!-- <div :class="data>quota?'icon-box-red':'icon-box-blue'">
<div :class="data>quota?'unit-red':'unit-blue'">{{ unit }}</div> <div :class="data>quota?'unit-red':'unit-blue'">{{ unit }}</div>
<div :class="data>quota?'num-red':'num-blue'">{{data}}</div> <div :class="data>quota?'num-red':'num-blue'">{{data}}</div>
</div> --> </div> -->
<!-- <p>{{ data }}</p> <!-- <p>{{ data }}</p>
<div>{{ unit }}</div> --> <div>{{ unit }}</div> -->
</div> </div>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import {onMounted, ref} from "vue" import { onMounted, ref } from "vue"
let props=defineProps<{ let props = defineProps<{
title:String, title: String,
data?:number, data?: number,
unit?:String, unit?: String,
quota?:number, quota?: number,
iconname?:String iconname?: String
}>() }>()
onMounted(() => { onMounted(() => {
console.log(props.iconname);
}) })
</script> </script>
<style module> <style module>
.container { .container {}
}
</style> </style>
<style scoped> <style scoped>
@import '@/assets/css/iconfont.css'; @import '@/assets/css/iconfont.css';
.box{
.box {
height: 100%; height: 100%;
width: 100%; width: 100%;
display: flex; display: flex;
@ -52,9 +50,11 @@ let props=defineProps<{
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
} }
h2{
h2 {
color: #fff; color: #fff;
} }
/* p{ /* p{
color: red; color: red;
font-size: 16px; font-size: 16px;
@ -64,41 +64,44 @@ div{
font-size: 16px; font-size: 16px;
margin-bottom: 20px; margin-bottom: 20px;
} */ } */
.icon-box-red{ .icon-box-red {
top: -20px; top: -20px;
height: 50%; height: 50%;
width: 80%; width: 80%;
background-color:rgba(255, 55, 55, 0.2); background-color: rgba(255, 55, 55, 0.2);
border-radius: 10%; border-radius: 10%;
/* border: 1px rgba(255, 255, 255, .3) solid; */ /* border: 1px rgba(255, 255, 255, .3) solid; */
box-shadow: 0 0 10px 2px rgba(253, 196, 196, 0.2) inset, box-shadow: 0 0 10px 2px rgba(253, 196, 196, 0.2) inset,
0 0 0px 1px rgba(255, 255, 255, .3) inset; 0 0 0px 1px rgba(255, 255, 255, .3) inset;
position: relative; position: relative;
transform-style: preserve-3d; transform-style: preserve-3d;
/* -webkit-clip-path: polygon(0% 0%, 0% 0%, 0% 0%, 100% 0%, 100% 0%, 100% 0%, 100% 85%, 85% 100%, 0% 100%, 0% 100%, 0% 100%); */ /* -webkit-clip-path: polygon(0% 0%, 0% 0%, 0% 0%, 100% 0%, 100% 0%, 100% 0%, 100% 85%, 85% 100%, 0% 100%, 0% 100%, 0% 100%); */
} }
.icon-box-red::before{
.icon-box-red::before {
position: absolute; position: absolute;
top: 3px; top: 3px;
left: 3px; left: 3px;
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 10%; border-radius: 10%;
background-color:rgba(255, 55, 55, 0.2); background-color: rgba(255, 55, 55, 0.2);
border: 1px rgba(255, 0, 0, 0.2) solid; border: 1px rgba(255, 0, 0, 0.2) solid;
content:""; content: "";
display: block; display: block;
transform: translateZ(-1px); transform: translateZ(-1px);
/* -webkit-clip-path: polygon(0% 0%, 0% 0%, 0% 0%, 100% 0%, 100% 0%, 100% 0%, 100% 87%, 87% 87%, 87% 100%, 0% 100%, 0% 100%, 0% 100%); */ /* -webkit-clip-path: polygon(0% 0%, 0% 0%, 0% 0%, 100% 0%, 100% 0%, 100% 0%, 100% 87%, 87% 87%, 87% 100%, 0% 100%, 0% 100%, 0% 100%); */
} }
.icon-red{
.icon-red {
font-size: 70px; font-size: 70px;
color: red; color: red;
position: relative; position: relative;
top: -15px; top: -15px;
} }
.num-red{
.num-red {
position: absolute; position: absolute;
right: -13%; right: -13%;
top: -15%; top: -15%;
@ -112,17 +115,18 @@ div{
color: red; color: red;
font-weight: 500; font-weight: 500;
} }
.unit-red{
.unit-red {
margin-top: -10px; margin-top: -10px;
font-size: 16px; font-size: 16px;
color: red; color: red;
} }
.icon-box-blue{ .icon-box-blue {
top: -20px; top: -20px;
height: 50%; height: 50%;
width: 80%; width: 80%;
background-color:rgba(126,191,227, 0.2); background-color: rgba(126, 191, 227, 0.2);
border-radius: 10%; border-radius: 10%;
border: 1px rgba(255, 255, 255, .3) solid; border: 1px rgba(255, 255, 255, .3) solid;
/* box-shadow: 0 0 10px 2px rgba(255, 255, 255, 0.2) inset, /* box-shadow: 0 0 10px 2px rgba(255, 255, 255, 0.2) inset,
@ -131,28 +135,31 @@ div{
transform-style: preserve-3d; transform-style: preserve-3d;
/* -webkit-clip-path: polygon(0% 0%, 0% 0%, 0% 0%, 100% 0%, 100% 0%, 100% 0%, 100% 85%, 85% 100%, 0% 100%, 0% 100%, 0% 100%); */ /* -webkit-clip-path: polygon(0% 0%, 0% 0%, 0% 0%, 100% 0%, 100% 0%, 100% 0%, 100% 85%, 85% 100%, 0% 100%, 0% 100%, 0% 100%); */
} }
.icon-box-blue::before{
.icon-box-blue::before {
position: absolute; position: absolute;
top: 3px; top: 3px;
left: 3px; left: 3px;
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 10%; border-radius: 10%;
background-color:rgba(126,191,227, 0.2); background-color: rgba(126, 191, 227, 0.2);
border: 1px rgba(0, 166, 255, 0.5) solid; border: 1px rgba(0, 166, 255, 0.5) solid;
content:""; content: "";
display: block; display: block;
transform: translateZ(-1px); transform: translateZ(-1px);
/* -webkit-clip-path: polygon(0% 0%, 0% 0%, 0% 0%, 100% 0%, 100% 0%, 100% 0%, 100% 87%, 87% 87%, 87% 100%, 0% 100%, 0% 100%, 0% 100%); */ /* -webkit-clip-path: polygon(0% 0%, 0% 0%, 0% 0%, 100% 0%, 100% 0%, 100% 0%, 100% 87%, 87% 87%, 87% 100%, 0% 100%, 0% 100%, 0% 100%); */
} }
.icon-blue{
.icon-blue {
font-size: 70px; font-size: 70px;
color: #A7A6BD; color: #A7A6BD;
position: relative; position: relative;
top: -15px; top: -15px;
} }
.num-blue{
.num-blue {
position: absolute; position: absolute;
right: -13%; right: -13%;
top: -15%; top: -15%;
@ -166,28 +173,31 @@ div{
color: #7EBFE3; color: #7EBFE3;
font-weight: 500; font-weight: 500;
} }
.unit-blue{
.unit-blue {
margin-top: -10px; margin-top: -10px;
font-size: 16px; font-size: 16px;
} }
.demo-red{ .demo-red {
position: relative; position: relative;
top: -20px; top: -20px;
height: 50%; height: 50%;
width: 80%; width: 80%;
background-color:rgba(255, 55, 55, 0.2); background-color: rgba(255, 55, 55, 0.2);
border: 5px rgba(255, 255, 255, .3) solid; border: 5px rgba(255, 255, 255, .3) solid;
border-radius: 10%; border-radius: 10%;
} }
.demo-icon-red{
.demo-icon-red {
font-size: 70px; font-size: 70px;
color: #fff; color: #fff;
font-weight: 600; font-weight: 600;
position: relative; position: relative;
top: -15px; top: -15px;
} }
.demo-blue{
.demo-blue {
position: relative; position: relative;
top: -20px; top: -20px;
height: 50%; height: 50%;
@ -195,11 +205,11 @@ div{
border: 5px #7EBFE3 solid; border: 5px #7EBFE3 solid;
border-radius: 10%; border-radius: 10%;
} }
.demo-icon-blue{
.demo-icon-blue {
font-size: 70px; font-size: 70px;
color: #7EBFE3; color: #7EBFE3;
font-weight: 600; font-weight: 600;
position: relative; position: relative;
top: -15px; top: -15px;
} }</style>
</style>

View File

@ -472,7 +472,6 @@ const setData=()=>{
* @函数备注: * @函数备注:
*/ */
const change = (item:EDataPersonItem) => { const change = (item:EDataPersonItem) => {
console.log(item);
let Ebox=proxy.$echarts.init( let Ebox=proxy.$echarts.init(
item.div, item.div,

View File

@ -39,8 +39,6 @@ let size=reactive({
oHeight:0 oHeight:0
}); });
function WH(div:HTMLElement){ function WH(div:HTMLElement){
console.log( div );
let a=calcWH(div.offsetHeight,div.offsetWidth,1,2,0) let a=calcWH(div.offsetHeight,div.offsetWidth,1,2,0)
size.oWidth=a.oWidth size.oWidth=a.oWidth
size.oHeight=a.oHeight size.oHeight=a.oHeight

View File

@ -126,7 +126,6 @@ watch(
() => store.pm, () => store.pm,
(newVal, oldVal) => { (newVal, oldVal) => {
//echarts //echarts
console.log(newVal,'最新数据');
refwelding.value.setData(newVal.welding,2) refwelding.value.setData(newVal.welding,2)
refornaments.value.setData(newVal.ornaments,2) refornaments.value.setData(newVal.ornaments,2)
refstuff.value.setData(newVal.stuff,2) refstuff.value.setData(newVal.stuff,2)
@ -158,7 +157,6 @@ async function getPmData(){
// let resultten:any = await getPmtenData() // let resultten:any = await getPmtenData()
let data=reactive({welding:{two:null,ten:null},stuff:{two:null,ten:null},ornaments:{two:null,ten:null}}) let data=reactive({welding:{two:null,ten:null},stuff:{two:null,ten:null},ornaments:{two:null,ten:null}})
Promise.all([getPmtwoDatafun(),getPmtenDatafun()]).then((res)=>{ Promise.all([getPmtwoDatafun(),getPmtenDatafun()]).then((res)=>{
console.log(res);
if(res){ if(res){
res[0].data.forEach(ele=>{ res[0].data.forEach(ele=>{
if(data[ele.enName]){ if(data[ele.enName]){

View File

@ -58,8 +58,6 @@ let size = reactive({
oHeight: 0, oHeight: 0,
}); });
function WH(div: HTMLElement) { function WH(div: HTMLElement) {
console.log(div);
let a = calcWH(div.offsetHeight, div.offsetWidth, 1, 2, 0); let a = calcWH(div.offsetHeight, div.offsetWidth, 1, 2, 0);
size.oWidth = a.oWidth; size.oWidth = a.oWidth;
size.oHeight = a.oHeight; size.oHeight = a.oHeight;

Some files were not shown because too many files have changed in this diff Show More