From bd6a0921941865accad8720603eee6064024db08 Mon Sep 17 00:00:00 2001
From: lxg <zxc1945@qq.com>
Date: Sat, 12 Aug 2023 15:51:03 +0800
Subject: [PATCH] lixg8-12

---
 index.html                                |  2 +-
 package.json                              |  6 ++---
 src/views/model/devicemodel/editModel.vue | 10 ++++----
 src/views/model/devicemodel/index.vue     | 31 ++++++++++++++---------
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/index.html b/index.html
index 90803b9..973256d 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
   <meta name="renderer" content="webkit">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/favicon.ico">
-  <title>闻荫管理系统</title>
+  <title>联美运营系统</title>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,
diff --git a/package.json b/package.json
index 5cb2b35..608d663 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "wenyin",
+  "name": "lianmei",
   "version": "3.8.5",
-  "description": "闻荫管理系统",
-  "author": "闻荫",
+  "description": "联美运营系统",
+  "author": "联美",
   "license": "MIT",
   "scripts": {
     "dev": "vite",
diff --git a/src/views/model/devicemodel/editModel.vue b/src/views/model/devicemodel/editModel.vue
index bf5ee2c..91adcb3 100644
--- a/src/views/model/devicemodel/editModel.vue
+++ b/src/views/model/devicemodel/editModel.vue
@@ -159,7 +159,7 @@
     }
   } 
 </style>
-<script setup name="newdevicemodel">
+<script setup name="editdevicemodel">
 import { listDevicemodel,addDevicemodel, updateDevicemodel } from "@/api/model/devicemodel";
 import { listParamclass } from "@/api/model/paramclass";
 import { listModelType} from "@/api/model/modelType";
@@ -186,9 +186,9 @@ const updateModelSubmit = ref([]);
 const operateModelIds = ref([]);
 const updateModelIds = ref([]);
 const deleteModelIds = ref([]);
-console.log(router);
+console.log(deleteModelIds);
 console.log(proxy);
-const tempPid = router.currentRoute._value.query.pid;
+const modelId = router.currentRoute._value.query.pid;
 const data = reactive({
   form: {
     sort:1,
@@ -353,8 +353,8 @@ function submitForm() {
   });
 }
   onMounted(() => {
-    debugger
-    console.log("-------------"+tempPid);
+    
+    console.log("-------------"+modelId);
     // 在组件首次加载完成后执行的逻辑
     // 可以在这里给组件复制
     // form.value.pid=tempPid;
diff --git a/src/views/model/devicemodel/index.vue b/src/views/model/devicemodel/index.vue
index e71e073..b7807ed 100644
--- a/src/views/model/devicemodel/index.vue
+++ b/src/views/model/devicemodel/index.vue
@@ -264,7 +264,6 @@ function getTreeselect() {
     devicemodelOptions.value.push(data);
   });
 }
-	
 // 取消按钮
 function cancel() {
   open.value = false;
@@ -342,19 +341,27 @@ function toggleExpandAll() {
 }
 
 /** 修改按钮操作 */
-async function handleUpdate(row) {
-  reset();
-  await getTreeselect();
-  if (row != null) {
-    form.value.pid = row.id;
-  }
-  getDevicemodel(row.id).then(response => {
-    form.value = response.data;
-    open.value = true;
-    title.value = "修改设备模型信息";
-  });
+function handleUpdate(row) {
+  const path = "/editdevicemodel"
+  router.push({
+    name: path,
+    query: { pid: row.id }
+  })
 }
 
+// async function handleUpdate(row) {
+//   reset();
+//   await getTreeselect();
+//   if (row != null) {
+//     form.value.pid = row.id;
+//   }
+//   getDevicemodel(row.id).then(response => {
+//     form.value = response.data;
+//     open.value = true;
+//     title.value = "修改设备模型信息";
+//   });
+// }
+
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs["devicemodelRef"].validate(valid => {