Commit 1e9c03ed authored by 黄奎's avatar 黄奎

页面修改

parent 053409d9
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div class="content"> <div class="content">
<div> <div>
<div class="searchInput"> <div class="searchInput">
<el-input style="display:inline-block;width:225px;height:30px" placeholder="请输入搜索内容" v-model="msg.RoleName" <el-input style="display:inline-block;width:225px;height:30px" placeholder="请输入搜索内容" v-model="msg.Name"
size="small" clearable @keyup.enter.native="msg.pageIndex=1,getList()"> size="small" clearable @keyup.enter.native="msg.pageIndex=1,getList()">
</el-input> </el-input>
<span class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px" <span class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="Name" label="名称"> <el-table-column prop="Name" label="名称">
</el-table-column> </el-table-column>
<el-table-column prop="createTime" label="创建日期" width="450"> <el-table-column prop="CreateDateStr" label="创建日期" width="450">
</el-table-column> </el-table-column>
<el-table-column label="操作" width="220"> <el-table-column label="操作" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -58,23 +58,23 @@ ...@@ -58,23 +58,23 @@
<img src="../../assets/img/storeDesign/select.png" class="Cubeselect" alt="" /> <img src="../../assets/img/storeDesign/select.png" class="Cubeselect" alt="" />
<div class="opacity"></div> <div class="opacity"></div>
<el-button class="choose-button" type="primary">启用该样式</el-button> <el-button class="choose-button" type="primary">启用该样式</el-button>
<img :src="item.imgUrl" class="cube_blockImg" alt=""> <img :src="item.ImgUrl" class="cube_blockImg" alt="">
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="模板设置" > <el-form-item label="模板设置">
<template v-if="addMsg.MagicData.length==0"> <template v-if="addMsg.MagicDataList.length==0">
<el-tag type="danger">请先选择样式</el-tag> <el-tag type="danger">请先选择样式</el-tag>
</template> </template>
<template v-else> <template v-else>
<el-row style="margin-bottom:15px;" v-for="(subItem,subIndex) in addMsg.MagicData" :key="subIndex"> <el-row style="margin-bottom:15px;" v-for="(subItem,subIndex) in addMsg.MagicDataList" :key="subIndex">
<el-col :span="4"> <el-col :span="4">
<el-tooltip class="item" effect="dark" content="建议尺寸:750*360" placement="top"> <el-tooltip class="item" effect="dark" content="建议尺寸:750*360" placement="top">
<el-button size="mini" @click="choicImg=true,commonIndex=subIndex">选择图片</el-button> <el-button size="mini" @click="choicImg=true,commonIndex=subIndex">选择图片</el-button>
</el-tooltip> </el-tooltip>
<div class="customize-share-title"> <div class="customize-share-title">
<div class="zk_pic_box" style="width:80px;height:80px;" flex="main:center cross:center" <div class="zk_pic_box" style="width:80px;height:80px;" flex="main:center cross:center"
:style="{backgroundImage:'url(' + getIconLink(subItem.imgUrl) + ')'}"> :style="{backgroundImage:'url(' + getIconLink(subItem.ImgUrl) + ')'}">
<i v-if="subItem.imgUrl==''" class="el-icon-picture-outline"></i> <i v-if="subItem.ImgUrl==''" class="el-icon-picture-outline"></i>
</div> </div>
</div> </div>
</el-col> </el-col>
...@@ -118,14 +118,10 @@ ...@@ -118,14 +118,10 @@
return { return {
loading: false, loading: false,
isActive: -1, isActive: -1,
choicImg:false, choicImg: false,
isShowLink:false, isShowLink: false,
commonIndex:-1, commonIndex: -1,
dataList: [{ dataList: [],
Id: 1,
Name: '123',
createTime: '2020'
}],
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
...@@ -137,46 +133,46 @@ ...@@ -137,46 +133,46 @@
Id: 0, //魔方Id Id: 0, //魔方Id
Name: '', //魔方名称 Name: '', //魔方名称
Style: 0, //魔方样式 Style: 0, //魔方样式
MagicData: [] MagicDataList: []
}, },
defaultMsg:[{ defaultMsg: [{
imgUrl:'', ImgUrl: '',
Link:'' Link: ''
},{ }, {
imgUrl:'', ImgUrl: '',
Link:'' Link: ''
},{ }, {
imgUrl:'', ImgUrl: '',
Link:'' Link: ''
},{ }, {
imgUrl:'', ImgUrl: '',
Link:'' Link: ''
}], }],
//样式选择枚举 //样式选择枚举
styleList: [{ styleList: [{
Style: 1, Style: 1,
imgUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/cube1-1.png' ImgUrl: this.domainManager().ImageUrl + '/Static/cube1-1.png'
}, { }, {
Style: 2, Style: 2,
imgUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/cube1-2.png' ImgUrl: this.domainManager().ImageUrl + '/Static/cube1-2.png'
}, { }, {
Style: 3, Style: 3,
imgUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/cube1-3.png' ImgUrl: this.domainManager().ImageUrl + '/Static/cube1-3.png'
}, { }, {
Style: 4, Style: 4,
imgUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/cube1-4.png' ImgUrl: this.domainManager().ImageUrl + '/Static/cube1-4.png'
}, { }, {
Style: 2, Style: 2,
imgUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/cube2-1.png' ImgUrl: this.domainManager().ImageUrl + '/Static/cube2-1.png'
}, { }, {
Style: 3, Style: 3,
imgUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/cube2-2.png' ImgUrl: this.domainManager().ImageUrl + '/Static/cube2-2.png'
}, { }, {
Style: 4, Style: 4,
imgUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/cube2-3.png' ImgUrl: this.domainManager().ImageUrl + '/Static/cube2-3.png'
}, { }, {
Style: 4, Style: 4,
imgUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/cube3-1.png' ImgUrl: this.domainManager().ImageUrl + '/Static/cube3-1.png'
}], }],
rules: { rules: {
Name: [{ Name: [{
...@@ -200,7 +196,7 @@ ...@@ -200,7 +196,7 @@
this.getList(); this.getList();
}, },
getList() { getList() {
this.apipost("/api/Employee/GetRolePageList", this.msg, res => { this.apipost("/api/Tenant/GetMallMagicPageList", this.msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.total = res.data.data.count; this.total = res.data.data.count;
...@@ -221,9 +217,7 @@ ...@@ -221,9 +217,7 @@
}, },
//保存 //保存
saveMsg() { saveMsg() {
var ckedKeys = this.$refs.tree.getCheckedKeys(); this.apipost("/api/Tenant/SetMallMagic", this.addMsg, res => {
this.addMsg.RoleAuth = ckedKeys.join(',');
this.apipost("/api/Employee/SetRole", this.addMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getList(); this.getList();
this.clearInfo(); this.clearInfo();
...@@ -235,23 +229,23 @@ ...@@ -235,23 +229,23 @@
}, },
//清空 //清空
clearInfo() { clearInfo() {
this.addMsg.RoleId = 0; this.addMsg.Id = 0;
this.addMsg.RoleName = ''; this.addMsg.Name = '';
this.addMsg.RoleIntro = ''; this.addMsg.Style = 0;
this.addMsg.RoleAuth = ''; this.addMsg.MagicDataList = [];
this.defaultMsg.forEach(item=>{
item.Link="";
item.ImgUrl="";
})
}, },
//修改 //修改
EditRole(item) { EditRole(item) {
this.apipost("/api/Employee/GetRole", { this.apipost("/api/Tenant/GetMallMagic", {
RoleId: item.RoleId Id: item.Id
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.addMsg = res.data.data; this.addMsg = res.data.data;
this.imgCubeAdd = false; this.imgCubeAdd = false;
let newArr = this.addMsg.RoleAuth.split(',');
setTimeout(() => {
this.$refs.tree.setCheckedKeys(newArr);
}, 10)
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
} }
...@@ -261,8 +255,8 @@ ...@@ -261,8 +255,8 @@
RemmoveRole(item) { RemmoveRole(item) {
var that = this; var that = this;
that.Confirm("是否要删除?", function () { that.Confirm("是否要删除?", function () {
that.apipost("/api/Employee/RemoveRole", { that.apipost("/api/Tenant/RemoveMallMagic", {
RoleId: item.RoleId Id: item.Id
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
that.getList(); that.getList();
...@@ -275,15 +269,15 @@ ...@@ -275,15 +269,15 @@
//点击选择样式 //点击选择样式
getStyleType(index, Style) { getStyleType(index, Style) {
this.isActive = index; this.isActive = index;
this.addMsg.MagicData=[]; this.addMsg.MagicDataList = [];
for(var i=0;i<Style;i++){ for (var i = 0; i < Style; i++) {
this.addMsg.MagicData.push(this.defaultMsg[i]); this.addMsg.MagicDataList.push(this.defaultMsg[i]);
} }
}, },
//选择图片 //选择图片
SelectId(msg) { SelectId(msg) {
if(this.commonIndex>-1){ if (this.commonIndex > -1) {
this.defaultMsg[this.commonIndex].imgUrl = msg.url; this.defaultMsg[this.commonIndex].ImgUrl = msg.url;
} }
this.choicImg = false; this.choicImg = false;
}, },
...@@ -291,7 +285,7 @@ ...@@ -291,7 +285,7 @@
getChoiceLink() { getChoiceLink() {
//调用子组件方法 //调用子组件方法
var obj = this.$refs.chooseMeun.getChooseMenu(); var obj = this.$refs.chooseMeun.getChooseMenu();
if(this.commonIndex>-1){ if (this.commonIndex > -1) {
this.defaultMsg[this.commonIndex].Link = obj.PageUrl; this.defaultMsg[this.commonIndex].Link = obj.PageUrl;
} }
this.isShowLink = false; this.isShowLink = false;
...@@ -299,7 +293,7 @@ ...@@ -299,7 +293,7 @@
}, },
mounted() { mounted() {
// this.getList(); this.getList();
} }
}; };
......
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