2025年05月10日18:27:44

.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 = 'http://47.112.185.26:8001/'
-VITE_APP_URL_WEBSOCKET = 'ws://47.112.185.26:8000/api/websocket'
+# VITE_APP_URL_WEBSOCKET = 'ws://47.112.185.26:8000/api/websocket'
 
-# VITE_APP_URL = 'http://api.handcuff.zhuhaiguangdun.cn'
+VITE_APP_URL = 'http://api.handcuff.zhuhaiguangdun.cn'
-# VITE_APP_URL_WEBSOCKET = 'ws://device.handcuff.zhuhaiguangdun.cn:8000/api/websocket'
+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'

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

src/components/alarm.vue

@@ -6,7 +6,7 @@
           <div class="glow"></div>
           <div class="modal-header">
             <div class="warning-icon">⚠️</div>
-            <h2>紧急警报！</h2>
+            <h2>紧急告警！</h2>
           </div>
           <div class="alarmTable">
             <div class="alarmTable-item">

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 });
 };
 </script>
 

src/views/incidentDispose/index.vue

@@ -65,9 +65,9 @@
                 <el-form-item label="处理记录：" prop="content">
                   <el-input v-model="ruleForm.content" clearable :autosize="{ minRows: 2, maxRows: 4 }" type="textarea" :disabled="disabled" />
                 </el-form-item>
-                <!-- <el-form-item label="处理图片：" prop="images">
+                <el-form-item label="处理图片：" prop="images">
                   <Upload v-model="ruleForm.images" :disabled="disabled" />
-                </el-form-item> -->
+                </el-form-item>
               </el-form>
             </div>
           </div>

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) {
+  clearInterval(Interval);
-    IntervalFn();
+  Interval = setInterval(() => {
-  }
+    getHealthLatestData();
+  }, 60000);
 };
 
 onUnmounted(() => {

src/views/synthesizeManage/deviceManage/index.vue

@@ -101,7 +101,8 @@ const editOp = [
 const query = reactive({});
 const searchOpt = ref<FormOptionList[]>([
   { type: "input", label: "IMEI：", prop: "deviceId" },
-  { type: "input", label: "警察名称：", prop: "name" },
+  { type: "input", label: "用户名称：", prop: "name" },
+  { type: "input", label: "佩戴者：", prop: "useName" },
   {
     type: "select",
     label: "当前模式：",

src/views/synthesizeManage/setting/index.vue

@@ -73,13 +73,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="户外模式上传频率：" style="width: 100%">
+            <el-form-item label="户外模式采集/上传频率：" prop="outsideInterval" style="width: 100%">
-              <el-select placeholder="请选择上传频率">
+              <el-select v-model="ruleForm.outsideInterval" placeholder="请选择上传频率">
-                <el-option label="30s" :value="0" />
+                <el-option label="30s" :value="30" />
-                <el-option label="1分钟" :value="1" />
+                <el-option label="1分钟" :value="60" />
-                <el-option label="2分钟" :value="2" />
+                <el-option label="2分钟" :value="120" />
-                <el-option label="3分钟" :value="3" />
+                <el-option label="3分钟" :value="180" />
-                <el-option label="10分钟" :value="4" />
+                <el-option label="10分钟" :value="600" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -106,6 +106,7 @@ const ruleForm = ref<TDeviceConfig.Tres>({
   minTemp: 0,
   maxTemp: 0,
   maxHr: 0,
+  outsideInterval: 0,
   contacts: [],
 });
 const validate = (rule: any, value: any, callback: any) => {

src/views/synthesizeManage/userManage/index.vue

@@ -109,7 +109,7 @@ const tableData = ref<TAccount.IListRes[]>([]);
 const roleListData = ref<TRoleList[]>([]);
 
 const searchOpt = ref<FormOptionList[]>([
-  { type: "input", label: "用户名：", prop: "name" },
+  { type: "input", label: "用户名称：", prop: "name" },
   { type: "input", label: "警员号：", prop: "username" },
   {
     type: "select",