gn

src/components/admin/routineMonitor.vue

@@ -484,11 +484,7 @@
 				// var val = this.selectedData;
 				this.pubarr = this.multipleSelection;
 				for (let i = 0; i < length; i++) {
-<<<<<<< HEAD
 					if (this.pubarr[i].ispublic == 1) {
-=======
-					if (this.pubarr[i].ispublic == '1') {
->>>>>>> 9c66f874300f83f8c9576cb39d4f53743c4c6756
 						this.pubarr[i].ispublic = 2
 						canPub = 1
 					} else {

src/components/jc/setTask.vue

@@ -708,23 +708,13 @@
 			/** 监听每页显示多少数据的改变 */
 			handleSizeChange(newSize) {
 				this.queryInfo.pageSize = newSize
-<<<<<<< HEAD
 				this.getTaskDetail()
-=======
-				console.log(this.queryInfo.pageSize)
-				this.getUnderTask()
->>>>>>> 9c66f874300f83f8c9576cb39d4f53743c4c6756
 			},
 
 			/** 监听页码的改变 */
 			handleCurrentChange(newPage) {
 				this.queryInfo.pageNum = newPage
-<<<<<<< HEAD
 				this.getTaskDetail()
-
-=======
-				this.getUnderTask()
->>>>>>> 9c66f874300f83f8c9576cb39d4f53743c4c6756
 			},
 			// 批量勾选
 			handleSelectionChange(val) {