new

src/components/admin/routineMonitor.vue

@@ -342,12 +342,6 @@
 				this.queryInfo.pageSize = newSize
 				this.gettaskList()
 			},
-			
-			/** 监听页码的改变 */
-			handleCurrentChange(newPage) {
-				this.queryInfo.pageNum = newPage
-				this.gettaskList()
-			},
 			// 获取任务列表
 			async gettaskList() {
 				for (var key in this.queryInfo) {
@@ -490,7 +484,11 @@
 				// 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,14 +708,23 @@
 			/** 监听每页显示多少数据的改变 */
 			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) {

src/components/jc/setTaskcd.vue

@@ -3,6 +3,7 @@
 
 		<el-breadcrumb separator-class="el-icon-arrow-right">
 			<el-breadcrumb-item>首页</el-breadcrumb-item>
+			<el-breadcrumb-item>承担单位</el-breadcrumb-item>
 			<el-breadcrumb-item :to="{ path: '/jc/routineMonitor' }">任务列表</el-breadcrumb-item>
 			<el-breadcrumb-item>基本信息</el-breadcrumb-item>
 		</el-breadcrumb>