From e5cdf3af17609b49138cec3e8fb200752365f651 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 01 十一月 2024 14:58:12 +0800
Subject: [PATCH] 1
---
src/views/console/base/Shiftsystem.vue | 2
src/views/console/basic-data/material-warehousing-data/Material-warehousing-data.vue | 14
vue.config.js | 6
src/views/home/widgets/components/mdcEquipmentRun.vue | 2
src/views/console/product-process/process-route/addWorking.vue | 2
src/views/mdc/configuration.vue | 16
src/utils/tool.js | 2
src/api/model/workingCondition.js | 10
src/views/console/basic-data/tpm-data.vue | 28
src/views/console/product-process/addRoute.vue | 2
src/views/configuration/custom/planSettings.vue | 2
src/views/mdc/state-feedback.vue | 14
src/views/master/person/main/personPerson.vue | 18
src/views/tpm/machine/Dialog.vue | 14
src/views/mdc/components/ShiftAlarm.vue | 2
src/views/console/base/Dialog.vue | 4
src/views/master/frock/tray-deposit/index.vue | 18
src/views/mdc/time-analysis.vue | 20
src/views/home/widgets/components/mdcDeviceStatus.vue | 4
src/views/mdc/configComp/Status.vue | 12
src/views/console/product-process/process-route/add-craft-version.vue | 8
src/api/model/workstation.js | 18
src/api/model/machineManagement.js | 2
src/views/console/basic-data/material-warehousing-data/material-infoComp2.vue | 10
src/views/mdc/components/Time.vue | 4
src/views/mdc/components/recordChartsByDate.vue | 2
src/views/console/product-process/process-route/add-craft.vue | 10
src/views/mdc/components/TimeAlarm.vue | 8
src/views/mdc/MYTree.vue | 2
src/views/mdc/add-feedback.vue | 6
src/views/console/basic-data/addProduct.vue | 4
src/views/console/basic-data/work-process.vue | 24
src/views/mdc/station-live.vue | 22
src/views/console/base/Add.vue | 6
src/views/console/workstation/index.vue | 14
src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue | 16
src/views/mdc/alarm-statistics.vue | 6
src/views/notification/business.vue | 21 -
src/views/console/tooling/Tray.vue | 30
src/views/console/tooling/fixture.vue | 38 +-
src/views/dnc/craft/document/File.vue | 4
src/views/mdc/add-station-status.vue | 10
src/views/console/basic-data/material-warehousing-data/material-storage.vue | 18
src/views/console/product-process/process-route.vue | 10
src/views/master/person/main/department.vue | 4
src/views/console/system/addUser.vue | 2
src/views/mdc/output-statistics.vue | 6
src/views/mdc/components/recordChartsByWorkstation.vue | 2
src/views/console/soam/oss-system.vue | 14
src/views/master/person/main/save.vue | 6
src/views/master/person/main/personDepartment.vue | 10
src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue | 24
src/api/model/time.js | 8
src/views/mdc/efficiency-analysis.vue | 13
src/views/console/base/CalenderTab.vue | 12
src/views/console/tooling/tray-fixturePreview.vue | 14
src/views/mdc/configComp/Board.vue | 2
src/views/console/basic-data/tpm-data1.vue | 2
src/views/console/workstation/CollTable.vue | 2
src/views/console/product-process/process-route/workmanship.vue | 12
src/views/mdc/processParam/index.vue | 10
src/views/console/basic-data/tpmComp1.vue | 22
src/views/dnc/setting/FTP.vue | 4
src/views/tpm/MachineGroup.vue | 8
src/views/mdc/processParam/TimeLine.vue | 2
src/views/console/basic-data/product.vue | 26
src/views/console/basic-data/supplier-info.vue | 6
src/views/console/bom-list/index.vue | 2
src/views/mdc/realtime-status/index.vue | 149 ++------
src/views/mdc/status-record.vue | 6
src/views/tpm/MachineTab.vue | 8
src/views/console/product-process/process-route/addWorkmanship.vue | 10
src/views/home/widgets/components/mdcRunning.vue | 2
src/views/mdc/components/Shift.vue | 4
src/views/console/workstation/CollDialog.vue | 4
src/views/console/workstation/Dialog.vue | 4
src/views/console/basic-data/tpmComp2.vue | 38 +-
src/api/model/calender.js | 6
src/views/dnc/file/admin/index.vue | 2
src/views/console/basic-data/addSupplierInfo.vue | 2
80 files changed, 420 insertions(+), 513 deletions(-)
diff --git a/src/api/model/calender.js b/src/api/model/calender.js
index f6f8002..7bc401c 100644
--- a/src/api/model/calender.js
+++ b/src/api/model/calender.js
@@ -9,21 +9,21 @@
export default {
getList: {
- url: `${config.API_URL}/blade-cps/calendar/page`,
+ url: `${config.API_URL}/smis/calendar/page`,
name: "鑾峰彇鏃ュ巻鍒楄〃",
post: async function (data, params) {
return await http.post(this.url, data, { params });
},
},
getShiftsystemList: {
- url: `${config.API_URL}/blade-cps/shift/page`,
+ url: `${config.API_URL}/smis/shift/page`,
name: "鑾峰彇鐝埗鍒楄〃",
get: async function (data) {
return await http.post(this.url, data, { params: { current: data.current, size: data.size } });
},
},
getShiftsystemInfo: {
- url: `${config.API_URL}/blade-cps/shift/`,
+ url: `${config.API_URL}/smis/shift/`,
name: "鑾峰彇鐝埗淇℃伅",
get: async function ({ id }) {
return await http.get(`${this.url}${id}`, {}, {});
diff --git a/src/api/model/machineManagement.js b/src/api/model/machineManagement.js
index bac616c..2f8724e 100644
--- a/src/api/model/machineManagement.js
+++ b/src/api/model/machineManagement.js
@@ -9,7 +9,7 @@
export default {
getList: {
- url: `${config.API_URL}/blade-cps/machine/page`,
+ url: `${config.API_URL}/smis/machine/page`,
name: "鑾峰彇宸ヤ綅鍒楄〃",
get: async function (params) {
return await http.post(this.url, { ...params }, { params: { current: params.current, size: params.size } });
diff --git a/src/api/model/time.js b/src/api/model/time.js
index e6dd431..68ecb06 100644
--- a/src/api/model/time.js
+++ b/src/api/model/time.js
@@ -9,7 +9,7 @@
export default {
getList: {
- url: `${config.API_URL}/blade-cps/shift-off-day/page`,
+ url: `${config.API_URL}/smis/shift-off-day/page`,
name: "鑾峰彇浼戞伅鏃ュ垪琛�",
get: async function(params){
return await http.post(this.url, params, {params});
@@ -19,7 +19,7 @@
}
},
insert: {
- url: `${config.API_URL}/blade-cps/shift-off-day/insert`,
+ url: `${config.API_URL}/smis/shift-off-day/insert`,
name: "娣诲姞浼戞伅鏃�",
post: async function(params){
return await http.post(this.url, params);
@@ -27,7 +27,7 @@
},
update: {
- url: `${config.API_URL}/blade-cps/shift-off-day/update`,
+ url: `${config.API_URL}/smis/shift-off-day/update`,
name: "鏇存柊浼戞伅鏃�",
post: async function(params){
return await http.put(this.url, params);
@@ -35,7 +35,7 @@
},
remove: {
- url: `${config.API_URL}/blade-cps/shift-off-day/remove`,
+ url: `${config.API_URL}/smis/shift-off-day/remove`,
name: "鍒犻櫎浼戞伅鏃�",
delete: async function(params){
return await http.delete(this.url, {},{data: params});
diff --git a/src/api/model/workingCondition.js b/src/api/model/workingCondition.js
index 3a34dfe..c9ddd06 100644
--- a/src/api/model/workingCondition.js
+++ b/src/api/model/workingCondition.js
@@ -9,28 +9,28 @@
export default {
getList: {
- url: `${config.API_URL}/blade-cps/workstation-wcs/listWcsSetting`,
+ url: `${config.API_URL}/smis/workstation-wcs/listWcsSetting`,
name: "鑾峰彇宸ヤ綅閲囬泦鍒楄〃",
get: async function(params){
return await http.get(this.url, params);
},
},
getwcsUsageList: {
- url: `${config.API_URL}/blade-cps/workstation-wcs-usage/list`,
+ url: `${config.API_URL}/smis/workstation-wcs-usage/list`,
name: "鑾峰彇鏁版嵁鏍囩",
get: async function(params){
return await http.get(this.url, params);
},
},
save: {
- url: `${config.API_URL}/blade-cps/workstation-wcs/save/setting`,
+ url: `${config.API_URL}/smis/workstation-wcs/save/setting`,
name: "淇濆瓨",
post: async function(params){
return await http.post(this.url, params);
},
},
update: {
- url: `${config.API_URL}/blade-cps/workstation-wcs/update`,
+ url: `${config.API_URL}/smis/workstation-wcs/update`,
name: "鏇存柊",
post: async function(params){
return await http.put(this.url, params);
@@ -38,7 +38,7 @@
},
del: {
- url: `${config.API_URL}/blade-cps/workstation-wcs`,
+ url: `${config.API_URL}/smis/workstation-wcs`,
name: "鍒犻櫎",
post: async function(params,data){
return await http.delete(this.url, params,{data});
diff --git a/src/api/model/workstation.js b/src/api/model/workstation.js
index bcc8bd9..1b4efda 100644
--- a/src/api/model/workstation.js
+++ b/src/api/model/workstation.js
@@ -9,7 +9,7 @@
export default {
getList: {
- url: `${config.API_URL}/blade-cps/workstation/page`,
+ url: `${config.API_URL}/smis/workstation/page`,
name: "鑾峰彇宸ヤ綅鍒楄〃",
get: async function (params) {
return await http.get(this.url, params);
@@ -19,28 +19,28 @@
}
},
getWorkstationGroup: {
- url: `${config.API_URL}/blade-cps/group/list?groupType=group_workstation&groupCategory=1`,
+ url: `${config.API_URL}/smis/group/list?groupType=group_workstation&groupCategory=1`,
name: "鑾峰彇宸ヤ綅缁勬爲",
get: async function (params) {
return await http.get(this.url, params);
}
},
groupWorkstationType: {
- url: `${config.API_URL}/blade-cps/group/groupWorkstation/type`,
+ url: `${config.API_URL}/smis/group/groupWorkstation/type`,
name: "鑾峰彇鐘舵�佸弽棣堟爲",
post: async function (params) {
return await http.post(this.url, params);
}
},
calendarList: {
- url: `${config.API_URL}/blade-cps/calendar/list`,
+ url: `${config.API_URL}/smis/calendar/list`,
name: "鑾峰彇鐢熶骇鏃ュ巻",
get: async function (params) {
return await http.get(this.url, params);
}
},
saveWorkstationGroup: {
- url: `${config.API_URL}/blade-cps/group`,
+ url: `${config.API_URL}/smis/group`,
name: "淇濆瓨宸ヤ綅缁�",
put: async function (params) {
return await http.put(this.url, params);
@@ -50,28 +50,28 @@
},
},
deleteWorkGroup: {
- url: `${config.API_URL}/blade-cps/workstation/deleteGroup`,
+ url: `${config.API_URL}/smis/workstation/deleteGroup`,
name: "鍒犻櫎宸ヤ綅缁�",
delete: async function (params) {
return await http.delete(this.url, {}, { params });
}
},
deleteWork: {
- url: `${config.API_URL}/blade-cps/workstation`,
+ url: `${config.API_URL}/smis/workstation`,
name: "鍒犻櫎宸ヤ綅",
delete: async function (params) {
return await http.delete(this.url, params);
}
},
add: {
- url: `${config.API_URL}/blade-cps/workstation/submit`,
+ url: `${config.API_URL}/smis/workstation/submit`,
name: "娣诲姞宸ヤ綅",
post: async function (params) {
return await http.post(this.url, params);
},
},
getlistnoband: {
- url: `${config.API_URL}/blade-cps/machine/list-no-band`,
+ url: `${config.API_URL}/smis/machine/list-no-band`,
name: "鑾峰彇鏈粦瀹氬伐浣�",
get: async function (params) {
return await http.get(this.url, params);
diff --git a/src/utils/tool.js b/src/utils/tool.js
index cdd7a0e..dcb9862 100644
--- a/src/utils/tool.js
+++ b/src/utils/tool.js
@@ -2,7 +2,7 @@
* @Descripttion: 宸ュ叿闆�
* @version: 1.2
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-10-23 13:46:35
+ * @LastEditTime: 2024-11-01 14:57:42
*/
import CryptoJS from 'crypto-js';
diff --git a/src/views/configuration/custom/planSettings.vue b/src/views/configuration/custom/planSettings.vue
index a1673a6..b035699 100644
--- a/src/views/configuration/custom/planSettings.vue
+++ b/src/views/configuration/custom/planSettings.vue
@@ -151,7 +151,7 @@
},
methods: {
gitProduct() {
- this.$HTTP.get(`/api/blade-cps/product-type/list`).then(res=> {
+ this.$HTTP.get(`/api/smis/product-type/list`).then(res=> {
if(res.code == 200) {
this.productList= res.data;
}
diff --git a/src/views/console/base/Add.vue b/src/views/console/base/Add.vue
index 8027a4e..8d02c26 100644
--- a/src/views/console/base/Add.vue
+++ b/src/views/console/base/Add.vue
@@ -225,7 +225,7 @@
this.form.date[0] = moment().format('YYYY-MM-DD')
}
// console.log(this.months)
- this.$HTTP.post('/api/blade-cps/shift-off-day/list', {
+ this.$HTTP.post('/api/smis/shift-off-day/list', {
year: currentYear,
startOffDay: `${currentYear}-01-01`,
endOffDay: `${currentYear}-12-31`
@@ -566,7 +566,7 @@
status: 1,
dateDTOList: list
}
- this.$HTTP.post('/api/blade-cps/calendar', data).then(res => {
+ this.$HTTP.post('/api/smis/calendar', data).then(res => {
if (res.code === 200) {
this.$emit('success')
} else {
@@ -578,7 +578,7 @@
id: this.drawerInfo.id,
dateDTOList: list
}
- this.$HTTP.put('/api/blade-cps/calendar', data).then(res => {
+ this.$HTTP.put('/api/smis/calendar', data).then(res => {
if (res.code === 200) {
this.$emit('success')
} else {
diff --git a/src/views/console/base/CalenderTab.vue b/src/views/console/base/CalenderTab.vue
index 95fc076..b9dba3f 100644
--- a/src/views/console/base/CalenderTab.vue
+++ b/src/views/console/base/CalenderTab.vue
@@ -119,7 +119,7 @@
this.drawerInfo = this.selectInfo
},
relationWork() {
- this.$HTTP.post('/api/blade-cps/group/groupWorkstation', { groupCategory: 1, groupType: 'group_workstation' }).then(res => {
+ this.$HTTP.post('/api/smis/group/groupWorkstation', { groupCategory: 1, groupType: 'group_workstation' }).then(res => {
if (res.code === 200) {
this.raworkVisible = true
this.workStations = this.formatData(res.data)
@@ -183,7 +183,7 @@
},
save(workstationIdList) {
console.log(workstationIdList, this.selectInfo)
- this.$HTTP.post('/api/blade-cps/calendar/associate-workstation', {
+ this.$HTTP.post('/api/smis/calendar/associate-workstation', {
calendarCode: this.selectInfo.code,
workstationIdList
}).then(res => {
@@ -199,7 +199,7 @@
// console.log(day)
},
init() {
- this.$HTTP.post('/api/blade-cps/shift/list', { statusList: [1] }).then(res => {
+ this.$HTTP.post('/api/smis/shift/list', { statusList: [1] }).then(res => {
if (res.code === 200) {
this.shiftList = res.data
}
@@ -208,7 +208,7 @@
select(row) {
this.months = []
- this.$HTTP.get(`/api/blade-cps/calendar/${row.id}`).then(res => {
+ this.$HTTP.get(`/api/smis/calendar/${row.id}`).then(res => {
if (res.code === 200) {
// console.log(res.data)
this.setDay(res.data)
@@ -228,7 +228,7 @@
})
},
table_del() {
- this.$HTTP.delete(`/api/blade-cps/calendar/${this.selectInfo.id}`).then(res => {
+ this.$HTTP.delete(`/api/smis/calendar/${this.selectInfo.id}`).then(res => {
if (res.code == 200) {
this.$message.success("鎿嶄綔鎴愬姛");
this.load(true)
@@ -266,7 +266,7 @@
},
setDay(data) {
let year = data.year
- this.$HTTP.post('/api/blade-cps/shift-off-day/list', {
+ this.$HTTP.post('/api/smis/shift-off-day/list', {
year: year,
startOffDay: `${year}-01-01`,
endOffDay: `${year}-12-31`
diff --git a/src/views/console/base/Dialog.vue b/src/views/console/base/Dialog.vue
index bc0adff..502d7cb 100644
--- a/src/views/console/base/Dialog.vue
+++ b/src/views/console/base/Dialog.vue
@@ -295,11 +295,11 @@
let res
try {
if (this.form.id) {
- res = await this.$HTTP.put('/api/blade-cps/shift', data).catch(() => {
+ res = await this.$HTTP.put('/api/smis/shift', data).catch(() => {
throw new Error()
})
} else {
- res = await this.$HTTP.post('/api/blade-cps/shift', data).catch(() => {
+ res = await this.$HTTP.post('/api/smis/shift', data).catch(() => {
throw new Error()
})
}
diff --git a/src/views/console/base/Shiftsystem.vue b/src/views/console/base/Shiftsystem.vue
index 2e9804a..9228bbd 100644
--- a/src/views/console/base/Shiftsystem.vue
+++ b/src/views/console/base/Shiftsystem.vue
@@ -275,7 +275,7 @@
this.$confirm(`纭畾鍒犻櫎鏁版嵁?`, '', {
type: 'warning'
}).then(() => {
- this.$HTTP.delete(`/api/blade-cps/shift/${this.info.id}`).then(res => {
+ this.$HTTP.delete(`/api/smis/shift/${this.info.id}`).then(res => {
if (res.code === 200) {
this.$refs.table.reload(this.params)
}
diff --git a/src/views/console/basic-data/addProduct.vue b/src/views/console/basic-data/addProduct.vue
index be471ae..97c98c2 100644
--- a/src/views/console/basic-data/addProduct.vue
+++ b/src/views/console/basic-data/addProduct.vue
@@ -122,7 +122,7 @@
},
methods: {
showParentData() {
- this.$HTTP.get("/api/blade-cps/product/tree?status=1").then(res=> {
+ this.$HTTP.get("/api/smis/product/tree?status=1").then(res=> {
if(res.code == 200) {
this.parentData = res.data;
}
@@ -153,7 +153,7 @@
var obj = Object.assign({},this.addDictForm);
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
- this.$HTTP.post("/api/blade-cps/product/insert",obj).then(res=> {
+ this.$HTTP.post("/api/smis/product/insert",obj).then(res=> {
if(res.code == 200) {
this.$emit('success', this.addDictForm, this.mode);
this.visible = false;
diff --git a/src/views/console/basic-data/addSupplierInfo.vue b/src/views/console/basic-data/addSupplierInfo.vue
index 1a724ca..28bf74d 100644
--- a/src/views/console/basic-data/addSupplierInfo.vue
+++ b/src/views/console/basic-data/addSupplierInfo.vue
@@ -85,7 +85,7 @@
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
- this.$HTTP.post("/api/blade-cps/supplier/save",obj).then(res=> {
+ this.$HTTP.post("/api/smis/supplier/save",obj).then(res=> {
this.isSaveing = false;
if(res.code == 200) {
this.$emit('success', this.form, this.mode);
diff --git a/src/views/console/basic-data/material-warehousing-data/Material-warehousing-data.vue b/src/views/console/basic-data/material-warehousing-data/Material-warehousing-data.vue
index 681f941..1351c95 100644
--- a/src/views/console/basic-data/material-warehousing-data/Material-warehousing-data.vue
+++ b/src/views/console/basic-data/material-warehousing-data/Material-warehousing-data.vue
@@ -9,15 +9,15 @@
<el-card shadow="never" style="height: 100%;" body-style="height: 100%">
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="鍑哄簱绫诲瀷" name="1">
- <MaterialWarehousingDataCompVue name="鍑哄簱" tableUrl="/api/blade-cps/stock-out-type/page"
- insertUrl="/api/blade-cps/stock-out-type/insert"
- removeUrl="/api/blade-cps/stock-out-type/remove"
- updateUrl="/api/blade-cps/stock-out-type/update" />
+ <MaterialWarehousingDataCompVue name="鍑哄簱" tableUrl="/api/smis/stock-out-type/page"
+ insertUrl="/api/smis/stock-out-type/insert"
+ removeUrl="/api/smis/stock-out-type/remove"
+ updateUrl="/api/smis/stock-out-type/update" />
</el-tab-pane>
<el-tab-pane label="鍏ュ簱绫诲瀷" name="2">
- <MaterialWarehousingDataCompVue name="鍏ュ簱" tableUrl="/api/blade-cps/stock-in-type/page"
- insertUrl="/api/blade-cps/stock-in-type/insert" removeUrl="/api/blade-cps/stock-in-type/remove"
- updateUrl="/api/blade-cps/stock-in-type/update" />
+ <MaterialWarehousingDataCompVue name="鍏ュ簱" tableUrl="/api/smis/stock-in-type/page"
+ insertUrl="/api/smis/stock-in-type/insert" removeUrl="/api/smis/stock-in-type/remove"
+ updateUrl="/api/smis/stock-in-type/update" />
</el-tab-pane>
</el-tabs>
</el-card>
diff --git a/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue b/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
index 4d433aa..15a456b 100644
--- a/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
+++ b/src/views/console/basic-data/material-warehousing-data/material-infoComp1.vue
@@ -169,8 +169,8 @@
},
data() {
return {
- uploadUrl: "/api/blade-cps/material/import-material",
- exportUrl: "/api/blade-cps/material/export-template",
+ uploadUrl: "/api/smis/material/import-material",
+ exportUrl: "/api/smis/material/export-template",
options: {
status: [
{
@@ -196,7 +196,7 @@
let params = {
...data
}
- return await this.$HTTP.get(`/api/blade-cps/material/page`, params).then(res => {
+ return await this.$HTTP.get(`/api/smis/material/page`, params).then(res => {
return res
})
}
@@ -224,7 +224,7 @@
},
methods: {
init() {
- this.$HTTP.get(`/api/blade-cps/material-type/list`).then(res => {
+ this.$HTTP.get(`/api/smis/material-type/list`).then(res => {
this.options.typeId = res.data.map(item => ({
label: item.name,
value: item.id
@@ -254,7 +254,7 @@
}
},
getExport() {
- this.$HTTP.post(`/api/blade-cps/material/export-material`, { ...this.params }).then(res => {
+ this.$HTTP.post(`/api/smis/material/export-material`, { ...this.params }).then(res => {
if (res.code == 200) {
window.open(res.data.link);
}
@@ -264,7 +264,7 @@
},
table_del(rowArr, type) {
- this.$HTTP.delete(`/api/blade-cps/material/delete-material?ids=${rowArr.map(v => v.id).toString()}&type=${type}`).then(res => {
+ this.$HTTP.delete(`/api/smis/material/delete-material?ids=${rowArr.map(v => v.id).toString()}&type=${type}`).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛");
this.$refs.table.reload(this.params)
@@ -275,14 +275,14 @@
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
if (this.form.id) {
- this.$HTTP.put(`/api/blade-cps/material/update-material`, {
+ this.$HTTP.put(`/api/smis/material/update-material`, {
...this.form
}).then(res => {
this.drawer = false
this.$refs.table.reload(this.params)
})
} else {
- this.$HTTP.post(`/api/blade-cps/material/create-material`, {
+ this.$HTTP.post(`/api/smis/material/create-material`, {
...this.form
}).then(res => {
this.drawer = false
diff --git a/src/views/console/basic-data/material-warehousing-data/material-infoComp2.vue b/src/views/console/basic-data/material-warehousing-data/material-infoComp2.vue
index 9376367..a275e84 100644
--- a/src/views/console/basic-data/material-warehousing-data/material-infoComp2.vue
+++ b/src/views/console/basic-data/material-warehousing-data/material-infoComp2.vue
@@ -123,7 +123,7 @@
let params = {
...data
}
- return await this.$HTTP.get(`/api/blade-cps/material-type/page`, params).then(res => {
+ return await this.$HTTP.get(`/api/smis/material-type/page`, params).then(res => {
return res
})
}
@@ -152,7 +152,7 @@
},
methods: {
init() {
- this.$HTTP.get(`/api/blade-cps/material-type/list`).then(res => {
+ this.$HTTP.get(`/api/smis/material-type/list`).then(res => {
this.options.typeId = res.data.map(item => ({
label: item.name,
value: item.id
@@ -190,7 +190,7 @@
},
table_del(rowArr, type) {
- this.$HTTP.delete(`/api/blade-cps/material-type/delete-material-type?ids=${rowArr.map(v => v.id).toString()}&type=${type}`).then(res => {
+ this.$HTTP.delete(`/api/smis/material-type/delete-material-type?ids=${rowArr.map(v => v.id).toString()}&type=${type}`).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛");
this.$refs.table.reload(this.params)
@@ -201,14 +201,14 @@
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
if (this.form.id) {
- this.$HTTP.put(`/api/blade-cps/material-type/update-material-type`, {
+ this.$HTTP.put(`/api/smis/material-type/update-material-type`, {
...this.form
}).then(res => {
this.drawer = false
this.$refs.table.reload(this.params)
})
} else {
- this.$HTTP.post(`/api/blade-cps/material-type/create-material-type`, {
+ this.$HTTP.post(`/api/smis/material-type/create-material-type`, {
...this.form
}).then(res => {
this.drawer = false
diff --git a/src/views/console/basic-data/material-warehousing-data/material-storage.vue b/src/views/console/basic-data/material-warehousing-data/material-storage.vue
index 2352008..c75a534 100644
--- a/src/views/console/basic-data/material-warehousing-data/material-storage.vue
+++ b/src/views/console/basic-data/material-warehousing-data/material-storage.vue
@@ -132,8 +132,8 @@
label: 'name',
disabled: 'isArea'
},
- exportUrl: '/api/blade-cps/material-storage/excel/template',
- uploadUrl: '/api/blade-cps/material-storage/excel/import',
+ exportUrl: '/api/smis/material-storage/excel/template',
+ uploadUrl: '/api/smis/material-storage/excel/import',
treeData: [],
selectNode: {},
apiObj: {
@@ -142,7 +142,7 @@
...data,
wareId: this.selectNode.id
}
- return await this.$HTTP.post(`/api/blade-cps/material-storage/page`, {}, { params }).then(res => {
+ return await this.$HTTP.post(`/api/smis/material-storage/page`, {}, { params }).then(res => {
return res
})
}
@@ -160,10 +160,10 @@
},
methods: {
init() {
- this.$HTTP.get(`/api/blade-cps/tray-storage/tree`).then(res => {
+ this.$HTTP.get(`/api/smis/tray-storage/tree`).then(res => {
this.treeData = res.data
})
- this.$HTTP.get(`/api/blade-cps/material-type/list`).then(res => {
+ this.$HTTP.get(`/api/smis/material-type/list`).then(res => {
this.options.typeId = res.data.map(item => ({
label: item.name,
value: item.id
@@ -181,12 +181,12 @@
this.queryInfo(node.id)
},
queryInfo(id) {
- this.$HTTP.get(`/api/blade-cps/warehouse-station/get/${id}`).then(res => {
+ this.$HTTP.get(`/api/smis/warehouse-station/get/${id}`).then(res => {
this.selectNode = res.data
})
},
table_add() {
- this.$HTTP.get(`/api/blade-cps/material-storage/material/not-bind`).then(res => {
+ this.$HTTP.get(`/api/smis/material-storage/material/not-bind`).then(res => {
if (res.data?.length > 0) {
this.todoList = res.data
this.dialogVisible = true
@@ -196,14 +196,14 @@
})
},
add() {
- this.$HTTP.post(`/api/blade-cps/material-storage`, { warehouseStationId: this.selectNode.id, materialIds: [this.materialIds] }).then(res => {
+ this.$HTTP.post(`/api/smis/material-storage`, { warehouseStationId: this.selectNode.id, materialIds: [this.materialIds] }).then(res => {
this.$message.success("鎿嶄綔鎴愬姛")
this.dialogVisible = false
this.$refs.table.reload()
})
},
table_del(ids) {
- this.$HTTP.delete(`/api/blade-cps/material-storage`, ids.map(v => v.id)).then(res => {
+ this.$HTTP.delete(`/api/smis/material-storage`, ids.map(v => v.id)).then(res => {
this.$message.success("鎿嶄綔鎴愬姛")
this.$refs.table.reload()
})
diff --git a/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue b/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue
index ca37deb..2b604f4 100644
--- a/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue
+++ b/src/views/console/basic-data/material-warehousing-data/reservoir-location/reservoir-location.vue
@@ -150,8 +150,8 @@
{ required: true, message: '蹇呭～' }
],
},
- exportUrl: '/api/blade-cps/warehouse-station/export-template',
- uploadUrl: '/api/blade-cps/warehouse-station/import-station',
+ exportUrl: '/api/smis/warehouse-station/export-template',
+ uploadUrl: '/api/smis/warehouse-station/import-station',
selection: [],
apiObj: {
get: async (data) => {
@@ -159,7 +159,7 @@
...data,
...this.params,
}
- return await this.$HTTP.get(`/api/blade-cps/warehouse-station/page`, {}, { params }).then(res => {
+ return await this.$HTTP.get(`/api/smis/warehouse-station/page`, {}, { params }).then(res => {
return res
})
}
@@ -178,7 +178,7 @@
},
methods: {
init() {
- this.$HTTP.get(`/api/blade-cps/warehouse-area/tree`).then(res => {
+ this.$HTTP.get(`/api/smis/warehouse-area/tree`).then(res => {
this.treeData = res.data
this.nodeClick(res.data?.[0])
})
@@ -200,11 +200,11 @@
type: 'warning'
}).then(() => {
const loading = this.$loading();
- this.$HTTP.get(`/api/blade-cps/warehouse-area/station-count?id=${id}`).then(res => {
+ this.$HTTP.get(`/api/smis/warehouse-area/station-count?id=${id}`).then(res => {
if (res.data > 0) {
this.$message.warning("璇ュ簱鍖哄凡缁忕粦瀹氬簱浣嶏紝璇峰厛娓呴櫎搴撲綅锛�")
} else {
- this.$HTTP.delete(`/api/blade-cps/warehouse-area/remove`, {}, { data: [id] }).then(res => {
+ this.$HTTP.delete(`/api/smis/warehouse-area/remove`, {}, { data: [id] }).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.init()
})
@@ -220,13 +220,13 @@
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
if (this.form.id) {
- return this.$HTTP.put(`/api/blade-cps/warehouse-area/update`, { ...this.form }).then(res => {
+ return this.$HTTP.put(`/api/smis/warehouse-area/update`, { ...this.form }).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.areaVisible = false
this.init()
})
}
- this.$HTTP.post(`/api/blade-cps/warehouse-area/insert`, { ...this.form, parentId: 1 }).then(res => {
+ this.$HTTP.post(`/api/smis/warehouse-area/insert`, { ...this.form, parentId: 1 }).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.areaVisible = false
this.init()
@@ -242,7 +242,7 @@
this.optionVisible = true
},
table_del(ids) {
- this.$HTTP.delete(`/api/blade-cps/warehouse-station/remove`, {}, { data: ids.map(v => v.id) }).then(res => {
+ this.$HTTP.delete(`/api/smis/warehouse-station/remove`, {}, { data: ids.map(v => v.id) }).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.search()
})
@@ -255,13 +255,13 @@
this.$refs.dialogForm1.validate(async (valid) => {
if (valid) {
if (this.form1.id) {
- return this.$HTTP.put(`/api/blade-cps/warehouse-station/update`, { ...this.form1, areaId: this.params.areaId }).then(res => {
+ return this.$HTTP.put(`/api/smis/warehouse-station/update`, { ...this.form1, areaId: this.params.areaId }).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.optionVisible = false
this.search()
})
}
- this.$HTTP.post(`/api/blade-cps/warehouse-station/insert`, { ...this.form1, areaId: this.params.areaId }).then(res => {
+ this.$HTTP.post(`/api/smis/warehouse-station/insert`, { ...this.form1, areaId: this.params.areaId }).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.optionVisible = false
this.search()
@@ -273,7 +273,7 @@
this.selection = selection
},
getExport() {
- this.$HTTP.post(`/api/blade-cps/warehouse-station/export-station`, { ...this.params }).then(res => {
+ this.$HTTP.post(`/api/smis/warehouse-station/export-station`, { ...this.params }).then(res => {
if (res.code == 200) {
window.open(res.data.link);
}
diff --git a/src/views/console/basic-data/product.vue b/src/views/console/basic-data/product.vue
index 86bbbb8..3dc9972 100644
--- a/src/views/console/basic-data/product.vue
+++ b/src/views/console/basic-data/product.vue
@@ -204,8 +204,8 @@
direction: "rtl",
drawer: false,
testList: [],
- uploadUrl: "/api/blade-cps/employee/import-employee",
- exportUrl: "/api/blade-cps/employee/export-template",
+ uploadUrl: "/api/smis/employee/import-employee",
+ exportUrl: "/api/smis/employee/export-template",
activeName: 'first',
selection0: [],
selection1: [],
@@ -240,7 +240,7 @@
methods: {
tableLoad(row,treeNode,resolve) {
this.searchData.parentId= row.id;
- this.$HTTP.post(`/api/blade-cps/product/lazy/tree?current=1&size=-1&id=${row.id}`).then(res=> {
+ this.$HTTP.post(`/api/smis/product/lazy/tree?current=1&size=-1&id=${row.id}`).then(res=> {
if(res.code == 200) {
resolve(res.data.records);
}
@@ -261,11 +261,11 @@
},
delTypeDataSingle(type) {
if(this.delTypeNum == 0) { //鍒犻櫎浜у搧
- var url = "/api/blade-cps/product/remove";
- var stopUrl = "/api/blade-cps/product/change-status";
+ var url = "/api/smis/product/remove";
+ var stopUrl = "/api/smis/product/change-status";
}else if(this.delTypeNum == 1) { //鍒犻櫎浜у搧绫诲瀷
- var url = "/api/blade-cps/product-type/remove";
- var stopUrl = "/api/blade-cps/product-type/change-status";
+ var url = "/api/smis/product-type/remove";
+ var stopUrl = "/api/smis/product-type/change-status";
}
if(type == 0) { //鍒犻櫎
this.$HTTP.delete(url,[this.id]).then(res=> {
@@ -293,7 +293,7 @@
this.getProductTypeSelect();
},
addTypeDataSubmit() {
- this.$HTTP.post(`/api/blade-cps/product-type/saveOrUpdate`,this.typeData).then(res => {
+ this.$HTTP.post(`/api/smis/product-type/saveOrUpdate`,this.typeData).then(res => {
if (res.code == 200) {
this.getProductType();
this.clearTypeData();
@@ -312,7 +312,7 @@
}
},
getProductType() {
- this.$HTTP.get(`/api/blade-cps/product-type/page?current=1&size=10`).then(res => {
+ this.$HTTP.get(`/api/smis/product-type/page?current=1&size=10`).then(res => {
if (res.code == 200) {
this.productTypeTableData = res.data.records;
}
@@ -324,7 +324,7 @@
this.delTypeModel = true;
},
getProductTypeSelect() {
- this.$HTTP.get(`/api/blade-cps/product-type/page?size=-1`).then(res => {
+ this.$HTTP.get(`/api/smis/product-type/page?size=-1`).then(res => {
if (res.code == 200) {
this.typeIdList = res.data.records;
}
@@ -360,7 +360,7 @@
done();
},
getExport() {
- this.$HTTP.post(`/api/blade-cps/product/export-product`,this.searchData).then(res => {
+ this.$HTTP.post(`/api/smis/product/export-product`,this.searchData).then(res => {
if (res.code == 200) {
window.open(res.data.link);
}
@@ -398,7 +398,7 @@
this.searchBtn0();
},
searchBtn0() {
- this.$HTTP.post("/api/blade-cps/product/lazy/tree?current=1&size=15&id=0",this.searchData).then(res=> {
+ this.$HTTP.post("/api/smis/product/lazy/tree?current=1&size=15&id=0",this.searchData).then(res=> {
if(res.code == 200) {
this.productTableData = res.data.records;
this.total0 = res.data.total;
@@ -437,7 +437,7 @@
},
table_edit(row){
this.dialog.save = true
- this.$HTTP.get(`/api/blade-cps/product/get/${row.id}`).then(res=> {
+ this.$HTTP.get(`/api/smis/product/get/${row.id}`).then(res=> {
if(res.code == 200) {
this.dialog.save = true;
this.$nextTick(() => {
diff --git a/src/views/console/basic-data/supplier-info.vue b/src/views/console/basic-data/supplier-info.vue
index 611afac..d9e9977 100644
--- a/src/views/console/basic-data/supplier-info.vue
+++ b/src/views/console/basic-data/supplier-info.vue
@@ -86,7 +86,7 @@
this.$confirm('纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎?','鎻愮ず', {
type: 'warning',
}).then(() => {
- this.$HTTP.delete(`/api/blade-cps/supplier/remove?supplierIds=${row.id}`).then(res=> {
+ this.$HTTP.delete(`/api/smis/supplier/remove?supplierIds=${row.id}`).then(res=> {
if(res.code == 200) {
this.searchclick();
this.$message.success("鎿嶄綔鎴愬姛");
@@ -104,7 +104,7 @@
this.searchSupplier();
},
searchSupplier() {
- this.$HTTP.get("/api/blade-cps/supplier/page",this.searchData).then(res=> {
+ this.$HTTP.get("/api/smis/supplier/page",this.searchData).then(res=> {
if(res.code == 200) {
res.data.records.forEach(item=> {
if(item.status == "1") {
@@ -158,7 +158,7 @@
this.$confirm('纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎锛�','鎻愮ず', {
type: 'warning',
}).then(() => {
- that.$HTTP.delete("/api/blade-cps/supplier/remove?supplierIds="+selStr).then(res=> {
+ that.$HTTP.delete("/api/smis/supplier/remove?supplierIds="+selStr).then(res=> {
if(res.code == 200) {
that.$message.success("鎿嶄綔鎴愬姛");
that.searchSupplier();
diff --git a/src/views/console/basic-data/tpm-data.vue b/src/views/console/basic-data/tpm-data.vue
index b72de24..ee4cc96 100644
--- a/src/views/console/basic-data/tpm-data.vue
+++ b/src/views/console/basic-data/tpm-data.vue
@@ -13,9 +13,9 @@
<el-header>
<Header key="1" ref="header1" :config="config1" v-model="params" :rules="rules1"
@search="search1" @submit="submit1" :formData="form1" :selection="selection1"
- exportUrlTpl="/api/blade-cps/maintain-item/export/template"
- exportUrl="/api/blade-cps/maintain-item/export"
- uploadUrl="/api/blade-cps/maintain-item/import-maintain-item" @del="del1" />
+ exportUrlTpl="/api/smis/maintain-item/export/template"
+ exportUrl="/api/smis/maintain-item/export"
+ uploadUrl="/api/smis/maintain-item/import-maintain-item" @del="del1" />
</el-header>
<el-main>
<TpmData1 key="1" ref="tpmData1" :apiObj="apiObj1" :params="params" :cols="cols1"
@@ -31,9 +31,9 @@
<el-header>
<Header key="2" ref="header2" :config="config2" v-model="params" :rules="rules2"
@search="search2" @submit="submit2" :formData="form2" :selection="selection2"
- exportUrlTpl="/api/blade-cps/malfunction/export-template"
- exportUrl="/api/blade-cps/malfunction/export-malfunctionType"
- uploadUrl="/api/blade-cps/malfunction/import-malfunctionType" @del="del2" />
+ exportUrlTpl="/api/smis/malfunction/export-template"
+ exportUrl="/api/smis/malfunction/export-malfunctionType"
+ uploadUrl="/api/smis/malfunction/import-malfunctionType" @del="del2" />
</el-header>
<el-main>
<TpmData1 key="2" ref="tpmData2" :apiObj="apiObj2" :params="params" :cols="cols2"
@@ -170,7 +170,7 @@
...data,
...this.params
}
- return await this.$HTTP.get(`/api/blade-cps/maintain-item/page`, {}, { params }).then(res => {
+ return await this.$HTTP.get(`/api/smis/maintain-item/page`, {}, { params }).then(res => {
res.data.records = res?.data?.records.map(v => {
return {
...v,
@@ -191,7 +191,7 @@
...this.params,
malfunctionTypeCodeOrName: this.params.keyWord
}
- return await this.$HTTP.get(`/api/blade-cps/malfunction/page`, {}, { params }).then(res => {
+ return await this.$HTTP.get(`/api/smis/malfunction/page`, {}, { params }).then(res => {
res.data.records = res?.data?.records.map(v => {
return {
...v,
@@ -299,7 +299,7 @@
submit1(val) {
console.log(val)
if (!val.id) {
- this.$HTTP.post(`/api/blade-cps/maintain-item/create-maintain-item`, val).then(res => {
+ this.$HTTP.post(`/api/smis/maintain-item/create-maintain-item`, val).then(res => {
if (res.success) {
this.search1()
} else {
@@ -307,7 +307,7 @@
}
})
} else {
- this.$HTTP.post(`/api/blade-cps/maintain-item/edit-maintain-item`, val).then(res => {
+ this.$HTTP.post(`/api/smis/maintain-item/edit-maintain-item`, val).then(res => {
if (res.success) {
this.search1()
} else {
@@ -317,7 +317,7 @@
}
},
del1(selection, type) {
- this.$HTTP.post(`/api/blade-cps/maintain-item/delete-maintain-item`, {}, {
+ this.$HTTP.post(`/api/smis/maintain-item/delete-maintain-item`, {}, {
params: {
ids: selection.map(v => v.id).toString(),
type
@@ -351,7 +351,7 @@
submit2(val) {
console.log(val)
// if (!val.id) {
- this.$HTTP.post(`/api/blade-cps/malfunction/save`, val).then(res => {
+ this.$HTTP.post(`/api/smis/malfunction/save`, val).then(res => {
if (res.success) {
this.search2()
} else {
@@ -360,7 +360,7 @@
})
// }
// else {
- // this.$HTTP.post(`/api/blade-cps/malfunction/save`, val).then(res => {
+ // this.$HTTP.post(`/api/smis/malfunction/save`, val).then(res => {
// if (res.success) {
// this.search2()
// } else {
@@ -370,7 +370,7 @@
// }
},
del2(selection, type) {
- this.$HTTP.delete(`/api/blade-cps/malfunction/delete`, {}, {
+ this.$HTTP.delete(`/api/smis/malfunction/delete`, {}, {
params: {
malfunctionTypeIds: selection.map(v => v.id).toString(),
type
diff --git a/src/views/console/basic-data/tpm-data1.vue b/src/views/console/basic-data/tpm-data1.vue
index faa5a1c..4938eea 100644
--- a/src/views/console/basic-data/tpm-data1.vue
+++ b/src/views/console/basic-data/tpm-data1.vue
@@ -66,7 +66,7 @@
// ...data,
// ...this.params
// }
- // return await this.$HTTP.get(`/api/blade-cps/maintain-item/page`, {}, { params }).then(res => {
+ // return await this.$HTTP.get(`/api/smis/maintain-item/page`, {}, { params }).then(res => {
// res.data.records = res?.data?.records.map(v => {
// return {
// ...v,
diff --git a/src/views/console/basic-data/tpmComp1.vue b/src/views/console/basic-data/tpmComp1.vue
index 3a5590f..dac37fb 100644
--- a/src/views/console/basic-data/tpmComp1.vue
+++ b/src/views/console/basic-data/tpmComp1.vue
@@ -132,8 +132,8 @@
form: {},
selection: [],
visible: false,
- exportUrlTpl: '/api/blade-cps/check-project/excel/template',
- uploadUrl: '/api/blade-cps/check-project/excel/import',
+ exportUrlTpl: '/api/smis/check-project/excel/template',
+ uploadUrl: '/api/smis/check-project/excel/import',
config: {
labelWidth: 120,
formItems: [
@@ -202,7 +202,7 @@
...data,
...this.params
}
- return await this.$HTTP.get(`/api/blade-cps/check-project/page`, {}, { params }).then(res => {
+ return await this.$HTTP.get(`/api/smis/check-project/page`, {}, { params }).then(res => {
res.data.records = res?.data?.records.map(v => {
return {
...v,
@@ -247,14 +247,14 @@
},
submit() {
if (!this.form.id) {
- this.$HTTP.post(`/api/blade-cps/check-project`, this.form).then(res => {
+ this.$HTTP.post(`/api/smis/check-project`, this.form).then(res => {
if (res.success) {
this.visible = false
this.search()
}
})
} else {
- this.$HTTP.put(`/api/blade-cps/check-project`, this.form).then(res => {
+ this.$HTTP.put(`/api/smis/check-project`, this.form).then(res => {
if (res.success) {
this.visible = false
this.search()
@@ -264,7 +264,7 @@
},
exportData() {
- this.$HTTP.post(`/api/blade-cps/check-project/excel/export`, {}, { params: this.params }).then(res => {
+ this.$HTTP.post(`/api/smis/check-project/excel/export`, {}, { params: this.params }).then(res => {
if (res.success) {
window.open(res.data.link)
}
@@ -274,7 +274,7 @@
this.$refs.table.reload()
},
table_del(selection, type) {
- this.$HTTP.delete(`/api/blade-cps/check-project?type=${type}`, {}, {
+ this.$HTTP.delete(`/api/smis/check-project?type=${type}`, {}, {
data: {
ids: selection.map(v => v.id),
}
@@ -294,14 +294,14 @@
},
getList() {
let row = this.selectRow
- return this.$HTTP.get(`/api/blade-cps/check-item/list?projectId=${row.id}`).then(res => {
+ return this.$HTTP.get(`/api/smis/check-item/list?projectId=${row.id}`).then(res => {
if (res.success) {
this.tabledata = res.data
}
})
},
del(row) {
- this.$HTTP.delete(`/api/blade-cps/check-item`, {}, {
+ this.$HTTP.delete(`/api/smis/check-item`, {}, {
data: {
ids: [row.id]
}
@@ -322,7 +322,7 @@
},
add(row) {
if (!row.id) {
- this.$HTTP.post(`/api/blade-cps/check-item`, {
+ this.$HTTP.post(`/api/smis/check-item`, {
checkProjectId: this.selectRow.id,
items: [{
...row,
@@ -337,7 +337,7 @@
this.getList()
})
} else {
- this.$HTTP.put(`/api/blade-cps/check-item`, {
+ this.$HTTP.put(`/api/smis/check-item`, {
...row,
name: row.name,
requirement: row.requirement,
diff --git a/src/views/console/basic-data/tpmComp2.vue b/src/views/console/basic-data/tpmComp2.vue
index a28a3f1..e525b0b 100644
--- a/src/views/console/basic-data/tpmComp2.vue
+++ b/src/views/console/basic-data/tpmComp2.vue
@@ -228,8 +228,8 @@
keyWord: '',
status: 1,
},
- exportUrlTpl: '/api/blade-cps/device-types/export/template',
- uploadUrl: '/api/blade-cps/device-types/excel/import',
+ exportUrlTpl: '/api/smis/device-types/export/template',
+ uploadUrl: '/api/smis/device-types/excel/import',
visible: false,
config: {
labelWidth: 120,
@@ -300,7 +300,7 @@
...data,
...this.params
}
- return await this.$HTTP.get(`/api/blade-cps/device-types/page`, {}, { params }).then(res => {
+ return await this.$HTTP.get(`/api/smis/device-types/page`, {}, { params }).then(res => {
res.data.records = res?.data?.records.map(v => {
return {
...v,
@@ -340,10 +340,10 @@
},
methods: {
init() {
- this.$HTTP.get(`/api/blade-cps/check-project/page?key=¤t=1&size=-1`).then(res => {
+ this.$HTTP.get(`/api/smis/check-project/page?key=¤t=1&size=-1`).then(res => {
this.options = res.data.records
})
- this.$HTTP.get(`/api/blade-cps/maintain-item/list?keyWord=`).then(res => {
+ this.$HTTP.get(`/api/smis/maintain-item/list?keyWord=`).then(res => {
this.options1 = res.data
})
},
@@ -358,7 +358,7 @@
this.visible = true
},
exportData() {
- this.$HTTP.post(`/api/blade-cps/device-types/excel/export`, {}, { params: this.params }).then(res => {
+ this.$HTTP.post(`/api/smis/device-types/excel/export`, {}, { params: this.params }).then(res => {
if (res.success) {
window.open(res.data.link)
}
@@ -368,7 +368,7 @@
this.$refs.table.reload()
},
table_del(selection, type) {
- this.$HTTP.delete(`/api/blade-cps/device-types?type=${type}`, {}, {
+ this.$HTTP.delete(`/api/smis/device-types?type=${type}`, {}, {
data: {
idList: selection.map(v => v.id),
}
@@ -389,14 +389,14 @@
},
submit() {
if (!this.form.id) {
- this.$HTTP.post(`/api/blade-cps/device-types`, this.form).then(res => {
+ this.$HTTP.post(`/api/smis/device-types`, this.form).then(res => {
if (res.success) {
this.visible = false
this.search()
}
})
} else {
- this.$HTTP.put(`/api/blade-cps/device-types`, this.form).then(res => {
+ this.$HTTP.put(`/api/smis/device-types`, this.form).then(res => {
if (res.success) {
this.visible = false
this.search()
@@ -415,7 +415,7 @@
},
getCheckList() {
let row = this.selectRow
- return this.$HTTP.get(`/api/blade-cps/device-type-check-projects/page?id=${row.id}`).then(res => {
+ return this.$HTTP.get(`/api/smis/device-type-check-projects/page?id=${row.id}`).then(res => {
if (res.success) {
this.tabledata = res.data
this.getCheckListChild(this.tabledata[0])
@@ -426,7 +426,7 @@
},
getCheckListChild(row) {
if (!row?.checkProjectId) return this.tableDataList = []
- this.$HTTP.get(`/api/blade-cps/check-item/list?projectId=${row.checkProjectId}`).then(res => {
+ this.$HTTP.get(`/api/smis/check-item/list?projectId=${row.checkProjectId}`).then(res => {
if (res.success) {
this.tableDataList = res.data
} else {
@@ -442,7 +442,7 @@
this.tabledata.splice(index, 1)
},
delCheck(row) {
- this.$HTTP.delete(`/api/blade-cps/device-type-check-projects`, {}, {
+ this.$HTTP.delete(`/api/smis/device-type-check-projects`, {}, {
data: {
ids: [row.id]
}
@@ -453,7 +453,7 @@
})
},
addCheck(row) {
- this.$HTTP.post(`/api/blade-cps/device-type-check-projects`, {
+ this.$HTTP.post(`/api/smis/device-type-check-projects`, {
deviceTypeId: this.selectRow.id,
checkProjectId: [row.checkProjectId],
intervalTime: row.intervalTime
@@ -474,7 +474,7 @@
})
},
getMList() {
- return this.$HTTP.get(`/api/blade-cps/maintain-project/list?deviceTypeId=${this.selectRow.id}`).then(res => {
+ return this.$HTTP.get(`/api/smis/maintain-project/list?deviceTypeId=${this.selectRow.id}`).then(res => {
if (res.success) {
this.talbeDataM = res.data
this.getMlistChild(this.talbeDataM?.[0])
@@ -486,7 +486,7 @@
getMlistChild(row) {
this.selectMRow = row
if (!row?.id) return this.talbeDataMChild = []
- this.$HTTP.get(`/api/blade-cps/maintain-project-item/item-list?projectId=${row.id}`).then(res => {
+ this.$HTTP.get(`/api/smis/maintain-project-item/item-list?projectId=${row.id}`).then(res => {
if (res) {
this.talbeDataMChild = res
} else {
@@ -496,7 +496,7 @@
},
//
addM(row) {
- this.$HTTP.post(`/api/blade-cps/maintain-project/create-maintain-project`, {
+ this.$HTTP.post(`/api/smis/maintain-project/create-maintain-project`, {
code: row.code,
deviceTypeId: this.selectRow.id,
deviceTypeName: row.deviceTypeName,
@@ -513,7 +513,7 @@
})
},
delM(row) {
- this.$HTTP.post(`/api/blade-cps/maintain-project/delete-maintain-project`, {}, {
+ this.$HTTP.post(`/api/smis/maintain-project/delete-maintain-project`, {}, {
params: {
id: row.id
}
@@ -525,7 +525,7 @@
},
delMChild(row) {
- this.$HTTP.post(`/api/blade-cps/maintain-project-item/delete-maintain-project-item?id=${row.id}`).then(res => {
+ this.$HTTP.post(`/api/smis/maintain-project-item/delete-maintain-project-item?id=${row.id}`).then(res => {
if (res.success) {
this.getMlistChild(this.selectMRow)
} else {
@@ -538,7 +538,7 @@
this.visibleAdd = true
},
saveAdd() {
- this.$HTTP.post(`/api/blade-cps/maintain-project-item/create-maintain-project-item`, {
+ this.$HTTP.post(`/api/smis/maintain-project-item/create-maintain-project-item`, {
itemId: this.itemId,
projectId: this.selectMRow.id
}).then(res => {
diff --git a/src/views/console/basic-data/work-process.vue b/src/views/console/basic-data/work-process.vue
index 1247d5e..d159fba 100644
--- a/src/views/console/basic-data/work-process.vue
+++ b/src/views/console/basic-data/work-process.vue
@@ -171,8 +171,8 @@
},
isAddData0: false,
isAddData1: false,
- uploadUrl: "/api/blade-cps/employee/import-employee",
- exportUrl: "/api/blade-cps/employee/export-template",
+ uploadUrl: "/api/smis/employee/import-employee",
+ exportUrl: "/api/smis/employee/export-template",
categoryList: [],
selection: [],
searchData: {
@@ -220,7 +220,7 @@
selStr += item.id + ","
})
selStr = selStr.replace(/,$/, '');
- var url = `/api/blade-cps/process/remove?processIds=${selStr}&type=${type}`;
+ var url = `/api/smis/process/remove?processIds=${selStr}&type=${type}`;
this.$HTTP.delete(url).then(res=> {
if(res.code == 200) {
this.$message.success("鎿嶄綔鎴愬姛");
@@ -231,7 +231,7 @@
})
},
delTypeDataSingle(type) {
- var url = `/api/blade-cps/process/remove?processIds=${this.leftId}&type=${type}`;
+ var url = `/api/smis/process/remove?processIds=${this.leftId}&type=${type}`;
this.$HTTP.delete(url).then(res=> {
if(res.code == 200) {
this.$message.success("鎿嶄綔鎴愬姛");
@@ -242,7 +242,7 @@
})
},
addData0Submit0() {
- this.$HTTP.post(`/api/blade-cps/process/save`,this.addData0).then(res => {
+ this.$HTTP.post(`/api/smis/process/save`,this.addData0).then(res => {
if (res.code == 200) {
this.getData();
this.clearData0();
@@ -263,7 +263,7 @@
},
addData0Submit1() {
this.addData1.processId = this.id;
- this.$HTTP.post(`/api/blade-cps/process-association/save`,this.addData1).then(res => {
+ this.$HTTP.post(`/api/smis/process-association/save`,this.addData1).then(res => {
if (res.code == 200) {
this.getPage1();
this.clearData1();
@@ -295,14 +295,14 @@
})
},
getBizIdList() {
- this.$HTTP.get(`/api/blade-cps/workstation/page?workstationCode=&workstationName=&size=-1&groupId=&keyWord=`).then(res => {
+ this.$HTTP.get(`/api/smis/workstation/page?workstationCode=&workstationName=&size=-1&groupId=&keyWord=`).then(res => {
if (res.code == 200) {
this.bizIdList = res.data.records;
}
})
},
getExport() {
- this.$HTTP.get(`/api/blade-cps/process/export-process?keyword=&status=1`).then(res => {
+ this.$HTTP.get(`/api/smis/process/export-process?keyword=&status=1`).then(res => {
if (res.code == 200) {
window.open(res.data.link);
}
@@ -315,14 +315,14 @@
this.getData();
},
getWorkDetail(id) {
- this.$HTTP.get(`/api/blade-cps/process/get?processId=${this.id}`).then(res=> {
+ this.$HTTP.get(`/api/smis/process/get?processId=${this.id}`).then(res=> {
if(res.code == 200) {
this.workDetail = res.data;
}
})
},
getData() {
- this.$HTTP.get(`/api/blade-cps/process/page?status=${this.searchData.status}&keyword=${this.searchData.keyword}¤t=${this.searchData.current}&size=${this.searchData.size}`).then(res=> {
+ this.$HTTP.get(`/api/smis/process/page?status=${this.searchData.status}&keyword=${this.searchData.keyword}¤t=${this.searchData.current}&size=${this.searchData.size}`).then(res=> {
if(res.code == 200) {
this.tableData0 = res.data.records;
if(this.tableData0.length != 0) {
@@ -341,7 +341,7 @@
})
},
getPage1() {
- this.$HTTP.get(`/api/blade-cps/process-association/page?processId=${this.id}`).then(res=> {
+ this.$HTTP.get(`/api/smis/process-association/page?processId=${this.id}`).then(res=> {
if(res.code == 200) {
this.tableData1 = res.data.workstationList;
}
@@ -354,7 +354,7 @@
},
//鍒犻櫎
biz_table_del(row) {
- var url = `/api/blade-cps/process-association/remove?bizId=${row.id}&processId=${this.id}`;
+ var url = `/api/smis/process-association/remove?bizId=${row.id}&processId=${this.id}`;
this.$HTTP.delete(url).then(res=> {
if(res.code == 200) {
this.$message.success("鎿嶄綔鎴愬姛");
diff --git a/src/views/console/bom-list/index.vue b/src/views/console/bom-list/index.vue
index f6aaf40..aa58822 100644
--- a/src/views/console/bom-list/index.vue
+++ b/src/views/console/bom-list/index.vue
@@ -143,7 +143,7 @@
this.info = this.leftData[index];
},
getLeftTree() {
- this.$HTTP.get("/api/blade-cps/product/tree").then(res=> {
+ this.$HTTP.get("/api/smis/product/tree").then(res=> {
if(res.code == 200) {
this.leftData = res.data;
}
diff --git a/src/views/console/product-process/addRoute.vue b/src/views/console/product-process/addRoute.vue
index 69458fd..8906b27 100644
--- a/src/views/console/product-process/addRoute.vue
+++ b/src/views/console/product-process/addRoute.vue
@@ -83,7 +83,7 @@
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
- this.$HTTP.put("/api/blade-cps/craft-routing/update",obj).then(res=> {
+ this.$HTTP.put("/api/smis/craft-routing/update",obj).then(res=> {
this.isSaveing = false;
if(res.code == 200) {
this.$emit('success', this.addRouteForm, this.mode);
diff --git a/src/views/console/product-process/process-route.vue b/src/views/console/product-process/process-route.vue
index 01b41b9..b5be74b 100644
--- a/src/views/console/product-process/process-route.vue
+++ b/src/views/console/product-process/process-route.vue
@@ -103,7 +103,7 @@
this.$confirm(`纭瑕佸垹闄ゆ宸ヨ壓鐗堟湰鍚�?`, '', {
type: 'warning'
}).then(() => {
- this.$HTTP.delete("/api/blade-cps/production-craft-version/remove/"+that.delIconId).then(res=> {
+ this.$HTTP.delete("/api/smis/production-craft-version/remove/"+that.delIconId).then(res=> {
if(res.code == 200) {
that.$message.success("鎿嶄綔鎴愬姛");
that.getDetail();
@@ -135,7 +135,7 @@
}
},
showDetail(item) {
- this.$HTTP.get(`/api/blade-cps/production-craft-version/detail/${item.id}`).then(res=> {
+ this.$HTTP.get(`/api/smis/production-craft-version/detail/${item.id}`).then(res=> {
if(res.code == 200) {
this.vHtml = `<ul class='detailUl'>
<li><span class='detailStyle'>鍚嶇О</span><span>${res.data.name}</span></li>
@@ -150,7 +150,7 @@
})
},
table_edit(row){
- this.$HTTP.get(`/api/blade-cps/craft-routing/not-band-craft?craftId=${row.id}`).then(res=> {
+ this.$HTTP.get(`/api/smis/craft-routing/not-band-craft?craftId=${row.id}`).then(res=> {
if(res.code == 200) {
this.dialog.save = true;
this.$nextTick(() => {
@@ -189,7 +189,7 @@
this.info = this.leftData[index];
},
getDetail() {
- this.$HTTP.get(`/api/blade-cps/craft-routing/detail?id=${this.id}`).then(res=> {
+ this.$HTTP.get(`/api/smis/craft-routing/detail?id=${this.id}`).then(res=> {
if(res.code == 200) {
if(res.data.dtos.length != 0) {
res.data.dtos.forEach(item=> {
@@ -208,7 +208,7 @@
},{
key: "0",value: ""
}]
- this.$HTTP.post("/api/blade-cps/craft-routing/list",{params}).then(res=> {
+ this.$HTTP.post("/api/smis/craft-routing/list",{params}).then(res=> {
if(res.code == 200) {
this.leftData = res.data;
if(res.data) {
diff --git a/src/views/console/product-process/process-route/add-craft-version.vue b/src/views/console/product-process/process-route/add-craft-version.vue
index 16f1926..8936e9c 100644
--- a/src/views/console/product-process/process-route/add-craft-version.vue
+++ b/src/views/console/product-process/process-route/add-craft-version.vue
@@ -136,7 +136,7 @@
groupCategory: 1,
groupType: "group_workstation"
}
- this.$HTTP.post(`/api/blade-cps/group/groupWorkstation`,obj).then(res=> {
+ this.$HTTP.post(`/api/smis/group/groupWorkstation`,obj).then(res=> {
if(res.code == 200) {
var tree = [];
var children = [];
@@ -159,7 +159,7 @@
obj.id = this.$route.query.craftId;
this.$refs.dialogForm0.validate(async (valid) => {
if (valid) {
- this.$HTTP.put(`/api/blade-cps/production-craft-version/update`,obj).then(res=> {
+ this.$HTTP.put(`/api/smis/production-craft-version/update`,obj).then(res=> {
if(res.code == 200) {
this.active = 1;
//this.getVersionDetail(res.data.id);
@@ -173,7 +173,7 @@
})
},
getVersionDetail(id) {
- this.$HTTP.get(`/api/blade-cps/production-craft-version/detail/${id}`).then(res=> {
+ this.$HTTP.get(`/api/smis/production-craft-version/detail/${id}`).then(res=> {
if(res.code == 200) {
this.versionDetail = res.data;
}else {
@@ -196,7 +196,7 @@
}
},
getDetail(id) {
- this.$HTTP.get(`/api/blade-cps/craft-routing/detail?id=${this.$route.query.id}`).then(res=> {
+ this.$HTTP.get(`/api/smis/craft-routing/detail?id=${this.$route.query.id}`).then(res=> {
if(res.code == 200) {
this.detail = res.data;
res.data.dtos.forEach(item=> {
diff --git a/src/views/console/product-process/process-route/add-craft.vue b/src/views/console/product-process/process-route/add-craft.vue
index 60efdb8..0182c7b 100644
--- a/src/views/console/product-process/process-route/add-craft.vue
+++ b/src/views/console/product-process/process-route/add-craft.vue
@@ -129,7 +129,7 @@
groupCategory: 1,
groupType: "group_workstation"
}
- this.$HTTP.post(`/api/blade-cps/group/groupWorkstation`,obj).then(res=> {
+ this.$HTTP.post(`/api/smis/group/groupWorkstation`,obj).then(res=> {
if(res.code == 200) {
var tree = [];
var children = [];
@@ -165,7 +165,7 @@
var obj = Object.assign({},this.addStepForm0);
this.$refs.dialogForm0.validate(async (valid) => {
if (valid) {
- this.$HTTP.put("/api/blade-cps/craft-routing/update",obj).then(res=> {
+ this.$HTTP.put("/api/smis/craft-routing/update",obj).then(res=> {
this.isSaveing = false;
if(res.code == 200) {
this.active = 1;
@@ -184,7 +184,7 @@
obj.craftId = "";
this.$refs.dialogForm1.validate(async (valid) => {
if (valid) {
- this.$HTTP.post("/api/blade-cps/production-craft-version/insert",obj).then(res=> {
+ this.$HTTP.post("/api/smis/production-craft-version/insert",obj).then(res=> {
this.isSaveing = false;
if(res.code == 200) {
this.active = 2;
@@ -200,14 +200,14 @@
})
},
getDetail(id) {
- this.$HTTP.get(`/api/blade-cps/craft-routing/detail?id=${this.$route.query.id}`).then(res=> {
+ this.$HTTP.get(`/api/smis/craft-routing/detail?id=${this.$route.query.id}`).then(res=> {
if(res.code == 200) {
this.addStepForm0 = res.data;
}
})
},
getProductList() {
- this.$HTTP.get(`/api/blade-cps/craft-routing/not-band-craft?craftId=${this.$route.query.id}`).then(res=> {
+ this.$HTTP.get(`/api/smis/craft-routing/not-band-craft?craftId=${this.$route.query.id}`).then(res=> {
if(res.code == 200) {
this.productList = res.data;
this.getDetail();
diff --git a/src/views/console/product-process/process-route/addWorking.vue b/src/views/console/product-process/process-route/addWorking.vue
index 5ef8d0c..1228c4c 100644
--- a/src/views/console/product-process/process-route/addWorking.vue
+++ b/src/views/console/product-process/process-route/addWorking.vue
@@ -64,7 +64,7 @@
this.selection = selection;
},
getTable() {
- this.$HTTP.get(`/api/blade-cps/process/page?current=${this.current}&size=${this.size}&keyword=`).then(res=> {
+ this.$HTTP.get(`/api/smis/process/page?current=${this.current}&size=${this.size}&keyword=`).then(res=> {
if(res.code == 200) {
this.tableData = res.data.records;
this.totle = res.data.total;
diff --git a/src/views/console/product-process/process-route/addWorkmanship.vue b/src/views/console/product-process/process-route/addWorkmanship.vue
index dbca07a..8c2dd0c 100644
--- a/src/views/console/product-process/process-route/addWorkmanship.vue
+++ b/src/views/console/product-process/process-route/addWorkmanship.vue
@@ -395,7 +395,7 @@
fixturesChange(value) {
var row = this.$refs.fixturesFirstData.getCurrentNode();
this.fixturesFirstData.groupName = row.name;
- this.$HTTP.get(`/api/blade-cps/fixture/list?groupId=${value}`).then(res=> {
+ this.$HTTP.get(`/api/smis/fixture/list?groupId=${value}`).then(res=> {
if(res.code == 200) {
this.fixtureCodeList = res.data;
}
@@ -429,7 +429,7 @@
}
obj.meaMethod = meaMethodArray.join(",");
return;
- this.$HTTP.post(`/api/blade-cps/production-craft-process/insert?versionId=${this.craftId}`,[obj]).then(res=> {
+ this.$HTTP.post(`/api/smis/production-craft-process/insert?versionId=${this.craftId}`,[obj]).then(res=> {
if(res.code == 200) {
this.$emit('success', obj);
this.resetAll();
@@ -498,7 +498,7 @@
})
},
getNumberAndName() { //宸ュ簭缂栧彿鍜屽悕绉�
- this.$HTTP.get("/api/blade-cps/process/page?current=1&size=-1&status=1").then(res=> {
+ this.$HTTP.get("/api/smis/process/page?current=1&size=-1&status=1").then(res=> {
if(res.code == 200) {
this.processCodeList = res.data.records;
this.processNameList = res.data.records;
@@ -535,7 +535,7 @@
groupCategory: 1,
groupType: "group_fixture"
}
- this.$HTTP.post("/api/blade-cps/tray/tooling-tree",obj).then(res=> {
+ this.$HTTP.post("/api/smis/tray/tooling-tree",obj).then(res=> {
if(res.code == 200) {
this.fixturesFirstTree = res.data;
}
@@ -551,7 +551,7 @@
},
setData(data) {
- this.$HTTP.get(`/api/blade-cps/production-craft-process/get/${data.id}`).then(res=> {
+ this.$HTTP.get(`/api/smis/production-craft-process/get/${data.id}`).then(res=> {
if(res.code == 200) {
//for娴嬮噺
var meaMethodArray = [];
diff --git a/src/views/console/product-process/process-route/workmanship.vue b/src/views/console/product-process/process-route/workmanship.vue
index c34c8a8..35ea7f1 100644
--- a/src/views/console/product-process/process-route/workmanship.vue
+++ b/src/views/console/product-process/process-route/workmanship.vue
@@ -135,7 +135,7 @@
}
this.$refs.mergeVisibleData.validate(async (valid) => {
if (valid) {
- that.$HTTP.post("/api/blade-cps/production-craft-process/save-parallel",obj).then(res=> {
+ that.$HTTP.post("/api/smis/production-craft-process/save-parallel",obj).then(res=> {
if(res.code == 200) {
that.mergeVisible = false;
that.$message.success("鎿嶄綔鎴愬姛");
@@ -159,7 +159,7 @@
this.getcraftlList();
},
getcraftlList() {
- // this.$HTTP.get(`/api/blade-cps/production-craft-version/detail/${this.craftId}`).then(res=> {
+ // this.$HTTP.get(`/api/smis/production-craft-version/detail/${this.craftId}`).then(res=> {
// if(res.code == 200) {
// res.data.processList.forEach((item,index)=> {
// item.index = index + 1;
@@ -167,7 +167,7 @@
// this.tableData = res.data.processList;
// }
// })
- this.$HTTP.get(`/api/blade-cps/production-craft-process/child-tree?versionId=${this.craftId}`).then(res=> {
+ this.$HTTP.get(`/api/smis/production-craft-process/child-tree?versionId=${this.craftId}`).then(res=> {
if(res.code == 200) {
res.data.forEach((item,index)=> {
if(item.children && item.children.length > 0) {
@@ -188,7 +188,7 @@
this.$confirm(`宸ヨ壓璺嚎瀹氱増鍚庯紝涓嶆敮鎸佺紪杈戙�佸垹闄ゃ�佹坊鍔犲伐搴忥紝璇风‘璁ゆ槸鍚﹀畾鐗�?`, '', {
type: 'warning'
}).then(() => {
- this.$HTTP.put(`/api/blade-cps/production-craft-version/fix-version/${this.craftId}`).then(res=> {
+ this.$HTTP.put(`/api/smis/production-craft-version/fix-version/${this.craftId}`).then(res=> {
if(res.code == 200) {
that.$message.success("鎿嶄綔鎴愬姛");
}else {
@@ -245,7 +245,7 @@
removeIds: [row.id],
versionId: that.craftId
}
- this.$HTTP.post(`/api/blade-cps/production-craft-process/child-process-update`,obj).then(res=> {
+ this.$HTTP.post(`/api/smis/production-craft-process/child-process-update`,obj).then(res=> {
if(res.code == 200) {
that.$message.success("鎿嶄綔鎴愬姛");
that.getcraftlList();
@@ -276,7 +276,7 @@
removeIds: [row.parentId],
versionId: that.craftId
}
- this.$HTTP.post(`/api/blade-cps/production-craft-process/child-process-update`,obj).then(res=> {
+ this.$HTTP.post(`/api/smis/production-craft-process/child-process-update`,obj).then(res=> {
if(res.code == 200) {
that.$message.success("鎿嶄綔鎴愬姛");
that.getcraftlList();
diff --git a/src/views/console/soam/oss-system.vue b/src/views/console/soam/oss-system.vue
index 741af56..4750594 100644
--- a/src/views/console/soam/oss-system.vue
+++ b/src/views/console/soam/oss-system.vue
@@ -354,7 +354,7 @@
},
methods: {
getMachineCodeList() {
- this.$HTTP.get(`/api/blade-cps/machine/list`).then(res=> {
+ this.$HTTP.get(`/api/smis/machine/list`).then(res=> {
if(res.code == 200) {
this.machineCodeList = res.data;
this.outer(); //鏈嶅姟闆嗘垚
@@ -436,21 +436,21 @@
});
},
license() {
- this.$HTTP.get("/api/blade-cps/init/license-detail").then(res=> {
+ this.$HTTP.get("/api/smis/init/license-detail").then(res=> {
if(res.code == 200) {
res.data.moduleNames.VISION = JSON.stringify(res.data.moduleNames.VISION);
res.data.moduleNames.CPS = JSON.stringify(res.data.moduleNames.CPS);
this.licenseDetail = res.data;
}
})
- this.$HTTP.get("/api/blade-cps/init/license-device").then(res=> { //璁惧鏍囪瘑
+ this.$HTTP.get("/api/smis/init/license-device").then(res=> { //璁惧鏍囪瘑
if(res.code == 200) {
this.copyStr = res.data;
}
})
},
getFile() {
- this.$HTTP.get("/api/blade-cps/enterprise/get").then(res=> {
+ this.$HTTP.get("/api/smis/enterprise/get").then(res=> {
if(res.code == 200) {
this.uploadData = res.data;
this.imageUrl1 = res.data.list[0].link;
@@ -478,7 +478,7 @@
},
handleAvatarSuccess(resp) {
var that = this;
- this.$HTTP.get("/api/blade-cps/enterprise/get").then(res=> {
+ this.$HTTP.get("/api/smis/enterprise/get").then(res=> {
if(res.code == 200) {
// 鍏堣祴鍊�
if(res.data.list.length == 0) res.data.list = [{},{}];
@@ -486,7 +486,7 @@
that.imageUrl1 = res.data.list[0].link;
that.imageUrl2 = res.data.list[1].link;
//娣诲姞鎺ュ彛
- var url = "/api/blade-cps/enterprise/add";
+ var url = "/api/smis/enterprise/add";
if(that.logoType == "0") {
var upData = Object.assign({},res.data.list[0]);
obj.type = "0";
@@ -496,7 +496,7 @@
var upData = Object.assign({},res.data.list[1]);
}
if(resp.uploadMethod == "edit") {
- url = "/api/blade-cps/enterprise/edit";
+ url = "/api/smis/enterprise/edit";
}
that.$HTTP.post(url,upData).then(resJ=> {
if(resJ.code == 200) {
diff --git a/src/views/console/system/addUser.vue b/src/views/console/system/addUser.vue
index 800739f..cebe197 100644
--- a/src/views/console/system/addUser.vue
+++ b/src/views/console/system/addUser.vue
@@ -189,7 +189,7 @@
})
},
getEmployee(employeeId) {
- this.$HTTP.get("/api/blade-cps/employee/unbind-employee?employeeId=" + employeeId).then(res=> {
+ this.$HTTP.get("/api/smis/employee/unbind-employee?employeeId=" + employeeId).then(res=> {
if(res.code == 200) {
function changeArr(arr) {
arr.forEach(item=> {
diff --git a/src/views/console/tooling/Tray.vue b/src/views/console/tooling/Tray.vue
index 0ba4f14..7fcb504 100644
--- a/src/views/console/tooling/Tray.vue
+++ b/src/views/console/tooling/Tray.vue
@@ -42,8 +42,8 @@
<el-container v-if="selectNode.id">
<el-header>
<el-button @click="table_add" type="primary" icon="el-icon-plus"></el-button>
- <import-table style="margin:0 8px" exportUrl="/api/blade-cps/tray/excel/template"
- uploadUrl="/api/blade-cps/tray/import-tray"></import-table>
+ <import-table style="margin:0 8px" exportUrl="/api/smis/tray/excel/template"
+ uploadUrl="/api/smis/tray/import-tray"></import-table>
<el-button type="danger" plain icon="el-icon-delete" @click="batchDel"></el-button>
<el-input v-model="params.keyword" style="width: 240px;margin-left: auto;" placeholder="璇疯緭鍏ユ绱㈠唴瀹�"
clearable></el-input>
@@ -261,7 +261,7 @@
...data,
...this.params
}
- return await this.$HTTP.get(`/api/blade-cps/tray/page/${this.selectNode.id}`, {}, { params }).then(res => {
+ return await this.$HTTP.get(`/api/smis/tray/page/${this.selectNode.id}`, {}, { params }).then(res => {
return res
})
}
@@ -326,13 +326,13 @@
this.visibleGroup = true
},
delArea(data) {
- this.$HTTP.delete(`/api/blade-cps/tray/remove-tree?id=${data.id}`).then(res => {
+ this.$HTTP.delete(`/api/smis/tray/remove-tree?id=${data.id}`).then(res => {
this.init()
})
},
saveGroup() {
if (!this.formGroup.id) {
- this.$HTTP.post(`/api/blade-cps/group`, {
+ this.$HTTP.post(`/api/smis/group`, {
groupCategory: 1,
groupType: "group_tray",
parentId: this.selectNode.id,
@@ -342,7 +342,7 @@
this.init()
})
} else {
- this.$HTTP.put(`/api/blade-cps/group`, {
+ this.$HTTP.put(`/api/smis/group`, {
groupCategory: 1,
groupType: "group_tray",
parentId: this.selectNode.id,
@@ -375,7 +375,7 @@
this.trayForm.groupId = node.id
},
confirm() {
- this.$HTTP.post(`/api/blade-cps/tray/save`, {
+ this.$HTTP.post(`/api/smis/tray/save`, {
...this.trayForm
}).then(res => {
this.dialog = false
@@ -383,7 +383,7 @@
})
},
init() {
- this.$HTTP.post(`/api/blade-cps/tray/tooling-tree`, {
+ this.$HTTP.post(`/api/smis/tray/tooling-tree`, {
groupCategory: 1,
groupType: "group_tray"
}).then(res => {
@@ -394,10 +394,10 @@
queryInfo() {
if (!this.selectNode.id) return
this.$refs?.table?.reload()
- // this.$HTTP.get(`/api/blade-cps/tray/${this.selectNode.id}`).then(res => {
+ // this.$HTTP.get(`/api/smis/tray/${this.selectNode.id}`).then(res => {
// this.info = res.data
// })
- // this.$HTTP.get(`/api/blade-cps/tray-surface/list/${this.selectNode.id}`).then(res => {
+ // this.$HTTP.get(`/api/smis/tray-surface/list/${this.selectNode.id}`).then(res => {
// this.info = res.data
// })
},
@@ -411,10 +411,10 @@
async queryChildInfo(id) {
if (!id) return
this.showLoading = true
- await this.$HTTP.get(`/api/blade-cps/tray/${id}`).then(res => {
+ await this.$HTTP.get(`/api/smis/tray/${id}`).then(res => {
this.info = res.data
})
- await this.$HTTP.get(`/api/blade-cps/tray-surface/list/${id}`).then(res => {
+ await this.$HTTP.get(`/api/smis/tray-surface/list/${id}`).then(res => {
this.infoList = res.data
})
this.showLoading = false
@@ -435,19 +435,19 @@
this.visible = true
},
table_del1(row) {
- this.$HTTP.delete(`/api/blade-cps/tray-surface/remove-face/${this.info.id}?faceId=${row.id}`).then(res => {
+ this.$HTTP.delete(`/api/smis/tray-surface/remove-face/${this.info.id}?faceId=${row.id}`).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.queryChildInfo(this.info.id)
})
},
saveTray() {
if (this.form.id) {
- return this.$HTTP.put(`/api/blade-cps/tray-surface/update`, this.form).then(res => {
+ return this.$HTTP.put(`/api/smis/tray-surface/update`, this.form).then(res => {
this.visible = false
this.queryChildInfo(this.info.id)
})
}
- this.$HTTP.post(`/api/blade-cps/tray-surface/save`, this.form).then(res => {
+ this.$HTTP.post(`/api/smis/tray-surface/save`, this.form).then(res => {
this.visible = false
this.queryChildInfo(this.info.id)
})
diff --git a/src/views/console/tooling/fixture.vue b/src/views/console/tooling/fixture.vue
index 6c8fb7f..f4def3f 100644
--- a/src/views/console/tooling/fixture.vue
+++ b/src/views/console/tooling/fixture.vue
@@ -42,8 +42,8 @@
<el-container v-if="selectNode.id">
<el-header>
<el-button @click="table_add" type="primary" icon="el-icon-plus"></el-button>
- <import-table style="margin:0 8px" exportUrl="/api/blade-cps/fixture/export/template"
- uploadUrl="/api/blade-cps/fixture/import-fixture"></import-table>
+ <import-table style="margin:0 8px" exportUrl="/api/smis/fixture/export/template"
+ uploadUrl="/api/smis/fixture/import-fixture"></import-table>
<el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="del(selection, '0')">
<template #reference>
<el-button type="danger" :disabled="selection.length === 0" plain icon="el-icon-delete"
@@ -253,7 +253,7 @@
groupId: this.selectNode.id,
...this.params
}
- return await this.$HTTP.get(`/api/blade-cps/fixture/page`, {}, { params }).then(res => {
+ return await this.$HTTP.get(`/api/smis/fixture/page`, {}, { params }).then(res => {
return res
})
}
@@ -292,7 +292,7 @@
'trayForm.trayId': {
handler(val) {
if (val) {
- this.$HTTP.get(`/api/blade-cps/tray-surface/list/${val}`).then(res => {
+ this.$HTTP.get(`/api/smis/tray-surface/list/${val}`).then(res => {
this.surfaceId = res.data
if (!this.surfaceId.find(v => v.id === this.trayForm.surfaceId)) {
this.trayForm.surfaceId = ''
@@ -308,7 +308,7 @@
},
created() {
this.init()
- this.$HTTP.post(`/api/blade-cps/tray/list`).then(res => {
+ this.$HTTP.post(`/api/smis/tray/list`).then(res => {
this.trayId = res.data
})
},
@@ -318,7 +318,7 @@
console.log(options)
formData.append('file', options.file)
this.$HTTP.post(`/api/blade-resource/oss/endpoint/put-file`, formData).then(resFile => {
- this.$HTTP.post(`/api/blade-cps/fixture/file`, {
+ this.$HTTP.post(`/api/smis/fixture/file`, {
contentType: options.file.type,
fileLength: options.file.size,
fileLink: resFile.data.link,
@@ -336,7 +336,7 @@
})
},
delFile(row) {
- this.$HTTP.delete(`/api/blade-cps/tool-appendix/remove`, [row.id]).then(res => {
+ this.$HTTP.delete(`/api/smis/tool-appendix/remove`, [row.id]).then(res => {
if (res.success) {
this.rowClick(this.row)
} else {
@@ -362,13 +362,13 @@
this.visibleGroup = true
},
delArea(data) {
- this.$HTTP.delete(`/api/blade-cps/tray/remove-tree?id=${data.id}`).then(res => {
+ this.$HTTP.delete(`/api/smis/tray/remove-tree?id=${data.id}`).then(res => {
this.init()
})
},
saveGroup() {
if (!this.formGroup.id) {
- this.$HTTP.post(`/api/blade-cps/group`, {
+ this.$HTTP.post(`/api/smis/group`, {
groupCategory: 1,
groupType: "group_fixture",
parentId: this.selectNode.id,
@@ -378,7 +378,7 @@
this.init()
})
} else {
- this.$HTTP.put(`/api/blade-cps/group`, {
+ this.$HTTP.put(`/api/smis/group`, {
groupCategory: 1,
groupType: "group_fixture",
parentId: this.selectNode.id,
@@ -411,14 +411,14 @@
},
confirm() {
if (this.trayForm.id) {
- return this.$HTTP.put(`/api/blade-cps/fixture/update`, {
+ return this.$HTTP.put(`/api/smis/fixture/update`, {
...this.trayForm
}).then(res => {
this.dialog = false
this.queryInfo()
})
}
- this.$HTTP.post(`/api/blade-cps/fixture/${this.trayForm.fixtureGroupId}/insert`, {
+ this.$HTTP.post(`/api/smis/fixture/${this.trayForm.fixtureGroupId}/insert`, {
...this.trayForm
}).then(res => {
this.dialog = false
@@ -426,12 +426,12 @@
})
},
del(ids) {
- this.$HTTP.delete(`/api/blade-cps/fixture/remove`, ids.map(v => v.id)).then(res => {
+ this.$HTTP.delete(`/api/smis/fixture/remove`, ids.map(v => v.id)).then(res => {
this.queryInfo()
})
},
init() {
- this.$HTTP.post(`/api/blade-cps/tray/tooling-tree`, {
+ this.$HTTP.post(`/api/smis/tray/tooling-tree`, {
groupCategory: 1,
groupType: "group_fixture"
}).then(res => {
@@ -442,10 +442,10 @@
queryInfo() {
if (!this.selectNode.id) return
this.$refs?.table?.reload()
- // this.$HTTP.get(`/api/blade-cps/tray/${this.selectNode.id}`).then(res => {
+ // this.$HTTP.get(`/api/smis/tray/${this.selectNode.id}`).then(res => {
// this.info = res.data
// })
- // this.$HTTP.get(`/api/blade-cps/tray-surface/list/${this.selectNode.id}`).then(res => {
+ // this.$HTTP.get(`/api/smis/tray-surface/list/${this.selectNode.id}`).then(res => {
// this.info = res.data
// })
},
@@ -460,7 +460,7 @@
async queryChildInfo(id) {
if (!id) return
this.showLoading = true
- await this.$HTTP.get(`/api/blade-cps/fixture/get/${id}`).then(res => {
+ await this.$HTTP.get(`/api/smis/fixture/get/${id}`).then(res => {
this.info = res.data
this.infoList = [
{
@@ -473,7 +473,7 @@
]
this.fileList = res.data.toolAppendixVOList
})
- // await this.$HTTP.get(`/api/blade-cps/tray-surface/list/${id}`).then(res => {
+ // await this.$HTTP.get(`/api/smis/tray-surface/list/${id}`).then(res => {
// this.infoList = res.data
// })
this.showLoading = false
@@ -482,7 +482,7 @@
this.selectNode = node
},
table_del1(row) {
- this.$HTTP.delete(`/api/blade-cps/tray-fixture`, [{ id: row.id, othersId: row.othersId }]).then(res => {
+ this.$HTTP.delete(`/api/smis/tray-fixture`, [{ id: row.id, othersId: row.othersId }]).then(res => {
this.$message.success('鎿嶄綔鎴愬姛')
this.queryChildInfo(this.info.id)
})
diff --git a/src/views/console/tooling/tray-fixturePreview.vue b/src/views/console/tooling/tray-fixturePreview.vue
index 5b07fcd..408fb00 100644
--- a/src/views/console/tooling/tray-fixturePreview.vue
+++ b/src/views/console/tooling/tray-fixturePreview.vue
@@ -22,8 +22,8 @@
<!-- <el-main> -->
<el-container>
<el-header>
- <import-table style="margin:0 8px" exportUrl="/api/blade-cps/tray-fixture/excel/template"
- uploadUrl="/api/blade-cps/tray-fixture/excel/import"></import-table>
+ <import-table style="margin:0 8px" exportUrl="/api/smis/tray-fixture/excel/template"
+ uploadUrl="/api/smis/tray-fixture/excel/import"></import-table>
</el-header>
<el-main v-if="selectNode.id">
<el-row>
@@ -114,7 +114,7 @@
},
methods: {
init() {
- this.$HTTP.post(`/api/blade-cps/tray/tray-tree`, {
+ this.$HTTP.post(`/api/smis/tray/tray-tree`, {
groupCategory: 1,
groupType: "group_tray"
}).then(res => {
@@ -122,19 +122,19 @@
})
},
async queryInfo() {
- this.$HTTP.get(`/api/blade-cps/tray/${this.selectNode.id}`).then(res => {
+ this.$HTTP.get(`/api/smis/tray/${this.selectNode.id}`).then(res => {
this.info = res.data
})
- this.$HTTP.post(`/api/blade-cps/tray/tool-appendix?id=${this.selectNode.id}`).then(res => {
+ this.$HTTP.post(`/api/smis/tray/tool-appendix?id=${this.selectNode.id}`).then(res => {
this.fileList = res.data
})
- await this.$HTTP.get(`/api/blade-cps/tray-surface/list/${this.selectNode.id}`).then(res => {
+ await this.$HTTP.get(`/api/smis/tray-surface/list/${this.selectNode.id}`).then(res => {
this.surfaceList = res.data
this.activeNames = res.data?.[0]?.id
})
Promise.all(this.surfaceList.map(item => {
- return this.$HTTP.get(`/api/blade-cps/tray-fixture/list/fixture?faceId=${item.id}`)
+ return this.$HTTP.get(`/api/smis/tray-fixture/list/fixture?faceId=${item.id}`)
})).then(data => {
data.forEach((v, i) => {
this.surfaceList[i].list = v.data
diff --git a/src/views/console/workstation/CollDialog.vue b/src/views/console/workstation/CollDialog.vue
index d734859..e7e979d 100644
--- a/src/views/console/workstation/CollDialog.vue
+++ b/src/views/console/workstation/CollDialog.vue
@@ -220,7 +220,7 @@
// }
// },
getList(params) {
- this.$HTTP.get(`/api/blade-cps/workstation/listDatapointsByWorkstationId`, {}, { params }).then(res => {
+ this.$HTTP.get(`/api/smis/workstation/listDatapointsByWorkstationId`, {}, { params }).then(res => {
try {
this.cols = JSON.parse(res.data.dpHead)
this.addOptions(this.cols)
@@ -266,7 +266,7 @@
if (len != this.tabledata.length) {
return this.$message.warning('鏁版嵁鐐瑰悕绉颁笉鑳介噸澶�')
}
- this.$HTTP.put('/api/blade-cps/workstation/saveDatapoints', {
+ this.$HTTP.put('/api/smis/workstation/saveDatapoints', {
dpConfig: JSON.stringify(this.tabledata.map(v => {
delete v.status
return v
diff --git a/src/views/console/workstation/CollTable.vue b/src/views/console/workstation/CollTable.vue
index e7903df..3e0a57d 100644
--- a/src/views/console/workstation/CollTable.vue
+++ b/src/views/console/workstation/CollTable.vue
@@ -70,7 +70,7 @@
})
},
getList(params) {
- this.$HTTP.get(`/api/blade-cps/workstation/listDatapointsByWorkstationId`, {}, { params }).then(res => {
+ this.$HTTP.get(`/api/smis/workstation/listDatapointsByWorkstationId`, {}, { params }).then(res => {
try {
this.cols = JSON.parse(res.data.dpHead)
this.addOptions(this.cols)
diff --git a/src/views/console/workstation/Dialog.vue b/src/views/console/workstation/Dialog.vue
index 1af476e..a25cbc5 100644
--- a/src/views/console/workstation/Dialog.vue
+++ b/src/views/console/workstation/Dialog.vue
@@ -327,10 +327,10 @@
this.form[key] = params[key]
})
- this.$HTTP.get(`/api/blade-cps/workstation/get?workstationId=${params.id}`).then(res => {
+ this.$HTTP.get(`/api/smis/workstation/get?workstationId=${params.id}`).then(res => {
this.form = res?.data
if (this.form.calendarCode && !this.form.calendarCodeWaiting) this.form.calendarCodeWaiting = this.form.calendarCode
- this.$HTTP.get(`/api/blade-cps/workstation-workbench/listWorkbench?workstationId=${params.id}`).then(res => {
+ this.$HTTP.get(`/api/smis/workstation-workbench/listWorkbench?workstationId=${params.id}`).then(res => {
this.form.workbenchVOList = res?.data?.workstationList || []
})
})
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index 4aa08d1..d16be18 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -474,7 +474,7 @@
methods: {
// 鏁版嵁鐐瑰鍑�
getExport() {
- this.$HTTP.get(`/api/blade-cps/workstation/export-dp?` + this.$TOOL.qsStringify({
+ this.$HTTP.get(`/api/smis/workstation/export-dp?` + this.$TOOL.qsStringify({
workstationId: this.previewData.id
})).then(res => {
if (res.code == 200) {
@@ -640,19 +640,19 @@
return
}
console.log(data, '>>>>>>>>>>>')
- data.machineId && this.$HTTP.get(`/api/blade-cps/workstation/listDmpVariablesByMachineId?machineId=${data.machineId}`).then(res => {
+ data.machineId && this.$HTTP.get(`/api/smis/workstation/listDmpVariablesByMachineId?machineId=${data.machineId}`).then(res => {
this.list = res?.data
// Object.keys(this.basic).forEach(key => {
// this.basic[key] = res?.data?.[key] || '-'
// })
})
- this.$HTTP.get(`/api/blade-cps/workstation/listDmpVariablesByWorkstationId?workstationId=${data.id}`).then(res => {
+ this.$HTTP.get(`/api/smis/workstation/listDmpVariablesByWorkstationId?workstationId=${data.id}`).then(res => {
// this.list = res?.data?.dmpVariablesVOList
Object.keys(this.basic).forEach(key => {
this.basic[key] = res?.data?.[key] || '-'
})
})
- this.$HTTP.get(`/api/blade-cps/workstation-workbench/listWorkbench?workstationId=${data.id}`).then(res => {
+ this.$HTTP.get(`/api/smis/workstation-workbench/listWorkbench?workstationId=${data.id}`).then(res => {
Object.keys(this.info).forEach(key => {
this.info[key] = res?.data?.[key] || '-'
})
@@ -688,7 +688,7 @@
this.$refs.dialog.open('edit', row)
},
table_del(row, index, type) {
- this.$HTTP.delete(`/api/blade-cps/workstation?type=0&workstationIds=${row.id}`).then(res => {
+ this.$HTTP.delete(`/api/smis/workstation?type=0&workstationIds=${row.id}`).then(res => {
this.search()
})
},
@@ -696,12 +696,12 @@
this.selection = selection
},
batchDel() {
- this.$HTTP.delete(`/api/blade-cps/workstation?type=0&workstationIds=${this.selection.map(item => item.id).join(',')}`).then(res => {
+ this.$HTTP.delete(`/api/smis/workstation?type=0&workstationIds=${this.selection.map(item => item.id).join(',')}`).then(res => {
this.search()
})
},
saveInfo() {
- this.$HTTP.post('/api/blade-cps/workstation-wcs/save', this.workbenchVOList).then(res => {
+ this.$HTTP.post('/api/smis/workstation-wcs/save', this.workbenchVOList).then(res => {
this.editFlag = false
this.showTable = true
})
diff --git a/src/views/dnc/craft/document/File.vue b/src/views/dnc/craft/document/File.vue
index e75ad71..f2b6099 100644
--- a/src/views/dnc/craft/document/File.vue
+++ b/src/views/dnc/craft/document/File.vue
@@ -272,7 +272,7 @@
loadNode(node, resolve) {
let id = node.level === 0 ? '' : node.data.id
if (node.level === 0) {
- return this.$HTTP.get(`/api/blade-cps/group/getRootNode?groupCategory=1&groupType=group_workstation`).then(res => {
+ return this.$HTTP.get(`/api/smis/group/getRootNode?groupCategory=1&groupType=group_workstation`).then(res => {
this.nodeClick(res.data)
resolve([res.data].map(v => {
return {
@@ -283,7 +283,7 @@
}))
})
} else {
- this.$HTTP.get(`/api/blade-cps/group/groupWorkstation/lazy?groupId=${id}`).then(res => {
+ this.$HTTP.get(`/api/smis/group/groupWorkstation/lazy?groupId=${id}`).then(res => {
resolve(res.data.map(v => {
return {
...v,
diff --git a/src/views/dnc/file/admin/index.vue b/src/views/dnc/file/admin/index.vue
index 73a5875..55e0b2d 100644
--- a/src/views/dnc/file/admin/index.vue
+++ b/src/views/dnc/file/admin/index.vue
@@ -115,7 +115,7 @@
})
},
init() {
- this.$HTTP.post(`/api/blade-cps/group/groupWorkstation`, { groupCategory: 1, groupType: 'group_workstation' }).then(res => {
+ this.$HTTP.post(`/api/smis/group/groupWorkstation`, { groupCategory: 1, groupType: 'group_workstation' }).then(res => {
this.treeData = this.formatData(res.data)
})
diff --git a/src/views/dnc/setting/FTP.vue b/src/views/dnc/setting/FTP.vue
index 0043cc2..c218118 100644
--- a/src/views/dnc/setting/FTP.vue
+++ b/src/views/dnc/setting/FTP.vue
@@ -177,7 +177,7 @@
},
methods: {
init() {
- this.$HTTP.post(`/api/blade-cps/group/groupWorkstation`, { groupCategory: 1, groupType: 'group_workstation' }).then(res => {
+ this.$HTTP.post(`/api/smis/group/groupWorkstation`, { groupCategory: 1, groupType: 'group_workstation' }).then(res => {
this.treeData = this.formatData(res.data)
})
@@ -232,7 +232,7 @@
})
},
getAddList(transferDirectorId) {
- return this.$HTTP.post(`/api/blade-cps/group/groupFtpDirectory/ftp`, { groupCategory: 1, groupType: 'group_workstation', transferDirectorId }).then(res => {
+ return this.$HTTP.post(`/api/smis/group/groupFtpDirectory/ftp`, { groupCategory: 1, groupType: 'group_workstation', transferDirectorId }).then(res => {
this.addTreeData = this.formatData(res.data, null, 'disabled')
return this.addTreeData
})
diff --git a/src/views/home/widgets/components/mdcDeviceStatus.vue b/src/views/home/widgets/components/mdcDeviceStatus.vue
index 9585275..259622d 100644
--- a/src/views/home/widgets/components/mdcDeviceStatus.vue
+++ b/src/views/home/widgets/components/mdcDeviceStatus.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-16 15:22:46
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-09-06 14:12:45
+ * @LastEditTime: 2024-11-01 14:54:21
* @FilePath: /CPSnew/smart-web/src/views/home/widgets/components/mdcDeviceStatus.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -44,7 +44,7 @@
this.$router.push({path: '/mdc/realtime-status/index',query:{currentTag: item.status}});
},
getdevicestatus() {
- this.$HTTP.get(`/api/blade-mdc/work-station-analysis/device-status-statistics`).then(res=> {
+ this.$HTTP.get(`/api/mdc/work-station-analysis/device-status-statistics`).then(res=> {
if(res.code == 200) {
res.data[0].icon = "Position";
res.data[1].icon = "Loading";
diff --git a/src/views/home/widgets/components/mdcEquipmentRun.vue b/src/views/home/widgets/components/mdcEquipmentRun.vue
index f3a3661..f75efbb 100644
--- a/src/views/home/widgets/components/mdcEquipmentRun.vue
+++ b/src/views/home/widgets/components/mdcEquipmentRun.vue
@@ -191,7 +191,7 @@
return newData
},
getParentData() {
- this.$HTTP.post('/api/blade-cps/group/groupWorkstation/type', {
+ this.$HTTP.post('/api/smis/group/groupWorkstation/type', {
groupCategory: 1,
groupType: "group_workstation"
}).then(({ code, data }) => {
diff --git a/src/views/home/widgets/components/mdcRunning.vue b/src/views/home/widgets/components/mdcRunning.vue
index 52fcb11..dbcb9d6 100644
--- a/src/views/home/widgets/components/mdcRunning.vue
+++ b/src/views/home/widgets/components/mdcRunning.vue
@@ -194,7 +194,7 @@
return newData
},
getParentData() {
- this.$HTTP.post('/api/blade-cps/group/groupWorkstation/type', {
+ this.$HTTP.post('/api/smis/group/groupWorkstation/type', {
groupCategory: 1,
groupType: "group_workstation"
}).then(({ code, data }) => {
diff --git a/src/views/master/frock/tray-deposit/index.vue b/src/views/master/frock/tray-deposit/index.vue
index ae144bc..32f84e7 100644
--- a/src/views/master/frock/tray-deposit/index.vue
+++ b/src/views/master/frock/tray-deposit/index.vue
@@ -119,8 +119,8 @@
label: 'name',
disabled: 'isArea'
},
- exportUrl: '/api/blade-cps/tray-storage/excel/template',
- uploadUrl: '/api/blade-cps/tray-storage/excel/import',
+ exportUrl: '/api/smis/tray-storage/excel/template',
+ uploadUrl: '/api/smis/tray-storage/excel/import',
treeData: [],
selectNode: {},
apiObj: {
@@ -128,7 +128,7 @@
let params = {
warehouseStationId: this.selectNode.id
}
- return await this.$HTTP.get(`/api/blade-cps/tray-storage/list`, {}, { params }).then(res => {
+ return await this.$HTTP.get(`/api/smis/tray-storage/list`, {}, { params }).then(res => {
return {
data: {
records: res.data,
@@ -153,10 +153,10 @@
},
methods: {
init() {
- this.$HTTP.get(`/api/blade-cps/tray-storage/tree`).then(res => {
+ this.$HTTP.get(`/api/smis/tray-storage/tree`).then(res => {
this.treeData = res.data
})
- this.$HTTP.get(`/api/blade-cps/material-type/list`).then(res => {
+ this.$HTTP.get(`/api/smis/material-type/list`).then(res => {
this.options.typeId = res.data.map(item => ({
label: item.name,
value: item.id
@@ -174,12 +174,12 @@
this.queryInfo(node.id)
},
queryInfo(id) {
- this.$HTTP.get(`/api/blade-cps/warehouse-station/get/${id}`).then(res => {
+ this.$HTTP.get(`/api/smis/warehouse-station/get/${id}`).then(res => {
this.selectNode = res.data
})
},
table_add() {
- this.$HTTP.post(`/api/blade-cps/tray/un-used-tray-tree`, { groupCategory: 1, groupType: 'group_tray' }).then(res => {
+ this.$HTTP.post(`/api/smis/tray/un-used-tray-tree`, { groupCategory: 1, groupType: 'group_tray' }).then(res => {
if (res.data?.length > 0) {
this.todoList = res.data
this.dialogVisible = true
@@ -191,14 +191,14 @@
add() {
let ids = this.$refs.group1.getCheckedNodes()
console.log(ids)
- this.$HTTP.post(`/api/blade-cps/tray-storage`, { warehouseStationId: this.selectNode.id, trayIds: ids.map(v => v.id) }).then(res => {
+ this.$HTTP.post(`/api/smis/tray-storage`, { warehouseStationId: this.selectNode.id, trayIds: ids.map(v => v.id) }).then(res => {
this.$message.success("鎿嶄綔鎴愬姛")
this.dialogVisible = false
this.$refs.table.reload()
})
},
table_del(ids) {
- this.$HTTP.delete(`/api/blade-cps/tray-storage`, { ids: ids.map(v => ({ id: v.id, othersId: v.trayId })) }).then(res => {
+ this.$HTTP.delete(`/api/smis/tray-storage`, { ids: ids.map(v => ({ id: v.id, othersId: v.trayId })) }).then(res => {
this.$message.success("鎿嶄綔鎴愬姛")
this.$refs.table.reload()
})
diff --git a/src/views/master/person/main/department.vue b/src/views/master/person/main/department.vue
index 26ae0a3..1b17c96 100644
--- a/src/views/master/person/main/department.vue
+++ b/src/views/master/person/main/department.vue
@@ -73,7 +73,7 @@
},
methods: {
getOrganizationList() {
- this.$HTTP.get(`/api/blade-cps/organization/tree?groupType=group_organization&groupCategory=1`).then(res=> {
+ this.$HTTP.get(`/api/smis/organization/tree?groupType=group_organization&groupCategory=1`).then(res=> {
if(res.code == 200) {
this.departmentList = res.data;
}
@@ -109,7 +109,7 @@
obj.status = obj.status ? 1 : 0;
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
- this.$HTTP[postMethods]("/api/blade-cps/group",obj).then(res=> {
+ this.$HTTP[postMethods]("/api/smis/group",obj).then(res=> {
if(res.code == 200) {
this.$emit('success', this.depatmentForm, this.mode);
this.visible = false;
diff --git a/src/views/master/person/main/personDepartment.vue b/src/views/master/person/main/personDepartment.vue
index 7b0e874..8292672 100644
--- a/src/views/master/person/main/personDepartment.vue
+++ b/src/views/master/person/main/personDepartment.vue
@@ -78,8 +78,8 @@
name: "bakalaka",
data(){
return {
- uploadUrl: "/api/blade-cps/group/import?groupType=group_organization&groupCategory=1",
- exportUrl: "/api/blade-cps/organization/export-template",
+ uploadUrl: "/api/smis/group/import?groupType=group_organization&groupCategory=1",
+ exportUrl: "/api/smis/organization/export-template",
selectId: "",
selection: [],
total: 0,
@@ -113,7 +113,7 @@
return !row.children; //鍙鐢ㄦ湁children鐨勯�夐」
},
getExport() {
- this.$HTTP.get(`/api/blade-cps/organization/export-organization?`+this.$TOOL.qsStringify(this.searchData)).then(res=> {
+ this.$HTTP.get(`/api/smis/organization/export-organization?`+this.$TOOL.qsStringify(this.searchData)).then(res=> {
if(res.code == 200) {
window.open(res.data.link);
}
@@ -123,7 +123,7 @@
this.getOrganizationList();
},
delData(type) {
- this.$HTTP.delete(`/api/blade-cps/organization?ids=${this.selectId}&type=${type}`).then(res=> {
+ this.$HTTP.delete(`/api/smis/organization?ids=${this.selectId}&type=${type}`).then(res=> {
if(res.code == 200) {
this.$message.success("鎿嶄綔鎴愬姛");
this.delPersonModel = false;
@@ -145,7 +145,7 @@
});
},
getOrganizationList() {
- this.$HTTP.get(`/api/blade-cps/organization/tree?` + this.$TOOL.qsStringify(this.searchData)).then(res=> {
+ this.$HTTP.get(`/api/smis/organization/tree?` + this.$TOOL.qsStringify(this.searchData)).then(res=> {
if(res.code == 200) {
this.departmentList = this.removeHasChildren(res.data);
this.departmentList[0]._disabled = true;
diff --git a/src/views/master/person/main/personPerson.vue b/src/views/master/person/main/personPerson.vue
index 875a0b5..181f165 100644
--- a/src/views/master/person/main/personPerson.vue
+++ b/src/views/master/person/main/personPerson.vue
@@ -167,8 +167,8 @@
data() {
return {
authorization: {},
- uploadUrl: "/api/blade-cps/employee/import-employee",
- exportUrl: "/api/blade-cps/employee/export-template",
+ uploadUrl: "/api/smis/employee/import-employee",
+ exportUrl: "/api/smis/employee/export-template",
titleList: [],
delPersonModel: false,
searchIcon: "el-icon-search",
@@ -219,14 +219,14 @@
avatarDel(index) {
var obj = this.tableData[index];
obj.avatar = "";
- this.$HTTP.post(`/api/blade-cps/employee/submit`,obj).then(res=> {
+ this.$HTTP.post(`/api/smis/employee/submit`,obj).then(res=> {
this.searchPerson();
})
},
handleAvatarSuccess(file,index) {
var obj = this.tableData[index];
obj.avatar = file.data.link;
- this.$HTTP.post(`/api/blade-cps/employee/submit`,obj).then(res=> {
+ this.$HTTP.post(`/api/smis/employee/submit`,obj).then(res=> {
this.searchPerson();
})
},
@@ -240,7 +240,7 @@
return isJPG;
},
getExport() {
- this.$HTTP.get(`/api/blade-cps/employee/export-employee?` + this.$TOOL.qsStringify(this.searchData)).then(res => {
+ this.$HTTP.get(`/api/smis/employee/export-employee?` + this.$TOOL.qsStringify(this.searchData)).then(res => {
if (res.code == 200) {
window.open(res.data.link);
}
@@ -269,7 +269,7 @@
this.searchPerson();
},
getOrganizationList() { //閮ㄩ棬
- this.$HTTP.get(`/api/blade-cps/organization/tree?groupType=group_organization&groupCategory=1`).then(res => {
+ this.$HTTP.get(`/api/smis/organization/tree?groupType=group_organization&groupCategory=1`).then(res => {
if (res.code == 200) {
this.titleList = res.data;
this.titleList[0].active = true;
@@ -293,7 +293,7 @@
})
},
delData(type) {
- this.$HTTP.post(`/api/blade-cps/employee/remove?ids=${this.selectId}&type=${type}`).then(res => {
+ this.$HTTP.post(`/api/smis/employee/remove?ids=${this.selectId}&type=${type}`).then(res => {
if (res.code == 200) {
this.$message.success("鎿嶄綔鎴愬姛");
this.delPersonModel = false;
@@ -311,7 +311,7 @@
this.searchPerson();
},
searchPerson() {
- this.$HTTP.get(`/api/blade-cps/employee/list?` + this.$TOOL.qsStringify(this.searchData)).then(res => {
+ this.$HTTP.get(`/api/smis/employee/list?` + this.$TOOL.qsStringify(this.searchData)).then(res => {
if (res.code == 200) {
res.data.records.forEach(item => {
if (item.dictValue == "鍦ㄨ亴") {
@@ -337,7 +337,7 @@
})
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
- this.$HTTP.put(`/api/blade-cps/employee/change-organization?organizationId=${this.departmentFrom.parentId}&employeeIds=${employeeIds.join(",")}`).then(res => {
+ this.$HTTP.put(`/api/smis/employee/change-organization?organizationId=${this.departmentFrom.parentId}&employeeIds=${employeeIds.join(",")}`).then(res => {
if (res.code == 200) {
this.searchPerson();
this.departmentVisible = false; //閮ㄩ棬璋冩暣
diff --git a/src/views/master/person/main/save.vue b/src/views/master/person/main/save.vue
index 67470c1..a8782bf 100644
--- a/src/views/master/person/main/save.vue
+++ b/src/views/master/person/main/save.vue
@@ -165,7 +165,7 @@
})
},
getOrganizationList() {
- this.$HTTP.get(`/api/blade-cps/organization/tree?groupType=group_organization&groupCategory=1`).then(res => {
+ this.$HTTP.get(`/api/smis/organization/tree?groupType=group_organization&groupCategory=1`).then(res => {
if (res.code == 200) {
this.departmentList = res.data;
this.addPersonForm.organizationId = res.data[0].id;
@@ -213,7 +213,7 @@
obj.postId = obj.postId.join(",");
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
- this.$HTTP.post("/api/blade-cps/employee/submit", obj).then(res => {
+ this.$HTTP.post("/api/smis/employee/submit", obj).then(res => {
if (res.code == 200) {
this.$emit('success', this.addPersonForm, this.mode);
this.visible = false;
@@ -229,7 +229,7 @@
},
//琛ㄥ崟娉ㄥ叆鏁版嵁
setData(data) {
- this.$HTTP.get(`/api/blade-cps/employee/detail/${data.id}`).then(res => {
+ this.$HTTP.get(`/api/smis/employee/detail/${data.id}`).then(res => {
if (res.code == 200) {
if (res.data.postId) {
res.data.postId = res.data.postId.split(",");
diff --git a/src/views/mdc/MYTree.vue b/src/views/mdc/MYTree.vue
index 28067b8..93e9090 100644
--- a/src/views/mdc/MYTree.vue
+++ b/src/views/mdc/MYTree.vue
@@ -75,7 +75,7 @@
data.title)
},
getList() {
- this.$HTTP.post('/api/blade-cps/group/groupWorkstation/type', {
+ this.$HTTP.post('/api/smis/group/groupWorkstation/type', {
groupCategory: 1,
groupType: "group_workstation"
}).then(({ code, data }) => {
diff --git a/src/views/mdc/add-feedback.vue b/src/views/mdc/add-feedback.vue
index 90c53f5..0010df8 100644
--- a/src/views/mdc/add-feedback.vue
+++ b/src/views/mdc/add-feedback.vue
@@ -80,14 +80,14 @@
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
- this.$HTTP.post("/api/blade-cps/workstation-wcs-feedback/overwrite-feedback-check",obj).then(res=> {
+ this.$HTTP.post("/api/mdc/workstation-wcs-feedback/overwrite-feedback-check",obj).then(res=> {
that.isSaveing = false;
if(res.code == 200) {
if(res.data) {
that.$confirm(`鍙嶉鐨勬椂闂翠笌宸叉湁鍙嶉閲嶅彔锛屾槸鍚﹁鐩朻, '', {
type: 'warning'
}).then(() => {
- that.$HTTP.post("/api/blade-cps/workstation-wcs-feedback/start-feedback-by-no-immediate",obj).then(res=> {
+ that.$HTTP.post("/api/mdc/workstation-wcs-feedback/start-feedback-by-no-immediate",obj).then(res=> {
if(res.code == 200) {
that.$message.success("鎿嶄綔鎴愬姛");
that.$emit('success', this.addDictForm, this.mode);
@@ -96,7 +96,7 @@
})
}).catch(() => {})
}else {
- that.$HTTP.post("/api/blade-cps/workstation-wcs-feedback/start-feedback-by-no-immediate",obj).then(res=> {
+ that.$HTTP.post("/api/mdc/workstation-wcs-feedback/start-feedback-by-no-immediate",obj).then(res=> {
if(res.code == 200) {
that.$message.success("鎿嶄綔鎴愬姛");
that.$emit('success', this.addDictForm, this.mode);
diff --git a/src/views/mdc/add-station-status.vue b/src/views/mdc/add-station-status.vue
index 1897390..78dbfaa 100644
--- a/src/views/mdc/add-station-status.vue
+++ b/src/views/mdc/add-station-status.vue
@@ -108,7 +108,7 @@
return this
},
getfeedBackStatusList() {
- this.$HTTP.get("/api/blade-cps/global_wcs/wcs-achievements").then(res=> {
+ this.$HTTP.get("/api/smis/global_wcs/wcs-achievements").then(res=> {
if(res.code == 200) {
res.data.forEach(item=> {
if(item.type == "4") {
@@ -126,14 +126,14 @@
this.$refs.dialogForm.validate(async (valid) => {
if (valid) {
this.isSaveing = true;
- this.$HTTP.post("/api/blade-cps/workstation-wcs-feedback/overwrite-feedback-check",obj).then(res=> {
+ this.$HTTP.post("/api/mdc/workstation-wcs-feedback/overwrite-feedback-check",obj).then(res=> {
that.isSaveing = false;
if(res.code == 200) {
if(res.data) {
that.$confirm(`鍙嶉鐨勬椂闂翠笌宸叉湁鍙嶉閲嶅彔锛屾槸鍚﹁鐩朻, '', {
type: 'warning'
}).then(() => {
- that.$HTTP.post("/api/blade-cps/workstation-wcs-feedback/start-feedback-by-no-immediate",obj).then(res=> {
+ that.$HTTP.post("/api/mdc/workstation-wcs-feedback/start-feedback-by-no-immediate",obj).then(res=> {
if(res.code == 200) {
that.$message.success("鎿嶄綔鎴愬姛");
that.$emit('success', this.addDictForm, this.mode);
@@ -142,7 +142,7 @@
})
}).catch(() => {})
}else {
- that.$HTTP.post("/api/blade-cps/workstation-wcs-feedback/start-feedback-by-no-immediate",obj).then(res=> {
+ that.$HTTP.post("/api/mdc/workstation-wcs-feedback/start-feedback-by-no-immediate",obj).then(res=> {
if(res.code == 200) {
that.$message.success("鎿嶄綔鎴愬姛");
that.$emit('success', this.addDictForm, this.mode);
@@ -162,7 +162,7 @@
//琛ㄥ崟娉ㄥ叆鏁版嵁
setData(lastLevelId){
this.getfeedBackStatusList(); //鑾峰彇鐘舵�乴ist
- this.$HTTP.get(`/api/blade-cps/workstation-wcs-feedback/latest?workstationId=${lastLevelId}`).then(res=> {
+ this.$HTTP.get(`/api/mdc/workstation-wcs-feedback/latest?workstationId=${lastLevelId}`).then(res=> {
if(res.code == 200) {
if(res.data == null) {
this.isShow = false;
diff --git a/src/views/mdc/alarm-statistics.vue b/src/views/mdc/alarm-statistics.vue
index 9ada019..4c136c6 100644
--- a/src/views/mdc/alarm-statistics.vue
+++ b/src/views/mdc/alarm-statistics.vue
@@ -35,12 +35,12 @@
<el-main>
<el-tabs tab-position="top" v-model="activeName" type="card">
<el-tab-pane label="鎸夌彮娆＄粺璁�" name="shift">
- <Shift colname="浜ч噺" url="/api/blade-mdc/alarm/summary-shift-graph" ref="shift"
+ <Shift colname="浜ч噺" url="/api/mdc/alarm/summary-shift-graph" ref="shift"
v-if="activeName == 'shift'">
</Shift>
</el-tab-pane>
<el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
- <Time url="/api/blade-mdc/alarm/summary-graph" ref="time" v-if="activeName == 'time'">
+ <Time url="/api/mdc/alarm/summary-graph" ref="time" v-if="activeName == 'time'">
</Time>
</el-tab-pane>
</el-tabs>
@@ -104,7 +104,7 @@
methods: {
exportExcel(statisticalMethod) {
let { start, end } = this.$refs.export.format(this.time[0], this.time[1], statisticalMethod)
- this.$HTTP.post(`/api/blade-mdc/alarm/export-alarm`, {
+ this.$HTTP.post(`/api/mdc/alarm/export-alarm`, {
startTime: start,
endTime: end,
enums: statisticalMethod,
diff --git a/src/views/mdc/components/Shift.vue b/src/views/mdc/components/Shift.vue
index 4c842b1..47df7a6 100644
--- a/src/views/mdc/components/Shift.vue
+++ b/src/views/mdc/components/Shift.vue
@@ -55,7 +55,7 @@
export default {
props: {
url: {
- default: '/api/blade-mdc/efficiency-analysis',
+ default: '/api/mdc/efficiency-analysis',
type: String,
},
colname: {
@@ -129,7 +129,7 @@
},
getTime(data) {
- return this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
+ return this.$HTTP.post('/api/mdc/efficiency-analysis/interval', {
...data
}).then(res => {
if (res.code === 200) {
diff --git a/src/views/mdc/components/ShiftAlarm.vue b/src/views/mdc/components/ShiftAlarm.vue
index 0b67709..a9b9e1a 100644
--- a/src/views/mdc/components/ShiftAlarm.vue
+++ b/src/views/mdc/components/ShiftAlarm.vue
@@ -62,7 +62,7 @@
},
data() {
return {
- sheetUrl: '/api/blade-mdc/alarm/data-shift-sheet',
+ sheetUrl: '/api/mdc/alarm/data-shift-sheet',
isShowTable: false,
params: {
enums: "SHIFT",
diff --git a/src/views/mdc/components/Time.vue b/src/views/mdc/components/Time.vue
index f7b94ea..63ad963 100644
--- a/src/views/mdc/components/Time.vue
+++ b/src/views/mdc/components/Time.vue
@@ -42,7 +42,7 @@
export default {
props: {
url: {
- default: '/api/blade-mdc/efficiency-analysis',
+ default: '/api/mdc/efficiency-analysis',
type: String,
},
options: {
@@ -146,7 +146,7 @@
},
getTime(data) {
//return Promise.resolve()
- return this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
+ return this.$HTTP.post('/api/mdc/efficiency-analysis/interval', {
...data
}).then(res => {
if (res.code === 200) {
diff --git a/src/views/mdc/components/TimeAlarm.vue b/src/views/mdc/components/TimeAlarm.vue
index f6a0932..5e8e0d5 100644
--- a/src/views/mdc/components/TimeAlarm.vue
+++ b/src/views/mdc/components/TimeAlarm.vue
@@ -78,7 +78,7 @@
},
data() {
return {
- sheetUrl: '/api/blade-mdc/alarm/data-sheet',
+ sheetUrl: '/api/mdc/alarm/data-sheet',
apiObj0: '',
apiObj1: '',
apiObj2: '',
@@ -121,7 +121,7 @@
},
getTime(data) {
return Promise.all([
- this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
+ this.$HTTP.post('/api/mdc/efficiency-analysis/interval', {
...data,
statisticalMethod: "DAY"
}).then(res => {
@@ -141,7 +141,7 @@
}
this.queryDay(this.btnListDay[0])
}),
- this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
+ this.$HTTP.post('/api/mdc/efficiency-analysis/interval', {
...data,
statisticalMethod: "WEEK"
}).then(res => {
@@ -161,7 +161,7 @@
}
}),
- this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
+ this.$HTTP.post('/api/mdc/efficiency-analysis/interval', {
...data,
statisticalMethod: "MONTH"
}).then(res => {
diff --git a/src/views/mdc/components/recordChartsByDate.vue b/src/views/mdc/components/recordChartsByDate.vue
index a547eb8..9d87f86 100644
--- a/src/views/mdc/components/recordChartsByDate.vue
+++ b/src/views/mdc/components/recordChartsByDate.vue
@@ -92,7 +92,7 @@
machineFeedback: true,
workstationInfoList: this.workstationInfoList
}
- this.$HTTP.post(`/api/blade-mdc/status-record/status-record-by-date?current=${this.current}&size=${this.size}`,obj).then(res => {
+ this.$HTTP.post(`/api/mdc/status-record/status-record-by-date?current=${this.current}&size=${this.size}`,obj).then(res => {
if (res.code === 200) {
var yAxisData = [];
var newData = [];
diff --git a/src/views/mdc/components/recordChartsByWorkstation.vue b/src/views/mdc/components/recordChartsByWorkstation.vue
index 2413dfa..f8cdab3 100644
--- a/src/views/mdc/components/recordChartsByWorkstation.vue
+++ b/src/views/mdc/components/recordChartsByWorkstation.vue
@@ -87,7 +87,7 @@
getCharts() {
if(!this.setWork) return;
if(this.select.length == 0) return;
- this.$HTTP.post(`/api/blade-mdc/status-record/status-record-by-workstation?current=${this.current}&size=${this.size}`,this.setWork).then(res => {
+ this.$HTTP.post(`/api/mdc/status-record/status-record-by-workstation?current=${this.current}&size=${this.size}`,this.setWork).then(res => {
if (res.code === 200) {
var yAxisData = [];
var newData = [];
diff --git a/src/views/mdc/configComp/Board.vue b/src/views/mdc/configComp/Board.vue
index 79e2b22..33f4e6e 100644
--- a/src/views/mdc/configComp/Board.vue
+++ b/src/views/mdc/configComp/Board.vue
@@ -135,7 +135,7 @@
})))
})
]).then(res => {
- this.$HTTP.get('/api/blade-cps/apply-settings/list-workstation-group?groupCategory=&groupTag=&groupType=group_workstation').then(res => {
+ this.$HTTP.get('/api/smis/apply-settings/list-workstation-group?groupCategory=&groupTag=&groupType=group_workstation').then(res => {
this.dicts.forEach(v => {
v.children = res.data.filter(item => item.groupTag == v.dictKey).map(item => {
return {
diff --git a/src/views/mdc/configComp/Status.vue b/src/views/mdc/configComp/Status.vue
index 331f075..d56a78b 100644
--- a/src/views/mdc/configComp/Status.vue
+++ b/src/views/mdc/configComp/Status.vue
@@ -181,7 +181,7 @@
this.data.splice(index, 1)
},
getList() {
- this.$HTTP.get('/api/blade-cps/global_wcs/wcs-achievements').then(res => {
+ this.$HTTP.get('/api/smis/global_wcs/wcs-achievements').then(res => {
if (res.code === 200) {
this.data = res.data.filter(v => v.type === 1)
this.Tabledata = res.data.filter(v => v.type === 4)
@@ -189,7 +189,7 @@
})
},
save() {
- this.$HTTP.post('/api/blade-cps/global_wcs/update-wcs-seq', this.data.map(v => v.code)).then(res => {
+ this.$HTTP.post('/api/smis/global_wcs/update-wcs-seq', this.data.map(v => v.code)).then(res => {
if (res.code == 200) {
this.$message.success(`鎿嶄綔鎴愬姛`)
this.getList()
@@ -208,7 +208,7 @@
name: row.name,
rps: row.rps
}
- this.$HTTP.post('/api/blade-cps/global_wcs/update-wcs-achievements', data).then(res => {
+ this.$HTTP.post('/api/smis/global_wcs/update-wcs-achievements', data).then(res => {
if (res.code == 200) {
this.$message.success(`鎿嶄綔鎴愬姛`)
this.getList()
@@ -231,7 +231,7 @@
rps: row.rps,
type: 4,
}
- this.$HTTP.post('/api/blade-cps/global_wcs/add-wcs-achievements', data).then(res => {
+ this.$HTTP.post('/api/smis/global_wcs/add-wcs-achievements', data).then(res => {
if (res.code == 200) {
this.$message.success(`鎿嶄綔鎴愬姛`)
this.getList()
@@ -239,7 +239,7 @@
})
},
remove(row) {
- this.$HTTP.delete(`/api/blade-cps/global_wcs/delete-wcs-achievements/${row.code}`).then(res => {
+ this.$HTTP.delete(`/api/smis/global_wcs/delete-wcs-achievements/${row.code}`).then(res => {
if (res.code == 200) {
this.$message.success(`鎿嶄綔鎴愬姛`)
this.getList()
@@ -247,7 +247,7 @@
})
},
rowDrop(arr) {
- this.$HTTP.post(`/api/blade-cps/global_wcs/update-wcs-seq`, arr.map(v => v.code)).then(res => {
+ this.$HTTP.post(`/api/smis/global_wcs/update-wcs-seq`, arr.map(v => v.code)).then(res => {
if (res.success) {
this.$message.success(res.msg)
} else {
diff --git a/src/views/mdc/configuration.vue b/src/views/mdc/configuration.vue
index bb21642..4cc3f01 100644
--- a/src/views/mdc/configuration.vue
+++ b/src/views/mdc/configuration.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
- * @LastEditors: Sneed
- * @LastEditTime: 2024-06-17 22:25:23
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-10-31 17:29:35
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/configuration.vue
* 搴旂敤璁剧疆
-->
@@ -9,16 +9,16 @@
<el-main>
<el-card shadow="never">
<el-tabs :tab-position="'left'" class="demo-tabs">
- <el-tab-pane label="瀹炴椂鐪嬫澘鏌ヨ缁勮缃�">
+ <el-tab-pane label="瀹炴椂鐪嬫澘鏌ヨ缁勮缃�" v-if="$route.query.isShowSearch == 1">
<Board />
</el-tab-pane>
- <el-tab-pane label="鐘舵�佸拰缁╂晥鏃堕棿璁剧疆">
+ <el-tab-pane label="鐘舵�佸拰缁╂晥鏃堕棿璁剧疆" v-if="true">
<Status />
</el-tab-pane>
<el-tab-pane label="鏁堢巼缁熻璁剧疆">
<Efficiency />
</el-tab-pane>
- <el-tab-pane label="閲囬泦鏁版嵁鏍囩璁剧疆">
+ <!-- <el-tab-pane label="閲囬泦鏁版嵁鏍囩璁剧疆">
<scFormTable ref="table1" v-model="Tabledata" stripe hideDelete :addTemplate="addTemplate">
<el-table-column label="鏁版嵁鏍囩" prop="usageName">
<template #default="scope">
@@ -58,7 +58,7 @@
</template>
</el-table-column>
</scFormTable>
- </el-tab-pane>
+ </el-tab-pane> -->
</el-tabs>
</el-card>
</el-main>
@@ -102,7 +102,7 @@
},
methods: {
getList() {
- this.$HTTP.get('/api/blade-cps/workstation-wcs-usage/list').then(res => {
+ this.$HTTP.get('/api/smis/workstation-wcs-usage/list').then(res => {
if (res.code === 200) {
this.Tabledata = res.data.map(item => {
return {
@@ -125,7 +125,7 @@
}
},
add(row) {
- let url = '/api/blade-cps/workstation-wcs-usage'
+ let url = '/api/smis/workstation-wcs-usage'
let data = {
...row
}
diff --git a/src/views/mdc/efficiency-analysis.vue b/src/views/mdc/efficiency-analysis.vue
index 7d0e50e..8ef0f3f 100644
--- a/src/views/mdc/efficiency-analysis.vue
+++ b/src/views/mdc/efficiency-analysis.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
- * @LastEditors: Sneed
- * @LastEditTime: 2024-06-22 18:34:40
+ * @LastEditors: lzhe lzhe@example.com
+ * @LastEditTime: 2024-11-01 14:56:14
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/efficiency-analysis.vue
* 鏁堢巼鍒嗘瀽
-->
@@ -191,7 +191,7 @@
},
methods: {
exportExcel(statisticalMethod) {
- this.$HTTP.post(`/api/blade-mdc/efficiency-analysis/export`, {
+ this.$HTTP.post(`/api/mdc/efficiency-analysis/export`, {
startDate: this.time[0],
endDate: this.time[1],
statisticalMethod,
@@ -214,13 +214,6 @@
shiftIndexList: [1, 2],
workStationIdList: [...this.treeChecked]
})
- // this.$HTTP.post('/api/blade-mdc/efficiency-analysis?size=-1', {
-
- // })
- // this.$HTTP.post('/api/blade-mdc/efficiency-analysis?current=1&size=15', {
-
- // })
- // this.$HTTP.post('/api/blade-cps/workstation-wcs-feedback/feedback-status', [...vals])
}
}
}
diff --git a/src/views/mdc/output-statistics.vue b/src/views/mdc/output-statistics.vue
index 4f18459..e8a9856 100644
--- a/src/views/mdc/output-statistics.vue
+++ b/src/views/mdc/output-statistics.vue
@@ -36,13 +36,13 @@
<el-tabs tab-position="top" v-model="activeName" type="card">
<el-tab-pane label="鎸夌彮娆＄粺璁�" name="shift">
<Shift :options="chartOption" :datasetNum="1" colname="浜ч噺"
- :colnameFn="val => { return val }" url="/api/blade-mdc/output" ref="shift"
+ :colnameFn="val => { return val }" url="/api/mdc/output" ref="shift"
v-if="activeName == 'shift'">
</Shift>
</el-tab-pane>
<el-tab-pane label="鎸夋椂闂村懆鏈熺粺璁�" name="time">
<Time :resFn="val => val" :options="chartOption1" :colnameFn="val => { return val }"
- url="/api/blade-mdc/output" ref="time" v-if="activeName == 'time'">
+ url="/api/mdc/output" ref="time" v-if="activeName == 'time'">
</Time>
</el-tab-pane>
@@ -183,7 +183,7 @@
},
methods: {
exportExcel(statisticalMethod) {
- this.$HTTP.post(`/api/blade-mdc/output/export`, {
+ this.$HTTP.post(`/api/mdc/output/export`, {
startDate: this.time[0],
endDate: this.time[1],
statisticalMethod,
diff --git a/src/views/mdc/processParam/TimeLine.vue b/src/views/mdc/processParam/TimeLine.vue
index 71dd49b..b6d6611 100644
--- a/src/views/mdc/processParam/TimeLine.vue
+++ b/src/views/mdc/processParam/TimeLine.vue
@@ -91,7 +91,7 @@
},
queryTime(data) {
if (!data.workstationId) return
- this.$HTTP.post('/api/blade-mdc/process-parameter/all-shift-time', {
+ this.$HTTP.post('/api/mdc/process-parameter/all-shift-time', {
...data
}).then(res => {
if (res.code == 200) {
diff --git a/src/views/mdc/processParam/index.vue b/src/views/mdc/processParam/index.vue
index c71f069..ca5844f 100644
--- a/src/views/mdc/processParam/index.vue
+++ b/src/views/mdc/processParam/index.vue
@@ -150,7 +150,7 @@
},
save() {
console.log(this.checkedCities)
- this.$HTTP.post(`/api/blade-mdc/process-parameter/excel/export`, {
+ this.$HTTP.post(`/api/mdc/process-parameter/excel/export`, {
collectItem: this.list.filter(v => this.checkedCities.includes(v.id)),
endTime: this.timeRange.endTime,
startTime: this.timeRange.startTime,
@@ -172,7 +172,7 @@
this.visible = true
},
init() {
- this.$HTTP.get('/api/blade-mdc/process-parameter').then(res => {
+ this.$HTTP.get('/api/mdc/process-parameter').then(res => {
if (res.code === 200) {
this.legend = res.data
}
@@ -181,7 +181,7 @@
viewData(item) {
this.drawerName = item.dpLabel
- this.$HTTP.post('/api/blade-mdc/process-parameter/item?current=1&size=1500', {
+ this.$HTTP.post('/api/mdc/process-parameter/item?current=1&size=1500', {
endTime: this.timeRange.endTime,
startTime: this.timeRange.startTime,
item: item.name,
@@ -217,7 +217,7 @@
workstationId: this.treeChecked.toString()
})
this.list = []
- this.$HTTP.get('/api/blade-mdc/process-parameter/params', { workstationId: this.treeChecked.toString() }).then(res => {
+ this.$HTTP.get('/api/mdc/process-parameter/params', { workstationId: this.treeChecked.toString() }).then(res => {
if (res.code === 200) {
console.log('jkjkjkjkj', this.list)
this.list = res.data.map(v => {
@@ -248,7 +248,7 @@
delete params.name
delete params.height
} catch (err) { console.error(err) }
- this.$HTTP.post('/api/blade-mdc/process-parameter/chart/dmp-item', {
+ this.$HTTP.post('/api/mdc/process-parameter/chart/dmp-item', {
methodEnum: "HOUR",
startTime: this.timeRange.startTime,
endTime: this.timeRange.endTime,
diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index ae05939..ecc298c 100644
--- a/src/views/mdc/realtime-status/index.vue
+++ b/src/views/mdc/realtime-status/index.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-09 22:11:21
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-10-22 20:56:44
+ * @LastEditTime: 2024-10-31 17:27:54
* @FilePath: /cps-web/src/views/mdc/realtime-status/index.vue
瀹炴椂鐪嬫澘
-->
@@ -53,8 +53,7 @@
<div class="status-card-detail-status">
<div class="status-card-detail-point" :style="{ 'background-color': item.statusStyle }">
</div>{{ item.statusName }}
- <div class="status-card-detail-time" :style="{ 'color': item.statusStyle }">{{ item.time
- }}
+ <div class="status-card-detail-time" :style="{ 'color': item.statusStyle }">{{ item.time }}
</div>
</div>
</div>
@@ -82,12 +81,11 @@
</div>
<el-dialog :title="titleMap" v-model="visible" :width="740">
<div class="dialogstyle">
- <div class="realtime-analysis-card" v-for="item in timestatus[clickIndex].properties">
- <div class="card-name" :style="{ 'background-color': item.color }">{{ item.name }}</div>
- <div class="card-value"
- :class="{ 'card-value': true, 'card-value-bg1': item.key != 'Alarm', 'card-value-bg2': item.key == 'Alarm' }">
- {{ item.code }}</div>
- </div>
+ <el-table :data="timestatus[clickIndex].properties" style="width: 100%" border>
+ <el-table-column prop="name" label="鏁版嵁鐐�"></el-table-column>
+ <el-table-column prop="code" label="鍊�"></el-table-column>
+ <el-table-column prop="moment" label="閲囬泦鏃堕棿"></el-table-column>
+ </el-table>
</div>
</el-dialog>
</div>
@@ -145,49 +143,6 @@
}
})
},
- setIntervalTime() {
- function addTime(timeStr) {
- var increaseByMilliseconds = 10 * 1000; // 10绉掕浆鎹负姣
- // 瑙ｆ瀽鏃堕棿瀛楃涓蹭负澶╂暟銆佸皬鏃躲�佸垎閽熷拰绉�
- if (timeStr != undefined && timeStr != "--") {
- var parts = timeStr.match(/(\d+)澶�(\d+)鏃�(\d+)鍒�(\d+)绉�/);
- if(parts == null) {
- var days = 0; // 澶╂暟杞崲涓烘绉�
- var hours = 0; // 灏忔椂杞崲涓烘绉�
- var minutes = 0; // 鍒嗛挓杞崲涓烘绉�
- var seconds = 0; // 绉掕浆鎹负姣
- }else {
- var days = parseInt(parts[1], 10) * 24 * 60 * 60 * 1000; // 澶╂暟杞崲涓烘绉�
- var hours = parseInt(parts[2], 10) * 60 * 60 * 1000; // 灏忔椂杞崲涓烘绉�
- var minutes = parseInt(parts[3], 10) * 60 * 1000; // 鍒嗛挓杞崲涓烘绉�
- var seconds = parseInt(parts[4], 10) * 1000; // 绉掕浆鎹负姣
- }
- // 鍒涘缓涓�涓狹oment.js鐨勬寔缁椂闂村璞�
- var duration = moment.duration(days + hours + minutes + seconds);
- // 澧炲姞鏃堕棿
- duration.add(increaseByMilliseconds); // 澧炲姞10绉�
- // 灏嗘寔缁椂闂磋浆鎹㈠洖澶╂暟銆佸皬鏃躲�佸垎閽熷拰绉掞紙娉ㄦ剰杩欓噷鍙兘涓嶅畬鍏ㄧ簿纭紝鍥犱负澶╂暟鍙兘涓嶆槸鏁存暟锛�
- var totalMilliseconds = duration.asMilliseconds();
- var totalDays = Math.floor(totalMilliseconds / (1000 * 60 * 60 * 24));
- var remainingMilliseconds = totalMilliseconds % (1000 * 60 * 60 * 24);
- var totalHours = Math.floor(remainingMilliseconds / (1000 * 60 * 60));
- remainingMilliseconds %= (1000 * 60 * 60);
- var totalMinutes = Math.floor(remainingMilliseconds / (1000 * 60));
- remainingMilliseconds %= (1000 * 60);
- var totalSeconds = Math.floor(remainingMilliseconds / 1000);
- return `${totalDays}澶�${totalHours}鏃�${totalMinutes}鍒�${totalSeconds}绉抈;
- } else {
- return timeStr;
- }
- }
- setInterval(() => {
- if (this.timestatus.length != 0) {
- this.timestatus.forEach(item => {
- item.time = addTime(item.time);
- })
- }
- }, 1000 * 10)
- },
changestationlabel(name) {
this.stationlabel = name;
this.stationlabelList.forEach(item => {
@@ -198,7 +153,7 @@
this.gettimestatus(); //鏌ヨ鍒楄〃
},
getstationlabelList() {
- this.$HTTP.get("/api/blade-cps/group/get-mdc-group").then(res => {
+ this.$HTTP.get("/api/smis/group/get-mdc-group").then(res => {
if (res.code == 200) {
this.stationlabelList = res.data;
if (res.data.length != 0) {
@@ -253,13 +208,13 @@
}
},
goSet() {
- this.$router.push('/mdc/configuration'); //鍒嗘瀽璁剧疆
+ this.$router.push('/mdc/configuration?isShowSearch=1'); //鍒嗘瀽璁剧疆
},
gostatus(item) {
this.$router.push('/mdc/station-live?code=' + item.id);
},
getprocess() { //棰滆壊鐘舵��
- this.$HTTP.get(`/api/blade-cps/global_wcs/list?code=&name=`).then(res => {
+ this.$HTTP.get(`/api/smis/global_wcs/list?code=&name=`).then(res => {
if (res.code == 200) {
this.allwcs = res.data;
this.getdevicestatus(); //鑾峰彇椤堕儴title/鍏蜂綋鏁版嵁
@@ -290,7 +245,7 @@
workStationGroupIdList: this.workStationGroupIdList
}
this.timestatus = [];
- this.$HTTP.post(`/api/blade-cps/workstation/real-time-status?current=${this.current || 0}&size=${this.size || 6}`, obj).then(res => {
+ this.$HTTP.post(`/api/smis/workstation/real-time-status?current=${this.current || 0}&size=${this.size || 6}`, obj).then(res => {
if (res.code == 200) {
var ids = [];
res.data.records.forEach(item => {
@@ -298,20 +253,6 @@
item.avatar = station;
}
ids.push(item.id);
- if (item.properties != null && item.properties.length != 0) {
- item.properties.forEach(item1 => {
- if (item1.key == "DeviceStatus") {
- this.allwcs.forEach(item2 => {
- if (item2.code == item1.value) {
- item1.color = item2.color;
- }
- })
- }
- })
- } else {
- item.statusName = "鏈煡";
- item.statusStyle = '#ccc';
- }
})
this.timestatus = res.data.records;
this.total = res.data.total;
@@ -329,10 +270,7 @@
that.$TOOL.socket.sendDataToWebSocket(obj); //鍙戦��
}
}, 500);
- //var num = 0;
- var intervalId;
this.$TOOL.socket.websocket.onmessage = function (event) {
- //num++;
var eventData = JSON.parse(event.data);
if (that.timestatus.length == 0) return; //娌″�间笉鐢ㄥ惊鐜�
that.timestatus.forEach((item, index) => { //绗竴姝ユ妸v鏀惧埌code閲�
@@ -345,7 +283,6 @@
var time = moment(eventData.data.DeviceStatus.t).format('YYYY-MM-DD HH:mm:ss');
var preT = moment(eventData.data.DeviceStatus.preT).format('YYYY-MM-DD HH:mm:ss');
var diffTime = that.changeTime(time,preT); //杞崲鎴愬樊鍊硷紙鏃跺垎绉掞級
- //that.setIntervalTime(); //鍗佺澧炲姞鏃堕棿
var diffTime = diffTime;
item.time = diffTime;
that.allwcs.forEach(item1 => {
@@ -356,8 +293,9 @@
})
} else {
if (item.time == undefined || item.time == "--") {
- var diffTime = "--";
- item.time = diffTime;
+ item.time = "--";
+ item.statusName = "鏈煡";
+ item.statusStyle = '#ccc';
}
}
item.properties.forEach((item1, index1) => {
@@ -365,57 +303,46 @@
that.allwcs.forEach(item2 => {
if(eventData.data.DeviceStatus && item2.code == eventData.data.DeviceStatus.v) {
item1.value = item2.code;
- item1.color = item2.color;
item1.code = item2.name;
+ item1.moment = that.timestampChangeTime(eventData.data[item1.key].t); //鏃堕棿鎴宠浆鍖栨垚鏃ユ湡
}
})
if (Object.keys(eventData.data).length == 0) { //ws娌℃湁data鏁版嵁锛岀粰榛樿鍊�
item1.code = "";
- item1.color = "#E4A512";
+ item1.moment = "";
};
} else {
- if (item1.key == 'Alarm') { //鎶ヨ
- if (eventData.data[item1.key]) {
- if(eventData.data[item1.key].v == "") return;
- var v = JSON.parse(eventData.data[item1.key].v);
- if (Array.isArray(v)) { //濡傛灉鏄暟缁勶紝涓嶈祴鍊�
- if (v.length == 0) {
- res.data.records[index].properties.splice(index1, 1);
- } else {
- item1.code = v[0].alarmNo;
- }
- } else {
- item1.name = v.code;
- item1.code = v.msg;
- }
- }
- } else {
- if (eventData.data[item1.key]) {
- item1.code = eventData.data[item1.key].v;
- }
+ if(eventData.data[item1.key]) {
+ item1.code = eventData.data[item1.key].v;
+ item1.moment = that.timestampChangeTime(eventData.data[item1.key].t); //鏃堕棿鎴宠浆鍖栨垚鏃ユ湡
+ }else {
+ item1.code = "";
+ item1.moment = "";
}
- that.allwcs.forEach(item2 => {
- if (item2.name == "鎶ヨ") {
- item1.color = item2.color;
- }
- })
}
+
})
}
});
};
- // var len = res.data.records.length;
- // intervalId = setInterval(function() {
- // if (num === len) {
- // clearInterval(intervalId);
- // that.timestatus = res.data.records; //绛夋墍鏈塻ocket鍥炴潵浠ュ悗璧嬪��
- // }
- // }, 500);
}
})
},
+ timestampChangeTime(timestamp) { //鏃堕棿鎴宠浆鎹㈡垚鏃堕棿
+ var date = new Date(timestamp);
+ //鎻愬彇骞存湀鏃ュ皬鏃跺垎閽熺
+ var year = date.getFullYear();
+ var month = date.getMonth() + 1; // 鏈堜唤浠�0寮�濮嬶紝鎵�浠ヨ鍔�1
+ var day = date.getDate();
+ var hours = date.getHours();
+ var minutes = date.getMinutes();
+ var seconds = date.getSeconds();
+ // 鏍煎紡鍖栨棩鏈熷瓧绗︿覆
+ var formattedDate = `${year}-${month < 10 ? '0' : ''}${month}-${day < 10 ? '0' : ''}${day} ${hours < 10 ? '0' : ''}${hours}:${minutes < 10 ? '0' : ''}${minutes}:${seconds < 10 ? '0' : ''}${seconds}`;
+ return formattedDate;
+ },
getdevicestatus() {
- this.$HTTP.get(`/api/blade-mdc/work-station-analysis/device-status-statistics`).then(res => {
+ this.$HTTP.get(`/api/mdc/work-station-analysis/device-status-statistics`).then(res => {
if (res.code == 200) {
res.data.forEach(item => {
item.active = false;
@@ -631,6 +558,7 @@
display: flex;
align-items: center;
justify-content: center;
+ cursor: pointer;
}
.status-card-bottom-detail,
@@ -639,6 +567,7 @@
display: flex;
align-items: center;
justify-content: center;
+ cursor: pointer;
}
.status-card-bottom-icon {
diff --git a/src/views/mdc/state-feedback.vue b/src/views/mdc/state-feedback.vue
index 4cd3ad1..ee3fb92 100644
--- a/src/views/mdc/state-feedback.vue
+++ b/src/views/mdc/state-feedback.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-06-05 12:03:50
+ * @LastEditTime: 2024-11-01 14:56:23
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -116,7 +116,7 @@
type: 'warning'
}).then(() => {
var arr = [row.id]
- this.$HTTP.delete("/api/blade-cps/workstation-wcs-feedback",arr).then(res=> {
+ this.$HTTP.delete("/api/mdc/workstation-wcs-feedback",arr).then(res=> {
if(res.code == 200) {
this.$message.success("鎿嶄綔鎴愬姛");
this.getlist();
@@ -130,7 +130,7 @@
this.getlist();
},
getfeedBackStatusList() {
- this.$HTTP.get("/api/blade-cps/global_wcs/wcs-achievements").then(res=> {
+ this.$HTTP.get("/api/smis/global_wcs/wcs-achievements").then(res=> {
if(res.code == 200) {
res.data.forEach(item=> {
if(item.type == "4") {
@@ -188,7 +188,7 @@
if(this.searchData.startDate) {
obj.startDate = this.searchData.startDate;
}
- this.$HTTP.post("/api/blade-cps/workstation-wcs-feedback/page?current=1&size=15",obj).then(res=> {
+ this.$HTTP.post("/api/mdc/workstation-wcs-feedback/page?current=1&size=15",obj).then(res=> {
if(res.code == 200) {
this.searchDataList = res.data.records;
}
@@ -255,7 +255,7 @@
groupCategory: 1,
groupType: "group_workstation"
}
- this.$HTTP.post("/api/blade-cps/group/groupWorkstation/type",obj).then(res=> {
+ this.$HTTP.post("/api/smis/group/groupWorkstation/type",obj).then(res=> {
if(res.code == 200) {
var treeDisabled = this.addTreeDisable(res.data);
this.tableData = this.buildTree(treeDisabled); //浠庢墎骞冲寲鍙樹负鏍戠姸缁撴瀯
@@ -280,7 +280,7 @@
if(this.searchData.startDate) {
obj.startDate = this.searchData.startDate;
}
- this.$HTTP.post("/api/blade-cps/workstation-wcs-feedback/page?current=1&size=15",obj).then(res=> {
+ this.$HTTP.post("/api/mdc/workstation-wcs-feedback/page?current=1&size=15",obj).then(res=> {
if(res.code == 200) {
this.searchDataList = res.data.records;
}
@@ -305,7 +305,7 @@
sel.push(item.id);
})
var that = this;
- this.$HTTP.delete("/api/blade-cps/workstation-wcs-feedback",sel).then(res=> {
+ this.$HTTP.delete("/api/mdc/workstation-wcs-feedback",sel).then(res=> {
if(res.code == 200) {
this.$message.success("鎿嶄綔鎴愬姛");
this.getlist();
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index ed36881..e13026e 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -320,7 +320,7 @@
this.alarmsearchBtn();
},
alarmsearchBtn() {
- this.$HTTP.get(`/api/blade-mdc/work-station-analysis/alarm/${this.lastLevelId}?current=${this.alarmsearchData.current}&size=${this.alarmsearchData.size}`).then(res=> {
+ this.$HTTP.get(`/api/mdc/work-station-analysis/alarm/${this.lastLevelId}?current=${this.alarmsearchData.current}&size=${this.alarmsearchData.size}`).then(res=> {
if(res.code == 200) {
this.alarmtableData = res.data.records;
this.alarmtotal = res.data.total;
@@ -340,7 +340,7 @@
humanFeedback: this.humanFeedback,
workstationId: this.lastLevelId
}
- this.$HTTP.post(`/api/blade-mdc/status-record/shift-index-status-record-table`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/status-record/shift-index-status-record-table`,obj).then(res=> {
if(res.code == 200) {
var defaultValues = {
oee: 0,
@@ -416,7 +416,7 @@
humanFeedback: this.humanFeedback,
workstationId: this.lastLevelId
}
- this.$HTTP.post(`/api/blade-mdc/status-record/shift-index-status-record-chart`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/status-record/shift-index-status-record-chart`,obj).then(res=> {
if(res.code == 200) {
var yAxisData = [];
var newData = [];
@@ -564,7 +564,7 @@
humanFeedback: this.humanFeedback,
workstationId: this.lastLevelId
}
- this.$HTTP.post(`/api/blade-mdc/status-record/time-distribution`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/status-record/time-distribution`,obj).then(res=> {
if(res.code == 200) {
var myChart = echarts.init(document.getElementById('wcs-left'));
var wcsOption = JSON.parse(JSON.stringify(this.wcsBeginOption));
@@ -587,7 +587,7 @@
})
},
getwcsLcolor() {
- this.$HTTP.get(`/api/blade-cps/global_wcs/list?code=&name=`).then(res=> {
+ this.$HTTP.get(`/api/smis/global_wcs/list?code=&name=`).then(res=> {
if(res.code == 200) {
res.data.forEach(item=> {
item.itemStyle = {color: item.color};
@@ -603,7 +603,7 @@
humanFeedback: this.humanFeedback,
workstationId: this.lastLevelId
}
- this.$HTTP.post(`/api/blade-mdc/status-record/equipment-efficiency`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/status-record/equipment-efficiency`,obj).then(res=> {
if(res.code == 200) {
var myChart = echarts.init(document.getElementById('wcs-right'));
res.data.forEach(item=> {
@@ -630,7 +630,7 @@
handleNodeClick(data) {
if(data.code) {
this.lastLevelId = data.id;
- this.$HTTP.get(`/api/blade-cps/workstation/get?workstationId=${this.lastLevelId}`).then(res=> {
+ this.$HTTP.get(`/api/smis/workstation/get?workstationId=${this.lastLevelId}`).then(res=> {
if(res.code == 200) {
if(res.data.avatar == "") {
res.data.avatar = station;
@@ -648,7 +648,7 @@
}
},
getdmp(lastLevelId,machineId) {
- this.$HTTP.get(`/api/blade-cps/workstation/listDatapointsByWorkstationId?machineId=${machineId}&workstationId=${lastLevelId}`).then(res=> {
+ this.$HTTP.get(`/api/smis/workstation/listDatapointsByWorkstationId?machineId=${machineId}&workstationId=${lastLevelId}`).then(res=> {
if(res.code == 200) {
this.dmpList = [];
var that = this;
@@ -772,7 +772,7 @@
groupCategory: 1,
groupType: "group_workstation"
}
- this.$HTTP.post("/api/blade-cps/group/groupWorkstation/type",obj).then(res=> {
+ this.$HTTP.post("/api/smis/group/groupWorkstation/type",obj).then(res=> {
if(res.code == 200) {
if (res.code == 200) {
var treeDisabled = this.addTreeDisable(res.data);
@@ -798,7 +798,7 @@
})
},
getachievements() { //鐝鐘舵�佽褰曢噰闆嗙姸鎬�
- this.$HTTP.get(`/api/blade-cps/global_wcs/wcs-achievements`).then(res=> {
+ this.$HTTP.get(`/api/smis/global_wcs/wcs-achievements`).then(res=> {
if(res.code == 200) {
var achievements = [];//閲囬泦鐘舵��
var collectionstatus = []; //浜哄伐鍙嶉鐘舵��
@@ -817,7 +817,7 @@
})
},
getlist() {
- this.$HTTP.get(`/api/blade-cps/workstation/get?workstationId=${this.lastLevelId}`).then(res=> {
+ this.$HTTP.get(`/api/smis/workstation/get?workstationId=${this.lastLevelId}`).then(res=> {
if(res.code == 200) {
if(res.data.avatar == "") {
res.data.avatar = station;
diff --git a/src/views/mdc/status-record.vue b/src/views/mdc/status-record.vue
index c811c18..30c9383 100644
--- a/src/views/mdc/status-record.vue
+++ b/src/views/mdc/status-record.vue
@@ -225,7 +225,7 @@
startTime: this.time[0],
workstationInfoList: this.workstationInfoList
}
- this.$HTTP.post(`/api/blade-mdc/status-record/excel/export`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/status-record/excel/export`,obj).then(res=> {
if(res.code == 200) {
window.open(res.data.link);
}
@@ -260,7 +260,7 @@
})
},
getachievements() { //鐝鐘舵�佽褰曢噰闆嗙姸鎬�
- this.$HTTP.get(`/api/blade-cps/global_wcs/wcs-achievements`).then(res=> {
+ this.$HTTP.get(`/api/smis/global_wcs/wcs-achievements`).then(res=> {
if(res.code == 200) {
var achievements = [];//閲囬泦鐘舵��
var collectionstatus = []; //浜哄伐鍙嶉鐘舵��
@@ -280,7 +280,7 @@
},
getTime(data) {
return new Promise(resolve=> {
- this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {...data}).then(res => {
+ this.$HTTP.post('/api/mdc/efficiency-analysis/interval', {...data}).then(res => {
if (res.code === 200) {
var today = moment().format('YYYY-MM-DD');
var yesterday = moment().subtract(1, 'days').format('YYYY-MM-DD');
diff --git a/src/views/mdc/time-analysis.vue b/src/views/mdc/time-analysis.vue
index f1794a3..d2631f5 100644
--- a/src/views/mdc/time-analysis.vue
+++ b/src/views/mdc/time-analysis.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-04-26 09:36:18
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-10-10 12:44:02
+ * @LastEditTime: 2024-11-01 14:48:23
* @FilePath: /smart-web/src/views/mdc/status-record.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -363,7 +363,7 @@
this.treeChecked.forEach(item=> {
ids.push(item.id);
})
- this.$HTTP.post(`/api/blade-mdc/time-used-analysis/excel/export`, {
+ this.$HTTP.post(`/api/mdc/time-used-analysis/excel/export`, {
startTime: this.time[0],
endTime: this.time[1],
enums: statisticalMethod,
@@ -377,7 +377,7 @@
})
},
getGlobal() {
- this.$HTTP.get(`/api/blade-cps/global_wcs/list`).then(res=> {
+ this.$HTTP.get(`/api/smis/global_wcs/list`).then(res=> {
if(res.code == 200) {
this.getGlobalColorList = res.data;
}
@@ -399,7 +399,7 @@
type: 1
}
}
- this.$HTTP.post(`/api/blade-mdc/time-used-analysis/workstation/shiftName`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/time-used-analysis/workstation/shiftName`,obj).then(res=> {
if(res.code == 200) {
this.setTitle = res.data.shiftDetails;
res.data.shiftDetails.forEach(item=> {
@@ -501,7 +501,7 @@
}else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
obj.type = 1;
}
- this.$HTTP.post(`/api/blade-mdc/time-used-analysis/work-stations?current=${this.current}&size=${this.size}`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/time-used-analysis/work-stations?current=${this.current}&size=${this.size}`,obj).then(res=> {
if(res.code == 200) {
var xAxis = [];
res.data.workStationDetails.forEach(item=> {
@@ -539,7 +539,7 @@
}else if(this.btnLeftctive == 2) { //鎸夊伐浣嶇粍缁熻
obj.type = 1;
}
- this.$HTTP.post(`/api/blade-mdc/time-used-analysis/work-stations?current=${this.current}&size=${this.size}`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/time-used-analysis/work-stations?current=${this.current}&size=${this.size}`,obj).then(res=> {
if(res.code == 200) {
var xAxis = [];
res.data.workStationDetails == null ? res.data.workStationDetails = [] : res.data.workStationDetails;
@@ -568,7 +568,7 @@
})
},
getTree2List() { //鎸夊伐浣嶇粍缁熻
- this.$HTTP.get(`/api/blade-cps/group/tree?groupCategory=1&groupType=group_workstation`).then(res=> {
+ this.$HTTP.get(`/api/smis/group/tree?groupCategory=1&groupType=group_workstation`).then(res=> {
if(res.code == 200) {
this.tree2 = res.data;
}
@@ -594,7 +594,7 @@
startDate: this.btnList[len-1].id,
statisticalMethod: "WEEK"
}
- this.$HTTP.post(`/api/blade-mdc/efficiency-analysis/interval`,obj).then(res=> {
+ this.$HTTP.post(`/api/mdc/efficiency-analysis/interval`,obj).then(res=> {
if(res.code == 200) {
var dateInJuly = moment(this.btnList[0].id);
// 鑾峰彇璇ユ湀浠界殑绗竴澶�
@@ -646,7 +646,7 @@
// startTime: this.time[0],
// workstationInfoList: this.workstationInfoList
// }
- // this.$HTTP.post(`/api/blade-mdc/time-used-analysis/excel/export`,obj).then(res=> {
+ // this.$HTTP.post(`/api/mdc/time-used-analysis/excel/export`,obj).then(res=> {
// if(res.code == 200) {
// window.open(res.data.link);
// }
@@ -679,7 +679,7 @@
}
},
getTime(data) {
- this.$HTTP.post('/api/blade-mdc/efficiency-analysis/interval', {
+ this.$HTTP.post('/api/mdc/efficiency-analysis/interval', {
...data
}).then(res => {
if (res.code === 200) {
diff --git a/src/views/notification/business.vue b/src/views/notification/business.vue
index 1eb3d8b..780c7ef 100644
--- a/src/views/notification/business.vue
+++ b/src/views/notification/business.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-05-10 12:08:41
+ * @LastEditTime: 2024-11-01 14:56:47
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -193,14 +193,14 @@
this.employeeLi.splice(index,1);
},
getgroupType() {
- this.$HTTP.get("/api/blade-cps/organization/list?groupType=group_organization&groupCategory=1").then(res=> {
+ this.$HTTP.get("/api/smis/organization/list?groupType=group_organization&groupCategory=1").then(res=> {
if(res.code == 200) {
this.organizationList = res.data;
}
})
},
getEmployeeList() {
- this.$HTTP.get("/api/blade-cps/employee/get/list?organizationCode=00001&status=1").then(res=> {
+ this.$HTTP.get("/api/smis/employee/get/list?organizationCode=00001&status=1").then(res=> {
if(res.code == 200) {
this.employeeList = res.data;
}
@@ -279,21 +279,6 @@
}
})
},
- // table_del(row) {
- // this.$confirm(`纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎?`, '', {
- // type: 'warning'
- // }).then(() => {
- // var arr = [row.id]
- // this.$HTTP.delete("/api/blade-cps/workstation-wcs-feedback",arr).then(res=> {
- // if(res.code == 200) {
- // this.$message.success("鎿嶄綔鎴愬姛");
- // this.getlist();
- // }
- // })
- // }).catch(() => {
-
- // })
- // },
addbusinessSuccess() {
this.getbusiness();
}
diff --git a/src/views/tpm/MachineGroup.vue b/src/views/tpm/MachineGroup.vue
index 9f54d09..6c28209 100644
--- a/src/views/tpm/MachineGroup.vue
+++ b/src/views/tpm/MachineGroup.vue
@@ -61,7 +61,7 @@
},
methods: {
getTreeData() {
- this.$HTTP.get('/api/blade-cps/group/tree?groupCategory=1&groupType=group_machine').then(res => {
+ this.$HTTP.get('/api/smis/group/tree?groupCategory=1&groupType=group_machine').then(res => {
if (res.code === 200) {
this.group = res.data
this.groupClick(res.data[0])
@@ -105,7 +105,7 @@
}
)
.then(() => {
- this.$HTTP.delete('/api/blade-cps/group/deleteGroup', {}, { params: { groupId: this.form.id } }).then(res => {
+ this.$HTTP.delete('/api/smis/group/deleteGroup', {}, { params: { groupId: this.form.id } }).then(res => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛");
this.getTreeData()
@@ -119,13 +119,13 @@
save() {
this.group = []
if (this.form.id) {
- this.$HTTP.put('/api/blade-cps/group', this.form).then(res => {
+ this.$HTTP.put('/api/smis/group', this.form).then(res => {
if (res.code === 200) {
this.getTreeData()
}
})
} else {
- this.$HTTP.post('/api/blade-cps/group', this.form).then(res => {
+ this.$HTTP.post('/api/smis/group', this.form).then(res => {
if (res.code === 200) {
this.getTreeData()
}
diff --git a/src/views/tpm/MachineTab.vue b/src/views/tpm/MachineTab.vue
index 84cc486..49a4e66 100644
--- a/src/views/tpm/MachineTab.vue
+++ b/src/views/tpm/MachineTab.vue
@@ -112,7 +112,7 @@
},
methods: {
init() {
- this.$HTTP.get('/api/blade-cps/device-types/page?keyWord=¤t=1&size=-1').then(res => {
+ this.$HTTP.get('/api/smis/device-types/page?keyWord=¤t=1&size=-1').then(res => {
if (res.code === 200) {
this.types = res.data.records.map(item => ({
label: item.name,
@@ -122,7 +122,7 @@
})
},
getTreeData() {
- this.$HTTP.get('/api/blade-cps/group/tree?groupCategory=1&groupType=group_machine').then(res => {
+ this.$HTTP.get('/api/smis/group/tree?groupCategory=1&groupType=group_machine').then(res => {
if (res.code === 200) {
this.group = res.data
// this.params.groupId = res.data[0].id
@@ -149,7 +149,7 @@
this.getTreeData()
},
table_del(row, index, type) {
- this.$HTTP.delete(`/api/blade-cps/machine?type=${type}`, {
+ this.$HTTP.delete(`/api/smis/machine?type=${type}`, {
ids: [row.id]
}).then(res => {
if (res.code === 200) {
@@ -167,7 +167,7 @@
if (this.selection.length === 0) {
return this.$message.warning("璇烽�夋嫨");
}
- this.$HTTP.delete(`/api/blade-cps/machine?type=1`, {
+ this.$HTTP.delete(`/api/smis/machine?type=1`, {
ids: this.selection.map(item => item.id)
}).then(res => {
if (res.code === 200) {
diff --git a/src/views/tpm/machine/Dialog.vue b/src/views/tpm/machine/Dialog.vue
index a518815..1127d07 100644
--- a/src/views/tpm/machine/Dialog.vue
+++ b/src/views/tpm/machine/Dialog.vue
@@ -480,7 +480,7 @@
}))
}
})
- this.$HTTP.get('/api/blade-cps/device-types/page?keyWord=¤t=1&size=-1').then(res => {
+ this.$HTTP.get('/api/smis/device-types/page?keyWord=¤t=1&size=-1').then(res => {
if (res.code === 200) {
this.options.machineTypeId = res.data.records.map(item => ({
label: item.name,
@@ -488,17 +488,17 @@
}))
}
})
- this.$HTTP.get('/api/blade-cps/employee/tree').then(res => {
+ this.$HTTP.get('/api/smis/employee/tree').then(res => {
if (res.code === 200) {
this.options.employeeId = res.data
}
})
- this.$HTTP.get('/api/blade-cps/group/tree?groupCategory=1&groupType=group_machine').then(res => {
+ this.$HTTP.get('/api/smis/group/tree?groupCategory=1&groupType=group_machine').then(res => {
if (res.code === 200) {
this.options.groupId = res.data
}
})
- this.$HTTP.get('/api/blade-cps/organization/tree?groupType=group_organization&groupCategory=1').then(res => {
+ this.$HTTP.get('/api/smis/organization/tree?groupType=group_organization&groupCategory=1').then(res => {
if (res.code === 200) {
this.options.organizationId = res.data
}
@@ -514,7 +514,7 @@
this.form[item] = ''
})
if (params.id) {
- this.$HTTP.get(`/api/blade-cps/machine/detail/${params.id}`).then(res => {
+ this.$HTTP.get(`/api/smis/machine/detail/${params.id}`).then(res => {
if (res.code === 200) {
this.form = {
...this.form,
@@ -542,11 +542,11 @@
let res
try {
if (this.form.id) {
- res = await this.$HTTP.put('/api/blade-cps/machine', data).catch(() => {
+ res = await this.$HTTP.put('/api/smis/machine', data).catch(() => {
throw new Error()
})
} else {
- res = await this.$HTTP.post('/api/blade-cps/machine', data).catch(() => {
+ res = await this.$HTTP.post('/api/smis/machine', data).catch(() => {
throw new Error()
})
}
diff --git a/vue.config.js b/vue.config.js
index 3c4ebea..b372543 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -30,7 +30,7 @@
'^/api': '/'
}
},
- '/api/blade-cps/workstation/listDatapointsByWorkstationId': {
+ '/api/smis/workstation/listDatapointsByWorkstationId': {
target: 'http://120.46.212.231:4102',
// ws: true,
changeOrigin: true,
@@ -38,7 +38,7 @@
'^/api': '/'
}
},
- '/api/blade-cps/workstation/saveDatapoints': {
+ '/api/smis/workstation/saveDatapoints': {
target: 'http://120.46.212.231:4102',
// ws: true,
changeOrigin: true,
@@ -46,7 +46,7 @@
'^/api': '/'
}
},
- '/api/blade-cps/workstation/export-dp': {
+ '/api/smis/workstation/export-dp': {
target: 'http://120.46.212.231:4102',
// ws: true,
changeOrigin: true,
--
Gitblit v1.9.3