diff --git a/psdc-ui/src/assets/font/ds-digi-webfont.woff b/psdc-ui/src/assets/font/ds-digi-webfont.woff
new file mode 100644
index 0000000..fc4c4c2
Binary files /dev/null and b/psdc-ui/src/assets/font/ds-digi-webfont.woff differ
diff --git a/psdc-ui/src/assets/font/ds-digi-webfont.woff2 b/psdc-ui/src/assets/font/ds-digi-webfont.woff2
new file mode 100644
index 0000000..b2616b4
Binary files /dev/null and b/psdc-ui/src/assets/font/ds-digi-webfont.woff2 differ
diff --git a/psdc-ui/src/assets/font/ds-digib-webfont.woff b/psdc-ui/src/assets/font/ds-digib-webfont.woff
new file mode 100644
index 0000000..cb3aff1
Binary files /dev/null and b/psdc-ui/src/assets/font/ds-digib-webfont.woff differ
diff --git a/psdc-ui/src/assets/font/ds-digib-webfont.woff2 b/psdc-ui/src/assets/font/ds-digib-webfont.woff2
new file mode 100644
index 0000000..48bd5f6
Binary files /dev/null and b/psdc-ui/src/assets/font/ds-digib-webfont.woff2 differ
diff --git a/psdc-ui/src/assets/font/ds-digii-webfont.woff b/psdc-ui/src/assets/font/ds-digii-webfont.woff
new file mode 100644
index 0000000..4a3c3fb
Binary files /dev/null and b/psdc-ui/src/assets/font/ds-digii-webfont.woff differ
diff --git a/psdc-ui/src/assets/font/ds-digii-webfont.woff2 b/psdc-ui/src/assets/font/ds-digii-webfont.woff2
new file mode 100644
index 0000000..e33a526
Binary files /dev/null and b/psdc-ui/src/assets/font/ds-digii-webfont.woff2 differ
diff --git a/psdc-ui/src/assets/font/stylesheet.css b/psdc-ui/src/assets/font/stylesheet.css
new file mode 100644
index 0000000..e92a388
--- /dev/null
+++ b/psdc-ui/src/assets/font/stylesheet.css
@@ -0,0 +1,60 @@
+/*! Generated by Font Squirrel (https://www.fontsquirrel.com) on June 4, 2023 */
+
+
+
+@font-face {
+ font-family: 'ds-digitalnormal';
+ src: url('ds-digi-webfont.woff2') format('woff2'),
+ url('ds-digi-webfont.woff') format('woff');
+ font-weight: normal;
+ font-style: normal;
+
+}
+
+
+
+
+@font-face {
+ font-family: 'ds-digitalbold';
+ src: url('ds-digib-webfont.woff2') format('woff2'),
+ url('ds-digib-webfont.woff') format('woff');
+ font-weight: normal;
+ font-style: normal;
+
+}
+
+
+
+
+@font-face {
+ font-family: 'ds-digitalitalic';
+ src: url('ds-digii-webfont.woff2') format('woff2'),
+ url('ds-digii-webfont.woff') format('woff');
+ font-weight: normal;
+ font-style: normal;
+
+}
+
+
+
+
+@font-face {
+ font-family: 'ds-digitalbold_italic';
+ src: url('ds-digit-webfont.woff2') format('woff2'),
+ url('ds-digit-webfont.woff') format('woff');
+ font-weight: normal;
+ font-style: normal;
+
+}
+
+
+
+
+@font-face {
+ font-family: 'ds-digitalnormal';
+ src: url('ds-digi-webfont.woff2') format('woff2'),
+ url('ds-digi-webfont.woff') format('woff');
+ font-weight: normal;
+ font-style: normal;
+
+}
\ No newline at end of file
diff --git a/psdc-ui/src/assets/images/dcgl(1).png b/psdc-ui/src/assets/images/dcgl(1).png
new file mode 100644
index 0000000..df56a4d
Binary files /dev/null and b/psdc-ui/src/assets/images/dcgl(1).png differ
diff --git a/psdc-ui/src/assets/images/发热电缆(1).png b/psdc-ui/src/assets/images/发热电缆(1).png
new file mode 100644
index 0000000..da1f751
Binary files /dev/null and b/psdc-ui/src/assets/images/发热电缆(1).png differ
diff --git a/psdc-ui/src/assets/images/空气源热泵(1).png b/psdc-ui/src/assets/images/空气源热泵(1).png
new file mode 100644
index 0000000..5c68853
Binary files /dev/null and b/psdc-ui/src/assets/images/空气源热泵(1).png differ
diff --git a/psdc-ui/src/assets/images/蓄热锅炉(1).png b/psdc-ui/src/assets/images/蓄热锅炉(1).png
new file mode 100644
index 0000000..1202dba
Binary files /dev/null and b/psdc-ui/src/assets/images/蓄热锅炉(1).png differ
diff --git a/psdc-ui/src/views/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue
index 759176d..62b80b4 100644
--- a/psdc-ui/src/views/bigview/index.vue
+++ b/psdc-ui/src/views/bigview/index.vue
@@ -44,15 +44,15 @@
-
{{ nowPower }}kW
+
{{ nowPower }}kW
当前功率
-
+
-
{{ nowEle }}kWh
+
{{ nowEle }}kWh
总用电量
@@ -66,7 +66,7 @@
{{ item.deviceName }}
-
{{ item.deviceTemp}}℃
+
{{ item.deviceTemp}}℃
@@ -258,12 +258,27 @@ function dcglChartFun(){
data: ["进水温度","出水温度"],
// selectedMode: 'single',
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
tooltip: {
trigger: "axis",
- // formatter: "{b0}： {c0}℃",
+ formatter: function(params) {
+ var result = params[0].name + '
'; // 获取横轴数据项名称
+ for (var i = 0; i < params.length; i++) {
+ var seriesName = params[i].seriesName; // 获取系列名称
+ var value = params[i].value; // 获取数据值
+ // result += seriesName + ': ' + ''+value+'' + '℃
'; // 拼接字符串
+ if (i === 0) { // 第一个系列名称设置为蓝色
+ result += '' + ''+seriesName+'' + ' ' + ''+value+'' + '℃
';
+ } else if (i === 1) { // 第二个系列名称设置为黄色
+ result += '' + ''+seriesName+'' + ' ' + ''+value+'' + '℃
';
+ } else { // 其他系列名称使用默认颜色
+ result += seriesName + ': ' + value + ' m/s
';
+ }
+ }
+ return result;
+ },
// borderColor: '#00fcff',
borderWidth: 1
},
@@ -273,7 +288,7 @@ function dcglChartFun(){
bottom:'15%',
left:'10%',
right:'3%',
- borderWidth: 1,
+ borderWidth: 0,
borderColor: '#767da1',
},
xAxis: {
@@ -281,7 +296,7 @@ function dcglChartFun(){
data: dcglTimeList.value,
axisLabel: {
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
axisLine: {
@@ -290,10 +305,10 @@ function dcglChartFun(){
}
},
axisTick: {
- show: false // 去掉x轴刻度
+ show: true // 去掉x轴刻度
},
splitArea: {
- show: true,
+ show: false,
interval:0,
areaStyle: {
color: ['rgb(54,68,148,.8)', 'rgb(37,51,133,.8)'] //这里重点，用于设置颜色的数组，
@@ -305,17 +320,17 @@ function dcglChartFun(){
type: 'value',
name:'℃',
nameTextStyle: {
- color: "#f3ffff",
+ color: "#b6bee7",
nameLocation: "start"
},
axisLabel: {
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
splitLine: {
show: true,
- lineStyle: {color: "#767da1", type: "solid"} //dashed
+ lineStyle: {color: "#767da1", type: "dashed"} //dashed
} //s是否显示为虚线的条纹背景
},
series: [
@@ -351,12 +366,27 @@ function xrglChartFun(){
data: ["进水温度","出水温度"],
// selectedMode: 'single',
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
tooltip: {
trigger: "axis",
- // formatter: "{b0}： {c0}℃",
+ formatter: function(params) {
+ var result = params[0].name + '
'; // 获取横轴数据项名称
+ for (var i = 0; i < params.length; i++) {
+ var seriesName = params[i].seriesName; // 获取系列名称
+ var value = params[i].value; // 获取数据值
+ // result += seriesName + ': ' + ''+value+'' + '℃
'; // 拼接字符串
+ if (i === 0) { // 第一个系列名称设置为蓝色
+ result += '' + ''+seriesName+'' + ' ' + ''+value+'' + '℃
';
+ } else if (i === 1) { // 第二个系列名称设置为黄色
+ result += '' + ''+seriesName+'' + ' ' + ''+value+'' + '℃
';
+ } else { // 其他系列名称使用默认颜色
+ result += seriesName + ': ' + value + ' m/s
';
+ }
+ }
+ return result;
+ },
// borderColor: '#00fcff',
borderWidth: 1
},
@@ -366,7 +396,7 @@ function xrglChartFun(){
bottom:'15%',
left:'10%',
right:'3%',
- borderWidth: 1,
+ borderWidth: 0,
borderColor: '#767da1',
},
xAxis: {
@@ -374,7 +404,7 @@ function xrglChartFun(){
data: xrglTimeList.value,
axisLabel: {
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
axisLine: {
@@ -383,10 +413,10 @@ function xrglChartFun(){
}
},
axisTick: {
- show: false // 去掉x轴刻度
+ show: true // 去掉x轴刻度
},
splitArea: {
- show: true,
+ show: false,
interval:0,
areaStyle: {
color: ['rgb(54,68,148,.8)', 'rgb(37,51,133,.8)'] //这里重点，用于设置颜色的数组，
@@ -398,17 +428,17 @@ function xrglChartFun(){
type: 'value',
name:'℃',
nameTextStyle: {
- color: "#f3ffff",
+ color: "#b6bee7",
nameLocation: "start"
},
axisLabel: {
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
splitLine: {
show: true,
- lineStyle: {color: "#767da1", type: "solid"} //dashed
+ lineStyle: {color: "#767da1", type: "dashed"} //dashed
} //s是否显示为虚线的条纹背景
},
series: [
@@ -444,12 +474,27 @@ function kqyrbChartFun(){
data: ["进水温度","出水温度"],
// selectedMode: 'single',
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
tooltip: {
trigger: "axis",
- // formatter: "{b0}： {c0}℃",
+ formatter: function(params) {
+ var result = params[0].name + '
'; // 获取横轴数据项名称
+ for (var i = 0; i < params.length; i++) {
+ var seriesName = params[i].seriesName; // 获取系列名称
+ var value = params[i].value; // 获取数据值
+ // result += seriesName + ': ' + ''+value+'' + '℃
'; // 拼接字符串
+ if (i === 0) { // 第一个系列名称设置为蓝色
+ result += '' + ''+seriesName+'' + ' ' + ''+value+'' + '℃
';
+ } else if (i === 1) { // 第二个系列名称设置为黄色
+ result += '' + ''+seriesName+'' + ' ' + ''+value+'' + '℃
';
+ } else { // 其他系列名称使用默认颜色
+ result += seriesName + ': ' + value + ' m/s
';
+ }
+ }
+ return result;
+ },
// borderColor: '#00fcff',
borderWidth: 1
},
@@ -459,7 +504,7 @@ function kqyrbChartFun(){
bottom:'15%',
left:'10%',
right:'3%',
- borderWidth: 1,
+ borderWidth: 0,
borderColor: '#767da1',
},
xAxis: {
@@ -467,7 +512,7 @@ function kqyrbChartFun(){
data: kqyrbTimeList.value,
axisLabel: {
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
axisLine: {
@@ -476,10 +521,10 @@ function kqyrbChartFun(){
}
},
axisTick: {
- show: false // 去掉x轴刻度
+ show: true // 去掉x轴刻度
},
splitArea: {
- show: true,
+ show: false,
interval:0,
areaStyle: {
color: ['rgb(54,68,148,.8)', 'rgb(37,51,133,.8)'] //这里重点，用于设置颜色的数组，
@@ -491,17 +536,17 @@ function kqyrbChartFun(){
type: 'value',
name:'℃',
nameTextStyle: {
- color: "#f3ffff",
+ color: "#b6bee7",
nameLocation: "start"
},
axisLabel: {
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
splitLine: {
show: true,
- lineStyle: {color: "#767da1", type: "solid"} //dashed
+ lineStyle: {color: "#767da1", type: "dashed"} //dashed
} //s是否显示为虚线的条纹背景
},
series: [
@@ -537,12 +582,27 @@ function frdlChartFun(){
data: ["当前温度"],
// selectedMode: 'single',
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
tooltip: {
trigger: "axis",
- // formatter: "{b0}： {c0}℃",
+ formatter: function(params) {
+ var result = params[0].name + '
'; // 获取横轴数据项名称
+ for (var i = 0; i < params.length; i++) {
+ var seriesName = params[i].seriesName; // 获取系列名称
+ var value = params[i].value; // 获取数据值
+ // result += seriesName + ': ' + ''+value+'' + '℃
'; // 拼接字符串
+ if (i === 0) { // 第一个系列名称设置为蓝色
+ result += '' + ''+seriesName+'' + ' ' + ''+value+'' + '℃
';
+ } else if (i === 1) { // 第二个系列名称设置为黄色
+ result += '' + ''+seriesName+'' + ' ' + ''+value+'' + '℃
';
+ } else { // 其他系列名称使用默认颜色
+ result += seriesName + ': ' + value + ' m/s
';
+ }
+ }
+ return result;
+ },
// borderColor: '#00fcff',
borderWidth: 1
},
@@ -552,7 +612,7 @@ function frdlChartFun(){
bottom:'15%',
left:'10%',
right:'3%',
- borderWidth: 1,
+ borderWidth: 0,
borderColor: '#767da1',
},
xAxis: {
@@ -560,7 +620,7 @@ function frdlChartFun(){
data: frdlTimeList.value,
axisLabel: {
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
axisLine: {
@@ -569,10 +629,10 @@ function frdlChartFun(){
}
},
axisTick: {
- show: false // 去掉x轴刻度
+ show: true // 去掉x轴刻度
},
splitArea: {
- show: true,
+ show: false,
interval:0,
areaStyle: {
color: ['rgb(54,68,148,.8)', 'rgb(37,51,133,.8)'] //这里重点，用于设置颜色的数组，
@@ -584,17 +644,17 @@ function frdlChartFun(){
type: 'value',
name:'℃',
nameTextStyle: {
- color: "#f3ffff",
+ color: "#b6bee7",
nameLocation: "start"
},
axisLabel: {
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
splitLine: {
show: true,
- lineStyle: {color: "#767da1", type: "solid"} //dashed
+ lineStyle: {color: "#767da1", type: "dashed"} //dashed
} //s是否显示为虚线的条纹背景
},
series: [
@@ -640,12 +700,21 @@ function dqglChartFun(){
data: ["当前功率"],
// selectedMode: 'single',
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
tooltip: {
trigger: "axis",
- formatter: "{b0}： {c0}kW",
+ // formatter: "{b0}： {c0}kW",
+ formatter: function(params) {
+ var result = params[0].name + '
'; // 获取横轴数据项名称
+ for (var i = 0; i < params.length; i++) {
+ var seriesName = params[i].seriesName; // 获取系列名称
+ var value = params[i].value; // 获取数据值
+ result += '' + ''+seriesName+'' + ' ' + ''+value+'' + 'kW
';
+ }
+ return result;
+ },
// borderColor: '#00fcff',
borderWidth: 1
},
@@ -655,7 +724,7 @@ function dqglChartFun(){
bottom:'15%',
left:'10%',
right:'3%',
- borderWidth: 1,
+ borderWidth: 0,
borderColor: '#767da1',
},
xAxis: {
@@ -687,7 +756,7 @@ function dqglChartFun(){
"23:15", "23:30", "23:45",],
axisLabel: {
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
axisLine: {
@@ -696,10 +765,10 @@ function dqglChartFun(){
}
},
axisTick: {
- show: false // 去掉x轴刻度
+ show: true // 去掉x轴刻度
},
splitArea: {
- show: true,
+ show: false,
interval:0,
areaStyle: {
color: ['rgb(54,68,148,.8)', 'rgb(37,51,133,.8)'] //这里重点，用于设置颜色的数组，
@@ -711,17 +780,17 @@ function dqglChartFun(){
type: 'value',
name:'kW',
nameTextStyle: {
- color: "#f3ffff",
+ color: "#b6bee7",
nameLocation: "start"
},
axisLabel: {
textStyle: {
- color: "#f3ffff"
+ color: "#b6bee7"
}
},
splitLine: {
show: true,
- lineStyle: {color: "#767da1", type: "solid"} //dashed
+ lineStyle: {color: "#767da1", type: "dashed"} //dashed
} //是否显示为虚线的条纹
},
series: [
@@ -764,6 +833,7 @@ onBeforeUnmount(() => {