1、优化数据报表模块页面布局 2、修复因时间选择器的showTime属性导致的布局混乱 3、删除假期管理页面中重复的导出按钮组件

zhuzhuanzhuan

2023-09-21 a1ff69f228b7a0d08959e6b25eff2dac6085df8d

1、优化数据报表模块页面布局
2、修复因时间选择器的showTime属性导致的布局混乱
3、删除假期管理页面中重复的导出按钮组件

 src/main.js

@@ -93,6 +93,9 @@
  new Vue({
    router,
    store,
    beforeCreate() {
      Vue.prototype.$bus = new Vue()
    },
    mounted () {
      store.commit('SET_SIDEBAR_TYPE', Vue.ls.get(SIDEBAR_TYPE, true))
      store.commit('TOGGLE_THEME', Vue.ls.get(DEFAULT_THEME, config.navTheme))

 src/mixins/JeecgListMixin.js

@@ -81,11 +81,10 @@
        this.ipagination.current = 1;
      }
      var params = this.getQueryParams();//查询条件

      console.log('params',params)
      if(!params){
        return false;
      }

      this.loading = true;
      getAction(this.url.list, params).then((res) => {
        if (res.success) {

 src/views/mdc/base/MdcDriveTypeParamConfigList.vue

@@ -60,11 +60,15 @@
              :sm="24"
            >
              <a-form-item label="显示标志">
                <j-switch
                  placeholder="请选择显示标志"
                  v-model="queryParam.showFlag"
                  query
                ></j-switch>
                <!--<j-switch-->
                  <!--placeholder="请选择显示标志"-->
                  <!--v-model="queryParam.showFlag"-->
                  <!--query-->
                <!--&gt;</j-switch>-->
                <a-select v-model='queryParam.showFlag' placeholder="请选择显示标志">
                  <a-select-option  value="Y">是</a-select-option>
                  <a-select-option value="N">否</a-select-option>
                </a-select>
              </a-form-item>
            </a-col>
            <a-col
@@ -74,11 +78,15 @@
              :sm="24"
            >
              <a-form-item label="工作曲线标志">
                <j-switch
                  placeholder="请选择工作曲线标志"
                  v-model="queryParam.curveGenerationFlags"
                  query
                ></j-switch>
                <!--<j-switch-->
                  <!--placeholder="请选择工作曲线标志"-->
                  <!--v-model="queryParam.curveGenerationFlags"-->
                  <!--query-->
                <!--&gt;</j-switch>-->
                <a-select v-model='queryParam.curveGenerationFlags' placeholder="请选择工作曲线标志">
                  <a-select-option  value="Y">是</a-select-option>
                  <a-select-option value="N">否</a-select-option>
                </a-select>
              </a-form-item>
            </a-col>
          </template>
@@ -386,7 +394,6 @@
      fieldList.push({ type: 'int', value: 'sortNo', text: '序号', dictCode: '' })
      fieldList.push({ type: 'switch', value: 'showFlag', text: '显示标志' })
      fieldList.push({ type: 'switch', value: 'curveGenerationFlags', text: '工作曲线标志' })

      this.superFieldList = fieldList
    },


 src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue

@@ -19,14 +19,11 @@
              <a-input placeholder="输入设备名称查询" v-model="queryParams.equipmentName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="2" :sm="3" :xs="3">
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
          </a-col>
          <a-col :md="2" :sm="2" :xs="2">
            <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
          </a-col>
          <a-col :lg="2" :md="3" :sm="3" :xs="3">
            <a-button type="primary" @click="exportExcel" icon="download">导出</a-button>
          </a-col>
        </a-row>
      </a-form>

 src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationList.vue

@@ -6,7 +6,7 @@
        <a-row :gutter="24">
          <a-col :md="7" :sm="7">
            <a-form-item label="时间">
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm:ss" showTime/>
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm:ss"/>
            </a-form-item>
          </a-col>
          <a-col :md="4" :sm="4">
@@ -192,6 +192,7 @@
      Type(valmath){
        this.dataList = [];
        this.queryParams.typeTree = valmath
        console.log(valmath,'触发Type的watch方法')
        // console.log(this.queryParams.typeTree)
      },
      nodeTree(val) { //监听currSelected 变化，将变化后的数值传递给 getCurrSelected 事件
@@ -240,8 +241,12 @@
      onOk(value) {
        console.log('onOk: ', value);
      },
      /**
       * 查询区域重置按钮
       */
      searchReset() {
        if(this.queryParams.typeTree == "1"){
          console.log('第一个的typeTree',this.queryParams.typeTree)
          this.typeTree = this.queryParams.typeTree
          this.typeParent =  this.queryParams.parentId
          this.typeEquipment = this.queryParams.equipmentId
@@ -250,6 +255,7 @@
          this.dates = []
          this.queryParams.typeTree = this.typeTree
          this.queryParams.parentId = this.typeParent
          console.log('进入第一个')
          if(this.queryParams.parentId !=  ""){
            this.queryParams.equipmentId =  ""
          }else{
@@ -258,12 +264,12 @@
            }else{
              this.queryParams.equipmentId = this.queryParamEquip.equipmentId
            }

          }

          this.ipagination.current = 1
          this.ResetloadData();
        }else{
          console.log('进入第二个')
          console.log('第二个的typeTree',this.queryParams.typeTree)
          this.typeTree = this.queryParams.typeTree
          this.typeParent =  this.queryParams.parentId
          // this.typeEquipment = this.queryParams.equipmentId
@@ -411,10 +417,8 @@
        if(this.queryParams.typeTree == "1"){
          this.queryParams.parentId =  this.queryParamEquip.parentId
          // this.queryParams.equipmentId =  this.queryParamEquip.equipmentId

        }else{
          this.queryParams.parentId = this.queryParamPeople.parentId

          // this.queryParams.equipmentId = ""
        }
        this.dataSource = [];
@@ -432,7 +436,7 @@
        param.equipmentId = this.queryParams.equipmentId;
        param.startTime = this.queryParam.startTime;
        param.endTime =  this.queryParam.endTime;
        // console.log(param);
        console.log('param',param);
        getAction(this.url.list,param).then((res) => {
          if(res.success){
            this.dataSource = res.result.records||res.result;
@@ -657,9 +661,19 @@
          exclude_inputs: true
        });
      },
      // /**
      //  * 车间选中项取消后触发此事件，由BaseTree组件由事件总线触发
      //  * @param value 提示信息
      //  */
      // treeClearSelected(value){
      //   this.queryParams.equipmentId=''
      //   this.queryParams.parentId=''
      //   this.ResetloadData()
      // }
    },
    created() {
      this.queryParam.typeTree = "1"
      // this.$bus.$on('treeClearSelected',this.treeClearSelected)
    }
  }
</script>

 src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModal.vue

@@ -111,6 +111,22 @@
              },
            ],
          },
          torqueDate:{
            rules:[
              {
                required:true,
                message: "请选择时间"
              },
            ],
          },
          torqueValue:{
            rules:[
              {
                required:true,
                message: "请输入扭矩值"
              },
            ],
          },
        },

        url: {

 src/views/mdc/base/modules/TorqueconfigurationList/TorqueconfigurationModalEdit.vue

@@ -125,6 +125,22 @@
              },
            ],
          },
          torqueDate:{
            rules:[
              {
                required:true,
                message: "请选择时间"
              },
            ],
          },
          torqueValue:{
            rules:[
              {
                required:true,
                message: "请输入扭矩值"
              },
            ],
          },
          // mdcRepairType:{
          //   rules:[
          //     {

 src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerList.vue

@@ -6,7 +6,7 @@
        <a-row :gutter="24">
          <a-col :md="7" :sm="7">
            <a-form-item label="时间">
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm" showTime/>
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm"/>
            </a-form-item>
          </a-col>
          <a-col :md="4" :sm="4">

 src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModal.vue

@@ -128,6 +128,22 @@
              },
            ],
          },
          startTime:{
            rules:[
              {
                required:true,
                message: "请选择开始时间"
              },
            ],
          },
          endTime:{
            rules:[
              {
                required:true,
                message: "请选择结束时间"
              },
            ],
          },
        },

        url: {

 src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue

@@ -144,6 +144,22 @@
              },
            ],
          },
          startTime:{
            rules:[
              {
                required:true,
                message: "请选择开始时间"
              },
            ],
          },
          endTime:{
            rules:[
              {
                required:true,
                message: "请选择结束时间"
              },
            ],
          },
          // mdcRepairType:{
          //   rules:[
          //     {

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

@@ -6,12 +6,12 @@
        <a-row :gutter="24">
          <a-col :md="6" :sm="6">
            <a-form-item label="设备编号">
              <a-input placeholder="输入设备编号查询" :readOnly="readOnly" v-model="queryParams.equipmentId"></a-input>
              <a-input placeholder="请选择设备" :readOnly="readOnly" v-model="queryParams.equipmentId"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="6" :sm="6">
            <a-form-item label="设备名称">
              <a-input placeholder="输入设备名称查询" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
              <a-input placeholder="请选择设备" :readOnly="readOnly" v-model="queryParams.equipmentName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :md="6" :sm="6">
@@ -152,7 +152,6 @@
    </div>
    <work-chart-model ref="workChartModel"></work-chart-model>
    <work-history-model ref="workHistoryModel"></work-history-model>

  </div>
</template>

@@ -327,15 +326,22 @@
        // console.log(this.queryParams.collectTime)
        if(this.queryParams.collectTime != undefined){
          this.queryParams.collectTimeStr = this.queryParams.collectTime.format('YYYY-MM-DD')
          if(!this.queryParams.equipmentId||!this.queryParams.equipmentName){
            this.$notification.warning({
              message:'消息',
              description:"请选择设备"
            });
            return false
          }
          this.queryChart()
        }else{
          // this.$message.warning("请选择时间")
          console.log('触发提示')
          this.$notification.warning({
            message:'消息',
            description:"请选择时间"
          });
        }

        // this.queryList()
      },
      searchReset() {
@@ -417,6 +423,7 @@
              message:'消息',
              description:res.message
            });

          }
        })
      }
@@ -427,11 +434,10 @@
      this.initEquipment();
      // this.queryTreeData();
    },
    mounted() {

    },
    watch: {
      equement(val) {
        console.log('通过watch触发')

        if (val && val.equipmentId) {
          this.$set(this.queryParams, 'equipmentName', val.equipmentName)
          this.$set(this.queryParams, 'equipmentId', val.equipmentId)

 src/views/mdc/base/modules/deviceRepair/DeviceRepairList.vue

@@ -6,7 +6,7 @@
        <a-row :gutter="24">
          <a-col :md="9" :sm="9">
            <a-form-item label="时间">
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm:ss" showTime/>
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm:ss"/>
            </a-form-item>
          </a-col>
          <a-col :md="4" :sm="4">

 src/views/mdc/base/modules/deviceRepair/DeviceRepairModel.vue

@@ -136,11 +136,11 @@
        confirmLoading: false,
        form: this.$form.createForm(this),
        validatorRules: {
          equipmentId:{
          equipmentIds:{
            rules:[
              {
                required:true,
                message: ""
                message: "请选择设备"
              },
            ],
          },
@@ -160,7 +160,23 @@
              },
            ],
            initialValue: 1
          }
          },
          startTime:{
            rules:[
              {
                required:true,
                message: "请选择开始时间"
              },
            ],
          },
          endTime:{
            rules:[
              {
                required:true,
                message: "请选择结束时间"
              },
            ],
          },
        },

        url: {

 src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue

@@ -120,6 +120,22 @@
              },
            ],
          },
          startTime:{
            rules:[
              {
                required:true,
                message: "请选择开始时间"
              },
            ],
          },
          endTime:{
            rules:[
              {
                required:true,
                message: "请选择结束时间"
              },
            ],
          },
          // mdcRepairType:{
          //   rules:[
          //     {

 src/views/mdc/base/modules/efficiencyPOReport/EfficiencyPOList.vue

@@ -10,13 +10,13 @@
                <a-range-picker @change="dateParamChange" :disabledDate="disabledDate" format="YYYYMMDD" v-model="dates"/>
              </a-form-item>
            </a-col>
            <a-col :lg="3" :md="3" :sm="3" :xs="3">
            <a-col :lg="2" :md="3" :sm="3" :xs="3">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
            </a-col>
            <a-col :lg="3"  :md="3" :sm="3" :xs="3">
            <a-col :lg="2"  :md="3" :sm="3" :xs="3">
              <a-button type="primary" @click="searchReset" icon="reload">重置</a-button>
            </a-col>
            <a-col :lg="3" :md="3" :sm="3" :xs="3">
            <a-col :lg="2" :md="3" :sm="3" :xs="3">
              <a-button type="primary" @click="exportExcel" icon="download">导出</a-button>
            </a-col>
          </a-row>

 src/views/mdc/base/modules/efficiencyShiftReport/EfficiencyShiftList.vue

@@ -33,7 +33,7 @@

          </a-row>
          <a-row :gutter="24">
            <a-col :md="14" :sm="14" :xs="14">
            <a-col :md="15" :sm="15" :xs="15">
              <a-checkbox-group :value="checkedList" :default-value="['lyl']" :options="efficiencyOptions"
                                @change="efficiencyOptionsOnChange"/>
            </a-col>
@@ -49,7 +49,7 @@
          </a-row>
        </a-form>
      </div>
        <div style="width: 400px;top: 20px; right: 0px;">
        <div style="width: 530px;top: 20px; right: 0px;">
        <table cellpadding="5" cellspacing="1" style="border: 1px solid darkgray;">
          <tr>
            <td v-for="(item, index) in identifying">{{item.title}}</td>
@@ -370,11 +370,11 @@
        })
      },
      initShiftSubList(val) {
        this.queryParam.shiftSubId = null;
        //每次重新选择班制时班次清空且显示placeholder内容
        this.queryParam.shiftSubId = undefined;
        getAction(this.url.initShiftSubList, { shiftId: val }).then((res) => {
          if (res.success) {
            this.shiftSubList = res.result;

          }
        })
      },
@@ -420,6 +420,7 @@
        this.checkedList = checkedList
      },
      searchQuery() {
        if(this.dates != ''){
        if(this.queryParam.typeTree == "1"){
          this.queryParam.parentId =  this.queryParamEquip.parentId
          this.queryParam.equipmentId = this.queryParamEquip.equipmentId
@@ -428,6 +429,15 @@
          this.queryParam.equipmentId = ""
        }
        this.loadData()
        }else{
          // this.$message.warning("请选择时间")
          console.log('触发提示')
          this.$notification.warning({
            message:'消息',
            description:"请选择时间"
          });
        }

        // this.onClearSelected()
      },
      searchReset() {

 src/views/mdc/common/BaseTree.vue

@@ -112,21 +112,24 @@
      ...mapActions(['QueryProduction']),
      getCurrSelectedTitle() {
        return !this.currSelected.title ? '' : this.currSelected.title
      }
      ,
      },
      /**
       * 取消车间选中项
       */
      onClearSelected() {
        this.hiding = true
        this.currSelected = {}
        this.selectedKeys = []
        console.log('发送')
        // this.$bus.$emit('treeClearSelected','重置列表')
        this.$emit('sendSelectBaseTree', '')
      },

      onSelect(selectedKeys, e) {
        this.hiding = false
        let record = e.node.dataRef
        this.currSelected = Object.assign({}, record)
        this.selectedKeys = [record.key]
        console.log(this.selectedKeys)
        console.log('选中树中项',this.selectedKeys)
        this.$emit('sendSelectBaseTree', this.selectedKeys)
      },
      handleEdit(entity) {
@@ -167,8 +170,7 @@
        //   this.loading = false
        //   this.cardLoading = false
        // })
      }
      ,
      },
      handleChange() {
        let search = this.searchInput
        let expandedKeys = this.dataList
@@ -186,8 +188,7 @@
          searchValue: search,
          autoExpandParent: true
        })
      }
      ,
      },
      handleSearch(value) {
        let search = value
        let expandedKeys = this.dataList
@@ -206,8 +207,7 @@
          searchValue: search,
          autoExpandParent: true
        })
      }
      ,
      },
      getParentKey(key, tree) {
        let parentKey
        for (let i = 0; i < tree.length; i++) {
@@ -223,7 +223,6 @@
        }
        return parentKey
      },

      generateList(data) {
        for (let i = 0; i < data.length; i++) {
          const node = data[i]
@@ -288,9 +287,7 @@
        this.queryTreeData()
        // 新增/修改 成功时，重载列表
      }

    }
    ,
    },
    //监听
    watch: {
      currSelected(val) { //监听currSelected 变化，将变化后的数值传递给 getCurrSelected 事件