diff --git a/package.json b/package.json index a68aae8..94baff7 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,8 @@ "serve-static": "1.13.2", "svg-sprite-loader": "4.1.3", "svgo": "1.2.2", + "swiper": "^4.5.1", + "vue-awesome-swiper": "^3.1.3", "vue-template-compiler": "2.6.10" }, "browserslist": [ diff --git a/src/assets/images/slide1.png b/src/assets/images/slide1.png new file mode 100644 index 0000000..abb18d3 Binary files /dev/null and b/src/assets/images/slide1.png differ diff --git a/src/assets/images/slide2.png b/src/assets/images/slide2.png new file mode 100644 index 0000000..26c8a4b Binary files /dev/null and b/src/assets/images/slide2.png differ diff --git a/src/assets/images/slide3.png b/src/assets/images/slide3.png new file mode 100644 index 0000000..5fd507d Binary files /dev/null and b/src/assets/images/slide3.png differ diff --git a/src/main.js b/src/main.js index dc36cd0..e9ead8a 100644 --- a/src/main.js +++ b/src/main.js @@ -1,6 +1,7 @@ import Vue from 'vue' import 'normalize.css/normalize.css' // A modern alternative to CSS resets +import 'swiper/dist/css/swiper.css' import ElementUI from 'element-ui' import 'element-ui/lib/theme-chalk/index.css' diff --git a/src/settings.js b/src/settings.js index ae3c494..40fd36d 100644 --- a/src/settings.js +++ b/src/settings.js @@ -1,6 +1,5 @@ module.exports = { - - title: 'Vue Admin Template', + title: '大胜达', /** * @type {boolean} true | false diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 5db429c..b00b7d6 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -2,7 +2,7 @@ * @Author: 龚祖望 573413756@qq.com * @Date: 2022-05-16 09:16:41 * @LastEditors: 龚祖望 573413756@qq.com - * @LastEditTime: 2022-05-30 15:42:18 + * @LastEditTime: 2022-06-15 16:09:03 * @FilePath: \dashengda\src\store\modules\user.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index be6bdd3..4c31c3b 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -51,6 +51,14 @@ width: 80%; } +.el-form-item { + margin-bottom: 0; +} + +.el-dialog .el-form-item { + margin-bottom: 15px; +} + .el-form-item__content .el-date-editor--daterange.el-input__inner { width: 80%; } diff --git a/src/views/home/index.vue b/src/views/home/index.vue index b913d5b..a537209 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -2,28 +2,60 @@ * @Author: 龚祖望 573413756@qq.com * @Date: 2022-05-16 09:16:41 * @LastEditors: 龚祖望 573413756@qq.com - * @LastEditTime: 2022-05-18 16:40:24 + * @LastEditTime: 2022-06-14 09:55:48 * @FilePath: \dashengda\src\views\dashboard\index.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> diff --git a/src/views/terminal/parameterBoundary/index.vue b/src/views/terminal/parameterBoundary/index.vue index e1b414e..7a86986 100644 --- a/src/views/terminal/parameterBoundary/index.vue +++ b/src/views/terminal/parameterBoundary/index.vue @@ -239,12 +239,14 @@ export default { edit({ id, name, minValue, maxValue, unit }) { this.title = '编辑终端参数' this.type = 1 - this.operateForm.id = id - this.operateForm.name = name - this.operateForm.minValue = minValue - this.operateForm.maxValue = maxValue - this.operateForm.unit = unit this.visible = true + this.$nextTick(() => { + this.operateForm.id = id + this.operateForm.name = name + this.operateForm.minValue = minValue + this.operateForm.maxValue = maxValue + this.operateForm.unit = unit + }) }, submit() { this.$refs.operateForm.validate((valid) => { diff --git a/src/views/terminal/structure/index.vue b/src/views/terminal/structure/index.vue index 6bbfc03..f9c073c 100644 --- a/src/views/terminal/structure/index.vue +++ b/src/views/terminal/structure/index.vue @@ -279,9 +279,11 @@ export default { edit(name, id) { this.title = '编辑终端类型' this.type = 1 - this.operateForm.id = id - this.operateForm.name = name this.visible = true + this.$nextTick(() => { + this.operateForm.id = id + this.operateForm.name = name + }) }, submit() { this.$refs.operateForm.validate(valid => { diff --git a/src/views/user/index.vue b/src/views/user/index.vue index 4f41712..1a17a3e 100644 --- a/src/views/user/index.vue +++ b/src/views/user/index.vue @@ -73,7 +73,7 @@ @@ -101,7 +101,7 @@ - + @@ -141,7 +141,7 @@ - 取 消 + 取 消 提 交 @@ -237,10 +237,17 @@ export default { this.type = 0 this.visible = true }, - edit() { + edit({ realName, loginName, mobile, gender, locked }) { this.title = '编辑用户' this.type = 1 this.visible = true + this.$nextTick(() => { + this.operateForm.realName = realName + this.operateForm.loginName = loginName + this.operateForm.mobile = mobile + this.operateForm.gender = gender + this.operateForm.locked = locked + }) }, submit() { this.$refs.operateForm.validate(valid => { diff --git a/vue.config.js b/vue.config.js index e3e6d00..2fc25fd 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,13 +1,10 @@ 'use strict' const path = require('path') -const defaultSettings = require('./src/settings.js') function resolve(dir) { return path.join(__dirname, dir) } -const name = defaultSettings.title || 'vue Admin Template' // page title - // If your port is set to 80, // use administrator privileges to execute the command line. // For example, Mac: sudo npm run @@ -50,15 +47,7 @@ module.exports = { before: require('./mock/mock-server.js') }, configureWebpack: { - // provide the app's title in webpack's name field, so that - // it can be accessed in index.html to inject the correct title. - name: name, - devtool: 'source-map', - resolve: { - alias: { - '@': resolve('src') - } - } + devtool: 'source-map' }, chainWebpack(config) { // it can improve the speed of the first screen, it is recommended to turn on preload