From 0e4cd61cadba8a32bbb91f2ef19c7d59a48913f4 Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Mon, 26 May 2025 16:55:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                            | 2 +-
 src/layout/components/Navbar.vue           | 2 +-
 src/router/index.js                        | 2 +-
 src/utils/request.js                       | 2 +-
 src/views/material/back/component/home.vue | 8 ++++----
 vue.config.js                              | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.env.production b/.env.production
index b9822ae9..e4773b1c 100644
--- a/.env.production
+++ b/.env.production
@@ -7,4 +7,4 @@ ENV = 'production'
 # 材料站材料库存管理系统/生产环境-公司
 # VUE_APP_BASE_API = '/prod-api'
 # 材料站材料库存管理系统/宏源环境
-VUE_APP_BASE_API = '/iws/jiju-api'
+VUE_APP_BASE_API = '/iws/clz-api'
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 74e7aec8..2ea861c3 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -99,7 +99,7 @@ export default {
         //   location.href = '/index';
         // })
         console.log('🚀 ~ process.env.VUE_APP_BASE_API:', process.env.VUE_APP_BASE_API)
-        if (process.env.VUE_APP_BASE_API == '/iws/jiju-api') {
+        if (process.env.VUE_APP_BASE_API == '/iws/clz-api') {
           setTimeout(() => {
             window.location.replace(
               'http://sgwpdm.ah.sgcc.com.cn/iws/',
diff --git a/src/router/index.js b/src/router/index.js
index b7d4a19f..76f0e65c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -245,7 +245,7 @@ Router.prototype.replace = function push(location) {
 
 export default new Router({
     // mode: 'history', // 去掉url中的#
-    mode: process.env.VUE_APP_BASE_API == '/iws/jiju-api' ? 'hash' : 'history', // 宏源: hash
+    mode: process.env.VUE_APP_BASE_API == '/iws/clz-api' ? 'hash' : 'history', // 宏源: hash
     scrollBehavior: () => ({ y: 0 }),
     routes: constantRoutes
 })
diff --git a/src/utils/request.js b/src/utils/request.js
index cedb426d..9d6b83f7 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -111,7 +111,7 @@ service.interceptors.response.use(res => {
     }
     if (code === 401) {
       console.log('🚀 ~ process.env.VUE_APP_BASE_API:', process.env.VUE_APP_BASE_API)
-      if (process.env.VUE_APP_BASE_API == '/iws/jiju-api') {
+      if (process.env.VUE_APP_BASE_API == '/iws/clz-api') {
         store.dispatch('LogOut').then(() => {
         }).catch((err) => {
           console.log('🚀 ~ store.dispatch ~ err:', err)
diff --git a/src/views/material/back/component/home.vue b/src/views/material/back/component/home.vue
index e65a5a23..dd967132 100644
--- a/src/views/material/back/component/home.vue
+++ b/src/views/material/back/component/home.vue
@@ -109,9 +109,9 @@
                 </template>
             </el-table-column>
             <el-table-column label="退料班组" align="center" prop="teamName" :show-overflow-tooltip="true" width="150"/>
-            <el-table-column label="退料工程" align="center" prop="proName" :show-overflow-tooltip="true" width="150"/>
+            <el-table-column label="工程名称" align="center" prop="proName" :show-overflow-tooltip="true" width="150"/>
             <el-table-column label="退料单号" align="center" prop="code" :show-overflow-tooltip="true" width="150"/>
-            <el-table-column label="物资类型" align="center" prop="typeName" :show-overflow-tooltip="true" width="200"/>
+            <el-table-column label="工器具类型" align="center" prop="typeName" :show-overflow-tooltip="true" width="200"/>
             <el-table-column label="退料人" align="center" prop="backPerson" :show-overflow-tooltip="true" width="100"/>
             <el-table-column label="退料人电话" align="center" prop="phone" :show-overflow-tooltip="true" width="120"/>
             <el-table-column label="创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"  width="180"/>
@@ -125,12 +125,12 @@
                     <el-button type="text" style="color: #67c23a" v-if="scope.row.taskStatus == '1'">已驳回</el-button> -->
                 </template>
             </el-table-column>
-            <el-table-column label="打印状态" align="center" prop="printStatus" :show-overflow-tooltip="true"  width="100">
+            <!-- <el-table-column label="打印状态" align="center" prop="printStatus" :show-overflow-tooltip="true"  width="100">
                 <template slot-scope="scope">
                     <div v-if="scope.row.printStatus==1">已打印</div>
                     <div v-if="scope.row.printStatus==0">未打印</div>
                 </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="240" fixed="right">
                 <template slot-scope="scope">
diff --git a/vue.config.js b/vue.config.js
index 2a8a4bc6..c91ddfd5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -18,7 +18,7 @@ module.exports = {
     // 部署生产环境和开发环境下的URL。
     // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
     // 例如 https://www.bonus.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.bonus.vip/admin/，则设置 baseUrl 为 /admin/。
-    publicPath: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API == '/iws/jiju-api' ? './' : '/' : '/', // 宏源
+    publicPath: process.env.NODE_ENV === 'production' ? process.env.VUE_APP_BASE_API == '/iws/clz-api' ? './' : '/' : '/', // 宏源
     // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
     outputDir: 'dist',
     // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
@@ -36,7 +36,7 @@ module.exports = {
             // detail: https://cli.vuejs.org/config/#devserver-proxy
             [process.env.VUE_APP_BASE_API]: {
                 // target: `http://36.33.26.201:19988/prod-api`,
-                target: `http://192.168.0.96:18080`,//马
+                target: `http://192.168.1.117:18080`,//马
                 // target: `http://192.168.0.244:18580`,//测试
                 // target: `http://192.168.2.223:18080`,//山
                 // target: `http://192.168.2.23:18080`,//洪