Browse Source

基于青半mes提交成飞分支

qinhb 10 months ago
parent
commit
c267942342

+ 1 - 1
.env.production

@@ -1,4 +1,4 @@
-## 生产环境
+## 维修环境
 NODE_ENV='production'
 
 # 代理前缀

+ 2 - 2
.env.test

@@ -2,10 +2,10 @@
 NODE_ENV='test'
 
 # 代理前缀 测试环境
-VITE_APP_BASE_API = '/prod-api'
+VITE_APP_BASE_API = '/client-server'
 
 # 上传文件接口地址
-VITE_APP_UPLOAD_URL = 'http://192.168.101.4:9000'
+VITE_APP_UPLOAD_URL = ''
 
 # 开发接口地址
 VITE_APP_API_URL = 'http://192.168.101.4:8079'

+ 20 - 0
.run/docker_Dockerfile_cf.run.xml

@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="docker/Dockerfile_cf" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+    <deployment type="dockerfile">
+      <settings>
+        <option name="imageTag" value="mes-client-cf:latest" />
+        <option name="containerName" value="mes-client-cf" />
+        <option name="portBindings">
+          <list>
+            <DockerPortBindingImpl>
+              <option name="containerPort" value="80" />
+              <option name="hostPort" value="31000" />
+            </DockerPortBindingImpl>
+          </list>
+        </option>
+        <option name="sourceFilePath" value="docker/Dockerfile_cf" />
+      </settings>
+    </deployment>
+    <method v="2" />
+  </configuration>
+</component>

+ 1 - 1
docker/Dockerfile

@@ -7,7 +7,7 @@ RUN echo "server {  \
                       listen       80; \
                       client_max_body_size 100m;\
                       location   /client-server/ { \
-                        proxy_pass              http://192.168.101.4:7103/; \
+                        proxy_pass              http://192.168.101.4:7203/; \
                         proxy_redirect          off; \
                         proxy_set_header        Host client-server; \
                         proxy_set_header        X-Real-IP \$remote_addr; \

+ 1 - 1
index.html

@@ -12,7 +12,7 @@
       content="vue,element-plus,typescript,vue-element-admin,vue3-element-admin"
       name="keywords"
     />
-    <title>生产线综合管控采集平台-一体机</title>
+    <title>维修线综合管控采集平台-一体机</title>
     <link rel="stylesheet" href="/LuckExcel/pluginsCss.css" />
     <link rel="stylesheet" href="/LuckExcel/plugins.css" />
     <link rel="stylesheet" href="/LuckExcel/luckysheet.css" />

+ 1 - 1
package.json

@@ -1,5 +1,5 @@
 {
-  "name": "生产线综合管控采集平台-一体机",
+  "name": "维修线综合管控采集平台-一体机",
   "version": "1.0.0",
   "private": true,
   "type": "module",

+ 2 - 2
public/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.7"
-}
+  "version": "1.9"
+}

+ 1 - 1
src/api/process/reportBreak.ts

@@ -1,6 +1,6 @@
 import request from "@/utils/request";
 
-// 通过生产过程id物料生产信息 :包含上方基本信息和报故数量需要选择的序列号
+// 通过维修过程id物料维修信息 :包含上方基本信息和报故数量需要选择的序列号
 export function breakReportInfoById(processId: string) {
   return request({
     url: `/api/v1/process/escalationFault/getWorkDetail/${processId}`,

+ 2 - 2
src/api/process/traceability.ts

@@ -16,7 +16,7 @@ export function getTabCount(data: any) {
     data,
   });
 }
-// 生产履历列表数据分页
+// 维修履历列表数据分页
 export function getInfo(data: any) {
   return request({
     url: "/api/v1/process/info/page",
@@ -51,7 +51,7 @@ export function checkRecordInfo(data: any) {
     data,
   });
 }
-// 生产履历列表数据分页
+// 维修履历列表数据分页
 export function equitRecordInfo(data: any) {
   return request({
     url: "/api/v1/process/web/traceability/equitRecordInfo/page",

+ 1 - 1
src/api/prosteps/index.ts

@@ -13,7 +13,7 @@ export function getOpCompent(queryPath: any) {
 }
 
 /**
- * 通过生产ID获取生产过程详情
+ * 通过维修ID获取维修过程详情
  *
  * @param id
  */

+ 1 - 1
src/router/modules/process.ts

@@ -165,7 +165,7 @@ export default {
       component: () => import("@/views/traceability/index.vue"),
       name: "traceability",
       meta: {
-        title: "生产履历",
+        title: "维修履历",
         back: true,
       },
     },

+ 1 - 1
src/store/modules/processView.ts

@@ -7,7 +7,7 @@ export const useProcessStore = defineStore(
     const processInfo = ref<any>({});
     //扫码开工返回值
     const scanInfo = ref<any>({});
-    //生产履历现使用的流转卡号
+    //维修履历现使用的流转卡号
     const useSeqNo = ref<any>("");
     return { odersData, processInfo, scanInfo, useSeqNo };
   },

+ 1 - 1
src/views/pro-operation/report-break/index.vue

@@ -43,7 +43,7 @@
                   </div>
                 </div>
                 <div class="info-item">
-                  <div class="item-label">生产数量</div>
+                  <div class="item-label">维修数量</div>
                   <div class="item-value">{{ infoData?.planNum }}</div>
                 </div>
               </div>

+ 2 - 2
src/views/process/components/operate.vue

@@ -46,7 +46,7 @@ const operationObjs: { icon?: string; text: string; num?: number }[] = [
   },
   {
     icon: "shengchanlvli",
-    text: "生产履历",
+    text: "维修履历",
   },
 ];
 const scanStatus = inject("scanStatus");
@@ -59,7 +59,7 @@ const handleClick = (item: { text: string }) => {
       break;
     case "取暂存料":
       break;
-    case "生产履历":
+    case "维修履历":
       if (!store.useSeqNo) {
         ElMessage.error("请选择流转卡号");
       } else {

+ 1 - 1
src/views/repair/components/info.vue

@@ -80,7 +80,7 @@ const infoBottomData = [
     value: "created",
   },
   {
-    bond: "生产数量",
+    bond: "维修数量",
     value: "planNum",
   },
   {

+ 1 - 1
src/views/repair/main/components/operate.vue

@@ -13,7 +13,7 @@
       </div>
     </div>
     <div class="operateBox">
-      <span class="operateText">生产履历</span>
+      <span class="operateText">维修履历</span>
       <svg-icon icon-class="shengchanlvli" size="30" />
     </div>
   </div>

+ 1 - 1
src/views/traceability/index.vue

@@ -112,7 +112,7 @@
               <el-badge
                 :type="activeName == 'f1' ? 'warning' : 'primary'"
                 :value="tabCountData.traceability"
-                >生产履历
+                >维修履历
               </el-badge>
             </template>
             <Traceability />

+ 1 - 1
src/views/traceability/style/index.scss

@@ -1,4 +1,4 @@
-//生产履历表格公共样式
+//维修履历表格公共样式
 :deep(.el-collapse-item__header) {
   background-color: #f1f3f5 !important;
   padding: 0 20px;

+ 2 - 2
vite.config.ts

@@ -204,8 +204,8 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
       terserOptions: {
         compress: {
           keep_infinity: true, // 防止 Infinity 被压缩成 1/0,这可能会导致 Chrome 上的性能问题
-          drop_console: true, // 生产环境去除 console
-          drop_debugger: true, // 生产环境去除 debugger
+          drop_console: true, // 维修环境去除 console
+          drop_debugger: true, // 维修环境去除 debugger
         },
         format: {
           comments: false, // 删除注释

File diff suppressed because it is too large
+ 330 - 0
vite.config.ts.timestamp-1722827982874-144a367f273a.mjs