项目优化

zhuzhuanzhuan

2023-09-19 102c7d7dc9f5af873f19c86a0d17d5d6addcbc32

项目优化

 src/components/jeecgbiz/JSelectEquipmentProduction.vue

@@ -3,7 +3,7 @@
    <!---->
    <a-input @click="openModal" placeholder="请点击选择车间" v-model="textVals" readOnly :disabled="disabled">
      <a-icon slot="prefix" type="cluster" title="车间选择控件"/>
      <a-icon v-if="storeVals" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
      <a-icon v-if="storeVals&&!disabled" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
    </a-input>
    <j-select-equipment-production-modal
      ref="innerDepartSelectModal"

 src/mixins/JeecgListMixin.js

@@ -256,7 +256,6 @@
      this.$refs.modalForm.edit(record);
      this.$refs.modalForm.title = "编辑";
      this.$refs.modalForm.disableSubmit = false;

    },
    handleAdd: function () {
      this.$refs.modalForm.add();

 src/views/mdc/base/modules/EquipmentList/UserModal.vue

@@ -3,7 +3,7 @@
    :title="title"
    :maskClosable="true"
    :width="drawerWidth"
    @cancel="handleCancel"
    @cancel="visible=false"
    :visible="visible"
    :footer="null"
    style="height: 100%;overflow: auto;padding-bottom: 53px;">
@@ -55,9 +55,6 @@
          <a-col :span="12">
            <a-form-model-item label="车间分配" :labelCol="labelCol" :wrapperCol="wrapperCol"  v-show="!productionDisabled" ref="selectedProduction"  prop="selectedProduction">
              <!--<j-select-equipment-production  v-decorator="['selectedProduction',{rules:[{required:true,message:'请选择车间!'}]}]" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>-->



              <j-select-equipment-production :disabled="disableSubmit"  v-model="model.selectedProduction" :multi="false" @back="backProductionInfo" :backProduction="true" :treeProductOpera="true"></j-select-equipment-production>
            </a-form-model-item>

@@ -549,9 +546,7 @@
      //     }
      //   })
      // },
      handleCancel () {
        this.close()
      },

      // validatequipmentId(rule, value, callback){
      //   if(!value){
      //     callback()

 src/views/mdc/base/modules/EquipmentTypeList/MdcEquipmentTypeForm.vue

@@ -102,7 +102,7 @@
            httpAction(httpurl,this.model,method).then((res)=>{
              if(res.success){
                // that.$message.success(res.message);
                that.$notification.warning({
                that.$notification.success({
                  message:'消息',
                  description:res.message
                });

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

@@ -112,6 +112,22 @@
              },
            ],
          },
          vacationDate:{
            rules:[
              {
                required:true,
                message: "请选择休假时间"
              },
            ],
          },
          vacationType:{
            rules:[
              {
                required:true,
                message: "请选择假期类型"
              },
            ],
          },
        },

        url: {
@@ -126,7 +142,6 @@
    },
    created() {
    },

    methods: {
      // disabledDate(current){
      //   //Can not slect days before today and today
@@ -248,7 +263,7 @@
                obj.then((res) => {
                  if (res.success) {
                    // that.$message.success("添加成功")
                    that.$notification.warning({
                    that.$notification.success({
                      message:'消息',
                      description:"添加成功"
                    });

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

@@ -126,6 +126,22 @@
              },
            ],
          },
          vacationDate:{
            rules:[
              {
                required:true,
                message: "请选择休假时间"
              },
            ],
          },
          vacationType:{
            rules:[
              {
                required:true,
                message: "请选择假期类型"
              },
            ],
          },
          // mdcRepairType:{
          //   rules:[
          //     {

 src/views/mdc/base/modules/MdcplancloseList/MdcplancloseForm.vue

@@ -7,8 +7,7 @@
            <a-form-model-item label="类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planCloseType">
              <j-dict-select-tag :readOnly="disableSubmit" placeholder="请选择类型"
                                 :triggerChange="true" dictCode="mdc_plan_type    "
                                 v-model="model.planCloseType" allow-clear/>

                                 v-model="model.planCloseType" allow-clear />
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
@@ -70,6 +69,15 @@
        },
        confirmLoading: false,
        validatorRules: {
          planCloseType:[
            {required: true,message:'请选择类型!'}
          ],
          planCloseTimeType:[
            {required: true,message:'请选择时间类型!'}
          ],
          planCloseTimeLong:[
            {required: true,message:'请输入时长!'}
          ],
        },
        url: {
          add: "/mdc/mdcPlanClose/add",

 src/views/mdc/base/modules/StatisticalAnalysis/StatisticalAnalysisMain.vue

@@ -269,7 +269,8 @@
                textStyle:{
                  color:'#000',
                },
                formatter:"时长：{c}H"
                // formatter:"时长：{c}H",
                formatter:params=>String(params.value).length==2?`时长：${String(params.value).slice(1)}H`:`时长：${String(params.value)}H`
              },
              itemStyle: {
                normal: {
@@ -312,7 +313,8 @@
          // },
          tooltip: {
            trigger: 'item',
            formatter: "{a} <br/>{b} : {c} ({d}%)"
            // formatter: "{a} <br/>{b} : {c} ({d}%)"，
            formatter:params=>String(params.value).length==2?`${params.seriesName}<br/>${params.name}：${String(params.value).slice(1)}（${params.percent}%）`:`${params.seriesName}<br/>${params.name}：${params.value}（${params.percent}%）`
          },
          legend: {
            orient: 'vertical',
@@ -335,7 +337,8 @@
                label: {
                  show: true,
                  position: 'top',
                  formatter: '{b}\n{c}'
                  // formatter: '{b}\n{c}',
                  formatter:params=>String(params.value).length==2?params.name+String(params.value).slice(1):params.name+String(params.value)
                }
              }
            },
@@ -354,7 +357,8 @@
          // },
          tooltip: {
            trigger: 'item',
            formatter: "{a} <br/>{b} : {c} ({d}%)"
            // formatter: "{a} <br/>{b} : {c} ({d}%)",
            formatter:params=>String(params.value).length==2?`${params.seriesName}<br/>${params.name}：${String(params.value).slice(1)}（${params.percent}%）`:`${params.seriesName}<br/>${params.name}：${params.value}（${params.percent}%）`
          },
          legend: {
            orient: 'vertical',
@@ -377,7 +381,8 @@
                label: {
                  show: true,
                  position: 'top',
                  formatter: '{b}\n{c}'
                  // formatter: '{b}\n{c}',
                  formatter:params=>String(params.value).length==2?params.name+String(params.value).slice(1):params.name+String(params.value)
                }
              }
            },

 src/views/mdc/base/modules/StatisticsChart/StatisticsLegend.vue

@@ -359,7 +359,8 @@
                  textStyle:{
                    color:'#000',
                  },
                  formatter:"时长：{c}H"
                  // formatter:"时长：{c}H",
                  formatter:params=>String(params.value).length==2?`时长：${String(params.value).slice(1)}H`:`时长：${String(params.value)}H`
                },
                itemStyle: {
                  normal: {
@@ -456,7 +457,8 @@
                textStyle:{
                  color:'#000',
                },
                formatter:"时长：{c}H"
                // formatter:"时长：{c}H",
                formatter:params=>String(params.value).length==2?`时长：${String(params.value).slice(1)}H`:`时长：${String(params.value)}H`
              },
            itemStyle: {
              normal: {
@@ -549,7 +551,8 @@
              textStyle:{
                color:'#000',
              },
              formatter:"时长：{c}H"
              // formatter:"时长：{c}H",
              formatter:params=>String(params.value).length==2?`时长：${String(params.value).slice(1)}H`:`时长：${String(params.value)}H`
            },
            itemStyle: {
              normal: {

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

@@ -530,7 +530,7 @@
            //重新计算分页问题
            that.reCalculatePage(1)
            // that.$message.success(res.message);
            that.$notification.warning({
            that.$notification.success({
              message:'消息',
              description:res.message
            });

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

@@ -120,6 +120,14 @@
              },
            ],
          },
          noplanType:{
            rules:[
              {
                required:true,
                message: "请选择类型"
              },
            ],
          },
        },

        url: {
@@ -253,7 +261,7 @@
                obj.then((res) => {
                  if (res.success) {
                    // that.$message.success("添加成功")
                    that.$notification.warning({
                    that.$notification.success({
                      message:'消息',
                      description:"添加成功"
                    });

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

@@ -136,6 +136,14 @@
              },
            ],
          },
          noplanType:{
            rules:[
              {
                required:true,
                message: "请选择类型"
              },
            ],
          },
          // mdcRepairType:{
          //   rules:[
          //     {

 src/views/mdc/base/modules/deviceCalendar/DeviceCalendarModel.vue

@@ -115,11 +115,18 @@
        },
        confirmLoading: false,        form: this.$form.createForm(this),
        validatorRules: {
          // shiftId:{
          //   rules: [{
          //     required: true, message: '请选择班制!',
          //   }],
          // },
          equipmentId:{
            rules:[
              {
                required:true,message:'请选择设备组!'
              }
            ]
          },
          shiftId:{
            rules: [{
              required: true, message: '请选择班制!',
            }],
          }
        },
        url: {
          add: '/mdc/mdcDeviceCalendar/add',
@@ -300,27 +307,34 @@
          if (!err) {
            that.confirmLoading = true
            let formData = Object.assign(this.model, values)

            formData.dateList = this.sendDte
            postAction(this.url.settingCalendar, formData).then((res) => {
              if (res.success) {
                // that.$message.success(res.message)
                that.$notification.success({
                  message:'消息',
                  description:res.message
                });
                that.$emit('ok', res.result)
              } else {
                // that.$message.warning(res.message)
                that.$notification.warning({
                  message:'消息',
                  description:res.message
                });
              }
            }).finally(() => {
            if(formData.dateList&&formData.dateList.length>0){
              postAction(this.url.settingCalendar, formData).then((res) => {
                if (res.success) {
                  // that.$message.success(res.message)
                  that.$notification.success({
                    message:'消息',
                    description:res.message
                  });
                  that.$emit('ok', res.result)
                } else {
                  // that.$message.warning(res.message)
                  that.$notification.warning({
                    message:'消息',
                    description:res.message
                  });
                }
              }).finally(() => {
                that.confirmLoading = false
                that.close()
              })
            }else{
              that.confirmLoading = false
              that.close()
            })
              that.$notification.warning({
                message:'消息',
                description:'请选择生效时间!'
              });
            }
          }
        })
      },

 src/views/mdc/base/modules/mdcUtilizationRate/MdcUtilizationRateModel.vue

@@ -115,7 +115,7 @@
            }).then((res) => {
              if (res.success) {
                // that.$message.success("保存成功")
                that.$notification.warning({
                that.$notification.success({
                  message:'消息',
                  description:"保存成功"
                });

 src/views/mdc/base/modules/shift/ShiftSystem.vue

@@ -117,10 +117,16 @@
        let _this = this
        putAction(this.url.changeStatus, { id: id, status: status }).then((res) => {
          if (res.success) {
            _this.$message.success('操作成功！')
            _this.$notification.success({
              message:'消息',
              description:res.message
            })
            _this.loadData()
          } else {
            _this.$message.warning('操作失败！')
            _this.$notification.warning({
              message:'消息',
              description:res.message
            });
          }
        })
      },