7ad8a813 by 杨炀

no message

1 parent 34186cd5
...@@ -633,12 +633,13 @@ watch(projectIds, (newVal, oldVal) => { ...@@ -633,12 +633,13 @@ watch(projectIds, (newVal, oldVal) => {
633 function filterProjectList(currProject){ 633 function filterProjectList(currProject){
634 for(let pp of projectList.value){ 634 for(let pp of projectList.value){
635 if( 635 if(
636 (pp.pproperty==hasPproperty)&&((pp.danceTypeDetailStr.split(',').length>=4&&hasPpropertyLength<4)||(pp.danceTypeDetailStr.split(',').length<4&&hasPpropertyLength>=4)) 636 (hasPproperty&&pp.pproperty==hasPproperty)&&((pp.danceTypeDetailStr.split(',').length>=4&&hasPpropertyLength<4)||(pp.danceTypeDetailStr.split(',').length<4&&hasPpropertyLength>=4))
637 ||(hasPproperty&&pp.pproperty&&pp.pproperty!=hasPproperty) 637 ||(hasPproperty&&pp.pproperty&&pp.pproperty!=hasPproperty)
638 ||(hasPlevel&&pp.plevel&&pp.plevel!=hasPlevel) 638 ||(hasPlevel&&pp.plevel&&pp.plevel!=hasPlevel)
639 ||(isDanNum==Number(singlePersonEntryLimit.value) && pp.singleFlag=='1'&&projectIds.value.indexOf(pp.id)==-1) 639 ||(isDanNum==Number(singlePersonEntryLimit.value) && pp.singleFlag=='1'&&projectIds.value.indexOf(pp.id)==-1)
640 ||(isShuangNum==Number(doublePersonEntryLimit.value) && pp.doubleSingleProjectFlag=='1'&&projectIds.value.indexOf(pp.id)==-1) 640 ||(isShuangNum==Number(doublePersonEntryLimit.value) && pp.doubleSingleProjectFlag=='1'&&projectIds.value.indexOf(pp.id)==-1)
641 ){ 641 ){
642 console.log(pp.name)
642 pp.disabled = true 643 pp.disabled = true
643 } else if((hasAlmighty.almightyFlag=='1'&&pp.almightyFlag=='1') 644 } else if((hasAlmighty.almightyFlag=='1'&&pp.almightyFlag=='1')
644 &&(hasAlmighty.danceTypeDetailStr.split(',').length!=pp.danceTypeDetailStr.split(',').length) 645 &&(hasAlmighty.danceTypeDetailStr.split(',').length!=pp.danceTypeDetailStr.split(',').length)
......
...@@ -84,16 +84,16 @@ export default defineConfig(({ mode, command }) => { ...@@ -84,16 +84,16 @@ export default defineConfig(({ mode, command }) => {
84 '/dev-api': { 84 '/dev-api': {
85 // target: 'http://192.168.1.118:8081/', 85 // target: 'http://192.168.1.118:8081/',
86 // target: 'http://192.168.1.131:8081/', 86 // target: 'http://192.168.1.131:8081/',
87 target: 'https://jijin.wtwuxicenter.com/stage-api', 87 // target: 'https://jijin.wtwuxicenter.com/stage-api',
88 // target: 'https://wdsfwuxicenter.com/stage-api/', 88 target: 'https://wdsfwuxicenter.com/stage-api/',
89 changeOrigin: true, 89 changeOrigin: true,
90 rewrite: (p) => p.replace(/^\/dev-api/, '') 90 rewrite: (p) => p.replace(/^\/dev-api/, '')
91 }, 91 },
92 '/ticket': { 92 '/ticket': {
93 // target: 'http://192.168.1.118:8098/', 93 // target: 'http://192.168.1.118:8098/',
94 // target: 'http://192.168.1.131:8081/', 94 // target: 'http://192.168.1.131:8081/',
95 target: 'https://jijin.wtwuxicenter.com/stage-api', 95 // target: 'https://jijin.wtwuxicenter.com/stage-api',
96 // target: 'https://wdsfwuxicenter.com/stage-api/', 96 target: 'https://wdsfwuxicenter.com/stage-api/',
97 changeOrigin: true, 97 changeOrigin: true,
98 rewrite: (p) => p.replace(/^\/ticket/, '') 98 rewrite: (p) => p.replace(/^\/ticket/, '')
99 } 99 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!