From 862fbc6658e149ecf173cd2b6e8af1e803cc4cb9 Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Mon, 15 Jan 2024 20:29:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=20=E6=B8=B8=E5=AE=A2?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/cs-harmonic-boot/datatrend.ts         | 25 +++++
 src/api/user.ts                               | 11 +++
 src/components/tree/govern/deviceTree.vue     | 28 +++++-
 src/components/tree/govern/getMarketList.vue  | 29 ++++++
 src/views/govern/device/disposition/index.vue | 71 ++++++++++++++
 src/views/govern/device/tourist/index.vue     | 97 +++++++++++++++++++
 6 files changed, 259 insertions(+), 2 deletions(-)
 create mode 100644 src/components/tree/govern/getMarketList.vue
 create mode 100644 src/views/govern/device/disposition/index.vue
 create mode 100644 src/views/govern/device/tourist/index.vue

diff --git a/src/api/cs-harmonic-boot/datatrend.ts b/src/api/cs-harmonic-boot/datatrend.ts
index ace01aa..97f0304 100644
--- a/src/api/cs-harmonic-boot/datatrend.ts
+++ b/src/api/cs-harmonic-boot/datatrend.ts
@@ -8,3 +8,28 @@ export function getDeviceDataTrend(data: any) {
         data
     })
 }
+
+// 查询游客配置
+export const getVisitorConfig = () => {
+    return createAxios({
+        url: '/cs-device-boot/csTouristData/queryAll',
+        method: 'POST'
+    })
+}
+
+// 更新游客配置
+export const updateVisitorConfig = (data: any) => {
+    return createAxios({
+        url: '/cs-device-boot/csTouristData/add',
+        method: 'POST',
+        data: data
+    })
+}
+// * 根据用户获取营销数据
+export const queryByUseId = (data: any) => {
+    return createAxios({
+        url: 'cs-device-boot/csMarketData/queryByUseId',
+        method: 'POST',
+        params: data
+    })
+}
diff --git a/src/api/user.ts b/src/api/user.ts
index a6480c9..a31ab93 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -29,3 +29,14 @@ export function refreshToken(): Promise<any> {
         username: adminInfo.username
     })
 }
+
+/**
+ * 获取营销用户列表
+ * @returns {AxiosPromise}
+ */
+export const getMarketList = () => {
+    return createAxios({
+        url: '/user-boot/user/getMarketList',
+        method: 'post',
+    })
+}
diff --git a/src/components/tree/govern/deviceTree.vue b/src/components/tree/govern/deviceTree.vue
index 12887d0..f72ec24 100644
--- a/src/components/tree/govern/deviceTree.vue
+++ b/src/components/tree/govern/deviceTree.vue
@@ -1,5 +1,11 @@
 <template>
-    <Tree ref="treRef" :data="tree" />
+    <Tree
+        ref="treRef"
+        @check-change="handleCheckChange"
+        :default-checked-keys="defaultCheckedKeys"
+        :show-checkbox="props.showCheckbox"
+        :data="tree"
+    />
 </template>
 
 <script lang="ts" setup>
@@ -10,7 +16,18 @@ import { useConfig } from '@/stores/config'
 defineOptions({
     name: 'govern/deviceTree'
 })
-const emit = defineEmits(['init'])
+const props = withDefaults(
+    defineProps<{
+        showCheckbox?: boolean
+        defaultCheckedKeys?: any
+    }>(),
+    {
+        showCheckbox: false,
+        defaultCheckedKeys: []
+    }
+)
+
+const emit = defineEmits(['init', 'checkChange'])
 const config = useConfig()
 const tree = ref()
 const treRef = ref()
@@ -42,4 +59,11 @@ getDeviceTree().then(res => {
         })
     })
 })
+const handleCheckChange = (data: any, checked: any, indeterminate: any) => {
+    emit('checkChange', {
+        data,
+        checked,
+        indeterminate
+    })
+}
 </script>
diff --git a/src/components/tree/govern/getMarketList.vue b/src/components/tree/govern/getMarketList.vue
new file mode 100644
index 0000000..5464b09
--- /dev/null
+++ b/src/components/tree/govern/getMarketList.vue
@@ -0,0 +1,29 @@
+<template>
+    <Tree ref="treRef" :data="tree" />
+</template>
+<script setup lang="ts">
+import { getMarketList } from '@/api/user'
+import Tree from '../index.vue'
+import { useConfig } from '@/stores/config'
+import { ref, reactive, nextTick } from 'vue'
+const config = useConfig()
+const tree = ref()
+const treRef = ref()
+const emit = defineEmits(['selectUser'])
+getMarketList().then((res: any) => {
+    if (res.code === 'A0000') {
+        tree.value = res.data.map((item: any) => {
+            return {
+                ...item,
+                icon: 'el-icon-User',
+                color: 'royalblue'
+            }
+        })
+        emit('selectUser', tree.value[0])
+        nextTick(() => {
+            treRef.value.treeRef.setCurrentKey(tree.value[0].id)
+        })
+    }
+})
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/govern/device/disposition/index.vue b/src/views/govern/device/disposition/index.vue
new file mode 100644
index 0000000..0a5caea
--- /dev/null
+++ b/src/views/govern/device/disposition/index.vue
@@ -0,0 +1,71 @@
+<template>
+    <div class="default-main device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
+        <GetMarketList @node-click="selectUser" @selectUser="selectUser"></GetMarketList>
+        <div class="device-manage-right" :style="{ height: tableHeight }">
+            <el-descriptions title="用户基本信息" class="mb10" :column="2" border>
+                <template #extra>
+                    <el-button type="primary" icon="el-icon-Plus" @click="getMarketEnginner">添加工程</el-button>
+                </template>
+                <el-descriptions-item label="名称">
+                    {{ user.name }}
+                </el-descriptions-item>
+                <el-descriptions-item label="手机号">
+                    {{ user.phone }}
+                </el-descriptions-item>
+            </el-descriptions>
+            <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" style="width: 100%">
+                <vxe-column field="enginerName" title="工程名称"></vxe-column>
+
+                <vxe-column field="deviceName" title="操作"></vxe-column>
+            </vxe-table>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+    name: 'govern/disposition/index'
+})
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import GetMarketList from '@/components/tree/govern/getMarketList.vue'
+import { mainHeight } from '@/utils/layout'
+import { queryByUseId } from '@/api/cs-harmonic-boot/datatrend'
+import { ref, onMounted } from 'vue'
+
+const pageHeight = mainHeight(20)
+const loading = ref(true)
+
+const tableHeight = mainHeight(20).height
+const user: any = ref({})
+const tableData = ref([])
+
+const selectUser = (e: any) => {
+    user.value = e
+    loading.value = true
+    queryByUseId({
+        userId: e.id
+    }).then(res => {
+        loading.value = false
+        tableData.value = res.data
+    })
+}
+const getMarketEnginner = () => {}
+</script>
+
+<style lang="scss">
+.device-manage {
+    display: flex;
+
+    &-right {
+        overflow: hidden;
+        flex: 1;
+        padding: 10px 10px 10px 0;
+        .el-descriptions__header {
+            height: 36px;
+            margin-bottom: 7px;
+            display: flex;
+            align-items: center;
+        }
+    }
+}
+</style>
diff --git a/src/views/govern/device/tourist/index.vue b/src/views/govern/device/tourist/index.vue
new file mode 100644
index 0000000..93afb3d
--- /dev/null
+++ b/src/views/govern/device/tourist/index.vue
@@ -0,0 +1,97 @@
+<template>
+    <div class="default-main device-manage" :style="{ height: pageHeight.height }" v-loading="loading">
+        <DeviceTree
+            :showCheckbox="true"
+            :default-checked-keys="defaultCheckedKeys"
+            @checkChange="checkChange"
+        ></DeviceTree>
+        <div class="device-manage-right" :style="{ height: tableHeight }">
+            <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" style="width: 100%">
+                <vxe-column field="enginerName" title="工程名称"></vxe-column>
+                <vxe-column field="projectName" title="项目名称"></vxe-column>
+                <vxe-column field="deviceName" title="装置名称"></vxe-column>
+            </vxe-table>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+    name: 'govern/tourist/index'
+})
+import { defaultAttribute } from '@/components/table/defaultAttribute'
+import DeviceTree from '@/components/tree/govern/deviceTree.vue'
+import { mainHeight } from '@/utils/layout'
+import { getVisitorConfig, updateVisitorConfig } from '@/api/cs-harmonic-boot/datatrend'
+import { ref, onMounted } from 'vue'
+
+const pageHeight = mainHeight(20)
+const loading = ref(true)
+
+const tableHeight = mainHeight(20).height
+const defaultCheckedKeys: any = ref([])
+const tableData = ref([])
+
+const checkChange = (data: any) => {
+    if (data.data.level === 2) {
+        if (data.checked) {
+            defaultCheckedKeys.value.push(data.data.id)
+        } else {
+            defaultCheckedKeys.value.splice(defaultCheckedKeys.value.indexOf(data.data.id), 1)
+        }
+        loading.value = true
+        updateVisitorConfigs()
+    }
+}
+const updateVisitorConfigs = () => {
+    const result = Array.from(new Set(defaultCheckedKeys.value))
+    updateVisitorConfig(
+        result.map(item => {
+            return {
+                deviceId: item
+            }
+        })
+    ).then((res: any) => {
+        if (res.code === 'A0000') {
+            getVisitorConfigs()
+        }
+    })
+}
+const getVisitorConfigs = () => {
+    getVisitorConfig().then((res:any) => {
+        if (res.code === 'A0000') {
+            tableData.value = res.data
+            loading.value = false
+            if (defaultCheckedKeys.value.length > 0) return
+            defaultCheckedKeys.value = [] // 清空
+            res.data.forEach((item:any) => {
+                defaultCheckedKeys.value.push(item.deviceId)
+            })
+        }
+    })
+}
+
+onMounted(() => {
+    // if (!adminInfo.token) return router.push({ name: 'login' })
+
+    getVisitorConfigs()
+})
+</script>
+
+<style lang="scss">
+.device-manage {
+    display: flex;
+
+    &-right {
+        overflow: hidden;
+        flex: 1;
+        padding: 10px 10px 10px 0;
+        .el-descriptions__header {
+            height: 36px;
+            margin-bottom: 7px;
+            display: flex;
+            align-items: center;
+        }
+    }
+}
+</style>

From 6dbe8469dbb739473702eb1a85b35fc2da4a86df Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Tue, 16 Jan 2024 08:56:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/index.vue                 |  4 ++--
 src/views/dashboard/test.vue                  | 12 ------------
 src/views/govern/device/disposition/index.vue | 16 ++++++++++++++--
 3 files changed, 16 insertions(+), 16 deletions(-)
 delete mode 100644 src/views/dashboard/test.vue

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 76189c7..574fad3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -20,8 +20,8 @@
 import TableHeader from '@/components/table/header/index.vue'
 import Area from '@/components/form/area/index.vue'
 import { useDictData } from '@/stores/dictData'
-import Echart from '@/views/dashboard/components/echart.vue'
-import Tableabove from '@/views/dashboard/components/Tableabove.vue'
+import Echart from '@/views/Event-boot/Region/components/echart.vue'
+import Tableabove from '@/views/Event-boot/Region/components/Tableabove.vue'
 import TableStore from '@/utils/tableStore'
 import { onMounted, reactive, ref, provide } from 'vue'
 import { mainHeight } from '@/utils/layout'
diff --git a/src/views/dashboard/test.vue b/src/views/dashboard/test.vue
deleted file mode 100644
index e19f59b..0000000
--- a/src/views/dashboard/test.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-    <el-button @click="click">测试1</el-button>
-</template>
-<script setup lang="ts">
-import { ref, reactive } from 'vue'
-// import { getTest } from '@/api/index'
-const click = () => {
-    // getTest({ name: '111', paw: 'asd' })
-}
-</script>
-<style lang="scss" scoped></style>
-@/api/text
\ No newline at end of file
diff --git a/src/views/govern/device/disposition/index.vue b/src/views/govern/device/disposition/index.vue
index 0a5caea..e8b408b 100644
--- a/src/views/govern/device/disposition/index.vue
+++ b/src/views/govern/device/disposition/index.vue
@@ -14,9 +14,20 @@
                 </el-descriptions-item>
             </el-descriptions>
             <vxe-table v-bind="defaultAttribute" :data="tableData" height="auto" style="width: 100%">
-                <vxe-column field="enginerName" title="工程名称"></vxe-column>
+                <vxe-column field="engineerName" title="工程名称"></vxe-column>
 
-                <vxe-column field="deviceName" title="操作"></vxe-column>
+                <vxe-column  title="操作">
+                    <template v-slot:default="scoped">
+                        <el-button
+                                size="small"
+                                type="danger"
+                                icon="el-icon-Delete"
+                                @click="deleteEngineering(scoped.row)"
+                            >
+                                移除
+                            </el-button>
+                    </template>
+                </vxe-column>
             </vxe-table>
         </div>
     </div>
@@ -50,6 +61,7 @@ const selectUser = (e: any) => {
     })
 }
 const getMarketEnginner = () => {}
+const deleteEngineering = (row:any) => {}
 </script>
 
 <style lang="scss">