1、全局修改密码弹窗中的新密码校验长度与数据字典password_length设置保持一致 2、报警分析页面优化过快点击多次表格行时图表内容出现数据残...

zhuzhuanzhuan

2023-12-08 1e1e70da5288f47d8770ba2e7f22f3362e5b577c

 src/views/mdc/base/modules/alarmAnalysis/alarmAnalysisMain.vue

@@ -58,7 +58,8 @@
          <!--</div>-->
          <a-table :columns="columns" :data-source="dataList" bordered :pagination="false" :scroll="{y:168}"
                   :customRow="customRow"
                   rowKey="alarmCode">
                   rowKey="alarmCode"
          >
            <span slot="timeCount" slot-scope="text">{{getFormattedTime(text)}}</span>
            <!--<a-table-->
              <!--slot="expandedRowRender"-->
@@ -66,15 +67,19 @@
              <!--:columns="innerColumns"-->
              <!--:data-source="row.innerDataList"-->
              <!--:pagination="false"-->
              <!--rowKey="equipmentId"-->
            <!--&gt;-->
              <!--<span slot="duration" slot-scope="text">{{getFormattedTime(text)}}</span>-->
            <!--</a-table>-->
          </a-table>
        </div>
        <div style="width: 100%;height: 55%;display: flex;">
          <div id="MdcEquipmentWarningPie" style="height: 100%;width: 35%;"></div>
          <div id="MdcEquipmentWarningLine" style="height: 100%;width: 65%;"></div>
        </div>

        <a-spin :spinning="spinning">
          <div style="width: 100%;height: 100%;display: flex;">
            <div id="MdcEquipmentWarningPie" style="height: 100%;width: 35%;"></div>
            <div id="MdcEquipmentWarningLine" style="height: 100%;width: 65%;"></div>
          </div>
        </a-spin>
      </div>
    </div>
  </div>
@@ -126,6 +131,7 @@
        dataSource: [],
        /* table加载状态 */
        loading: false,
        spinning:false,
        typeTree: '',
        typeParent: 1,
        typeEquipment: 1,
@@ -226,23 +232,21 @@
      },
      TableDraw(key, val) {
        let that = this
        that.spinning=true
        that.queryParam.alarmCode = val.alarmCode
        console.log(this.queryParam)
        that.pieDate = []
        that.XData = []
        that.YData = []
        getAction(that.url.alarmTrend, that.queryParam).then(res => {
        getAction(that.url.alarmTrend, that.queryParam)
          .then(res => {
          if (res.success) {
            for (var i = 0; i < res.result.equipmentCountList.length; i++) {
              that.pieDate.push({
                name: res.result.equipmentCountList[i].key,
                value: res.result.equipmentCountList[i].count
              })
            }
            for (var j = 0; j < res.result.dateCountList.length; j++) {
              that.XData.push(res.result.dateCountList[j].key)
              that.YData.push(res.result.dateCountList[j].count)
            }
            that.pieDate=res.result.equipmentCountList.map(item=>{
              return {
                name:item.key,
                value:item.count
              }
            })
            that.XData=res.result.dateCountList.map(item=>item.key)
            that.YData=res.result.dateCountList.map(item=>item.count)

            // this.tableHeads = res.result.dates
            // this.dataList = res.result
            // this.draw()
@@ -254,6 +258,9 @@
            that.drawWrin()
          }
        })
          .finally(()=>{
            that.spinning=false
          })
        console.log(this.YData)

      },
@@ -387,15 +394,31 @@
          if (res.success) {
            // this.tableHeads = res.result.dates
            this.dataList = res.result
            this.dataList.forEach(item => item.innerDataList = [
            this.dataList[0].innerDataList=[
              {
                equipmentId: '11234',
                equipmentName: '立体机床',
                alarmTime: 20,
                endTime: 20,
                duration: 123
              },
              {
                equipmentId: '4213',
                equipmentName: '卧室机床',
                alarmTime: 312,
                endTime: 31,
                duration: 421
              }
            ])
            ]
            this.dataList[1].innerDataList=[
              {
                equipmentId: '4213',
                equipmentName: '卧室机床',
                alarmTime: 312,
                endTime: 31,
                duration: 421
              }
            ]
            // this.draw()
            // this.checkSameData(this.dataList)
            // this.checkSameData1(this.dataList)
@@ -521,23 +544,26 @@
      /**
       * 格式化时间
       * @param seconds 秒数
       * @returns 格式化后时间字符串
       * @returns '' 格式化后时间字符串
       */
      getFormattedTime(seconds) {
        var hours = Math.floor(seconds / 3600)
        var minutes = Math.floor((seconds % 3600) / 60)
        var secs = seconds % 60

        if (hours == 0) {
          if (minutes == 0) {
            return `${secs}秒`
        if (hours === 0) {
          if (minutes === 0 ) {
            return secs === 0 ? 0 : `${secs}秒`
          } else {
            if(secs=== 0 ){
              return `${minutes}分`
            }
            return `${minutes}分 ${secs}秒`
          }
        } else {
          if (minutes == 0 && secs == 0) {
          if (minutes === 0 && secs === 0) {
            return `${hours}小时`
          } else if (minutes != 0 && secs == 0) {
          } else if (minutes !== 0 && secs === 0) {
            return `${hours}小时 ${minutes}分`
          }
        }
@@ -553,10 +579,37 @@
      customRow(record, index) {
        return {
          on: {
            click: () => {
              this.TableDraw(index, record)
            click: (event) => {
              // 如果点击的不是展开图标区域则渲染图表，相反则相当于点击展开图标
              if(event.target.className !== 'ant-table-row-expand-icon-cell'){
                this.TableDraw(index, record)
              }else{
                if(event.target.children && event.target.children.length>0) event.target.children[0].click()
              }
            }
          }
        }
      },

      /**
       * 自定义展开表格图标
       * @param props 图标属性
       * @returns {null} 若主表数据下无数据则不显示图标
       */
      expandIcon(props){
        console.log('props',props)
        if (props.record.innerDataList&&props.record.innerDataList.length>0){
          if (props.expanded) {
            return <a style="margin-right:0px;color:#999" onClick={e=> {
              props.onExpand(props.record, e);
            }}><a-icon type="minus" /></a>
          } else{
            return <a style="margin-right:0px;color:#999" onClick={e => {
              props.onExpand(props.record, e);
            }}><a-icon type="plus"/></a>
          }
        }else{
          return null
        }
      }
    }
@@ -781,4 +834,13 @@
    padding-bottom: 10px;
    cursor: pointer;
  }

  /deep/ .ant-spin-nested-loading{
    height: 55%;
  }

  /deep/ .ant-spin-container{
    height: 100%;
  }

</style>