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')" />
-
+
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 @@
-
+
-
+
-
+
-
+
@@ -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 @@
-
+
@@ -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 @@
-
+
+
-
-
-
+
+
+
@@ -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 @@
-
-
-
+
+
+
-
-
+
+
@@ -79,6 +79,7 @@
+