From 03fc78efb70fd6613b8b683c20486431b64da7c3 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 27 八月 2026 09:10:08 +0800
Subject: [PATCH] 新疆——新聚 1.除掉相关logo
---
src/views/business/inspectionTask/components/InspectionWord.vue | 2
src/api/cnas/resourceDemand/device.js | 2
src/views/business/materialOrder/customsInspectionView.vue | 2
vue.config.js | 2
src/layout/components/Navbar.vue | 5 --
src/views/business/sample/components/detail.vue | 2
src/views/business/unpass/components/unPassDialog.vue | 2
src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue | 2
src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlanDia.vue | 2
src/views/business/materialOrder/customsInspectionOrder.vue | 2
.env.staging | 2
.env.development | 2
src/api/cnas/process/ensureResults/qualitySupervise.js | 10 ++--
src/components/UpPdfStamp/index.vue | 2
src/views/login.vue | 2
src/views/business/productOrder/components/addOrder.vue | 4 +-
src/layout/components/Sidebar/Logo.vue | 4 -
src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management-dia.vue | 2
src/views/CNAS/process/demand/index.vue | 3 -
.env.production | 2
src/views/business/productOrder/components/addView.vue | 4 +-
src/workers/InspectionWorker.worker.js | 4 +-
src/views/structural/capabilityAndLaboratory/capability/index.vue | 2
23 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/.env.development b/.env.development
index cac0595..8d38372 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 涓ぉ瑁呭LIMS
+VUE_APP_TITLE = LIMS
# 寮�鍙戠幆澧冮厤缃�
ENV = 'development'
diff --git a/.env.production b/.env.production
index 393c337..b287d88 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 涓ぉ瑁呭LIMS
+VUE_APP_TITLE = LIMS
# 鐢熶骇鐜閰嶇疆
ENV = 'production'
diff --git a/.env.staging b/.env.staging
index cf1b4c7..b1ee379 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
# 椤甸潰鏍囬
-VUE_APP_TITLE = 涓ぉ瑁呭LIMS
+VUE_APP_TITLE = LIMS
BABEL_ENV = staging
diff --git a/src/api/cnas/process/ensureResults/qualitySupervise.js b/src/api/cnas/process/ensureResults/qualitySupervise.js
index 42328d0..8ab0823 100644
--- a/src/api/cnas/process/ensureResults/qualitySupervise.js
+++ b/src/api/cnas/process/ensureResults/qualitySupervise.js
@@ -133,7 +133,7 @@
params: query,
})
}
-// (瑁呭娴佺▼)鏂板鐩戠潱璁板綍涓嶇鍚堟帶鍒朵俊鎭�
+// 鏂板鐩戠潱璁板綍涓嶇鍚堟帶鍒朵俊鎭�
export function addEquipSuperviseDetailAccording(query) {
return request({
url: '/qualitySupervise/addEquipSuperviseDetailAccording',
@@ -141,7 +141,7 @@
data: query,
})
}
-// (瑁呭娴佺▼)鎵瑰噯鐩戠潱璁板綍涓嶇鍚堟帶鍒朵俊鎭�
+// 鎵瑰噯鐩戠潱璁板綍涓嶇鍚堟帶鍒朵俊鎭�
export function approverEquipSuperviseDetailAccording(query) {
return request({
url: '/qualitySupervise/approverEquipSuperviseDetailAccording',
@@ -157,7 +157,7 @@
params: query,
})
}
-// (瑁呭娴佺▼)鏂板鐩戠潱绾犳澶勭悊
+// 鏂板鐩戠潱绾犳澶勭悊
export function addEquipSuperviseDetailCorrect(query) {
return request({
url: '/qualitySupervise/addEquipSuperviseDetailCorrect',
@@ -165,7 +165,7 @@
data: query,
})
}
-// (瑁呭娴佺▼)鎵瑰噯鐩戠潱绾犳澶勭悊
+// 鎵瑰噯鐩戠潱绾犳澶勭悊
export function approveEquipSuperviseDetailCorrect(query) {
return request({
url: '/qualitySupervise/approveEquipSuperviseDetailCorrect',
@@ -173,7 +173,7 @@
data: query,
})
}
-// (瑁呭娴佺▼)鎵瑰噯鐩戠潱绾犳澶勭悊
+// 鎵瑰噯鐩戠潱绾犳澶勭悊
export function getThisYearTrainingDetailed(query) {
return request({
url: '/personTraining/getThisYearTrainingDetailed',
diff --git a/src/api/cnas/resourceDemand/device.js b/src/api/cnas/resourceDemand/device.js
index b4055f7..cf12e71 100644
--- a/src/api/cnas/resourceDemand/device.js
+++ b/src/api/cnas/resourceDemand/device.js
@@ -736,7 +736,7 @@
});
}
-//璁惧楠屾敹锛堣澶囷級瀵煎嚭
+//璁惧楠屾敹瀵煎嚭
export function exportDeviceAcceptance(query) {
return request({
url: "/deviceAcceptance/exportDeviceAcceptance",
diff --git a/src/components/UpPdfStamp/index.vue b/src/components/UpPdfStamp/index.vue
index 9e83bc3..faac13c 100644
--- a/src/components/UpPdfStamp/index.vue
+++ b/src/components/UpPdfStamp/index.vue
@@ -24,7 +24,7 @@
stampWidth: 120, // 鐩栫珷瀹藉害
stampHeight: 80, // 鐩栫珷楂樺害
stampsName: '',
- stampsList: ['涓讳换', '璐ㄩ噺璐熻矗浜�', '鎶�鏈礋璐ｄ汉', '缁煎悎瀹�', '閫氫俊', '鐢靛姏', '瑁呭', '鍌ㄨ兘', '灏勯'],
+ stampsList: ['涓讳换', '璐ㄩ噺璐熻矗浜�', '鎶�鏈礋璐ｄ汉'],
fileName: '鏂囦欢鍚�'
};
},
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 54e2258..63c0c6e 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -2,11 +2,8 @@
<div class="navbar">
<!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>-->
<!-- <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>-->
- <div class="logo">
- <img src="@/assets/logo/ZTTlogo.png" />
- </div>
<div class="center-menu">
- <span class="label">瑁呭LIMS瀹為獙瀹ょ鐞嗙郴缁�</span>
+ <span class="label">LIMS瀹為獙瀹ょ鐞嗙郴缁�</span>
</div>
<div class="right-menu">
<div class="avatar-wrapper">
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index a6ff306..7dac72a 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -14,7 +14,6 @@
</template>
<script>
-import logoImg from '@/assets/logo/ZTTlogo.png'
import variables from '@/assets/styles/variables.scss'
export default {
@@ -35,8 +34,7 @@
},
data() {
return {
- title: process.env.VUE_APP_TITLE,
- logo: logoImg
+ title: process.env.VUE_APP_TITLE
}
}
}
diff --git a/src/views/CNAS/process/demand/index.vue b/src/views/CNAS/process/demand/index.vue
index e77260c..b60e1bc 100644
--- a/src/views/CNAS/process/demand/index.vue
+++ b/src/views/CNAS/process/demand/index.vue
@@ -105,7 +105,6 @@
<table border="1" cellpadding="10" class="tables heads" style="border: 1px dashed black;width: 100%">
<tr>
<td rowspan="2">
- <img alt="" src="@/assets/logo/ZTTlogo.png" style="width: 80%;">
</td>
<td>
<p>璁板綍鍚嶇О锛氭楠屽鎵樺崟</p>
@@ -368,7 +367,7 @@
<p>妫�娴嬫満鏋勪俊鎭�</p>
</td>
<td colspan="3">
- <p>姹熻嫃涓ぉ绉戞妧鑲′唤鏈夐檺鍏徃妫�娴嬩腑蹇�</p>
+ <p>鏂拌仛</p>
</td>
</tr>
<tr>
diff --git a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management-dia.vue b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management-dia.vue
index 191c4b3..cea9b65 100644
--- a/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management-dia.vue
+++ b/src/views/CNAS/resourceDemand/facilitiesEnvironment/component/Personnel-management-dia.vue
@@ -132,7 +132,7 @@
this.searchInfo(row)
} else {
this.form.accompanyingId = this.userId
- this.form.area = '瑁呭鐢电紗璇曢獙瀹�'
+ this.form.area = '鐢电紗璇曢獙瀹�'
this.form.reason = '鍙傝瀹為獙瀹�'
this.form.accompanyingId = 64
this.form.approveId = 65
diff --git a/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue b/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
index 5c6b8da..d996ab6 100644
--- a/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
+++ b/src/views/CNAS/systemManagement/documentControl/components/ControlledFileApplication.vue
@@ -178,7 +178,7 @@
checkLoading: false,
noCheckLoading: false,
type: '',
- stampsList: ['涓讳换', '璐ㄩ噺璐熻矗浜�', '鎶�鏈礋璐ｄ汉', '缁煎悎瀹�', '閫氫俊', '鐢靛姏', '瑁呭', '鍌ㄨ兘', '灏勯'],
+ stampsList: ['涓讳换', '璐ㄩ噺璐熻矗浜�', '鎶�鏈礋璐ｄ汉', '缁煎悎瀹�'],
currentStamp: '涓讳换',
queryParams: {},
tableData: [],
diff --git a/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlanDia.vue b/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlanDia.vue
index 024ef3f..1732a8f 100644
--- a/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlanDia.vue
+++ b/src/views/CNAS/systemManagement/internalAuditManagement/components/yearPlanDia.vue
@@ -172,7 +172,7 @@
ratifyRemark: '',
examineRemark: '',
dic1: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
- planDetailList: [{ department: '瑁呭鐢电紗瀹為獙瀹�' }, { department: '閫氫俊浜у搧瀹為獙瀹�' }, { department: '鐢靛姏浜у搧瀹為獙瀹�' }, { department: '鍌ㄨ兘浜у搧瀹為獙瀹�' }, { department: '灏勯绾跨紗瀹為獙瀹�' }],
+ planDetailList: [{ department: '鐢电紗瀹為獙瀹�' }, { department: '閫氫俊浜у搧瀹為獙瀹�' }, { department: '鐢靛姏浜у搧瀹為獙瀹�' }, { department: '鍌ㄨ兘浜у搧瀹為獙瀹�' }, { department: '灏勯绾跨紗瀹為獙瀹�' }],
};
},
mounted() {
diff --git a/src/views/business/inspectionTask/components/InspectionWord.vue b/src/views/business/inspectionTask/components/InspectionWord.vue
index 755730e..89800da 100644
--- a/src/views/business/inspectionTask/components/InspectionWord.vue
+++ b/src/views/business/inspectionTask/components/InspectionWord.vue
@@ -63,7 +63,7 @@
</template>
<template v-else-if="n.v.ps != undefined && n.v.ps.value === '缁撹'">
<el-select
- v-if="(getInspectionValueType(n.i) == 2 || getInspectionValueType(n.i) == 5) && state == 1 && PROJECT == '瑁呭鐢电紗'"
+ v-if="(getInspectionValueType(n.i) == 2 || getInspectionValueType(n.i) == 5) && state == 1"
v-model="n.v.v" class="table_input"
@change="m => changeInput(m, `${item.templateId}-${n.r}-${n.c}-${n.i}`, n, 'getDataType')">
<el-option :value="1" label="鍚堟牸"></el-option>
diff --git a/src/views/business/materialOrder/customsInspectionOrder.vue b/src/views/business/materialOrder/customsInspectionOrder.vue
index c31a242..f18ef61 100644
--- a/src/views/business/materialOrder/customsInspectionOrder.vue
+++ b/src/views/business/materialOrder/customsInspectionOrder.vue
@@ -498,7 +498,7 @@
sample: null, // 鏍峰搧鍚嶇О
qtyArrived: '', // 鏍峰搧鎬绘暟
testQuantity: '', // 鎶芥鏁伴噺
- company: '涓ぉ绉戞妧瑁呭鐢电紗鏈夐檺鍏徃', // 濮旀墭鍗曚綅
+ company: '', // 濮旀墭鍗曚綅
companyId: '1233268751', // 濮旀墭鍗曚綅id
receiverDate: '', // 鎺ユ敹鏃堕棿
appointed: '', // 绾﹀畾鏃堕棿
diff --git a/src/views/business/materialOrder/customsInspectionView.vue b/src/views/business/materialOrder/customsInspectionView.vue
index 6037a09..883295e 100644
--- a/src/views/business/materialOrder/customsInspectionView.vue
+++ b/src/views/business/materialOrder/customsInspectionView.vue
@@ -479,7 +479,7 @@
sample: null, // 鏍峰搧鍚嶇О
qtyArrived: '', // 鏍峰搧鎬绘暟
testQuantity: '', // 鎶芥鏁伴噺
- company: '涓ぉ绉戞妧瑁呭鐢电紗鏈夐檺鍏徃', // 濮旀墭鍗曚綅
+ company: '', // 濮旀墭鍗曚綅
companyId: '1233268751', // 濮旀墭鍗曚綅id
receiverDate: '', // 鎺ユ敹鏃堕棿
appointed: '', // 绾﹀畾鏃堕棿
diff --git a/src/views/business/productOrder/components/addOrder.vue b/src/views/business/productOrder/components/addOrder.vue
index 91eb5b9..9729ae7 100644
--- a/src/views/business/productOrder/components/addOrder.vue
+++ b/src/views/business/productOrder/components/addOrder.vue
@@ -1430,8 +1430,8 @@
this.addObj.code = selects.code
this.addObj.phone = selects.phone
this.addObj.companyId = selects.departId
- this.addObj.production = '涓ぉ绉戞妧瑁呭鐢电紗鏈夐檺鍏徃'
- this.addObj.productionEn = 'Zhongtian Technology Industrial Wire&Cable System CO.,LTD'
+ this.addObj.production = ''
+ this.addObj.productionEn = ''
if(this.active==1){
this.selectInsOrderTemplate()
}
diff --git a/src/views/business/productOrder/components/addView.vue b/src/views/business/productOrder/components/addView.vue
index b5ba69f..d7e8fd7 100644
--- a/src/views/business/productOrder/components/addView.vue
+++ b/src/views/business/productOrder/components/addView.vue
@@ -1356,8 +1356,8 @@
this.addObj.code = selects.code
this.addObj.phone = selects.phone
this.addObj.companyId = selects.departId
- this.addObj.production = '涓ぉ绉戞妧瑁呭鐢电紗鏈夐檺鍏徃'
- this.addObj.productionEn = 'Zhongtian Technology Industrial Wire&Cable System CO.,LTD'
+ this.addObj.production = ''
+ this.addObj.productionEn = ''
if(this.active==1){
this.selectInsOrderTemplate()
}
diff --git a/src/views/business/sample/components/detail.vue b/src/views/business/sample/components/detail.vue
index c9f3eaf..41ad622 100644
--- a/src/views/business/sample/components/detail.vue
+++ b/src/views/business/sample/components/detail.vue
@@ -67,7 +67,7 @@
</el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="100"
show-overflow-tooltip></el-table-column>
- <el-table-column prop="inspectionItemSubclass" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip v-if="PROJECT=='瑁呭鐢电紗'"></el-table-column>
+ <el-table-column prop="inspectionItemSubclass" label="妫�楠岄」鍒嗙被" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="laboratory" label="瀹為獙瀹�" min-min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="unit" label="鍗曚綅" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="equipValue" label="璁惧" min-width="100" show-overflow-tooltip>
diff --git a/src/views/business/unpass/components/unPassDialog.vue b/src/views/business/unpass/components/unPassDialog.vue
index c2f06e0..16e4ef4 100644
--- a/src/views/business/unpass/components/unPassDialog.vue
+++ b/src/views/business/unpass/components/unPassDialog.vue
@@ -149,7 +149,7 @@
orderId: this.orderId
}).then(res => {
if (res.code === 200) {
- this.unPassForm.headline = `No.0005-涓ぉ瑁呭鐢电嚎-澶栬喘鍝佷笉鍚堟牸鍙嶉璇勫鍙婄籂姝ｉ闃叉祦绋�(姝ｅ紡鐗�)-${this.nickName}-${new Date().toISOString().substring(0, 10)}` // 鏍囬
+ this.unPassForm.headline = `No.0005-鐢电嚎-澶栬喘鍝佷笉鍚堟牸鍙嶉璇勫鍙婄籂姝ｉ闃叉祦绋�(姝ｅ紡鐗�)-${this.nickName}-${new Date().toISOString().substring(0, 10)}` // 鏍囬
this.unPassForm.feedbackTime = new Date().toISOString().substring(0, 10) // 鎶ユ鏃堕棿
this.unPassForm.feedbackUser = this.nickName // 鍙嶉浜�
this.unPassForm.insOrderId = res.data.insOrder.id // 璁㈠崟id
diff --git a/src/views/login.vue b/src/views/login.vue
index ad52f89..f326de1 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -5,7 +5,7 @@
</div>
<div class="rightForm">
<div class="title_big">娆㈣繋鎮ㄧ櫥褰曪紒</div>
- <div class="title_small">瑁呭LIMS瀹為獙瀹ょ鐞嗙郴缁�</div>
+ <div class="title_small">鏂拌仛瀹為獙瀹ょ鐞嗙郴缁�</div>
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
<el-form-item prop="username">
<el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="璐﹀彿">
diff --git a/src/views/structural/capabilityAndLaboratory/capability/index.vue b/src/views/structural/capabilityAndLaboratory/capability/index.vue
index 19f9318..9936cf6 100644
--- a/src/views/structural/capabilityAndLaboratory/capability/index.vue
+++ b/src/views/structural/capabilityAndLaboratory/capability/index.vue
@@ -207,7 +207,7 @@
return null
}
// if (params == 1) {
- // return '瑁呭鐢电紗璇曢獙瀹�'
+ // return '鐢电紗璇曢獙瀹�'
// } else if (params == 5) {
// return '閫氫俊浜у搧瀹為獙瀹�'
// } else if (params == 6) {
diff --git a/src/workers/InspectionWorker.worker.js b/src/workers/InspectionWorker.worker.js
index 5736162..4a60ecd 100644
--- a/src/workers/InspectionWorker.worker.js
+++ b/src/workers/InspectionWorker.worker.js
@@ -10,7 +10,7 @@
let comparisonList = [];
// 褰撳墠鏍峰搧淇℃伅
let currentSample = {};
-// 褰撳墠椤圭洰锛氭娴嬩腑蹇冦�佽澶囩數缂�
+// 褰撳墠椤圭洰锛氭娴嬩腑蹇�
let PROJECT = "";
// 濂楃
let bushing = "";
@@ -514,7 +514,7 @@
tell.length > 0 &&
typeof tell[0] == "string" &&
tell[0].includes("/") &&
- tell[0] !== "/"; // 瑁呭鐢电紗--鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
+ tell[0] !== "/"; // 鍒ゆ柇瑕佹眰鍊兼槸鍚︿负鍒嗘暟
const inspectionItemClass = currentSample.insProduct.find(
(m) => m.id == item.i
).inspectionItemClass; // 妫�楠岄」鍒嗙被
diff --git a/vue.config.js b/vue.config.js
index b465775..df96ca0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,7 @@
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
- target: `http://127.0.0.1:8001/lims`,
+ target: `http://36.213.90.123:9015/lims`,
changeOrigin: true,
pathRewrite: {
["^" + process.env.VUE_APP_BASE_API]: "",
--
Gitblit v1.9.3