gaoaoy
2024-03-12 ebb8e1fd49f89323d561b1f78547fc1bc129e3b7
6 设备工具明细 功能调整
已修改2个文件
58 ■■■■■ 文件已修改
src/assets/api/controller.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/a6-device-management.vue 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/api/controller.js
@@ -102,10 +102,10 @@
    addDeviceParameter: "/deviceScope/addDeviceParameter", //添加设备详情参数
    delDeviceParameter: "/deviceScope/delDeviceParameter", //删除设备详情参数
    upDeviceParameter: "/deviceScope/upDeviceParameter", //修改设备详情参数
  authorizedPerson: "/deviceScope/authorizedPerson", //获取授权人
  authorizedPerson: "/user/getDeviceManager", //获取授权人
  selectEquipmentOverview: "/deviceScope/selectEquipmentOverview", //获取设备总览
  uploadFile: "/deviceScope/uploadFile", //上传图片
  selectDevicePrincipal: "/deviceScope/selectDevicePrincipal", //获取设备负责人
  selectDevicePrincipal: "/user/getDeviceManager", //获取设备负责人
}
const systemLog = {
src/components/view/a6-device-management.vue
@@ -149,7 +149,7 @@
                </el-date-picker>
              </el-form-item>
              <el-form-item label="设备负责人:" >
                <el-select :disabled="isUp" v-model="formData.equipmentManager" placeholder="请选择" size="small" style="width:100%">
                <el-select :disabled="isUp" v-model="formData.getDeviceManager" placeholder="请选择" size="small" style="width:100%">
                  <el-option
                    v-for="item in responsiblePersonList"
                    :key="item.value"
@@ -160,7 +160,7 @@
                </el-select>
              </el-form-item>
              <el-form-item label="被授权人:" >
                <el-select :disabled="isUp" v-model="formData.authorizedPerson" size="small" multiple placeholder="请选择" style="width:100%">
                <el-select :disabled="isUp" v-model="formData.getDeviceManager" size="small" multiple placeholder="请选择" style="width:100%">
                  <el-option
                    v-for="item in authorizerList"
                    :key="item.value"
@@ -345,7 +345,7 @@
          <!-- 表单 -->
          <el-form :label-position="labelPosition" :model="formData2" label-width="90px">
            <el-form-item label="设备分类:" >
              <el-select :disabled="isUp" v-model="formData2.largeCategory" placeholder="请选择" size="small" style="width:100%">
              <el-select v-model="formData2.largeCategory" placeholder="请选择" size="small" style="width:100%">
                <el-option
                  v-for="item in equipmentList"
                  :key="item.value"
@@ -358,7 +358,6 @@
            <el-form-item label="出厂日期:">
              <el-date-picker
              style="width:100%"
                :disabled="isUp"
                v-model="formData2.dateProduction"
                type="datetime"
                size="small"
@@ -368,7 +367,7 @@
              </el-date-picker>
            </el-form-item>
            <el-form-item label="设备负责人:" >
              <el-select :disabled="isUp" v-model="formData2.equipmentManager" placeholder="请选择" size="small" style="width:100%">
              <el-select v-model="formData2.equipmentManager" placeholder="请选择" size="small" style="width:100%">
                <el-option
                  v-for="item in responsiblePersonList"
                  :key="item.value"
@@ -379,7 +378,7 @@
              </el-select>
            </el-form-item>
            <el-form-item label="被授权人:" >
              <el-select :disabled="isUp" v-model="formData2.authorizedPerson" size="small" multiple placeholder="请选择" style="width:100%">
              <el-select v-model="formData2.authorizedPerson" size="small" multiple placeholder="请选择" style="width:100%">
                <el-option
                  v-for="item in authorizerList"
                  :key="item.value"
@@ -395,17 +394,16 @@
      <el-col  :span="7">
        <el-form :label-position="labelPosition" :model="formData2" label-width="116px">
          <el-form-item label="设备名称:" >
            <el-input :disabled="isUp" v-model="formData2.deviceName" size="small"></el-input>
            <el-input v-model="formData2.deviceName" size="small"></el-input>
          </el-form-item>
          <el-form-item label="内部编码:">
            <el-input :disabled="isUp" v-model="formData2.internalCode" size="small"></el-input>
            <el-input v-model="formData2.internalCode" size="small"></el-input>
          </el-form-item>
          <el-form-item label="资产编码:" >
            <el-input :disabled="isUp" v-model="formData2.assetCode" size="small"></el-input>
            <el-input v-model="formData2.assetCode" size="small"></el-input>
          </el-form-item>
          <el-form-item label="校准日期(月):" >
            <el-date-picker
              :disabled="isUp"
              v-model="formData2.calibrationDate"
              type="month"
              size="small"
@@ -418,7 +416,6 @@
            <el-form-item label="报废时间:" >
              <el-date-picker
              style="width:100%"
                :disabled="isUp"
                v-model="formData2.scrapTime"
                type="datetime"
                format="yyyy-MM-dd HH:mm:ss"
@@ -428,15 +425,14 @@
              </el-date-picker>
            </el-form-item>
            <el-form-item label="验收记录:" >
            <el-input :disabled="isUp" v-model="formData2.acceptanceRecords" size="small"></el-input>
            <el-input v-model="formData2.acceptanceRecords" size="small"></el-input>
            </el-form-item>
            <el-form-item label="出厂编号:" >
            <el-input :disabled="isUp" v-model="formData2.factoryNo" size="small"></el-input>
            <el-input v-model="formData2.factoryNo" size="small"></el-input>
            </el-form-item>
            <el-form-item label="购置日期:" >
              <el-date-picker
              style="width:100%"
                :disabled="isUp"
                v-model="formData2.acquisitionDate"
                type="datetime"
                size="small"
@@ -446,10 +442,10 @@
              </el-date-picker>
            </el-form-item>
            <el-form-item label="准确度量值:" >
            <el-input :disabled="isUp" v-model="formData2.accurateMeasurement" size="small"></el-input>
            <el-input v-model="formData2.accurateMeasurement" size="small"></el-input>
            </el-form-item>
            <el-form-item label="备注:" >
            <el-input :disabled="isUp" v-model="formData2.notes" size="small"></el-input>
            <el-input v-model="formData2.notes" size="small"></el-input>
            </el-form-item>
          </el-form>
      </el-col>
@@ -457,10 +453,10 @@
      <el-col  :span="7">
        <el-form :label-position="labelPosition" :model="formData2" label-width="110px" ref="ruleForm">
          <el-form-item label="规格型号:" >
            <el-input :disabled="isUp" v-model="formData2.specificationModel" size="small"></el-input>
            <el-input v-model="formData2.specificationModel" size="small"></el-input>
          </el-form-item>
          <el-form-item label="设备状态:">
            <el-select :disabled="isUp" v-model="formData2.deviceStatus" placeholder="请选择" size="small" style="width:100%">
            <el-select v-model="formData2.deviceStatus" placeholder="请选择" size="small" style="width:100%">
                <el-option
                  v-for="item in deviceStatusList"
                  :key="item.value"
@@ -471,12 +467,11 @@
              </el-select>
          </el-form-item>
          <el-form-item label="存放点:" >
            <el-input :disabled="isUp" v-model="formData2.storagePoint" size="small"></el-input>
            <el-input v-model="formData2.storagePoint" size="small"></el-input>
          </el-form-item>
          <el-form-item label="最近追溯日期:" >
            <el-date-picker
              style="width:100%"
                :disabled="isUp"
                v-model="formData2.latestTraceability"
                format="yyyy-MM-dd HH:mm:ss"
                value-format="yyyy-MM-dd HH:mm:ss"
@@ -488,7 +483,6 @@
            <el-form-item label="停用时间:" >
              <el-date-picker
              style="width:100%"
                :disabled="isUp"
                format="yyyy-MM-dd HH:mm:ss"
                value-format="yyyy-MM-dd HH:mm:ss"
                v-model="formData2.downTime"
@@ -498,16 +492,16 @@
              </el-date-picker>
            </el-form-item>
            <el-form-item label="维修记录:" >
            <el-input :disabled="isUp" v-model="formData2.maintenanceRecords" size="small"></el-input>
            <el-input v-model="formData2.maintenanceRecords" size="small"></el-input>
            </el-form-item>
            <el-form-item label="生产厂家:" >
            <el-input :disabled="isUp" v-model="formData2.manufacturer" size="small" ></el-input>
            <el-input v-model="formData2.manufacturer" size="small" ></el-input>
            </el-form-item>
            <el-form-item label="采购费用:" >
            <el-input :disabled="isUp" v-model="formData2.procurementCosts" size="small"></el-input>
            <el-input v-model="formData2.procurementCosts" size="small"></el-input>
            </el-form-item>
            <el-form-item label="校准证书:" >
            <el-input :disabled="isUp" v-model="formData2.calibrationCerticate" size="small"></el-input>
            <el-input v-model="formData2.calibrationCerticate" size="small"></el-input>
            </el-form-item>
            <el-form-item v-if="!isUp" label="图片:" >
              <div style="border: 1px solid #DCDFE6;border-radius:4px;height:32px;lineHeight:32px;display:flex;justify-content: space-around;font-size: 13px;">
@@ -673,12 +667,12 @@
            },
      // 获取授权人
      getAuthorizedPerson(){
        this.$axios.get(this.$api.deviceScope.authorizedPerson).then(res => {
        this.$axios.get(this.$api.deviceScope.selectDevicePrincipal).then(res => {
                    let data = []
                    res.data.forEach(a=>{
                        data.push({
                            label: a.authorizedPerson,
                            value: a.authorizedPerson
                            label: a.name,
                            value: a.id
                        })
                    })
                    this.authorizerList = data
@@ -703,8 +697,8 @@
                    let data = []
                    res.data.forEach(a=>{
                        data.push({
                            label: a.equipmentManager,
                            value: a.equipmentManager
                            label: a.name,
                            value: a.id
                        })
                    })
                    this.responsiblePersonList = data