From 8965385106ee1028a610c577d38211d076c5d41a Mon Sep 17 00:00:00 2001
From: lzhe <181968431@qq.com>
Date: 星期日, 28 四月 2024 00:08:04 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/utils/request.js | 70 +++---
src/views/console/workstation/index.vue | 60 +++--
src/views/tpm/MachineTab.vue | 128 ++++++++++++
src/views/tpm/machine-management.vue | 102 ++++++++++
src/views/mdc/components/Shift.vue | 11
src/api/model/machineManagement.js | 19 +
src/views/mdc/components/Time.vue | 13
src/views/tpm/MachineGroup.vue | 131 +++++++++++++
src/views/tpm/machine/create.vue | 21 ++
9 files changed, 489 insertions(+), 66 deletions(-)
diff --git a/src/api/model/machineManagement.js b/src/api/model/machineManagement.js
new file mode 100644
index 0000000..bac616c
--- /dev/null
+++ b/src/api/model/machineManagement.js
@@ -0,0 +1,19 @@
+/*
+ * @Date: 2024-03-24 11:37:47
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-04-27 20:26:42
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/api/model/machineManagement.js
+ */
+import config from "@/config"
+import http from "@/utils/request"
+
+export default {
+ getList: {
+ url: `${config.API_URL}/blade-cps/machine/page`,
+ name: "鑾峰彇宸ヤ綅鍒楄〃",
+ get: async function (params) {
+ return await http.post(this.url, { ...params }, { params: { current: params.current, size: params.size } });
+ },
+ },
+
+}
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 262d2f1..ec1904e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -13,10 +13,10 @@
(config) => {
let token = tool.cookie.get("TOKEN");
config.headers['Authorization'] = 'Basic c2FiZXI6c2FiZXJfc2VjcmV0'
- if(token){
+ if (token) {
config.headers[sysConfig.TOKEN_NAME] = sysConfig.TOKEN_PREFIX + token
}
- if(!sysConfig.REQUEST_CACHE && config.method == 'get'){
+ if (!sysConfig.REQUEST_CACHE && config.method == 'get') {
config.params = config.params || {};
// config.params['_'] = new Date().getTime();
}
@@ -49,7 +49,7 @@
message: error.response.data.message || "Status:500锛屾湇鍔″櫒鍙戠敓閿欒锛�"
});
} else if (error.response.status == 401) {
- if(!MessageBox_401_show){
+ if (!MessageBox_401_show) {
MessageBox_401_show = true
ElMessageBox.confirm('褰撳墠鐢ㄦ埛宸茶鐧诲嚭鎴栨棤鏉冮檺璁块棶褰撳墠璧勬簮锛岃灏濊瘯閲嶆柊鐧诲綍鍚庡啀鎿嶄綔銆�', '鏃犳潈闄愯闂�', {
type: 'error',
@@ -61,8 +61,8 @@
done()
}
}).then(() => {
- router.replace({path: '/login'});
- }).catch(() => {})
+ router.replace({ path: '/login' });
+ }).catch(() => { })
}
} else {
ElNotification.error({
@@ -81,16 +81,16 @@
}
);
function qsStringify(obj) {
- return Object.keys(obj)
- .map(key => {
- if (Array.isArray(obj[key])) {
- return obj[key]
- .map(arrayValue => `${encodeURIComponent(key)}=${encodeURIComponent(arrayValue)}`)
- .join('&');
- }
- return `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`;
- })
- .join('&');
+ return Object.keys(obj)
+ .map(key => {
+ if (Array.isArray(obj[key])) {
+ return obj[key]
+ .map(arrayValue => `${encodeURIComponent(key)}=${encodeURIComponent(arrayValue)}`)
+ .join('&');
+ }
+ return `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`;
+ })
+ .join('&');
}
var http = {
@@ -100,7 +100,7 @@
* @param {object} params 璇锋眰鍙傛暟
* @param {object} config 鍙傛暟
*/
- get: function(url, params={}, config={}) {
+ get: function (url, params = {}, config = {}) {
return new Promise((resolve, reject) => {
axios({
method: 'get',
@@ -120,7 +120,7 @@
* @param {object} data 璇锋眰鍙傛暟
* @param {object} config 鍙傛暟
*/
- post: function(url, data={}, config={}) {
+ post: function (url, data = {}, config = {}) {
return new Promise((resolve, reject) => {
axios({
method: 'post',
@@ -130,12 +130,12 @@
}).then((response) => {
resolve(response.data);
}).catch((error) => {
- if(error.status == 400) {
+ if (error.status == 400) {
ElMessage({
- message: error.data.msg,
- type: 'warning',
- })
- }else {
+ message: error.data.msg,
+ type: 'warning',
+ })
+ } else {
reject(error);
}
})
@@ -146,13 +146,13 @@
* @param {object} data 璇锋眰鍙傛暟
* @param {object} config 鍙傛暟
*/
- postJ: function(url, data={}, config={}) {
+ postJ: function (url, data = {}, config = {}) {
return new Promise((resolve, reject) => {
console.log(qsStringify(data))
axios({
method: 'post',
url: url,
- headers: { 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'},
+ headers: { 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8' },
data: qsStringify(data),
...config
}).then((response) => {
@@ -167,7 +167,7 @@
* @param {object} data 璇锋眰鍙傛暟
* @param {object} config 鍙傛暟
*/
- put: function(url, data={}, config={}) {
+ put: function (url, data = {}, config = {}) {
return new Promise((resolve, reject) => {
axios({
method: 'put',
@@ -187,7 +187,7 @@
* @param {object} data 璇锋眰鍙傛暟
* @param {object} config 鍙傛暟
*/
- patch: function(url, data={}, config={}) {
+ patch: function (url, data = {}, config = {}) {
return new Promise((resolve, reject) => {
axios({
method: 'patch',
@@ -207,7 +207,7 @@
* @param {object} data 璇锋眰鍙傛暟
* @param {object} config 鍙傛暟
*/
- delete: function(url, data={}, config={}) {
+ delete: function (url, data = {}, config = {}) {
return new Promise((resolve, reject) => {
axios({
method: 'delete',
@@ -217,12 +217,12 @@
}).then((response) => {
resolve(response.data);
}).catch((error) => {
- if(error.status == 400) {
+ if (error.status == 400) {
ElMessage({
- message: error.data.msg,
- type: 'warning',
- })
- }else {
+ message: error.data.msg,
+ type: 'warning',
+ })
+ } else {
reject(error);
}
})
@@ -233,19 +233,19 @@
* @param {string} url 鎺ュ彛鍦板潃
* @param {string} name JSONP鍥炶皟鍑芥暟鍚嶇О
*/
- jsonp: function(url, name='jsonp'){
+ jsonp: function (url, name = 'jsonp') {
return new Promise((resolve) => {
var script = document.createElement('script')
var _id = `jsonp${Math.ceil(Math.random() * 1000000)}`
script.id = _id
script.type = 'text/javascript'
script.src = url
- window[name] =(response) => {
+ window[name] = (response) => {
resolve(response)
document.getElementsByTagName('head')[0].removeChild(script)
try {
delete window[name];
- }catch(e){
+ } catch (e) {
window[name] = undefined;
}
}
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index 2671639..cbc45db 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -47,14 +47,10 @@
ref="table" :params="params" :apiObj="apiObj"
@selection-change="selectionChange" stripe>
<el-table-column type="selection" width="50"></el-table-column>
- <el-table-column label="宸ヤ綅缂栧彿" prop="code" width="120"
- sortable='custom'></el-table-column>
- <el-table-column label="宸ヤ綅鍚嶇О" prop="name" width="120"
- sortable='custom'></el-table-column>
- <el-table-column label="宸ヤ綅绫诲瀷" prop="type" width="120"
- sortable='custom'></el-table-column>
- <el-table-column label="宸ヤ綅鏃ュ巻" prop="calendarName" width="120"
- sortable='custom'></el-table-column>
+ <el-table-column label="宸ヤ綅缂栧彿" prop="code" width="120"></el-table-column>
+ <el-table-column label="宸ヤ綅鍚嶇О" prop="name" width="120"></el-table-column>
+ <el-table-column label="宸ヤ綅绫诲瀷" prop="type" width="120"></el-table-column>
+ <el-table-column label="宸ヤ綅鏃ュ巻" prop="calendarName" width="120"></el-table-column>
<el-table-column label="鎿嶄綔" fixed="right" align="right" width="160">
<template #default="scope">
<el-button-group>
@@ -129,49 +125,64 @@
<el-container>
<el-header>
<span>閲囬泦淇℃伅</span>
- <el-button @click="editFlag = !editFlag" style="margin-left: auto;" text type="primary" size="small">閰嶇疆宸ヤ綅閲囬泦</el-button>
- <el-button v-show="editFlag" @click="saveInfo" text type="primary" size="small">淇濆瓨</el-button>
- <el-button text type="primary" size="small">淇敼DMP閰嶇疆</el-button>
+ <el-button @click="editFlag = !editFlag"
+ style="margin-left: auto;" text type="primary"
+ size="small">閰嶇疆宸ヤ綅閲囬泦</el-button>
+ <el-button v-show="editFlag" @click="saveInfo" text
+ type="primary" size="small">淇濆瓨</el-button>
+ <el-button text type="primary"
+ size="small">淇敼DMP閰嶇疆</el-button>
</el-header>
<el-main>
<el-table :data="list" height="200px">
<el-table-column label="閲囬泦鍙橀噺鍚嶇О" prop="name" />
<el-table-column label="宸ヤ綅鍙橀噺鍚嶇О" prop="dataItem">
<template #default="scope">
- <el-input :disabled="!editFlag" v-model="scope.row.dataItem"></el-input>
+ <el-input :disabled="!editFlag"
+ v-model="scope.row.dataItem"></el-input>
</template>
</el-table-column>
<el-table-column label="鏁版嵁鏍囩" prop="description">
<template #default="scope">
- <el-select :disabled="!editFlag" v-model="scope.row.description">
- <el-option v-for="item in workstation_param_type" :key="item.dictKey" :label="item.dictValue"
- :value="item.dictKey-0" />
+ <el-select :disabled="!editFlag"
+ v-model="scope.row.description">
+ <el-option
+ v-for="item in workstation_param_type"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictKey - 0" />
</el-select>
<!-- {{ dmp_data_type.find(v => v.dictKey == scope.row.wcsDataType)?.dictValue }} -->
</template>
</el-table-column>
<el-table-column label="鏁版嵁绫诲埆" prop="wcsDataType">
<template #default="scope">
- <el-select disabled v-model="scope.row.wcsDataType">
- <el-option v-for="item in dmp_data_type" :key="item.dictKey" :label="item.dictValue"
- :value="item.dictKey-0" />
+ <el-select disabled
+ v-model="scope.row.wcsDataType">
+ <el-option v-for="item in dmp_data_type"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictKey - 0" />
</el-select>
<!-- {{ dmp_data_type.find(v => v.dictKey == scope.row.wcsDataType)?.dictValue }} -->
</template>
</el-table-column>
<el-table-column label="澶у睆" prop="bigScreen">
<template #default="scope">
- <el-checkbox :disabled="!editFlag" v-model="scope.row.bigScreen" />
+ <el-checkbox :disabled="!editFlag"
+ v-model="scope.row.bigScreen" />
</template>
</el-table-column>
<el-table-column label="瀹炴椂鏁版嵁" prop="realTimeData">
<template #default="scope">
- <el-checkbox :disabled="!editFlag" v-model="scope.row.realTimeData" />
+ <el-checkbox :disabled="!editFlag"
+ v-model="scope.row.realTimeData" />
</template>
</el-table-column>
<el-table-column label="杩囩▼鍙傛暟" prop="processParameter">
<template #default="scope">
- <el-checkbox :disabled="!editFlag" v-model="scope.row.processParameter" />
+ <el-checkbox :disabled="!editFlag"
+ v-model="scope.row.processParameter" />
</template>
</el-table-column>
</el-table>
@@ -210,7 +221,7 @@
<el-col :span="8">
<ul class="workbench">
<li v-for="item in workbenchVOList" :key="item.sort">
- {{`銆�${item.sort}銆慲}}{{item.name}}
+ {{ `銆�${item.sort}銆慲 }}{{ item.name }}
</li>
</ul>
</el-col>
@@ -659,8 +670,8 @@
this.search()
})
},
- saveInfo () {
- this.$HTTP.post('/api/blade-cps/workstation-wcs/save',this.workbenchVOList).then(res => {
+ saveInfo() {
+ this.$HTTP.post('/api/blade-cps/workstation-wcs/save', this.workbenchVOList).then(res => {
this.editFlag = false
})
},
@@ -701,6 +712,7 @@
}
}
}
+
.workbench {
list-style: none;
}
diff --git a/src/views/mdc/components/Shift.vue b/src/views/mdc/components/Shift.vue
index 630353b..2bab6cf 100644
--- a/src/views/mdc/components/Shift.vue
+++ b/src/views/mdc/components/Shift.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-23 19:45:06
+ * @LastEditTime: 2024-04-27 23:31:53
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Shift.vue
-->
<template>
@@ -151,7 +151,12 @@
type: 'category',
},
yAxis: {
- type: 'value'
+ type: 'value',
+ axisLabel: {
+ formatter: (value) => {
+ return value + '%'
+ }
+ },
},
dataZoom: [
{ type: 'slider' }
@@ -171,7 +176,7 @@
}
option2.dataset.source = [['product', '鐝1', '鐝2']]
res.data.items.records.forEach(v => {
- option2.dataset.source.push([v.workstationName, v.data[1] === '-' ? 0 : v.data[1], v.data[2] === '-' ? 0 : v.data[2]])
+ option2.dataset.source.push([v.workstationName, v.data[1] === '-' ? 0 : v.data[1] * 100, v.data[2] === '-' ? 0 : v.data[2] * 100])
});
this.option2 = option2
console.log(option2)
diff --git a/src/views/mdc/components/Time.vue b/src/views/mdc/components/Time.vue
index d9db372..17d160d 100644
--- a/src/views/mdc/components/Time.vue
+++ b/src/views/mdc/components/Time.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-18 21:52:18
* @LastEditors: Sneed
- * @LastEditTime: 2024-04-23 19:44:57
+ * @LastEditTime: 2024-04-27 23:30:06
* @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/components/Time.vue
-->
<template>
@@ -140,11 +140,16 @@
xAxis: {
type: 'category',
axisLabel: {
- interval: 'auto'
+ interval: 'auto',
}
},
yAxis: {
- type: 'value'
+ type: 'value',
+ axisLabel: {
+ formatter: (value) => {
+ return value + '%'
+ }
+ },
},
dataZoom: [
{ type: 'slider' }
@@ -166,7 +171,7 @@
res.data.items.records.forEach(v => {
let current = [v.id]
Object.keys(v.nameData).forEach(key => {
- current.push(row.data[key] - 0)
+ current.push((v.data[key] - 0) * 100)
})
option2.dataset.source.push(current)
});
diff --git a/src/views/tpm/MachineGroup.vue b/src/views/tpm/MachineGroup.vue
new file mode 100644
index 0000000..3c561a9
--- /dev/null
+++ b/src/views/tpm/MachineGroup.vue
@@ -0,0 +1,131 @@
+<!--
+ * @Date: 2024-04-27 20:02:44
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-04-27 22:21:36
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/tpm/MachineGroup.vue
+-->
+<template>
+ <el-container>
+ <el-aside width="200px" v-loading="showGrouploading">
+ <el-container>
+ <el-main class="nopadding">
+ <el-tree ref="group" node-key="id" :data="group" :current-node-key="form.id"
+ :highlight-current="true" :expand-on-click-node="false" default-expand-all
+ @node-click="groupClick"></el-tree>
+ </el-main>
+ </el-container>
+ </el-aside>
+ <el-container>
+ <el-header>
+ <div class="left-panel">
+ <el-button @click="addChild" type="primary" plain>鏂板涓嬬骇</el-button>
+ <el-button :disabled="!form.id" @click="del" type="danger" plain>鍒犻櫎</el-button>
+ </div>
+ </el-header>
+ <el-main class="">
+ <el-form :model="form" :rules="rules" ref="dialogForm" label-width="200px" label-position="left">
+ <el-form-item label="涓婄骇鐩綍" prop="parentName">
+ <el-input disabled style="width: 240px" v-model="form.parentName"></el-input>
+ </el-form-item>
+ <el-form-item label="鏈哄櫒缁勫悕绉�" prop="name">
+ <el-input :disabled="(form.id === '102' || form.id === '2')" style="width: 240px"
+ v-model="form.name" clearable></el-input>
+ </el-form-item>
+ </el-form>
+ <el-button @click="save" v-show="!(form.id === '102' || form.id === '2')" style="width: 100px"
+ type="primary" plain>淇濆瓨</el-button>
+ </el-main>
+ </el-container>
+ </el-container>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ group: [],
+ form: {
+ code: '',
+ name: '',
+ id: '',
+ groupType: '',
+ groupCategory: '',
+ parentName: '',
+ parentId: '',
+ },
+ disabled: false,
+ }
+ },
+ created() {
+ this.getTreeData()
+ },
+ methods: {
+ getTreeData() {
+ this.$HTTP.get('/api/blade-cps/group/tree?groupCategory=1&groupType=group_machine').then(res => {
+ if (res.code === 200) {
+ this.group = res.data
+ this.groupClick(res.data[0])
+ }
+ })
+ },
+ groupClick(node, node1) {
+ console.log(node, node1?.parent?.data?.name)
+ this.disabled = false
+ Object.keys(this.form).forEach(item => {
+ this.form[item] = node[item]
+ })
+ if (node1?.parent?.data?.name) {
+ this.form.parentName = node1?.parent?.data?.name
+ }
+ if (node.id === '102' || node.id === '2') {
+ this.form.parentName = node.name
+ this.disabled = true
+ }
+ },
+ addChild() {
+ if (!this.form.id) {
+ return
+ }
+ let { name, id, groupType, groupCategory } = this.form
+ this.form.id = ''
+ this.form.name = ''
+ this.form.code = ''
+ this.form.groupType = groupType
+ this.form.groupCategory = groupCategory
+ this.form.parentName = name
+ this.form.parentId = id
+ },
+ del() {
+ this.$confirm(
+ '纭鍒犻櫎璇ユ満鍣ㄧ粍锛�',
+ {
+ distinguishCancelAndClose: true,
+ confirmButtonText: '鍒犻櫎',
+ cancelButtonText: '鍙栨秷',
+ }
+ )
+ .then(() => {
+ this.$HTTP.delete('/api/blade-cps/group/deleteGroup', {}, { params: { groupId: this.form.id } }).then(res => {
+ if (res.code === 200) {
+ this.$message.success("鎿嶄綔鎴愬姛");
+ this.getTreeData()
+ }
+ })
+ }).catch(() => {
+ this.$message.success("鍙栨秷鎿嶄綔");
+ })
+
+ },
+ save() {
+ this.group = []
+ this.$HTTP.post('/api/blade-cps/group', this.form).then(res => {
+ if (res.code === 200) {
+ this.getTreeData()
+ }
+ })
+ }
+ }
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/tpm/MachineTab.vue b/src/views/tpm/MachineTab.vue
new file mode 100644
index 0000000..b4b362d
--- /dev/null
+++ b/src/views/tpm/MachineTab.vue
@@ -0,0 +1,128 @@
+<!--
+ * @Date: 2024-04-27 20:04:34
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-04-27 21:51:12
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/tpm/MachineTab.vue
+-->
+<template>
+ <el-container>
+ <el-aside width="200px" v-loading="showGrouploading">
+ <el-container>
+ <el-main class="nopadding">
+ <el-tree ref="group" default-expand-all node-key="id" :data="group"
+ :current-node-key="params.groupId" :highlight-current="true" @node-click="nodeClick"></el-tree>
+ </el-main>
+ </el-container>
+ </el-aside>
+ <el-container>
+ <el-header>
+ <div class="left-panel">
+ <el-button size="small" @click="table_add" type="primary" icon="el-icon-plus"></el-button>
+ <el-button size="small" type="danger" plain icon="el-icon-delete" @click="batchDel"></el-button>
+ <!-- <el-button type="primary" plain>瀵煎叆</el-button>
+ <el-button type="primary" plain>鎵归噺鎿嶄綔</el-button> -->
+ </div>
+ <div class="right-panel">
+ <div class="right-panel-search">
+ <span>绫诲瀷</span>
+ <el-select size="small" v-model="params.machineTypeId" style="width: 240px">
+ <el-option size="small" v-for="item in types" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select>
+ <span>鐘舵��</span>
+ <el-select size="small" v-model="params.status" style="width: 240px">
+ <el-option size="small" v-for="item in status" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select>
+ <el-input size="small" v-model="params.machineName" style="width: 240px" placeholder="璇疯緭鍏ユ満鍣ㄥ悕绉�"
+ clearable></el-input>
+ <el-button size="small" @click="search" type="primary" icon="el-icon-search"></el-button>
+ </div>
+ </div>
+ </el-header>
+ <el-main class="nopadding">
+ <scTable highlight-current-row @dataChange="dataChange" @row-click="rowClick" ref="table"
+ :params="params" :apiObj="apiObj" @selection-change="selectionChange" stripe>
+ <el-table-column type="selection" width="50"></el-table-column>
+ <el-table-column label="鏈哄櫒缂栧彿" prop="machineCode" width="120"></el-table-column>
+ <el-table-column label="鏈哄櫒鍚嶇О" prop="machineName" width="120"></el-table-column>
+ <el-table-column label="鎵�灞炴満鍣ㄧ粍" prop="groupName" width="120"></el-table-column>
+ <el-table-column label="鏈哄櫒绫诲瀷" prop="machineTypeName" width="120"></el-table-column>
+ <el-table-column label="鏈哄櫒搴忓垪鍙�" prop="serialNo" width="120"></el-table-column>
+ <el-table-column label="鐭紪鍙�" prop="shortCode" width="120"></el-table-column>
+ <el-table-column label="鏈哄櫒瑙勬牸" prop="machineModel" width="120"></el-table-column>
+ <el-table-column label="浣跨敤鐘舵��" prop="machineUseStatusName" width="120"></el-table-column>
+ <el-table-column label="鎿嶄綔" fixed="right" align="right" width="160">
+ <template #default="scope">
+ <el-button-group>
+ <el-button text type="primary" size="small"
+ @click="table_edit(scope.row, scope.$index)">缂栬緫</el-button>
+ <el-popconfirm title="纭畾鍒犻櫎鍚楋紵" @confirm="table_del(scope.row, scope.$index, '0')">
+ <template #reference>
+ <el-button text type="primary" size="small">鍒犻櫎</el-button>
+ </template>
+ </el-popconfirm>
+ </el-button-group>
+ </template>
+ </el-table-column>
+ </scTable>
+
+ </el-main>
+ </el-container>
+ </el-container>
+</template>
+
+<script>
+export default {
+ data() {
+ return {
+ apiObj: this.$API.machineManagement.getList,
+ group: [],
+ treeCheckKey: '',
+ params: {
+ groupId: '',
+ machineCode: '',
+ machineName: '',
+ machineTypeId: '',
+ status: 1,
+ },
+ status: [
+ {
+ label: '鍚敤',
+ value: 1
+ },
+ {
+ label: '鍋滅敤',
+ value: 0
+ }
+ ],
+ types: []
+ }
+ },
+ created() {
+ this.getTreeData()
+ },
+ methods: {
+ getTreeData() {
+ this.$HTTP.get('/api/blade-cps/group/tree?groupCategory=1&groupType=group_machine').then(res => {
+ if (res.code === 200) {
+ this.group = res.data
+ this.params.groupId = res.data[0].id
+ }
+ })
+ },
+ nodeClick(node) {
+ this.params.groupId = node.id
+ },
+ search() {
+ this.$refs.table.reload(this.params)
+ },
+ table_add() {
+ this.$router.push(`/tpm/machine/create`);
+ },
+ batchDel() { },
+ }
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/tpm/machine-management.vue b/src/views/tpm/machine-management.vue
new file mode 100644
index 0000000..61fb8e2
--- /dev/null
+++ b/src/views/tpm/machine-management.vue
@@ -0,0 +1,102 @@
+<template>
+ <el-main>
+ <el-card shadow="never">
+ <el-tabs tab-position="top" class="custom-tabs" v-model="activeName">
+ <el-tab-pane label="鏈哄櫒鍙拌处" name="1">
+ <Machine></Machine>
+ </el-tab-pane>
+ <el-tab-pane label="鏈哄櫒缁�" name="2">
+ <MachineGroup></MachineGroup>
+ </el-tab-pane>
+
+ </el-tabs>
+ </el-card>
+ <!-- <Dialog ref="dialog" @success="success" :option="{ types, status, group }"></Dialog> -->
+ </el-main>
+</template>
+
+<script>
+import pmsPng from '@/assets/pms.png'
+// import Dialog from './Dialog.vue'
+import MachineGroup from './MachineGroup.vue'
+import Machine from './MachineTab.vue'
+export default {
+ name: 'system',
+ components: {
+ // Dialog,
+ MachineGroup,
+ Machine
+ },
+ data() {
+ return {
+ activeName: '1',
+ }
+ },
+ watch: {
+ activeName: {
+ handler(val) {
+ // this.queryList().then(() => {
+ // if (val == 1) {
+ // console.log('>>>>>>>>>>>>>>', this.treeCheckedNode)
+ // this.apiObj = this.$API.workstation.getList
+ // this.params = {
+ // groupId: this.treeCheckedNode.id,
+ // keyWord: '',
+ // status: 1,
+ // type: ''
+ // }
+ // this.groupClick1(this.treeCheckedNode)
+ // }
+ // })
+ },
+ immediate: true
+ },
+ },
+ created() {
+ // this.init()
+ // this.queryList()
+ },
+ methods: {
+
+ }
+}
+</script>
+
+<style lang="scss" scoped>
+.show-info {
+ list-style: none;
+ font-size: 14px;
+}
+
+.preview-title {
+ padding: 12px;
+ margin-bottom: 14px;
+ font-size: 16px;
+}
+
+.preview-content {
+ font-size: 14px;
+ display: flex;
+ align-items: center;
+
+ .img {
+ width: 30%;
+ }
+
+ ul {
+ list-style: none;
+ display: flex;
+ flex-wrap: wrap;
+
+ li {
+ width: 50%;
+ flex: 1 0 auto;
+ margin-bottom: 10px;
+ }
+ }
+}
+
+.workbench {
+ list-style: none;
+}
+</style>
diff --git a/src/views/tpm/machine/create.vue b/src/views/tpm/machine/create.vue
new file mode 100644
index 0000000..9e4c12f
--- /dev/null
+++ b/src/views/tpm/machine/create.vue
@@ -0,0 +1,21 @@
+<!--
+ * @Date: 2024-04-27 21:44:20
+ * @LastEditors: Sneed
+ * @LastEditTime: 2024-04-27 21:45:27
+ * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/tpm/machine/create.vue
+-->
+<template>
+ <el-main>
+ <el-card shadow="never">
+ 鏂板
+ </el-card>
+ </el-main>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
--
Gitblit v1.9.3