From 494581ce138323017505adfd215c4ba45ecddcd8 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期一, 04 十一月 2024 20:15:57 +0800
Subject: [PATCH] 部分修改词条及其他
---
src/views/console/workstation/index.vue | 6 +++---
src/views/tpm/MachineTab.vue | 4 ++--
src/views/tpm/machine-management.vue | 4 ++--
src/views/console/workstation/Dialog.vue | 2 +-
src/views/tpm/machine/Dialog.vue | 8 ++++----
src/views/tpm/MachineGroup.vue | 6 +++---
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/views/console/workstation/Dialog.vue b/src/views/console/workstation/Dialog.vue
index 5e44b5f..49df965 100644
--- a/src/views/console/workstation/Dialog.vue
+++ b/src/views/console/workstation/Dialog.vue
@@ -151,7 +151,7 @@
<el-button style="margin-left: 50px;margin-top: 8px" @click="addWork">娣诲姞宸ヤ綔鍙�</el-button>
</el-col> -->
<el-col :span="12">
- <el-form-item label="鏁版嵁鏉冮檺" prop="createDept">
+ <el-form-item label="鎵�灞為儴闂�" prop="createDept">
<el-tree-select :props="{
label: 'title',
id: 'id',
diff --git a/src/views/console/workstation/index.vue b/src/views/console/workstation/index.vue
index e588771..e41d64a 100644
--- a/src/views/console/workstation/index.vue
+++ b/src/views/console/workstation/index.vue
@@ -228,13 +228,13 @@
<el-main class="" v-show="addGroupShow">
<el-form v-show="treeCheckedNode.id == 1" :model="form" :rules="rules" ref="dialogForm"
label-width="200px" label-position="left">
- <el-form-item label="浜х嚎鏍囩" prop="groupTag">
+ <!-- <el-form-item label="浜х嚎鏍囩" prop="groupTag">
<el-select v-model="form.groupTag" clearable placeholder="浜х嚎鏍囩"
style="width: 240px">
<el-option v-for="item in beltline_type" :key="item.dictKey"
:label="item.dictValue" :value="item.dictKey" />
</el-select>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="浜х嚎鍚嶇О" prop="name">
<el-input style="width: 240px" v-model="form.name" clearable
placeholder="浜х嚎鍚嶇О"></el-input>
@@ -404,7 +404,7 @@
previewData: {},
// --------
form: {
- groupTag: '',
+ groupTag: 'beltline',
name: '',
sort: '',
remark: ''
diff --git a/src/views/tpm/MachineGroup.vue b/src/views/tpm/MachineGroup.vue
index 6c28209..c7fa5bb 100644
--- a/src/views/tpm/MachineGroup.vue
+++ b/src/views/tpm/MachineGroup.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-27 20:02:44
* @LastEditors: gaoshp
- * @LastEditTime: 2024-09-29 19:33:58
+ * @LastEditTime: 2024-11-04 20:10:22
* @FilePath: /cps-web/src/views/tpm/MachineGroup.vue
-->
<template>
@@ -27,7 +27,7 @@
<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-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>
@@ -97,7 +97,7 @@
},
del() {
this.$confirm(
- '纭鍒犻櫎璇ユ満鍣ㄧ粍锛�',
+ '纭鍒犻櫎璇ヨ澶囩粍锛�',
{
distinguishCancelAndClose: true,
confirmButtonText: '鍒犻櫎',
diff --git a/src/views/tpm/MachineTab.vue b/src/views/tpm/MachineTab.vue
index 49a4e66..5c4e6fe 100644
--- a/src/views/tpm/MachineTab.vue
+++ b/src/views/tpm/MachineTab.vue
@@ -1,7 +1,7 @@
<!--
* @Date: 2024-04-27 20:04:34
* @LastEditors: gaoshp
- * @LastEditTime: 2024-09-24 21:03:08
+ * @LastEditTime: 2024-11-04 20:10:30
* @FilePath: /cps-web/src/views/tpm/MachineTab.vue
-->
<template>
@@ -47,7 +47,7 @@
<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="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>
diff --git a/src/views/tpm/machine-management.vue b/src/views/tpm/machine-management.vue
index 61fb8e2..b6f51fd 100644
--- a/src/views/tpm/machine-management.vue
+++ b/src/views/tpm/machine-management.vue
@@ -2,10 +2,10 @@
<el-main>
<el-card shadow="never">
<el-tabs tab-position="top" class="custom-tabs" v-model="activeName">
- <el-tab-pane label="鏈哄櫒鍙拌处" name="1">
+ <el-tab-pane label="璁惧鍙拌处" name="1">
<Machine></Machine>
</el-tab-pane>
- <el-tab-pane label="鏈哄櫒缁�" name="2">
+ <el-tab-pane label="璁惧缁�" name="2">
<MachineGroup></MachineGroup>
</el-tab-pane>
diff --git a/src/views/tpm/machine/Dialog.vue b/src/views/tpm/machine/Dialog.vue
index 1127d07..4031b59 100644
--- a/src/views/tpm/machine/Dialog.vue
+++ b/src/views/tpm/machine/Dialog.vue
@@ -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>
@@ -332,8 +332,8 @@
},
mode: "add",
titleMap: {
- add: '鏂板缓鏈哄櫒鍙拌处',
- edit: '缂栬緫鏈哄櫒鍙拌处',
+ add: '鏂板缓璁惧鍙拌处',
+ edit: '缂栬緫璁惧鍙拌处',
// show: '鏌ョ湅'
},
visible: false,
--
Gitblit v1.9.3