Commit 46ccd5b1 authored by huangjie's avatar huangjie

*

parent 5085b88f
...@@ -101,8 +101,10 @@ export default { ...@@ -101,8 +101,10 @@ export default {
const index = val.path.indexOf('/', val.path.indexOf('/') + 1) const index = val.path.indexOf('/', val.path.indexOf('/') + 1)
const parentPath = val.path.slice(0, index) const parentPath = val.path.slice(0, index)
const currentRoute = this.$router.options.routes.find(item => item.path === parentPath) const currentRoute = this.$router.options.routes.find(item => item.path === parentPath)
currentIcon = currentRoute.meta && currentRoute.meta.icon if(currentRoute){
icon = this.isActive(val) ? currentIcon+'Tags' : currentIcon+'Tag' currentIcon = currentRoute.meta && currentRoute.meta.icon
icon = this.isActive(val) ? currentIcon+'Tags' : currentIcon+'Tag'
}
} }
icon = (svgIcon && svgIcon != '#') || (currentIcon && svgIcon != '#') ? icon : this.isActive(val) ? 'defaultTags' : 'defaultTag' icon = (svgIcon && svgIcon != '#') || (currentIcon && svgIcon != '#') ? icon : this.isActive(val) ? 'defaultTags' : 'defaultTag'
return `#icon-${icon}` return `#icon-${icon}`
......
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
@pagination="getList" @pagination="getList"
/> />
<!-- 添加或修改角色配置对话框 --> <!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px"> <el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row> <el-row>
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<img class="img" slot="prefix" src="../assets/images/validCode.png"/> <img class="img" slot="prefix" src="../assets/images/validCode.png"/>
</el-input> </el-input>
<div class="login-code"> <div class="login-code">
<div class="hqyzm" @click="getsms">{{smstitle}}</div> <div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'}">{{smstitle}}</div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item style="width:100%;margin-top: 42px"> <el-form-item style="width:100%;margin-top: 42px">
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
<img class="img" slot="prefix" src="../assets/images/validCode.png"/> <img class="img" slot="prefix" src="../assets/images/validCode.png"/>
</el-input> </el-input>
<div class="login-code"> <div class="login-code">
<div class="hqyzm" @click="getsms">{{smstitle}}</div> <div class="hqyzm" @click="getsms" :class="{'disableds':smstitle!='获取验证码'}">{{smstitle}}</div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item style="width:100%;margin-top: 42px"> <el-form-item style="width:100%;margin-top: 42px">
...@@ -280,7 +280,7 @@ ...@@ -280,7 +280,7 @@
_this.smstitle = _this.smstime +'秒后重试' _this.smstitle = _this.smstime +'秒后重试'
_this.smstime--; _this.smstime--;
if(_this.smstime <= 0){ if(_this.smstime <= 0){
_this.smstitle = '发送验证码' _this.smstitle = '获取验证码'
clearInterval(_this.timers) clearInterval(_this.timers)
_this.nosend = false _this.nosend = false
} }
...@@ -529,11 +529,14 @@ ...@@ -529,11 +529,14 @@
border-radius: 4px; border-radius: 4px;
border: 1px solid #EFEFEF; border: 1px solid #EFEFEF;
text-align: center; text-align: center;
color: rgba(35, 35, 35, 0.40); color: rgba(35, 35, 35, 0.80);
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
line-height: 48px; line-height: 48px;
} }
.disableds{
color: rgba(35, 35, 35, 0.40);
}
} }
.el-login-footer { .el-login-footer {
height: 40px; height: 40px;
......
...@@ -122,6 +122,7 @@ ...@@ -122,6 +122,7 @@
created(){ created(){
this.getList() this.getList()
this.getCount() this.getCount()
console.log(777)
}, },
methods:{ methods:{
getCount(){ getCount(){
...@@ -190,11 +191,11 @@ ...@@ -190,11 +191,11 @@
if(result.code == 200){ if(result.code == 200){
this.$message.success('修改成功!') this.$message.success('修改成功!')
this.getList() this.getList()
this.getCount()
}else{ }else{
this.$message.error(result.msg) this.$message.error(result.msg)
} }
}) })
this.getCount()
}, },
getYQ(){ getYQ(){
let state = this.searchPram.state let state = this.searchPram.state
...@@ -206,6 +207,9 @@ ...@@ -206,6 +207,9 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.app-container{
background: #fff;
}
.records{ .records{
.tasklist{ .tasklist{
.select{ .select{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment