Skip to content

M
memberTag-web
Commit 865ae284 by 无尘
Options

add: 打开标签详情

parent fc5ee759
Showing with 256 additions and 177 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.641d2bd404888a1e7cf0ac990033f3b8.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.ba48b10af00d91bae239.js></script><script type=text/javascript src=./static/js/vendor.09cb8cbbb9af29784157.js></script><script type=text/javascript src=./static/js/app.da44d658767f3ef0f234.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.8c703d9d425664ccd358172ab1d8b960.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.d21de76be5db250cb8d8.js></script><script type=text/javascript src=./static/js/vendor.c61d13725ce07aa84642.js></script><script type=text/javascript src=./static/js/app.f47255588964a378e1cf.js></script></body></html>
\ No newline at end of file
dist/static/js/0.f0bab96076bd22498361.js → dist/static/js/0.603e24b6249496bff8d6.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/0.603e24b6249496bff8d6.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.f0bab96076bd22498361.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.3952e1d5dc6277eb797c.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.963a8888a2c77c5d1ca4.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.1425cfc0727e2226daf6.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.1f29ea24c1bd377cfbc1.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/8.24eeef980ff8ffe24d42.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/8.383864ab09e4f624885b.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.ba48b10af00d91bae239.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,a,o){for(var f,d,i,u=0,b=[];u<n.length;u++)d=n[u],r[d]&&b.push(r[d][0]),r[d]=0;for(f in a)Object.prototype.hasOwnProperty.call(a,f)&&(e[f]=a[f]);for(c&&c(n,a,o);b.length;)b.shift()();if(o)for(u=0;u<o.length;u++)i=t(t.s=o[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 a=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:"f0bab96076bd22498361",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"0106258f51de87a40b57",6:"963a8888a2c77c5d1ca4",7:"1f29ea24c1bd377cfbc1",8:"383864ab09e4f624885b",9:"6284684f59ae2a7586a8",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"dece2fedb495aa36c9a6",13:"e29aa5893a93a16c34bc",14:"92199267df3426ee7901",15:"9f61f06d1572f1265cc0",16:"843a47923cc77fa59466",17:"83e469d672229c638715",18:"6ed416399616407ccde9",19:"bfcaf83a5268b922dc57",20:"b3cad66f7678905684ab",21:"cc4b11f9d593442a0878",22:"22f63d81db79c0c78098",25:"9ceafa4ee79176c87d81"}[e]+".js";var f=setTimeout(d,12e4);function d(){o.onerror=o.onload=null,clearTimeout(f);var c=r[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),r[e]=void 0)}return o.onerror=o.onload=d,a.appendChild(o),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.ba48b10af00d91bae239.js.map
\ No newline at end of file
dist/static/js/manifest.d21de76be5db250cb8d8.js 0 → 100644
!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],c[d]&&b.push(c[d][0]),c[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=t(t.s=a[u]);return i};var r={},c={26:0};function t(n){if(r[n])return r[n].exports;var c=r[n]={i:n,l:!1,exports:{}};return e[n].call(c.exports,c,c.exports,t),c.l=!0,c.exports}t.e=function(e){var n=c[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,t){n=c[e]=[r,t]});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,t.nc&&a.setAttribute("nonce",t.nc),a.src=t.p+"static/js/"+e+"."+{0:"603e24b6249496bff8d6",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"0106258f51de87a40b57",6:"3952e1d5dc6277eb797c",7:"1425cfc0727e2226daf6",8:"24eeef980ff8ffe24d42",9:"6284684f59ae2a7586a8",10:"c71c26ffe9e929740644",11:"e85b90356083e5b3e250",12:"dece2fedb495aa36c9a6",13:"e29aa5893a93a16c34bc",14:"92199267df3426ee7901",15:"9f61f06d1572f1265cc0",16:"843a47923cc77fa59466",17:"83e469d672229c638715",18:"6ed416399616407ccde9",19:"bfcaf83a5268b922dc57",20:"b3cad66f7678905684ab",21:"cc4b11f9d593442a0878",22:"22f63d81db79c0c78098",25:"9ceafa4ee79176c87d81"}[e]+".js";var f=setTimeout(d,12e4);function d(){a.onerror=a.onload=null,clearTimeout(f);var n=c[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),c[e]=void 0)}return a.onerror=a.onload=d,o.appendChild(a),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.d21de76be5db250cb8d8.js.map
\ No newline at end of file
dist/static/js/vendor.09cb8cbbb9af29784157.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/vendor.09cb8cbbb9af29784157.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/vendor.c61d13725ce07aa84642.js 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/vendor.c61d13725ce07aa84642.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
package-lock.json
......@@ -89,6 +89,47 @@
"vue": "^2.5.11"
}
},
"@gic-test/vue-gic-datepicker": {
"version": "1.2.9",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-datepicker/download/@gic-test/vue-gic-datepicker-1.2.9.tgz",
"integrity": "sha1-ijVEgJykrIqcHv6I1beL28D/ZwY=",
"requires": {
"@riophae/vue-treeselect": "0.0.35",
"axios": "^0.18.0",
"element-ui": "^2.4.8",
"localforage": "^1.7.2",
"vue": "^2.5.11"
},
"dependencies": {
"@riophae/vue-treeselect": {
"version": "0.0.35",
"resolved": "https://registry.npmjs.org/@riophae/vue-treeselect/-/vue-treeselect-0.0.35.tgz",
"integrity": "sha512-MluY8JRx7yD3AE39g54HnYtcD9cxVTUsqXo6Tjs4+gq41XzlTJhyUJLsSSMtT49qonKbL6gOjK7F/wm+Y9LFQA==",
"requires": {
"babel-helper-vue-jsx-merge-props": "^2.0.3",
"easings-css": "^1.0.0",
"fuzzysearch": "^1.0.3",
"google-material-color": "^1.3.1",
"is-promise": "^2.1.0",
"lodash": "^4.0.0",
"watch-size": "^2.0.0"
}
},
"element-ui": {
"version": "2.4.9",
"resolved": "http://registry.npm.taobao.org/element-ui/download/element-ui-2.4.9.tgz",
"integrity": "sha1-t8nJbaBvGCxqT+f1CLjI7xpRZzI=",
"requires": {
"async-validator": "~1.8.1",
"babel-helper-vue-jsx-merge-props": "^2.0.0",
"deepmerge": "^1.2.0",
"normalize-wheel": "^1.0.1",
"resize-observer-polyfill": "^1.5.0",
"throttle-debounce": "^1.0.1"
}
}
}
},
"@gic-test/vue-gic-footer": {
"version": "1.0.8",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-footer/download/@gic-test/vue-gic-footer-1.0.8.tgz",
......@@ -116,9 +157,9 @@
}
},
"@gic-test/vue-gic-store-new": {
"version": "1.0.9",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-store-new/download/@gic-test/vue-gic-store-new-1.0.9.tgz",
"integrity": "sha1-WHyjBkBpMeMhqOX6N5ZX3/ZmtYc=",
"version": "1.1.0",
"resolved": "http://www.gicdev.com:7001/@gic-test/vue-gic-store-new/download/@gic-test/vue-gic-store-new-1.1.0.tgz",
"integrity": "sha1-j66ac7+k+wJOryewVN3LQZdTFbw=",
"requires": {
"axios": "^0.18.0",
"qs": "^6.5.2",
......@@ -4950,6 +4991,21 @@
"delegate": "^3.1.2"
}
},
"google-material-color": {
"version": "1.3.1",
"resolved": "http://registry.npm.taobao.org/google-material-color/download/google-material-color-1.3.1.tgz",
"integrity": "sha1-mAgtTthq9DuzqxHEmoHrmcrKEFY=",
"requires": {
"lodash": "^2.4.1"
},
"dependencies": {
"lodash": {
"version": "2.4.2",
"resolved": "http://registry.npm.taobao.org/lodash/download/lodash-2.4.2.tgz",
"integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4="
}
}
},
"graceful-fs": {
"version": "4.1.11",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
......@@ -5467,6 +5523,11 @@
"dev": true,
"optional": true
},
"immediate": {
"version": "3.0.6",
"resolved": "http://registry.npm.taobao.org/immediate/download/immediate-3.0.6.tgz",
"integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps="
},
"import-local": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz",
......@@ -5811,6 +5872,11 @@
"integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
"dev": true
},
"is-promise": {
"version": "2.1.0",
"resolved": "http://registry.npm.taobao.org/is-promise/download/is-promise-2.1.0.tgz",
"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
},
"is-property": {
"version": "1.0.2",
"resolved": "http://registry.npm.taobao.org/is-property/download/is-property-1.0.2.tgz",
......@@ -6068,6 +6134,14 @@
}
}
},
"lie": {
"version": "3.1.1",
"resolved": "http://registry.npm.taobao.org/lie/download/lie-3.1.1.tgz",
"integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=",
"requires": {
"immediate": "~3.0.5"
}
},
"load-json-file": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
......@@ -6105,6 +6179,14 @@
"json5": "^0.5.0"
}
},
"localforage": {
"version": "1.7.3",
"resolved": "http://registry.npm.taobao.org/localforage/download/localforage-1.7.3.tgz",
"integrity": "sha1-AIKzypc0Z54b1TSZW907JM8Q8gQ=",
"requires": {
"lie": "3.1.1"
}
},
"locate-path": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
......@@ -6118,8 +6200,7 @@
"lodash": {
"version": "4.17.10",
"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
"dev": true
"integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
},
"lodash.assign": {
"version": "4.2.0",
......@@ -11958,6 +12039,11 @@
"integrity": "sha1-52E1Lr4K9TfUu3Vam53Evj3379I=",
"dev": true
},
"watch-size": {
"version": "2.0.0",
"resolved": "http://registry.npm.taobao.org/watch-size/download/watch-size-2.0.0.tgz",
"integrity": "sha1-CW7ijQNlvX6gPZyL8fL1CnO+FHQ="
},
"watchpack": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
......
package.json
......@@ -12,10 +12,11 @@
"dependencies": {
"@gic-test/vue-area-ab": "^1.4.3",
"@gic-test/vue-gic-aside-menu": "^1.1.45",
"@gic-test/vue-gic-datepicker": "^1.2.9",
"@gic-test/vue-gic-footer": "^1.0.8",
"@gic-test/vue-gic-header": "^1.3.31",
"@gic-test/vue-gic-img-preview": "^1.0.12",
"@gic-test/vue-gic-store-new": "^1.0.9",
"@gic-test/vue-gic-store-new": "^1.1.0",
"@riophae/vue-treeselect": "0.0.29",
"@tinymce/tinymce-vue": "^1.0.8",
"element-ui": "^2.3.9",
......
src/components/tagCategory.vue
......@@ -24,7 +24,7 @@
<!-- 更多列表 -->
<div class="common-wrap__moreTag__body">
<template v-for="(item,index) in childTagDatas">
<a :href="'#/'+tagLibName+'List?tagLevelGroupId='+item.tagLevelGroupId" class="common-wrap__childTag__name">{{item.levelName}}({{ item.num }})</a>
<a :href="'#/'+tagLibName+'List?tagLevelGroupId='+item.tagLevelGroupId" class="common-wrap__childTag__name">{{item.levelName}}({{ item.count }})</a>
</template>
</div>
<i slot="reference" class="el-icon-more"></i>
......
src/components/tagCategorySmall.vue
......@@ -10,13 +10,15 @@
<a class="common-wrap__currentTag__name" @click.stop="toRequestData">全部</a>
<i class="el-icon-arrow-right m-l-8 m-r-8"></i>
<template v-for="(item,index) in currentTagDatas">
<a class="common-wrap__currentTag__name" @click.stop="toRequestData(item.id)">{{item.name}}</a>
<a class="common-wrap__currentTag__name" @click.stop="toRequestData(item.tagLevelGroupId)">{{item.levelName}}</a>
<i class="el-icon-arrow-right m-l-8 m-r-8" v-if="currentTagDatas.length-1 != index"></i>
</template>
</div>
<div class="common-wrap__childTag inline-block">
<template v-for="(item,index) in childTagDatas">
<a class="common-wrap__childTag__name" @click.stop="toRequestData(item.id)">{{item.name}}</a>
<a class="common-wrap__childTag__name" @click.stop="toRequestData(item.tagLevelGroupId)">
{{item.levelName}}({{ item.count }})
</a>
</template>
</div>
<div class="common-wrap__moreTag p-l-20">
......@@ -27,7 +29,9 @@
<!-- 更多列表 -->
<div class="common-wrap__moreTag__body">
<template v-for="(item,index) in childTagDatas">
<a class="common-wrap__childTag__name" @click.stop="toRequestData(item.id)">{{item.name}}</a>
<a class="common-wrap__childTag__name" @click.stop="toRequestData(item.tagLevelGroupId)">
{{item.levelName}}({{ item.count }})
</a>
</template>
</div>
<i slot="reference" class="el-icon-more"></i>
......@@ -55,135 +59,27 @@
// 子分类数据
currentTagDatas: [
{
id: 1,
name: '基本信息',
tagLevelGroupId: 1,
levelName: '基本信息',
},
{
id: 2,
name: '地理信息',
tagLevelGroupId: 2,
levelName: '地理信息',
},
],
childTagDatas: [
{
id: 1,
name: '其他一',
num: 12
tagLevelGroupId: 1,
levelName: '其他一',
count: 12
},
{
id: 2,
name: '其他二',
num: 12
},
{
id: 1,
name: '其他一',
num: 12
},
{
id: 2,
name: '其他二',
num: 12
},
{
id: 1,
name: '其他一',
num: 12
},
{
id: 2,
name: '其他二',
num: 12
},
{
id: 1,
name: '其他一',
num: 12
},
{
id: 2,
name: '其他二',
num: 12
},
{
id: 1,
name: '其他一',
num: 12
},
{
id: 2,
name: '其他二',
num: 12
},
{
id: 1,
name: '其他一',
num: 12
},
{
id: 2,
name: '其他二',
num: 12
},
{
id: 1,
name: '其他一',
num: 12
},
{
id: 2,
name: '其他二',
num: 12
},
{
id: 1,
name: '其他一',
num: 12
},
{
id: 2,
name: '其他二',
num: 12
},
{
id: 1,
name: '其他一',
num: 12
},
{
id: 2,
name: '其他二',
num: 12
},
{
id: 1,
name: '其他一',
num: 12
},
{
id: 2,
name: '其他二',
num: 12
},
{
id: 1,
name: '其他一',
num: 12
},
{
id: 2,
name: '其他二',
num: 12
},
{
id: 1,
name: '其他一',
num: 12
},
{
id: 2,
name: '其他二',
num: 12
tagLevelGroupId: 2,
levelName: '其他二',
count: 12
},
],
}
},
......@@ -194,7 +90,40 @@
toRequestData(id) {
var that = this
console.log(id)
}
},
/**
* 获取当前分类数据
*/
getCateData(id) {
const that = this
const para = {
tagLevelGroupId: id
}
postRequest('/enterpriseMemberTag/enterpriseTagLevel',para)
.then((res) => {
// console.log(res,res.data,res.data.errorCode)
const resData = res.data
if (resData.errorCode == 1) {
// showMsg.showmsg('成功','success')
that.currentTagDatas = resData.result.currentNode; // 当前分类数据
that.childTagDatas = resData.result.dataList; // 子类数据
return;
}
errMsg.errorMsg(resData)
})
.catch(function (error) {
console.log(error);
that.$message.error({
duration: 1000,
message: error.message
})
});
},
},
watch:{
......
src/components/tagTemporary.vue
......@@ -32,21 +32,21 @@
</template>
</el-table-column>
<el-table-column
prop="tagValue"
label="已选标签值"
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.tagParams }}</template>
</el-table-column>
<el-table-column
label="是否实时"
>
<template slot-scope="scope">
{{scope.row.isRealTime == 1? '实时':'非实时'}}
{{scope.row.isActive == 1? '实时':'非实时'}}
</template>
</el-table-column>
<el-table-column
label="操作">
<template slot-scope="scope">
<el-button type="text" size="small" class="" @click="toDelTag(scope.row.id,scope.$index)">删除</el-button>
<el-button type="text" size="small" class="" @click="toDelTag(scope.row.tagValueId,scope.$index)">删除</el-button>
</template>
</el-table-column>
</el-table>
......@@ -71,18 +71,18 @@
toggleTagListFlag: false, // 是否显示参数
selectTag: [],// 已选择标签数据
tagListData: [
{
tagId: 1,
tagName: "123",
tagValue: '描述描述，最多200字，一行显示50字，默认显示一行',
isRealTime: 1
},
{
tagId: 1,
tagName: "123",
tagValue: '描述描述，最多200字，一行显示50字，默认显示一行',
isRealTime: 1
},
// {
// tagId: 1,
// tagName: "123",
// tagValue: '描述描述，最多200字，一行显示50字，默认显示一行',
// isActive: 1
// },
// {
// tagId: 1,
// tagName: "123",
// tagValue: '描述描述，最多200字，一行显示50字，默认显示一行',
// isActive: 1
// },
]
}
......@@ -118,16 +118,17 @@
toDelTag(id,index) {
const that = this
console.log(id,index)
that.tagListData.splice(index,1)
that.delTag(id,index)
},
/**
* 表格---删除 API
*/
delTag(id) {
delTag(id,index) {
const that = this
const para = {
tagValueId: '',
tagValueId: id,
}
getRequest('/member-tag-value/delete.json',para)
......@@ -135,7 +136,8 @@
// console.log(res,res.data,res.data.errorCode)
var resData = res.data
if (resData.errorCode == 1) {
// showMsg.showmsg('保存成功','success')
that.tagListData.splice(index,1)
showMsg.showmsg('删除成功','success')
return;
}
......@@ -184,6 +186,7 @@
var resData = res.data
if (resData.errorCode == 1) {
// showMsg.showmsg('保存成功','success')
that.tagListData = resData.result
return;
}
......
src/main.js
......@@ -20,8 +20,9 @@ import vueAreaAb from '@gic-test/vue-area-ab'
import vueGicFooter from '@gic-test/vue-gic-footer'
import vueGicImgPreview from '@gic-test/vue-gic-img-preview'
import vueGicStoreNew from '@gic-test/vue-gic-store-new'
import vueGicDatepicker from '@gic-test/vue-gic-datepicker'
Vue.use(vueGicDatepicker)
Vue.use(vueGicStoreNew)
Vue.use(vueGicImgPreview)
Vue.use(vueGicFooter)
......
src/view/myTag/myTagDetail.vue
......@@ -11,7 +11,7 @@
<div class="checkboxOption-wrap__body">
<div class="checkboxOption-wrap__body__title">标签值设置</div>
<!-- 1.选项控件 -->
<template v-if="templateCode == 'tag001'">
<template v-if="">
<div class="checkboxOption-wrap__body__checkAll border-box">
<el-checkbox :indeterminate="tagData.isIndeterminate" v-model="tagData.checkAll" @change="handleCheckAllChange">全选</el-checkbox>
</div>
......@@ -23,7 +23,7 @@
</template>
<!-- 2.数字范围 -->
<template v-if="templateCode == 'tag003'">
<template v-if="">
<div class="m-b-20">
<el-input v-model="tagData.numRange[0]" class="select-wrap-input" style="width: 100px;margin-right: 0;" placeholder="请输入数字" @blur="blurFrom"></el-input><!-- @keyup.native="(value) => toInputFrom(value)" -->
<label> - </label>
......@@ -33,7 +33,7 @@
</template>
<!-- 3.时间属性-固定时段/相对时段 -->
<template v-if="templateCode == 'tag0014'">
<template v-if="">
<el-radio v-model="tagData.radio" label="1">固定时段</el-radio>
<el-radio v-model="tagData.radio" label="2">相对时段</el-radio>
<!-- 固定时段 -->
......@@ -94,21 +94,21 @@
</template>
<!-- 4.最近 天 -->
<template v-if="templateCode == 'tag005'">
<template v-if="">
<div>
<label class="inline-block middle label-unit">最近</label><el-input v-model="tagData.timeRecent" placeholder="请输入" class="w-90 m-r-20 m-l-20" @blur="(value) => toEditInput(value,'timeRecent')"></el-input><label class="inline-block middle label-unit">天</label>
</div>
</template>
<!-- 5.之后 天 -->
<template v-if="templateCode == 'tag006'">
<template v-if="">
<div>
<label class="inline-block middle label-unit">之后</label><el-input v-model="tagData.timeAfter" placeholder="请输入" class="w-90 m-r-20 m-l-20" @blur="(value) => toEditInput(value,'timeAfter')"></el-input><label class="inline-block middle label-unit">天</label>
</div>
</template>
<!-- 6.属于/不属于 -->
<template v-if="templateCode == 'tag002'">
<template v-if="">
<div>
<el-radio v-model="tagData.computeRadio" label="1">属于</el-radio>
<el-radio v-model="tagData.computeRadio" label="2">不属于</el-radio>
......@@ -116,7 +116,7 @@
</template>
<!-- 7.固定时段/最近 -->
<template v-if="templateCode == 'tag004'">
<template v-if="">
<div>
<el-radio v-model="tagData.fixedRecentRadio" label="1">固定时段</el-radio>
<el-radio v-model="tagData.fixedRecentRadio" label="2">最近时段</el-radio>
......@@ -144,7 +144,7 @@
</template>
<!-- 8.输入添加值 -->
<template v-if="templateCode == 'tag007'">
<template v-if="">
<div>
<el-input v-model="tagData.addInputValue" placeholder="请输入" class="w-184 m-t-20 m-r-20"></el-input><el-button class="m-t-20 middle" type="text" @click.stop="addInputVal">添加</el-button>
</div>
......@@ -156,7 +156,7 @@
</template>
<!-- 9.输入搜索下拉多选 添加值 -->
<template v-if="templateCode == 'tag008'">
<template v-if="">
<div class="m-t-18 add-search-select">
<el-select
size="small"
......@@ -185,7 +185,7 @@
</template>
<!-- 10.存在其一/所有,/属于不属于 -->
<template v-if="templateCode == 'tag012'">
<template v-if="">
<div>
<el-select v-model="tagData.selectOne" placeholder="请选择" class="w-98 m-l-8">
<el-option label="所有" value="1"></el-option>
......@@ -205,14 +205,14 @@
</template>
<!-- 11.门店选择器 -->
<template v-if="templateCode == 'tag011'">
<template v-if="">
<div>
<vue-gic-store-new :options="options" :uuid.sync="uuid" :isAdd="isAdd"></vue-gic-store-new>
</div>
</template>
<!-- 11.多选项( 全部选项/已选选项 ) -->
<template v-if="templateCode == 'tag009'">
<!-- 12.多选项( 全部选项/已选选项 ) -->
<template v-if="">
<div class="multiple-select-wrap">
<div class="multiple-select-wrap__search w-184">
<el-input
......@@ -245,8 +245,8 @@
</div>
</template>
<!-- 12.多选项 城市选择( 全部选项/已选选项 ) -->
<template v-if="templateCode == 'tag010'">
<!-- 13.多选项 城市选择( 全部选项/已选选项 ) -->
<template v-if="">
<div class="multiple-select-wrap city-select-wrap">
<div class="multiple-select-wrap__search w-184">
<el-input
......@@ -359,8 +359,8 @@
tagData: {
tagId: '',
tagName: '性别',
tagDescribe: '根据描述根据描述根据描述根据描述根据描述根据描述根据描述根',
tagName: '',
tagDescribe: '',
isActive: 0, // 是否实时
// 选项控件
checkeditems: [],
......@@ -501,6 +501,56 @@
*/
addTemporary() {
const that = this
let tagValue = {
"val":[{//选择的值 跟人群筛选器一样
"type": "data",//类型
"data": {
"key": "",//es字段 如果是nested 变为title.t
"compute": "",//计算属性
"value": "",//值,
"dealKey":""//属性是需要处理的类型 比如门店 下的门店类型都需要转门店id 需要后台转换
}
}],
"time":[{//时间选择 比如最近几天等
"type":"",//
"value":"" //有区间值的 逗号分隔 例如：2018-10,2019-10
}]
}
that.addTemporaryApi(tagValue,tagParams);
},
/**
* 添加到暂存架 --- api
*/
addTemporaryApi(tagValue,tagParams) {
const that = this
const para = {
tagId: that.tagId,
tagValue: tagValue,
tagParams: tagParams
}
getRequest('/member-tag-value/add.json',para)
.then((res) => {
// console.log(res,res.data,res.data.errorCode)
var resData = res.data
if (resData.errorCode == 1) {
showMsg.showmsg('添加成功','success')
return;
}
errMsg.errorMsg(resData)
})
.catch(function (error) {
console.log(error);
that.$message.error({
duration: 1000,
message: error.message
})
});
},
/**
......@@ -1048,6 +1098,8 @@
},
mounted() {
const that = this
that.tagFlag = that.$route.path.indexOf('myTag') != -1? true : false;
// 获取标签的 id 和一个判断是否添加暂存架还是添加我的标签库的标志
console.log(that.$route.query);
if (!!that.$route.query.tagId) {
......
src/view/myTag/myTagList.vue
......@@ -34,10 +34,9 @@
>
</el-table-column> -->
<el-table-column
prop="tagName"
label="标签名称"
>
<!-- <template slot-scope="scope">{{ scope.row.name }}</template> -->
<template slot-scope="scope"><span class="pointer" @click="addTemporary(scope.row.tagId)">{{ scope.row.tagName }}</span></template>
</el-table-column>
<el-table-column
prop="tagDescribe"
......@@ -91,9 +90,9 @@
</div>
<vue-gic-footer></vue-gic-footer>
<!-- 标签详情缩写版 -->
<tagShortDetail :tagShortId="tagShortDetailId" :showTagDetail="showTagDetail" @hideTag="handleHideTag"></tagShortDetail>
<tagShortDetail :tagShortId="tagShortDetailId" :showTagDetail="showTagDetail" @hideTag="handleHideTag" @updateTemp="updateTemp"></tagShortDetail>
<!-- 暂存架 -->
<tag-temporary @showShortDetail="showShortDetail"></tag-temporary>
<tag-temporary ref="tagTemp" @showShortDetail="showShortDetail"></tag-temporary>
</div>
</template>
<script>
......@@ -313,6 +312,14 @@
},
/**
* 子组件添加到暂存架-更新暂存架
*/
updateTemp(){
const that = this
that.$refs.tagTemp.getTagList();
},
/**
* 获取标签列表
*/
getmyTagList() {
......
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