소스 검색

93最终版本

347617796@qq.com 3 년 전
부모
커밋
a5972a6ba6
5개의 변경된 파일11개의 추가작업 그리고 7개의 파일을 삭제
  1. 1 1
      src/main.js
  2. 2 3
      src/views/common/rewardTaskAmend.vue
  3. 4 3
      src/views/common/temporaryTaskAmend.vue
  4. 2 0
      src/views/ranking/log_rank.vue
  5. 2 0
      src/views/ranking/task_rank.vue

+ 1 - 1
src/main.js

@@ -40,7 +40,7 @@ Vue.prototype.$authoritys = authoritys
 Vue.prototype.$moment = moment
 Vue.prototype.$appId = process.env.VUE_APP_APPID
 Vue.prototype.$socketApi = socketApi   //长连接
-Vue.prototype.$generateUUID = generateUUID   //长连接
+Vue.prototype.$generateUUID = generateUUID   //UID 唯一标识
 
 Vue.prototype.$http = service;
 var CancelToken = axios.CancelToken;

+ 2 - 3
src/views/common/rewardTaskAmend.vue

@@ -398,16 +398,15 @@ export default {
 			})
 			this.fileList = filtList
 			this.fileFun('', filtList)
-			
 			if(this.rewardTaskAmendData.point_config.item_info){
 				let itemInfo = this.rewardTaskAmendData.point_config.item_info
 				this.formData.tree_echo = this.ruleChange(itemInfo.rule_id,[itemInfo.id])
-				this.isSelectType=false;
+				this.isSelectType=true;
 				this.$nextTick(_=>{
 					this.ruleItemChange(this.formData.tree_echo)
 				})
 			}else if(this.rewardTaskAmendData.rule_id){//指定了分类
-				this.isSelectType=true;
+				this.isSelectType=false;
 				this.formData.rule_id = this.rewardTaskAmendData.rule_id;
 				this.formData.rule_value = this.returnRuleVal(this.rewardTaskAmendData.rule_id,[]);
 			}

+ 4 - 3
src/views/common/temporaryTaskAmend.vue

@@ -391,7 +391,7 @@ export default {
 			return id == 2 ? 'A分' : 'B分'
 		},
 		ruleItemChange(val){
-			let item = this.formData
+			let item = this.formData;
 			if(val.length>0){
 				let data = this.$refs.ruleItem.getCheckedNodes()[0].data;//当前选中的节点数据
 				item.task_remark = data.name;
@@ -436,16 +436,17 @@ export default {
 			})
 			this.fileList = filtList
 			this.fileFun('', filtList)
+			console.log(this.modifyData.point_config)
 			// 指定了规则
 			if(this.modifyData.point_config.item_info){
 				let itemInfo = this.modifyData.point_config.item_info
 				this.formData.tree_echo = this.ruleChange(itemInfo.rule_id,[itemInfo.id])
-				this.isSelectType=false;
+				this.isSelectType=true;
 				this.$nextTick(_=>{
 					this.ruleItemChange(this.formData.tree_echo);
 				})
 			}else if(this.modifyData.rule_id){//指定了分类
-				this.isSelectType=true;
+				this.isSelectType=false;
 				this.formData.rule_id = this.modifyData.rule_id;
 				this.formData.rule_value = this.returnRuleVal(this.modifyData.rule_id,[]);
 			}

+ 2 - 0
src/views/ranking/log_rank.vue

@@ -261,6 +261,8 @@ export default {
 			} else {
 				this.formData.sort = 'DESC';
 			}
+			this.formData.page = 1;
+			this.get_list();
 		},
 		dept_name(val) {
 			if (val.length !== 0) {

+ 2 - 0
src/views/ranking/task_rank.vue

@@ -268,6 +268,8 @@ export default {
 			} else {
 				this.formData.sort = 'DESC';
 			}
+			this.formData.page = 1;
+			this.get_list();
 		},
 		dept_name(val) {
 			if (val.length !== 0) {