BUG修改

liuchengxin

2022-06-06 4001279159dd37942b3cf4c83ab537f95832a82d

 src/views/device/equipment/index.vue

@@ -139,23 +139,19 @@
          {{formatZero(scope.row.serialNumber, 4)}}
        </template>
      </el-table-column>
      <el-table-column label="设备类型" align="center" prop="type">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT101" :value="scope.row.type"/>
        </template>
      </el-table-column>
      <el-table-column label="硬件序列码" align="center" prop="sequenceCode"/>
      <el-table-column label="软件版本" align="center" prop="edition"/>
      <el-table-column label="学校名称" align="center" prop="schoolId_dictText"/>
      <el-table-column label="主机ID" align="center" prop="hostId"/>
      <el-table-column label="β网络ID" align="center" prop="networkId"/>
      <el-table-column label="β工作频段" align="center" prop="frequencyBand">
      <el-table-column label="设备类型" min-width="120" align="center" prop="type_dictText" show-overflow-tooltip/>
      <el-table-column label="硬件序列码" min-width="180" align="center" prop="sequenceCode" show-overflow-tooltip/>
      <el-table-column label="软件版本" align="center" min-width="120" prop="edition" show-overflow-tooltip/>
      <el-table-column label="学校名称" align="center" prop="schoolId_dictText" show-overflow-tooltip/>
      <el-table-column label="主机ID" align="center" min-width="120" prop="hostId" show-overflow-tooltip/>
      <el-table-column label="β网络ID" align="center" prop="networkId" show-overflow-tooltip/>
      <el-table-column label="β工作频段" align="center" prop="frequencyBand" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT102" :value="scope.row.frequencyBand"/>
        </template>
      </el-table-column>
      <el-table-column label="生产批次" align="center" prop="batchId_dictText"/>
      <el-table-column label="在用" align="center" prop="useStatus">
      <el-table-column label="生产批次" min-width="150" align="center" prop="batchId_dictText" show-overflow-tooltip/>
      <el-table-column label="在用" align="center" prop="useStatus" show-overflow-tooltip>
        <template slot-scope="scope">
          <dict-tag :options="dict.type.DICT104" :value="scope.row.useStatus"/>
        </template>
@@ -192,7 +188,7 @@
    />

    <!-- 添加或修改智控设备对话框 -->
    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="500px" append-to-body>
    <Dialog :title="title" :visible.sync="open" width="50%" :append-to-body="true" :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="序列号" prop="serialNumber">
          <el-input v-model="form.serialNumber" :disabled="disabled" placeholder="请输入序列号"/>
@@ -267,7 +263,7 @@
        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
    </Dialog>
  </div>
</template>

@@ -339,12 +335,12 @@
        hostId: [
          {required: true, message: "主机ID不能为空", trigger: "blur"}
        ],
        networkId: [
          {required: true, message: "β网络ID不能为空", trigger: "blur"}
        ],
        frequencyBand: [
          {required: true, message: "β工作频段不能为空", trigger: "blur"}
        ],
        // networkId: [
        //   {required: true, message: "β网络ID不能为空", trigger: "blur"}
        // ],
        // frequencyBand: [
        //   {required: true, message: "β工作频段不能为空", trigger: "blur"}
        // ],
        batchId: [
          {required: true, message: "生产批次不能为空", trigger: "blur"}
        ],
@@ -361,7 +357,7 @@
  },
  created() {
    this.getList();
    this.getSchool()
    //this.getSchool()
    this.getBatch()
  },
  methods: {
@@ -370,6 +366,7 @@
      this.loading = true;
      listEquipment(this.queryParams).then(response => {
        this.equipmentList = response.rows;
        console.log(this.equipmentList);
        this.total = response.total;
        this.loading = false;
      });