设备配置中关于部门的权限处理；设备工作日历界面的配置弹窗中的日历选中效果修改；设备日志界面的历史记录界面不显示报警信息显示的问题处理；设备日志界面的工...

zhuzhuanzhuan

2023-08-16 fe8842f9caa8ae657fabc485283bca910869b848

 src/views/mdc/base/modules/deviceLog/WorkHistoryModel.vue

@@ -44,9 +44,9 @@
                              <span v-if="item.status == 23"
                                    :style='{display: "inline-block",width:item.dateProportion,  height: "100%", background: "#19FE01",position:"absolute",bottom:"0"}'></span>
                            </div>
                            <div  v-if="item.status == 22" style="z-index: 999;"
                            <div   style="z-index: 999;"
                                  :style='{display: "inline-block",left:item.left,width:item.dateProportion,  height: "100%",position:"absolute"}'
                                  v-for="item in waring">
                                  v-for="item in info.value.waring">
                            <span
                              :style='{display: "inline-block",width:"100%", left:0, height: "68%", background: "#FD0008",position:"absolute",bottom:"0"}'></span>
                            </div>
@@ -136,21 +136,24 @@
              // console.log(tmp)
              if (tmp) {
                if (tmp.normal) {
                  for (let i = 0; i < tmp.normal.length; i++) {
                    tmp.normal[i].dateProportion = tmp.normal[i].duration / 86400 * 100 + '%'
                  for (let k = 0; k < tmp.normal.length; k++) {
                    tmp.normal[k].dateProportion = tmp.normal[k].duration / 86400 * 100 + '%'
                    // let leftTmp = (moment(tmp.normal[i].startTime, 'YYYY-MM-DD HH:mm:ss').valueOf() - 57600000) / 1000 % 86400
                    // tmp.normal[i].left = leftTmp / 86400 * 100 + '%'
                  }
                } else {
                  tmp.normal = []
                }
                /*if (tmp.waring) {
                  for (let i = 0; i < tmp.waring.length; i++) {
                    tmp.waring[i].dateProportion = tmp.waring[i].duration / 86400 * 100 + '%'
                    let leftTmp = (moment(tmp.waring[i].startTime, 'YYYY-MM-DD HH:mm:ss').valueOf() - 57600000) / 1000 % 86400
                    tmp.waring[i].left = leftTmp / 86400 * 100 + '%'
                if (tmp.waring) {
                  // console.log("测试判断")
                  for (let j = 0; j < tmp.waring.length; j++) {
                    tmp.waring[j].dateProportion = tmp.waring[j].duration / 86400 * 100 + '%'
                    let leftTmp = (moment(tmp.waring[j].startTime, 'YYYY-MM-DD HH:mm:ss').valueOf() - 57600000) / 1000 % 86400
                    tmp.waring[j].left = leftTmp / 86400 * 100 + '%'
                  }
                } else {
                  tmp.waring = []
                }*/
                }
              } else {
                res.result[i].value = { normal: [], waring: [] }
              }