zhuzhuanzhuan
2023-07-06 a3c183de4e2527893bbc38e5928d189954e589d6
利用率界面增加层级之后横向滑动,固定列,扭矩配置界面多选参数修改
已修改3个文件
78 ■■■■ 文件已修改
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue
@@ -6,7 +6,7 @@
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item label="设备组" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
              <a-input-search :readOnly="true" v-decorator="['equipmentId', validatorRules.equipmentId]"
              <a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"
                              @search="deviceSearch" enter-button/>
            </a-form-item>
          </a-col>
@@ -27,7 +27,7 @@
        </a-row>
        <a-row :gutter="24">
          <a-form-item label="备注" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
            <a-input   v-decorator="['notes', validatorRules.notes]" placeholder="请输入备注"  ></a-input>
            <a-textarea   v-decorator="['notes', validatorRules.notes]" placeholder="请输入备注"  ></a-textarea>
          </a-form-item>
        </a-row>
      </a-form>
@@ -161,17 +161,17 @@
        this.endTime = dateStrings[0];
      },
      getDeviceRows(val) {
        var equipmentId;
        var equipmentIds;
        for(var i = 0;i<val.length;i++){
          if (i == 0) {
            equipmentId =  val[i].equipmentId;
            equipmentIds =  val[i].equipmentId;
          } else {
            equipmentId = equipmentId + "," + val[i].equipmentId;
            equipmentIds = equipmentIds + "," + val[i].equipmentId;
          }
        }
        // console.log("========",equipmentIds);
        this.form.setFieldsValue({
          equipmentId: equipmentId,
          equipmentIds: equipmentIds,
        })
        //   this.form.setFieldsValue({
        // equipmentId: val.equipmentId,
src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue
@@ -33,6 +33,11 @@
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-form-item label="备注" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
            <a-textarea  :disabled="disableSubmit"  v-decorator="['notes', validatorRules.notes]" placeholder="请输入备注"  ></a-textarea>
          </a-form-item>
        </a-row>
      </a-form>
    </a-spin>
    <!--<device-repair-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></device-repair-list-model>-->
@@ -223,7 +228,7 @@
        // this.editStart  = (this.model.startTime).replace(/:/g,'');
        this.visible = true
        this.$nextTick(() => {
          this.form.setFieldsValue(pick(this.model,'equipmentId', 'equipmentName','torqueDate', 'torqueValue',
          this.form.setFieldsValue(pick(this.model,'equipmentId', 'equipmentName','torqueDate', 'torqueValue','notes'
          ))
        })
      },
src/views/mdc/base/modules/efficiencyReport/EfficiencyList.vue
@@ -50,12 +50,12 @@
          <table class="dataContent table" border="1" cellspacing="0" cellpadding="0" style="white-space: nowrap">
            <thead>
            <tr class="thead fixed equipname">
              <th class="thgu dong1 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;"></th>
              <th  class="thgu dong1 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;"></th>
              <th  class="thgu dong1 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;"></th>
              <th class="thgu dong1 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备编号</th>
              <th class="thgu dong2 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备名称</th>
              <th class="thgu dong3 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备类型</th>
              <th class="thgu dong1 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
              <th  class="thgu dong2 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
              <th  class="thgu dong3 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;"></th>
              <th class="thgu dong4 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备编号</th>
              <th class="thgu dong5 name" rowspan="2" style="min-width: 150px; max-width: 150px;width: 150px;">设备名称</th>
              <th class="thgu dong6 name" rowspan="2" style="min-width: 100px; max-width: 100px;width: 100px;">设备类型</th>
              <!--<th rowspan="2">组别</th>-->
              <template v-for="(tableHead, index) in tableHeads">
                <th class="timeth" :colspan="checkedList.length">{{tableHead}}</th>
@@ -74,12 +74,12 @@
            </thead>
            <tbody>
            <tr class="mathData" v-for="(item, index) in dataList">
              <td :rowspan="item.level1span" :class="{hidden: item.level1dis}"  v-show="!item.level1dis">{{item.level1}}</td>
              <td :rowspan="item.level2span" :class="{hidden: item.level2dis}"  v-show="!item.level2dis">{{item.level2}}</td>
              <td :rowspan="item.level3span" :class="{hidden: item.level3dis}"  v-show="!item.level3dis">{{item.level3}}</td>
              <td class="tdgu  kaitou">{{item.equipmentId}}</td>
              <td  class="tdgu1 kaitou">{{item.equipmentName}}</td>
              <td  class="tdgu2 kaitou">{{item.equipmentType}}</td>
              <td  class="tdgu kaitou" :rowspan="item.level1span" :class="{hidden: item.level1dis}"  v-show="!item.level1dis">{{item.level1}}</td>
              <td  class="tdgu1 kaitou" :rowspan="item.level2span" :class="{hidden: item.level2dis}"  v-show="!item.level2dis">{{item.level2}}</td>
              <td  class="tdgu2 kaitou" :rowspan="item.level3span" :class="{hidden: item.level3dis}"  v-show="!item.level3dis">{{item.level3}}</td>
              <td  class="tdgu3  kaitou">{{item.equipmentId}}</td>
              <td  class="tdgu4 kaitou">{{item.equipmentName}}</td>
              <td  class="tdgu5 kaitou">{{item.equipmentType}}</td>
              <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">
@@ -405,12 +405,27 @@
}
.table tbody tr .tdgu1{
  position: sticky;
  left: 100px;
  left: 150px;
  z-index: 2;
}
.table tbody tr .tdgu2{
  position: sticky;
  left: 250px;
  left: 300px;
  z-index: 2;
}
.table tbody tr .tdgu3{
  position: sticky;
  left: 450px;
  z-index: 2;
}
.table tbody tr .tdgu4{
  position: sticky;
  left: 550px;
  z-index: 2;
}
.table tbody tr .tdgu5{
  position: sticky;
  left: 700px;
  z-index: 2;
}
.table2 thead tr .timeth,
@@ -434,11 +449,23 @@
}
.table2 thead .equipname .dong2{
  z-index: 5;
  left: 100px;
  left: 150px;
}
.table2 thead .equipname .dong3{
  z-index: 5;
  left: 250px;
  left: 300px;
}
.table2 thead .equipname .dong4{
  z-index: 5;
  left: 450px;
}
.table2 thead .equipname .dong5{
  z-index: 5;
  left: 550px;
}
.table2 thead .equipname .dong6{
  z-index: 5;
  left: 700px;
}
@media screen and (min-width: 1920px){