From 0aa4f9751aadb4abb3637bc74fb7f0b48dd7a23e Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 08 十一月 2024 15:01:23 +0800
Subject: [PATCH] Merge branch 'new' of http://122.9.151.159:9090/r/smart-web into new

---
 src/views/tpm/machine/Dialog.vue |   38 ++++++++++++++++++++------------------
 1 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/views/tpm/machine/Dialog.vue b/src/views/tpm/machine/Dialog.vue
index 3ff174f..4031b59 100644
--- a/src/views/tpm/machine/Dialog.vue
+++ b/src/views/tpm/machine/Dialog.vue
@@ -51,7 +51,7 @@
                     <el-form-item label="鐢熷懡鐘舵��" prop="machineLifeStatus">
                         <el-select v-model="form.machineLifeStatus" placeholder="" style="width: 240px">
                             <el-option v-for="item in options.machineLifeStatus" :key="item.value" :label="item.label"
-                                :value="item.value" />
+                                :value="item.value - 0" />
                         </el-select>
                     </el-form-item>
                 </el-col>
@@ -106,8 +106,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item label="鎵�灞炴満鍣ㄧ粍" prop="groupId">
-                        <!-- <el-input style="width: 240px" v-model="form.groupId" placeholder="鎵�灞炴満鍣ㄧ粍" clearable></el-input> -->
+                    <el-form-item label="鎵�灞炶澶囩粍" prop="groupId">
+                        <!-- <el-input style="width: 240px" v-model="form.groupId" placeholder="" clearable></el-input> -->
                         <el-tree-select v-model="form.groupId" node-key="id" :props="props" :data="options.groupId"
                             filterable style="width: 240px" />
                     </el-form-item>
@@ -119,14 +119,15 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item label="宸ヤ綅缂栧彿" prop="workstationId">
-                        <el-input style="width: 240px" v-model="form.workstationId" placeholder="鏈粦瀹�"
+                    <el-form-item label="宸ヤ綅缂栧彿" prop="workstationCode">
+                        <el-input style="width: 240px" v-model="form.workstationCode" placeholder="鏈粦瀹�"
                             disabled></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
-                    <el-form-item label="宸ヤ綅鍚嶇О" prop="code">
-                        <el-input style="width: 240px" v-model="form.code" placeholder="鏈粦瀹�" disabled></el-input>
+                    <el-form-item label="宸ヤ綅鍚嶇О" prop="workstationName">
+                        <el-input style="width: 240px" v-model="form.workstationName" placeholder="鏈粦瀹�"
+                            disabled></el-input>
                     </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -243,7 +244,7 @@
                     <el-form-item label="浣跨敤鐘舵��" prop="machineUseStatus">
                         <el-select v-model="form.machineUseStatus" placeholder="" style="width: 240px">
                             <el-option v-for="item in options.machineUseStatus" :key="item.value" :label="item.label"
-                                :value="item.value" />
+                                :value="item.value - 0" />
                         </el-select>
                     </el-form-item>
                 </el-col>
@@ -331,8 +332,8 @@
             },
             mode: "add",
             titleMap: {
-                add: '鏂板缓鏈哄櫒鍙拌处',
-                edit: '缂栬緫鏈哄櫒鍙拌处',
+                add: '鏂板缓璁惧鍙拌处',
+                edit: '缂栬緫璁惧鍙拌处',
                 // show: '鏌ョ湅'
             },
             visible: false,
@@ -358,8 +359,9 @@
                 softwareVersion: '',
                 groupId: '',
                 linkWay: '',
-                machineCode: '',
                 workstationId: '',
+                workstationCode: '',
+                workstationName: '',
                 code: '',
                 status: '',
                 invoiceValue: '',
@@ -478,7 +480,7 @@
                     }))
                 }
             })
-            this.$HTTP.get('/api/blade-cps/device-types/page?keyWord=&current=1&size=-1').then(res => {
+            this.$HTTP.get('/api/smis/device-types/page?keyWord=&current=1&size=-1').then(res => {
                 if (res.code === 200) {
                     this.options.machineTypeId = res.data.records.map(item => ({
                         label: item.name,
@@ -486,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
                 }
@@ -512,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,
@@ -540,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()
                             })
                         }

--
Gitblit v1.9.3