From 5e3f6dc1253883bbdef87974cfa950171f87f9ec Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 13 八月 2025 17:55:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_7004' into dev_7004
---
.env.staging | 4 +-
.env.development | 4 +-
src/views/login.vue | 2
index.html | 4 +-
package.json | 2
.env.production | 4 +-
src/views/qualityManagement/rawMaterialInspection/index.vue | 17 +++++---
vite.config.js | 4 +-
src/router/index.js | 54 +++++++++++++-------------
9 files changed, 50 insertions(+), 45 deletions(-)
diff --git a/.env.development b/.env.development
index 042d9fb..cb09df4 100644
--- a/.env.development
+++ b/.env.development
@@ -1,8 +1,8 @@
# 椤甸潰鏍囬
-VITE_APP_TITLE = 寮樹篃姘存偿绠＄悊绯荤粺
+VITE_APP_TITLE = 涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘
# 寮�鍙戠幆澧冮厤缃�
VITE_APP_ENV = 'development'
-# 寮樹篃姘存偿绠＄悊绯荤粺/寮�鍙戠幆澧�
+# 涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘/寮�鍙戠幆澧�
VITE_APP_BASE_API = '/dev-api'
diff --git a/.env.production b/.env.production
index ce8e1b7..3076c27 100644
--- a/.env.production
+++ b/.env.production
@@ -1,10 +1,10 @@
# 椤甸潰鏍囬
-VITE_APP_TITLE = 寮樹篃姘存偿绠＄悊绯荤粺
+VITE_APP_TITLE = 涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘
# 鐢熶骇鐜閰嶇疆
VITE_APP_ENV = 'production'
-# 寮樹篃姘存偿绠＄悊绯荤粺/鐢熶骇鐜
+# 涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘/鐢熶骇鐜
VITE_APP_BASE_API = '/prod-api'
# 鏄惁鍦ㄦ墦鍖呮椂寮�鍚帇缂╋紝鏀寔 gzip 鍜� brotli
diff --git a/.env.staging b/.env.staging
index 200b47b..f446698 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,10 +1,10 @@
# 椤甸潰鏍囬
-VITE_APP_TITLE = 寮樹篃姘存偿绠＄悊绯荤粺
+VITE_APP_TITLE = 涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘
# 鐢熶骇鐜閰嶇疆
VITE_APP_ENV = 'staging'
-# 寮樹篃姘存偿绠＄悊绯荤粺/鐢熶骇鐜
+# 涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘/鐢熶骇鐜
VITE_APP_BASE_API = '/stage-api'
# 鏄惁鍦ㄦ墦鍖呮椂寮�鍚帇缂╋紝鏀寔 gzip 鍜� brotli
diff --git a/index.html b/index.html
index 386c920..187ddea 100644
--- a/index.html
+++ b/index.html
@@ -6,8 +6,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="renderer" content="webkit">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
- <link rel="icon" href="/HYSNico.ico">
- <title>寮樹篃姘存偿绠＄悊绯荤粺</title>
+ <link rel="icon" href="/favicon.ico">
+ <title>涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘</title>
<!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
<style>
html,
diff --git a/package.json b/package.json
index 8369890..d6169e8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "ruoyi",
"version": "3.8.9",
- "description": "寮樹篃姘存偿绠＄悊绯荤粺",
+ "description": "涓皬浼佷笟鏁板瓧鍖栬浆鍨嬪椁愬寘",
"author": "鑻ヤ緷",
"license": "MIT",
"type": "module",
diff --git a/src/router/index.js b/src/router/index.js
index 4b4f154..2ee88bd 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -71,33 +71,33 @@
}
]
},
- {
- path: '/equipment',
- component: Layout,
- redirect: '/equipment/iot-monitor',
- children: [
- {
- path: 'iot-monitor',
- component: () => import('@/views/equipmentManagement/iotMonitor/index.vue'),
- name: 'IoTMonitor',
- meta: { title: 'IoT鐩戞帶', icon: 'monitor', noCache: true }
- }
- ]
- },
- {
- path: '/main/MobileChat',
- component: Layout,
- redirect: '',
- hidden: true,
- children: [
- {
- path: '',
- component: () => import('@/views/chatHome/chatHomeIndex/MobileChat'),
- name: 'MobileChat',
- meta: { title: 'AI瀵硅瘽', icon: 'dashboard', affix: true}
- }
- ]
- },
+ // {
+ // path: '/equipment',
+ // component: Layout,
+ // redirect: '/equipment/iot-monitor',
+ // children: [
+ // {
+ // path: 'iot-monitor',
+ // component: () => import('@/views/equipmentManagement/iotMonitor/index.vue'),
+ // name: 'IoTMonitor',
+ // meta: { title: 'IoT鐩戞帶', icon: 'monitor', noCache: true }
+ // }
+ // ]
+ // },
+ // {
+ // path: '/main/MobileChat',
+ // component: Layout,
+ // redirect: '',
+ // hidden: true,
+ // children: [
+ // {
+ // path: '',
+ // component: () => import('@/views/chatHome/chatHomeIndex/MobileChat'),
+ // name: 'MobileChat',
+ // meta: { title: 'AI瀵硅瘽', icon: 'dashboard', affix: true}
+ // }
+ // ]
+ // },
{
path: '/user',
component: Layout,
diff --git a/src/views/login.vue b/src/views/login.vue
index a491228..a7cd923 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -181,7 +181,7 @@
<style lang='scss' scoped>
.login {
height: 100%;
- background-image: url("../assets/indexViews/HYSNView.png");
+ background-image: url("../assets/indexViews/ZQHXView.png");
background-size: cover;
position: relative;
}
diff --git a/src/views/qualityManagement/rawMaterialInspection/index.vue b/src/views/qualityManagement/rawMaterialInspection/index.vue
index 16db3eb..804fed2 100644
--- a/src/views/qualityManagement/rawMaterialInspection/index.vue
+++ b/src/views/qualityManagement/rawMaterialInspection/index.vue
@@ -168,6 +168,9 @@
clickFun: (row) => {
openForm("edit", row);
},
+ disabled: (row) => {
+ return row.inspectState;
+ }
},
{
name: "闄勪欢",
@@ -193,6 +196,9 @@
proxy.$modal.msgError("妫�楠屽憳宸插瓨鍦�");
}
},
+ disabled: (row) => {
+ return row.inspectState;
+ }
},
{
name: "涓嬭浇",
@@ -354,19 +360,18 @@
}
const downLoadFile = (row) => {
- downloadQualityInspect({id: row.id}).then(res => {
- // 鍒涘缓 blob 瀵硅薄
- const blob = new Blob([res.data], {type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'})
+ downloadQualityInspect({ id: row.id }).then((blobData) => {
+ const blob = new Blob([blobData], {
+ type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+ })
const downloadUrl = window.URL.createObjectURL(blob)
- // 鍒涘缓涓存椂 <a> 鏍囩杩涜涓嬭浇
const link = document.createElement('a')
link.href = downloadUrl
- link.download = '妫�楠屾姤鍛�.docx' // 杩欓噷鍜屽悗绔竴鑷�
+ link.download = '妫�楠屾姤鍛�.docx'
document.body.appendChild(link)
link.click()
- // 娓呯悊
document.body.removeChild(link)
window.URL.revokeObjectURL(downloadUrl)
})
diff --git a/vite.config.js b/vite.config.js
index b96c1d4..26e8edc 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -8,8 +8,8 @@
const { VITE_APP_ENV } = env;
const baseUrl =
VITE_APP_ENV == "development"
- ? "http://114.132.189.42:8092" // 寮�鍙戠幆澧冨悗绔帴鍙�
- : "http://114.132.189.42:8092"; // 鐢熶骇鐜鍚庣鎺ュ彛
+ ? "http://114.132.189.42:8089" // 寮�鍙戠幆澧冨悗绔帴鍙�
+ : "http://114.132.189.42:8089"; // 鐢熶骇鐜鍚庣鎺ュ彛
return {
// 閮ㄧ讲鐢熶骇鐜鍜屽紑鍙戠幆澧冧笅鐨刄RL銆�
--
Gitblit v1.9.3