From fe8842f9caa8ae657fabc485283bca910869b848 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 16 八月 2023 09:26:42 +0800
Subject: [PATCH] 设备配置中关于部门的权限处理；设备工作日历界面的配置弹窗中的日历选中效果修改；设备日志界面的历史记录界面不显示报警信息显示的问题处理；设备日志界面的工作曲线的时间的选择弹窗关闭的问题处理;设备统计分析界面的饼图的开机率关机率的问题处理;统计图表界面的样式调整
---
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue | 87 +++++++++----------------------------------
1 files changed, 18 insertions(+), 69 deletions(-)
diff --git a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
index bb315ce..cb49c1c 100644
--- a/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
+++ b/src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue
@@ -15,7 +15,7 @@
<a-row :gutter="24">
<a-col :span="24">
<a-form-item label="鐝埗" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
- <a-select v-decorator="['monShiftId', validatorRules.monShiftId]" placeholder="璇烽�夋嫨鐝埗"
+ <a-select v-decorator="['shiftId', validatorRules.shiftId]" placeholder="璇烽�夋嫨鐝埗"
:allowClear='allowClear' @change="initShiftSubList">
<a-select-option v-for="(em,index) in shiftList" :key="index" :value="em.value">
{{ em.label }}
@@ -152,10 +152,10 @@
// console.log(data); //閫変腑鏌愬ぉ
// },
changeDate(data) {
- console.log(data); //宸﹀彸鐐瑰嚮鍒囨崲鏈堜唤
+ // console.log(data); //宸﹀彸鐐瑰嚮鍒囨崲鏈堜唤
},
clickToday(data) {
- console.log(data); // 璺冲埌浜嗘湰鏈�
+ //console.log(data); // 璺冲埌浜嗘湰鏈�
},
// markChange(){
//
@@ -200,13 +200,10 @@
}
},
clickDay(today){//閫変腑鏃ユ湡
- // today = this.fun(today)
- console.log("褰撳墠閫変腑鏃ユ湡===>", today);
let existDate = this.selectDate;
let isExist = true;
for (var i = 0; i < existDate.length; i++) {
if (existDate[i].date === today) {
- console.log("褰撳墠鏃ユ湡瀛樺凡鍦�===>",today);
this.selectDate.splice(i,1);
this.shiData.splice(i,1);
this.sendDte.splice(i,1)
@@ -214,7 +211,6 @@
}
}
if (isExist) {//褰撳墠鏃ユ湡瀛樺湪绉婚櫎
- console.log("涓嶅瓨鍦�-娣诲姞===>");
let tempDate = {date: today, className: "mark1"}
// let ddd = this.fun(today)
let ddd = today
@@ -223,8 +219,6 @@
this.shiData.push(ddd)
this.sendDte.push(ccc)
}
- console.log("this.selectDate===>",JSON.stringify(this.selectDate));
- console.log(this.sendDte)
},
onSelect(value) {
console.log(value);
@@ -308,13 +302,20 @@
let formData = Object.assign(this.model, values)
formData.dateList = this.sendDte
- console.log(formData)
postAction(this.url.settingCalendar, formData).then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ // that.$message.success(res.message)
+ that.$notification.success({
+ message:'娑堟伅',
+ description:res.message
+ });
that.$emit('ok', res.result)
} else {
- that.$message.warning(res.message)
+ // that.$message.warning(res.message)
+ that.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() => {
that.confirmLoading = false
@@ -417,9 +418,11 @@
color: #000000;
}
/deep/ .mainBox .wh_content_all .wh_content_item .wh_isMark {
- color: #1890ff;
- border:1px solid #1890ff;
- border-radius: 50%;
+ /*color: #1890ff;*/
+ /*border:1px solid #1890ff;*/
+ /*border-radius: 50%;*/
+ color: #ffffff;
+ background-color: blue;
}
/deep/ .mainBox .wh_content_all .wh_content_item .wh_isToday {
/*background: #33ad53;*/
@@ -430,60 +433,6 @@
</style>
-<!--<style lang="scss">-->
-
- <!--.mark1 {-->
- <!--color: white !important;-->
- <!--background: #1890ff !important;-->
- <!--border-radius: 50%;-->
- <!--}-->
-
- <!--.mainBox {-->
- <!--.wh_content_all { /*涓讳綋*/-->
- <!--background-color: #ffffff;-->
- <!--border: 1px silver solid;-->
- <!--border-radius: 5px;-->
- <!--.wh_jiantou1{/*宸︾澶�*/-->
- <!--border-top: 2px solid #000000;-->
- <!--border-left: 2px solid #000000;-->
- <!--}-->
- <!--.wh_jiantou2{/*鍙崇澶�*/-->
- <!--border-top: 2px solid #000000;-->
- <!--border-right: 2px solid #000000;-->
- <!--}-->
- <!--.wh_top_changge li { /*褰撳墠骞存湀鏍囬*/-->
- <!--color: black;-->
- <!--}-->
- <!--.wh_content_item {-->
- <!--margin-top: 5px;-->
- <!--.wh_top_tag{/*鏄熸湡鏍囬*/-->
- <!--color: #000000;-->
- <!--}-->
- <!--.wh_item_date {/*褰撳墠鏈�*/-->
- <!--color: #000000;-->
- <!--}-->
- <!--.wh_item_date:hover { //鎮诞-->
- <!--color: #1890ff;-->
- <!--background: #ffffff;-->
- <!--border-radius: 50%;-->
- <!--}-->
- <!--.wh_other_dayhide { /*涓婃湀鍜屼笅鏈堟椂闂�*/-->
- <!--color: #bfbfbf;-->
- <!--}-->
- <!--.wh_chose_day { //閫変腑-->
- <!--background: #ffffff;-->
- <!--color: #000000;-->
- <!--}-->
- <!--.wh_isToday { /*褰撳墠澶�*/-->
- <!--/*background: #33ad53;*/-->
- <!--background: #ff4d4d;-->
- <!--color: #ffffff;-->
- <!--}-->
- <!--}-->
-
- <!--}-->
- <!--}-->
-<!--</style>-->
--
Gitblit v1.9.3