From dcdeebfe1dfcfc7e9d55657912ce9e92897f618c Mon Sep 17 00:00:00 2001
From: suixy <2277317060@qq.com>
Date: Wed, 4 Mar 2026 15:53:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.ts              | 21 ++++----
 src/views/index-2.vue             |  8 +--
 src/views/index-3.vue             | 83 +++++++++++++++++++++++++++++++
 src/views/print/externalPrint.vue |  4 +-
 4 files changed, 101 insertions(+), 15 deletions(-)

diff --git a/src/utils/request.ts b/src/utils/request.ts
index 07a1d67..f364b19 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -27,19 +27,19 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8';
 axios.defaults.headers['clientid'] = import.meta.env.VITE_APP_CLIENT_ID;
 
 //请求地址处理，兼容使用模块化，wms分为wms1\2\3多个微服务端口
-const getUrl = () =>{
-  let routeType = router.currentRoute.value.query.routeType
-  if(!routeType) return "/wms/"
-  if(routeType == '1'){
-    return "/wms1/"
+const getUrl = () => {
+  let routeType = router.currentRoute.value.query.routeType;
+  if (!routeType) return '/wms/';
+  if (routeType == '1') {
+    return '/wms1/';
   }
-  if(routeType == '2'){
-    return "/wms2/"
+  if (routeType == '2') {
+    return '/wms2/';
   }
-  if(routeType == '3'){
-    return "/wms3/"
+  if (routeType == '3') {
+    return '/wms3/';
   }
-}
+};
 // 创建 axios 实例
 const service = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_API,
@@ -68,6 +68,7 @@ service.interceptors.request.use(
     }
     // get请求映射params参数
     if (config.method === 'get' && config.params) {
+      f;
       let url = config.url + '?' + tansParams(config.params);
       url = url.slice(0, -1);
       config.params = {};
diff --git a/src/views/index-2.vue b/src/views/index-2.vue
index 1624724..14cca2e 100644
--- a/src/views/index-2.vue
+++ b/src/views/index-2.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="content">
-    <div class="title">工厂总体看板</div>
+    <div class="title">车间生产监控</div>
 
     <div class="text text1">密炼车间</div>
     <div class="text text2">计划数：169150 <span style="font-size: 0.8vw;margin-left: 12px;">条</span></div>
@@ -45,9 +45,9 @@
       </div>
     </div>
 
-    <div class="btn btn1" @click="toDetail">查看详情</div>
-    <div class="btn btn2" @click="toDetail">查看详情</div>
-    <div class="btn btn3" @click="toDetail">查看详情</div>
+<!--    <div class="btn btn1" @click="toDetail">查看详情</div>-->
+<!--    <div class="btn btn2" @click="toDetail">查看详情</div>-->
+<!--    <div class="btn btn3" @click="toDetail">查看详情</div>-->
     <div class="btn btn4" @click="toDetail">查看详情</div>
     <div class="back">
       <el-button type="primary" @click="back" :icon="ArrowLeft" circle />
diff --git a/src/views/index-3.vue b/src/views/index-3.vue
index 31b0d9c..e82f962 100644
--- a/src/views/index-3.vue
+++ b/src/views/index-3.vue
@@ -3,6 +3,12 @@
     <div class="back">
       <el-button type="primary" @click="back" :icon="ArrowLeft" circle />
     </div>
+    <div class="topLeft">
+      硫化车间
+    </div>
+    <div class="topRight">
+      {{ time }}
+    </div>
   </div>
 </template>
 
@@ -11,12 +17,61 @@ import {
   ArrowLeft
 } from '@element-plus/icons-vue';
 
+function parseTime(time, pattern) {
+  if (arguments.length === 0 || !time) {
+    return null;
+  }
+  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}';
+  let date;
+  if (typeof time === 'object') {
+    date = time;
+  } else {
+    if (typeof time === 'string' && /^[0-9]+$/.test(time)) {
+      time = parseInt(time);
+    } else if (typeof time === 'string') {
+      time = time
+        .replace(new RegExp(/-/gm), '/')
+        .replace('T', ' ')
+        .replace(new RegExp(/\.[\d]{3}/gm), '');
+    }
+    if (typeof time === 'number' && time.toString().length === 10) {
+      time = time * 1000;
+    }
+    date = new Date(time);
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  };
+  return format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key];
+    // Note: getDay() returns 0 on Sunday
+
+    if (result.length > 0 && value < 10) {
+      value = '0' + value;
+    }
+    return value || 0;
+  });
+}
+
 const props = defineProps({
   changeType: Function
 });
 const back = () => {
   props.changeType(1);
 };
+const time = ref('');
+let times = null;
+onMounted(() => {
+  times = setInterval(() => {
+    time.value = parseTime(new Date());
+  }, 1000);
+});
 </script>
 
 <style lang="less" scoped>
@@ -36,5 +91,33 @@ const back = () => {
   left: 1%;
 }
 
+.topLeft {
+  position: absolute;
+  top: 4%;
+  left: 5%;
+  width: 15%;
+  height: 14%;
+  background-color: #131936;
+  color: #fff;
+  font-size: 2vw;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.topRight {
+  white-space: nowrap;
+  position: absolute;
+  top: 4%;
+  left: 82%;
+  width: 15%;
+  height: 4%;
+  background-color: #131936;
+  color: #fff;
+  font-size: clamp(16px, 1vw, 24px);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 </style>
 
diff --git a/src/views/print/externalPrint.vue b/src/views/print/externalPrint.vue
index 9aec111..09fa322 100644
--- a/src/views/print/externalPrint.vue
+++ b/src/views/print/externalPrint.vue
@@ -537,5 +537,7 @@ defineExpose({
     page-break-after: always;
   }
 }
-
+.floatIcon {
+ display: none;
+}
 </style>