From 79f973d8f7b9e51eb68ae4139b68a3d4847b56b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Wed, 3 Jul 2024 17:39:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E4=BF=AE=E6=94=B91=EF=BC=88?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.moblie                                      |  4 ++--
 src/api/deviceManagement/devicetaskexecute.js    | 12 ++++++++++++
 .../analysis/fullscreen/table1.vue               |  2 +-
 .../TheTaskExecuteDeviceItemStep.vue             | 13 ++++++-------
 .../deviceTaskExecute/TheTaskExecuteView.vue     |  6 +++---
 .../deviceManagement/deviceTaskExecute/index.vue | 16 ++++++++++------
 .../deviceManagement/deviceaccount/index.vue     | 11 ++++++-----
 7 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/.env.moblie b/.env.moblie
index 9ac4809..62a6d38 100644
--- a/.env.moblie
+++ b/.env.moblie
@@ -4,8 +4,8 @@ ENV = 'moblie'
 VITE_APP_ROUTER_PREFIX = './'
 
 # 路由前缀
-VITE_APP_BASE_API = "http://192.168.50.163:7000/"
-
+VITE_APP_BASE_API = "https://192.168.50.163"
+# VITE_APP_BASE_API = "http://192.168.0.49:7000/"
 # 默认上传地址
 VITE_APP_UPLOAD_URL = '/Common/UploadFile'
 
diff --git a/src/api/deviceManagement/devicetaskexecute.js b/src/api/deviceManagement/devicetaskexecute.js
index 74a067d..f3788fc 100644
--- a/src/api/deviceManagement/devicetaskexecute.js
+++ b/src/api/deviceManagement/devicetaskexecute.js
@@ -148,4 +148,16 @@ export function updateTaskStatus(params) {
 		method: 'get',
 		params:params
 	})
+}
+
+/**
+ * 设置任务开始时间
+ * @param {id,status}
+ */
+export function setTaskStartTime(params) {
+	return request({
+		url: 'mes/deviceManagement/DeviceTaskExecute/set_task_start_time',
+		method: 'get',
+		params:params
+	})
 }
\ No newline at end of file
diff --git a/src/views/andonManagement/analysis/fullscreen/table1.vue b/src/views/andonManagement/analysis/fullscreen/table1.vue
index 1ad20bd..3e66498 100644
--- a/src/views/andonManagement/analysis/fullscreen/table1.vue
+++ b/src/views/andonManagement/analysis/fullscreen/table1.vue
@@ -37,7 +37,7 @@
         :show-overflow-tooltip="true"
         v-if="columns.showColumn('responsePerson')" />
       <el-table-column prop="endTime" label="签到时间" :show-overflow-tooltip="true" v-if="columns.showColumn('endTime')"> </el-table-column>
-      <el-table-column prop="duration" label="持续时长(小时)" align="center" v-if="columns.showColumn('duration')" />
+      <el-table-column prop="duration" label="持续时长(分钟)" align="center" v-if="columns.showColumn('duration')" />
     </el-table>
   </div>
 </template>
diff --git a/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteDeviceItemStep.vue b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteDeviceItemStep.vue
index 6a7df7c..cae617f 100644
--- a/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteDeviceItemStep.vue
+++ b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteDeviceItemStep.vue
@@ -4,16 +4,16 @@
 			<el-row :gutter="20">
 				<el-col :span="10" :xs="6">
 					<el-form-item label="设备所属">
-						<el-input type="input" v-model="deviceItem.workshop" disabled />
+						<el-input type="input" v-model="deviceItem.workshop" readonly />
 					</el-form-item>
 					<el-form-item label="设备产线">
-						<el-input type="input" v-model="deviceItem.workline" disabled />
+						<el-input type="input" v-model="deviceItem.workline" readonly />
 					</el-form-item>
 					<el-form-item label="设备名称">
-						<el-input type="input" v-model="deviceItem.deviceName" disabled />
+						<el-input type="input" v-model="deviceItem.deviceName" readonly />
 					</el-form-item>
 					<el-form-item label="设备编号">
-						<el-input type="input" v-model="deviceItem.deviceCode" disabled />
+						<el-input type="input" v-model="deviceItem.deviceCode" readonly />
 					</el-form-item>
 				</el-col>
 				<el-col :span="14" :xs="6">
@@ -138,7 +138,6 @@
 	})
 	const { proxy } = getCurrentInstance()
 	watch(() => props.deviceItem, (newValue, oldValue) => {
-		console.log('props.deviceItem watch', newValue)
 		if (newValue != null) {
 			init();
 			getStepsData();
@@ -164,6 +163,7 @@
 			.then(async () => {
 				const data = {
 					id: props.executeKey,
+					
 					status: 2
 				}
 				updateTaskStatus(data).then(res => {
@@ -323,13 +323,12 @@
 	const IsIdentification = ref(false);
 
 	function handlerIdentification() {
-		console.log(navigator.mediaDevices);
 		if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
 			// 浏览器支持getUserMedia
 			IdentificationShow.value = true;
 		} else {
 			// 浏览器不支持getUserMedia
-			proxy.$message.error('当前浏览器不支持打开摄像头！请更换浏览器！');
+			proxy.$message.error('当前浏览器不支持打开摄像头！请更换浏览器或设置摄像头权限！');
 		}
 	}
 
diff --git a/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteView.vue b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteView.vue
index 73b837c..ecf2527 100644
--- a/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteView.vue
+++ b/src/views/deviceManagement/deviceTaskExecute/TheTaskExecuteView.vue
@@ -3,7 +3,7 @@
 		<el-row :gutter="20">
 			<el-col :span="18">
 				<el-steps direction="horizontal" :active="deviceStepsActive" finish-status="success">
-					<el-step v-for="(item,index) in deviceStepsList" :title="`设备${index + 1}`" :key="index" />
+					<el-step v-for="(item,index) in deviceStepsList" :title="item.deviceName" :key="index" />
 				</el-steps>
 			</el-col>
 			<el-col :span="6">
@@ -50,9 +50,9 @@
 	function getDeviceStepsData() {
 		AchieveTaskbindDevice(executeKey.value).then(res => {
 			const { code, data } = res;
-			console.log(1, 'getDeviceStepsData', data);
+			// console.log(1, 'getDeviceStepsData', data);
 			if (code === 200) {
-				console.log(2, data);
+				// console.log(2, data);
 				deviceStepsList.value = data;
 			}
 		})
diff --git a/src/views/deviceManagement/deviceTaskExecute/index.vue b/src/views/deviceManagement/deviceTaskExecute/index.vue
index 2ac2ae9..c0c3816 100644
--- a/src/views/deviceManagement/deviceTaskExecute/index.vue
+++ b/src/views/deviceManagement/deviceTaskExecute/index.vue
@@ -57,15 +57,16 @@
 			<el-table-column type="selection" width="50" align="center" />
 			<el-table-column prop="id" label="数据库编号" align="center" v-if="columns.showColumn('id')" />
 			<el-table-column prop="taskId" label="任务编号" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('taskId')" />
-			<el-table-column prop="taskName" label="任务名称" align="center" width="200" :show-overflow-tooltip="true" v-if="columns.showColumn('taskName')" />
+			<el-table-column prop="taskName" label="任务名称" align="center" min-width="120" :show-overflow-tooltip="true" v-if="columns.showColumn('taskName')" />
+			<el-table-column prop="persion" label="执行人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('persion')" />
 			<el-table-column prop="type" label="任务类型" align="center" v-if="columns.showColumn('type')">
 				<template #default="scope">
 					<dict-tag :options="options.typeOptions" :value="scope.row.type" />
 				</template>
 			</el-table-column>
-			<el-table-column prop="distributedTime" label="任务派发时间" :show-overflow-tooltip="true" v-if="columns.showColumn('distributedTime')" />
-			<el-table-column prop="startTime" label="任务开始时间" :show-overflow-tooltip="true" v-if="columns.showColumn('startTime')" />
-			<el-table-column prop="endTime" label="任务结束时间" :show-overflow-tooltip="true" v-if="columns.showColumn('endTime')" />
+			<el-table-column prop="distributedTime" label="任务派发时间" align="center" min-width="140" :show-overflow-tooltip="true" v-if="columns.showColumn('distributedTime')" />
+			<el-table-column prop="startTime" label="任务开始时间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('startTime')" />
+			<el-table-column prop="endTime" label="任务结束时间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('endTime')" />
 			<el-table-column prop="status" label="状态" align="center" v-if="columns.showColumn('status')">
 				<template #default="scope">
 					<dict-tag :options="options.statusOptions" :value="scope.row.status" />
@@ -155,7 +156,8 @@
 		delDeviceTaskExecute,
 		updateDeviceTaskExecute,
 		getDeviceTaskExecute,
-		clearDeviceTaskExecute
+		clearDeviceTaskExecute,
+		setTaskStartTime
 	} from '@/api/deviceManagement/devicetaskexecute.js'
 	import { default as TheTaskExecuteDialog } from './TheTaskExecuteDialog'
 	import importData from '@/components/ImportData'
@@ -179,7 +181,8 @@
 		{ visible: false, prop: 'id', label: '主键' },
 		{ visible: false, prop: 'taskId', label: '任务id' },
 		{ visible: true, prop: 'taskName', label: '任务名称' },
-		{ visible: true, prop: 'type', label: '任务类型（1是巡检，2是点检）' },
+		{ visible: true, prop: 'persion', label: '执行人' },
+		{ visible: true, prop: 'type', label: '任务类型' },
 		{ visible: true, prop: 'distributedTime', label: '任务派发时间' },
 		{ visible: true, prop: 'startTime', label: '任务执行——开始时间' },
 		{ visible: true, prop: 'endTime', label: '任务执行——结束时间' },
@@ -254,6 +257,7 @@
 		planType.value = row.type;
 		fkPlanId.value = row.taskId;
 		executeKey.value = row.id;
+		// setTaskStartTime(executeKey.value);
 		// open2.value = true;
 		proxy.$router.push({ name: 'TheTaskExecuteView', query: { planType: row.type, fkPlanId: row.taskId, executeKey: row.id } });
 		// proxy.$router.push({ path: '/deviceManagement/deviceTaskExecute', query: { planType: row.type, fkPlanId: row.taskId, executeKey: row.id } });
diff --git a/src/views/deviceManagement/deviceaccount/index.vue b/src/views/deviceManagement/deviceaccount/index.vue
index 352abc9..e7e9ed3 100644
--- a/src/views/deviceManagement/deviceaccount/index.vue
+++ b/src/views/deviceManagement/deviceaccount/index.vue
@@ -47,15 +47,15 @@
 					</el-row>
 
 					<el-table :data="dataList" v-loading="loading" ref="table" border header-cell-class-name="el-table-header-cell" highlight-current-row @sort-change="sortChange">
-						<el-table-column prop="deviceName" label="设备名称" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceName')" />
-						<el-table-column prop="deviceSpecification" label="设备规格" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceSpecification')" />
-						<el-table-column prop="deviceCode" label="设备编号" align="center" width="100px" v-if="columns.showColumn('deviceCode')">
+						<el-table-column prop="deviceName" label="设备名称" align="center" min-width="120px" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceName')" />
+						<el-table-column prop="deviceCode" label="设备编号" align="center" min-width="140px" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceSpecification')" />
+						<el-table-column prop="deviceCode" label="设备二维码" align="center" width="80px" v-if="columns.showColumn('deviceCode')">
 							<template #default="scope">
 								<qrcode-vue style="width: 36px;height: 36px;" :id="scope.row.deviceCode" :value="scope.row.deviceCode" @click="downloadQrCode(scope.row.deviceCode)"></qrcode-vue>
 							</template>
 						</el-table-column>
-						<el-table-column prop="workshop" label="所属车间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workshop')" />
-						<el-table-column prop="workline" label="所属产线" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('workline')" />
+						<el-table-column prop="workshop" label="所属车间" align="center" min-width="100px" :show-overflow-tooltip="true" v-if="columns.showColumn('workshop')" />
+						<el-table-column prop="workline" label="所属产线" align="center" min-width="100px" :show-overflow-tooltip="true" v-if="columns.showColumn('workline')" />
 						<el-table-column prop="deviceImage" label="设备图片" align="center" v-if="columns.showColumn('deviceImage')">
 							<template #default="scope">
 								<ImagePreview :src="scope.row.deviceImage"></ImagePreview>
@@ -79,6 +79,7 @@
 						<el-table-column prop="createdTime" label="创建时间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('createdTime')" />
 						<el-table-column prop="updatedBy" label="修改人" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedBy')" />
 						<el-table-column prop="updatedTime" label="修改时间" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('updatedTime')" />
+						<el-table-column prop="deviceSpecification" label="设备规格" align="center" :show-overflow-tooltip="true" v-if="columns.showColumn('deviceSpecification')" />
 						<el-table-column label="操作" width="240" fixed="right">
 							<template #default="scope">
 								<el-button type="success" size="small" icon="edit" title="编辑" v-hasPermi="['business:deviceaccount:edit']" @click="handleUpdate(scope.row)"></el-button>