Skip to content

M
memberTag-web
Commit c0c972e5 by 黑潮
Options

Merge branch 'feature/会员分组变更日志' into dev 

# Conflicts:
#	dist/index.html
#	dist/static/js/6.c0082e0760646e1b398f.js
#	dist/static/js/7.3942f2ed9fd061ac7b65.js
#	dist/static/js/7.5c03be74455e6564e4bb.js
parents 7557355b 6c9d24c2
Showing with 12 additions and 13 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.c3a36c78f9b6b2f7936170eebb4a1693.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/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.40.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.55.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.601cd011f8cc401582cd.js></script><script type=text/javascript src=./static/js/vendor.b1f9d02124849a461e52.js></script><script type=text/javascript src=./static/js/app.023836e6aca64823b641.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.bc5afb2932ed9b809537d4ba27ec4ce4.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/track.1.0.4.js></script><script src=//web-1251519181.file.myqcloud.com/components/header.2.0.40.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.55.js></script><script src=//web-1251519181.file.myqcloud.com/components/aside-menu.2.0.15.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.11.js></script><script src=//web-1251519181.file.myqcloud.com/components/selector.1.2.20.js></script><script src=//web-1251519181.file.myqcloud.com/components/export-excel.2.0.13.js></script><script src=//web-1251519181.file.myqcloud.com/components/pagination.1.0.8.js></script><script type=text/javascript src=./static/js/manifest.1d1323770ba400287067.js></script><script type=text/javascript src=./static/js/vendor.b1f9d02124849a461e52.js></script><script type=text/javascript src=./static/js/app.023836e6aca64823b641.js></script></body></html>
\ No newline at end of file
dist/static/js/5.e1c4d2689b37ec1c90e8.js deleted 100644 → 0
webpackJsonp([5],{"5PlU":function(e,t,a){var r=a("RY/4"),n=a("dSzd")("iterator"),o=a("/bQp");e.exports=a("FeBl").isIterable=function(e){var t=Object(e);return void 0!==t[n]||"@@iterator"in t||o.hasOwnProperty(r(t))}},"8jHj":function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=a("d7EF"),n=a.n(r);function o(e,t){var a={"M+":e.getMonth()+1,"d+":e.getDate(),"h+":e.getHours(),"m+":e.getMinutes(),"s+":e.getSeconds(),"q+":Math.floor((e.getMonth()+3)/3),S:e.getMilliseconds()};for(var r in/(y+)/.test(t)&&(t=t.replace(RegExp.$1,(e.getFullYear()+"").substr(4-RegExp.$1.length))),a)new RegExp("("+r+")").test(t)&&(t=t.replace(RegExp.$1,1==RegExp.$1.length?a[r]:("00"+a[r]).substr((""+a[r]).length)));return t}var i={name:"member-group-log",components:{navCrumb:a("3Xzz").a},data:function(){return{searchKey:"",dateValue:[],tableData:[],total:0,pageSize:20,currentPage:1,loading:!1,navpath:[{name:"首页",path:window.location.origin+"/report/#/memberSummary",relocation:!0},{name:"会员管理",path:""},{name:"会员分组",path:"/memberGroupList"},{name:"分组操作日志",path:""}]}},filters:{formatTimeYMD:function(e){return e?o(new Date(e),"yyyy-MM-dd"):"--"},formatTimeHMS:function(e){return e?o(new Date(e),"hh:mm:ss"):"--"}},methods:{selectDate:function(e){this.currentPage=1,this.getList()},clearSearch:function(){this.currentPage=1,this.getList()},getList:function(){var e=this;this.loading=!0;var t=this.dateValue||[],a=n()(t,2),r=a[0],o=void 0===r?"":r,i=a[1],s=void 0===i?"":i;return this.axios.get("http://gicdev.demogic.com/gic-member-tag-web/member-tag-group/groupLog",{params:{pageSize:this.pageSize,pageNum:this.currentPage,requestProject:"gic-member-tag-web",search:this.searchKey,startDate:o,endDate:s}}).then(function(t){var a=t.data,r=t.data.result;console.log(a),1===a.errorCode&&(e.total=r.totalCount,e.tableData=r.result||[]),e.loading=!1})},handleCurrentChange:function(e){this.currentPage=e,this.getList()},handleSizeChange:function(e){this.currentPage=1,this.pageSize=e,this.getList()},onSearch:function(){this.currentPage=1,this.getList()},getName:function(e){return e&&e.split("-")[0]||"--"},getPhone:function(e){return e&&e.split("-")[1]||"--"},formatter:function(e,t,a){return a||"--"}},mounted:function(){this.searchKey=this.$route.query.groupName||"",this.getList()}},s={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"member-group-log"},[a("nav-crumb",{attrs:{navpath:e.navpath}}),e._v(" "),a("div",{staticClass:"member-group-log__content"},[a("div",{staticClass:"font-0"},[a("el-input",{staticClass:"w-220 m-r-8",attrs:{placeholder:"请输入内容","prefix-icon":"el-icon-search",clearable:""},on:{clear:e.clearSearch},nativeOn:{keyup:function(t){if(!("button"in t)&&e._k(t.keyCode,"enter",13,t.key))return null;e.onSearch(t)}},model:{value:e.searchKey,callback:function(t){e.searchKey=t},expression:"searchKey"}}),e._v(" "),a("el-date-picker",{staticClass:"date-picker",attrs:{"value-format":"yyyy-MM-dd HH:mm:ss",type:"datetimerange","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期","default-time":["00:00:00","23:59:59"]},on:{change:e.selectDate},model:{value:e.dateValue,callback:function(t){e.dateValue=t},expression:"dateValue"}})],1),e._v(" "),a("div",{staticClass:"common-wrap__table m-t-20"},[a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],attrs:{data:e.tableData}},[a("el-table-column",{attrs:{label:"日志ID",formatter:e.formatter,prop:"logId"}}),e._v(" "),a("el-table-column",{attrs:{label:"分组名称",prop:"operateObject",formatter:e.formatter,"show-overflow-tooltip":""}}),e._v(" "),a("el-table-column",{attrs:{label:"操作内容",prop:"content",formatter:e.formatter,"show-overflow-tooltip":""}}),e._v(" "),a("el-table-column",{attrs:{width:200,label:"操作时间"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("p",{staticClass:"h-18"},[e._v(e._s(e._f("formatTimeYMD")(t.row.createTime)))]),e._v(" "),a("p",{staticClass:"h-18"},[e._v(e._s(e._f("formatTimeHMS")(t.row.createTime)))])]}}])}),e._v(" "),a("el-table-column",{attrs:{width:200,label:"操作人"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("p",{staticClass:"h-18"},[e._v(e._s(e.getName(t.row.userName)))]),e._v(" "),a("p",{staticClass:"h-18"},[e._v(e._s(e.getPhone(t.row.userName)))])]}}])})],1)],1),e._v(" "),0!==e.tableData.length?a("div",{staticClass:"block common-wrap__page text-right"},[a("dm-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(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var l=a("VU/8")(i,s,!1,function(e){a("Y6hI"),a("bUz0")},"data-v-2e5cfc98",null);t.default=l.exports},Xd32:function(e,t,a){a("+tPU"),a("zQR9"),e.exports=a("5PlU")},Y6hI:function(e,t){},bUz0:function(e,t){},d7EF:function(e,t,a){"use strict";t.__esModule=!0;var r=o(a("us/S")),n=o(a("BO1k"));function o(e){return e&&e.__esModule?e:{default:e}}t.default=function(){return function(e,t){if(Array.isArray(e))return e;if((0,r.default)(Object(e)))return function(e,t){var a=[],r=!0,o=!1,i=void 0;try{for(var s,l=(0,n.default)(e);!(r=(s=l.next()).done)&&(a.push(s.value),!t||a.length!==t);r=!0);}catch(e){o=!0,i=e}finally{try{!r&&l.return&&l.return()}finally{if(o)throw i}}return a}(e,t);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}()},"us/S":function(e,t,a){e.exports={default:a("Xd32"),__esModule:!0}}});
\ No newline at end of file
dist/static/js/5.ef821d6cc1ab11f3a775.js 0 → 100644
webpackJsonp([5],{"+nug":function(e,t){},"5PlU":function(e,t,a){var r=a("RY/4"),n=a("dSzd")("iterator"),o=a("/bQp");e.exports=a("FeBl").isIterable=function(e){var t=Object(e);return void 0!==t[n]||"@@iterator"in t||o.hasOwnProperty(r(t))}},"8jHj":function(e,t,a){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=a("d7EF"),n=a.n(r);function o(e,t){var a={"M+":e.getMonth()+1,"d+":e.getDate(),"h+":e.getHours(),"m+":e.getMinutes(),"s+":e.getSeconds(),"q+":Math.floor((e.getMonth()+3)/3),S:e.getMilliseconds()};for(var r in/(y+)/.test(t)&&(t=t.replace(RegExp.$1,(e.getFullYear()+"").substr(4-RegExp.$1.length))),a)new RegExp("("+r+")").test(t)&&(t=t.replace(RegExp.$1,1==RegExp.$1.length?a[r]:("00"+a[r]).substr((""+a[r]).length)));return t}var i={name:"member-group-log",components:{navCrumb:a("3Xzz").a},data:function(){return{searchKey:"",dateValue:[],tableData:[],total:0,pageSize:20,currentPage:1,loading:!1,navpath:[{name:"首页",path:window.location.origin+"/report/#/memberSummary",relocation:!0},{name:"会员管理",path:""},{name:"会员分组",path:"/memberGroupList"},{name:"分组操作日志",path:""}]}},filters:{formatTimeYMD:function(e){return e?o(new Date(e),"yyyy-MM-dd"):"--"},formatTimeHMS:function(e){return e?o(new Date(e),"hh:mm:ss"):"--"}},methods:{selectDate:function(e){this.currentPage=1,this.getList()},clearSearch:function(){this.currentPage=1,this.getList()},getList:function(){var e=this;this.loading=!0;var t=this.dateValue||[],a=n()(t,2),r=a[0],o=void 0===r?"":r,i=a[1],s=void 0===i?"":i;return this.axios.get("http://gicdev.demogic.com/gic-member-tag-web/member-tag-group/groupLog",{params:{pageSize:this.pageSize,pageNum:this.currentPage,requestProject:"gic-member-tag-web",search:this.searchKey,startDate:o,endDate:s}}).then(function(t){var a=t.data,r=t.data.result;console.log(a),1===a.errorCode&&(e.total=r.totalCount,e.tableData=r.result||[]),e.loading=!1})},handleCurrentChange:function(e){this.currentPage=e,this.getList()},handleSizeChange:function(e){this.currentPage=1,this.pageSize=e,this.getList()},onSearch:function(){this.currentPage=1,this.getList()},getName:function(e){return e&&e.split("-")[0]||"--"},getPhone:function(e){return e&&e.split("-")[1]||"--"},formatter:function(e,t,a){return a||"--"}},mounted:function(){this.searchKey=this.$route.query.groupName||"",this.getList()}},s={render:function(){var e=this,t=e.$createElement,a=e._self._c||t;return a("div",{staticClass:"member-group-log"},[a("nav-crumb",{attrs:{navpath:e.navpath}}),e._v(" "),a("div",{staticClass:"member-group-log__content"},[a("div",{staticClass:"font-0"},[a("el-input",{staticClass:"w-220 m-r-8",attrs:{placeholder:"请输入内容","prefix-icon":"el-icon-search",clearable:""},on:{clear:e.clearSearch},nativeOn:{keyup:function(t){if(!("button"in t)&&e._k(t.keyCode,"enter",13,t.key))return null;e.onSearch(t)}},model:{value:e.searchKey,callback:function(t){e.searchKey=t},expression:"searchKey"}}),e._v(" "),a("el-date-picker",{staticClass:"date-picker",attrs:{"value-format":"yyyy-MM-dd HH:mm:ss",type:"datetimerange","range-separator":"至","start-placeholder":"开始日期","end-placeholder":"结束日期","default-time":["00:00:00","23:59:59"]},on:{change:e.selectDate},model:{value:e.dateValue,callback:function(t){e.dateValue=t},expression:"dateValue"}})],1),e._v(" "),a("div",{staticClass:"common-wrap__table m-t-20"},[a("el-table",{directives:[{name:"loading",rawName:"v-loading",value:e.loading,expression:"loading"}],attrs:{data:e.tableData}},[a("el-table-column",{attrs:{label:"日志ID",width:350,formatter:e.formatter,prop:"logId"}}),e._v(" "),a("el-table-column",{attrs:{width:180,label:"分组名称",prop:"operateObject",formatter:e.formatter,"show-overflow-tooltip":""}}),e._v(" "),a("el-table-column",{attrs:{label:"操作内容",prop:"content",formatter:e.formatter,"show-overflow-tooltip":""}}),e._v(" "),a("el-table-column",{attrs:{width:180,label:"操作时间"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("p",{staticClass:"h-18"},[e._v(e._s(e._f("formatTimeYMD")(t.row.createTime)))]),e._v(" "),a("p",{staticClass:"h-18"},[e._v(e._s(e._f("formatTimeHMS")(t.row.createTime)))])]}}])}),e._v(" "),a("el-table-column",{attrs:{width:180,label:"操作人"},scopedSlots:e._u([{key:"default",fn:function(t){return[a("p",{staticClass:"h-18"},[e._v(e._s(e.getName(t.row.userName)))]),e._v(" "),a("p",{staticClass:"h-18"},[e._v(e._s(e.getPhone(t.row.userName)))])]}}])})],1)],1),e._v(" "),0!==e.tableData.length?a("div",{staticClass:"block common-wrap__page text-right"},[a("dm-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(" "),a("vue-gic-footer")],1)},staticRenderFns:[]};var l=a("VU/8")(i,s,!1,function(e){a("nTRf"),a("+nug")},"data-v-80794cee",null);t.default=l.exports},Xd32:function(e,t,a){a("+tPU"),a("zQR9"),e.exports=a("5PlU")},d7EF:function(e,t,a){"use strict";t.__esModule=!0;var r=o(a("us/S")),n=o(a("BO1k"));function o(e){return e&&e.__esModule?e:{default:e}}t.default=function(){return function(e,t){if(Array.isArray(e))return e;if((0,r.default)(Object(e)))return function(e,t){var a=[],r=!0,o=!1,i=void 0;try{for(var s,l=(0,n.default)(e);!(r=(s=l.next()).done)&&(a.push(s.value),!t||a.length!==t);r=!0);}catch(e){o=!0,i=e}finally{try{!r&&l.return&&l.return()}finally{if(o)throw i}}return a}(e,t);throw new TypeError("Invalid attempt to destructure non-iterable instance")}}()},nTRf:function(e,t){},"us/S":function(e,t,a){e.exports={default:a("Xd32"),__esModule:!0}}});
\ No newline at end of file
dist/static/js/manifest.1d1323770ba400287067.js 0 → 100644
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,r,t){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],f[d]&&u.push(f[d][0]),f[d]=0;for(o in r)Object.prototype.hasOwnProperty.call(r,o)&&(e[o]=r[o]);for(c&&c(a,r,t);u.length;)u.shift()();if(t)for(i=0;i<t.length;i++)b=n(n.s=t[i]);return b};var a={},f={35:0};function n(c){if(a[c])return a[c].exports;var f=a[c]={i:c,l:!1,exports:{}};return e[c].call(f.exports,f,f.exports,n),f.l=!0,f.exports}n.e=function(e){var c=f[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,n){c=f[e]=[a,n]});c[2]=a;var r=document.getElementsByTagName("head")[0],t=document.createElement("script");t.type="text/javascript",t.charset="utf-8",t.async=!0,t.timeout=12e4,n.nc&&t.setAttribute("nonce",n.nc),t.src=n.p+"static/js/"+e+"."+{0:"2bfc624c286fa809b1d0",1:"63df651c5bad36d0031f",2:"ad19189a14bdfa817feb",3:"a6be4b07c7905d1e0ece",4:"eb5284f76b1ea13cb843",5:"ef821d6cc1ab11f3a775",6:"73d704775438cf69c2d4",7:"fe4f089e5ffd4ae68897",8:"6bc235be321d7a1b85da",9:"6f6edaaaf08fae10313e",10:"076fd4feb30608f97995",11:"cfa61640d1a3d8d26b48",12:"c1320c80ccfa48cc4505",13:"48c5666be42dc48db9f3",14:"b5f145ec162622561efe",15:"9911067032afaee3b577",16:"4a4cf12d77568d3424ff",17:"6f87525425a68e911f05",18:"6fd5220acc3536c9de18",19:"f725fb304c21822a4eef",20:"b50344d83b55a4cf958c",21:"8dae44947d0935b50c02",22:"8e3ac3ece7e9321cacfd",23:"52a8993f03088f744918",24:"47a5cc3e7d8c22395406",25:"58606db55ab3f74528d9",26:"ddd8e067e8889fe496fa",27:"c0b17d68a8ed6ebb33e6",28:"95393e00d83cc1679c24",29:"a31e91f87ed7df884523",30:"397679e2908f9fc9a458",31:"4591a6b917a443e5d890",32:"2e5562d608d17fee0ed3"}[e]+".js";var o=setTimeout(d,12e4);function d(){t.onerror=t.onload=null,clearTimeout(o);var c=f[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),f[e]=void 0)}return t.onerror=t.onload=d,r.appendChild(t),a},n.m=e,n.c=a,n.d=function(e,c,a){n.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},n.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return n.d(c,"a",c),c},n.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},n.p="./",n.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
dist/static/js/manifest.601cd011f8cc401582cd.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(a,t,f){for(var o,d,b,i=0,u=[];i<a.length;i++)d=a[i],n[d]&&u.push(n[d][0]),n[d]=0;for(o in t)Object.prototype.hasOwnProperty.call(t,o)&&(e[o]=t[o]);for(c&&c(a,t,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=r(r.s=f[i]);return b};var a={},n={35:0};function r(c){if(a[c])return a[c].exports;var n=a[c]={i:c,l:!1,exports:{}};return e[c].call(n.exports,n,n.exports,r),n.l=!0,n.exports}r.e=function(e){var c=n[e];if(0===c)return new Promise(function(e){e()});if(c)return c[2];var a=new Promise(function(a,r){c=n[e]=[a,r]});c[2]=a;var t=document.getElementsByTagName("head")[0],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,r.nc&&f.setAttribute("nonce",r.nc),f.src=r.p+"static/js/"+e+"."+{0:"2bfc624c286fa809b1d0",1:"63df651c5bad36d0031f",2:"ad19189a14bdfa817feb",3:"a6be4b07c7905d1e0ece",4:"eb5284f76b1ea13cb843",5:"e1c4d2689b37ec1c90e8",6:"73d704775438cf69c2d4",7:"5c03be74455e6564e4bb",8:"6bc235be321d7a1b85da",9:"6f6edaaaf08fae10313e",10:"076fd4feb30608f97995",11:"cfa61640d1a3d8d26b48",12:"c1320c80ccfa48cc4505",13:"48c5666be42dc48db9f3",14:"b5f145ec162622561efe",15:"9911067032afaee3b577",16:"4a4cf12d77568d3424ff",17:"6f87525425a68e911f05",18:"6fd5220acc3536c9de18",19:"f725fb304c21822a4eef",20:"b50344d83b55a4cf958c",21:"8dae44947d0935b50c02",22:"8e3ac3ece7e9321cacfd",23:"52a8993f03088f744918",24:"47a5cc3e7d8c22395406",25:"58606db55ab3f74528d9",26:"ddd8e067e8889fe496fa",27:"c0b17d68a8ed6ebb33e6",28:"95393e00d83cc1679c24",29:"a31e91f87ed7df884523",30:"397679e2908f9fc9a458",31:"4591a6b917a443e5d890",32:"2e5562d608d17fee0ed3"}[e]+".js";var o=setTimeout(d,12e4);function d(){f.onerror=f.onload=null,clearTimeout(o);var c=n[e];0!==c&&(c&&c[1](new Error("Loading chunk "+e+" failed.")),n[e]=void 0)}return f.onerror=f.onload=d,t.appendChild(f),a},r.m=e,r.c=a,r.d=function(e,c,a){r.o(e,c)||Object.defineProperty(e,c,{configurable:!1,enumerable:!0,get:a})},r.n=function(e){var c=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(c,"a",c),c},r.o=function(e,c){return Object.prototype.hasOwnProperty.call(e,c)},r.p="./",r.oe=function(e){throw console.error(e),e}}([]);
\ No newline at end of file
src/view/memberGroup/member-group-log.vue
......@@ -18,16 +18,16 @@
</div>
<div class="common-wrap__table m-t-20">
<el-table v-loading="loading" :data="tableData">
<el-table-column label="日志ID" :formatter="formatter" prop="logId"></el-table-column>
<el-table-column label="分组名称" prop="operateObject" :formatter="formatter" show-overflow-tooltip></el-table-column>
<el-table-column label="日志ID" :width="350" :formatter="formatter" prop="logId"></el-table-column>
<el-table-column :width="180" label="分组名称" prop="operateObject" :formatter="formatter" show-overflow-tooltip></el-table-column>
<el-table-column label="操作内容" prop="content" :formatter="formatter" show-overflow-tooltip></el-table-column>
<el-table-column :width="200" label="操作时间">
<el-table-column :width="180" label="操作时间">
<template slot-scope="scope">
<p class="h-18">{{ scope.row.createTime | formatTimeYMD }}</p>
<p class="h-18">{{ scope.row.createTime | formatTimeHMS }}</p>
</template>
</el-table-column>
<el-table-column :width="200" label="操作人">
<el-table-column :width="180" label="操作人">
<template slot-scope="scope">
<p class="h-18">{{ getName(scope.row.userName) }}</p>
<p class="h-18">{{ getPhone(scope.row.userName) }}</p>
......
src/view/memberGroup/memberLevelDetail.vue
......@@ -11,11 +11,10 @@
<span>{{ separator(total) }}</span>
人
</span>
<el-button type="primary" class="down-member-list__btn m-l-8" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown && total < 1000000">人群导出</el-button>
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown && total < 1000000">人群导出</el-button>
<el-tooltip v-else-if="downMemberListPop.canDown" class="item" effect="dark" content="每张报表导出人数限制为100万，大于100万的人群会自动拆分为多张报表进行导出" placement="top">
<el-button type="primary" class="down-member-list__btn m-l-8" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown">人群导出</el-button>
<el-button type="primary" class="down-member-list__btn" @click="downMemberListPop.show = true" v-if="downMemberListPop.canDown">人群导出</el-button>
</el-tooltip>
<el-button type="primary" class="down-member-list__btn" @click="`/memberGroupLog?memberTagGroupId=${$route.query.memberTagGroupId}`">操作日志</el-button>
</div>
<div class="memberGroupDetail-wrap__table">
<el-input
......
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