qsw 优化

qushaowei

2023-08-21 c120699170354666327cc3c1d7f1cc1eb5f90c4f

qsw 优化

 src/views/eam/EquipmentAccountList.vue

@@ -4,13 +4,13 @@
    :gutter="16"
  >
    <a-col
      :md="6"
      :md="4"
      :sm="24"
    >
      <equipment-category-left />
    </a-col>
    <a-col
      :md="24-6"
      :md="24-4"
      :sm="24"
    >
      <equipment-right />

 src/views/eam/InspectionProjectList.vue

@@ -4,13 +4,13 @@
    :gutter="16"
  >
    <a-col
      :md="6"
      :md="4"
      :sm="24"
    >
      <inspection-project-category-left @clickTreeNode="getSelectNode" />
    </a-col>
    <a-col
      :md="24-6"
      :md="24-4"
      :sm="24"
    >
      <inspection-project-right :recordSelect="currentNodeSelect" />

 src/views/eam/MaintenanceProjectList.vue

@@ -4,13 +4,13 @@
    :gutter="16"
  >
    <a-col
      :md="6"
      :md="4"
      :sm="24"
    >
      <maintenance-project-category-left @clickTreeNode="getSelectNode" />
    </a-col>
    <a-col
      :md="24-6"
      :md="24-4"
      :sm="24"
    >
      <maintenance-project-right :recordSelect="currentNodeSelect" />

 src/views/eam/SpecialtyMaintenanceOrderList.vue

@@ -258,8 +258,8 @@
      ref="SpecialyMaintenanceOrderExeDrawer"
      @ok="modalFormOk"
    ></specialy-maintenance-order-exe-drawer>
    <specialty-maintenance-order-assign-modal 
       ref="SpecialtyMaintenanceOrderAssignModal"
    <specialty-maintenance-order-assign-modal
      ref="SpecialtyMaintenanceOrderAssignModal"
      @ok="modalFormOk"
    >
    </specialty-maintenance-order-assign-modal>
@@ -349,35 +349,35 @@
          align: "center",
          dataIndex: 'teamName',
        },
        {
          title: '工时定额/每小时',
          align: "center",
          dataIndex: 'sumOfWorkingHourQuota',
        },
        // {
        //   title: '工时定额/每小时',
        //   align: "center",
        //   dataIndex: 'sumOfWorkingHourQuota',
        // },
        {
          title: '计划开始时间',
          align: "center",
          dataIndex: 'planStartTime',
          width:170
          
          width: 170

        },
        {
          title: '计划结束时间',
          align: "center",
          dataIndex: 'planEndTime',
          width:170
          width: 170
        },
        {
          title: '实际开始时间',
          align: "center",
          dataIndex: 'actualStartTime',
          width:170
          width: 170
        },
        {
          title: '实际结束时间',
          align: "center",
          dataIndex: 'actualEndTime',
          width:170
          width: 170
        },
        {
          title: '实际用时',
@@ -398,7 +398,7 @@
          title: '创建日期',
          align: "center",
          dataIndex: 'createTime',
          width:170
          width: 170
        },
        {
          title: '操作',

 src/views/eam/modules/dailyInspectionOrder/DailyInspectionOrderExeDrawer.vue

@@ -147,7 +147,7 @@
                        style="max-width:80px;font-size: 12px;font-style: italic;"
                      />
                      <a-select
                        v-if="col.dataIndex == 'inspectionProjectResult' && record.analysisMethod == '2'"
                        v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '2'"
                        :value="text"
                        :options="record.inspectionCycles"
                        @change="(e) => handleChange(e, record.key, col, index)"
@@ -156,7 +156,7 @@
                      />
                      <a-input-number
                        :value="text"
                        v-if="col.dataIndex == 'inspectionProjectResult' && record.analysisMethod == '1'"
                        v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '1'"
                        :min="0"
                        :max="20000"
                        @change="(e)=>handleChange(e, record.key, col, index,record)"
@@ -663,7 +663,7 @@
      if (target) {

        if (column.dataIndex == 'inspectionProjectResult') {
          if (target.analysisMethod === "1") {
          if (target.testValueType === "1") {
            target[column.dataIndex] = value;
            let maxValue = target.maxValue
            let minValue = target.minValue

 src/views/eam/modules/equipment/EquipmentAccount2List.vue

@@ -210,11 +210,11 @@
        slot-scope="text, record"
      >
        <!-- class="table-operation" -->
        <a
        <!-- <a
          href="javascript:;"
          @click="equipmentStructuresShow(record)"
        >设备结构</a>
        <a-divider type="vertical" />
        <a-divider type="vertical" /> -->
        <a
          href="javascript:;"
          @click="handleEdit(record)"
@@ -249,7 +249,7 @@
      type="card"
      defaultActiveKey="1"
    >
      <a-tab-pane key="1">
      <!-- <a-tab-pane key="1">
        <span slot="tab">
          <a-badge v-if="showTabsFlag">工艺参数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
          <a-badge
@@ -265,7 +265,7 @@
        >
          <process-parameters-list ref="ProcessParametersList"></process-parameters-list>
        </div>
      </a-tab-pane>
      </a-tab-pane> -->

      <a-tab-pane
        key="2"
@@ -402,11 +402,6 @@
          dataIndex: 'num',
        },
        {
          title: '资产编码',
          align: "center",
          dataIndex: 'assetNumber',
        },
        {
          title: '设备名称',
          align: "center",
          dataIndex: 'name',
@@ -422,6 +417,11 @@
          dataIndex: 'specification',
        },
        {
          title: '资产编码',
          align: "center",
          dataIndex: 'assetNumber',
        },
        {
          title: '设备状态',
          align: "center",
          dataIndex: 'equipmentStatus_dictText',
@@ -434,12 +434,7 @@
        {
          title: '特种设备',
          align: "center",
          dataIndex: 'specificEquipment',
        },
        {
          title: '特种设备',
          align: "center",
          dataIndex: 'sourceId_dictText',
          dataIndex: 'specificEquipment_dictText',
        },
        {
          title: '设备图片',
@@ -512,17 +507,17 @@
          align: "center",
          dataIndex: 'equipmentImportanceId_dictText',
        },
        {
          title: '工艺参数管理',
          align: "center",
          dataIndex: 'processParameters',
          scopedSlots: { customRender: 'processParameters' },
        },
        {
          title: '工艺参数模板',
          align: "center",
          dataIndex: 'processParametersTemplateName',
        },
        // {
        //   title: '工艺参数管理',
        //   align: "center",
        //   dataIndex: 'processParameters',
        //   scopedSlots: { customRender: 'processParameters' },
        // },
        // {
        //   title: '工艺参数模板',
        //   align: "center",
        //   dataIndex: 'processParametersTemplateName',
        // },
        {
          title: '设备精度管理',
          align: "center",
@@ -534,27 +529,27 @@
          align: "center",
          dataIndex: 'precisionParametersTemplateName',
        },
        {
          title: '检定管理',
          align: "center",
          dataIndex: 'verification',
          scopedSlots: { customRender: 'verification' },
        },
        {
          title: '检定周期/月',
          align: "center",
          dataIndex: 'verificationPeriod',
        },
        {
          title: '上次检定日期',
          align: "center",
          dataIndex: 'lastVerificationDate',
        },
        {
          title: '下次检定日期',
          align: "center",
          dataIndex: 'nextVerificationDate',
        },
        // {
        //   title: '检定管理',
        //   align: "center",
        //   dataIndex: 'verification',
        //   scopedSlots: { customRender: 'verification' },
        // },
        // {
        //   title: '检定周期/月',
        //   align: "center",
        //   dataIndex: 'verificationPeriod',
        // },
        // {
        //   title: '上次检定日期',
        //   align: "center",
        //   dataIndex: 'lastVerificationDate',
        // },
        // {
        //   title: '下次检定日期',
        //   align: "center",
        //   dataIndex: 'nextVerificationDate',
        // },
        // {
        //   title: '状态',
        //   align: 'center',
@@ -626,11 +621,11 @@

    onSelectChange(selectedRowKeys, selectionRows) {
      if (selectedRowKeys.length == 1) {
        this.$refs.ProcessParametersList.equipmentId = selectedRowKeys[0]
        // this.$refs.ProcessParametersList.equipmentId = selectedRowKeys[0]
        this.$refs.EquipmentFileList.equipmentId = selectedRowKeys[0]
        this.$refs.PrecisionParametersList.equipmentId = selectedRowKeys[0]
      } else {
        this.$refs.ProcessParametersList.equipmentId = '-1'
        // this.$refs.ProcessParametersList.equipmentId = '-1'
        this.$refs.PrecisionParametersList.equipmentId = '-1'
        this.$refs.EquipmentFileList.equipmentId = '-1'
      }
@@ -746,7 +741,7 @@
      }
      this.selectedRowKeys = []
      this.selectionRows = []
      this.$refs.ProcessParametersList.equipmentId = '-1'
      // this.$refs.ProcessParametersList.equipmentId = '-1'
      this.$refs.PrecisionParametersList.equipmentId = '-1'
      this.$refs.EquipmentFileList.equipmentId = '-1'
      this.loadData(1);
@@ -755,7 +750,7 @@
    searchQuery() {
      this.selectedRowKeys = []
      this.selectionRows = []
      this.$refs.ProcessParametersList.equipmentId = '-1'
      // this.$refs.ProcessParametersList.equipmentId = '-1'
      this.$refs.PrecisionParametersList.equipmentId = '-1'
      this.$refs.EquipmentFileList.equipmentId = '-1'
      this.loadData(1);
@@ -767,7 +762,7 @@
      //清空列表选中
      this.onClearSelected()

      this.$refs.ProcessParametersList.equipmentId = '-1'
      // this.$refs.ProcessParametersList.equipmentId = '-1'
      this.$refs.PrecisionParametersList.equipmentId = '-1'
      this.$refs.EquipmentFileList.equipmentId = '-1'
    },
@@ -789,7 +784,7 @@
      }
      this.selectedRowKeys = []
      this.selectionRows = []
      this.$refs.ProcessParametersList.equipmentId = '-1'
      // this.$refs.ProcessParametersList.equipmentId = '-1'
      this.$refs.PrecisionParametersList.equipmentId = '-1'
      this.$refs.EquipmentFileList.equipmentId = '-1'
      this.loadData(1);

 src/views/eam/modules/equipment/EquipmentModel.vue

@@ -366,9 +366,8 @@
              />
            </a-form-item>
          </a-col>

        </a-row>
        <a-row style="width: 100%">
        <!-- <a-row style="width: 100%">
          <a-col :span="24 / 3">
            <a-form-item
              :labelCol="labelCol"
@@ -416,9 +415,9 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        </a-row> -->
        <a-row style="width: 100%">
          <a-col :span="24 / 3  ">
          <!-- <a-col :span="24 / 3  ">
            <a-form-item
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
@@ -451,7 +450,7 @@
                v-decorator="['processParametersTemplateName', validatorRules.processParametersTemplateName]"
              />
            </a-form-item>
          </a-col>
          </a-col> -->
          <a-col :span="24 / 3">
            <a-form-item
              :labelCol="labelCol"
@@ -468,9 +467,6 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row style="width: 100%">

          <a-col :span="24 / 3">
            <a-form-item
              :labelCol="labelCol"
@@ -505,6 +501,9 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
        <a-row style="width: 100%">

        </a-row>

        <a-row :gutter="24">
@@ -733,7 +732,7 @@
          'remark'));
        this.form.setFieldsValue({ leaveFactoryDate: this.model.leaveFactoryDate ? moment(this.model.leaveFactoryDate, 'YYYY-MM-DD') : null });
        this.form.setFieldsValue({ acceptanceCheckDate: this.model.acceptanceCheckDate ? moment(this.model.acceptanceCheckDate, 'YYYY-MM-DD') : null });
        this.form.setFieldsValue({ lastVerificationDate: this.model.lastVerificationDate ? moment(this.model.lastVerificationDate, 'YYYY-MM-DD') : null })
        // this.form.setFieldsValue({ lastVerificationDate: this.model.lastVerificationDate ? moment(this.model.lastVerificationDate, 'YYYY-MM-DD') : null })
      });
      if (record.id) {
        this.codeDisable = true;
@@ -784,17 +783,17 @@
          // formData.equipmentPhoto = this.equipmentPhoto
          formData.leaveFactoryDate = formData.leaveFactoryDate ? formData.leaveFactoryDate.format('YYYY-MM-DD') : null;
          formData.acceptanceCheckDate = formData.acceptanceCheckDate ? formData.acceptanceCheckDate.format('YYYY-MM-DD') : null;
          formData.lastVerificationDate = formData.lastVerificationDate ? formData.lastVerificationDate.format('YYYY-MM-DD') : null;
          // formData.lastVerificationDate = formData.lastVerificationDate ? formData.lastVerificationDate.format('YYYY-MM-DD') : null;
          if (that.model.precisionParameters != "1") {
            formData.precisionParametersTemplateId = "";
          } else {
            formData.precisionParametersTemplateId = this.precisionParametersTemplateId;
          }
          if (that.model.processParameters != "1") {
            formData.processParametersTemplateId = "";
          } else {
            formData.processParametersTemplateId = this.processParametersTemplateId;
          }
          // if (that.model.processParameters != "1") {
          //   formData.processParametersTemplateId = "";
          // } else {
          //   formData.processParametersTemplateId = this.processParametersTemplateId;
          // }
          let obj;
          if (!this.model.id) {
            formData.equipmentCategoryId = this.equipmentCategoryId
@@ -874,13 +873,13 @@
        this.model.precisionParameters = '1'
      }
    },
    handle3Switch(verification) {
      if ('1' == verification) {
        this.model.verification = '0'
      } else {
        this.model.verification = '1'
      }
    },
    // handle3Switch(verification) {
    //   if ('1' == verification) {
    //     this.model.verification = '0'
    //   } else {
    //     this.model.verification = '1'
    //   }
    // },

    getSysDeparts() {
      getAction(this.url.getSysDeparts).then((res) => {

 src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue

@@ -201,6 +201,7 @@
        关闭
      </a-button>
      <a-button
        hidden
        v-if="!this.model.id"
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"

 src/views/eam/modules/specialtyInspectionOrder/SpecialyInspectionOrderExeDrawer.vue

@@ -253,7 +253,7 @@
                        style="max-width:80px;font-size: 12px;font-style: italic;"
                      />
                      <a-select
                        v-if="col.dataIndex == 'inspectionProjectResult' && record.analysisMethod == '2'"
                        v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '2'"
                        :value="text"
                        :options="record.inspectionCycles"
                        @change="(e) => handleChange(e, record.key, col, index)"
@@ -262,7 +262,7 @@
                      />
                      <a-input-number
                        :value="text"
                        v-if="col.dataIndex == 'inspectionProjectResult' && record.analysisMethod == '1'"
                        v-if="col.dataIndex == 'inspectionProjectResult' && record.testValueType == '1'"
                        :min="0"
                        :max="200"
                        @change="(e)=>handleChange(e, record.key, col, index,record)"
@@ -825,7 +825,7 @@
      if (target) {

        if (column.dataIndex == 'inspectionProjectResult') {
          if (target.analysisMethod === "1") {
          if (target.testValueType == "1") {
            target[column.dataIndex] = value;
            let maxValue = target.maxValue
            let minValue = target.minValue

 src/views/eam/modules/specialtyInspectionPlan/SpecialtyInspectionPlanModal.vue

@@ -15,14 +15,14 @@
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item
              label="点检计划编码"
              label="点检方案编码"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
              <a-input
                allow-clear
                :disabled="disableSubmit"
                :placeholder="disableSubmit?'':'请输入点检计划编码'"
                :placeholder="disableSubmit?'':'请输入点检方案编码'"
                v-decorator="['num', validatorRules.num ]"
              />
            </a-form-item>
@@ -148,7 +148,7 @@
              <a-input
                :disabled=true
                placeholder="请输入图片名称"
                v-decorator="['name', {} ]"
                v-decorator="['name', validatorRules.name ]"
              />
            </a-form-item>
          </a-col>
@@ -431,7 +431,6 @@
      for (let i = 0; i < this.dataSource.length; i++) {
        ids.push(this.dataSource[i].specialtyInspectionStandardId);
      }
      debugger
      let departId = dataDepartId.departId;
      let inspectionCycleId = data.inspectionCycleId;
      this.$refs.specialtyInspectionStandardModalForm.showModals(ids, departId, inspectionCycleId);