From 8520e36378e8e88cbbc45586bb31d1fec3be87ac Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期三, 21 八月 2024 10:11:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6
---
Web/src/views/wcs/wcsDevice/component/editDialog.vue | 218 ++++++++++++++++++++++++++++--------------------------
1 files changed, 114 insertions(+), 104 deletions(-)
diff --git a/Web/src/views/wcs/wcsDevice/component/editDialog.vue b/Web/src/views/wcs/wcsDevice/component/editDialog.vue
index 10396a3..fc839f3 100644
--- a/Web/src/views/wcs/wcsDevice/component/editDialog.vue
+++ b/Web/src/views/wcs/wcsDevice/component/editDialog.vue
@@ -15,71 +15,85 @@
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="PlcId" prop="plcId">
<el-select clearable filterable v-model="ruleForm.plcId" placeholder="璇烽�夋嫨PlcId">
- <el-option v-for="(item,index) in wcsPlcPlcIdDropdownList" :key="index" :value="item.value" :label="item.label" />
-
+ <el-option v-for="(item, index) in wcsPlcPlcIdDropdownList" :key="index"
+ :value="item.value" :label="item.label" />
+
</el-select>
-
+
</el-form-item>
-
+
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="璁惧绾у埆" prop="level">
<el-select clearable v-model="ruleForm.level" placeholder="璇烽�夋嫨璁惧绾у埆">
- <el-option v-for="(item,index) in dl('DeviceLevelEnum')" :key="index" :value="Number(item.value)" :label="`${item.name} (${item.code}) [${item.value}]`"></el-option>
-
+ <el-option v-for="(item, index) in dl('DeviceLevelEnum')" :key="index"
+ :value="Number(item.value)"
+ :label="`${item.name} (${item.code}) [${item.value}]`"></el-option>
+
</el-select>
-
+
</el-form-item>
-
+
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="DB鍖哄煙" prop="dbNumber">
- <el-input v-model="ruleForm.dbNumber" placeholder="璇疯緭鍏B鍖哄煙" maxlength="10" show-word-limit clearable />
-
+ <el-input v-model="ruleForm.dbNumber" placeholder="璇疯緭鍏B鍖哄煙" maxlength="10" show-word-limit
+ clearable />
+
</el-form-item>
-
+
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="宸ヤ綅鍙�" prop="stationNum">
- <el-input v-model="ruleForm.stationNum" placeholder="璇疯緭鍏ュ伐浣嶅彿" maxlength="4" show-word-limit clearable />
-
+ <el-input v-model="ruleForm.stationNum" placeholder="璇疯緭鍏ュ伐浣嶅彿" maxlength="4" show-word-limit
+ clearable />
+
</el-form-item>
-
+
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="PLC鍋忕Щ閲�" prop="plcPos">
- <el-input v-model="ruleForm.plcPos" placeholder="璇疯緭鍏LC鍋忕Щ閲�" maxlength="10" show-word-limit clearable />
-
+ <el-input v-model="ruleForm.plcPos" placeholder="璇疯緭鍏LC鍋忕Щ閲�" maxlength="10" show-word-limit
+ clearable />
+
</el-form-item>
-
+
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="WCS鍋忕Щ閲�" prop="wcsPos">
- <el-input v-model="ruleForm.wcsPos" placeholder="璇疯緭鍏CS鍋忕Щ閲�" maxlength="10" show-word-limit clearable />
-
+ <el-input v-model="ruleForm.wcsPos" placeholder="璇疯緭鍏CS鍋忕Щ閲�" maxlength="10" show-word-limit
+ clearable />
+
</el-form-item>
-
+
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="娴佺▼瀛楃被鍨�" prop="posType">
- <el-input v-model="ruleForm.posType" placeholder="璇疯緭鍏ユ祦绋嬪瓧绫诲瀷" maxlength="10" show-word-limit clearable />
-
+ <el-select clearable v-model="ruleForm.posType" placeholder="璇烽�夋嫨娴佺▼瀛楃被鍨�">
+ <el-option v-for="(item, index) in dl('PLCDataTypeEnum')" :key="index"
+ :value="Number(item.value)"
+ :label="`${item.name} (${item.code}) [${item.value}]`"></el-option>
+
+ </el-select>
+
</el-form-item>
-
+
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="鏄剧ず灞廼p鍦板潃" prop="ledIP">
- <el-input v-model="ruleForm.ledIP" placeholder="璇疯緭鍏ユ樉绀哄睆ip鍦板潃" maxlength="50" show-word-limit clearable />
-
+ <el-input v-model="ruleForm.ledIP" placeholder="璇疯緭鍏ユ樉绀哄睆ip鍦板潃" maxlength="50" show-word-limit
+ clearable />
+
</el-form-item>
-
+
</el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="鎻忚堪" prop="text">
- <el-input v-model="ruleForm.text" placeholder="璇疯緭鍏ユ弿杩�" maxlength="20" show-word-limit clearable />
-
+ <el-input v-model="ruleForm.text" placeholder="璇疯緭鍏ユ弿杩�" maxlength="20" show-word-limit
+ clearable />
+
</el-form-item>
-
+
</el-col>
</el-row>
</el-form>
@@ -99,97 +113,93 @@
}
</style>
<script lang="ts" setup>
- import { ref,onMounted } from "vue";
- import { ElMessage } from "element-plus";
- import type { FormRules } from "element-plus";
- import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
- import { getDictLabelByVal as dv } from '/@/utils/dict-utils';
- import { formatDate } from '/@/utils/formatTime';
- import { addWcsDevice, updateWcsDevice, detailWcsDevice } from "/@/api/wcs/wcsDevice";
- import { getWcsPlcPlcIdDropdown } from '/@/api/wcs/wcsDevice';
- import { getAPI } from '/@/utils/axios-utils';
- import { SysEnumApi } from '/@/api-services/api';
+import { ref, onMounted } from "vue";
+import { ElMessage } from "element-plus";
+import type { FormRules } from "element-plus";
+import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
+import { getDictLabelByVal as dv } from '/@/utils/dict-utils';
+import { formatDate } from '/@/utils/formatTime';
+import { addWcsDevice, updateWcsDevice, detailWcsDevice } from "/@/api/wcs/wcsDevice";
+import { getWcsPlcPlcIdDropdown } from '/@/api/wcs/wcsDevice';
+import { getAPI } from '/@/utils/axios-utils';
+import { SysEnumApi } from '/@/api-services/api';
- //鐖剁骇浼犻�掓潵鐨勫弬鏁�
- var props = defineProps({
- title: {
+//鐖剁骇浼犻�掓潵鐨勫弬鏁�
+var props = defineProps({
+ title: {
type: String,
default: "",
},
- });
- //鐖剁骇浼犻�掓潵鐨勫嚱鏁帮紝鐢ㄤ簬鍥炶皟
- const emit = defineEmits(["reloadTable"]);
- const ruleFormRef = ref();
- const isShowDialog = ref(false);
- const ruleForm = ref<any>({});
- //鑷娣诲姞鍏朵粬瑙勫垯
- const rules = ref<FormRules>({
- });
+});
+//鐖剁骇浼犻�掓潵鐨勫嚱鏁帮紝鐢ㄤ簬鍥炶皟
+const emit = defineEmits(["reloadTable"]);
+const ruleFormRef = ref();
+const isShowDialog = ref(false);
+const ruleForm = ref<any>({});
+//鑷娣诲姞鍏朵粬瑙勫垯
+const rules = ref<FormRules>({
+});
- // 椤甸潰鍔犺浇鏃�
- onMounted(() => {
+// 椤甸潰鍔犺浇鏃�
+onMounted(() => {
- });
+});
- // 鎵撳紑寮圭獥
- const openDialog = async (row: any) => {
- // ruleForm.value = JSON.parse(JSON.stringify(row));
- // 鏀圭敤detail鑾峰彇鏈�鏂版暟鎹潵缂栬緫
- let rowData = JSON.parse(JSON.stringify(row));
- if (rowData.id)
- ruleForm.value = (await detailWcsDevice(rowData.id)).data.result;
- else
- ruleForm.value = rowData;
- isShowDialog.value = true;
- };
+// 鎵撳紑寮圭獥
+const openDialog = async (row: any) => {
+ // ruleForm.value = JSON.parse(JSON.stringify(row));
+ // 鏀圭敤detail鑾峰彇鏈�鏂版暟鎹潵缂栬緫
+ let rowData = JSON.parse(JSON.stringify(row));
+ if (rowData.id)
+ ruleForm.value = (await detailWcsDevice(rowData.id)).data.result;
+ else
+ ruleForm.value = rowData;
+ isShowDialog.value = true;
+};
- // 鍏抽棴寮圭獥
- const closeDialog = () => {
- emit("reloadTable");
- isShowDialog.value = false;
- };
+// 鍏抽棴寮圭獥
+const closeDialog = () => {
+ emit("reloadTable");
+ isShowDialog.value = false;
+};
- // 鍙栨秷
- const cancel = () => {
- isShowDialog.value = false;
- };
+// 鍙栨秷
+const cancel = () => {
+ isShowDialog.value = false;
+};
- // 鎻愪氦
- const submit = async () => {
- ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
- if (isValid) {
- let values = ruleForm.value;
- if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
- await addWcsDevice(values);
- } else {
- await updateWcsDevice(values);
- }
- closeDialog();
+// 鎻愪氦
+const submit = async () => {
+ ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
+ if (isValid) {
+ let values = ruleForm.value;
+ if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
+ await addWcsDevice(values);
} else {
- ElMessage({
- message: `琛ㄥ崟鏈�${Object.keys(fields).length}澶勯獙璇佸け璐ワ紝璇蜂慨鏀瑰悗鍐嶆彁浜,
- type: "error",
- });
+ await updateWcsDevice(values);
}
- });
- };
+ closeDialog();
+ } else {
+ ElMessage({
+ message: `琛ㄥ崟鏈�${Object.keys(fields).length}澶勯獙璇佸け璐ワ紝璇蜂慨鏀瑰悗鍐嶆彁浜,
+ type: "error",
+ });
+ }
+ });
+};
- const wcsPlcPlcIdDropdownList = ref<any>([]);
- const getWcsPlcPlcIdDropdownList = async () => {
- let list = await getWcsPlcPlcIdDropdown();
- wcsPlcPlcIdDropdownList.value = list.data.result ?? [];
- };
- getWcsPlcPlcIdDropdownList();
-
+const wcsPlcPlcIdDropdownList = ref<any>([]);
+const getWcsPlcPlcIdDropdownList = async () => {
+ let list = await getWcsPlcPlcIdDropdown();
+ wcsPlcPlcIdDropdownList.value = list.data.result ?? [];
+};
+getWcsPlcPlcIdDropdownList();
- //灏嗗睘鎬ф垨鑰呭嚱鏁版毚闇茬粰鐖剁粍浠�
- defineExpose({ openDialog });
+
+//灏嗗睘鎬ф垨鑰呭嚱鏁版毚闇茬粰鐖剁粍浠�
+defineExpose({ openDialog });
</script>
-
-
-
-
--
Gitblit v1.8.0