2022 5/10

src/api/websocket.js

@@ -1,5 +1,6 @@
 
 let wsurl='wss://' + process.env.VUE_APP_WEBSCOKET + '/ws/';
+// let wsurl='wss://ding.insys.g107.com/ws/';
 let ws = null
 let weboscket_callback = null
 import {getToken,generateUUID } from '@/api/auth';

src/views/ranking/dept_rank.vue

@@ -260,7 +260,7 @@ export default {
 				value1: '', //时间
 				DC_position: '全部', //人员
 				dept_name: [], //部门
-				rule_id: [] ,//规则
+				rule: [] ,//规则
 				pt_id: 3,
 			},
 			dialogVisible: false,
@@ -274,7 +274,7 @@ export default {
 				time_type: 1,
 				exclusion: [],
 				page: 1,
-				rule_id: '',
+				rule: '',
 				page_size: 10,
 				position: 0 //部门多选删除这个
 			},
@@ -418,13 +418,13 @@ export default {
 		},
 		rule_id(val) {
 			if(val.length==0){
-				this.formData.rule_id='';
+				this.formData.rule='';
 				return false
 			}
 			if(val.length==1){
-				this.formData.rule_id=(val).toString()
+				this.formData.rule=(val).toString()
 			}else{
-				this.formData.rule_id=(val[val.length-1]).toString()
+				this.formData.rule=(val[val.length-1]).toString()
 			}
 			this.$refs.rule_id.dropDownVisible = false;
 		}
@@ -441,9 +441,9 @@ export default {
 				ruleId.push(item.value);
 			});
 			if (rule == 'ruleinquire') {
-				this.formData.rule_id = ruleId;
+				this.formData.rule = ruleId;
 			} else {
-				this.Dc_Data.rule_id = ruleId;
+				this.Dc_Data.rule = ruleId;
 			}
 			this.$nextTick(() => {
 				if (this.$refs[rule].presentTags[1]) {
@@ -665,8 +665,8 @@ export default {
 			}
 			data += '&position=' + this.Dc_Data.DC_position;
 			this.Dc_Data.dept_name > 0 ? (data += '&dept_id=' + this.Dc_Data.dept_name) : (data += '&dept_id=0');
-			if (this.Dc_Data.rule_id.length > 0) {
-				data += '&rule_id=' + this.Dc_Data.rule_id;
+			if (this.Dc_Data.rule.length > 0) {
+				data += '&rule_id=' + this.Dc_Data.rule;
 			}
 			window.open(process.env.VUE_APP_BASE_API + 'api/download/ranking/v2?pt_id=' + this.Dc_Data.pt_id + '&employee_id=' + this.$getUserData().id + data, '_blank');
 			this.dialogVisible = false;