Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

src/views/wf/allwork.vue

@@ -87,7 +87,7 @@
 					cateType = 'opl'
 				}
 				this.$router.push({
-					name: "ticketdetail",
+					path: "ticketdetail",
 					query: {
 						id: row.id,
 						type: 'show',

src/views/wf/ccwork.vue

@@ -84,7 +84,7 @@
 					cateType = 'opl'
 				}
 				this.$router.push({
-					name: "ticketdetail",
+					path: "ticketdetail",
 					query: {
 						id: row.id,
 						type: 'show',

src/views/wf/dutywork.vue

@@ -116,7 +116,7 @@
 					cateType = 'opl'
 				}
 				this.$router.push({
-					name: "ticketdetail",
+					path: "ticketdetail",
 					query: {
 						id: row.id,
 						projectId: projectId,

src/views/wf/ownerwork.vue

@@ -123,7 +123,7 @@
 					cateType = 'opl'
 				}
 				this.$router.push({
-					name: "ticketdetail",
+					path: "ticketdetail",
 					query: {
 						id: row.id,
 						type: "show",

src/views/wf/ticketdetail.vue

@@ -1,11 +1,11 @@
 <template>
 	<el-container>
 		<el-main v-loading="mainLoading">
-			<el-card header="流程">
+			<el-card header="流程" style="position:relative">
 				<work-step v-if="ticketDetail.state" ref="workStep" :ticket="ticketDetail"></work-step>
 				<el-button
 					class="ticketRetry"
-					v-if="type!=='show'&&ticketDetail.state_&&ticketDetail.state_.name==='任务执行'"
+					v-if="ticketDetail.state_&&ticketDetail.state_.name==='任务执行'"
 					@click="reStart"
 					type="primary"
 				>

src/views/wf/worked.vue

@@ -84,7 +84,7 @@
 					cateType = 'opl'
 				}
 				this.$router.push({
-					name: "ticketdetail",
+					path: "ticketdetail",
 					query: {
 						id: row.id,
 						type: "show",