Skip to content

M
memberTag-web
Commit 6b93001c by 无尘
Options

add: 增加返回后端数据判断

parent b87d7e87
Showing with 161 additions and 30 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.db517901e12ae918d1318f2fdaa1f19e.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.ffddbf3e6c8c9a4972a6.js></script><script type=text/javascript src=./static/js/vendor.b0d7f5b290518254f4f2.js></script><script type=text/javascript src=./static/js/app.f47255588964a378e1cf.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.30f6625aa1c1b752bc29eb2e724410c7.css rel=stylesheet></head><body style="background-color: #f0f2f5;min-width: 1400px;"><div id=app></div><script type=text/javascript src=./static/js/manifest.ab91d1707b0347e94796.js></script><script type=text/javascript src=./static/js/vendor.b0d7f5b290518254f4f2.js></script><script type=text/javascript src=./static/js/app.ba337f1a8f88b0fa95e1.js></script></body></html>
\ No newline at end of file
dist/static/css/app.30f6625aa1c1b752bc29eb2e724410c7.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.30f6625aa1c1b752bc29eb2e724410c7.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.db517901e12ae918d1318f2fdaa1f19e.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.db517901e12ae918d1318f2fdaa1f19e.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/js/21.cc4b11f9d593442a0878.js → dist/static/js/20.747937511d9761d173a2.js
webpackJsonp([21],{YPWR:function(t,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=o("bOdI"),i=o.n(n),a=o("5reh"),s={name:"App",data:function(){var t;return t={projectName:"member",contentHeight:"0px",collapseFlag:!1},i()(t,"collapseFlag",!1),i()(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(a.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("jw/Y")},null,null);e.default=c.exports},"jw/Y":function(t,e){}});
//# sourceMappingURL=21.cc4b11f9d593442a0878.js.map
\ No newline at end of file
webpackJsonp([20],{YPWR:function(t,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var n=o("bOdI"),i=o.n(n),a=o("5reh"),s={name:"App",data:function(){var t;return t={projectName:"member",contentHeight:"0px",collapseFlag:!1},i()(t,"collapseFlag",!1),i()(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(a.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("jw/Y")},null,null);e.default=c.exports},"jw/Y":function(t,e){}});
//# sourceMappingURL=20.747937511d9761d173a2.js.map
\ No newline at end of file
dist/static/js/20.b3cad66f7678905684ab.js deleted 100644 → 0
webpackJsonp([20],{"JfU+":function(e,t){},oVck:function(e,t,o){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var n=o("3Xzz"),a=(o("Mk6G"),o("3E4D"),o("Ch4/")),r=function(e,t){function o(e){return(e=e.toString())[1]?e:"0"+e}if(null!=e){var n=new Date(e),a=n.getFullYear(),r=n.getMonth()+1,i=n.getDate(),l=n.getHours(),s=n.getMinutes(),u=n.getSeconds();return[a,r,i].map(o).join(t||"-")+" "+[l,s,u].map(o).join(":")}return"--"},i=(o("PI0u"),o("P9l9")),l={name:"memberGroupList",data:function(){return{navpath:[{name:"首页",path:""},{name:"会员标签",path:""}],tagSearch:"",groupTableData:[{memberTagGroupId:1,describle:"标签列表数据",groupName:"123",isRealTime:1,latestUpdateTime:"2018-09-30 14:30:28",updateRate:"-",effectiveStatus:1,memberCount:"456566",createTime:"2018-09-30 14:30:28",expiredTime:"2018-09-30 14:30:28",popVisible:!1}],currentPage:1,pageSize:20,total:0}},filters:{formatTimeYMD:function(e){return console.log(e,"--"!=e?e.split(" ")[0]:"--"),"--"!=e?e.split(" ")[0]:"--"},formatTimeHMS:function(e){return"--"!=e?e.split(" ")[1]:"--"},formatNum:function(e){return(e+"").replace(/\d{1,3}(?=(\d{3})+$)/g,"$&,")}},methods:{changeRoute:function(e){this.$router.push(e)},toAddGroup:function(){this.changeRoute("/memberGroupEdit")},searchEnterFun:function(e){console.log(e)},handleSizeChange:function(e){console.log("每页 "+e+" 条")},handleCurrentChange:function(e){console.log("当前页: "+e)},toInvalid:function(e){this.$confirm("该分组失效后，不再更新数据，确认要失效吗？","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){}).catch(function(){}),this.$confirm("该分组正在被活动使用，无法删除！","提示",{confirmButtonText:"确定",type:"warning"}).then(function(){}).catch(function(){}),this.$confirm("该分组覆盖XX人，一旦删除无法恢复，确认要删除吗？","提示",{confirmButtonText:"确定",type:"warning"}).then(function(){}).catch(function(){})},cancelDelTag:function(e,t){t.popVisible=!1},toDelTag:function(e,t){var o=this;o.$confirm("此操作将永久删除该文件, 是否继续?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){o.groupTableData.splice(e,1)}).catch(function(){})},delGroup:function(e){var t=this,o={memberTagGroupId:e};Object(i.a)("/member-tag-group/delete.json",o).then(function(e){var t=e.data;1!=t.errorCode&&a.a.errorMsg(t)}).catch(function(e){console.log(e),t.$message.error({duration:1e3,message:e.message})})},getGroupList:function(){var e=this,t={groupName:e.tagSearch,pageSize:e.pageSize,pageNum:e.currentPage};Object(i.a)("/member-tag-group/findList.json",t).then(function(t){var o=t.data;if(1==o.errorCode)return e.total=o.result.totalCount,o.result.result.forEach(function(e,t){e.latestUpdateTime||(e.latestUpdateTime="- -"),e.createTime&&(e.createTime=r(e.createTime))}),void(e.groupTableData=o.result.result);a.a.errorMsg(o)}).catch(function(t){console.log(t),e.$message.error({duration:1e3,message:t.message})})}},mounted:function(){this.getGroupList()},components:{navCrumb:n.a}},s={render:function(){var e=this,t=e.$createElement,o=e._self._c||t;return o("div",{staticClass:"memberGroupList-wrap common-wrap"},[o("nav-crumb",{attrs:{navpath:e.navpath}}),e._v(" "),o("div",{staticClass:"right-content"},[o("div",{staticClass:"right-box"},[o("div",{staticClass:"common-wrap__opt"},[o("el-input",{staticClass:"w-184",attrs:{placeholder:"请输入关键字搜索人群","prefix-icon":"el-icon-search"},nativeOn:{keyup:function(t){return"button"in t||!e._k(t.keyCode,"enter",13,t.key,"Enter")?e.searchEnterFun(t):null}},model:{value:e.tagSearch,callback:function(t){e.tagSearch=t},expression:"tagSearch"}}),e._v(" "),o("el-button",{staticClass:"fr",attrs:{type:"primary"},on:{click:e.toAddGroup}},[e._v("新增分组")])],1),e._v(" "),o("div",{staticClass:"common-wrap__table m-t-20"},[o("el-table",{ref:"multipleTable",staticStyle:{width:"100%"},attrs:{data:e.groupTableData,"tooltip-effect":"dark"}},[o("el-table-column",{attrs:{label:"分组名称",width:"150px","show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(t){return[o("el-popover",{attrs:{placement:"top-start",width:"200",trigger:"hover"}},[o("span",[e._v(e._s(t.row.describle))]),e._v(" "),o("a",{staticClass:"pointer",attrs:{slot:"reference",href:"/memberGroupDetail?memberTagGroupId="+t.row.memberTagGroupId},slot:"reference"},[e._v(e._s(t.row.groupName))])])]}}])}),e._v(" "),o("el-table-column",{attrs:{label:"是否实时",width:"100px"},scopedSlots:e._u([{key:"default",fn:function(t){return[e._v("\n "+e._s(1==t.row.isRealTime?"实时":"非实时")+"\n ")]}}])}),e._v(" "),o("el-table-column",{attrs:{label:"最近更新时间",width:"150px","show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(t){return[e._v("\n "+e._s(e._f("formatTimeYMD")(t.row.latestUpdateTime))+"\n "),o("p",[e._v(e._s(e._f("formatTimeHMS")(t.row.latestUpdateTime)))])]}}])}),e._v(" "),o("el-table-column",{attrs:{label:"更新频率",width:"150px","show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(t){return[e._v("\n "+e._s(t.row.updateRate)+"\n ")]}}])}),e._v(" "),o("el-table-column",{attrs:{prop:"state",label:"状态",width:"50px"},scopedSlots:e._u([{key:"default",fn:function(t){return[e._v("\n "+e._s(1==t.row.effectiveStatus?"有效":"失效")+"\n ")]}}])}),e._v(" "),o("el-table-column",{attrs:{prop:"peopleCover",label:"覆盖人数",width:"150px","show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(t){return[e._v("\n "+e._s(e._f("formatNum")(t.row.memberCount))+" 人\n ")]}}])}),e._v(" "),o("el-table-column",{attrs:{prop:"createTime",label:"创建时间",width:"150px","show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(t){return[e._v("\n "+e._s(e._f("formatTimeYMD")(t.row.createTime))+"\n "),o("p",[e._v(e._s(e._f("formatTimeHMS")(t.row.createTime)))])]}}])}),e._v(" "),o("el-table-column",{attrs:{prop:"recentUpdateDate",label:"到期时间",width:"150px","show-overflow-tooltip":""},scopedSlots:e._u([{key:"default",fn:function(t){return[e._v("\n "+e._s(e._f("formatTimeYMD")(t.row.effectiveDate))+"\n "),o("p",[e._v(e._s(e._f("formatTimeHMS")(t.row.effectiveDate)))])]}}])}),e._v(" "),o("el-table-column",{attrs:{label:"操作"},scopedSlots:e._u([{key:"default",fn:function(t){return[o("el-button",{attrs:{type:"text",size:"small"},on:{click:function(o){e.toInvalid(t.row.memberTagGroupId,t.row)}}},[e._v("失效")]),e._v(" "),o("router-link",{staticClass:"edit-btn el-button--text p-l-20",attrs:{to:{path:"/memberGroupDetail",query:{memberTagGroupId:t.row.memberTagGroupId}}}},[e._v("详情")]),e._v(" "),o("router-link",{staticClass:"edit-btn el-button--text p-l-20",attrs:{to:{path:"/memberGroupEdit",query:{memberTagGroupId:t.row.memberTagGroupId}}}},[e._v("编辑")]),e._v(" "),o("el-popover",{attrs:{placement:"top",width:"160"},model:{value:t.row.popVisible,callback:function(o){e.$set(t.row,"popVisible",o)},expression:"scope.row.popVisible"}},[o("p",{staticStyle:{"line-height":"1.5",padding:"10px 10px 20px"}},[e._v("确认删除吗？")]),e._v(" "),o("div",{staticStyle:{"text-align":"right",margin:"0"}},[o("el-button",{attrs:{size:"mini",type:"text"},on:{click:function(o){e.cancelDelTag(t.$index,t.row)}}},[e._v("取消")]),e._v(" "),o("el-button",{attrs:{type:"primary",size:"mini"},on:{click:function(o){e.toDelTag(t.$index,t.row)}}},[e._v("确定")])],1),e._v(" "),o("el-button",{staticClass:"p-l-20",attrs:{slot:"reference",type:"text"},slot:"reference"},[e._v("\n 删除\n ")])],1)]}}])})],1)],1),e._v(" "),0!=e.groupTableData.length?o("div",{staticClass:"block common-wrap__page text-right"},[o("el-pagination",{attrs:{background:"","current-page":e.currentPage,"page-sizes":[10,20,30,40],"page-size":e.pageSize,layout:"total, sizes, prev, pager, next, jumper",total:e.total},on:{"size-change":e.handleSizeChange,"current-change":e.handleCurrentChange}})],1):e._e()])]),e._v(" "),o("vue-gic-footer")],1)},staticRenderFns:[]};var u=o("VU/8")(l,s,!1,function(e){o("JfU+")},"data-v-50cbef74",null);t.default=u.exports}});
//# sourceMappingURL=20.b3cad66f7678905684ab.js.map
\ No newline at end of file
dist/static/js/21.3dba0a38816e1f1717fb.js 0 → 100644
webpackJsonp([21],{"cV+l":function(t,e){},oVck:function(t,e,o){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var r=o("3Xzz"),a=(o("Mk6G"),o("3E4D"),o("Ch4/")),n=function(t,e){function o(t){return(t=t.toString())[1]?t:"0"+t}if(null!=t){var r=new Date(t),a=r.getFullYear(),n=r.getMonth()+1,i=r.getDate(),l=r.getHours(),s=r.getMinutes(),c=r.getSeconds();return[a,n,i].map(o).join(e||"-")+" "+[l,s,c].map(o).join(":")}return"--"},i=(o("PI0u"),o("P9l9")),l={name:"memberGroupList",data:function(){return{navpath:[{name:"首页",path:""},{name:"会员标签",path:""}],tagSearch:"",groupTableData:[{memberTagGroupId:1,describle:"标签列表数据",groupName:"123",isRealTime:1,latestUpdateTime:"2018-09-30 14:30:28",updateRate:"-",effectiveStatus:1,memberCount:"456566",createTime:"2018-09-30 14:30:28",expiredTime:"2018-09-30 14:30:28",popVisible:!1}],currentPage:1,pageSize:20,total:0}},filters:{formatTimeYMD:function(t){return console.log(t,"--"!=t?t.split(" ")[0]:"--"),"--"!=t?t.split(" ")[0]:"--"},formatTimeHMS:function(t){return"--"!=t?t.split(" ")[1]:"--"},formatNum:function(t){return(t+"").replace(/\d{1,3}(?=(\d{3})+$)/g,"$&,")}},methods:{changeRoute:function(t){this.$router.push(t)},toAddGroup:function(){this.changeRoute("/memberGroupEdit")},clearSearch:function(){this.currentPage=1,this.getGroupList()},searchEnterFun:function(t){console.log(t),this.currentPage=1,this.getGroupList()},handleSizeChange:function(t){console.log("每页 "+t+" 条"),this.getGroupList()},handleCurrentChange:function(t){console.log("当前页: "+t),this.getGroupList()},toInvalid:function(t){this.$confirm("该分组失效后，不再更新数据，确认要失效吗？","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){}).catch(function(){}),this.$confirm("该分组正在被活动使用，无法删除！","提示",{confirmButtonText:"确定",type:"warning"}).then(function(){}).catch(function(){}),this.$confirm("该分组覆盖XX人，一旦删除无法恢复，确认要删除吗？","提示",{confirmButtonText:"确定",type:"warning"}).then(function(){}).catch(function(){})},cancelDelTag:function(t,e){e.popVisible=!1},toDelTag:function(t,e){var o=this;o.$confirm("此操作将永久删除该文件, 是否继续?","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){o.groupTableData.splice(t,1)}).catch(function(){})},delGroup:function(t){var e=this,o={memberTagGroupId:t};Object(i.a)("/member-tag-group/delete.json",o).then(function(t){var e=t.data;1!=e.errorCode&&a.a.errorMsg(e)}).catch(function(t){console.log(t),e.$message.error({duration:1e3,message:t.message})})},getGroupList:function(){var t=this,e={groupName:t.tagSearch,pageSize:t.pageSize,pageNum:t.currentPage};Object(i.a)("/member-tag-group/findList.json",e).then(function(e){var o=e.data;if(1==o.errorCode)return t.total=o.result.totalCount,o.result.result.forEach(function(t,e){t.latestUpdateTime||(t.latestUpdateTime="- -"),t.createTime&&(t.createTime=n(t.createTime))}),void(t.groupTableData=o.result.result);a.a.errorMsg(o)}).catch(function(e){console.log(e),t.$message.error({duration:1e3,message:e.message})})}},mounted:function(){this.getGroupList()},components:{navCrumb:r.a}},s={render:function(){var t=this,e=t.$createElement,o=t._self._c||e;return o("div",{staticClass:"memberGroupList-wrap common-wrap"},[o("nav-crumb",{attrs:{navpath:t.navpath}}),t._v(" "),o("div",{staticClass:"right-content"},[o("div",{staticClass:"right-box"},[o("div",{staticClass:"common-wrap__opt"},[o("el-input",{staticClass:"w-184",attrs:{placeholder:"请输入关键字搜索人群","prefix-icon":"el-icon-search",clearable:""},on:{clear:t.clearSearch},nativeOn:{keyup:function(e){return"button"in e||!t._k(e.keyCode,"enter",13,e.key,"Enter")?t.searchEnterFun(e):null}},model:{value:t.tagSearch,callback:function(e){t.tagSearch=e},expression:"tagSearch"}}),t._v(" "),o("el-button",{staticClass:"fr",attrs:{type:"primary"},on:{click:t.toAddGroup}},[t._v("新增分组")])],1),t._v(" "),o("div",{staticClass:"common-wrap__table m-t-20"},[o("el-table",{ref:"multipleTable",staticStyle:{width:"100%"},attrs:{data:t.groupTableData,"tooltip-effect":"dark"}},[o("el-table-column",{attrs:{label:"分组名称",width:"150px","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[o("el-popover",{attrs:{placement:"top-start",width:"200",trigger:"hover"}},[o("span",[t._v(t._s(e.row.describle))]),t._v(" "),o("a",{staticClass:"pointer",attrs:{slot:"reference",href:"/memberGroupDetail?memberTagGroupId="+e.row.memberTagGroupId},slot:"reference"},[t._v(t._s(e.row.groupName))])])]}}])}),t._v(" "),o("el-table-column",{attrs:{label:"是否实时",width:"100px"},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(1==e.row.isRealTime?"实时":"非实时")+"\n ")]}}])}),t._v(" "),o("el-table-column",{attrs:{label:"最近更新时间",width:"150px","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(t._f("formatTimeYMD")(e.row.latestUpdateTime))+"\n "),o("p",[t._v(t._s(t._f("formatTimeHMS")(e.row.latestUpdateTime)))])]}}])}),t._v(" "),o("el-table-column",{attrs:{label:"更新频率",width:"150px","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(e.row.updateRate)+"\n ")]}}])}),t._v(" "),o("el-table-column",{attrs:{prop:"state",label:"状态",width:"50px"},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(1==e.row.effectiveStatus?"有效":"失效")+"\n ")]}}])}),t._v(" "),o("el-table-column",{attrs:{prop:"peopleCover",label:"覆盖人数",width:"150px","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(t._f("formatNum")(e.row.memberCount))+" 人\n ")]}}])}),t._v(" "),o("el-table-column",{attrs:{prop:"createTime",label:"创建时间",width:"150px","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(t._f("formatTimeYMD")(e.row.createTime))+"\n "),o("p",[t._v(t._s(t._f("formatTimeHMS")(e.row.createTime)))])]}}])}),t._v(" "),o("el-table-column",{attrs:{prop:"recentUpdateDate",label:"到期时间",width:"150px","show-overflow-tooltip":""},scopedSlots:t._u([{key:"default",fn:function(e){return[t._v("\n "+t._s(t._f("formatTimeYMD")(e.row.effectiveDate))+"\n "),o("p",[t._v(t._s(t._f("formatTimeHMS")(e.row.effectiveDate)))])]}}])}),t._v(" "),o("el-table-column",{attrs:{label:"操作"},scopedSlots:t._u([{key:"default",fn:function(e){return[o("el-button",{attrs:{type:"text",size:"small"},on:{click:function(o){t.toInvalid(e.row.memberTagGroupId,e.row)}}},[t._v("失效")]),t._v(" "),o("router-link",{staticClass:"edit-btn el-button--text p-l-20",attrs:{to:{path:"/memberGroupDetail",query:{memberTagGroupId:e.row.memberTagGroupId}}}},[t._v("详情")]),t._v(" "),o("router-link",{staticClass:"edit-btn el-button--text p-l-20",attrs:{to:{path:"/memberGroupEdit",query:{memberTagGroupId:e.row.memberTagGroupId}}}},[t._v("编辑")]),t._v(" "),o("el-popover",{attrs:{placement:"top",width:"160"},model:{value:e.row.popVisible,callback:function(o){t.$set(e.row,"popVisible",o)},expression:"scope.row.popVisible"}},[o("p",{staticStyle:{"line-height":"1.5",padding:"10px 10px 20px"}},[t._v("确认删除吗？")]),t._v(" "),o("div",{staticStyle:{"text-align":"right",margin:"0"}},[o("el-button",{attrs:{size:"mini",type:"text"},on:{click:function(o){t.cancelDelTag(e.$index,e.row)}}},[t._v("取消")]),t._v(" "),o("el-button",{attrs:{type:"primary",size:"mini"},on:{click:function(o){t.toDelTag(e.$index,e.row)}}},[t._v("确定")])],1),t._v(" "),o("el-button",{staticClass:"p-l-20",attrs:{slot:"reference",type:"text"},slot:"reference"},[t._v("\n 删除\n ")])],1)]}}])})],1)],1),t._v(" "),0!=t.groupTableData.length?o("div",{staticClass:"block common-wrap__page text-right"},[o("el-pagination",{attrs:{background:"","current-page":t.currentPage,"page-sizes":[10,20,30,40],"page-size":t.pageSize,layout:"total, sizes, prev, pager, next, jumper",total:t.total},on:{"size-change":t.handleSizeChange,"current-change":t.handleCurrentChange}})],1):t._e()])]),t._v(" "),o("vue-gic-footer")],1)},staticRenderFns:[]};var c=o("VU/8")(l,s,!1,function(t){o("cV+l")},"data-v-21c10097",null);e.default=c.exports}});
//# sourceMappingURL=21.3dba0a38816e1f1717fb.js.map
\ No newline at end of file
dist/static/js/6.0b21defc52529ba29c17.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.6e20df2de316cd07487c.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.14975418fdb9ed654597.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.8503c3ebe9ccda503e48.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.ffddbf3e6c8c9a4972a6.js → dist/static/js/manifest.ab91d1707b0347e94796.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:"603e24b6249496bff8d6",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"0106258f51de87a40b57",6:"0b21defc52529ba29c17",7:"14975418fdb9ed654597",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=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.ffddbf3e6c8c9a4972a6.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,s=[];u<r.length;u++)d=r[u],t[d]&&s.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);s.length;)s.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:"603e24b6249496bff8d6",1:"d1b66d4bf3d45b2621dd",2:"344d5c61c44868322e7e",3:"88a303fc10feb8b51091",4:"f6a8f25f4e8cc458879d",5:"0106258f51de87a40b57",6:"6e20df2de316cd07487c",7:"8503c3ebe9ccda503e48",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:"747937511d9761d173a2",21:"3dba0a38816e1f1717fb",22:"22f63d81db79c0c78098",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.ab91d1707b0347e94796.js.map
\ No newline at end of file
src/components/tagShortDetail.vue
......@@ -86,7 +86,7 @@
<!-- 2.数字范围 -->
<template v-if="parent.templateCode == 'tag003'">
<div class="m-b-20">
<div class="m-t-18 m-b-20">
<el-input v-model="parent.numRange[0]" class="select-wrap-input" style="width: 100px;margin-right: 0;" placeholder="请输入数字" @blur="blurFrom($event,parent)"></el-input><!-- @keyup.native="(value) => toInputFrom(value)" -->
<label> - </label>
<el-input v-model="parent.numRange[1]" class="select-wrap-input" style="width: 100px;margin-right: 0;" placeholder="请输入数字" @blur="blurTo($event,parent)"></el-input>
......@@ -755,7 +755,8 @@
*/
confirmDialog(){
const that = this
that.tagShortVisible = false;
console.log(that.templateData)
let tagParams = [];
let tagValue = {
......@@ -774,6 +775,59 @@
}]
}
let code = that.templateData[0].templateCode
/* 多选 */
if (code === 'tag001' && !that.templateData[0].checkeditems.length) {
that.$message.error({ message: '请选择值'})
return false;
}
if (code === 'tag001' && that.templateData.length ===1) {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
tagValue.val[0].data.value = that.templateData[0].checkeditems.join(',')
tagParams = that.templateData;
}
/* 数字区间 */
if (code === 'tag003' && that.templateData[0].numRange[0] === '') {
that.$message.error({ message: '请填写值'})
return false;
}
if (code === 'tag003' && that.templateData.length ===1) {
tagValue.val[0].data.compute = that.templateData[0].postCompute;
tagValue.val[0].data.value = that.templateData[0].numRange.join(',')
tagParams = that.templateData;
}
/* 固定/相对 */
if (code === 'tag014' && that.templateData[0].radio == 1 && !that.templateData[0].daterangeValue.length) {
that.$message.error({ message: '请选择值'})
return false;
}
if (code === 'tag014' && that.templateData[0].radio == 2 && that.templateData[0].timeCheckedTwo && !timeInput) {
that.$message.error({ message: '请填写值'})
return false;
}
if (code === 'tag014' && that.templateData.length ===1 && that.templateData[0].radio == 1){
tagValue.val[0].data.compute = 'range';
tagValue.val[0].data.value = that.templateData[0].daterangeValue.join(',')
tagParams = that.templateData;
}
if (code === 'tag014' && that.templateData.length ===1 && that.templateData[0].radio == 2){
tagValue.val[0].data.compute = 'range';
tagValue.val[0].data.value = that.templateData[0];
tagParams = that.templateData;
}
/* 时间属性- 月日-月日 */
if (code === 'tag015' && !that.templateData[0].monthDayRange.length) {
that.$message.error({ message: '请选择值'})
return false;
}
if (code === 'tag015' && that.templateData.length ===1){
tagValue.val[0].data.compute = that.templateData[0].postCompute;
tagValue.val[0].data.value = that.templateData[0].monthDayRange.join(',')
tagParams = that.templateData;
}
that.addToTemp(tagValue,tagParams);
that.closeTagShortDialog()
......@@ -1442,7 +1496,7 @@
if (!!that.postCompute) {
that[resData.result.templateCode].postCompute = that.postCompute;
}
// console.log(resData.result.sourceFlag)
// 如果直接给需要字段
if (parseInt(resData.result.sourceFlag) === 0) {
resData.result.widgetValues = JSON.parse(resData.result.widgetValues)
......@@ -1458,10 +1512,13 @@
}
return false;
}
// console.log(that[resData.result.templateCode])
that.templateData.push(that[resData.result.templateCode])
// 获取已存数据
that.getExistData(that.tagData.tagId);
if (resData.result.templateCode === 'tag009' || resData.result.templateCode === 'tag010') {
that.searchFlag = true;
}
......@@ -1494,8 +1551,9 @@
that.axios.post(that.baseUrl + url, qs.stringify(para)).then(res => {
let resData = res.data;
if (resData.errorCode == 0) {
// data.options =
data.options = resData.result;
that.templateData.push(data)
that.getExistData(that.tagData.tagId)
return;
}
......@@ -1515,6 +1573,40 @@
},
/**
* 获取当前标签已存数据 --- api
*/
getExistData(tagId) {
const that = this
const para = {
tagId: tagId
}
getRequest('/member-tag-value/findOne.json',para)
.then((res) => {
// console.log(res,res.data,res.data.errorCode)
const resData = res.data
if (resData.errorCode == 1) {
if (!resData.result || resData.result.tagParams == '[]') {
return false;
}
that.templateData = JSON.parse(resData.result.tagParams)
return;
}
errMsg.errorMsg(resData)
})
.catch(function (error) {
console.log(error);
that.$message.error({
duration: 1000,
message: error.message
})
});
},
/**
* 获取当前标签数据 --- api
*/
getTagData(tagId) {
......@@ -1685,6 +1777,14 @@
}
}
.el-checkbox-group .el-checkbox {
margin-right: 16px;
}
.el-checkbox + .el-checkbox {
margin-left: 0;
}
.add-search-select {
.el-select {
line-height: 32px;
......
src/components/tagTemporary.vue
......@@ -34,7 +34,7 @@
<el-table-column
label="已选标签值"
show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.tagParams }}</template>
<template slot-scope="scope">{{ scope.row.newTagVal }}</template>
</el-table-column>
<el-table-column
label="是否实时"
......@@ -157,10 +157,10 @@
/**
* 点击标签名,收起暂存架,显示标签详情缩略版
*/
showTagShort() {
showTagShort(row) {
const that = this
that.toggleTagListFlag = false;
that.$emit('showShortDetail')
that.$emit('showShortDetail',row.tagId)
},
/**
......@@ -183,10 +183,21 @@
getRequest('/member-tag-value/findList.json',para)
.then((res) => {
// console.log(res,res.data,res.data.errorCode)
var resData = res.data
let resData = res.data
if (resData.errorCode == 1) {
// showMsg.showmsg('保存成功','success')
that.tagListData = resData.result
let dataVal = JSON.parse(JSON.stringify(resData.result))
dataVal.forEach(function(ele,index){
let newTagVal = JSON.parse(ele.tagValue)
if (newTagVal.val[0].data.value != '') {
ele.newTagVal = newTagVal.val[0].data.value
}else{
ele.newTagVal = ''
}
})
console.log(dataVal)
that.tagListData = dataVal
return;
}
......
src/view/memberGroup/memberGroupList.vue
......@@ -9,6 +9,8 @@
placeholder="请输入关键字搜索人群"
prefix-icon="el-icon-search"
v-model="tagSearch"
clearable
@clear="clearSearch"
@keyup.enter.native="searchEnterFun">
</el-input>
<el-button type="primary" @click="toAddGroup" class="fr">新增分组</el-button>
......@@ -216,24 +218,39 @@
},
/**
* 搜索标签
* 搜索分组清空
*/
clearSearch() {
const that = this
that.currentPage = 1;
that.getGroupList()
},
/**
* 搜索分组
*/
searchEnterFun(e) {
const that = this
console.log(e)
that.currentPage = 1;
that.getGroupList()
},
/**
* 分页---页码变化
*/
handleSizeChange(val) {
const that = this
console.log(`每页 ${val} 条`);
that.getGroupList()
},
/**
* 分页---当前页变化
*/
handleCurrentChange(val) {
const that = this
console.log(`当前页: ${val}`);
that.getGroupList()
},
/**
......
src/view/myTag/myTagList.vue
......@@ -160,7 +160,7 @@
* 显示标签详情缩小版
*/
handleShowTag() {
var that = this
const that = this
that.showTagDetail = true
},
......@@ -168,7 +168,7 @@
* 隐藏标签详情缩小版
*/
handleHideTag(val){
var that = this
const that = this
that.showTagDetail = false
},
......@@ -176,7 +176,7 @@
* 到手工标签库
*/
toManualTagLib() {
var that = this
const that = this
that.changeRoute('/manualTagList')
},
......@@ -184,7 +184,7 @@
* 到平台标签库
*/
toPlatformTagLib() {
var that = this
const that = this
that.changeRoute('/platformTagList')
},
......@@ -192,7 +192,7 @@
* 搜索标签
*/
searchEnterFun: _debounce(function(e) {
var that = this
const that = this
console.log(e)
that.currentPage = 1;
that.getTagList()
......@@ -219,6 +219,7 @@
* 分页---页码变化
*/
handleSizeChange(val) {
const that = this
console.log(`每页 ${val} 条`);
that.pageSize = val;
that.getTagList()
......@@ -227,6 +228,7 @@
* 分页---当前页变化
*/
handleCurrentChange(val) {
const that = this
console.log(`当前页: ${val}`);
that.currentPage = val;
that.getTagList()
......@@ -247,7 +249,7 @@
getRequest('/enterpriseMemberTag/pageList',para)
.then((res) => {
// console.log(res,res.data,res.data.errorCode)
var resData = res.data
let resData = res.data
if (resData.errorCode == 1) {
that.tagTableData = resData.result.result;
that.total = resData.result.totalCount;
......@@ -306,9 +308,10 @@
/**
* 子组件暂存架-点击名字显示标签详情缩略版
*/
showShortDetail() {
showShortDetail(val) {
const that = this
that.showTagDetail = true
that.showTagDetail = true;
that.tagShortDetailId = val
},
/**
......
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