Merge remote-tracking branch 'origin/master'

psdc-ui/src/views/bigview/index.vue

@@ -144,39 +144,39 @@ function getWenduFun(){
 
 /**运行设备工作信息*/
 //蓄热锅炉运行数据
-const xrglRunStatus = ref()
-const xrglThermometerValueIn = ref()
-const xrglThermometerValueOut = ref()
-const xrglTodayUseEnergy = ref()
+const xrglRunStatus = ref('--')
+const xrglThermometerValueIn = ref('--')
+const xrglThermometerValueOut = ref('--')
+const xrglTodayUseEnergy = ref('--')
 //蓄热锅炉折线图数据
 const xrglTimeList = ref([]);
 const xrglTempInTodayList = ref([]);
 const xrglTempOutTodayList = ref([]);
 
 //电磁锅炉运行数据
-const dcglRunStatus = ref()
-const dcglThermometerValueIn = ref()
-const dcglThermometerValueOut = ref()
-const dcglTodayUseEnergy = ref()
+const dcglRunStatus = ref('--')
+const dcglThermometerValueIn = ref('--')
+const dcglThermometerValueOut = ref('--')
+const dcglTodayUseEnergy = ref('--')
 //电磁锅炉折线图数据
 const dcglTimeList = ref([]);
 const dcglTempInTodayList = ref([]);
 const dcglTempOutTodayList = ref([]);
 
 //空气源热泵运行数据
-const kqyrbRunStatus = ref()
-const kqyrbThermometerValueIn = ref()
-const kqyrbThermometerValueOut = ref()
-const kqyrbTodayUseEnergy = ref()
+const kqyrbRunStatus = ref('--')
+const kqyrbThermometerValueIn = ref('--')
+const kqyrbThermometerValueOut = ref('--')
+const kqyrbTodayUseEnergy = ref('--')
 //空气源热泵折线图数据
 const kqyrbTimeList = ref([]);
 const kqyrbTempInTodayList = ref([]);
 const kqyrbTempOutTodayList = ref([]);
 
 //发热电缆运行数据
-const frdlRunStatus = ref()
-const frdlThermometerValueNow = ref()
-const frdlTodayUseEnergy = ref()
+const frdlRunStatus = ref('--')
+const frdlThermometerValueNow = ref('--')
+const frdlTodayUseEnergy = ref('--')
 //发热电缆折线图数据
 const frdlTimeList = ref([]);
 const frdlTempTodayList = ref([]);
@@ -614,8 +614,8 @@ function frdlChartFun(){
 };
 
 /**总电表信息*/
-const nowPower = ref()
-const nowEle = ref()
+const nowPower = ref('--')
+const nowEle = ref('--')
 const todayUsePowersArr = [];
 function getZdbFun(){
   getZdb(13).then((res)=>{

psdc-ui/src/views/system/user/profile/index.vue

@@ -147,6 +147,19 @@ getUser();
 
 <style lang="scss" scoped>
 ::v-deep .el-form-item__label{
-  color: #606266 !important;
+  color: #bfcbd9 !important;
+}
+::v-deep .el-card {
+  color: #bfcbd9;
+  background-color: #2F3D8A;
+  border: none;
+  height: 100%;
+}
+::v-deep .el-card__header{
+  background-color: #374590;
+  border: none;
+}
+::v-deep .list-group-item{
+  border: none;
 }
 </style>