From d50adb9d3025cf622ea69f6935a58e44ca6aafd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Tue, 16 Jan 2024 10:34:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pnpm-lock.yaml                                |   7 +
 .../govern/setting/statisticalType/add.vue    |  28 +--
 .../setting/statisticalType/binding.vue       | 215 ++++++++++--------
 3 files changed, 140 insertions(+), 110 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2f5e817..c73b48f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -28,6 +28,9 @@ dependencies:
   html2canvas:
     specifier: ^1.4.1
     version: 1.4.1
+  jquery:
+    specifier: ^3.7.1
+    version: 3.7.1
   lodash-es:
     specifier: ^4.17.21
     version: 4.17.21
@@ -1480,6 +1483,10 @@ packages:
     resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==}
     dev: false
 
+  /jquery@3.7.1:
+    resolution: {integrity: sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==}
+    dev: false
+
   /js-tokens@4.0.0:
     resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
     dev: true
diff --git a/src/views/govern/setting/statisticalType/add.vue b/src/views/govern/setting/statisticalType/add.vue
index 39ba7b3..690d8f4 100644
--- a/src/views/govern/setting/statisticalType/add.vue
+++ b/src/views/govern/setting/statisticalType/add.vue
@@ -1,31 +1,31 @@
 <template>
-    <el-dialog class='cn-operate-dialog' v-model='dialogVisible' :title='title'>
+    <el-dialog class="cn-operate-dialog" v-model="dialogVisible" :title="title">
         <el-scrollbar>
-            <el-form :inline='false' :model='form' label-width='120px'>
-                <el-form-item label='名称'>
-                    <el-input v-model='form.name' placeholder='请输入名称' />
+            <el-form :inline="false" :model="form" label-width="120px">
+                <el-form-item label="名称">
+                    <el-input v-model="form.name" placeholder="请输入名称" />
                 </el-form-item>
-                <el-form-item label='编码'>
-                    <el-input v-model='form.code' placeholder='请输入编码' />
+                <el-form-item label="编码">
+                    <el-input v-model="form.code" placeholder="请输入编码" />
                 </el-form-item>
-                <el-form-item label='备注'>
-                    <el-input v-model='form.remark' placeholder='请输入备注' />
+                <el-form-item label="备注">
+                    <el-input v-model="form.remark" placeholder="请输入备注" />
                 </el-form-item>
-                <el-form-item label='排序'>
-                    <el-input-number v-model='form.sort' :min='0' />
+                <el-form-item label="排序">
+                    <el-input-number v-model="form.sort" :min="0" />
                 </el-form-item>
             </el-form>
         </el-scrollbar>
 
         <template #footer>
-            <span class='dialog-footer'>
-                <el-button @click='dialogVisible = false'>取消</el-button>
-                <el-button type='primary' @click='submit'>确认</el-button>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
             </span>
         </template>
     </el-dialog>
 </template>
-<script lang='ts' setup>
+<script lang="ts" setup>
 import { ref, inject } from 'vue'
 import { reactive } from 'vue'
 import TableStore from '@/utils/tableStore'
diff --git a/src/views/govern/setting/statisticalType/binding.vue b/src/views/govern/setting/statisticalType/binding.vue
index 5388ce5..69a7f28 100644
--- a/src/views/govern/setting/statisticalType/binding.vue
+++ b/src/views/govern/setting/statisticalType/binding.vue
@@ -1,65 +1,70 @@
 <template>
-    <el-dialog class='cn-operate-dialog statistical-type-binding' v-model='dialogVisible' title='绑定指标'>
-        <el-scrollbar style='padding-right: 0'>
-            <div class='box'>
-                <div class='box-left'>
+    <el-dialog class="cn-operate-dialog statistical-type-binding" v-model="dialogVisible" title="绑定指标">
+        <el-scrollbar style="padding-right: 0">
+            <div class="box">
+                <div class="box-left">
                     <el-cascader-panel
-                        v-model='fromDataValue'
-                        :props='{
+                        v-model="fromDataValue"
+                        :props="{
                             multiple: true
-                        }'
-                        :options='fromData'
+                        }"
+                        :options="fromData"
                     ></el-cascader-panel>
                 </div>
-                <div class='box-center'>
-                    <el-button type='primary' icon='el-icon-Plus' @click='newGroup'>新建分组</el-button>
-                    <el-popover v-model='popoverVisible' placement='right' width='400' trigger='click'
-                                popper-style='width:auto'>
-                        <div class='statistical-type-binding-button-group'>
+                <div class="box-center">
+                    <el-button type="primary" icon="el-icon-Plus" @click="newGroup">新建分组</el-button>
+                    <el-popover
+                        v-model="popoverVisible"
+                        placement="right"
+                        width="400"
+                        trigger="click"
+                        popper-style="width:auto"
+                    >
+                        <div class="statistical-type-binding-button-group">
                             <el-button
-                                type='primary'
-                                style='margin-left: 0'
-                                v-for='item in toData'
-                                @click='leftCheckChange(item)'
+                                type="primary"
+                                style="margin-left: 0"
+                                v-for="item in toData"
+                                @click="leftCheckChange(item)"
                             >
                                 {{ item.label }}
                             </el-button>
                         </div>
-                        <div v-if='toData.length === 0'>请先创建分组</div>
+                        <div v-if="toData.length === 0">请先创建分组</div>
                         <template #reference>
-                            <el-button style='margin-left: 0' class='mt20' type='primary' icon='el-icon-ArrowRight'>
+                            <el-button style="margin-left: 0" class="mt20" type="primary" icon="el-icon-ArrowRight">
                                 向右
                             </el-button>
                         </template>
                     </el-popover>
                     <el-button
-                        style='margin-left: 0'
-                        icon='el-icon-ArrowLeft'
-                        class='mt20'
-                        type='primary'
-                        @click='rightCheckChange'
+                        style="margin-left: 0"
+                        icon="el-icon-ArrowLeft"
+                        class="mt20"
+                        type="primary"
+                        @click="rightCheckChange"
                     >
                         向左
                     </el-button>
                 </div>
-                <div class='box-right'>
+                <div class="box-right">
                     <el-cascader-panel
-                        v-model='toDataValue'
-                        :props='{
+                        v-model="toDataValue"
+                        :props="{
                             multiple: true
-                        }'
-                        :options='toData'
+                        }"
+                        :options="toData"
                     >
-                        <template #default='{ node, data }'>
-                            <div style='display: flex; align-items: center'>
-                                <div class='hide-txt'>{{ data.label }}</div>
-                                <template v-if='!node.isLeaf'>
-                                    <div class='ml5'>({{ data.children.length }})</div>
-                                    <div style='flex: 1'></div>
+                        <template #default="{ node, data }">
+                            <div style="display: flex; align-items: center">
+                                <div class="hide-txt">{{ data.label }}</div>
+                                <template v-if="!node.isLeaf">
+                                    <div class="ml5">({{ data.children.length }})</div>
+                                    <div style="flex: 1"></div>
                                     <i
-                                        class='el-icon-delete ml10'
-                                        style='cursor: pointer'
-                                        @click='deleteStatistical(data)'
+                                        class="el-icon-delete ml10"
+                                        style="cursor: pointer"
+                                        @click="deleteStatistical(data)"
                                     ></i>
                                 </template>
                             </div>
@@ -70,28 +75,83 @@
         </el-scrollbar>
 
         <template #footer>
-            <span class='dialog-footer'>
-                <el-button @click='dialogVisible = false'>取消</el-button>
-                <el-button type='primary' @click='submit'>确认</el-button>
+            <span class="dialog-footer">
+                <el-button @click="dialogVisible = false">取消</el-button>
+                <el-button type="primary" @click="submit">确认</el-button>
             </span>
         </template>
     </el-dialog>
+    <PopupAdd ref='addRef' @over='init'></PopupAdd>
 </template>
-<script lang='ts' setup>
+<script lang="ts" setup>
 import { ref, inject } from 'vue'
 import { ElMessage } from 'element-plus'
 import { queryStatistical } from '@/api/system-boot/csstatisticalset'
+import PopupAdd from './add.vue'
 
 defineOptions({
     name: 'govern/setting/statisticalType/binding'
 })
-
+const addRef = ref()
+// 统计类型pid
+const pid = ref('')
 const dialogVisible = ref(false)
 const popoverVisible = ref(false)
 const fromData = ref<treeData[]>([])
 const fromDataValue = ref<treeData[]>([])
 const toData = ref<treeData[]>([])
 const toDataValue = ref<treeData[]>([])
+
+const init = () => {
+    queryStatistical(pid.value).then(res => {
+        fromData.value = []
+        fromDataValue.value = []
+        toData.value = []
+        toDataValue.value = []
+        res.data.unSelectedList.forEach((item: any) => {
+            const obj = {
+                id: item.dataType,
+                value: item.dataType,
+                pid: 0,
+                label: item.dataTypeName,
+                children: [] as any[]
+            }
+            item.eleEpdPqdVOS.forEach((item2: any) => {
+                const obj2 = {
+                    id: item2.id,
+                    pid: item.dataType,
+                    value: item2.id,
+                    label: item2.phase === 'M' ? item2.showName : item2.phase + '相' + item2.showName
+                }
+                if (item2.showName) {
+                    obj.children.push(obj2)
+                }
+            })
+            fromData.value.push(obj)
+        })
+        res.data.selectedList.forEach((item: any) => {
+            const obj = {
+                id: item.dataType,
+                value: item.dataType,
+                pid: 0,
+                label: item.dataTypeName,
+                children: [] as any[]
+            }
+            item.eleEpdPqdVOS.forEach((item2: any) => {
+                const obj2 = {
+                    id: item2.id,
+                    pid: item2.dataType,
+                    value: item2.id,
+                    label: item2.phase === 'M' ? item2.showName : item2.phase + '相' + item2.showName
+                }
+                if (item2.showName) {
+                    obj.children.push(obj2)
+                }
+            })
+            toData.value.push(obj)
+        })
+    })
+}
 // 左侧源数据选中事件
 const leftCheckChange = (e: any) => {
     if (fromDataValue.value.length === 0) {
@@ -186,58 +246,20 @@ const deleteStatistical = (data: any) => {
 }
 
 const newGroup = () => {
+    addRef.value.open('新增菜单', {
+        sort: toData.value.length ? toData.value[toData.value.length - 1].sort + 1 : 1,
+        code: '',
+        pid: pid.value,
+        id: '',
+        remark: '',
+        name: ''
+    })
 }
 
 const open = (id: string) => {
     dialogVisible.value = true
-    queryStatistical(id).then(res => {
-        fromData.value = []
-        fromDataValue.value = []
-        toData.value = []
-        toDataValue.value = []
-        res.data.unSelectedList.forEach((item: any) => {
-            const obj = {
-                id: item.dataType,
-                value: item.dataType,
-                pid: 0,
-                label: item.dataTypeName,
-                children: [] as any[]
-            }
-            item.eleEpdPqdVOS.forEach((item2: any) => {
-                const obj2 = {
-                    id: item2.id,
-                    pid: item.dataType,
-                    value: item2.id,
-                    label: item2.phase === 'M' ? item2.showName : item2.phase + '相' + item2.showName
-                }
-                if (item2.showName) {
-                    obj.children.push(obj2)
-                }
-            })
-            fromData.value.push(obj)
-        })
-        res.data.selectedList.forEach((item: any) => {
-            const obj = {
-                id: item.dataType,
-                value: item.dataType,
-                pid: 0,
-                label: item.dataTypeName,
-                children: [] as any[]
-            }
-            item.eleEpdPqdVOS.forEach((item2: any) => {
-                const obj2 = {
-                    id: item2.id,
-                    pid: item2.dataType,
-                    value: item2.id,
-                    label: item2.phase === 'M' ? item2.showName : item2.phase + '相' + item2.showName
-                }
-                if (item2.showName) {
-                    obj.children.push(obj2)
-                }
-            })
-            toData.value.push(obj)
-        })
-    })
+    pid.value = id
+    init()
 }
 const submit = async () => {
     dialogVisible.value = false
@@ -245,7 +267,7 @@ const submit = async () => {
 
 defineExpose({ open })
 </script>
-<style lang='scss'>
+<style lang="scss">
 .statistical-type-binding-button-group {
     display: grid;
     grid-template-columns: repeat(3, 1fr);
@@ -253,7 +275,6 @@ defineExpose({ open })
 }
 
 .statistical-type-binding {
-
     .box {
         display: flex;
         width: 1000px;
@@ -275,12 +296,15 @@ defineExpose({ open })
             height: 100%;
             overflow: hidden;
             flex: 1;
-            .el-cascader-menu{
+
+            .el-cascader-menu {
                 padding-right: 0;
-                .el-scrollbar__wrap{
+
+                .el-scrollbar__wrap {
                     height: 100%;
                 }
             }
+
             .el-cascader-panel {
                 height: 100%;
 
@@ -289,7 +313,6 @@ defineExpose({ open })
                 }
             }
         }
-
     }
 }
 </style>