Skip to content

M
memberTag-web
Commit 1a92ed6f by 无尘
Options

fix: 修改选中效果

parent fadd2692
Showing with 130 additions and 42 deletions
dist/index.html
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.0ce1ce69e2b5ec0de5d1377f34b663aa.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.fe7e7d190dbb468be9c0.js></script><script type=text/javascript src=./static/js/vendor.4ac54fd03099c45beefc.js></script><script type=text/javascript src=./static/js/app.7425a201428117df7302.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.8e036f4462b29c87bbd7fe988b1cfe62.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.a865be21acfad061bc92.js></script><script type=text/javascript src=./static/js/vendor.4ac54fd03099c45beefc.js></script><script type=text/javascript src=./static/js/app.7538ee7f54c2af1d33b0.js></script></body></html>
\ No newline at end of file
dist/static/css/app.0ce1ce69e2b5ec0de5d1377f34b663aa.css deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.0ce1ce69e2b5ec0de5d1377f34b663aa.css.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.8e036f4462b29c87bbd7fe988b1cfe62.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/app.8e036f4462b29c87bbd7fe988b1cfe62.css.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/public.css
......@@ -1196,6 +1196,10 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
/* 标签详情各个组件 */
.tagShort-dialog .el-dialog__headerbtn {
top: 28px;
}
/* 选项 (固化值)*/
.checkboxOption-wrap {
width: 100%;
......
dist/static/js/0.886814224159d16c7194.js → dist/static/js/0.72123e3de0997d5b69ce.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.72123e3de0997d5b69ce.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.886814224159d16c7194.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/12.6bce72ffa3001288e97c.js deleted 100644 → 0
webpackJsonp([12],{YPWR:function(t,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=o("bOdI"),a=o.n(n),i=o("5reh"),s={name:"App",data:function(){var t;return t={projectName:"memberTag",contentHeight:"0px",collapseFlag:!1},a()(t,"collapseFlag",!1),a()(t,"leftModulesName","会员设置"),t},methods:{toRouterView:function(t){console.log(t),this.$router.push({path:t.path})},collapseTag:function(t){console.log(t),this.collapseFlag=t}},mounted:function(){this.$store.commit(i.d,"达摩GIC"),document.title=this.$store.state.title,this.pathName=window.location.hash.split("/")[1],console.log("pathname:",this.pathName,this.$route.path),this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},l={render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",{attrs:{id:"index"}},[e("vue-gic-header",{attrs:{projectName:this.projectName,collapseFlag:this.collapseFlag},on:{collapseTag:this.collapseTag,toRouterView:this.toRouterView}}),this._v(" "),e("div",{staticClass:"content",attrs:{id:"content"}},[e("div",{staticClass:"content-body",style:{height:this.contentHeight}},[e("transition",{attrs:{name:"fade",mode:"out-in"}},[e("router-view")],1)],1)])],1)},staticRenderFns:[]};var c=o("VU/8")(s,l,!1,function(t){o("ygpo")},null,null);e.default=c.exports},ygpo:function(t,e){}});
//# sourceMappingURL=12.6bce72ffa3001288e97c.js.map
\ No newline at end of file
dist/static/js/15.ea13cc5370a4d770d711.js → dist/static/js/14.9e2a6743137628654ca9.js
webpackJsonp([15],{NIJk:function(t,a){},twLH:function(t,a,n){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var e=n("3Xzz"),i=n("BdFv"),s=(n("Mk6G"),n("3E4D"),n("Ch4/"),n("PI0u"),n("P9l9"),{name:"myTagLib",data:function(){return{navpath:[{name:"首页",path:""},{name:"会员标签",path:""},{name:"我的标签库",path:""}],tagCategory:"myTagList"}},methods:{toAddMyTagLib:function(){}},mounted:function(){},components:{navCrumb:e.a,tagLib:i.a}}),r={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"myTagLib-wrap common-wrap"},[a("nav-crumb",{attrs:{navpath:this.navpath}}),this._v(" "),a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)]),this._v(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var o=n("VU/8")(s,r,!1,function(t){n("NIJk")},"data-v-a886157a",null);a.default=o.exports}});
//# sourceMappingURL=15.ea13cc5370a4d770d711.js.map
\ No newline at end of file
webpackJsonp([14],{NIJk:function(t,a){},twLH:function(t,a,n){"use strict";Object.defineProperty(a,"__esModule",{value:!0});var e=n("3Xzz"),i=n("BdFv"),s=(n("Mk6G"),n("3E4D"),n("Ch4/"),n("PI0u"),n("P9l9"),{name:"myTagLib",data:function(){return{navpath:[{name:"首页",path:""},{name:"会员标签",path:""},{name:"我的标签库",path:""}],tagCategory:"myTagList"}},methods:{toAddMyTagLib:function(){}},mounted:function(){},components:{navCrumb:e.a,tagLib:i.a}}),r={render:function(){var t=this.$createElement,a=this._self._c||t;return a("div",{staticClass:"myTagLib-wrap common-wrap"},[a("nav-crumb",{attrs:{navpath:this.navpath}}),this._v(" "),a("div",{staticClass:"right-content"},[a("div",{staticClass:"right-box"},[a("tag-lib",{attrs:{tagCategory:this.tagCategory}})],1)]),this._v(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var o=n("VU/8")(s,r,!1,function(t){n("NIJk")},"data-v-a886157a",null);a.default=o.exports}});
//# sourceMappingURL=14.9e2a6743137628654ca9.js.map
\ No newline at end of file
dist/static/js/15.e32139e15d4fcfa0d5c6.js 0 → 100644
webpackJsonp([15],{"00+T":function(t,e){},YPWR:function(t,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=o("bOdI"),a=o.n(n),i=o("5reh"),s={name:"App",data:function(){var t;return t={projectName:"memberTag",contentHeight:"0px",collapseFlag:!1},a()(t,"collapseFlag",!1),a()(t,"leftModulesName","会员设置"),t},methods:{toRouterView:function(t){console.log(t),this.$router.push({path:t.path})},collapseTag:function(t){console.log(t),this.collapseFlag=t}},mounted:function(){this.$store.commit(i.d,"达摩GIC"),document.title=this.$store.state.title,this.pathName=window.location.hash.split("/")[1],console.log("pathname:",this.pathName,this.$route.path),this.contentHeight=(document.documentElement.clientHeight||document.body.clientHeight)-64+"px"},components:{}},l={render:function(){var t=this.$createElement,e=this._self._c||t;return e("div",{attrs:{id:"index"}},[e("vue-gic-header",{attrs:{projectName:this.projectName,collapseFlag:this.collapseFlag},on:{collapseTag:this.collapseTag,toRouterView:this.toRouterView}}),this._v(" "),e("div",{staticClass:"content",attrs:{id:"content"}},[e("div",{staticClass:"content-body",style:{height:this.contentHeight}},[e("transition",{attrs:{name:"fade",mode:"out-in"}},[e("router-view")],1)],1)])],1)},staticRenderFns:[]};var c=o("VU/8")(s,l,!1,function(t){o("00+T")},null,null);e.default=c.exports}});
//# sourceMappingURL=15.e32139e15d4fcfa0d5c6.js.map
\ No newline at end of file
dist/static/js/6.058549080836adecd618.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.0c7ffef99808ef5a01f1.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.3f3a16190c967641978f.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.3f3a16190c967641978f.js → dist/static/js/7.705594fccf9031ef2581.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/7.705594fccf9031ef2581.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.fe7e7d190dbb468be9c0.js → dist/static/js/manifest.a865be21acfad061bc92.js
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,a){for(var f,d,i,u=0,b=[];u<r.length;u++)d=r[u],t[d]&&b.push(t[d][0]),t[d]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,a);b.length;)b.shift()();if(a)for(u=0;u<a.length;u++)i=c(c.s=a[u]);return i};var r={},t={26:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+e+"."+{0:"886814224159d16c7194",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"464a7564c7b7ba2790b3",6:"058549080836adecd618",7:"3f3a16190c967641978f",8:"d1c84e5f613ed64a6698",9:"adf58eb4d42206d12256",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"6bce72ffa3001288e97c",13:"5200748d114383e3286c",14:"e3674474da8a18925ba8",15:"ea13cc5370a4d770d711",16:"f4036a24000959bd38c8",17:"83e469d672229c638715",18:"129d150ebd1fce6ee6e0",19:"4f681127cc3b6c7e3765",20:"d26c039b11e406222a2d",21:"90b485e716ee61ee3eaa",22:"3d0de4ebe82f7a00535f",25:"9ceafa4ee79176c87d81"}[e]+".js";var f=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=d,o.appendChild(a),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.fe7e7d190dbb468be9c0.js.map
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,a){for(var f,d,i,u=0,b=[];u<r.length;u++)d=r[u],t[d]&&b.push(t[d][0]),t[d]=0;for(f in o)Object.prototype.hasOwnProperty.call(o,f)&&(e[f]=o[f]);for(n&&n(r,o,a);b.length;)b.shift()();if(a)for(u=0;u<a.length;u++)i=c(c.s=a[u]);return i};var r={},t={26:0};function c(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,c),t.l=!0,t.exports}c.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,c){n=t[e]=[r,c]});n[2]=r;var o=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,c.nc&&a.setAttribute("nonce",c.nc),a.src=c.p+"static/js/"+e+"."+{0:"72123e3de0997d5b69ce",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"464a7564c7b7ba2790b3",6:"0c7ffef99808ef5a01f1",7:"705594fccf9031ef2581",8:"d1c84e5f613ed64a6698",9:"adf58eb4d42206d12256",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"c0e6361ebccd622f756e",13:"e29aa5893a93a16c34bc",14:"9e2a6743137628654ca9",15:"e32139e15d4fcfa0d5c6",16:"f4036a24000959bd38c8",17:"83e469d672229c638715",18:"129d150ebd1fce6ee6e0",19:"4f681127cc3b6c7e3765",20:"d26c039b11e406222a2d",21:"90b485e716ee61ee3eaa",22:"3d0de4ebe82f7a00535f",25:"9ceafa4ee79176c87d81"}[e]+".js";var f=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(f);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=d,o.appendChild(a),r},c.m=e,c.c=r,c.d=function(e,n,r){c.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},c.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return c.d(n,"a",n),n},c.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},c.p="./",c.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.a865be21acfad061bc92.js.map
\ No newline at end of file
src/components/addTagView.vue
......@@ -572,8 +572,8 @@
.el-upload-list__item-status-label {
display: block;
position: absolute;
right: -17px;
top: -7px;
right: -22px;
top: -11px;
width: 46px;
height: 26px;
background: #1890ff;
......@@ -582,12 +582,12 @@
-ms-transform: rotate(45deg);
-o-transform: rotate(45deg);
transform: rotate(45deg);
box-shadow: 0 1px 1px #ccc;
/*box-shadow: 0 1px 1px #ccc;*/
i {
font-size: 12px;
color: #fff;
margin-top: 12px;
margin-top: 14px;
-webkit-transform: rotate(-45deg);
-ms-transform: rotate(-45deg);
-o-transform: rotate(-45deg);
......
src/components/tagCategory.vue
......@@ -203,6 +203,13 @@
color: #909399;
}
}
.common-wrap__childTag__name {
&:hover {
background: #e6e8ed;
color: #303133;
}
}
.el-icon-more {
font-size: 14px;
color: #909399;
......
src/components/tagCategorySmall.vue
......@@ -196,6 +196,10 @@
display: inline-block;
padding: 3px 5px;
cursor: pointer;
&:hover {
background: #e6e8ed;
color: #303133;
}
}
}
</style>
src/components/tagLib.vue
......@@ -18,7 +18,7 @@
<div class="common-libFields flex" >
<template v-for="(item,pindex) in libDatas">
<div :class="['common-lib__cell','flex-1',item.id == libRadio? 'border-primary-color':'']" :key="pindex">
<div :class="['common-lib__cell','flex-1',item.id == libRadio? 'border-primary-color':'']" :key="pindex" @click.stop="selectTag(item.id)">
<div class="border-box common-lib__cell__head">
<a :href="'#/'+tagCategory+'?tagLevelGroupId='+item.id" class="block"><i :class="['iconfont','common-lib__cell__icon',item.icon]"></i><span class="common-lib__cell__name">{{item.name}}</span><span class="platformTagLib-wrap__cell__icon fr"><i class="el-icon-arrow-right"></i></span>
</a>
......@@ -38,7 +38,13 @@
</template>
</div>
<div class="platformTagLib-wrap__cell__radio common-lib__cell__radio" v-if="tagCategory != 'myTagList'">
<el-radio v-model="libRadio" :label="item.id" name=""> </el-radio>
<!-- <el-radio v-model="libRadio" :label="item.id" name=""> </el-radio> -->
<!-- 新增选中 -->
<div class="platformTagLib-wrap__box__triangle" v-if="item.id == libRadio">
<div class="platformTagLib-wrap__box__outer">
<i class="el-icon-upload-success el-icon-check"></i>
</div>
</div>
</div>
</div>
</template>
......@@ -336,6 +342,14 @@
},
/**
* 路由跳转
*/
selectTag(id) {
const that = this;
that.libRadio = id;
},
/**
* 添加到我的标签库
*/
toAddMyTagLib() {
......@@ -451,6 +465,10 @@
}
</script>
<style lang="scss" scoped>
.common-lib__cell {
cursor: pointer;
}
.platformTagLib-wrap {
&__cell {
......@@ -471,7 +489,7 @@
&__body {
cursor: pointer;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
......@@ -492,8 +510,41 @@
}
}
}
.common-lib__cell__radio {
right: 0;
bottom: 0;
}
&__box__triangle {
position: relative;
width: 100%;
height: 100%;
overflow: hidden;
}
&__box__outer {
position: absolute;
right: -16px;
bottom: -6px;
width: 40px;
height: 20px;
background: #1890ff;
text-align: center;
-webkit-transform: rotate(-45deg);
-moz-transform: rotate(-45deg);
transform: rotate(-45deg);
i {
position: absolute;
top: 1px;
left: 15px;
font-size: 12px;
color: #fff;
-webkit-transform: rotate(45deg);
-moz-transform: rotate(45deg);
transform: rotate(45deg);
}
}
}
</style>
src/components/tagShortDetail.vue
......@@ -46,11 +46,14 @@
:modal-append-to-body="false"
:append-to-body="false"
:before-close="closeTagShortDialog">
<div slot="title" class="dialog-title">
<div class="checkboxOption-wrap__head__title inline-block top">{{ tagData.tagName }}
<span class="realtime-span border-box inline-block middle">{{ tagData.isActive == 1? '实时' : '非实时' }}</span>
</div>
</div>
<div class="tags-content">
<div class="tags-content-wrap m-b-26">
<div class="checkboxOption-wrap__head__title inline-block top">{{ tagData.tagName }}
<span class="realtime-span border-box inline-block middle">{{ tagData.isActive == 1? '实时' : '非实时' }}</span>
</div>
<div class="tags-content-wrap m-b-26" v-if="false">
<div class="checkboxOption-wrap__head__describe inline-block top fr">
<el-input
v-if="false"
......@@ -2100,11 +2103,20 @@
that.axios.post(that.baseUrl + url, qs.stringify(para)).then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
data.options = resData.result;
that.templateData.push(data)
that.getExistData(that.tagData.tagId)
return;
if (!!that.currentKey) {
if (resData.errorCode == 0) {
data.options = resData.result;
that.templateData.push(data)
that.getExistData(that.tagData.tagId)
return;
}
}else {
if (resData.errorCode == 1) {
data.options = resData.result;
that.templateData.push(data)
that.getExistData(that.tagData.tagId)
return;
}
}
that.$message.error({
......
src/view/index/index.vue
......@@ -230,7 +230,7 @@
.right-content{
width: 100%;
padding: 24px;
min-height: 480px;
min-height: 615px;
.right-box{
/*background: #fff;*/
/*padding: 24px;*/
......@@ -254,7 +254,7 @@
.right-content {
/*width: 100%;*/
padding: 24px;
min-height: 480px;
min-height: 615px;
.right-box {
background: #fff;
......
src/view/memberGroup/memberGroupEdit.vue
......@@ -46,12 +46,12 @@
<el-form-item label="" class="" prop="updateDay" v-if="ruleForm.isActive == 1">
<div class="memberGroupEdit-wrap__item__title">更新频率</div>
<el-select v-model="ruleForm.updateType" placeholder="请选择" class="w-200" @change="changeRate(ruleForm.updateType)">
<el-option label="每日一次" value="0"></el-option>
<el-option label="每周一次" value="1"></el-option>
<el-option label="每月一次" value="2"></el-option>
<el-option label="每日一次" value="1"></el-option>
<el-option label="每周一次" value="2"></el-option>
<el-option label="每月一次" value="3"></el-option>
</el-select><el-select
v-model="ruleForm.updateDay"
v-if="ruleForm.updateType != 0"
v-if="ruleForm.updateType != 1"
placeholder="请选择"
class="w-200 p-l-8">
<el-option
......@@ -122,7 +122,7 @@
};
const rateValid = (rule, value, callback) => {
console.log(value,this.ruleForm)
if (this.ruleForm.isActive == 1 && (this.ruleForm.updateType != '0'||this.ruleForm.updateType == '') && value == '') {
if (this.ruleForm.isActive == 1 && (this.ruleForm.updateType != '1'||this.ruleForm.updateType == '') && value == '') {
console.log(value,this.ruleForm)
callback(new Error('请选择更新频率'));
} else {
......@@ -367,7 +367,7 @@
that.$refs[formName].validate((valid) => {
if (valid) {
console.log('valid',that.ruleForm)
const flag = that.ruleForm.isActive == 1 && that.ruleForm.updateType !=0 && that.ruleForm.updateDay == '';
const flag = that.ruleForm.isActive == 1 && that.ruleForm.updateType !=1 && that.ruleForm.updateDay == '';
if (!!flag) {
that.$message.error({message: '请选择更新频率!'});
return false;
......@@ -488,7 +488,7 @@
}else {
console.log(allIds.indexOf(obj.tagId))
// 不存在直接追加
that.selectedTagData.push(JSON.parse(JSON.stringify(obj)))
that.selectedTagData.unshift(JSON.parse(JSON.stringify(obj)))
console.log("处理obj:",that.selectedTagData)
}
that.handleReturnData(that.selectedTagData)
......@@ -515,7 +515,7 @@
// midData = midData.filter(item=>(tagIds.indexOf(item.tagId) == -1))
// console.log("处理已选的时候:",newMidData)
arr.forEach(function(ele,index){
newMidData.push(ele)
newMidData.unshift(ele)
})
that.selectedTagData = newMidData
// console.log("全选的时候:",newMidData)
......@@ -578,7 +578,7 @@
let ids = delData.map(item=>item.tagId)
// 暂存架选择的标签不在已选数据中
if (ids.indexOf(row.tagId) == -1) {
delData.push(row)
delData.unshift(row)
}
that.selectedTagData = delData;
......@@ -643,7 +643,7 @@
that.ruleForm.updateDay = String(tagGroupDto.updateDay);
that.inputNumObj['groupName'] = strLength.getZhLen(that.ruleForm['groupName']);
if (that.ruleForm.updateType != 0) {
if (that.ruleForm.updateType != 1) {
that.changeRate(that.ruleForm.updateType,that.ruleForm.updateDay)
}
}
......@@ -705,7 +705,8 @@
<style lang="scss" scoped>
.memberGroupEdit-wrap__tags {
height: 100px;
max-height: 222px;
min-height: 100px;
padding: 12px;
border: 1px solid #DCDFE6;
border-radius: 4px;
......@@ -719,6 +720,9 @@
margin-bottom: 8px;
background: #F3F6F9;
border-radius: 2px;
&:last-child {
margin-bottom: 0;
}
span {
display: inline-block;
......
static/css/public.css
......@@ -1196,6 +1196,10 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill {
/* 标签详情各个组件 */
.tagShort-dialog .el-dialog__headerbtn {
top: 28px;
}
/* 选项 (固化值)*/
.checkboxOption-wrap {
width: 100%;
......
theme/index.css
......@@ -3979,8 +3979,9 @@
color: #606266;
font-size: 14px; }
.el-dialog__footer {
border-top:1px solid #DCDFE6;
padding: 20px;
padding-top: 10px;
/* padding-top: 10px; */
text-align: right;
-webkit-box-sizing: border-box;
box-sizing: border-box; }
......@@ -42515,7 +42516,8 @@
color: #1890ff;
background: transparent;
padding-left: 0;
padding-right: 0; }
padding-right: 0;
padding: 0; }
.el-button--text:hover, .el-button--text:focus {
color: #46a6ff;
border-color: transparent;
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