diff --git a/.env.development b/.env.development index 2faf684..064a624 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 # VITE_API_URL = 'http://192.168.34.221:19111' -# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 +VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 # VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 # VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://121.196.214.246/api' @@ -30,7 +30,7 @@ NODE_ENV = 'development' # 苏立信 # VITE_API_URL = 'http://101.43.164.214:11111' # 中科安信 -VITE_API_URL = 'http://8.136.222.164:8808' +# VITE_API_URL = 'http://8.136.222.164:8808' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/src/assets/images/warning.gif b/src/assets/images/warning.gif new file mode 100644 index 0000000..0d565d2 Binary files /dev/null and b/src/assets/images/warning.gif differ diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 09a23d5..d09e333 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -24,8 +24,8 @@ export const staticRouter: RouteRecordRaw[] = [ { path: "/large", name: "大屏", - component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 - // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 + // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版 + component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏 // component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页) children: [ { diff --git a/src/views/commandScreen/commandCenter/index.vue b/src/views/commandScreen/commandCenter/index.vue index eef7eb1..8fe2321 100644 --- a/src/views/commandScreen/commandCenter/index.vue +++ b/src/views/commandScreen/commandCenter/index.vue @@ -69,7 +69,7 @@ const mqttMSG = () => { const result = JSON.parse(message); openPeopleCountDialog({ index: 10, - title: "查看", + title: "人员呼叫", timeOut: 60, timeFlag: null, show: true, @@ -90,7 +90,7 @@ onMounted(() => { // setTimeout(() => { // openPeopleCountDialog({ // index: 10, - // title: "查看", + // title: "人员呼叫", // timeOut: 10, // timeFlag: null, // show: true, diff --git a/src/views/commandScreen/dialogCompnnents/data-dialog.vue b/src/views/commandScreen/dialogCompnnents/data-dialog.vue index f3d8981..929c6ef 100644 --- a/src/views/commandScreen/dialogCompnnents/data-dialog.vue +++ b/src/views/commandScreen/dialogCompnnents/data-dialog.vue @@ -57,6 +57,7 @@
+
@@ -72,7 +73,7 @@
- +
@@ -201,6 +202,17 @@ onMounted(async () => {