1、扭矩配置页面更名为参数配置，增加字段“进给参数” 2、设备监控页面设备表增加状态异常说明字段以及操作列状态反馈功能（具备鉴权功能） 3、设备加工工...

zhuzhuanzhuan

2024-01-17 e205cad00ed14b91f7c7395146941ade750982bb

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

@@ -5,12 +5,12 @@
      <a-form :form="form">
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间"
                      class="query-group-cust" v-decorator="['torqueDate', validatorRules.torqueDate]"></j-date>
            <a-form-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="请输入设备编号"
                       v-decorator="['equipmentId',validatorRules.equipmentId]"/>
            </a-form-item>

          </a-col>

          <a-col :span="12">
            <a-form-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="请输入设备名称"
@@ -20,16 +20,23 @@
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item label="时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择时间"
                      class="query-group-cust" v-decorator="['torqueDate', validatorRules.torqueDate]" style="width: 100%"></j-date>
            </a-form-item>
          </a-col>

          <a-col :span="12">
            <a-form-item label="扭矩值" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input-number :min="0" :disabled="disableSubmit" placeholder="请输入扭矩值"
                       v-decorator="['torqueValue', validatorRules.torqueValue]"/>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">

            <a-form-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="请输入设备编号"
                       v-decorator="['equipmentId',validatorRules.equipmentId]"/>
            <a-form-item label="进给参数" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input placeholder="请输入进给参数" v-decorator="['feedParameter', validatorRules.feedParameter]"></a-input>
            </a-form-item>
          </a-col>
        </a-row>
@@ -141,6 +148,14 @@
              },
            ],
          },
          feedParameter:{
            rules:[
              {
                required:true,
                message:'请输入进给参数'
              }
            ]
          }
          // mdcRepairType:{
          //   rules:[
          //     {
@@ -244,7 +259,7 @@
        // this.editStart  = (this.model.startTime).replace(/:/g,'');
        this.visible = true
        this.$nextTick(() => {
          this.form.setFieldsValue(pick(this.model,'equipmentId', 'equipmentName','torqueDate', 'torqueValue','notes'
          this.form.setFieldsValue(pick(this.model,'equipmentId', 'equipmentName','torqueDate', 'torqueValue','feedParameter','notes'
          ))
        })
      },