diff --git a/src/assets/style.less b/src/assets/style.less index 1735fa9..db38257 100644 --- a/src/assets/style.less +++ b/src/assets/style.less @@ -26,6 +26,12 @@ html, body { height: 100%; } +.table-border{ + border: solid 1px #ddd; + margin-bottom: 20px; + width: 100%; +} + body { font-family: 'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif; } diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue index 803bbd0..279e3e6 100644 --- a/src/pages/Dashboard.vue +++ b/src/pages/Dashboard.vue @@ -143,11 +143,11 @@ formatter: '.0%' }]; const hotNewsData = [ - // {title:'国乒包揽世乒五冠',views:'332,201',create_time:'2019-4-22 12:30'}, - // {title:'章子怡被曝怀二胎',views:'120,030',create_time:'2019-4-22 12:30'}, - // {title:'中国风机器人乐队',views:'92,000',create_time:'2019-4-22 12:30'}, - // {title:'交通运输部:“五一”假期四天收费公路小客车免费通行',views:'82,000',create_time:'2019-4-22 12:30'}, - // {title:'小米有品签“军令状”放弃年终奖?',views:'3,000',create_time:'2019-4-22 12:30'}, + {title:'国乒包揽世乒五冠',views:'332,201',create_time:'2019-4-22 12:30'}, + {title:'章子怡被曝怀二胎',views:'120,030',create_time:'2019-4-22 12:30'}, + {title:'中国风机器人乐队',views:'92,000',create_time:'2019-4-22 12:30'}, + {title:'交通运输部:“五一”假期四天收费公路小客车免费通行',views:'82,000',create_time:'2019-4-22 12:30'}, + {title:'小米有品签“军令状”放弃年终奖?',views:'3,000',create_time:'2019-4-22 12:30'}, ]; export default { components: { @@ -167,15 +167,15 @@ }; }, async mounted(){ - this.hotNewsData = await api.queryHotNews(); - var o = new DataSet.View().source(await api.categoryCount()); - o.transform({ - type: 'percent', - field: 'count', - dimension: 'item', - as: 'percent' - }) - this.pieData = o.rows; + this.hotNewsData = hotNewsData; + // var o = new DataSet.View().source(await api.categoryCount()); + // o.transform({ + // type: 'percent', + // field: 'count', + // dimension: 'item', + // as: 'percent' + // }) + // this.pieData = o.rows; } }; diff --git a/src/pages/Layout.vue b/src/pages/Layout.vue index 600d941..a27dc21 100644 --- a/src/pages/Layout.vue +++ b/src/pages/Layout.vue @@ -27,9 +27,8 @@ 王小虎 - 个人中心 - 个人设置 - 退出 + 修改密码 + 退出 @@ -82,6 +81,24 @@ + + + + + + + + + + + + + +
+ 取 消 + 确定修改 +
+
@@ -100,6 +117,15 @@ export default { data() { const currentLang = "zh-cn"; + var validatePass = (rule, value, callback) => { + if (value === '') { + callback(new Error('请再次输入密码')); + } else if (value !== this.updateModel.new_pwd) { + callback(new Error('两次输入密码不一致!')); + } else { + callback(); + } + } return { activeMenu: "/dashboard", routes: adminRoutes, @@ -124,6 +150,27 @@ query: { name: "", date: [] + }, + dialogUpdatePwdVisible:false, + updateModel:{ + origin:'', + new_pwd:'', + new_pwd2:'', + }, + updateRules: { + origin: [ + {required: true, message: '请输入新密码', trigger: 'blur'}, + {min: 6, max: 16, message: '长度在 6 到 16 个字符', trigger: 'blur'} + ], + new_pwd: [ + {required: true, message: '请输入新密码', trigger: 'blur'}, + {min: 6, max: 16, message: '长度在 6 到 16 个字符', trigger: 'blur'} + ], + new_pwd2: [ + {required: true, message: '请再次输入新密码', trigger: 'blur'}, + {min: 6, max: 16, message: '长度在 6 到 16 个字符', trigger: 'blur'}, + {validator:validatePass,trigger: 'blur'} + ] } }; }, @@ -153,9 +200,12 @@ sessionStorage.removeItem('ms_username'); this.$router.push('login'); }, 1000); - return; + break; + case 'updatePwd': + this.dialogUpdatePwdVisible = true; + break; } - this.$message('功能尚在开发中...'); + // this.$message('功能尚在开发中...'); }, updateActiveMenuIndex() { if (this.$route.meta.text) { diff --git a/src/pages/evaluation/History.vue b/src/pages/evaluation/History.vue index 788876a..7d29b5c 100644 --- a/src/pages/evaluation/History.vue +++ b/src/pages/evaluation/History.vue @@ -31,9 +31,7 @@
- + @@ -55,7 +53,7 @@ :total="totalCount">
- +

导出数据

@@ -160,10 +158,6 @@ @color-checkbox: #cccccc; @color-checkbox-checked: #78909C; @color-checkbox-inner-checked: #fff; - .el-table{ - border: solid 1px #ddd; - margin-bottom: 20px; - } .header_nav_right { position: absolute; top: 20px; @@ -176,7 +170,7 @@ width: 90px; } } - .el-dialog{ + .el-dialog-export{ width:795px; } .el-checkbox-group{ diff --git a/src/pages/user/Index.vue b/src/pages/user/Index.vue index 40ca2f6..c445127 100644 --- a/src/pages/user/Index.vue +++ b/src/pages/user/Index.vue @@ -18,7 +18,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -41,15 +41,13 @@
- - + + - + + + - + + + - + + - - - - - - - - - - - - - + + + + + +
- +
@@ -127,29 +98,44 @@ drink: '北京', is_first_to_tibet: 1, medical_history: 1, - medical_history_data: '反流性食道炎、慢性胃炎、胃溃疡、慢性胰腺炎、肠易激惹综合征、结肠炎', + medical_history_data: '反流性食道炎、、结肠炎', } import cities from '../../utils/distpicker'; + export default { name: "Index", data() { return { - provinces:cities, - cities:[], + provinces: cities, + cities: [], searchModel: { first_to_tibet: '', - province:'', - city:'' + province: '', + city: '' }, userList: Array(5).fill(userObj), currentPage: 1, totalCount: 401 } }, + filters: { + firstToTibet(v) { + return v == 1 ? "是" : "否"; + }, + formatGender(v) { + return v == 1 ? "男" : "女"; + }, + formatHeight(v) { + return v + 'cm'; + }, + formatWeight(v) { + return v + 'kg'; + } + }, methods: { - handleProvinceChange(provinceId){ - for(var i = 0;i < cities.length;i++){ - if(provinceId && provinceId == cities[i].code){ + handleProvinceChange(provinceId) { + for (var i = 0; i < cities.length; i++) { + if (provinceId && provinceId == cities[i].code) { this.cities = cities[i].children; break; } @@ -161,7 +147,7 @@ handleSizeChange() { }, - handleCurrentChange(){ + handleCurrentChange() { } } @@ -176,26 +162,27 @@ } .user-head-name { - height:80px; - &:after{ - content:' '; + height: 80px; + &:after { + content: ' '; display: block; clear: both; } + .img { + + float: left; + } img { - float:left; width: 80px; - height:80px; + height: 80px; border-radius: 50%; } .info { - float:left; - display: table-cell; + float: left; vertical-align: middle; - padding-top:10px; - padding-left:10px; - p{ - height:30px; + padding-left: 10px; + p { + height: 30px; line-height: 30px; } }