From f8e7dc84f30df6dbac5d32ce84a85c7d804f0f9d Mon Sep 17 00:00:00 2001 From: liuchengxin <13104445455@126.com> Date: 星期五, 07 一月 2022 18:31:14 +0800 Subject: [PATCH] 代码提交 --- src/views/basics/manufacturer/index.vue | 3 src/views/basics/school/index.vue | 85 ++++++++-------- src/views/device/equipment/index.vue | 79 ++++++++------- src/views/system/role/index.vue | 7 src/views/system/user/index.vue | 27 ++-- src/assets/styles/index.scss | 4 src/views/device/peripheralUnit/index.vue | 22 ++-- src/views/system/dept/index.vue | 5 src/layout/components/Navbar.vue | 20 ++-- src/views/system/dict/data.vue | 4 src/views/device/batch/index.vue | 3 src/views/system/dict/index.vue | 3 12 files changed, 139 insertions(+), 123 deletions(-) diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 96095ef..c799ce6 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -189,3 +189,7 @@ .multiselect--active { z-index: 1000 !important; } + +.del-btn { + color: #ff0000; +} diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 1c192d5..31d9b3c 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -6,16 +6,16 @@ <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/> <div class="right-menu"> - <template v-if="device!=='mobile'"> - <search id="header-search" class="right-menu-item" /> + <!--<template v-if="device!=='mobile'">--> + <!--<search id="header-search" class="right-menu-item" />--> - <screenfull id="screenfull" class="right-menu-item hover-effect" /> + <!--<screenfull id="screenfull" class="right-menu-item hover-effect" />--> - <el-tooltip content="甯冨眬澶у皬" effect="dark" placement="bottom"> - <size-select id="size-select" class="right-menu-item hover-effect" /> - </el-tooltip> + <!--<el-tooltip content="甯冨眬澶у皬" effect="dark" placement="bottom">--> + <!--<size-select id="size-select" class="right-menu-item hover-effect" />--> + <!--</el-tooltip>--> - </template> + <!--</template>--> <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click"> <div class="avatar-wrapper"> @@ -26,9 +26,9 @@ <router-link to="/user/profile"> <el-dropdown-item>涓汉涓績</el-dropdown-item> </router-link> - <el-dropdown-item @click.native="setting = true"> - <span>甯冨眬璁剧疆</span> - </el-dropdown-item> + <!--<el-dropdown-item @click.native="setting = true">--> + <!--<span>甯冨眬璁剧疆</span>--> + <!--</el-dropdown-item>--> <el-dropdown-item divided @click.native="logout"> <span>閫�鍑虹櫥褰�</span> </el-dropdown-item> diff --git a/src/views/basics/manufacturer/index.vue b/src/views/basics/manufacturer/index.vue index a12101b..27f4efc 100644 --- a/src/views/basics/manufacturer/index.vue +++ b/src/views/basics/manufacturer/index.vue @@ -114,6 +114,7 @@ size="mini" type="text" icon="el-icon-delete" + class="del-btn" @click="handleDelete(scope.row)" v-hasPermi="['oa:manufacturer:remove']" >鍒犻櫎</el-button> @@ -321,7 +322,7 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const ids = row.id || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎鍘傚晢缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => { + this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => { this.loading = true; return delManufacturer(ids); }).then(() => { diff --git a/src/views/basics/school/index.vue b/src/views/basics/school/index.vue index a65241b..7c164e1 100644 --- a/src/views/basics/school/index.vue +++ b/src/views/basics/school/index.vue @@ -19,47 +19,47 @@ @keyup.enter.native="handleQuery" /> </el-form-item> - <el-form-item label="鐪佷唤" prop="provinceCode"> - <el-select v-model="queryParams.provinceCode" placeholder="璇烽�夋嫨鐪佷唤" clearable size="small" - @change="provinceQueryChange"> - <el-option - v-for="item in provinceList" - :key="item.provinceCode" - :label="item.provinceName" - :value="item.provinceCode" - /> - </el-select> - </el-form-item> - <el-form-item label="鍩庡競" prop="cityCode"> - <el-select v-model="queryParams.cityCode" placeholder="璇烽�夋嫨鐪佷唤" clearable size="small"> - <el-option - v-for="item in cityList" - :key="item.cityCode" - :label="item.cityName" - :value="item.cityCode" - /> - </el-select> - </el-form-item> - <el-form-item label="鍔炲灞傛" prop="schoolRunLevel"> - <el-select v-model="queryParams.schoolRunLevel" placeholder="璇烽�夋嫨鍔炲灞傛" clearable size="small"> - <el-option - v-for="dict in dict.type.DICT105" - :key="dict.value" - :label="dict.label" - :value="dict.value" - /> - </el-select> - </el-form-item> - <el-form-item label="瀛︾鑼冨洿" prop="disciplineScope"> - <el-select v-model="queryParams.disciplineScope" placeholder="璇烽�夋嫨瀛︾鑼冨洿" clearable size="small"> - <el-option - v-for="dict in dict.type.DICT106" - :key="dict.value" - :label="dict.label" - :value="dict.value" - /> - </el-select> - </el-form-item> + <!--<el-form-item label="鐪佷唤" prop="provinceCode">--> + <!--<el-select v-model="queryParams.provinceCode" placeholder="璇烽�夋嫨鐪佷唤" clearable size="small"--> + <!--@change="provinceQueryChange">--> + <!--<el-option--> + <!--v-for="item in provinceList"--> + <!--:key="item.provinceCode"--> + <!--:label="item.provinceName"--> + <!--:value="item.provinceCode"--> + <!--/>--> + <!--</el-select>--> + <!--</el-form-item>--> + <!--<el-form-item label="鍩庡競" prop="cityCode">--> + <!--<el-select v-model="queryParams.cityCode" placeholder="璇烽�夋嫨鐪佷唤" clearable size="small">--> + <!--<el-option--> + <!--v-for="item in cityList"--> + <!--:key="item.cityCode"--> + <!--:label="item.cityName"--> + <!--:value="item.cityCode"--> + <!--/>--> + <!--</el-select>--> + <!--</el-form-item>--> + <!--<el-form-item label="鍔炲灞傛" prop="schoolRunLevel">--> + <!--<el-select v-model="queryParams.schoolRunLevel" placeholder="璇烽�夋嫨鍔炲灞傛" clearable size="small">--> + <!--<el-option--> + <!--v-for="dict in dict.type.DICT105"--> + <!--:key="dict.value"--> + <!--:label="dict.label"--> + <!--:value="dict.value"--> + <!--/>--> + <!--</el-select>--> + <!--</el-form-item>--> + <!--<el-form-item label="瀛︾鑼冨洿" prop="disciplineScope">--> + <!--<el-select v-model="queryParams.disciplineScope" placeholder="璇烽�夋嫨瀛︾鑼冨洿" clearable size="small">--> + <!--<el-option--> + <!--v-for="dict in dict.type.DICT106"--> + <!--: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> @@ -151,6 +151,7 @@ <el-button size="mini" type="text" + class="del-btn" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['oa:school:remove']" @@ -413,7 +414,7 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const ids = row.id || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎瀛︽牎缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => { + this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => { this.loading = true; return delSchool(ids); }).then(() => { diff --git a/src/views/device/batch/index.vue b/src/views/device/batch/index.vue index 886eb50..eac0486 100644 --- a/src/views/device/batch/index.vue +++ b/src/views/device/batch/index.vue @@ -100,6 +100,7 @@ size="mini" type="text" icon="el-icon-delete" + class="del-btn" @click="handleDelete(scope.row)" v-hasPermi="['oa:batch:remove']" >鍒犻櫎</el-button> @@ -301,7 +302,7 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const ids = row.id || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎鐢熶骇鎵规缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => { + this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => { this.loading = true; return delBatch(ids); }).then(() => { diff --git a/src/views/device/equipment/index.vue b/src/views/device/equipment/index.vue index ccd52b4..6e5bd87 100644 --- a/src/views/device/equipment/index.vue +++ b/src/views/device/equipment/index.vue @@ -20,15 +20,15 @@ @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="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 @@ -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> @@ -174,6 +174,7 @@ size="mini" type="text" icon="el-icon-delete" + class="del-btn" @click="handleDelete(scope.row)" v-hasPermi="['oa:equipment:remove']" >鍒犻櫎 @@ -495,7 +496,7 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const ids = row.id || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎鏅烘帶璁惧缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => { + this.$modal.confirm('鏄惁纭鍒狅紵').then(() => { this.loading = true; return delEquipment(ids); }).then(() => { diff --git a/src/views/device/peripheralUnit/index.vue b/src/views/device/peripheralUnit/index.vue index 712b727..a5d36be 100644 --- a/src/views/device/peripheralUnit/index.vue +++ b/src/views/device/peripheralUnit/index.vue @@ -129,7 +129,7 @@ <dict-tag :options="dict.type.DICT103" :value="scope.row.baudRate"/> </template> </el-table-column> - <el-table-column label="璇绘暟鎸囦护" align="center" prop="readInstruction"/> + <el-table-column label="璇绘暟鎸囦护" align="center" width="180" prop="readInstruction"/> <el-table-column label="鍥炴暟闀垮害" align="center" prop="loopLength"/> <el-table-column label="鍔熻兘鎻忚堪" align="center" prop="description"/> <el-table-column label="鎿嶄綔" align="center" fixed="right" width="240" class-name="small-padding fixed-width"> @@ -137,7 +137,7 @@ <el-button size="mini" type="text" - icon="el-icon-edit" + icon="el-icon-view" @click="handleInfo(scope.row)" v-hasPermi="['oa:peripheralUnit:info']" >鏌ョ湅 @@ -153,17 +153,18 @@ <el-button size="mini" type="text" - icon="el-icon-delete" - @click="handleDelete(scope.row)" - v-hasPermi="['oa:peripheralUnit:remove']" - >鍒犻櫎 + icon="el-icon-document" + @click="handleUpload(scope.row)" + >闄勪欢 </el-button> <el-button size="mini" type="text" icon="el-icon-delete" - @click="handleUpload(scope.row)" - >闄勪欢 + class="del-btn" + @click="handleDelete(scope.row)" + v-hasPermi="['oa:peripheralUnit:remove']" + >鍒犻櫎 </el-button> </template> </el-table-column> @@ -305,7 +306,8 @@ {required: true, message: "澶栬浠g爜涓嶈兘涓虹┖", trigger: "blur"} ], name: [ - {required: true, message: "澶栬鍚嶇О涓嶈兘涓虹┖", trigger: "blur"} + {required: true, message: "澶栬鍚嶇О涓嶈兘涓虹┖", trigger: "blur"}, + {max: 32, message: '鏈�澶氳緭鍏�32涓枃瀛楃', trigger: 'blur' } ], model: [ {required: true, message: "瑙勬牸鍨嬪彿涓嶈兘涓虹┖", trigger: "blur"} @@ -462,7 +464,7 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const ids = row.id || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎澶栬鍗曞厓缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(() => { + this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => { this.loading = true; return delPeripheralUnit(ids); }).then(() => { diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index ca4e365..2278d65 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -105,6 +105,7 @@ size="mini" type="text" icon="el-icon-delete" + class="del-btn" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']" >鍒犻櫎 @@ -201,7 +202,7 @@ title="鏈烘瀯鎴愬憳" :visible.sync="drawer" direction="rtl" - size="50%"> + size="500px"> <el-table :data="userTable"> <el-table-column property="nickName" label="濮撳悕" width="150"></el-table-column> <el-table-column property="phonenumber" label="鐢佃瘽" width="200"></el-table-column> @@ -417,7 +418,7 @@ }, /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { - this.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.deptName + '"鐨勬暟鎹」锛�').then(function () { + this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function () { return delDept(row.deptId); }).then(() => { this.getList(); diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue index bf538ad..756dee2 100644 --- a/src/views/system/dict/data.vue +++ b/src/views/system/dict/data.vue @@ -65,6 +65,7 @@ icon="el-icon-delete" size="mini" :disabled="multiple" + class="del-btn" @click="handleDelete" v-hasPermi="['system:dict:remove']" >鍒犻櫎</el-button> @@ -126,6 +127,7 @@ size="mini" type="text" icon="el-icon-delete" + class="del-btn" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']" >鍒犻櫎</el-button> @@ -382,7 +384,7 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const dictCodes = row.dictCode || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎瀛楀吀缂栫爜涓�"' + dictCodes + '"鐨勬暟鎹」锛�').then(function() { + this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function() { return delData(dictCodes); }).then(() => { this.getList(); diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue index fed26e3..e9eb376 100644 --- a/src/views/system/dict/index.vue +++ b/src/views/system/dict/index.vue @@ -146,6 +146,7 @@ size="mini" type="text" icon="el-icon-delete" + class="del-btn" @click="handleDelete(scope.row)" v-hasPermi="['system:dict:remove']" >鍒犻櫎</el-button> @@ -326,7 +327,7 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const dictIds = row.dictId || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎瀛楀吀缂栧彿涓�"' + dictIds + '"鐨勬暟鎹」锛�').then(function() { + this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function() { return delType(dictIds); }).then(() => { this.getList(); diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 9c02f99..2fcc2e6 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -104,8 +104,8 @@ <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange"> <el-table-column type="selection" width="55" align="center" /> <el-table-column label="瑙掕壊缂栧彿" prop="roleId" width="150" /> - <el-table-column label="瑙掕壊鍚嶇О" prop="roleName" :show-overflow-tooltip="true" width="150" /> - <el-table-column label="瑙掕壊缂栧彿" prop="roleKey" :show-overflow-tooltip="true" width="150" /> + <el-table-column label="瑙掕壊鍚嶇О" prop="roleName" :show-overflow-tooltip="true" min-width="150" /> + <el-table-column label="瑙掕壊缂栧彿" prop="roleKey" :show-overflow-tooltip="true" min-width="150" /> <el-table-column label="鏄剧ず椤哄簭" prop="roleSort" width="150" /> <el-table-column label="鐘舵��" align="center" width="150"> <template slot-scope="scope"> @@ -135,6 +135,7 @@ size="mini" type="text" icon="el-icon-delete" + class="del-btn" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']" >鍒犻櫎</el-button> @@ -600,7 +601,7 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const roleIds = row.roleId || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎瑙掕壊缂栧彿涓�"' + roleIds + '"鐨勬暟鎹」锛�').then(function() { + this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function() { return delRole(roleIds); }).then(() => { this.getList(); diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 5beeeae..6d14bf3 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -64,18 +64,18 @@ /> </el-select> </el-form-item> - <el-form-item label="鍒涘缓鏃堕棿"> - <el-date-picker - v-model="dateRange" - size="small" - style="width: 240px" - value-format="yyyy-MM-dd" - type="daterange" - range-separator="-" - start-placeholder="寮�濮嬫棩鏈�" - end-placeholder="缁撴潫鏃ユ湡" - ></el-date-picker> - </el-form-item> + <!--<el-form-item label="鍒涘缓鏃堕棿">--> + <!--<el-date-picker--> + <!--v-model="dateRange"--> + <!--size="small"--> + <!--style="width: 240px"--> + <!--value-format="yyyy-MM-dd"--> + <!--type="daterange"--> + <!--range-separator="-"--> + <!--start-placeholder="寮�濮嬫棩鏈�"--> + <!--end-placeholder="缁撴潫鏃ユ湡"--> + <!--></el-date-picker>--> + <!--</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> @@ -179,6 +179,7 @@ size="mini" type="text" icon="el-icon-delete" + class="del-btn" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']" >鍒犻櫎</el-button> @@ -677,7 +678,7 @@ /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete(row) { const userIds = row.userId || this.ids; - this.$modal.confirm('鏄惁纭鍒犻櫎鐢ㄦ埛缂栧彿涓�"' + userIds + '"鐨勬暟鎹」锛�').then(function() { + this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(function() { return delUser(userIds); }).then(() => { this.getList(); -- Gitblit v1.9.1