diff --git a/.env.development b/.env.development index 54fa899..80890df 100644 --- a/.env.development +++ b/.env.development @@ -1,11 +1,11 @@ # VITE_APP_URL = 'http://192.168.3.116:8001/' # VITE_APP_URL_WEBSOCKET = 'http://192.168.3.116:8000/api/websocket' -VITE_APP_URL = 'http://47.112.185.26:8001/' -VITE_APP_URL_WEBSOCKET = 'ws://47.112.185.26:8000/api/websocket' +# VITE_APP_URL = 'http://47.112.185.26:8001/' +# VITE_APP_URL_WEBSOCKET = 'ws://47.112.185.26:8000/api/websocket' -# VITE_APP_URL = 'http://api.handcuff.zhuhaiguangdun.cn' -# VITE_APP_URL_WEBSOCKET = 'ws://device.handcuff.zhuhaiguangdun.cn:8000/api/websocket' +VITE_APP_URL = 'http://api.handcuff.zhuhaiguangdun.cn' +VITE_APP_URL_WEBSOCKET = 'ws://device.handcuff.zhuhaiguangdun.cn:8000/api/websocket' # VITE_APP_URL = 'http://api.handcuff.youaikang.cn' # VITE_APP_URL_WEBSOCKET = 'http://device.handcuff.youaikang.cn:8000/api/websocket' diff --git a/src/api/index.d.ts b/src/api/index.d.ts index 759d60b..233ab1a 100644 --- a/src/api/index.d.ts +++ b/src/api/index.d.ts @@ -102,6 +102,7 @@ export namespace TDeviceConfig { userNumber: string minHr: number minBo: number + outsideInterval: number | string minTemp: number maxTemp: number maxHr: number diff --git a/src/components/alarm.vue b/src/components/alarm.vue index ae3c39e..ddfa914 100644 --- a/src/components/alarm.vue +++ b/src/components/alarm.vue @@ -6,7 +6,7 @@
⚠️
-

紧急警报！

+

紧急告警！

diff --git a/src/components/sectionDate.vue b/src/components/sectionDate.vue index 14fc65b..383893c 100644 --- a/src/components/sectionDate.vue +++ b/src/components/sectionDate.vue @@ -46,7 +46,7 @@ const handleWeekChange = (val) => { value.value = ""; value1.value = ""; let time = new Date(val).getTime() + 6 * 24 * 60 * 60 * 1000; - emit("change", { startDate: `${val} 00:00:00`, endDate: `${format(time, "YYYY-MM-DD")} 00:00:00`, type: radioType.value }); + emit("change", { startDate: `${val} 00:00:00`, endDate: `${format(time, "YYYY-MM-DD")} 23:59:59`, type: radioType.value }); }; const handleDateChange = (val) => { if (radioType.value === "hour") { @@ -56,7 +56,7 @@ const handleDateChange = (val) => { value.value = ""; value2.value = ""; } - emit("change", { startDate: val[0], endDate: val[1], type: radioType.value }); + emit("change", { startDate: val[0], endDate: radioType.value == "day" ? format(val[1], "YYYY-MM-DD 23:59:59") : val[1], type: radioType.value }); }; diff --git a/src/views/incidentDispose/index.vue b/src/views/incidentDispose/index.vue index c8991a4..ceef1b2 100644 --- a/src/views/incidentDispose/index.vue +++ b/src/views/incidentDispose/index.vue @@ -65,9 +65,9 @@ - +
diff --git a/src/views/monitoringCenter/index.vue b/src/views/monitoringCenter/index.vue index 14e3a96..00afe48 100644 --- a/src/views/monitoringCenter/index.vue +++ b/src/views/monitoringCenter/index.vue @@ -61,18 +61,13 @@ const getHealthLatestData = () => { }); }; -const IntervalFn = () => { - Interval = setInterval(() => { - getHealthLatestData(); - }, 60000); -}; - const handleClickDevice = (val: TDevice.IListRes) => { deviceInfo.value = val; getHealthLatestData(); - if (!Interval) { - IntervalFn(); - } + clearInterval(Interval); + Interval = setInterval(() => { + getHealthLatestData(); + }, 60000); }; onUnmounted(() => { diff --git a/src/views/synthesizeManage/deviceManage/index.vue b/src/views/synthesizeManage/deviceManage/index.vue index 74002d2..e572eb9 100644 --- a/src/views/synthesizeManage/deviceManage/index.vue +++ b/src/views/synthesizeManage/deviceManage/index.vue @@ -101,7 +101,8 @@ const editOp = [ const query = reactive({}); const searchOpt = ref([ { type: "input", label: "IMEI：", prop: "deviceId" }, - { type: "input", label: "警察名称：", prop: "name" }, + { type: "input", label: "用户名称：", prop: "name" }, + { type: "input", label: "佩戴者：", prop: "useName" }, { type: "select", label: "当前模式：", diff --git a/src/views/synthesizeManage/setting/index.vue b/src/views/synthesizeManage/setting/index.vue index 988a4bb..d418cdf 100644 --- a/src/views/synthesizeManage/setting/index.vue +++ b/src/views/synthesizeManage/setting/index.vue @@ -73,13 +73,13 @@ - - - - - - - + + + + + + + @@ -106,6 +106,7 @@ const ruleForm = ref({ minTemp: 0, maxTemp: 0, maxHr: 0, + outsideInterval: 0, contacts: [], }); const validate = (rule: any, value: any, callback: any) => { diff --git a/src/views/synthesizeManage/userManage/index.vue b/src/views/synthesizeManage/userManage/index.vue index 659ecee..aa2f735 100644 --- a/src/views/synthesizeManage/userManage/index.vue +++ b/src/views/synthesizeManage/userManage/index.vue @@ -109,7 +109,7 @@ const tableData = ref([]); const roleListData = ref([]); const searchOpt = ref([ - { type: "input", label: "用户名：", prop: "name" }, + { type: "input", label: "用户名称：", prop: "name" }, { type: "input", label: "警员号：", prop: "username" }, { type: "select",