zhuzhuanzhuan
2023-07-04 bfbca619b7a499423bd8b1748f99f8105e5c0954
利用率界面接口调取,测试,扭矩配置界面绘制,设备工作日历界面bug
已添加5个文件
已修改4个文件
659 ■■■■■ 文件已修改
src/views/mdc/base/MdcEquipmentTypeList.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/Torqueconfiguration.vue 94 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationForm.vue 124 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue 230 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.Style#Drawer.vue 84 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/deviceLog/LogInfo.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue 53 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/MdcEquipmentTypeList.vue
@@ -13,10 +13,10 @@
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <a @click="handleToggleSearch" style="margin-left: 8px">
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
              </a>
              <!--<a @click="handleToggleSearch" style="margin-left: 8px">-->
                <!--{{ toggleSearchStatus ? '收起' : '展开' }}-->
                <!--<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
              <!--</a>-->
            </span>
          </a-col>
        </a-row>
@@ -166,7 +166,7 @@
          deleteBatch: "/mdc/mdcEquipmentType/deleteBatchEquipmentType",
          exportXlsUrl: "/mdcequipmenttype/mdcEquipmentType/exportXls",
          importExcelUrl: "mdcequipmenttype/mdcEquipmentType/importExcel",
        },
        dictOptions:{},
        superFieldList:[],
src/views/mdc/base/Torqueconfiguration.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,94 @@
<template>
  <a-card :bordered="false">
    <div style="width: 100%; height: 100%;overflow: hidden">
      <a-row type="flex" :gutter="16">
        <a-col :md="5" :sm="24">
          <base-tree @getCurrSelected="changeSelectionNode"></base-tree>
        </a-col>
        <a-col :md="24-5" :sm="24">
          <torqueconfiguration-list :equement="selectEquement"></torqueconfiguration-list>
        </a-col>
      </a-row>
    </div>
  </a-card>
</template>
<script>
  import { putAction,getAction } from '@/api/manage'
  import { frozenBatch } from '@/api/api'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import JInput from '@/components/jeecg/JInput'
  import BaseTree from '../common/BaseTree'
  import TorqueconfigurationList from './modules/TorqueconfigurationList/TorqueconfigurationList'
  import JSuperQuery from '@/components/jeecg/JSuperQuery'
  import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
  export default {
    name: 'Torqueconfiguration',
    components: {
      JThirdAppButton,
      JInput,
      BaseTree,
      JSuperQuery,
      TorqueconfigurationList,
    },
    data() {
      return {
        description: '扭矩配置管理页面',
        selectEquement:{},
        equipmentStatisticsInfo:{},
        url:{
          equipmentStatistics:"/mdc/equipment/equipmentStatistics"
        }
      }
    },
    created() {
    },
    methods: {
      changeSelectionNode(val){
        this.selectEquement = val
      }
    }
  }
</script>
<style scoped>
  @import '~@assets/less/common.less';
  .equipMessage {
    width: 100%;
    height: 10%;
  }
  .equipMessage table {
    width: 60%;
    height: 100%;
    line-height: 50%;
  }
  .equipMessage table td {
    text-align: center;
  }
  .equipMessage table td span {
    display: inline-block;
    width: 15px;
    height: 15px;
  }
  .equipMessage table td .equipShutdown {
    background-color: #808080;
  }
  .equipMessage table td .equipStandby {
    background-color: #ffbf37;
  }
  .equipMessage table td .equipRun {
    background-color: #19FE01;
  }
  .equipMessage table td .equipAlarm {
    background-color: #FD0008;
  }
</style>
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationForm.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,124 @@
<template>
  <a-spin :spinning="confirmLoading">
    <j-form-container :disabled="formDisabled">
      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
        <a-row>
          <a-col :span="24">
            <a-form-model-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentid">
              <a-input v-model="model.equipmentid" placeholder="请输入设备编号"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentname">
              <a-input v-model="model.equipmentname" placeholder="请输入设备名称"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="startdate">
              <j-date placeholder="请选择日期" v-model="model.startdate"  style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="扭矩值" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="torquevalue">
              <a-input v-model="model.torquevalue" placeholder="请输入扭矩值"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="notes">
              <a-input v-model="model.notes" placeholder="请输入备注"  ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>
    </j-form-container>
  </a-spin>
</template>
<script>
  import { httpAction, getAction } from '@/api/manage'
  import { validateDuplicateValue } from '@/utils/util'
  export default {
    name: 'TorqueconfigurationForm',
    components: {
    },
    props: {
      //表单禁用
      disabled: {
        type: Boolean,
        default: false,
        required: false
      }
    },
    data () {
      return {
        model:{
         },
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },
        confirmLoading: false,
        validatorRules: {
        },
        url: {
          add: "/torquec/torqueconfiguration/add",
          edit: "/torquec/torqueconfiguration/edit",
          queryById: "/torquec/torqueconfiguration/queryById"
        }
      }
    },
    computed: {
      formDisabled(){
        return this.disabled
      },
    },
    created () {
       //备份model原始值
      this.modelDefault = JSON.parse(JSON.stringify(this.model));
    },
    methods: {
      add () {
        this.edit(this.modelDefault);
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;
      },
      submitForm () {
        const that = this;
        // è§¦å‘表单验证
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
            let httpurl = '';
            let method = '';
            if(!this.model.id){
              httpurl+=this.url.add;
              method = 'post';
            }else{
              httpurl+=this.url.edit;
               method = 'put';
            }
            httpAction(httpurl,this.model,method).then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
              }
            }).finally(() => {
              that.confirmLoading = false;
            })
          }
        })
      },
    }
  }
</script>
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,230 @@
<template>
  <a-card :bordered="false">
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="设备编号">
              <a-input placeholder="请输入设备编号" v-model="queryParam.equipmentid"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="设备名称">
              <a-input placeholder="请输入设备名称" v-model="queryParam.equipmentname"></a-input>
            </a-form-item>
          </a-col>
          <template v-if="toggleSearchStatus">
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="日期">
                <j-date placeholder="请选择日期" v-model="queryParam.startdate"></j-date>
              </a-form-item>
            </a-col>
            <a-col :xl="6" :lg="7" :md="8" :sm="24">
              <a-form-item label="扭矩值">
                <a-input placeholder="请输入扭矩值" v-model="queryParam.torquevalue"></a-input>
              </a-form-item>
            </a-col>
          </template>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
              <a @click="handleToggleSearch" style="margin-left: 8px">
                {{ toggleSearchStatus ? '收起' : '展开' }}
                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
              </a>
            </span>
          </a-col>
        </a-row>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->
    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
      <a-button type="primary" icon="download" @click="handleExportXls('扭矩配置')">导出</a-button>
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
        <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
      <!-- é«˜çº§æŸ¥è¯¢åŒºåŸŸ -->
      <!--<j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
        </a-menu>
        <a-button style="margin-left: 8px"> æ‰¹é‡æ“ä½œ <a-icon type="down" /></a-button>
      </a-dropdown>
    </div>
    <!-- table区域-begin -->
    <div>
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>
      <a-table
        ref="table"
        size="middle"
        :scroll="{x:true}"
        bordered
        rowKey="id"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        class="j-table-force-nowrap"
        @change="handleTableChange">
        <!--<template slot="htmlSlot" slot-scope="text">-->
          <!--<div v-html="text"></div>-->
        <!--</template>-->
        <!--<template slot="imgSlot" slot-scope="text,record">-->
          <!--<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>-->
          <!--<img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>-->
        <!--</template>-->
        <!--<template slot="fileSlot" slot-scope="text">-->
          <!--<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
          <!--<a-button-->
            <!--v-else-->
            <!--:ghost="true"-->
            <!--type="primary"-->
            <!--icon="download"-->
            <!--size="small"-->
            <!--@click="downloadFile(text)">-->
            <!--下载-->
          <!--</a-button>-->
        <!--</template>-->
        <span slot="action" slot-scope="text, record">
          <a @click="handleEdit(record)">编辑</a>
          <a-divider type="vertical" />
          <a-dropdown>
            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
            <a-menu slot="overlay">
              <a-menu-item>
                <a @click="handleDetail(record)">详情</a>
              </a-menu-item>
              <a-menu-item>
                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
            </a-menu>
          </a-dropdown>
        </span>
      </a-table>
    </div>
    <torqueconfiguration-modal ref="modalForm" @ok="modalFormOk"></torqueconfiguration-modal>
  </a-card>
</template>
<script>
  import '@/assets/less/TableExpand.less'
  import { mixinDevice } from '@/utils/mixin'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import TorqueconfigurationModal from './TorqueconfigurationModal'
  export default {
    name: 'TorqueconfigurationList',
    mixins:[JeecgListMixin, mixinDevice],
    components: {
      TorqueconfigurationModal
    },
    data () {
      return {
        description: '扭矩配置管理页面',
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
          },
          {
            title:'设备编号',
            align:"center",
            dataIndex: 'equipmentid'
          },
          {
            title:'设备名称',
            align:"center",
            dataIndex: 'equipmentname'
          },
          {
            title:'日期',
            align:"center",
            dataIndex: 'startdate',
            customRender:function (text) {
              return !text?"":(text.length>10?text.substr(0,10):text)
            }
          },
          {
            title:'扭矩值',
            align:"center",
            dataIndex: 'torquevalue'
          },
          {
            title:'备注',
            align:"center",
            dataIndex: 'notes'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' }
          }
        ],
        url: {
          list: "/torquec/torqueconfiguration/list",
          delete: "/torquec/torqueconfiguration/delete",
          deleteBatch: "/torquec/torqueconfiguration/deleteBatch",
          exportXlsUrl: "/torquec/torqueconfiguration/exportXls",
          importExcelUrl: "torquec/torqueconfiguration/importExcel",
        },
        dictOptions:{},
        superFieldList:[],
      }
    },
    created() {
    this.getSuperFieldList();
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      },
    },
    methods: {
      initDictConfig(){
      },
      getSuperFieldList(){
        let fieldList=[];
        fieldList.push({type:'string',value:'equipmentid',text:'设备编号',dictCode:''})
        fieldList.push({type:'string',value:'equipmentname',text:'设备名称',dictCode:''})
        fieldList.push({type:'date',value:'startdate',text:'日期'})
        fieldList.push({type:'string',value:'torquevalue',text:'扭矩值',dictCode:''})
        fieldList.push({type:'string',value:'notes',text:'备注',dictCode:''})
        this.superFieldList = fieldList
      }
    }
  }
</script>
<style scoped>
  @import '~@assets/less/common.less';
</style>
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.Style#Drawer.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,84 @@
<template>
  <a-drawer
    :title="title"
    :width="width"
    placement="right"
    :closable="false"
    @close="close"
    destroyOnClose
    :visible="visible">
    <torqueconfiguration-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></torqueconfiguration-form>
    <div class="drawer-footer">
      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
    </div>
  </a-drawer>
</template>
<script>
  import TorqueconfigurationForm from './TorqueconfigurationForm'
  export default {
    name: 'TorqueconfigurationModal',
    components: {
      TorqueconfigurationForm
    },
    data () {
      return {
        title:"操作",
        width:800,
        visible: false,
        disableSubmit: false
      }
    },
    methods: {
      add () {
        this.visible=true
        this.$nextTick(()=>{
          this.$refs.realForm.add();
        })
      },
      edit (record) {
        this.visible=true
        this.$nextTick(()=>{
          this.$refs.realForm.edit(record);
        });
      },
      close () {
        this.$emit('close');
        this.visible = false;
      },
      submitCallback(){
        this.$emit('ok');
        this.visible = false;
      },
      handleOk () {
        this.$refs.realForm.submitForm();
      },
      handleCancel () {
        this.close()
      }
    }
  }
</script>
<style lang="less" scoped>
/** Button按钮间距 */
  .ant-btn {
    margin-left: 30px;
    margin-bottom: 30px;
    float: right;
  }
  .drawer-footer{
    position: absolute;
    bottom: -8px;
    width: 100%;
    border-top: 1px solid #e8e8e8;
    padding: 10px 16px;
    text-align: right;
    left: 0;
    background: #fff;
    border-radius: 0 0 2px 2px;
  }
</style>
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,60 @@
<template>
  <j-modal
    :title="title"
    :width="width"
    :visible="visible"
    switchFullscreen
    @ok="handleOk"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    @cancel="handleCancel"
    cancelText="关闭">
    <torqueconfiguration-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></torqueconfiguration-form>
  </j-modal>
</template>
<script>
  import TorqueconfigurationForm from './TorqueconfigurationForm'
  export default {
    name: 'TorqueconfigurationModal',
    components: {
      TorqueconfigurationForm
    },
    data () {
      return {
        title:'',
        width:800,
        visible: false,
        disableSubmit: false
      }
    },
    methods: {
      add () {
        this.visible=true
        this.$nextTick(()=>{
          this.$refs.realForm.add();
        })
      },
      edit (record) {
        this.visible=true
        this.$nextTick(()=>{
          this.$refs.realForm.edit(record);
        })
      },
      close () {
        this.$emit('close');
        this.visible = false;
      },
      handleOk () {
        this.$refs.realForm.submitForm();
      },
      submitCallback(){
        this.$emit('ok');
        this.visible = false;
      },
      handleCancel () {
        this.close()
      }
    }
  }
</script>
src/views/mdc/base/modules/deviceCalendar/DeviceCalendarList.vue
@@ -180,7 +180,7 @@
      },
      loadData(arg) {
        this.dataSource = [];
        if(!this.url.list){
          this.$message.error("请设置url.list属性!")
          return
src/views/mdc/base/modules/deviceLog/LogInfo.vue
@@ -389,7 +389,7 @@
              this.queryParams = {}
              // this.queryList()
              this.equipment = {}
              _this.$message.warning('请联系管理员,开发设备权限!')
              _this.$message.warning('请联系管理员,开放设备权限!')
            }
          }else{
            this.$message.warning(res.message)
src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
@@ -75,22 +75,22 @@
              <td  class="tdgu1 kaitou">{{item.equipmentName}}</td>
              <td  class="tdgu2 kaitou">{{item.equipmentType}}</td>
              <!--<td>{{item.tierType}}</td>-->
              <template v-for="(tableHead, index) in tableHeads">
                <td :style="{background:item[tableHead].color }">{{item[tableHead].lyl | numFilter}}</td>
                <td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('kjl') > -1">
                  {{item[tableHead].kjl | numFilter}}
              <template v-for="(tableHead, index) in item.dataList">
                <td :style="{background:tableHead.color }">{{tableHead.utilizationRate | numFilter}}</td>
                <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjl') > -1">
                  {{tableHead.openRate | numFilter}}
                </td>
                <td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('kjsj') > -1">
                  {{item[tableHead].kjsj}}
                <td :style="{background:tableHead.color }" v-if="checkedList.indexOf('kjsj') > -1">
                  {{tableHead.openLong}}
                </td>
                <td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('jgsj') > -1">
                  {{item[tableHead].jgsj}}
                <td :style="{background:tableHead.color }"  v-if="checkedList.indexOf('jgsj') > -1">
                  {{tableHead.processLong}}
                </td>
                <td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('djsj') > -1">
                  {{item[tableHead].djsj}}
                <td :style="{background:tableHead.color }"  v-if="checkedList.indexOf('djsj') > -1">
                  {{tableHead.waitLong}}
                </td>
                <td :style="{background:item[tableHead].color }" v-if="checkedList.indexOf('gjsj') > -1">
                  {{item[tableHead].gjsj}}
                <td :style="{background:tableHead.color }"  v-if="checkedList.indexOf('gjsj') > -1">
                  {{tableHead.closeLong}}
                </td>
              </template>
            </tr>
@@ -158,24 +158,24 @@
    },
    nodeTree(val) { //监听currSelected å˜åŒ–,将变化后的数值传递给 getCurrSelected äº‹ä»¶
      if (JSON.stringify(val) != '{}') {
        if (val.entity.equipmentId) {
        if (val.equipmentId != null) {
          this.queryParamEquip.parentId = ''
          this.queryParamEquip.equipmentIds = val.entity.equipmentId
          this.queryParamEquip.equipmentId = val.equipmentId
        } else {
          this.queryParamEquip.parentId = val.entity.id
          this.queryParamEquip.equipmentIds = ''
          this.queryParamEquip.parentId = val.key
          this.queryParamEquip.equipmentId = ''
        }
        this.searchQuery()
      }
    },
    nodePeople(val){
      if (JSON.stringify(val) != '{}') {
        if (val.entity.equipmentId) {
          this.queryParamPeople.parentId = val.entity.equipmentId
          this.queryParamPeople.equipmentIds = ''
        if (val.equipmentId != null) {
          this.queryParamPeople.parentId = val.equipmentId
          this.queryParamPeople.equipmentId = ''
        } else {
          this.queryParamPeople.parentId = val.entity.id
          this.queryParamPeople.equipmentIds = ''
          this.queryParamPeople.parentId = val.key
          this.queryParamPeople.equipmentId = ''
        }
        this.searchQuery()
      }
@@ -253,16 +253,14 @@
      this.checkedList = checkedList
    },
    searchQuery() {
      // console.log(this.queryParam.typeTree);
      // console.log(this.queryParams.parentId);
      if(this.queryParam.typeTree == "1"){
        // this.queryParam.TreeIDTwo = ""
        this.queryParam.parentId =  this.queryParamEquip.parentId
        this.queryParam.equipmentIds = this.queryParamEquip.equipmentIds
        this.queryParam.equipmentId = this.queryParamEquip.equipmentId
      }else{
        // this.queryParam.TreeIDOne = ""
        this.queryParam.parentId = this.queryParamPeople.parentId
        this.queryParam.equipmentIds = ""
        this.queryParam.equipmentId = ""
      }
      this.loadData()
      // this.onClearSelected()
@@ -278,11 +276,12 @@
      // this.onClearSelected()
    },
    loadData() {
      // console.log(this.queryParam)
      this.tableHeads = []
      this.dataList = []
      getAction(this.url.list, this.queryParam).then(res => {
        if (res.success) {
          this.tableHeads = res.result.dates
          this.dataList = res.result.list
          this.dataList = res.result.mdcEfficiencyList
          this.initDeviceType(this.dataList)
        }
      })