From 5a1cbbd198bc9c0a6a8af83985c75e96ae25ab9c Mon Sep 17 00:00:00 2001
From: liuchengxin <13104445455@126.com>
Date: 星期四, 27 一月 2022 11:28:36 +0800
Subject: [PATCH] 问题修改
---
src/views/system/config/index.vue | 4
src/views/system/role/index.vue | 8
src/views/device/peripheralUnit/index.vue | 10
src/views/system/oss/config.vue | 4
src/views/system/user/profile/userAvatar.vue | 4
src/components/Dialog/index.vue | 224 +++++++++++++++++++++++++++++++++++++
src/views/monitor/logininfor/index.vue | 2
src/views/monitor/operlog/index.vue | 4
src/views/basics/school/index.vue | 4
src/views/system/menu/index.vue | 4
src/views/system/dict/data.vue | 4
src/views/system/role/selectUser.vue | 4
src/views/device/batch/index.vue | 4
src/components/ImageUpload/index.vue | 6
src/views/system/dept/index.vue | 6
src/views/system/post/index.vue | 4
src/views/demo/tree/index.vue | 4
src/components/RightToolbar/index.vue | 4
src/views/system/oss/index.vue | 4
src/views/basics/manufacturer/index.vue | 4
src/views/device/equipment/index.vue | 16 +-
src/views/system/user/index.vue | 8
src/main.js | 3
src/views/tool/gen/index.vue | 2
src/views/demo/demo/index.vue | 6
src/views/system/notice/index.vue | 4
src/views/system/dict/index.vue | 4
27 files changed, 291 insertions(+), 64 deletions(-)
diff --git a/src/components/Dialog/index.vue b/src/components/Dialog/index.vue
new file mode 100644
index 0000000..bb438c6
--- /dev/null
+++ b/src/components/Dialog/index.vue
@@ -0,0 +1,224 @@
+<template>
+ <transition
+ name="dialog-fade"
+ @after-enter="afterEnter"
+ @after-leave="afterLeave">
+ <div
+ v-show="visible"
+ class="el-dialog__wrapper else close-on-mousedown" @mousedown.self="handleWrapperClick" @mouseup.self="handleWrapperUpClick">
+ <!-- 姝ゅ锛屾坊鍔犱簡涓や釜绫诲悕锛屼綔涓鸿皟璇曟椂鐨勮瘑鍒� -->
+
+ <!-- 姝ゅ灏嗗師鏉ョ粍浠朵腑鐨� @click 鏇挎崲涓� @mousedown锛屽姝や竴鏉ワ紝鍦ㄩ伄缃╁眰涓� mouseup 鏃朵篃涓嶄細鎰忓瑙﹀彂寮圭獥鐨勫叧闂� -->
+ <div
+ role="dialog"
+ :key="key"
+ aria-modal="true"
+ :aria-label="title || 'dialog'"
+ :class="['el-dialog', { 'is-fullscreen': fullscreen, 'el-dialog--center': center }, customClass]"
+ ref="dialog"
+ :style="style">
+ <div class="el-dialog__header">
+ <slot name="title">
+ <span class="el-dialog__title">{{ title }}</span>
+ </slot>
+ <button
+ type="button"
+ class="el-dialog__headerbtn"
+ aria-label="Close"
+ v-if="showClose"
+ @click="handleClose">
+ <i class="el-dialog__close el-icon el-icon-close"></i>
+ </button>
+ </div>
+ <div class="el-dialog__body" v-if="rendered"><slot></slot></div>
+ <div class="el-dialog__footer" v-if="$slots.footer">
+ <slot name="footer"></slot>
+ </div>
+ </div>
+ </div>
+ </transition>
+</template>
+
+<script>
+ import Popup from 'element-ui/src/utils/popup';
+ import Migrating from 'element-ui/src/mixins/migrating';
+ import emitter from 'element-ui/src/mixins/emitter';
+
+ export default {
+ name: 'ElseDialog',
+
+ mixins: [Popup, emitter, Migrating],
+
+ props: {
+ title: {
+ type: String,
+ default: ''
+ },
+
+ modal: {
+ type: Boolean,
+ default: true
+ },
+
+ modalAppendToBody: {
+ type: Boolean,
+ default: true
+ },
+
+ appendToBody: {
+ type: Boolean,
+ default: false
+ },
+
+ lockScroll: {
+ type: Boolean,
+ default: true
+ },
+
+ closeOnClickModal: {
+ type: Boolean,
+ default: true
+ },
+
+ closeOnPressEscape: {
+ type: Boolean,
+ default: true
+ },
+
+ showClose: {
+ type: Boolean,
+ default: true
+ },
+
+ width: String,
+
+ fullscreen: Boolean,
+
+ customClass: {
+ type: String,
+ default: ''
+ },
+
+ top: {
+ type: String,
+ default: '15vh'
+ },
+ beforeClose: Function,
+ center: {
+ type: Boolean,
+ default: false
+ },
+
+ destroyOnClose: Boolean
+ },
+
+ data() {
+ return {
+ closed: false,
+ key: 0,
+ isClose: false
+ };
+ },
+
+ watch: {
+ visible(val) {
+ if (val) {
+ this.closed = false;
+ this.$emit('open');
+ this.$el.addEventListener('scroll', this.updatePopper);
+ this.$nextTick(() => {
+ this.$refs.dialog.scrollTop = 0;
+ });
+ if (this.appendToBody) {
+ document.body.appendChild(this.$el);
+ }
+ } else {
+ this.$el.removeEventListener('scroll', this.updatePopper);
+ if (!this.closed) this.$emit('close');
+ if (this.destroyOnClose) {
+ this.$nextTick(() => {
+ this.key++;
+ });
+ }
+ }
+ }
+ },
+
+ computed: {
+ style() {
+ let style = {};
+ if (!this.fullscreen) {
+ style.marginTop = this.top;
+ if (this.width) {
+ style.width = this.width;
+ }
+ }
+ return style;
+ }
+ },
+
+ methods: {
+ getMigratingConfig() {
+ return {
+ props: {
+ 'size': 'size is removed.'
+ }
+ };
+ },
+ handleWrapperClick(e) {
+ this.isClose = true
+ // if (!this.closeOnClickModal) return;
+ // this.handleClose();
+ },
+ handleWrapperUpClick (e) {
+ if (!this.closeOnClickModal) return;
+ console.log(this.isClose)
+ if (!this.isClose) return
+ console.log(123)
+ this.handleClose();
+ },
+ handleClose() {
+ if (typeof this.beforeClose === 'function') {
+ this.beforeClose(this.hide);
+ } else {
+ this.hide();
+ }
+ },
+ hide(cancel) {
+ if (cancel !== false) {
+ this.$emit('update:visible', false);
+ this.$emit('close');
+ this.closed = true;
+ }
+ },
+ updatePopper() {
+ this.broadcast('ElSelectDropdown', 'updatePopper');
+ this.broadcast('ElDropdownMenu', 'updatePopper');
+ },
+ afterEnter() {
+ this.$emit('opened');
+ },
+ afterLeave() {
+ this.isClose = false
+ this.$emit('closed');
+ }
+ },
+
+ mounted() {
+ if (this.visible) {
+ this.rendered = true;
+ this.open();
+ if (this.appendToBody) {
+ document.body.appendChild(this.$el);
+ }
+ }
+ },
+
+ destroyed() {
+ // if appendToBody is true, remove DOM node after destroy
+ if (this.appendToBody && this.$el && this.$el.parentNode) {
+ this.$el.parentNode.removeChild(this.$el);
+ }
+ }
+ };
+</script>
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index fcf010d..4b0d226 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -18,7 +18,7 @@
>
<i class="el-icon-plus"></i>
</el-upload>
-
+
<!-- 涓婁紶鎻愮ず -->
<div class="el-upload__tip" slot="tip" v-if="showTip">
璇蜂笂浼�
@@ -27,7 +27,7 @@
鐨勬枃浠�
</div>
- <el-dialog
+ <Dialog
:visible.sync="dialogVisible"
title="棰勮"
width="800"
@@ -37,7 +37,7 @@
:src="dialogImageUrl"
style="display: block; max-width: 100%; margin: 0 auto"
/>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index f7663a3..ca677cf 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -11,14 +11,14 @@
<el-button size="mini" circle icon="el-icon-menu" @click="showColumn()" />
</el-tooltip>
</el-row>
- <el-dialog :title="title" :visible.sync="open" append-to-body>
+ <Dialog :title="title" :visible.sync="open" append-to-body>
<el-transfer
:titles="['鏄剧ず', '闅愯棌']"
v-model="value"
:data="columns"
@change="dataChange"
></el-transfer>
- </el-dialog>
+ </Dialog>
</div>
</template>
<script>
diff --git a/src/main.js b/src/main.js
index 29c4022..02e2329 100644
--- a/src/main.js
+++ b/src/main.js
@@ -35,6 +35,8 @@
import VueMeta from 'vue-meta'
// 瀛楀吀鏁版嵁缁勪欢
import DictData from '@/components/DictData'
+// 寮瑰嚭灞傜粍浠�
+import Dialog from '@/components/Dialog/index'
// 鍏ㄥ眬鏂规硶鎸傝浇
Vue.prototype.getDicts = getDicts
@@ -54,6 +56,7 @@
Vue.component('Editor', Editor)
Vue.component('FileUpload', FileUpload)
Vue.component('ImageUpload', ImageUpload)
+Vue.component('Dialog', Dialog)
Vue.use(directive)
Vue.use(plugins)
diff --git a/src/views/basics/manufacturer/index.vue b/src/views/basics/manufacturer/index.vue
index 2a7b12a..b097050 100644
--- a/src/views/basics/manufacturer/index.vue
+++ b/src/views/basics/manufacturer/index.vue
@@ -131,7 +131,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="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鍘傚晢鍚嶇О" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ュ巶鍟嗗悕绉�" />
@@ -153,7 +153,7 @@
<el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/basics/school/index.vue b/src/views/basics/school/index.vue
index 0ce859a..5c76ac7 100644
--- a/src/views/basics/school/index.vue
+++ b/src/views/basics/school/index.vue
@@ -170,7 +170,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="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="瀛︽牎浠ｇ爜" prop="code">
<el-input v-model="form.code" placeholder="璇疯緭鍏ュ鏍′唬鐮�"/>
@@ -227,7 +227,7 @@
<el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index 8434907..ba3f119 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -143,7 +143,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀规祴璇曞崟琛ㄥ璇濇 -->
- <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="500px" append-to-body>
+ <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="閮ㄩ棬id" prop="deptId">
<el-input v-model="form.deptId" placeholder="璇疯緭鍏ラ儴闂╥d" />
@@ -175,7 +175,7 @@
</div>
</el-dialog>
<!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
- <el-dialog :title="upload.title" :close-on-click-modal="false" :visible.sync="upload.open" width="400px" append-to-body>
+ <Dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
ref="upload"
:limit="1"
@@ -195,7 +195,7 @@
<el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button>
<el-button @click="upload.open = false">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index 603d4d8..6c78c22 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -86,7 +86,7 @@
</el-table>
<!-- 娣诲姞鎴栦慨鏀规祴璇曟爲琛ㄥ璇濇 -->
- <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="500px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鐖秈d" prop="parentId">
<treeselect v-model="form.parentId" :options="treeOptions" :normalizer="normalizer" placeholder="璇烽�夋嫨鐖秈d" />
@@ -105,7 +105,7 @@
<el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/device/batch/index.vue b/src/views/device/batch/index.vue
index d5b0c59..577df13 100644
--- a/src/views/device/batch/index.vue
+++ b/src/views/device/batch/index.vue
@@ -117,7 +117,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="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鐢熶骇鎵规" prop="batch">
<el-input v-model="form.batch" placeholder="璇疯緭鍏ョ敓浜ф壒娆�" />
@@ -146,7 +146,7 @@
<el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/device/equipment/index.vue b/src/views/device/equipment/index.vue
index 0cac510..8e56435 100644
--- a/src/views/device/equipment/index.vue
+++ b/src/views/device/equipment/index.vue
@@ -139,15 +139,15 @@
{{formatZero(scope.row.serialNumber, 4)}}
</template>
</el-table-column>
- <el-table-column label="璁惧绫诲瀷" align="center" prop="type">
+ <el-table-column label="璁惧绫诲瀷" min-width="120" 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="纭欢搴忓垪鐮�" min-width="120" 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"/>
<el-table-column label="尾缃戠粶ID" align="center" prop="networkId"/>
<el-table-column label="尾宸ヤ綔棰戞" align="center" prop="frequencyBand">
<template slot-scope="scope">
@@ -192,9 +192,9 @@
/>
<!-- 娣诲姞鎴栦慨鏀规櫤鎺ц澶囧璇濇 -->
- <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>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
- <el-form-item label="搴忓垪鍙�" prop="serialNumber">
+ <el-form-item label="搴忓垪鍙�11" prop="serialNumber">
<el-input v-model="form.serialNumber" :disabled="disabled" placeholder="璇疯緭鍏ュ簭鍒楀彿"/>
</el-form-item>
<el-form-item label="璁惧绫诲瀷" prop="type">
@@ -267,7 +267,7 @@
<el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/device/peripheralUnit/index.vue b/src/views/device/peripheralUnit/index.vue
index d350538..d6a5142 100644
--- a/src/views/device/peripheralUnit/index.vue
+++ b/src/views/device/peripheralUnit/index.vue
@@ -121,7 +121,7 @@
</el-table-column>
<el-table-column label="澶栬浠ｇ爜" width="80" align="center" prop="code"/>
<el-table-column label="澶栬鍚嶇О" align="center" prop="name" show-overflow-tooltip/>
- <el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="model"/>
+ <el-table-column label="瑙勬牸鍨嬪彿" align="center" prop="model" min-width="120"/>
<el-table-column label="鐢熶骇鍘傚晢" align="center" prop="manufacturer_dictText"/>
<el-table-column label="鍘傚晢浠ｇ爜" width="100" align="center" prop="vendorCode_dictText"/>
<el-table-column label="娉㈢壒鐜�" width="100" align="center" prop="baudRate">
@@ -179,7 +179,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀瑰璁惧崟鍏冨璇濇 -->
- <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="50%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="澶栬浠ｇ爜" prop="code">
<el-input v-model="form.code" placeholder="璇疯緭鍏ュ璁句唬鐮�" :disabled="disabled"/>
@@ -230,10 +230,10 @@
<el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
<!-- 闄勪欢绐椾綋 -->
- <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="uploadFlag" width="500px" append-to-body>
+ <Dialog :title="title" :visible.sync="uploadFlag" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="闄勪欢">
<fileUpload v-model="form.filePath" limit="1"/>
@@ -243,7 +243,7 @@
<el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/monitor/logininfor/index.vue b/src/views/monitor/logininfor/index.vue
index 373e75d..8e133dd 100644
--- a/src/views/monitor/logininfor/index.vue
+++ b/src/views/monitor/logininfor/index.vue
@@ -93,7 +93,7 @@
<el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="璁块棶缂栧彿" align="center" prop="infoId" />
- <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
+ <el-table-column label="鐢ㄦ埛鍚嶇О" align="center" min-width="120" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
<el-table-column label="鐧诲綍鍦板潃" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
<el-table-column label="鐧诲綍鍦扮偣" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<el-table-column label="娴忚鍣�" align="center" prop="browser" :show-overflow-tooltip="true" />
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index c74c125..408a894 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -151,7 +151,7 @@
/>
<!-- 鎿嶄綔鏃ュ織璇︾粏 -->
- <el-dialog title="鎿嶄綔鏃ュ織璇︾粏" :close-on-click-modal="false" :visible.sync="open" width="700px" append-to-body>
+ <Dialog title="鎿嶄綔鏃ュ織璇︾粏" :visible.sync="open" width="700px" append-to-body>
<el-form ref="form" :model="form" label-width="100px" size="mini">
<el-row>
<el-col :span="12">
@@ -190,7 +190,7 @@
<div slot="footer" class="dialog-footer">
<el-button @click="open = false">鍏� 闂�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 694da80..bc04984 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -151,7 +151,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="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鍙傛暟鍚嶇О" prop="configName">
<el-input v-model="form.configName" placeholder="璇疯緭鍏ュ弬鏁板悕绉�" />
@@ -179,7 +179,7 @@
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 95610c0..d1c6c4d 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -69,7 +69,7 @@
</el-table-column>
<el-table-column prop="leaderName" label="涓昏礋璐ｄ汉" width="200"></el-table-column>
<el-table-column prop="leaderAssistantName" label="鍓礋璐ｄ汉" width="200"></el-table-column>
- <el-table-column prop="remarks" label="鏈烘瀯鑱岃兘" width="200"></el-table-column>
+ <el-table-column prop="remarks" label="鏈烘瀯鑱岃兘" width="200" show-overflow-tooltip></el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
@@ -115,7 +115,7 @@
</el-table>
<!-- 娣诲姞鎴栦慨鏀归儴闂ㄥ璇濇 -->
- <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="600px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24" v-if="form.parentId !== 0">
@@ -195,7 +195,7 @@
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
<!--鏈烘瀯鎴愬憳-->
<el-drawer
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index b29d15f..2fc0a85 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -144,7 +144,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="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="瀛楀吀绫诲瀷">
<el-input v-model="form.dictType" :disabled="true" />
@@ -188,7 +188,7 @@
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index d27918d..5cd4c64 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -163,7 +163,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="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="瀛楀吀鍚嶇О" prop="dictName">
<el-input v-model="form.dictName" placeholder="璇疯緭鍏ュ瓧鍏稿悕绉�" />
@@ -188,7 +188,7 @@
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 2c3ead3..fab7fb6 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -104,7 +104,7 @@
</el-table>
<!-- 娣诲姞鎴栦慨鏀硅彍鍗曞璇濇 -->
- <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="680px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="680px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="24">
@@ -271,7 +271,7 @@
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 8e46a70..5a72073 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -125,7 +125,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀瑰叕鍛婂璇濇 -->
- <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="780px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="780px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
@@ -167,7 +167,7 @@
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index 58c0fe6..b917aa0 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -119,7 +119,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀瑰璞″瓨鍌ㄩ厤缃璇濇 -->
- <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="800px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="閰嶇疆key" prop="configKey">
<el-select v-model="form.configKey" placeholder="璇烽�夋嫨閰嶇疆key">
@@ -166,7 +166,7 @@
<el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index 473d146..87ce7b4 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -171,7 +171,7 @@
/>
<!-- 娣诲姞鎴栦慨鏀筄SS瀵硅薄瀛樺偍瀵硅瘽妗� -->
- <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="500px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鏂囦欢鍚�">
<fileUpload v-model="form.file" v-if="type === 0"/>
@@ -182,7 +182,7 @@
<el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 5aaeb82..4aa8b56 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -127,7 +127,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="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="宀椾綅鍚嶇О" prop="postName">
<el-input v-model="form.postName" placeholder="璇疯緭鍏ュ矖浣嶅悕绉�" />
@@ -155,7 +155,7 @@
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 326618a..45e1bb7 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -163,7 +163,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="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
<el-input v-model="form.roleName" placeholder="璇疯緭鍏ヨ鑹插悕绉�" />
@@ -212,10 +212,10 @@
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
<!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
- <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="openDataScope" width="500px" append-to-body>
+ <Dialog :title="title" :visible.sync="openDataScope" width="500px" append-to-body>
<el-form :model="form" label-width="80px">
<el-form-item label="瑙掕壊鍚嶇О">
<el-input v-model="form.roleName" :disabled="true" />
@@ -254,7 +254,7 @@
<el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
<el-button @click="cancelDataScope">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 694facb..b4fe6d4 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -1,6 +1,6 @@
<template>
<!-- 鎺堟潈鐢ㄦ埛 -->
- <el-dialog title="閫夋嫨鐢ㄦ埛" :close-on-click-modal="false" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+ <Dialog title="閫夋嫨鐢ㄦ埛" :visible.sync="visible" width="800px" top="5vh" append-to-body>
<el-form :model="queryParams" ref="queryForm" :inline="true">
<el-form-item label="鐢ㄦ埛鍚嶇О" prop="userName">
<el-input
@@ -55,7 +55,7 @@
<el-button type="primary" @click="handleSelectUser">纭� 瀹�</el-button>
<el-button @click="visible = false">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</template>
<script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ec8cb8c..bfcfdaf 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -209,7 +209,7 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀圭敤鎴烽厤缃璇濇 -->
- <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="600px" append-to-body>
+ <Dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="12">
@@ -334,10 +334,10 @@
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
<!-- 鐢ㄦ埛瀵煎叆瀵硅瘽妗� -->
- <el-dialog :title="upload.title" :close-on-click-modal="false" :visible.sync="upload.open" width="400px" append-to-body>
+ <Dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
<el-upload
ref="upload"
:limit="1"
@@ -364,7 +364,7 @@
<el-button type="primary" @click="submitFileForm">纭� 瀹�</el-button>
<el-button @click="upload.open = false">鍙� 娑�</el-button>
</div>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index b72b25f..da519cd 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -1,7 +1,7 @@
<template>
<div>
<div class="user-info-head" :close-on-click-modal="false" @click="editCropper()"><img v-bind:src="options.img" title="鐐瑰嚮涓婁紶澶村儚" class="img-circle img-lg" /></div>
- <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
+ <Dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
<el-row>
<el-col :xs="24" :md="12" :style="{height: '350px'}">
<vue-cropper
@@ -48,7 +48,7 @@
<el-button type="primary" size="small" @click="uploadImg()">鎻� 浜�</el-button>
</el-col>
</el-row>
- </el-dialog>
+ </Dialog>
</div>
</template>
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index fff031d..cffa8ec 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -161,7 +161,7 @@
@pagination="getList"
/>
<!-- 棰勮鐣岄潰 -->
- <el-dialog :title="preview.title" :close-on-click-modal="false" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
+ <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
<el-tabs v-model="preview.activeName">
<el-tab-pane
v-for="(value, key) in preview.data"
--
Gitblit v1.9.1