From b16924b9d159dc352ccb210c476b0d3f2682c671 Mon Sep 17 00:00:00 2001
From: fuguobin <fgbin2008@163.com>
Date: Tue, 5 Sep 2023 13:58:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/settings.ts                               |  2 +-
 src/types/auto-imports.d.ts                   |  2 +
 src/views/dashboard/index.vue                 | 10 +--
 .../devicemanage/components/main.vue          |  8 +--
 .../devicemanage/components/menu.vue          | 61 ++++++++++++-------
 vite.config.ts                                |  4 +-
 6 files changed, 52 insertions(+), 35 deletions(-)

diff --git a/src/settings.ts b/src/settings.ts
index 8aac99f..7accad9 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -50,7 +50,7 @@ interface DefaultSettings {
 }
 
 const defaultSettings: DefaultSettings = {
-  title: 'vue-vite-project-admin',
+  title: '联美运营驾驶舱管理系统',
   showSettings: true,
   tagsView: true,
   fixedHeader: false,
diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts
index 89da715..e21443a 100644
--- a/src/types/auto-imports.d.ts
+++ b/src/types/auto-imports.d.ts
@@ -2,6 +2,7 @@
 export {}
 declare global {
   const EffectScope: typeof import('vue')['EffectScope']
+  const ElForm: typeof import('element-plus/es')['ElForm']
   const ElMessage: typeof import('element-plus/es')['ElMessage']
   const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
   const NEllipsis: typeof import('naive-ui')['NEllipsis']
@@ -271,6 +272,7 @@ import { UnwrapRef } from 'vue'
 declare module 'vue' {
   interface ComponentCustomProperties {
     readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
+    readonly ElForm: UnwrapRef<typeof import('element-plus/es')['ElForm']>
     readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
     readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
     readonly NEllipsis: UnwrapRef<typeof import('naive-ui')['NEllipsis']>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 4188936..698979f 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -18,10 +18,10 @@
               </div>
             </div>
           </div>
-          <!-- <div class="userNum flex column text-center">
+          <div class="userNum flex column text-center">
             <div class="title">用户数</div>
             <span><countTo :start="1" :end="userNumber" :duration="5000"></countTo></span>
-          </div> -->
+          </div>
           <!-- <div class="currentTime flex column text-center">
             <span>{{ currentTime }}</span>
             <span>
@@ -32,7 +32,7 @@
         </div>
       </el-card>
     </section>
-    <!-- <section class="dataCard">
+    <section class="dataCard">
       <el-card shadow="always">
         <el-row :gutter="20">
           <el-col :span="6" v-for="item in cardData" :key="item.value">
@@ -62,7 +62,7 @@
           <PieChart id="pieChart" height="300px" width="100%" />
         </el-col>
       </el-row>
-    </section> -->
+    </section>
   </div>
 </template>
 
@@ -117,7 +117,7 @@ const cardData: CardData[] = [
   },
   {
     id: '3',
-    title: '下载数',
+    title: '订单数',
     value: 2000,
     time: 5000,
     colors: ['#56cdf3', '#719de3'],
diff --git a/src/views/monitoring/devicemanage/components/main.vue b/src/views/monitoring/devicemanage/components/main.vue
index 863fb2d..b07f8a1 100644
--- a/src/views/monitoring/devicemanage/components/main.vue
+++ b/src/views/monitoring/devicemanage/components/main.vue
@@ -232,7 +232,7 @@ import mitt from '@/plugins/bus';
 
 const value = ref(0)
 // const active = ref(true)
-const menuKey = ref();
+const deviceMenuKey = ref();
 const infoData = ref([
   { header_main: [] }
 ]);
@@ -246,15 +246,15 @@ defineProps({
     default: 0,
   },
 });
-mitt.on('menuKey', (res: any) => {
+mitt.on('deviceMenuKey', (res: any) => {
   //监听部门点击
-  menuKey.value = res;
+  deviceMenuKey.value = res;
   gitDevice();
 });
 
 function gitDevice() {
   //获取组态信息
-  const params = menuKey.value;
+  const params = deviceMenuKey.value;
   getViewInfo(params).then((res: any) => {
     if (res.code === 200) {
       if (isCurrentRoute) {
diff --git a/src/views/monitoring/devicemanage/components/menu.vue b/src/views/monitoring/devicemanage/components/menu.vue
index 38544eb..8ea3669 100644
--- a/src/views/monitoring/devicemanage/components/menu.vue
+++ b/src/views/monitoring/devicemanage/components/menu.vue
@@ -1,15 +1,16 @@
 <template>
-  <el-menu ref="menuInstRef" class="menu" background-color="transparent" text-color="#84e0f7"
-    active-text-color="#ffd04b" :default-active="selectedKey" @open="openClick" @close="closeClick" @select="selectClick">
+  <el-menu ref="menuInstRef" class="menu" background-color="transparent" text-color="#84e0f7" active-text-color="#ffd04b"
+    :default-active="selectedKey" unique-opened @open="openClick" @close="closeClick" @select="selectClick">
     <el-sub-menu :index="`${item.deptId}`" v-for="(item, index) in menuOptions" :key="item.deptId">
       <template #title>
         <el-tooltip class="box-item" effect="dark" :content="item.deptName" placement="top-start">
           <span>{{ item.deptName }}</span>
         </el-tooltip>
       </template>
-      <el-sub-menu :index="`${result.deptId}`" v-for="(result, index) in item.children" :key="result.deptId"
-        @click.native="clickNative">
-        <template #title>{{ result.deptName }}</template>
+      <el-sub-menu :index="`${result.deptId}`" v-for="(result, index) in item.children" :key="result.deptId">
+        <template #title>
+          <div @click.native="clickNative(result)">{{ result.deptName }}</div>
+        </template>
         <el-menu-item :index="`${res.deptId}`" v-for="(res, index) in result.children" :key="res.deptId">
           <el-tooltip class="box-item" effect="dark" :content="res.deptName" placement="right-start">
             <span>{{ res.deptName }}</span>
@@ -21,7 +22,7 @@
 </template>
 
 <script lang="ts" setup>
-import { useRouter } from "vue-router";
+import { useRoute } from "vue-router";
 import { getDept, getDeviceList } from '@/api/device/index';
 import { menuVo, deviceVo } from '@/api/device/types';
 import mitt from '@/plugins/bus';
@@ -29,29 +30,38 @@ const deptData = ref([]);
 const selectedKey = ref();
 const menuOptions = ref<menuVo[]>();
 const deviceData = ref<deviceVo[]>();
-const id=
+const router = useRoute()
 
 const emit = defineEmits(['tableMenuData']);
 
 onMounted(() => {
-  menuApi();
+  if (router.query?.id === undefined) {
+    menuApi('0');
+  } else {
+    menuApi('2');
+  }
 });
 
-function menuApi() {
+function menuApi(type: string) {
   //获取部门
   getDept().then((res: any) => {
     if (res.code === 200) {
-      const key =
-        res.data[0] && res.data[0].children && res.data[0].children.length > 0
-          ? res.data[0].children[0].deptId
-          : res.data[0].deptId;
       // removeChildren(res.data);
       deptData.value = res.data;
-      menuOptions.value=res.data
-      gitDevice(key, '0')
+      // menuOptions.value = res.data
       // selectedKey.value = key;
-      // mitt.emit('menuKey', key);
+      // mitt.emit('deviceMenuKey', key);
       emit('tableMenuData', res.data);
+      if (type === '0') {
+        const key =
+          res.data[0] && res.data[0].children && res.data[0].children.length > 0
+            ? res.data[0].children[0].deptId
+            : res.data[0].deptId;
+        gitDevice(key, '0')
+      } else {
+        const deptId = Number(sessionStorage.getItem('deptId'))
+        gitDevice(deptId, '2')
+      }
     }
   });
 }
@@ -78,14 +88,18 @@ function gitDevice(key: number, type: string) {
       if (type === '0') {
         const deptIdKey = res.data[0].deptId;
         selectedKey.value = deptIdKey.toString();
-        mitt.emit('menuKey', deptIdKey);
+        mitt.emit('deviceMenuKey', deptIdKey);
+      } else if (type === '2') {
+        const deptIdKey = router.query?.id;
+        selectedKey.value = deptIdKey?.toString();
+        mitt.emit('deviceMenuKey', deptIdKey);
       }
-      // menuOptions.value = deptData.value
+      menuOptions.value = deptData.value
       deviceData.value = res.data;
       // console.log(menuOptions.value)
       // if (type === '0') {
       //   selectedKey.value = res.data[0].deptId;
-      //   mitt.emit('menuKey', res.data[0].deptId);
+      //   mitt.emit('deviceMenuKey', res.data[0].deptId);
       // }
     }
   });
@@ -109,14 +123,14 @@ function gitDevice(key: number, type: string) {
 // function menuUpdateValue(key: number, item: MenuOption) {
 //   //点击菜单
 //   // gitDevice(key, '1')
-//   mitt.emit('menuKey', key);
+//   mitt.emit('deviceMenuKey', key);
 //   console.log(key, item);
 // }
 
 const openClick = (key: string, indexPath: string[]) => {
   //sub-menu 展开的回调
   console.log("open-", key, indexPath)
-  gitDevice(Number(key), '1')
+  // gitDevice(Number(key), '1')
 }
 const closeClick = (key: string, keyPath: string[]) => {
   //sub-menu 收起的回调
@@ -125,11 +139,12 @@ const closeClick = (key: string, keyPath: string[]) => {
 const selectClick = (key: string, keyPath: string[], item: any) => {
   //菜单激活回调
   console.log("select-", key, keyPath, item)
-  mitt.emit('menuKey', key);
+  mitt.emit('deviceMenuKey', key);
 }
 
 function clickNative(item: any) {
-  console.log("clickNative-",item)
+  gitDevice(item.deptId, '1')
+  console.log("clickNative-", item)
 }
 </script>
 <style lang="scss" scoped>
diff --git a/vite.config.ts b/vite.config.ts
index fb772d1..7a8369c 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -45,8 +45,8 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
       hmr: true,//配置HMR
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          target: 'http://172.1.2.157:9000/',//本地接口地址
-          // target: 'http://10.10.10.56:9000/',//线上接口地址
+          // target: 'http://172.1.2.157:9000/',//本地接口地址
+          target: 'http://10.10.10.56:9000/',//线上接口地址
           changeOrigin: true,
           rewrite: path =>
             path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')