Skip to content

M
memberTag-web
Commit 43154522 by member
Options

修改生产问题

parent fca01245
Showing with 43 additions and 20 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.4dcad714cf38425338e6d6c539aa8a78.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.12ac1f35ff609e14db56.js></script><script type=text/javascript src=./static/js/vendor.eb4fd5c01c3b98d7fcea.js></script><script type=text/javascript src=./static/js/app.b7d422efb3e56dbd098d.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.2b4c0c534666e4c4bc544aad3dbe3a0d.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script src=//web-1251519181.file.myqcloud.com/lib/vue/2.6.6/vue.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vue-router/3.0.2/vue-router.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/vuex/3.1.0/vuex.min.js></script><script src=//web-1251519181.file.myqcloud.com/lib/elementUI/index.2.5.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.18.js></script><script src=//web-1251519181.file.myqcloud.com/components/footer.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/store-new.2.0.12.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.02.js></script><script src=//web-1251519181.file.myqcloud.com/components/area-ab.2.0.00.js></script><script src=//web-1251519181.file.myqcloud.com/components/card.2.0.02.js></script><script type=text/javascript src=./static/js/manifest.3bf809be6d1b6794317d.js></script><script type=text/javascript src=./static/js/vendor.eb4fd5c01c3b98d7fcea.js></script><script type=text/javascript src=./static/js/app.b7d422efb3e56dbd098d.js></script></body></html>
\ No newline at end of file
dist/static/js/0.c8f5803fce6ccd567d1c.js → dist/static/js/0.746c3c652e4a9aa0cb0e.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/manifest.12ac1f35ff609e14db56.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,t,a){for(var o,d,b,i=0,u=[];i<n.length;i++)d=n[i],r[d]&&u.push(r[d][0]),r[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(n,t,a);u.length;)u.shift()();if(a)for(i=0;i<a.length;i++)b=f(f.s=a[i]);return b};var n={},r={33:0};function f(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,f),r.l=!0,r.exports}f.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,f){c=r[e]=[n,f]});c[2]=n;var t=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,f.nc&&a.setAttribute("nonce",f.nc),a.src=f.p+"static/js/"+e+"."+{0:"c8f5803fce6ccd567d1c",1:"1a66f3452cb905b67755",2:"01784f338bb843f827f5",3:"469f9eb20815d11a1a31",4:"5346be35fdb53a222936",5:"897c431e2ea275b47fcf",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"49dc4ce10dca172e66e9",11:"089121d042e2ea4d5934",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"d92460353eb3e0bb9bf6",16:"77043b18784ab0e7f74a",17:"b43a253e53779917cbec",18:"9022ea0326694df97cda",19:"b15734a344b3a216e067",20:"0fef167461d750bfe493",21:"9552d108595ed6cf8df5",22:"61bb63c1296b6c9972a5",23:"c24a9f56d0040598512c",24:"590887b93345814f00ef",25:"fbc9d87dd52c837c39be",26:"c5f9e5a4bc2c63938b70",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"a847856eb9171d0ce268",32:"a9aaa6e5d01423c1a780"}[e]+".js";var o=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(o);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return a.onerror=a.onload=d,t.appendChild(a),n},f.m=e,f.c=n,f.d=function(e,c,n){f.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},f.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(c,"a",c),c},f.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},f.p="./",f.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.3bf809be6d1b6794317d.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,t,f){for(var o,b,d,i=0,u=[];i<n.length;i++)b=n[i],r[b]&&u.push(r[b][0]),r[b]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(n,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)d=a(a.s=f[i]);return d};var n={},r={33:0};function a(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,a),r.l=!0,r.exports}a.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,a){c=r[e]=[n,a]});c[2]=n;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,a.nc&&f.setAttribute("nonce",a.nc),f.src=a.p+"static/js/"+e+"."+{0:"746c3c652e4a9aa0cb0e",1:"1a66f3452cb905b67755",2:"01784f338bb843f827f5",3:"469f9eb20815d11a1a31",4:"5346be35fdb53a222936",5:"897c431e2ea275b47fcf",6:"31eb51419dea97959645",7:"f169140cbd6ad9f5611c",8:"fe61efcd1ccfc3412252",9:"ea583eedf0e8e01807bd",10:"49dc4ce10dca172e66e9",11:"089121d042e2ea4d5934",12:"ff49b3face62ef7aef5f",13:"5ff52df0201b9234fa89",14:"698cfa21b2f783438c71",15:"d92460353eb3e0bb9bf6",16:"77043b18784ab0e7f74a",17:"b43a253e53779917cbec",18:"9022ea0326694df97cda",19:"b15734a344b3a216e067",20:"0fef167461d750bfe493",21:"9552d108595ed6cf8df5",22:"61bb63c1296b6c9972a5",23:"c24a9f56d0040598512c",24:"590887b93345814f00ef",25:"fbc9d87dd52c837c39be",26:"c5f9e5a4bc2c63938b70",27:"2c48b10d124016d57c0b",28:"3493abb67f82d7dbc1cb",29:"a847856eb9171d0ce268",32:"a9aaa6e5d01423c1a780"}[e]+".js";var o=setTimeout(b,12e4);function b(){f.onerror=f.onload=null,clearTimeout(o);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return f.onerror=f.onload=b,t.appendChild(f),n},a.m=e,a.c=n,a.d=function(e,c,n){a.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:n})},a.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(c,"a",c),c},a.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},a.p="./",a.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/components/tag/tag-config-options.vue
......@@ -717,8 +717,16 @@ export default {
checkeditems: [],
isIndeterminate: false,
checkAll: false,
options: [
],
options: [],
compute: 'in'
},
// 多选项值异步
tag013: {
checkeditems: [],
isIndeterminate: false,
checkAll: false,
options: [],
compute: 'in'
},
......@@ -804,14 +812,6 @@ export default {
selectLabelTip: '注：存在其一即会员至少有一个字段值满足所选条件；所有即会员的所有字段值满足所选条件'
},
// 多选项值异步
tag013: {
checkeditems: [],
isIndeterminate: false,
checkAll: false,
options: []
},
// 时间属性-固定时段/相对时段 年月日-年月日+最近+之后
tag014: {
radio: '1',
......@@ -1083,6 +1083,11 @@ export default {
if (data.templateCode === 'tag009' || data.templateCode === 'tag010') {
this.searchFlag = true;
}
setTimeout(_ => {
if (this.templateDataList.editCondition) {
this.asyncTemplateList();
}
}, 200);
return false;
}
this.templateData.push(this[data.templateCode]);
......@@ -1112,6 +1117,25 @@ export default {
});
},
asyncTemplateList() {
let tagValue = JSON.parse(this.templateDataList.tagValue);
// let tagParams = JSON.parse(this.templateDataList.tagParams);
let value = null;
let checkedCount = null;
for (let tem of this.templateData) {
switch (tem.templateCode) {
case 'tag013':
value = tagValue.val[0].data.value.split(' ');
tem.checkeditems = value;
checkedCount = tem.checkeditems.length;
tem.checkAll = checkedCount == tem.options.length;
tem.isIndeterminate = checkedCount > 0 && checkedCount < tem.options.length;
break;
}
}
},
/**
* 城市
*/
......@@ -1148,7 +1172,7 @@ export default {
this.axios.post(`${this.baseUrl}${url}`, qs.stringify(para))
.then(res => {
let resData = res;
console.log(resData);
console.log(this.tagData.tagType, this.currentKey);
if (this.tagData.tagType != 1 && this.currentKey != 'tag') {
if (resData.data.errorCode == 0) {
data.options = resData.data.result;
......@@ -1326,9 +1350,9 @@ export default {
case 'tag013':
value = tagValue.val[0].data.value.split(' ');
console.log(value);
for (let i = 0; i < this.templateData.length; i++) {
if (this.templateData[i].templateCode === 'tag013') {
console.log(this.templateData[i].checkeditems);
this.templateData[i].checkeditems = value;
}
}
......@@ -1520,15 +1544,15 @@ export default {
for (let i = 0; i < this.templateData.length; i++) {
if (this.templateData[i].templateCode === 'com001') {
// 老数据是按照两个区间值来做的 所以强行当成老数据来做
if (tagParams.selectedVal.indexOf('区间') != -1) {
if (tagParams.selectedVal[0].indexOf('区间') != -1) {
// 存在区间
this.templateData[i].symbol = '区间';
this.templateData[i].numRange = tagValue.val[0].data.value.split(',')
this.templateData[i].numRange = tagValue.val[0].data.value.split(',');
} else if (tagParams.template[0].symbol == void 0) {
this.templateData[i].symbol = '区间';
this.templateData[i].numRange = tagParams.template[0].numRange;
} else {
this.templateData[i].symbol = tagParams.selectedVal.slice(0, 1);
this.templateData[i].symbol = tagParams.template[0].symbol;
this.templateData[i].num = tagValue.val[0].data.value;
}
}
......
src/components/tagDetail/mixin/index.js
......@@ -1708,7 +1708,6 @@ export default {
that.getcityData();
}
if (resData.result.templateCode === 'com001') {
console.log(resData);
console.log(this.templateData);
}
// 如果是给了 计算属性值
......
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