Skip to content

M
memberTag-web
Commit 4d56def9 by member
Options

修改tag

parent b5c13b5a
Showing with 46 additions and 19 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.1c062af91f1feb49f506d763be6c39e0.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.5db9a865de98c7361703.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.c40a1b7419beedbedcd5a48233364195.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.26b1cf950c9f7dfe0f4f.js></script><script type=text/javascript src=./static/js/vendor.eb4fd5c01c3b98d7fcea.js></script><script type=text/javascript src=./static/js/app.e9b61258081113d58255.js></script></body></html>
\ No newline at end of file
dist/static/css/app.1c062af91f1feb49f506d763be6c39e0.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.c40a1b7419beedbedcd5a48233364195.css 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/css/index.less
......@@ -90,4 +90,8 @@
.el-date-editor .el-range-separator {
width: 6%;
}
.el-dialog__footer {
border-top: none;
}
\ No newline at end of file
dist/static/js/0.2de08a37828f5eccfb97.js → dist/static/js/0.307726a6dfe183ec80cc.js
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/static/js/19.b15734a344b3a216e067.js deleted 100644 → 0
webpackJsonp([19],{SJ7l:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=i("Dd8w"),a=i.n(s),n=i("lRwf"),o=i.n(n),r=i("zL8q"),c=i("2CGT");o.a.component(r.CollapseTransition.name,r.CollapseTransition);var l={name:"group-list",data:function(){return{lists:[],addGroupDialog:!1,expendTxt:"展开",groupName:"",title:"新增分组名称",currentIndex:-1,active:!1}},computed:{expendClass:function(){return"展开"!=this.expendTxt?"is-caret":""}},methods:{handleNoEditClassifyName:function(){this.lists=this.lists.map(function(e){return a()({},e,{edit:!1})})},handleChangeIndex:function(e,t){this.active=!1,this.currentIndex=e,this.$emit("second-list",t)},editGroupName:function(e){if(e.edit)this.modifyName(e);else{if(!this.operatorName(e))return;e.edit=!0}},deleteGroupName:function(e){var t=this;this.operatorName(e)&&this.$confirm("是否删除分组名称？","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){t.excludeName(e)}).catch(function(){t.$message({type:"info",message:"已取消删除"})})},excludeName:function(e){var t=this,i={requestProject:"gic-member-tag-web",memberTagGroupClassifyId:e.memberTagGroupClassifyId};Object(c.k)(i).then(function(e){1==e.errorCode&&(t.getMemberGroupList(),t.$message({type:"success",message:"删除成功!"}))})},modifyName:function(e){var t=this;if(e.classifyName){var i={requestProject:"gic-member-tag-web",classifyName:e.classifyName,memberTagGroupClassifyId:e.memberTagGroupClassifyId};Object(c.m)(i).then(function(i){1==i.errorCode&&(e.edit=!1,t.getMemberGroupList(),t.$message({type:"success",message:"修改成功",duration:2e3}))})}else this.$message({message:"分组名称不能为空！",type:"warning",duration:2e3})},operatorName:function(e){return"0"!=e.memberTagGroupClassifyId||(this.$message({message:e.classifyName+"的不能操作",type:"warning",duration:2e3}),!1)},handleGroupDialog:function(){var e=this;if(this.groupName){var t={requestProject:"gic-member-tag-web",classifyName:this.groupName};Object(c.m)(t).then(function(t){1==t.errorCode&&(e.getMemberGroupList(),e.groupName="",e.addGroupDialog=!1,e.$message({type:"success",message:"添加成功"}))})}else this.$message({type:"warning",message:"分组名称不能为空"})},getMemberGroupList:function(){var e=this;Object(c.l)({requestProject:"gic-member-tag-web"}).then(function(t){1===t.errorCode&&(e.lists=t.result.map(function(e){return a()({},e,{edit:!1})}))})},handleExpend:function(){this.expendTxt="展开"===this.expendTxt?"收起":"展开"}},beforeMount:function(){this.getMemberGroupList()}},u={render:function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{staticClass:"group-list"},[i("div",{staticClass:"member-group"},[i("i",{staticClass:"icon-list el-icon-caret-top icon-transform",class:e.expendClass,on:{click:e.handleExpend}}),e._v("\n 我的会员分组\n "),i("i",{staticClass:"el-icon-plus icon-right icon-list",on:{click:function(t){e.addGroupDialog=!0}}})]),e._v(" "),i("el-collapseTransition",[i("ul",{directives:[{name:"show",rawName:"v-show",value:"展开"==e.expendTxt,expression:"expendTxt == '展开'"}],staticClass:"lists"},e._l(e.lists,function(t,s){return i("li",{key:s,staticClass:"member-list",class:{"active-li":s==e.currentIndex},on:{click:function(i){e.handleChangeIndex(s,t)}}},[i("span",{directives:[{name:"show",rawName:"v-show",value:!t.edit,expression:"!list.edit"}],staticClass:"name-txt",attrs:{title:t.classifyName}},[e._v(e._s(t.classifyName))]),e._v(" "),i("el-input",{directives:[{name:"show",rawName:"v-show",value:t.edit,expression:"list.edit"}],staticStyle:{width:"100px"},attrs:{size:"mini"},nativeOn:{keyup:function(i){if(!("button"in i)&&e._k(i.keyCode,"enter",13,i.key))return null;e.modifyName(t)}},model:{value:t.classifyName,callback:function(i){e.$set(t,"classifyName",i)},expression:"list.classifyName"}}),e._v(" "),"未分类"!==t.classifyName?i("div",{staticClass:"oper-area"},[i("i",{staticClass:"icon-list icon-list-oper",class:[t.edit?"el-icon-check":"el-icon-edit"],on:{click:function(i){i.stopPropagation(),e.editGroupName(t)}}}),e._v(" "),i("i",{staticClass:"icon-list el-icon-circle-close icon-list-oper",on:{click:function(i){e.deleteGroupName(t)}}})]):e._e()],1)}))]),e._v(" "),i("el-dialog",{attrs:{title:e.title,visible:e.addGroupDialog,width:"320px",top:"30vh","close-on-click-modal":!1},on:{"update:visible":function(t){e.addGroupDialog=t}}},[i("div",[e._v("\n 分组名称：\n "),i("el-input",{staticStyle:{width:"200px"},attrs:{placeholder:"请输入分组名称",maxlength:8,clearable:""},model:{value:e.groupName,callback:function(t){e.groupName=t},expression:"groupName"}})],1),e._v(" "),i("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[i("el-button",{on:{click:function(t){e.addGroupDialog=!1}}},[e._v("取 消")]),e._v(" "),i("el-button",{attrs:{type:"primary"},on:{click:e.handleGroupDialog}},[e._v("确 定")])],1)])],1)},staticRenderFns:[]};var m=i("VU/8")(l,u,!1,function(e){i("Z1PK")},"data-v-752807c8",null);t.default=m.exports},Z1PK:function(e,t){}});
\ No newline at end of file
dist/static/js/23.c24a9f56d0040598512c.js → dist/static/js/22.f24920a6257c85f352de.js
webpackJsonp([23],{GXzu:function(t,e){},iHP3:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=a("Dd8w"),n=a.n(s),i=a("lRwf"),l=a.n(i),c=a("zL8q"),o=a("CUHN"),d=a("SJI6");l.a.component(c.CollapseTransition.name,c.CollapseTransition);var r={name:"tag-type",components:{SecondTag:o.default},props:{tagList:Object},data:function(){return{list:{},typeName:"",editData:[],expends:"收起"}},computed:n()({},Object(d.mapState)(["tagRealName"])),methods:{handleChangeExpends:function(){this.expends="收起"===this.expends?"展开":"收起"},handleFirstTag:function(){localStorage.setItem("jumpTag",""),this.$emit("handleFristTag",this.list)}},watch:{tagList:{immediate:!0,handler:function(t){this.list=t}}}},p={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"list"},[a("span",{staticClass:"expends-txt",on:{click:t.handleChangeExpends}},[t._v(t._s(t.expends)+" ")]),t._v(" "),a("div",{staticClass:"first-tag"},[a("div",[a("i",{staticClass:"iconfont menu-icon",class:[t.list.icon,{"icon-tag-light":t.list.name===t.tagRealName}]}),t._v(" "),a("span",{staticClass:"tag-name",class:{"icon-tag-light":t.list.name===t.tagRealName},on:{click:t.handleFirstTag}},[t._v(t._s(t.list.name))])]),t._v(" "),a("el-collapseTransition",[a("div",{directives:[{name:"show",rawName:"v-show",value:"收起"===t.expends,expression:"expends === '收起'"}],staticClass:"second-tag"},t._l(t.list.children,function(e,s){return a("second-tag",{key:s,attrs:{list:e,"tag-name":t.list.name}})}))])],1)])},staticRenderFns:[]};var m=a("VU/8")(r,p,!1,function(t){a("GXzu")},"data-v-4c518050",null);e.default=m.exports}});
\ No newline at end of file
webpackJsonp([22],{GXzu:function(t,e){},iHP3:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var s=a("Dd8w"),n=a.n(s),i=a("lRwf"),l=a.n(i),c=a("zL8q"),o=a("CUHN"),d=a("SJI6");l.a.component(c.CollapseTransition.name,c.CollapseTransition);var r={name:"tag-type",components:{SecondTag:o.default},props:{tagList:Object},data:function(){return{list:{},typeName:"",editData:[],expends:"收起"}},computed:n()({},Object(d.mapState)(["tagRealName"])),methods:{handleChangeExpends:function(){this.expends="收起"===this.expends?"展开":"收起"},handleFirstTag:function(){localStorage.setItem("jumpTag",""),this.$emit("handleFristTag",this.list)}},watch:{tagList:{immediate:!0,handler:function(t){this.list=t}}}},p={render:function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("div",{staticClass:"list"},[a("span",{staticClass:"expends-txt",on:{click:t.handleChangeExpends}},[t._v(t._s(t.expends)+" ")]),t._v(" "),a("div",{staticClass:"first-tag"},[a("div",[a("i",{staticClass:"iconfont menu-icon",class:[t.list.icon,{"icon-tag-light":t.list.name===t.tagRealName}]}),t._v(" "),a("span",{staticClass:"tag-name",class:{"icon-tag-light":t.list.name===t.tagRealName},on:{click:t.handleFirstTag}},[t._v(t._s(t.list.name))])]),t._v(" "),a("el-collapseTransition",[a("div",{directives:[{name:"show",rawName:"v-show",value:"收起"===t.expends,expression:"expends === '收起'"}],staticClass:"second-tag"},t._l(t.list.children,function(e,s){return a("second-tag",{key:s,attrs:{list:e,"tag-name":t.list.name}})}))])],1)])},staticRenderFns:[]};var m=a("VU/8")(r,p,!1,function(t){a("GXzu")},"data-v-4c518050",null);e.default=m.exports}});
\ No newline at end of file
dist/static/js/23.17397a079914e3c270ab.js 0 → 100644
webpackJsonp([23],{SJ7l:function(e,t,i){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var s=i("Dd8w"),a=i.n(s),n=i("lRwf"),o=i.n(n),r=i("zL8q"),c=i("2CGT");o.a.component(r.CollapseTransition.name,r.CollapseTransition);var l={name:"group-list",data:function(){return{lists:[],addGroupDialog:!1,expendTxt:"展开",groupName:"",title:"新增分组名称",currentIndex:-1,active:!1}},computed:{expendClass:function(){return"展开"!=this.expendTxt?"is-caret":""}},methods:{handleNoEditClassifyName:function(){this.lists=this.lists.map(function(e){return a()({},e,{edit:!1})})},handleChangeIndex:function(e,t){this.active=!1,this.currentIndex=e,this.$emit("second-list",t)},editGroupName:function(e){if(e.edit)this.modifyName(e);else{if(!this.operatorName(e))return;e.edit=!0}},deleteGroupName:function(e){var t=this;this.operatorName(e)&&this.$confirm("删除分组名称，包括该分组下的内容，确定删除吗？","提示",{confirmButtonText:"确定",cancelButtonText:"取消",type:"warning"}).then(function(){t.excludeName(e)}).catch(function(){t.$message({type:"info",message:"已取消删除"})})},excludeName:function(e){var t=this,i={requestProject:"gic-member-tag-web",memberTagGroupClassifyId:e.memberTagGroupClassifyId};Object(c.k)(i).then(function(e){1==e.errorCode&&(t.getMemberGroupList(),t.$message({type:"success",message:"删除成功!"}))})},modifyName:function(e){var t=this;if(e.classifyName){var i={requestProject:"gic-member-tag-web",classifyName:e.classifyName,memberTagGroupClassifyId:e.memberTagGroupClassifyId};Object(c.m)(i).then(function(i){1==i.errorCode&&(e.edit=!1,t.getMemberGroupList(),t.$message({type:"success",message:"修改成功",duration:2e3}))})}else this.$message({message:"分组名称不能为空！",type:"warning",duration:2e3})},operatorName:function(e){return"0"!=e.memberTagGroupClassifyId||(this.$message({message:e.classifyName+"的不能操作",type:"warning",duration:2e3}),!1)},handleGroupDialog:function(){var e=this;if(this.groupName){var t={requestProject:"gic-member-tag-web",classifyName:this.groupName};Object(c.m)(t).then(function(t){1==t.errorCode&&(e.getMemberGroupList(),e.groupName="",e.addGroupDialog=!1,e.$message({type:"success",message:"添加成功"}))})}else this.$message({type:"warning",message:"分组名称不能为空"})},getMemberGroupList:function(){var e=this;Object(c.l)({requestProject:"gic-member-tag-web"}).then(function(t){1===t.errorCode&&(e.lists=t.result.map(function(e){return a()({},e,{edit:!1})}))})},handleExpend:function(){this.expendTxt="展开"===this.expendTxt?"收起":"展开"}},beforeMount:function(){this.getMemberGroupList()}},u={render:function(){var e=this,t=e.$createElement,i=e._self._c||t;return i("div",{staticClass:"group-list"},[i("div",{staticClass:"member-group"},[i("i",{staticClass:"icon-list el-icon-caret-top icon-transform",class:e.expendClass,on:{click:e.handleExpend}}),e._v("\n 我的会员分组\n "),i("i",{staticClass:"el-icon-plus icon-right icon-list",on:{click:function(t){e.addGroupDialog=!0}}})]),e._v(" "),i("el-collapseTransition",[i("ul",{directives:[{name:"show",rawName:"v-show",value:"展开"==e.expendTxt,expression:"expendTxt == '展开'"}],staticClass:"lists"},e._l(e.lists,function(t,s){return i("li",{key:s,staticClass:"member-list",class:{"active-li":s==e.currentIndex},on:{click:function(i){e.handleChangeIndex(s,t)}}},[i("span",{directives:[{name:"show",rawName:"v-show",value:!t.edit,expression:"!list.edit"}],staticClass:"name-txt",attrs:{title:t.classifyName}},[e._v(e._s(t.classifyName))]),e._v(" "),i("el-input",{directives:[{name:"show",rawName:"v-show",value:t.edit,expression:"list.edit"}],staticStyle:{width:"100px"},attrs:{size:"mini"},nativeOn:{keyup:function(i){if(!("button"in i)&&e._k(i.keyCode,"enter",13,i.key))return null;e.modifyName(t)}},model:{value:t.classifyName,callback:function(i){e.$set(t,"classifyName",i)},expression:"list.classifyName"}}),e._v(" "),"未分类"!==t.classifyName?i("div",{staticClass:"oper-area"},[i("i",{staticClass:"icon-list icon-list-oper",class:[t.edit?"el-icon-check":"el-icon-edit"],on:{click:function(i){i.stopPropagation(),e.editGroupName(t)}}}),e._v(" "),i("i",{staticClass:"icon-list el-icon-circle-close icon-list-oper",on:{click:function(i){e.deleteGroupName(t)}}})]):e._e()],1)}))]),e._v(" "),i("el-dialog",{attrs:{title:e.title,visible:e.addGroupDialog,width:"320px",top:"30vh","close-on-click-modal":!1},on:{"update:visible":function(t){e.addGroupDialog=t}}},[i("div",[e._v("\n 分组名称：\n "),i("el-input",{staticStyle:{width:"200px"},attrs:{placeholder:"请输入分组名称",maxlength:8,clearable:""},model:{value:e.groupName,callback:function(t){e.groupName=t},expression:"groupName"}})],1),e._v(" "),i("span",{staticClass:"dialog-footer",attrs:{slot:"footer"},slot:"footer"},[i("el-button",{on:{click:function(t){e.addGroupDialog=!1}}},[e._v("取 消")]),e._v(" "),i("el-button",{attrs:{type:"primary"},on:{click:e.handleGroupDialog}},[e._v("确 定")])],1)])],1)},staticRenderFns:[]};var m=i("VU/8")(l,u,!1,function(e){i("qBFS")},"data-v-435aa186",null);t.default=m.exports},qBFS:function(e,t){}});
\ No newline at end of file
dist/static/js/manifest.26b1cf950c9f7dfe0f4f.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:"307726a6dfe183ec80cc",1:"1a66f3452cb905b67755",2:"01784f338bb843f827f5",3:"051ac3bcb06e09d7b34d",4:"5346be35fdb53a222936",5:"b90e111733583960642a",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:"58217a281ee1178e0c5d",20:"519677922a687ccbe4d9",21:"e39e3461a16359f1196b",22:"f24920a6257c85f352de",23:"17397a079914e3c270ab",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
dist/static/js/manifest.5db9a865de98c7361703.js deleted 100644 → 0
!function(e){var c=window.webpackJsonp;window.webpackJsonp=function(n,a,f){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 a)Object.prototype.hasOwnProperty.call(a,o)&&(e[o]=a[o]);for(c&&c(n,a,f);u.length;)u.shift()();if(f)for(i=0;i<f.length;i++)b=t(t.s=f[i]);return b};var n={},r={33: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],f=document.createElement("script");f.type="text/javascript",f.charset="utf-8",f.async=!0,f.timeout=12e4,t.nc&&f.setAttribute("nonce",t.nc),f.src=t.p+"static/js/"+e+"."+{0:"2de08a37828f5eccfb97",1:"1a66f3452cb905b67755",2:"01784f338bb843f827f5",3:"a1d23b8276ed0dc5689a",4:"5346be35fdb53a222936",5:"5a523b4d63b337052d7b",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(){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=d,a.appendChild(f),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}}([]);
\ No newline at end of file
src/components/tag/tag-config-options.vue
......@@ -447,7 +447,8 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss">
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['000000', '235959']">
</el-date-picker>
</div>
<!-- 相对时段 -->
......@@ -516,7 +517,8 @@
start-placeholder="开始时间"
end-placeholder="结束时间"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss">
value-format="yyyy-MM-dd HH:mm:ss"
:default-time="['000000', '235959']">
</el-date-picker>
</div>
<!-- 相对时段 -->
......@@ -1299,7 +1301,7 @@ export default {
let tagValue = JSON.parse(this.templateDataList.tagValue);
let tagParams = JSON.parse(this.templateDataList.tagParams);
let value = null;
let radio = null;
// let radio = null;
let selectVal = null;
let checkedCount = null;
......@@ -1372,10 +1374,30 @@ export default {
break;
case 'tag015':
radio = tagParams.template[0].radio;
value = tagValue.val[0].data.value.split(',');
this.templateData[0].radio = radio;
this.templateData[0].monthDayRange = value;
for (let i = 0; i < this.templateData.length; i++) {
if (this.templateData[i].templateCode === 'tag015') {
console.log(tagParams.template[0]);
console.log(tagValue)
let templateDate = tagParams.template[0];
this.templateData[i].radio = templateDate.radio; // 时段
this.templateData[i].timeRadio = templateDate.timeRadio; // 天 月 年
this.templateData[i].timeAfterChecked = templateDate.timeAfterChecked;
this.templateData[i].timeChecked = templateDate.timeChecked;
if (templateDate.dateRangeValue.length) {
this.templateData[i].dateRangeValue = templateDate.dateRangeValue;
} else {
this.templateData[i].dateRangeValue = tagValue.val[0].data.value.split(',');
}
// 如果有最近选项必有 timeInput
if (this.templateData[i].timeAfterChecked) {
this.templateData[i].timeInput = tagValue.val[0].data.value;
}
}
}
// radio = tagParams.template[0].radio;
// value = tagValue.val[0].data.value.split(',');
// this.templateData[0].radio = radio;
// this.templateData[0].monthDayRange = value;
break;
case 'tag012':
......
src/components/tagDetail/mixin/index.js
......@@ -440,11 +440,11 @@ export default {
}
/* 固定/相对 年月日+最近+之后 年月日+最近 年月日时分秒-年月日时分秒 */
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020') && that.templateData[0].radio == 1 && !that.templateData[0].dateRangeValue.length) {
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020' || code === 'tag015') && that.templateData[0].radio == 1 && !that.templateData[0].dateRangeValue.length) {
that.$message.error({ message: '请选择值' });
return false;
}
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020')) {
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020' || code === 'tag015')) {
for (let k of this.templateData) {
if (!k.timeChecked && !k.timeAfterChecked && k.radio == 2) {
let tips = k.timeRadio == 1 ? '天' : k.timeRadio == 2 ? '月' : '年';
......@@ -467,7 +467,7 @@ export default {
}
}
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020') && that.templateData.length === 1 && that.templateData[0].radio == 1) {
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020' || code === 'tag015') && that.templateData.length === 1 && that.templateData[0].radio == 1) {
if (that.currentComputeType == 2) {
tagValue.val[0].data.compute = 'between';
} else {
......@@ -485,7 +485,7 @@ export default {
that.postTemplateData.selectedVal.push(that.templateData[0].dateRangeValue[0].split(' ')[0] + '至' + that.templateData[0].dateRangeValue[1].split(' ')[0]);
}
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020') && that.templateData.length === 1 && that.templateData[0].radio == 2) {
if ((code === 'tag014' || code === 'tag017' || code === 'tag019' || code === 'tag020' || code === 'tag015') && that.templateData.length === 1 && that.templateData[0].radio == 2) {
// 天
// timeAfterChecked 最近/之后
// timeChecked 当天/年/月
......
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