lyh
2025-02-11 346ae2e0793c9fce4a97d6d1df5dedcebdbd0d40
mdc新增系统类型
已修改2个文件
40 ■■■■■ 文件已修改
src/views/dnc/base/modules/WorkUpcoming/WorkUpcomingApprovalForm.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/EquipmentList/UserModal.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/modules/WorkUpcoming/WorkUpcomingApprovalForm.vue
@@ -41,8 +41,8 @@
          <a-col :span="24" >
            <a-form-item label="审批状态" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-select placeholder="审批状态">
                <a-select-option v-if="isAgreed" value="1">同意</a-select-option>
                <a-select-option v-if="!isAgreed" value="2">拒绝</a-select-option>
                <a-select-option v-if="isAgreed" value="2">同意</a-select-option>
                <a-select-option v-if="!isAgreed" value="3">拒绝</a-select-option>
              </a-select>
<!--              <j-dict-select-tag  placeholder="请选择审批状态"  style="width:100%" :trigger-change="true" v-decorator="['status', validatorRules.status]" dictCode="dnc_assign_stream_status"/>-->
            </a-form-item>
src/views/mdc/base/modules/EquipmentList/UserModal.vue
@@ -143,6 +143,19 @@
          </a-col>
        </a-row>
        <a-row :gutter="24" v-if="systemType">
            <a-col :span='24'>
              <a-form-model-item label="系统类型" :labelCol="{span:3}" :wrapperCol="{span:21}">
                <a-radio-group name="radioGroup" v-model="systemValue">
                  <a-radio value="1">DNC</a-radio>
                  <a-radio value="2">MDC</a-radio>
                  <a-radio value="3">通用</a-radio>
                </a-radio-group>
              </a-form-model-item>
            </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span='12'>
            <a-form-model-item v-if="isDepartType == 0" label="系统版本号" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -246,7 +259,9 @@
          driveType: "",
          systemType: "",
          deviceLevel: "",
          deviceCategory: ""
          deviceCategory: "",
          deviceTypeDnc:"",
          deviceTypeMdc:"",
        },
        labelCol: {
          xs: { span: 24 },
@@ -259,6 +274,8 @@
        uploadLoading:false,
        confirmLoading: false,
        headers:{},
        systemType:false,
        systemValue:"3",
        url: {
          fileUpload: window._CONFIG['domianURL']+"/sys/common/upload",
          userWithDepart: "/mdc/mdcEquipment/equipmentDepartList", // 引入为指定用户查看部门信息需要的url
@@ -283,6 +300,7 @@
      this.headers = {"X-Access-Token":token}
      this.queryGroup()
      this.queryTreeData()
      this.getAppPlatformName();
      // this.initRoleList()
      // this.initTenantList()
    },
@@ -305,6 +323,13 @@
            });
          }
        }).finally(() =>{
        })
      },
      getAppPlatformName(){
        getAction(`/system/sysParams/query/by/settingKey?settingKey=system_type`).then(res=>{
          if(res.success){
            this.systemType = res.result.settingValue === '0';
          }
        })
      },
      queryGroup() {
@@ -356,13 +381,18 @@
        // that.userId = record.id;
        // console.log(record)
        if (record.systemValue!=null){
          this.systemValue=record.systemValue;
        }else {
          this.systemValue="3"
        }
        that.model = Object.assign({}, record);
        // that.model = Object.assign({},{selectedroles:'',selectedProduction:''}, record);
        // this.model = Object.assign({}, record)
        this.$nextTick(() => {
          this.form.setFieldsValue(pick(that.model, 'selectedDeparts', 'selectedProduction', 'equipmentId', 'equipmentName', 'equipmentModel', 'equipmentType', 'equipmentIp', 'dataPort',
            'driveType', 'sortNo', 'remark','systemVersion','devicePower','controlSystem','saveTableName'))
            'driveType', 'sortNo', 'remark','systemVersion','devicePower','controlSystem','saveTableName','systemValue'))
        })
        if(record.hasOwnProperty("id")){
          // that.getUserRoles(record.id);
@@ -485,8 +515,10 @@
            let obj;
            if(!this.model.id){
              this.model.id = this.userId;
              this.model.systemValue=this.systemValue;
              obj=addEquipment(this.model);
            }else{
              this.model.systemValue=this.systemValue;
              obj=editEquipment(this.model,{
                        id: this.model.id
                      });