BUG修改

liuchengxin

2022-06-06 4001279159dd37942b3cf4c83ab537f95832a82d

 src/views/device/equipment/index.vue

@@ -20,17 +20,17 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="版本" prop="edition">
        <el-input
          v-model="queryParams.edition"
          placeholder="请输入版本"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="高校" prop="schoolId">
        <el-select v-model="queryParams.schoolId" placeholder="请选择高校" clearable size="small">
      <!--<el-form-item label="软件版本" prop="edition">-->
        <!--<el-input-->
          <!--v-model="queryParams.edition"-->
          <!--placeholder="请输入软件版本"-->
          <!--clearable-->
          <!--size="small"-->
          <!--@keyup.enter.native="handleQuery"-->
        <!--/>-->
      <!--</el-form-item>-->
      <el-form-item label="学校名称" prop="schoolId">
        <el-select v-model="queryParams.schoolId" placeholder="请选择学校名称" clearable size="small">
          <el-option
            v-for="item in querySchoolList"
            :key="item.id"
@@ -48,35 +48,35 @@
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="β网络ID" prop="networkId">
        <el-input
          v-model="queryParams.networkId"
          placeholder="请输入β网络ID"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="β工作频段" prop="frequencyBand">
        <el-select v-model="queryParams.frequencyBand" placeholder="请选择β工作频段" clearable size="small">
          <el-option
            v-for="dict in dict.type.DICT102"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <el-form-item label="在用状态" prop="useStatus">
        <el-select v-model="queryParams.useStatus" placeholder="请选择在用状态" clearable size="small">
          <el-option
            v-for="dict in dict.type.DICT104"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        </el-select>
      </el-form-item>
      <!--<el-form-item label="β网络ID" prop="networkId">-->
        <!--<el-input-->
          <!--v-model="queryParams.networkId"-->
          <!--placeholder="请输入β网络ID"-->
          <!--clearable-->
          <!--size="small"-->
          <!--@keyup.enter.native="handleQuery"-->
        <!--/>-->
      <!--</el-form-item>-->
      <!--<el-form-item label="β工作频段" prop="frequencyBand">-->
        <!--<el-select v-model="queryParams.frequencyBand" placeholder="请选择β工作频段" clearable size="small">-->
          <!--<el-option-->
            <!--v-for="dict in dict.type.DICT102"-->
            <!--:key="dict.value"-->
            <!--:label="dict.label"-->
            <!--:value="dict.value"-->
          <!--/>-->
        <!--</el-select>-->
      <!--</el-form-item>-->
      <!--<el-form-item label="在用状态" prop="useStatus">-->
        <!--<el-select v-model="queryParams.useStatus" placeholder="请选择在用状态" clearable size="small">-->
          <!--<el-option-->
            <!--v-for="dict in dict.type.DICT104"-->
            <!--:key="dict.value"-->
            <!--:label="dict.label"-->
            <!--:value="dict.value"-->
          <!--/>-->
        <!--</el-select>-->
      <!--</el-form-item>-->
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -84,17 +84,17 @@
    </el-form>

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['oa:equipment:add']"
        >新增
        </el-button>
      </el-col>
      <!--      <el-col :span="1.5">-->
      <!--        <el-button-->
      <!--          type="primary"-->
      <!--          plain-->
      <!--          icon="el-icon-plus"-->
      <!--          size="mini"-->
      <!--          @click="handleAdd"-->
      <!--          v-hasPermi="['oa:equipment:add']"-->
      <!--        >新增-->
      <!--        </el-button>-->
      <!--      </el-col>-->
      <el-col :span="1.5">
        <el-button
          type="success"
@@ -134,33 +134,29 @@

    <el-table v-loading="loading" :data="equipmentList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center"/>
      <el-table-column label="序号" align="center" width="50">
      <el-table-column label="序列号" align="center" width="100">
        <template slot-scope="scope">
          <span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
          {{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>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
      <el-table-column label="操作" fixed="right" width="120" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
@@ -174,6 +170,7 @@
            size="mini"
            type="text"
            icon="el-icon-delete"
            class="del-btn"
            @click="handleDelete(scope.row)"
            v-hasPermi="['oa:equipment:remove']"
          >删除
@@ -191,8 +188,8 @@
    />

    <!-- 添加或修改智控设备对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
    <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="请输入序列号"/>
        </el-form-item>
@@ -202,11 +199,11 @@
              v-for="dict in dict.type.DICT101"
              :key="dict.value"
              :label="dict.label"
              :value="parseInt(dict.value)"
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="序列码" prop="sequenceCode">
        <el-form-item label="硬件序列码" prop="sequenceCode">
          <el-input v-model="form.sequenceCode" :disabled="disabled" placeholder="请输入序列码"/>
        </el-form-item>
        <el-form-item label="版本" prop="edition">
@@ -266,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>

@@ -338,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"}
        ],
@@ -360,7 +357,7 @@
  },
  created() {
    this.getList();
    this.getSchool()
    //this.getSchool()
    this.getBatch()
  },
  methods: {
@@ -369,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;
      });
@@ -462,6 +460,7 @@
      getEquipment(id).then(response => {
        this.loading = false;
        this.form = response.data;
        this.form.serialNumber = this.formatZero(this.form.serialNumber, 4);
        this.open = true;
        this.title = "修改智控设备";
      });
@@ -494,7 +493,7 @@
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除智控设备编号为"' + ids + '"的数据项？').then(() => {
      this.$modal.confirm(`是否确认删序列号为${this.formatZero(row.serialNumber, 4)}的指控设备？`).then(() => {
        this.loading = true;
        return delEquipment(ids);
      }).then(() => {
@@ -510,6 +509,11 @@
      this.download('oa/equipment/export', {
        ...this.queryParams
      }, `equipment_${new Date().getTime()}.xlsx`)
    },
    // 数字位数不够，前面位数补零
    formatZero(num, len) {
      if (String(num).length > len) return num;
      return (Array(len).join(0) + num).slice(-len);
    }
  }
};