From 4ef06d948899e393515bd62819f4f773766f9449 Mon Sep 17 00:00:00 2001
From: 唐耀东 <18861537@qq.com>
Date: 星期六, 16 七月 2022 13:16:42 +0800
Subject: [PATCH] 提交代码
---
src/views/device/equipment/index.vue | 164 ++++++++++++++++++++++++++++--------------------------
1 files changed, 84 insertions(+), 80 deletions(-)
diff --git a/src/views/device/equipment/index.vue b/src/views/device/equipment/index.vue
index 051ade7..479b0a8 100644
--- a/src/views/device/equipment/index.vue
+++ b/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="璇疯緭鍏ノ茬綉缁淚D"
- 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="璇疯緭鍏ノ茬綉缁淚D"-->
+ <!--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);
}
}
};
--
Gitblit v1.9.1