Skip to content

M
memberTag-web
Commit 7507b10d by 无尘
Options

fix: 修改分组编辑bug

parent fc2e5fd3
Showing with 57 additions and 26 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.f5ea833225025f7ec49091cea2ef188a.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.f8bd129eec378c6e09d5.js></script><script type=text/javascript src=./static/js/vendor.4ac54fd03099c45beefc.js></script><script type=text/javascript src=./static/js/app.093271d4650febf1f6d5.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.3fc6e1351b370c4d0fd90ec983c7158c.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.497476b4e5b294f88b23.js></script><script type=text/javascript src=./static/js/vendor.4ac54fd03099c45beefc.js></script><script type=text/javascript src=./static/js/app.093271d4650febf1f6d5.js></script></body></html>
\ No newline at end of file
dist/static/css/app.3fc6e1351b370c4d0fd90ec983c7158c.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/app.f5ea833225025f7ec49091cea2ef188a.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/public.css
......@@ -468,14 +468,26 @@ input:focus {
width: 309px;
}
.w-329 {
width: 329px;
}
.w-375 {
width: 375px;
}
.w-427 {
width: 427px;
}
.w-485 {
width: 485px;
}
.w-536 {
width: 536px;
}
.w-548 {
width: 548px;
}
......
dist/static/js/5.12081ccc9406f39b3ccc.js deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/5.12081ccc9406f39b3ccc.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/5.1a256372cf611e55ba61.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/5.1a256372cf611e55ba61.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/6.64f558a9374b3a579c60.js → dist/static/js/6.59b27edefe4691fe176b.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/6.59b27edefe4691fe176b.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/6.64f558a9374b3a579c60.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/manifest.497476b4e5b294f88b23.js 0 → 100644
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,o,f){for(var a,d,i,u=0,b=[];u<r.length;u++)d=r[u],t[d]&&b.push(t[d][0]),t[d]=0;for(a in o)Object.prototype.hasOwnProperty.call(o,a)&&(e[a]=o[a]);for(n&&n(r,o,f);b.length;)b.shift()();if(f)for(u=0;u<f.length;u++)i=c(c.s=f[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],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,c.nc&&f.setAttribute("nonce",c.nc),f.src=c.p+"static/js/"+e+"."+{0:"e176f14a64fd437559de",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"1a256372cf611e55ba61",6:"59b27edefe4691fe176b",7:"90e57a4c65b361239045",8:"734402e7a15a86d0b936",9:"13bfcb94c19bc4aad614",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"efe5e750726bc1eaf8fb",13:"f31d7a2959c9f924b85f",14:"dcdc82940d580456b970",15:"5966245d2668ef56829e",16:"f4036a24000959bd38c8",17:"83e469d672229c638715",18:"129d150ebd1fce6ee6e0",19:"4f681127cc3b6c7e3765",20:"e9481aadfbdf4369b210",21:"0146cbc284f8f86a347d",22:"e91d8f3111c8c501ab9d",25:"9ceafa4ee79176c87d81"}[e]+".js";var a=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(a);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return f.onerror=f.onload=d,o.appendChild(f),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.497476b4e5b294f88b23.js.map
\ No newline at end of file
dist/static/js/manifest.f8bd129eec378c6e09d5.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,o,f){for(var a,d,i,u=0,b=[];u<n.length;u++)d=n[u],r[d]&&b.push(r[d][0]),r[d]=0;for(a in o)Object.prototype.hasOwnProperty.call(o,a)&&(e[a]=o[a]);for(c&&c(n,o,f);b.length;)b.shift()();if(f)for(u=0;u<f.length;u++)i=t(t.s=f[u]);return i};var n={},r={26:0};function t(c){if(n[c])return n[c].exports;var r=n[c]={i:c,l:!1,exports:{}};return e[c].call(r.exports,r,r.exports,t),r.l=!0,r.exports}t.e=function(e){var c=r[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var n=new Promise(function(n,t){c=r[e]=[n,t]});c[2]=n;var o=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,t.nc&&f.setAttribute("nonce",t.nc),f.src=t.p+"static/js/"+e+"."+{0:"e176f14a64fd437559de",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"12081ccc9406f39b3ccc",6:"64f558a9374b3a579c60",7:"90e57a4c65b361239045",8:"734402e7a15a86d0b936",9:"13bfcb94c19bc4aad614",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"efe5e750726bc1eaf8fb",13:"f31d7a2959c9f924b85f",14:"dcdc82940d580456b970",15:"5966245d2668ef56829e",16:"f4036a24000959bd38c8",17:"83e469d672229c638715",18:"129d150ebd1fce6ee6e0",19:"4f681127cc3b6c7e3765",20:"e9481aadfbdf4369b210",21:"0146cbc284f8f86a347d",22:"e91d8f3111c8c501ab9d",25:"9ceafa4ee79176c87d81"}[e]+".js";var a=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(a);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return f.onerror=f.onload=d,o.appendChild(f),n},t.m=e,t.c=n,t.d=function(e,c,n){t.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},t.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(c,"a",c),c},t.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},t.p="./",t.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.f8bd129eec378c6e09d5.js.map
\ No newline at end of file
src/view/manualTag/manualTagEdit.vue
......@@ -17,8 +17,8 @@
</div>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm">
<el-form-item label="标签名称" prop="tagName" class="w-309">
<el-input class="w-200" v-model="ruleForm.tagName" @focus="focus('tagName',10)" @keyup.native="(value) => toInput(value)">
<el-form-item label="标签名称" prop="tagName" class="w-329">
<el-input class="w-220" v-model="ruleForm.tagName" @focus="focus('tagName',10)" @keyup.native="(value) => toInput(value)">
</el-input>
<label class="input-label">{{inputNumObj.tagName}}/10</label>
</el-form-item>
......@@ -26,7 +26,7 @@
<el-select
v-model="ruleForm.tagTwoLevelGroupId"
placeholder="请选择"
class="w-200"
class="w-220"
@change="changeTwo">
<el-option
v-for="item in optionsTwo"
......@@ -36,7 +36,7 @@
</el-option>
</el-select><el-select
v-model="ruleForm.tagLevelGroupId"
placeholder="请选择" class="w-200 m-l-8">
placeholder="请选择" class="w-220 m-l-8">
<el-option
v-for="item in optionsThree"
:key="item.tagLevelGroupId"
......@@ -45,8 +45,8 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标签描述" prop="tagDescribe" class="w-516">
<el-input class="w-407" type="textarea" v-model="ruleForm.tagDescribe" style="height: 96px;" @focus="focus('tagDescribe',200)" @keyup.native="(value) => toInput(value)">
<el-form-item label="标签描述" prop="tagDescribe" class="w-560">
<el-input class="w-447" type="textarea" v-model="ruleForm.tagDescribe" style="height: 96px;" @focus="focus('tagDescribe',200)" @keyup.native="(value) => toInput(value)">
</el-input>
<template><label class="input-label textarea-label">{{inputNumObj.tagDescribe}}/200</label></template>
</el-form-item>
......@@ -64,9 +64,9 @@
<el-input
v-model="addInputValue"
placeholder="请输入"
class="w-200 m-r-20"
class="w-220 m-r-20"
@focus="focus('addInputValue',10)"
@keyup.native="(value) => toInput(value)">
@keyup.native="(value) => toInput(value,'tagVal')">
</el-input><label
class="input-label textarea-label">
......@@ -353,13 +353,19 @@
/**
* 输入
*/
toInput: function(value) {
toInput: function(value,flag) {
const that = this;
console.log(value);
let temp = '';
temp = strLength.getByteVal(value.target.value,that.inputFlagNum);
console.log(temp)
if (!!flag) {
that.addInputValue = temp.trim();
that.inputNumObj[that.inputFlag] = strLength.getZhLen(that.addInputValue);
return false;
}
that.ruleForm[that.inputFlag] = temp.trim();
that.inputNumObj[that.inputFlag] = strLength.getZhLen(that.ruleForm[that.inputFlag]);
......@@ -907,12 +913,12 @@
font-weight: bold;
}
.w-407 {
width: 407px;
.w-447 {
width: 447px;
}
.w-516 {
width: 516px;
.w-560 {
width: 560px;
}
.manualTagEdit-wrap__form {
......@@ -946,7 +952,7 @@
.manualTagEdit-wrap__input {
position: relative;
width: 250px;
width: 270px;
}
.excel-upload-content {
......
src/view/memberGroup/memberGroupEdit.vue
......@@ -114,7 +114,7 @@
const rateOneValid = (rule, value, callback) => {
console.log(value)
if (this.ruleForm.isActive == 1 && value == '') {
if (this.ruleForm.isActive == 0 && value == '') {
callback(new Error('请选择更新频率'));
} else {
callback();
......@@ -122,7 +122,7 @@
};
const rateValid = (rule, value, callback) => {
console.log(value,this.ruleForm)
if (this.ruleForm.isActive == 1 && (this.ruleForm.updateType != '1'||this.ruleForm.updateType == '') && value == '') {
if (this.ruleForm.isActive == 0 && (this.ruleForm.updateType != '1'||this.ruleForm.updateType == '') && value == '') {
console.log(value,this.ruleForm)
callback(new Error('请选择更新频率'));
} else {
......@@ -339,8 +339,8 @@
if (!!that.selectedTagData.length) {
const arrTag = that.selectedTagData.map(item=>parseInt(item.isActive));
console.log(arrTag)
if (arrTag.indexOf(0) != -1) {
console.log("已选标签实时/非实时:",arrTag)
if (arrTag.includes(0)) {
that.ruleForm.isActive = 0; // 如果有非实时,最后都是非实时
}else {
that.ruleForm.isActive = 1;
......@@ -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 !=1 && that.ruleForm.updateDay == '';
const flag = that.ruleForm.isActive == 0 && that.ruleForm.updateType !=1 && that.ruleForm.updateDay == '';
if (!!flag) {
that.$message.error({message: '请选择更新频率!'});
return false;
......@@ -594,7 +594,7 @@
selectedTagData.forEach(function(ele,index){
let newTagVal = JSON.parse(ele.tagParams)
if (newTagVal.selectedVal != '') {
ele.newTagVal = newTagVal.selectedVal
ele.newTagVal = JSON.stringify(newTagVal.selectedVal).replace(/"/g, '');
}else{
ele.newTagVal = ''
}
......@@ -653,7 +653,7 @@
tagValueDtoList.forEach(function(ele,index){
let newTagVal = JSON.parse(ele.tagParams)
if (newTagVal.selectedVal != '') {
ele.newTagVal = newTagVal.selectedVal
ele.newTagVal = JSON.stringify(newTagVal.selectedVal).replace(/"/g, '');
}else{
ele.newTagVal = ''
}
......@@ -686,6 +686,7 @@
that.ruleForm.selectedTag = JSON.parse(localData);
setTimeout(function(){
that.selectedTagData = JSON.parse(localData);
that.checkRealTime()
},500)
sessionStorage.removeItem('selectTempTag')
}
......
static/css/public.css
......@@ -468,14 +468,26 @@ input:focus {
width: 309px;
}
.w-329 {
width: 329px;
}
.w-375 {
width: 375px;
}
.w-427 {
width: 427px;
}
.w-485 {
width: 485px;
}
.w-536 {
width: 536px;
}
.w-548 {
width: 548px;
}
......
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