web/SchedulingDashboard.git

			@@ -69,7 +69,7 @@
			工时： {{ taskData.Procedure.procedure.workHours \|\| "" }}
			</div>
			<div class="title-item">
			起止时间： {{ formatDate(taskData.Order.startTime) \|\| "" }}
			计划时间： {{ formatDate(taskData.Order.startTime) \|\| "" }}
			-
			{{ formatDate(taskData.Order.endTime) }}
			</div>
			@@ -114,24 +114,37 @@
			font-size: 26px;
			width: 100%;
			text-align: center;
			margin-bottom: 20px;
			margin-bottom: 15px;
			margin-top: 10px;
			line-height:35px;
			"
			>
			<template v-if="showBtn == 2">
			<div class="gif">
			<img src="../../public/shan.gif" />
			</div>
			</template>
			<template v-if="showBtn == 3&&!isLoading">
			<div class="gif">
			<span class="yuandian"></span>
			</div>
			</template>
			{{ message }}
			</div>
			<div class="progress-item">
			<span>{{ parseInt((num / 60) * 100) }}%</span>
			<el-progress
			style="width: calc(100% - 50px); float: right"
			define-back-color="#CDC6C6"
			color="#00cc66"
			text-color="#fff"
			:text-inside="true"
			:stroke-width="20"
			:percentage="parseInt((num / 60) * 100)"
			></el-progress>
			</div>
			<template v-if="showBtn == 3&&isLoading">
			<div class="progress-item">
			<span>{{ parseInt((num / 60) * 100) }}%</span>
			<el-progress
			style="width: calc(100% - 50px); float: right"
			define-back-color="#CDC6C6"
			color="#00cc66"
			text-color="#fff"
			:text-inside="true"
			:stroke-width="20"
			:percentage="parseInt((num / 60) * 100)"
			></el-progress>
			</div>
			</template>
			</div>
			</template>

			@@ -228,10 +241,18 @@
			this.showBtn = 3;
			}
			},
			islook(){
			this.showBtn=1;
			if (this.timer) {
			clearInterval(this.timer);
			}
			this.num = 0;
			},
			},
			methods: {
			confirmClick2() {
			this.messageError = "";
			this.isLoading=false;
			},
			confirmClick1() {
			this.num = 0;
			@@ -259,7 +280,7 @@
			this.islook = true;
			} else {
			this.islook = false;
			// this.islook = true;
			this.islook = true;
			}
			},
			getDateObj(date, fmt) {
			@@ -316,8 +337,7 @@
			return true;
			}
			this.isLoading=true;
			sendProcessParams({ id: this.taskData.Procedure.ID }).then((res) => {
			console.log(res,'====res')
			sendProcessParams({ procedureId: this.taskData.Procedure.ID,position: Number(this.taskData.Position), }).then((res) => {
			if (res.code == 200) {
			this.resParams = res;
			this.isLoading=false;
			@@ -386,10 +406,10 @@
			margin-bottom: 13px;
			}
			.title-box {
			width: calc(100% - 160px);
			width: calc(100% - 140px);
			height: auto;
			overflow: hidden;
			padding:0 80px;
			padding:0 70px;
			.title-item {
			width: 45%;
			float: left;
			@@ -551,7 +571,26 @@
			background:#0E246A;
			.title-box{
			padding:0 10px;
			width:calc(100% - 20px);
			}
			}
			.gif{
			width:35px;
			margin:0 auto;
			display:inline-block;
			vertical-align: middle;
			img{
			width:100%;
			}
			.yuandian {
			width: 35px;
			height: 35px;
			display: inline-block;
			// background: #15d815;
			background:red;
			border-radius: 50%;
			vertical-align: middle;
			}
			}
			.progress-item {
			width: 55%;
			@@ -586,7 +625,7 @@
			width:25%;
			float:left;
			margin-left:30px;
			font-size: 27px;
			font-size: 25px;
			color: #fff;
			height: 3.2vw;
			line-height: 4.5vw;