Commit dc44c5d7 by 无尘

fix: 修改标签详情交互

parent e86d3c7b
<!DOCTYPE html><html><head><meta charset=utf-8><link rel="shortcut icon" href=./favicon.ico><title>GIC-会员标签</title><link href=./static/css/app.8ec65a5e571aef5d5f122d19a2efd178.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.a9546f1e8b7fa3ab02aa.js></script><script type=text/javascript src=./static/js/vendor.4e8e1ad254ac3b9caa18.js></script><script type=text/javascript src=./static/js/app.49274dac1131f7fdfae1.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.b40760cc666fcc590df1828a41d3988c.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.fd4b289773b0bc375a96.js></script><script type=text/javascript src=./static/js/vendor.4e8e1ad254ac3b9caa18.js></script><script type=text/javascript src=./static/js/app.49274dac1131f7fdfae1.js></script></body></html>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var f,d,b,i=0,u=[];i<r.length;i++)d=r[i],a[d]&&u.push(a[d][0]),a[d]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=t(t.s=o[i]);return b};var r={},a={28:0};function t(n){if(r[n])return r[n].exports;var a=r[n]={i:n,l:!1,exports:{}};return e[n].call(a.exports,a,a.exports,t),a.l=!0,a.exports}t.e=function(e){var n=a[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=a[e]=[r,t]});n[2]=r;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,t.nc&&o.setAttribute("nonce",t.nc),o.src=t.p+"static/js/"+e+"."+{0:"6301e59b41e85ae317d5",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"4d14a26187252a5e79e4",6:"5118aed425a61b370dca",7:"3877c729133a8e741e38",8:"025af3d113b361bd7603",9:"bd6886217341a2ac6364",10:"bda2f0473989f24cfd79",11:"d02aea8830b64fa15254",12:"9ecfc05b1317eae5aceb",13:"e29aa5893a93a16c34bc",14:"30fa1e18caf0b2c59bb5",15:"d5c5df25a4f4dcfb8bbf",16:"9f01549142162cddd10f",17:"c8a47b8d501bd5430967",18:"7a971724ceedf92fdfcc",19:"5e189ff7a83716b9b3e5",20:"3d26bb4503e7e9f2e788",21:"cafd61d1500edc38a50a",22:"6fa2e5eec68626176108",23:"8d9024391ef085f99b5a",24:"d8ebf9b105c3079a42bd",27:"02b5e0be03d9340bd130"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=a[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return o.onerror=o.onload=d,c.appendChild(o),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="./",t.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.a9546f1e8b7fa3ab02aa.js.map
\ No newline at end of file
!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,o){for(var f,d,b,i=0,u=[];i<r.length;i++)d=r[i],a[d]&&u.push(a[d][0]),a[d]=0;for(f in c)Object.prototype.hasOwnProperty.call(c,f)&&(e[f]=c[f]);for(n&&n(r,c,o);u.length;)u.shift()();if(o)for(i=0;i<o.length;i++)b=t(t.s=o[i]);return b};var r={},a={28:0};function t(n){if(r[n])return r[n].exports;var a=r[n]={i:n,l:!1,exports:{}};return e[n].call(a.exports,a,a.exports,t),a.l=!0,a.exports}t.e=function(e){var n=a[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=a[e]=[r,t]});n[2]=r;var c=document.getElementsByTagName("head")[0],o=document.createElement("script");o.type="text/javascript",o.charset="utf-8",o.async=!0,o.timeout=12e4,t.nc&&o.setAttribute("nonce",t.nc),o.src=t.p+"static/js/"+e+"."+{0:"6301e59b41e85ae317d5",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"4d14a26187252a5e79e4",6:"fd4f2e0c53b82299ce08",7:"571d8139a39270a9c596",8:"025af3d113b361bd7603",9:"bd6886217341a2ac6364",10:"bda2f0473989f24cfd79",11:"d02aea8830b64fa15254",12:"9ecfc05b1317eae5aceb",13:"e29aa5893a93a16c34bc",14:"352dad5ae4a83a4cb845",15:"d5c5df25a4f4dcfb8bbf",16:"9f01549142162cddd10f",17:"c8a47b8d501bd5430967",18:"7a971724ceedf92fdfcc",19:"5e189ff7a83716b9b3e5",20:"3d26bb4503e7e9f2e788",21:"cafd61d1500edc38a50a",22:"6fa2e5eec68626176108",23:"8d9024391ef085f99b5a",24:"d8ebf9b105c3079a42bd",27:"02b5e0be03d9340bd130"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var n=a[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),a[e]=void 0)}return o.onerror=o.onload=d,c.appendChild(o),r},t.m=e,t.c=r,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="./",t.oe=function(e){throw console.error(e),e}}([]);
//# sourceMappingURL=manifest.fd4b289773b0bc375a96.js.map
\ No newline at end of file
......@@ -461,20 +461,65 @@
</template>
<!-- 19.时间属性(年月日时分秒-年月日时分秒) -->
<template v-if="parent.templateCode == 'tag019'">
<el-date-picker
v-model="parent.dateRangeValue"
type="daterange"
:editable="false"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
><!-- :picker-options="pickerOptions" -->
</el-date-picker>
<el-radio v-model="parent.radio" label="1">固定时段</el-radio>
<el-radio v-model="parent.radio" label="2">相对时段</el-radio>
<!-- 固定时段 -->
<div class="m-t-18 w-438 p-20 border-box bg-f3f6f9" v-if="parent.radio == 1">
<el-date-picker
v-model="parent.dateRangeValue"
type="daterange"
:editable="false"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
>
</el-date-picker>
</div>
<!-- 相对时段 -->
<div class="relative-range m-t-18 border-box" v-if="parent.radio != 1">
<div>
<div>
<label class="inline-block w-98 label-unit">时间精度</label>
<el-radio-group v-model="parent.timeRadio" @change="timeRadioChange($event,parent)">
<el-radio label="1"></el-radio>
<el-radio label="2"></el-radio>
<el-radio label="3"></el-radio>
</el-radio-group>
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-radio v-model="parent.timeChecked" label="1">{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<!-- <el-checkbox v-model="parent.timeChecked"><label class="inline-block middle">{{parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年'}}</label></el-checkbox> -->
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-radio v-model="parent.timeChecked" label="2">{{ }}</el-radio>
<!-- <el-checkbox v-model="parent.timeCheckedTwo"> </el-checkbox> -->
<el-select v-model="parent.timeSelect" placeholder="请选择" class="w-86 m-l-8">
<el-option label="最近" value="1"></el-option>
<el-option label="之后" value="2"></el-option>
</el-select>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)"></el-input>
<template v-if="parent.timeRadio==1">
<label class="inline-block middle label-unit m-l-8"></label>
<label class="inline-block middle label-tip">正整数,最大365</label>
</template>
<template v-if="parent.timeRadio==2">
<label class="inline-block middle label-unit m-l-8"></label>
<label class="inline-block middle label-tip">正整数,最大12</label>
</template>
<template v-if="parent.timeRadio==3">
<label class="inline-block middle label-unit m-l-8"></label>
<label class="inline-block middle label-tip">正整数,最大2</label>
</template>
</div>
</div>
</div>
</template>
<!-- 17.时间属性(年月日-年月日 + 最近) -->
<template v-if="parent.templateCode == 'tag017'">
<el-radio v-model="parent.radio" label="1">固定时段</el-radio>
......@@ -808,7 +853,15 @@
},
// 时间属性- 年月日-年月日
tag019: {
dateRangeValue: []
radio: "1",
dateRangeValue: [],
// 相对时间
timeRadio: "1", // 年月日
timeChecked: '1', //当 年月日 / 最近/之后
// timeCheckedTwo: false,
timeSelect: '1', // 最近/之后
timeInput: '',
},
// 标签详情数据
......@@ -1048,40 +1101,44 @@
}
/* 年月日时分秒-年月日时分秒*/
if (code === 'tag019' && !that.templateData[0].dateRangeValue.length) {
that.$message.error({ message: '请选择时间'})
return false;
}
if (code === 'tag019' && that.templateData.length ===1) {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'between';
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',').replace(/-/g,'').replace(/:/g,'').replace(/\s+/g,'')
// console.log(tagValue.val[0].data.value)
that.postTemplateData.selectedVal.push(`${that.templateData[0].dateRangeValue[0]}${that.templateData[0].dateRangeValue[1]}`)
}
/* 固定/相对 年月日+最近+之后 年月日+最近*/
if ((code === 'tag014' || code === 'tag017') && that.templateData[0].radio == 1 && !that.templateData[0].dateRangeValue.length) {
// if (code === 'tag019' && !that.templateData[0].dateRangeValue.length) {
// that.$message.error({ message: '请选择时间'})
// return false;
// }
// if (code === 'tag019' && that.templateData.length ===1) {
// if (that.currentComputeType == 2) {
// tagValue.val[0].data.compute = 'between';
// }else {
// tagValue.val[0].data.compute = that.templateData[0].postCompute;
// }
// tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',').replace(/-/g,'').replace(/:/g,'').replace(/\s+/g,'')
// that.postTemplateData.selectedVal.push(`${that.templateData[0].dateRangeValue[0]} 至 ${that.templateData[0].dateRangeValue[1]}`)
// }
/* 固定/相对 年月日+最近+之后 年月日+最近 年月日时分秒-年月日时分秒 */
if ((code === 'tag014' || code === 'tag017' || code === 'tag019') && that.templateData[0].radio == 1 && !that.templateData[0].dateRangeValue.length) {
that.$message.error({ message: '请选择值'})
return false;
}
if ((code === 'tag014' || code === 'tag017') && that.templateData[0].radio == 2 && that.templateData[0].timeChecked == 2 && !that.templateData[0].timeInput) {
if ((code === 'tag014' || code === 'tag017' || code === 'tag019') && that.templateData[0].radio == 2 && that.templateData[0].timeChecked == 2 && !that.templateData[0].timeInput) {
that.$message.error({ message: '请填写值'})
return false;
}
if ((code === 'tag014' || code === 'tag017') && that.templateData.length === 1 && that.templateData[0].radio == 1){
if ((code === 'tag014' || code === 'tag017' || code === 'tag019') && that.templateData.length === 1 && that.templateData[0].radio == 1){
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'between';
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',')
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',');
if (code === 'tag019') {
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',').replace(/-/g,'').replace(/:/g,'').replace(/\s+/g,'')
}
that.postTemplateData.selectedVal.push(`${that.templateData[0].dateRangeValue[0]}${that.templateData[0].dateRangeValue[1]}`)
}
if ((code === 'tag014' || code === 'tag017') && that.templateData.length === 1 && that.templateData[0].radio == 2){
if ((code === 'tag014' || code === 'tag017' || code === 'tag019') && that.templateData.length === 1 && that.templateData[0].radio == 2){
// 天
if (that.templateData[0].timeRadio == 1) {
//天 当天
......
......@@ -398,20 +398,65 @@
</template>
<!-- 19.时间属性(年月日时分秒-年月日时分秒) -->
<template v-if="parent.templateCode == 'tag019'">
<el-date-picker
v-model="parent.dateRangeValue"
type="daterange"
:editable="false"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
><!-- :picker-options="pickerOptions" -->
</el-date-picker>
<el-radio v-model="parent.radio" label="1">固定时段</el-radio>
<el-radio v-model="parent.radio" label="2">相对时段</el-radio>
<!-- 固定时段 -->
<div class="m-t-18 w-438 p-20 border-box bg-f3f6f9" v-if="parent.radio == 1">
<el-date-picker
v-model="parent.dateRangeValue"
type="daterange"
:editable="false"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyyMMdd"
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['00:00:00', '23:59:59']"
>
</el-date-picker>
</div>
<!-- 相对时段 -->
<div class="relative-range m-t-18 border-box" v-if="parent.radio != 1">
<div>
<div>
<label class="inline-block w-98 label-unit">时间精度</label>
<el-radio-group v-model="parent.timeRadio" @change="timeRadioChange($event,parent)">
<el-radio label="1"></el-radio>
<el-radio label="2"></el-radio>
<el-radio label="3"></el-radio>
</el-radio-group>
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-radio v-model="parent.timeChecked" label="1">{{ parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年' }}</el-radio>
<!-- <el-checkbox v-model="parent.timeChecked"><label class="inline-block middle">{{parent.timeRadio==1?'天':parent.timeRadio==2?'月':'年'}}</label></el-checkbox> -->
</div>
<div class="m-t-20">
<label class="inline-block w-98"></label>
<el-radio v-model="parent.timeChecked" label="2">{{ }}</el-radio>
<!-- <el-checkbox v-model="parent.timeCheckedTwo"> </el-checkbox> -->
<el-select v-model="parent.timeSelect" placeholder="请选择" class="w-86 m-l-8">
<el-option label="最近" value="1"></el-option>
<el-option label="之后" value="2"></el-option>
</el-select>
<el-input v-model="parent.timeInput" placeholder="请输入" class="w-90" @blur="(value) => toEditDateInput(value,parent.timeRadio,parent)"></el-input>
<template v-if="parent.timeRadio==1">
<label class="inline-block middle label-unit m-l-8"></label>
<label class="inline-block middle label-tip">正整数,最大365</label>
</template>
<template v-if="parent.timeRadio==2">
<label class="inline-block middle label-unit m-l-8"></label>
<label class="inline-block middle label-tip">正整数,最大12</label>
</template>
<template v-if="parent.timeRadio==3">
<label class="inline-block middle label-unit m-l-8"></label>
<label class="inline-block middle label-tip">正整数,最大2</label>
</template>
</div>
</div>
</div>
</template>
<!-- 17.时间属性(年月日-年月日 + 最近) -->
<template v-if="parent.templateCode == 'tag017'">
<el-radio v-model="parent.radio" label="1">固定时段</el-radio>
......@@ -737,7 +782,15 @@ import qs from 'qs';
// 时间属性- 年月日-年月日
tag019: {
dateRangeValue: []
radio: "1",
dateRangeValue: [],
// 相对时间
timeRadio: "1", // 年月日
timeChecked: '1', //当 年月日 / 最近/之后
// timeCheckedTwo: false,
timeSelect: '1', // 最近/之后
timeInput: '',
},
// 标签详情数据
......@@ -1001,39 +1054,42 @@ import qs from 'qs';
}
/* 年月日时分秒-年月日时分秒*/
if (code === 'tag019' && !that.templateData[0].dateRangeValue.length) {
that.$message.error({ message: '请选择时间'})
return false;
}
if (code === 'tag019' && that.templateData.length ===1) {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'between';
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',').replace(/-/g,'').replace(/:/g,'').replace(/\s+/g,'')
that.postTemplateData.selectedVal.push(`${that.templateData[0].dateRangeValue[0]}${that.templateData[0].dateRangeValue[1]}`)
}
// if (code === 'tag019' && !that.templateData[0].dateRangeValue.length) {
// that.$message.error({ message: '请选择时间'})
// return false;
// }
// if (code === 'tag019' && that.templateData.length ===1) {
// if (that.currentComputeType == 2) {
// tagValue.val[0].data.compute = 'between';
// }else {
// tagValue.val[0].data.compute = that.templateData[0].postCompute;
// }
// tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',').replace(/-/g,'').replace(/:/g,'').replace(/\s+/g,'')
// that.postTemplateData.selectedVal.push(`${that.templateData[0].dateRangeValue[0]} 至 ${that.templateData[0].dateRangeValue[1]}`)
// }
/* 固定/相对 年月日+最近+之后 年月日+最近*/
if ((code === 'tag014' || code === 'tag017') && that.templateData[0].radio == 1 && !that.templateData[0].dateRangeValue.length) {
if ((code === 'tag014' || code === 'tag017' || code === 'tag019') && that.templateData[0].radio == 1 && !that.templateData[0].dateRangeValue.length) {
that.$message.error({ message: '请选择值'})
return false;
}
if ((code === 'tag014' || code === 'tag017') && that.templateData[0].radio == 2 && that.templateData[0].timeChecked == 2 && !that.templateData[0].timeInput) {
if ((code === 'tag014' || code === 'tag017' || code === 'tag019') && that.templateData[0].radio == 2 && that.templateData[0].timeChecked == 2 && !that.templateData[0].timeInput) {
that.$message.error({ message: '请填写值'})
return false;
}
if ((code === 'tag014' || code === 'tag017') && that.templateData.length === 1 && that.templateData[0].radio == 1){
if ((code === 'tag014' || code === 'tag017' || code === 'tag019') && that.templateData.length === 1 && that.templateData[0].radio == 1){
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'between';
}else {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
}
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',')
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',');
if (code === 'tag019') {
tagValue.val[0].data.value = that.templateData[0].dateRangeValue.join(',').replace(/-/g,'').replace(/:/g,'').replace(/\s+/g,'')
}
that.postTemplateData.selectedVal.push(`${that.templateData[0].dateRangeValue[0]}${that.templateData[0].dateRangeValue[1]}`)
}
if ((code === 'tag014' || code === 'tag017') && that.templateData.length === 1 && that.templateData[0].radio == 2){
if ((code === 'tag014' || code === 'tag017' || code === 'tag019') && that.templateData.length === 1 && that.templateData[0].radio == 2){
// 天
if (that.templateData[0].timeRadio == 1) {
//天 当天
......
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