From a5bfb77e2a6d0571097fd29790d8e0d00c0e75dd Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 15 Jun 2022 16:18:57 +0800
Subject: [PATCH 01/68] =?UTF-8?q?=E7=BE=A4=E5=8F=91=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxwork}/AppMassNotification/AppMassNotification.vue           | 0
 .../wxwork}/AppMassNotification/components/Add.vue                | 0
 .../wxwork}/AppMassNotification/components/List.vue               | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename {core/apps => packages/wxwork}/AppMassNotification/AppMassNotification.vue (100%)
 rename {core/apps => packages/wxwork}/AppMassNotification/components/Add.vue (100%)
 rename {core/apps => packages/wxwork}/AppMassNotification/components/List.vue (100%)

diff --git a/core/apps/AppMassNotification/AppMassNotification.vue b/packages/wxwork/AppMassNotification/AppMassNotification.vue
similarity index 100%
rename from core/apps/AppMassNotification/AppMassNotification.vue
rename to packages/wxwork/AppMassNotification/AppMassNotification.vue
diff --git a/core/apps/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
similarity index 100%
rename from core/apps/AppMassNotification/components/Add.vue
rename to packages/wxwork/AppMassNotification/components/Add.vue
diff --git a/core/apps/AppMassNotification/components/List.vue b/packages/wxwork/AppMassNotification/components/List.vue
similarity index 100%
rename from core/apps/AppMassNotification/components/List.vue
rename to packages/wxwork/AppMassNotification/components/List.vue

From 307f835cec73f9b8540b243bdf5930971f82aba4 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 16 Jun 2022 10:57:34 +0800
Subject: [PATCH 02/68] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B9=9D=E5=88=86?=
 =?UTF-8?q?=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/IntelligentSecurity/AppISManage/AppISManage.vue     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue b/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue
index 36fff7a7..ede77678 100644
--- a/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue
+++ b/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue
@@ -54,8 +54,7 @@
       splitOps() {
         return [
           { label: '单分屏', value: 1, per: '100%' },
-          { label: '四分屏', value: 4, per: '49.2%' },
-          { label: '九分屏', value: 9, per: '32%' },
+          { label: '四分屏', value: 4, per: '49.2%' }
         ]
       },
       currentSplitStyle() {

From 5bc5bf0672a3e1ad1b2b0da06866293270892345 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 16 Jun 2022 11:21:26 +0800
Subject: [PATCH 03/68] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/dv/apps/AppGridDV.vue | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/project/dv/apps/AppGridDV.vue b/project/dv/apps/AppGridDV.vue
index c7922dfb..7012e858 100644
--- a/project/dv/apps/AppGridDV.vue
+++ b/project/dv/apps/AppGridDV.vue
@@ -344,9 +344,9 @@
       getGirdInfo (id, level) {
         this.instance.post(`/app/appgirdinfo/listAllGirdAndMemberByTop?id=${id || ''}`).then((res) => {
           if (res.code == 0) {
-            const chartData = this.formatList(res.data)
-            if (res.data && res.data[0] && res.data[0].parentGirdInfo) {
-              const parentGirdInfo = res.data[0].parentGirdInfo
+            const chartData = this.formatList([res.data])
+            if (res.data && res.data.parentGirdInfo) {
+              const parentGirdInfo = res.data.parentGirdInfo
               const girdMemberList = parentGirdInfo.girdMemberManageList ? parentGirdInfo.girdMemberManageList.map(v => {
                 return {
                   ...v,
@@ -402,7 +402,7 @@
                 label: v.name
               }
             })
-            
+
             this.isLoading = false
 
             if (!userList.length) {
@@ -424,6 +424,7 @@
       },
 
       formatList (list) {
+        console.log(list)
         return list.map(item => {
           let userList = []
           const girdMemberManageList = item.girdMemberManageList ? item.girdMemberManageList.map(v => {
@@ -546,7 +547,7 @@
       .el-table {
         background-color: transparent;
       }
-      
+
       .el-table__body tr td:first-child .cell, .ai-table .el-table__header tr th:first-child .cell {
         padding-left: 0!important;
       }
@@ -690,7 +691,7 @@
             text-overflow:ellipsis;
             white-space: nowrap;
             margin-bottom: 10px;
-          
+
             &:nth-of-type(2n) {
               margin-right: 0;
             }
@@ -875,4 +876,4 @@
       }
     }
   }
-</style>
\ No newline at end of file
+</style>

From 942078e3fdd4b07285834f113f2149e3f61c4744 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 16 Jun 2022 11:29:14 +0800
Subject: [PATCH 04/68] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/bigscreen/designer/components/SourceData.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/bigscreen/designer/components/SourceData.vue b/packages/bigscreen/designer/components/SourceData.vue
index d2280f0d..b116f15d 100644
--- a/packages/bigscreen/designer/components/SourceData.vue
+++ b/packages/bigscreen/designer/components/SourceData.vue
@@ -66,6 +66,7 @@
             </el-form-item>
             <el-form-item v-if="form.type === '1'" label="sql语句" style="width: 100%;" prop="description" :rules="[{ required: true, message: '请输入sql语句', trigger: 'blur' }]">
               <el-input
+                :rows="8"
                 size="small"
                 type="textarea"
                 placeholder="请输入数据源描述"

From 2dbdc7a4c4779bc7a46d671f7c5b4d05b308faf4 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 16 Jun 2022 11:47:00 +0800
Subject: [PATCH 05/68] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/dv/apps/AppGridDV.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/dv/apps/AppGridDV.vue b/project/dv/apps/AppGridDV.vue
index 7012e858..b38f4999 100644
--- a/project/dv/apps/AppGridDV.vue
+++ b/project/dv/apps/AppGridDV.vue
@@ -376,7 +376,7 @@
             }
 
             this.$nextTick(() => {
-              if (level === '2') {
+              if (id) {
                 this.getUserList(id)
               } else {
                 this.isLoading = false
@@ -395,6 +395,7 @@
           }
         }).then(res => {
           if (res.code == 0) {
+            console.log(res.data)
             const userList = res.data.records.map(v => {
               return {
                 ...v,
@@ -424,7 +425,6 @@
       },
 
       formatList (list) {
-        console.log(list)
         return list.map(item => {
           let userList = []
           const girdMemberManageList = item.girdMemberManageList ? item.girdMemberManageList.map(v => {

From ca38041eecfbeecd1750175e81ed2fd50cac03d1 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 16 Jun 2022 13:48:07 +0800
Subject: [PATCH 06/68] BUG 30204

---
 packages/publicity/AppJob/components/JobList.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/publicity/AppJob/components/JobList.vue b/packages/publicity/AppJob/components/JobList.vue
index 139fb7ee..625fb133 100644
--- a/packages/publicity/AppJob/components/JobList.vue
+++ b/packages/publicity/AppJob/components/JobList.vue
@@ -95,9 +95,11 @@
         })
       },
 
-      remove(id) {
+      remove(ids) {
         this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appjob/delete?id=${id}`).then(res => {
+          this.instance.post(`/app/appjob/delete`,null,{
+            params:{ids}
+          }).then(res => {
             if (res.code == 0) {
               this.$message.success('删除成功！')
               this.getList()

From 3dce3cd49774e30b24fdb90cc8d4e9e2e1a40e0e Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 16 Jun 2022 14:01:10 +0800
Subject: [PATCH 07/68] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=A4=A7=E5=B1=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/dv/apps/AppGridDV.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/project/dv/apps/AppGridDV.vue b/project/dv/apps/AppGridDV.vue
index b38f4999..cb3708e9 100644
--- a/project/dv/apps/AppGridDV.vue
+++ b/project/dv/apps/AppGridDV.vue
@@ -345,8 +345,8 @@
         this.instance.post(`/app/appgirdinfo/listAllGirdAndMemberByTop?id=${id || ''}`).then((res) => {
           if (res.code == 0) {
             const chartData = this.formatList([res.data])
-            if (res.data && res.data.parentGirdInfo) {
-              const parentGirdInfo = res.data.parentGirdInfo
+            if (res.data) {
+              const parentGirdInfo = res.data
               const girdMemberList = parentGirdInfo.girdMemberManageList ? parentGirdInfo.girdMemberManageList.map(v => {
                 return {
                   ...v,
@@ -395,7 +395,6 @@
           }
         }).then(res => {
           if (res.code == 0) {
-            console.log(res.data)
             const userList = res.data.records.map(v => {
               return {
                 ...v,

From 345f1c10b0fcd606dcf8564c63ed32e87e38ba96 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 16 Jun 2022 15:31:40 +0800
Subject: [PATCH 08/68] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/AppDeploy/AppDeploy.vue | 26 +++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/project/oms/apps/AppDeploy/AppDeploy.vue b/project/oms/apps/AppDeploy/AppDeploy.vue
index 2cfcee35..5beb1843 100644
--- a/project/oms/apps/AppDeploy/AppDeploy.vue
+++ b/project/oms/apps/AppDeploy/AppDeploy.vue
@@ -14,6 +14,14 @@
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+          <el-table-column type="expand" slot="expand">
+            <template slot-scope="{row}">
+              <ai-wrapper>
+                <ai-info-item labelWidth="200px" v-for="op in desConfigs" :key="op.prop" :value="row[op.prop]"
+                              v-bind="op"/>
+              </ai-wrapper>
+            </template>
+          </el-table-column>
           <el-table-column slot="process" label="打包进度">
             <template slot-scope="{row}">
               <span v-if="row.count==0" v-text="getProcessMsg(row)"/>
@@ -42,6 +50,9 @@
         <el-form-item label="更新脚本" prop="updateShell">
           <el-input v-model="form.updateShell" clearable placeholder="请输入"/>
         </el-form-item>
+        <el-form-item label="项目地址" prop="webUrl">
+          <el-input v-model="form.webUrl" clearable placeholder="请输入"/>
+        </el-form-item>
         <el-form-item label="开发环境nginx" prop="target">
           <el-input v-model="form.target" clearable placeholder="请输入"/>
         </el-form-item>
@@ -62,7 +73,16 @@ export default {
     permissions: Function
   },
   computed: {
-    ...mapState(['user'])
+    ...mapState(['user']),
+    desConfigs() {
+      let isLine = true
+      return [
+        {prop: "libShell", label: "打包脚本", width: 100, isLine},
+        {prop: "updateShell", label: "更新脚本", width: 100, isLine},
+        {prop: "target", label: "nginx地址", width: 100, isLine},
+        {prop: "webUrl", label: "项目地址", width: 100},
+      ]
+    },
   },
   data() {
     return {
@@ -70,9 +90,9 @@ export default {
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       colConfigs: [
+        {slot: "expand"},
         {label: "项目/系统名称", prop: "name", width: 200},
-        {label: "打包脚本", prop: "libShell"},
-        {label: "更新脚本", prop: "updateShell"},
+        {label: "项目地址", prop: "webUrl"},
         {label: "nginx地址", prop: "target"},
         {slot: "process"},
         {slot: "options"}

From 531f1a55fd226999e50c1878688f571a5c8a8c9a Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 16 Jun 2022 17:02:53 +0800
Subject: [PATCH 09/68] =?UTF-8?q?=E5=85=B6=E4=BB=96=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxwork/AppMassNotification/components/Add.vue   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index b6041edb..026c8c6f 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -61,16 +61,23 @@
                   placeholder="选择日期时间">
                 </el-date-picker>
               </el-form-item>
+              <el-form-item label="其他类型" prop="explain" style="width: 100%">
+                <el-radio-group v-model="form.contentType" @change="onTypeChange">
+                  <el-radio label="image">图片</el-radio>
+                  <el-radio label="video">视频</el-radio>
+                  <el-radio label="file">附件</el-radio>
+                </el-radio-group>
+              </el-form-item>
               <!-- 图片 -->
-              <el-form-item label="图片" style="width: 100%">
+              <el-form-item label="图片" style="width: 100%" v-if="form.contentType == 'image'">
                 <ai-uploader :instance="instance" isWechat v-model="imgList" acceptType=".jpg,.png,.jpeg" :limit="1" url="/app/wxcp/upload/uploadFile?type=image"></ai-uploader>
               </el-form-item>
               <!-- 视频 -->
-              <el-form-item label="视频" style="width: 100%">
+              <el-form-item label="视频" style="width: 100%" v-if="form.contentType == 'video'">
                 <ai-uploader :instance="instance" fileType="file" isWechat acceptType=".mp4" v-model="videoList" :limit="1" url="/app/wxcp/upload/uploadFile?type=video"></ai-uploader>
               </el-form-item>
               <!-- 附件 -->
-              <el-form-item label="附件" style="width: 100%">
+              <el-form-item label="附件" style="width: 100%" v-if="form.contentType == 'file'">
                 <ai-uploader :instance="instance" fileType="file" isWechat v-model="filesList" :limit="1" url="/app/wxcp/upload/uploadFile?type=file"></ai-uploader>
               </el-form-item>
 

From ddc87afed29ee157bd01129e1eef4d3e5ef31661 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 16 Jun 2022 17:43:18 +0800
Subject: [PATCH 10/68] BUG 30199

---
 packages/grid/AppBuildMap/toolBar/communityOverview.vue     | 2 +-
 packages/grid/AppHouseMap/toolBar/communityOverview.vue     | 2 +-
 project/sass/apps/AppHouseMap/toolBar/communityOverview.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/grid/AppBuildMap/toolBar/communityOverview.vue b/packages/grid/AppBuildMap/toolBar/communityOverview.vue
index 06003c14..907c6238 100644
--- a/packages/grid/AppBuildMap/toolBar/communityOverview.vue
+++ b/packages/grid/AppBuildMap/toolBar/communityOverview.vue
@@ -57,7 +57,7 @@ export default {
 <style lang="scss" scoped>
 .communityOverview {
   max-width: 400px;
-  max-height: 700px;
+  max-height: 600px;
   overflow-y: auto;
 
   .units {
diff --git a/packages/grid/AppHouseMap/toolBar/communityOverview.vue b/packages/grid/AppHouseMap/toolBar/communityOverview.vue
index 06003c14..907c6238 100644
--- a/packages/grid/AppHouseMap/toolBar/communityOverview.vue
+++ b/packages/grid/AppHouseMap/toolBar/communityOverview.vue
@@ -57,7 +57,7 @@ export default {
 <style lang="scss" scoped>
 .communityOverview {
   max-width: 400px;
-  max-height: 700px;
+  max-height: 600px;
   overflow-y: auto;
 
   .units {
diff --git a/project/sass/apps/AppHouseMap/toolBar/communityOverview.vue b/project/sass/apps/AppHouseMap/toolBar/communityOverview.vue
index 06003c14..907c6238 100644
--- a/project/sass/apps/AppHouseMap/toolBar/communityOverview.vue
+++ b/project/sass/apps/AppHouseMap/toolBar/communityOverview.vue
@@ -57,7 +57,7 @@ export default {
 <style lang="scss" scoped>
 .communityOverview {
   max-width: 400px;
-  max-height: 700px;
+  max-height: 600px;
   overflow-y: auto;
 
   .units {

From 62248f1ac674748943f030f5854b3bf529d7c53d Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 16 Jun 2022 17:56:42 +0800
Subject: [PATCH 11/68] BUG 30199

---
 packages/grid/AppBuildMap/toolBar/communityOverview.vue     | 2 +-
 packages/grid/AppHouseMap/toolBar/communityOverview.vue     | 2 +-
 project/sass/apps/AppHouseMap/toolBar/communityOverview.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/grid/AppBuildMap/toolBar/communityOverview.vue b/packages/grid/AppBuildMap/toolBar/communityOverview.vue
index 907c6238..60b0652a 100644
--- a/packages/grid/AppBuildMap/toolBar/communityOverview.vue
+++ b/packages/grid/AppBuildMap/toolBar/communityOverview.vue
@@ -58,7 +58,7 @@ export default {
 .communityOverview {
   max-width: 400px;
   max-height: 600px;
-  overflow-y: auto;
+  overflow-y: auto!important;
 
   .units {
     display: flex;
diff --git a/packages/grid/AppHouseMap/toolBar/communityOverview.vue b/packages/grid/AppHouseMap/toolBar/communityOverview.vue
index 907c6238..60b0652a 100644
--- a/packages/grid/AppHouseMap/toolBar/communityOverview.vue
+++ b/packages/grid/AppHouseMap/toolBar/communityOverview.vue
@@ -58,7 +58,7 @@ export default {
 .communityOverview {
   max-width: 400px;
   max-height: 600px;
-  overflow-y: auto;
+  overflow-y: auto!important;
 
   .units {
     display: flex;
diff --git a/project/sass/apps/AppHouseMap/toolBar/communityOverview.vue b/project/sass/apps/AppHouseMap/toolBar/communityOverview.vue
index 907c6238..60b0652a 100644
--- a/project/sass/apps/AppHouseMap/toolBar/communityOverview.vue
+++ b/project/sass/apps/AppHouseMap/toolBar/communityOverview.vue
@@ -58,7 +58,7 @@ export default {
 .communityOverview {
   max-width: 400px;
   max-height: 600px;
-  overflow-y: auto;
+  overflow-y: auto!important;
 
   .units {
     display: flex;

From 7b70dafbafe47da196caad3ff840f104b2b8196f Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 17 Jun 2022 11:25:26 +0800
Subject: [PATCH 12/68] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/AppDeploy/AppDeploy.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/project/oms/apps/AppDeploy/AppDeploy.vue b/project/oms/apps/AppDeploy/AppDeploy.vue
index 5beb1843..60fe0b5a 100644
--- a/project/oms/apps/AppDeploy/AppDeploy.vue
+++ b/project/oms/apps/AppDeploy/AppDeploy.vue
@@ -77,8 +77,8 @@ export default {
     desConfigs() {
       let isLine = true
       return [
-        {prop: "libShell", label: "打包脚本", width: 100, isLine},
-        {prop: "updateShell", label: "更新脚本", width: 100, isLine},
+        {prop: "libShell", label: "打包脚本", width: 100},
+        {prop: "updateShell", label: "更新脚本", width: 100},
         {prop: "target", label: "nginx地址", width: 100, isLine},
         {prop: "webUrl", label: "项目地址", width: 100},
       ]
@@ -206,7 +206,9 @@ export default {
       })
     },
     getProcessMsg(row) {
-      return row.error || (row.download ? `最近打包时间:${row.download}` : `暂无打包`)
+      let time = row.zipTime ? this.$moment(row.zipTime).diff(row.download, 's', true) : ""
+      return row.error || (row.download ? `最近打包时间:${row.download}(用时:${time}秒)` :
+          row.zipTime ? `正在打包,开始于:${row.zipTime}` : `暂无打包`)
     }
   },
   created() {

From 3e2a01339da1dec074f8b296b9397a441953b86b Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 17 Jun 2022 11:29:49 +0800
Subject: [PATCH 13/68] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/AppDeploy/AppDeploy.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/oms/apps/AppDeploy/AppDeploy.vue b/project/oms/apps/AppDeploy/AppDeploy.vue
index 60fe0b5a..4325be37 100644
--- a/project/oms/apps/AppDeploy/AppDeploy.vue
+++ b/project/oms/apps/AppDeploy/AppDeploy.vue
@@ -206,7 +206,7 @@ export default {
       })
     },
     getProcessMsg(row) {
-      let time = row.zipTime ? this.$moment(row.zipTime).diff(row.download, 's', true) : ""
+      let time = row.zipTime ? this.$moment(row.download).diff(row.zipTime, 's', true) : ""
       return row.error || (row.download ? `最近打包时间:${row.download}(用时:${time}秒)` :
           row.zipTime ? `正在打包,开始于:${row.zipTime}` : `暂无打包`)
     }

From 768304bf9d32d5c95de6736434fcaa995607ef2a Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 17 Jun 2022 18:42:59 +0800
Subject: [PATCH 14/68] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC,=E8=87=AA=E5=8A=A8=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/AppDeploy/AppDeploy.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/project/oms/apps/AppDeploy/AppDeploy.vue b/project/oms/apps/AppDeploy/AppDeploy.vue
index 4325be37..a5e7c6af 100644
--- a/project/oms/apps/AppDeploy/AppDeploy.vue
+++ b/project/oms/apps/AppDeploy/AppDeploy.vue
@@ -44,6 +44,9 @@
         <el-form-item label="项目/系统" prop="name">
           <el-input v-model="form.name" clearable placeholder="请输入"/>
         </el-form-item>
+        <el-form-item label="系统类型" prop="type">
+          <ai-select v-model="form.type" :selectList="dict.getDict('systemType')"/>
+        </el-form-item>
         <el-form-item label="打包脚本" prop="libShell">
           <el-input v-model="form.libShell" clearable placeholder="请输入"/>
         </el-form-item>
@@ -53,6 +56,9 @@
         <el-form-item label="项目地址" prop="webUrl">
           <el-input v-model="form.webUrl" clearable placeholder="请输入"/>
         </el-form-item>
+        <el-form-item label="打包地址" prop="webUrl">
+          <el-input v-model="form.zipPath" clearable placeholder="请输入"/>
+        </el-form-item>
         <el-form-item label="开发环境nginx" prop="target">
           <el-input v-model="form.target" clearable placeholder="请输入"/>
         </el-form-item>
@@ -79,7 +85,8 @@ export default {
       return [
         {prop: "libShell", label: "打包脚本", width: 100},
         {prop: "updateShell", label: "更新脚本", width: 100},
-        {prop: "target", label: "nginx地址", width: 100, isLine},
+        {prop: "zipPath", label: "打包地址", width: 100},
+        {prop: "target", label: "nginx地址", width: 100},
         {prop: "webUrl", label: "项目地址", width: 100},
       ]
     },
@@ -92,6 +99,7 @@ export default {
       colConfigs: [
         {slot: "expand"},
         {label: "项目/系统名称", prop: "name", width: 200},
+        {label: "系统类型", prop: "type", dict: "systemType", width: 80},
         {label: "项目地址", prop: "webUrl"},
         {label: "nginx地址", prop: "target"},
         {slot: "process"},
@@ -101,8 +109,6 @@ export default {
       form: {},
       rules: {
         name: {required: true, message: "请输入项目/系统名称"},
-        libShell: {required: true, message: "请输入 打包脚本"},
-        updateShell: {required: true, message: "请输入 更新脚本"},
       }
     }
   },
@@ -212,6 +218,7 @@ export default {
     }
   },
   created() {
+    this.dict.load("systemType")
     this.getTableData()
   }
 }

From 6b80930bc0ef77479780ef687f41270dfa9e2c51 Mon Sep 17 00:00:00 2001
From: kubbo <390378816@qq.com>
Date: Sun, 19 Jun 2022 22:30:03 +0800
Subject: [PATCH 15/68] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/AppDeploy/AppDeploy.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/oms/apps/AppDeploy/AppDeploy.vue b/project/oms/apps/AppDeploy/AppDeploy.vue
index a5e7c6af..a8f2b468 100644
--- a/project/oms/apps/AppDeploy/AppDeploy.vue
+++ b/project/oms/apps/AppDeploy/AppDeploy.vue
@@ -53,7 +53,7 @@
         <el-form-item label="更新脚本" prop="updateShell">
           <el-input v-model="form.updateShell" clearable placeholder="请输入"/>
         </el-form-item>
-        <el-form-item label="项目地址" prop="webUrl">
+        <el-form-item label="项目URL" prop="webUrl">
           <el-input v-model="form.webUrl" clearable placeholder="请输入"/>
         </el-form-item>
         <el-form-item label="打包地址" prop="webUrl">
@@ -87,7 +87,7 @@ export default {
         {prop: "updateShell", label: "更新脚本", width: 100},
         {prop: "zipPath", label: "打包地址", width: 100},
         {prop: "target", label: "nginx地址", width: 100},
-        {prop: "webUrl", label: "项目地址", width: 100},
+        {prop: "webUrl", label: "项目URL", width: 100},
       ]
     },
   },
@@ -100,7 +100,7 @@ export default {
         {slot: "expand"},
         {label: "项目/系统名称", prop: "name", width: 200},
         {label: "系统类型", prop: "type", dict: "systemType", width: 80},
-        {label: "项目地址", prop: "webUrl"},
+        {label: "项目URL", prop: "webUrl"},
         {label: "nginx地址", prop: "target"},
         {slot: "process"},
         {slot: "options"}

From c03be59b1853c8bb6806f72148f9c58c8cb2e535 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 20 Jun 2022 10:03:03 +0800
Subject: [PATCH 16/68] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/{ => develop}/AppDeploy/AppDeploy.vue            | 0
 project/oms/apps/{ => develop}/AppDeployWxmp/AppDeployWxmp.vue    | 0
 project/oms/apps/{ => develop}/AppWebApps/AppWebApps.vue          | 0
 project/oms/apps/{ => develop}/AppWechatApps/AppWechatApps.vue    | 0
 project/oms/apps/{ => develop}/AppWxworkApps/AppWxworkApps.vue    | 0
 .../apps/{ => statistics}/AppCorpStatistics/AppCorpStatistics.vue | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename project/oms/apps/{ => develop}/AppDeploy/AppDeploy.vue (100%)
 rename project/oms/apps/{ => develop}/AppDeployWxmp/AppDeployWxmp.vue (100%)
 rename project/oms/apps/{ => develop}/AppWebApps/AppWebApps.vue (100%)
 rename project/oms/apps/{ => develop}/AppWechatApps/AppWechatApps.vue (100%)
 rename project/oms/apps/{ => develop}/AppWxworkApps/AppWxworkApps.vue (100%)
 rename project/oms/apps/{ => statistics}/AppCorpStatistics/AppCorpStatistics.vue (100%)

diff --git a/project/oms/apps/AppDeploy/AppDeploy.vue b/project/oms/apps/develop/AppDeploy/AppDeploy.vue
similarity index 100%
rename from project/oms/apps/AppDeploy/AppDeploy.vue
rename to project/oms/apps/develop/AppDeploy/AppDeploy.vue
diff --git a/project/oms/apps/AppDeployWxmp/AppDeployWxmp.vue b/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
similarity index 100%
rename from project/oms/apps/AppDeployWxmp/AppDeployWxmp.vue
rename to project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
diff --git a/project/oms/apps/AppWebApps/AppWebApps.vue b/project/oms/apps/develop/AppWebApps/AppWebApps.vue
similarity index 100%
rename from project/oms/apps/AppWebApps/AppWebApps.vue
rename to project/oms/apps/develop/AppWebApps/AppWebApps.vue
diff --git a/project/oms/apps/AppWechatApps/AppWechatApps.vue b/project/oms/apps/develop/AppWechatApps/AppWechatApps.vue
similarity index 100%
rename from project/oms/apps/AppWechatApps/AppWechatApps.vue
rename to project/oms/apps/develop/AppWechatApps/AppWechatApps.vue
diff --git a/project/oms/apps/AppWxworkApps/AppWxworkApps.vue b/project/oms/apps/develop/AppWxworkApps/AppWxworkApps.vue
similarity index 100%
rename from project/oms/apps/AppWxworkApps/AppWxworkApps.vue
rename to project/oms/apps/develop/AppWxworkApps/AppWxworkApps.vue
diff --git a/project/oms/apps/AppCorpStatistics/AppCorpStatistics.vue b/project/oms/apps/statistics/AppCorpStatistics/AppCorpStatistics.vue
similarity index 100%
rename from project/oms/apps/AppCorpStatistics/AppCorpStatistics.vue
rename to project/oms/apps/statistics/AppCorpStatistics/AppCorpStatistics.vue

From b66d14f53e370f8bbb3edc3f28a963d9cd1c3fbc Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 20 Jun 2022 10:24:39 +0800
Subject: [PATCH 17/68] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 {packages/work => project/oms/apps/develop}/AppForm/AppForm.vue | 2 +-
 .../oms/apps/develop}/AppForm/components/Add.vue                | 0
 .../oms/apps/develop}/AppForm/components/BasicInfo.vue          | 0
 .../oms/apps/develop}/AppForm/components/FormConfig.vue         | 0
 .../oms/apps/develop}/AppForm/components/FormLayout.vue         | 0
 .../oms/apps/develop}/AppForm/components/List.vue               | 0
 .../oms/apps/develop}/AppForm/components/config.js              | 0
 7 files changed, 1 insertion(+), 1 deletion(-)
 rename {packages/work => project/oms/apps/develop}/AppForm/AppForm.vue (94%)
 rename {packages/work => project/oms/apps/develop}/AppForm/components/Add.vue (100%)
 rename {packages/work => project/oms/apps/develop}/AppForm/components/BasicInfo.vue (100%)
 rename {packages/work => project/oms/apps/develop}/AppForm/components/FormConfig.vue (100%)
 rename {packages/work => project/oms/apps/develop}/AppForm/components/FormLayout.vue (100%)
 rename {packages/work => project/oms/apps/develop}/AppForm/components/List.vue (100%)
 rename {packages/work => project/oms/apps/develop}/AppForm/components/config.js (100%)

diff --git a/packages/work/AppForm/AppForm.vue b/project/oms/apps/develop/AppForm/AppForm.vue
similarity index 94%
rename from packages/work/AppForm/AppForm.vue
rename to project/oms/apps/develop/AppForm/AppForm.vue
index b9059e59..9af50c4b 100644
--- a/packages/work/AppForm/AppForm.vue
+++ b/project/oms/apps/develop/AppForm/AppForm.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="doc-circulation">
     <keep-alive :include="['List']">
-      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"/>
     </keep-alive>
   </div>
 </template>
diff --git a/packages/work/AppForm/components/Add.vue b/project/oms/apps/develop/AppForm/components/Add.vue
similarity index 100%
rename from packages/work/AppForm/components/Add.vue
rename to project/oms/apps/develop/AppForm/components/Add.vue
diff --git a/packages/work/AppForm/components/BasicInfo.vue b/project/oms/apps/develop/AppForm/components/BasicInfo.vue
similarity index 100%
rename from packages/work/AppForm/components/BasicInfo.vue
rename to project/oms/apps/develop/AppForm/components/BasicInfo.vue
diff --git a/packages/work/AppForm/components/FormConfig.vue b/project/oms/apps/develop/AppForm/components/FormConfig.vue
similarity index 100%
rename from packages/work/AppForm/components/FormConfig.vue
rename to project/oms/apps/develop/AppForm/components/FormConfig.vue
diff --git a/packages/work/AppForm/components/FormLayout.vue b/project/oms/apps/develop/AppForm/components/FormLayout.vue
similarity index 100%
rename from packages/work/AppForm/components/FormLayout.vue
rename to project/oms/apps/develop/AppForm/components/FormLayout.vue
diff --git a/packages/work/AppForm/components/List.vue b/project/oms/apps/develop/AppForm/components/List.vue
similarity index 100%
rename from packages/work/AppForm/components/List.vue
rename to project/oms/apps/develop/AppForm/components/List.vue
diff --git a/packages/work/AppForm/components/config.js b/project/oms/apps/develop/AppForm/components/config.js
similarity index 100%
rename from packages/work/AppForm/components/config.js
rename to project/oms/apps/develop/AppForm/components/config.js

From 918b88e5e2ad59add390a703151a0c8d9404b41b Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 20 Jun 2022 11:01:12 +0800
Subject: [PATCH 18/68] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/App.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/examples/App.vue b/examples/App.vue
index 2227e9d5..14fab565 100644
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -44,14 +44,17 @@ export default {
   methods: {
     ...mapMutations(['setToken']),
     getToken(params) {
-      this.setToken([params.token_type, params.access_token].join(' '))
-      this.dialog = false
-      this.$message.success("登录成功,正在刷新页面...")
-      location.reload()
+      if (params.access_token) {
+        this.setToken([params.token_type, params.access_token].join(' '))
+        this.dialog = false
+        this.$message.success("登录成功,正在刷新页面...")
+        location.reload()
+      } else this.$message.error(params.msg || "登录失败!")
+
     },
     getUserInfo() {
       this.$axios.post("/admin/user/detail-phone").then(res => {
-        if (res && res.data) {
+        if (res?.data) {
           this.$store.commit("setUserInfo", res.data)
           if (/^\/project\/xiushan/.test(location.pathname)) {
             this.$store.commit("setFinanceUser")
@@ -60,7 +63,7 @@ export default {
       })
     },
     handleLogin() {
-      this.$axios.delete("/auth/token/logout").then(() => {
+      this.$axios.delete("/auth/token/logout").finally(() => {
         this.dialog = true
       })
     },

From 387b25c67814f5175d3e5f1415257a4f9aa5bab2 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 20 Jun 2022 11:26:42 +0800
Subject: [PATCH 19/68] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppIntegralAudit/AppIntegralAudit.vue     |  62 +++
 .../AppIntegralAudit/components/Detail.vue    | 239 +++++++++++
 .../apps/AppIntegralAudit/components/List.vue | 237 +++++++++++
 .../apps/AppPartyScore/AppPartyScore.vue      |  35 ++
 .../sanjianxi/apps/AppPartyScore/psDetail.vue | 154 +++++++
 .../sanjianxi/apps/AppPartyScore/psList.vue   | 380 ++++++++++++++++++
 .../AppPartyScoreFlow/AppPartyScoreFlow.vue   |  34 ++
 .../apps/AppPartyScoreFlow/psfList.vue        | 153 +++++++
 .../apps/AppScoreRules/AppScoreRules.vue      | 303 ++++++++++++++
 9 files changed, 1597 insertions(+)
 create mode 100644 project/sanjianxi/apps/AppIntegralAudit/AppIntegralAudit.vue
 create mode 100644 project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
 create mode 100644 project/sanjianxi/apps/AppIntegralAudit/components/List.vue
 create mode 100644 project/sanjianxi/apps/AppPartyScore/AppPartyScore.vue
 create mode 100644 project/sanjianxi/apps/AppPartyScore/psDetail.vue
 create mode 100644 project/sanjianxi/apps/AppPartyScore/psList.vue
 create mode 100644 project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue
 create mode 100644 project/sanjianxi/apps/AppPartyScoreFlow/psfList.vue
 create mode 100644 project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue

diff --git a/project/sanjianxi/apps/AppIntegralAudit/AppIntegralAudit.vue b/project/sanjianxi/apps/AppIntegralAudit/AppIntegralAudit.vue
new file mode 100644
index 00000000..2636ceff
--- /dev/null
+++ b/project/sanjianxi/apps/AppIntegralAudit/AppIntegralAudit.vue
@@ -0,0 +1,62 @@
+<template>
+  <div class="AppHealthReport">
+    <keep-alive :include="['List']">
+      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+  import List from './components/List.vue'
+  import Detail from './components/Detail.vue'
+
+  export default {
+    name: 'AppIntegralAudit',
+    label: '积分审核(三涧溪)',
+
+    components: {
+      List,
+      Detail
+    },
+
+    props: {
+      instance: Function,
+      dict: Object,
+      permissions: Function
+    },
+
+    data () {
+      return {
+        component: 'List',
+        params: {}
+      }
+    },
+
+    methods: {
+      onChange (data) {
+        if (data.type === 'Detail') {
+          this.component = 'Detail'
+          this.isShowDetail = true
+          this.params = data.params
+        }
+
+        if (data.type === 'list') {
+          this.component = 'List'
+          this.params = data.params
+
+          this.$nextTick(() => {
+            if (data.isRefresh) {
+              this.$refs.component.getList()
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .AppHealthReport {
+    height: 100%;
+  }
+</style>
diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
new file mode 100644
index 00000000..b3e465c2
--- /dev/null
+++ b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
@@ -0,0 +1,239 @@
+<template>
+  <ai-detail class="audit">
+    <template slot="title">
+      <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(true)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+          <ai-wrapper
+              label-width="120px">
+            <ai-info-item label="申请人" :value="info.residentName"></ai-info-item>
+            <ai-info-item label="申请时间" :value="info.createTime"></ai-info-item>
+            <!-- <ai-info-item label="积分类型" :value="dict.getLabel('atWillReportType', info.applyIntegralType)"></ai-info-item> -->
+            <ai-info-item label="申请描述" :value="info.description" isLine></ai-info-item>
+            <ai-info-item label="联系电话" isLine :value="info.residentPhone"></ai-info-item>
+            <ai-info-item label="图片" isLine>
+              <ai-uploader v-model="info.applyFiles" disabled></ai-uploader>
+            </ai-info-item>
+          </ai-wrapper>
+        </template>
+      </ai-card>
+      <ai-card title="处理结果" v-if="info.auditStatus !== '0'">
+        <div slot="content" style="margin-top: 16px;margin-bottom:24px">
+          <ai-wrapper
+              label-width="120px">
+            <ai-info-item label="审核结果" :value="info.auditStatus === '1' ? '通过' : '拒绝'" isLine></ai-info-item>
+            <ai-info-item label="审核意见" v-if="info.auditStatus === '2'" isLine :value="info.auditOpinion"></ai-info-item>
+            <!--            <ai-info-item label="积分规则类别" v-if="info.auditStatus === '1'" :value="dict.getLabel('atWillReportType', info.auditIntegralType)"></ai-info-item>-->
+            <!--            <ai-info-item label="积分规则事项" v-if="info.auditStatus === '1'" :value="info.auditRuleName"></ai-info-item>-->
+            <ai-info-item label="积分调整" isLine v-if="info.auditStatus === '1'"
+                          :value="(info.auditIntegral >= 0 ? info.auditIntegral : info.auditIntegral) + '分'"></ai-info-item>
+            <ai-info-item label="审核人" :value="info.auditUserName"></ai-info-item>
+            <ai-info-item label="审核时间" :value="info.auditTime"></ai-info-item>
+          </ai-wrapper>
+        </div>
+      </ai-card>
+      <ai-dialog
+          :visible.sync="isShow"
+          width="800px"
+          @close="onClose"
+          title="事件审核"
+          @onConfirm="onConfirm">
+        <el-form class="ai-form" label-width="120px" :model="form" ref="form">
+          <el-form-item label="是否通过审核" prop="pass" style="width: 100%;" :rules="[{ required: true, message: '请选择是否通过审核' }]">
+            <el-radio-group v-model="form.pass" @change="onStatusChange">
+              <el-radio label="0">否</el-radio>
+              <el-radio label="1">是</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-if="form.pass === '1'" label="积分调整" prop="auditIntegral" style="width: 100%;" :rules="[{ required: true, message: '请输入积分调整' }]">
+            <el-input v-model.number="form.auditIntegral" clearable placeholder="请输入积分调整" @keyup.native="form.auditIntegral=Math.abs(form.auditIntegral)"/>
+          </el-form-item>
+          <!--          <el-form-item v-if="form.pass === '1'" label="积分规则类别" prop="auditRuleId" style="width: 100%;" :rules="[{ required: true, message: '' }]">-->
+          <!--            <div class="flex-warpper">-->
+          <!--               <el-form-item  label-width="0" prop="auditIntegralType" :rules="[{ required: true, message: '请选择积分规则类别' }]">-->
+          <!--                <ai-select-->
+          <!--                  v-model="form.auditIntegralType"-->
+          <!--                  clearable-->
+          <!--                  style="width: 180px;"-->
+          <!--                  placeholder="请选择积分规则类别"-->
+          <!--                  :selectList="dict.getDict('atWillReportType')"-->
+          <!--                  @change="onChange">-->
+          <!--                </ai-select>-->
+          <!--               </el-form-item>-->
+          <!--               <el-form-item style="margin: 0 10px;" prop="auditRuleId" :rules="[{ required: true, message: '请选择积分规则事项' }]">-->
+          <!--                <ai-select-->
+          <!--                  v-model="form.auditRuleId"-->
+          <!--                  clearable-->
+          <!--                  style="width: 180px;"-->
+          <!--                  placeholder="请选择积分规则事项"-->
+          <!--                  :selectList="ruleList">-->
+          <!--                </ai-select>-->
+          <!--               </el-form-item>-->
+          <!--              <span>{{ integralText }}</span>-->
+          <!--            </div>-->
+          <!--          </el-form-item>-->
+          <el-form-item label="审核意见" v-if="form.pass === '0'" prop="opinion" style="width: 100%;" :rules="[{ required: true, message: '请输入审核意见' }]">
+            <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
+    </template>
+    <template #footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="isShow = true" v-if="info.auditStatus === '0'">审核</el-button>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+export default {
+  name: 'Detail',
+
+  props: {
+    instance: Function,
+    dict: Object,
+    params: Object
+  },
+
+  data() {
+    const validatorRules = function (rule, value, callback) {
+      if (value === '') {
+        callback(new Error('请输入联系方式'))
+      } else if (!/^1\d{10}$/.test(value)) {
+        callback(new Error('手机号格式错误'))
+      } else {
+        callback()
+      }
+    }
+    return {
+      total: 0,
+      info: {
+        auditStatus: '0'
+      },
+      id: '',
+      isShow: false,
+      form: {
+        auditIntegralType: '',
+        auditRuleId: '',
+        opinion: '',
+        pass: ''
+      },
+      ruleList: []
+    }
+  },
+
+  computed: {
+    integralText() {
+      if (!this.form.auditRuleId) {
+        return ''
+      }
+
+      const integral = this.ruleList.filter(v => v.dictValue === this.form.auditRuleId)[0].integral
+
+      return integral >= 0 ? `+${integral}分` : `${integral}分`
+    }
+  },
+
+  created() {
+    if (this.params && this.params.id) {
+      this.id = this.params.id
+      this.dict.load(['atWillReportType', 'auditStatus']).then(() => {
+        this.getInfo(this.params.id)
+      })
+    }
+  },
+
+  methods: {
+    getInfo(id) {
+      this.instance.post(`/app/appvillagerintegraldeclare/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.info = res.data
+        }
+      })
+    },
+
+    onStatusChange() {
+      this.$refs.form.clearValidate()
+    },
+
+    onClose() {
+      this.form.auditIntegralType = ''
+      this.form.auditRuleId = ''
+      this.form.pass = ''
+      this.form.opinion = ''
+      this.id = ''
+    },
+
+    onConfirm() {
+      this.$refs.form.validate(v => {
+        if (v) {
+          this.instance.post('/app/appvillagerintegraldeclare/examine', null, {
+            params: {
+              ...this.form,
+              id: this.params.id,
+            }
+          }).then(res => {
+            if (res.code == 0) {
+              this.isShow = false
+              this.getInfo(this.params.id)
+              this.$message.success('审核成功!')
+            }
+          })
+        }
+      })
+    },
+
+    onChange(e) {
+      this.form.auditRuleId = ''
+      this.instance.post(`/app/appvillagerintegralrule/list?size=1000&classification=${e}`).then(res => {
+        if (res?.code == 0) {
+          this.ruleList = res.data.records.filter(v => v.ruleStatus === '1').map(v => {
+            return {
+              dictName: v.ruleName,
+              dictValue: v.id,
+              ruleName: v.ruleName,
+              integral: v.integral
+            }
+          })
+        }
+      })
+    },
+
+    cancel(isRefresh) {
+      this.$emit('change', {
+        type: 'list',
+        isRefresh: !!isRefresh
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.audit {
+  .flex-warpper {
+    display: flex;
+    align-items: center;
+
+    ::v-deep .el-form-item .el-form-item__content {
+      margin-left: 0 !important;
+    }
+
+    ::v-deep .ai-select {
+      margin: 0 !important;
+    }
+
+    ::v-deep .el-form-item {
+      width: auto;
+      margin-bottom: 0;
+
+      &:last-child {
+        margin-right: 10px;
+      }
+    }
+  }
+}
+</style>
diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/List.vue b/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
new file mode 100644
index 00000000..c20e9e4e
--- /dev/null
+++ b/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
@@ -0,0 +1,237 @@
+<template>
+  <ai-list class="list">
+    <ai-title
+      slot="title"
+      title="积分审核"
+      v-if="search.areaId"
+      isShowBottomBorder
+      :instance="instance"
+      :disabledLevel="disabledLevel"
+      isShowArea
+      v-model="search.areaId"
+      @change="changeArea">
+    </ai-title>
+    <template slot="content">
+      <div class="content">
+        <ai-search-bar>
+          <template #left>
+            <ai-select
+              v-model="search.applyIntegralType"
+              clearable
+              placeholder="请选择积分类型"
+              :selectList="dict.getDict('atWillReportType')"
+              @change="search.current = 1, getList()">
+            </ai-select>
+            <ai-select
+              v-model="search.auditStatus"
+              clearable
+              placeholder="请选择审核状态"
+              :selectList="dict.getDict('auditStatus')"
+              @change="search.current = 1, getList()">
+            </ai-select>
+            <el-date-picker
+              value-format="yyyy-MM-dd"
+              v-model="search.createTimeStart"
+              type="date"
+              size="small"
+              unlink-panels
+              placeholder="选择开始日期"
+              @change="search.current = 1, getList()" />
+            <el-date-picker
+              value-format="yyyy-MM-dd"
+              v-model="search.createTimeEnd"
+              type="date"
+              size="small"
+              unlink-panels
+              placeholder="选择结束日期"
+              @change="search.current = 1, getList()" />
+          </template>
+          <template #right>
+            <el-input
+              v-model="search.residentName"
+              size="small"
+              placeholder="请输入姓名"
+              clearable
+              v-throttle="() => {search.current = 1, getList()}"
+              @clear="search.current = 1, search.residentName = '', getList()"
+              suffix-icon="iconfont iconSearch">
+            </el-input>
+          </template>
+        </ai-search-bar>
+        <ai-table
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total"
+          v-loading="loading"
+          style="margin-top: 8px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @getList="getList">
+          <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
+            <template slot-scope="{ row }">
+              <div class="table-options">
+                <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </div>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          residentName: '',
+          applyIntegralType: '',
+          areaId: '',
+          auditStatus: '',
+          createTimeStart: '',
+          createTimeEnd: ''
+        },
+        dictList: [{
+          dictName: '否',
+          dictValue: '0'
+        }, {
+          dictName: '是',
+          dictValue: '1'
+        }],
+        info: {},
+        colConfigs: [
+          { prop: 'residentName', label: '申请人' },
+          { prop: 'residentPhone', align: 'center', label: '联系电话' },
+          { prop: 'createTime', align: 'center', label: '申请时间' },
+          { prop: 'applyIntegralType', align: 'center', label: '积分类型', formart: v => this.dict.getLabel('atWillReportType', v) }, 
+          { prop: 'auditStatus', align: 'center', label: '状态', formart: v => v ? this.dict.getLabel('auditStatus', v) : '-' }, 
+          { prop: 'auditUserName', align: 'center', label: '审批人' }, 
+          { prop: 'auditTime', align: 'center', label: '审批时间' }
+        ],
+        tableData: [],
+        total: 0,
+        loading: false,
+        disabledLevel: 0
+      }
+    },
+
+    computed: {
+      ...mapState(['user']),
+
+      param () {
+        return {
+
+        }
+      }
+    },
+
+    created () {
+      this.disabledLevel = this.user.info.areaList.length - 1
+      this.search.areaId = this.user.info.areaId
+      this.loading = true
+      this.dict.load(['atWillReportType', 'auditStatus']).then(() => {
+        this.getList()
+      })
+    },
+
+    methods: {
+      getList () {
+        this.instance.post(`/app/appvillagerintegraldeclare/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        }).catch(() => {
+          this.loading = false
+        })
+      },
+
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || ''
+          }
+        })
+      },
+
+      changeArea () {
+        this.search.current = 1
+
+        this.$nextTick(() => {
+          this.getList()
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .list {
+    ::v-deep .ai-list__content {
+      padding: 0!important;
+
+      .ai-list__content--right-wrapper {
+        background: transparent!important;
+        box-shadow: none!important;
+        margin: 0!important;
+        padding: 12px 16px 12px!important;
+      }
+    }
+    .statistics-top {
+      display: flex;
+      align-items: center;
+      margin-bottom: 20px;
+
+      & > div {
+        flex: 1;
+        height: 96px;
+        line-height: 1;
+        margin-right: 20px;
+        padding: 16px 24px;
+        background: #FFFFFF;
+        box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
+        border-radius: 4px;
+
+        &:last-child {
+          margin-right: 0;
+        }
+
+        h3 {
+          font-size: 24px;
+        }
+
+        span {
+          display: block;
+          margin-bottom: 16px;
+          color: #888888;
+          font-size: 16px;
+        }
+      }
+    }
+
+    .content {
+      padding: 16px;
+      background: #FFFFFF;
+      box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.15);
+    }
+  }
+</style>
diff --git a/project/sanjianxi/apps/AppPartyScore/AppPartyScore.vue b/project/sanjianxi/apps/AppPartyScore/AppPartyScore.vue
new file mode 100644
index 00000000..7949e685
--- /dev/null
+++ b/project/sanjianxi/apps/AppPartyScore/AppPartyScore.vue
@@ -0,0 +1,35 @@
+<template>
+  <section class="AppPartyScore">
+    <component :is="currentPage" v-bind="$props"/>
+  </section>
+</template>
+
+<script>
+import PsList from "./psList";
+import PsDetail from "./psDetail";
+
+export default {
+  name: "AppPartyScore",
+  components: {PsDetail, PsList},
+  label: "党员积分(三涧溪)",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentPage() {
+      return this.$route.query.id ? PsDetail : PsList
+    }
+  },
+  created() {
+    this.dict.load("partyIntegralType")
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppPartyScore {
+  height: 100%;
+}
+</style>
diff --git a/project/sanjianxi/apps/AppPartyScore/psDetail.vue b/project/sanjianxi/apps/AppPartyScore/psDetail.vue
new file mode 100644
index 00000000..4c662b8e
--- /dev/null
+++ b/project/sanjianxi/apps/AppPartyScore/psDetail.vue
@@ -0,0 +1,154 @@
+<template>
+  <section class="psDetail">
+    <ai-detail>
+      <ai-title slot="title" title="积分详情" isShowBottomBorder isShowBack @onBackClick="back"/>
+      <template #content>
+        <el-row type="flex">
+          <ai-card hideTitle class="staCard fill">
+            <template #content>
+              <div class="color-999" v-text="`姓名`"/>
+              <b v-text="detail.name"/>
+            </template>
+          </ai-card>
+          <ai-card hideTitle class="staCard fill">
+            <template #content>
+              <div class="color-999" v-text="`学习强国`"/>
+              <el-button type="text" @click="handleEditLearningIntergral(detail.id)">编辑</el-button>
+              <b class="color-26f" v-text="detail.learningIntegral||0"/>
+            </template>
+          </ai-card>
+          <ai-card hideTitle class="staCard fill">
+            <template slot="content">
+              <div class="color-999" v-text="`个人积分`"/>
+              <b class="color-26f" v-text="detail.integral||0"/>
+            </template>
+          </ai-card>
+          <ai-card hideTitle class="staCard fill">
+            <template #content>
+              <div class="color-999" v-text="`家庭积分`"/>
+              <b class="color-26f" v-text="detail.familySurplusIntegral||0"/>
+            </template>
+          </ai-card>
+        </el-row>
+        <ai-card title="余额变动明细">
+          <template #content>
+            <ai-table :tableData="detail.integralInfoList" :isShowPagination="false" :col-configs="colConfigs"
+                      :dict="dict"/>
+          </template>
+        </ai-card>
+      </template>
+    </ai-detail>
+    <ai-dialog :visible.sync="dialog" title="学习强国设置" width="500px" @close="form={}" @onConfirm="submit">
+      <el-form :model="form" size="small" ref="DialogForm" :rules="rules" label-width="110px">
+        <el-form-item label="学习强国积分" prop="learningIntegral">
+          <el-input v-model.number="form.learningIntegral" placeholder="请输入正整数" clearable/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "psDetail",
+  props: {
+    instance: Function,
+    dict: Object,
+  },
+  data() {
+    return {
+      detail: {},
+      colConfigs: [
+        {label: "时间", prop: "createTime"},
+        {label: "类型", prop: "integralType", align: 'center', dict: "partyIntegralType"},
+        {label: "变动积分", prop: "integral", align: 'center'},
+        {label: "剩余积分", prop: "residualIntegral", align: 'center'},
+        {label: "调整说明", prop: "remark"},
+      ],
+      dialog: false,
+      form: {},
+      rules: {
+        learningIntegral: [
+          {required: true, message: "请输入学习强国积分"},
+          {pattern: /^\d+$/g, message: "请输入正整数"}
+        ]
+      }
+    }
+  },
+  methods: {
+    getDetail() {
+      let {id} = this.$route.query
+      this.instance.post("/app/appparty/getPartyIntegralDetail", null, {
+        params: {id}
+      }).then(res => {
+        if (res?.data) {
+          this.detail = res.data
+        }
+      })
+    },
+    back() {
+      this.$router.push({})
+    },
+    submit() {
+      this.$refs.DialogForm.validate(v => {
+        if (v) {
+          this.instance.post("/app/appparty/editLearningIntegral", null,{
+            params:this.form
+          }).then(res => {
+            if (res?.code == 0) {
+              this.$message.success("提交成功!")
+              this.dialog = false
+              this.getDetail()
+            }
+          })
+        }
+      })
+    },
+    handleEditLearningIntergral(partyMemberId) {
+      this.dialog = true
+      this.form = {partyMemberId}
+    }
+  },
+  created() {
+    this.getDetail()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.psDetail {
+  height: 100%;
+
+  .color-999 {
+    color: #999;
+  }
+
+  .color-26f {
+    color: #26f;
+  }
+
+  ::v-deep.staCard {
+    font-size: 14px;
+
+    b {
+      font-size: 24px;
+      line-height: 40px;
+    }
+
+    & + .staCard {
+      margin-left: 16px;
+    }
+
+    .ai-card__body {
+      position: relative;
+
+      .el-button {
+        position: absolute;
+        right: 32px;
+        top: 6px;
+      }
+    }
+
+  }
+}
+</style>
diff --git a/project/sanjianxi/apps/AppPartyScore/psList.vue b/project/sanjianxi/apps/AppPartyScore/psList.vue
new file mode 100644
index 00000000..92e34bdf
--- /dev/null
+++ b/project/sanjianxi/apps/AppPartyScore/psList.vue
@@ -0,0 +1,380 @@
+<template>
+  <section class="psList">
+    <ai-list>
+      <ai-title slot="title" title="党员积分" isShowBottomBorder/>
+      <template #left>
+        <div class="patyCode-left">
+          <div class="patyCode-left__title">
+            <h2>组织目录</h2>
+          </div>
+          <div class="organization-left__list">
+            <div class="organization-left__list--title">
+              <el-input
+                  class="organization-left__list--search"
+                  size="mini"
+                  clearable
+                  placeholder="请输入组织名称"
+                  v-model="organizationName"
+                  suffix-icon="iconfont iconSearch">
+              </el-input>
+            </div>
+            <el-tree
+                :filter-node-method="filterNode"
+                ref="tree"
+                :props="defaultProps"
+                node-key="id"
+                :data="organizationTree"
+                highlight-current
+                :current-node-key="search.organizationName"
+                :default-expanded-keys="defaultExpanded"
+                :default-checked-keys="defaultChecked"
+                @current-change="onTreeChange">
+            </el-tree>
+          </div>
+        </div>
+      </template>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <div>统计周期</div>
+            <el-date-picker type="daterange" placeholder="日期" size="small" clearable v-model="createTime"
+                        @change="handleSearchTime" start-placeholder="开始时间" end-placeholder="结束时间"
+                        value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00','23:59:59']"/>
+          </template>
+          <template #right>
+            <ai-import :instance="instance" name="党员积分" title="导入党员积分"
+                        suffixName="xlsx"
+                        url="/app/apppartyintegralinfo/downloadTemplate"
+                        importUrl="/app/apppartyintegralinfo/import"
+                        @onSuccess="page.current=1,getTableData()"/>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                  @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+          <el-table-column slot="options" label="操作" fixed="right" align="center">
+            <template slot-scope="{row}">
+              <el-button type="text" @click="getFamilyByPartyId(row.idNumber)">家庭成员</el-button>
+              <el-button type="text" @click="showDetail(row.id)">详情</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-dialog :visible.sync="dialog" title="家庭成员" :customFooter="true" width="780px" @close="familyList=[]">
+      <ai-table :tableData="familyList" :isShowPagination="false" :col-configs="familyCols" :dict="dict"/>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialog=false">关 闭</el-button>
+      </div>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: "psList",
+  props: {
+    instance: Function,
+    dict: Object,
+  },
+  computed: {
+    ...mapState(['user']),
+    colConfigs() {
+      return [
+        {label: "姓名", prop: "name"},
+        {label: "个人积分", prop: "integral", align: "center"},
+        {label: "家庭积分", prop: "familySurplusIntegral", align: "center"},
+        {label: "学习强国", prop: "learningIntegral", align: "center"},
+        {slot: "options"}
+      ]
+    },
+    familyCols() {
+      return [
+        {
+          label: '与户主关系', prop: 'householdRelation', align: 'center', width: 165,
+          render: (h, {row}) => h('p', this.dict.getLabel('householdRelation', row.householdRelation || "户主"))
+        },
+        {label: '类型', prop: 'residentType', align: 'center', dict: "residentType"},
+        {label: '姓名', prop: 'name', align: 'center'},
+        {label: '身份证号', render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber)), width: 165},
+        {label: '联系电话', prop: 'phone', align: 'center', width: 120}
+      ]
+    }
+  },
+  data() {
+    return {
+      search: {},
+      page: {current: 1, size: 10, total: 0},
+      tableData: [],
+      dialog: false,
+      familyList: [],
+      organizationName: '',
+      organizationTree: [],
+      defaultExpanded: [],
+      defaultChecked: [],
+      areaTree: [],
+      defaultProps: {
+        children: 'children',
+        label: 'name'
+      },
+      createTime: '',
+    }
+  },
+  methods: {
+    back() {
+      this.$router.push({})
+    },
+    getTableData() {
+      this.instance.post("/app/appparty/listByPartyIntegral", null, {
+        params: {...this.page, ...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+    getTree() {
+      this.instance.post(`/admin/area/queryAllArea?id=${this.user.info.areaId}`).then(res => {
+        if (res.code === 0) {
+          let parent = res.data.map(v => {
+            v.label = v.name
+            v.children = []
+
+            return v
+          }).filter(e => !e.parentid)[0]
+          this.defaultExpanded = [parent.id]
+          this.defaultChecked = [parent.id]
+          this.search.areaId = parent.id
+          this.addChild(parent, res.data)
+          this.organizationTree = [parent]
+
+          this.$nextTick(() => {
+            this.$refs.tree.setCurrentKey(parent.id)
+          })
+        }
+      })
+    },
+
+    addChild(parent, list) {
+      for (let i = 0; i < list.length; i++) {
+        if (list[i].parentId === parent.id) {
+          parent.children.push(list[i])
+        }
+      }
+
+      if (list.length > 0) {
+        parent['children'].map(v => this.addChild(v, list))
+      }
+    },
+
+    onTreeChange(e) {
+      this.search.areaId = e.id
+      this.areaName = e.name
+      this.search.current = 1
+
+      this.$nextTick(() => {
+        this.getList()
+      })
+    },
+
+    filterNode(value, data) {
+      if (!value) return true
+      return data.name.indexOf(value) !== -1
+    },
+
+    handleSearchTime(v) {
+      // this.page.current = 1
+      // this.search.startTime = v?.[0]
+      // this.search.endTime = v?.[1]
+      // this.getTableData()
+    },
+
+    showDetail(id) {
+      this.$router.push({query: {id}})
+    },
+    getFamilyByPartyId(idNumber) {
+      this.instance.post("/app/appresident/queryHomeMember", null, {
+        params: {idNumber}
+      }).then(res => {
+        if (res?.data) {
+          this.familyList = res.data?.family || []
+          this.dialog = true
+        }
+      })
+    }
+  },
+  created() {
+    this.getTableData()
+    // this.getTree()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.psList {
+  height: 100%;
+
+  .organization-left__list {
+    height: calc(100% - 40px);
+    padding: 8px 8px;
+    overflow: auto;
+
+    .organization-left__tags--item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height: 40px;
+      padding: 0 8px 0 16px;
+      color: #222222;
+
+      &.organization-left__tags--item-active, &:hover {
+        background: #E8EFFF;
+        color: #2266FF;
+
+        i, span {
+          color: #2266FF;
+        }
+      }
+
+      span {
+        font-size: 14px;
+      }
+
+      i {
+        cursor: pointer;
+        color: #8e9ebf;
+        font-size: 16px;
+      }
+    }
+
+    .organization-left__list--title {
+      display: flex;
+      align-items: center;
+      margin-bottom: 8px;
+
+      .organization-left__list--search {
+        flex: 1;
+
+        ::v-deep input {
+          width: 100%;
+        }
+      }
+
+      .el-button {
+        width: 84px;
+        flex-shrink: 1;
+        margin-right: 8px;
+      }
+    }
+
+    span {
+      color: #222222;
+      font-size: 14px;
+    }
+
+    ::v-deep .el-tree {
+      background: transparent;
+
+      .el-tree-node__expand-icon.is-leaf {
+        color: transparent !important;
+      }
+
+      .el-tree-node__content > .el-tree-node__expand-icon {
+        padding: 4px;
+      }
+
+      .el-tree-node__content {
+        height: 32px;
+      }
+
+      .el-tree__empty-text {
+        color: #222;
+        font-size: 14px;
+      }
+
+      .el-tree-node__children .el-tree-node__content {
+        height: 32px;
+      }
+
+      .el-tree-node__content:hover {
+        background: #E8EFFF;
+        color: #222222;
+        border-radius: 2px;
+      }
+
+      .is-current > .el-tree-node__content {
+        &:hover {
+          background: #2266FF;
+          color: #fff;
+        }
+
+        background: #2266FF;
+
+        span {
+          color: #fff;
+        }
+      }
+    }
+  }
+
+  ::v-deep .ai-list__content--left {
+    margin-right: 2px;
+  }
+
+  .patyCode-left {
+    width: 100%;
+    height: auto;
+    background: #FAFAFB;
+
+    .patyCode-left__title {
+      display: flex;
+      align-items: center;
+      height: 40px;
+      padding: 0 16px;
+      background: #fff;
+
+      h2 {
+        color: #222;
+        font-size: 14px;
+      }
+    }
+
+    .patyCode-left__list {
+      height: calc(100% - 40px);
+      padding: 8px 0;
+      overflow: auto;
+
+      span {
+        display: block;
+        height: 40px;
+        line-height: 40px;
+        padding: 0 24px;
+        color: #222222;
+        font-size: 14px;
+        cursor: pointer;
+        border-right: 2px solid transparent;
+        background: transparent;
+
+        &:hover {
+          color: #2266FF;
+          background: #E8EFFF;
+        }
+
+        &.left-active {
+          color: #2266FF;
+          border-color: #2266FF;
+          background: #E8EFFF;
+        }
+      }
+    }
+  }
+
+  ::v-deep .ai-list__content--right {
+    .ai-list__content--right-wrapper {
+      min-height: 100%;
+    }
+  }
+}
+</style>
diff --git a/project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue b/project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue
new file mode 100644
index 00000000..8c2a5991
--- /dev/null
+++ b/project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue
@@ -0,0 +1,34 @@
+<template>
+  <section class="AppPartyScoreFlow">
+    <component :is="currentPage" v-bind="$props"/>
+  </section>
+</template>
+
+<script>
+import PsfList from "./psfList";
+
+export default {
+  name: "AppPartyScoreFlow",
+  components: {PsfList},
+  label: "党员积分明细(三涧溪)",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentPage() {
+      return PsfList
+    }
+  },
+  created() {
+    this.dict.load("partyIntegralType")
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppPartyScoreFlow {
+  height: 100%;
+}
+</style>
diff --git a/project/sanjianxi/apps/AppPartyScoreFlow/psfList.vue b/project/sanjianxi/apps/AppPartyScoreFlow/psfList.vue
new file mode 100644
index 00000000..227187d3
--- /dev/null
+++ b/project/sanjianxi/apps/AppPartyScoreFlow/psfList.vue
@@ -0,0 +1,153 @@
+<template>
+  <section class="psfList">
+    <ai-list>
+      <ai-title slot="title" title="党员积分明细" isShowBottomBorder/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" icon="iconfont iconAdd" @click="dialog=true">添加</el-button>
+            <el-date-picker type="daterange" placeholder="日期" size="small" clearable v-model="createTime"
+                            @change="handleSearchTime" start-placeholder="开始时间" end-placeholder="结束时间"
+                            value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00','23:59:59']"/>
+          </template>
+          <template #right>
+            <el-input size="small" placeholder="搜索党员" v-model="search.partyName" clearable
+                      @change="page.current=1,getTableData()" suffix-icon="iconfont iconSearch"/>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                  @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+          <el-table-column slot="options" label="操作" fixed="right" align="center">
+            <template slot-scope="{row}">
+              <el-button type="text" @click="showDetail(row)">详情</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-dialog :visible.sync="dialog" title="积分对象" width="600px" @close="form={}" @onConfirm="submit"
+               :customFooter="!isAdd">
+      <el-form v-if="isAdd" :model="form" size="small" ref="DialogForm" :rules="rules" label-width="80px">
+        <el-form-item label="选择人员" prop="partyId">
+          <ai-select v-model="form.partyId" action="/app/appparty/list" :instance="instance"
+                     :prop="{label:'name'}"/>
+        </el-form-item>
+        <el-form-item label="调整说明" prop="remark">
+          <el-input type="textarea" placeholder="请输入" v-model="form.remark" maxlength="100" show-word-limit rows="3"
+                    clearable/>
+        </el-form-item>
+        <el-form-item label="类型" prop="integralType">
+          <ai-select v-model="form.integralType" :selectList="dict.getDict('partyIntegralType')"/>
+        </el-form-item>
+        <el-form-item label="积分" prop="integral">
+          <el-input v-model.number="form.integral" placeholder="请输入正整数" clearable/>
+        </el-form-item>
+      </el-form>
+      <ai-wrapper v-else>
+        <ai-info-item label="对象" :value="form.partyName"/>
+        <ai-info-item label="调整说明" :value="form.remark" isLine/>
+        <ai-info-item label="类型" :value="dict.getLabel('partyIntegralType',form.integralType)"/>
+        <ai-info-item label="积分" :value="form.integral"/>
+      </ai-wrapper>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: "psfList",
+  props: {
+    instance: Function,
+    dict: Object,
+  },
+  computed: {
+    ...mapState(['user']),
+    colConfigs() {
+      return [
+        {label: "对象", prop: "partyName"},
+        {label: "调整说明", prop: "remark", align: "center"},
+        {label: "时间", prop: "createTime"},
+        {label: "类型", prop: "integralType", align: "center", dict: "partyIntegralType"},
+        {label: "积分", prop: "integral", align: "center"},
+        {slot: "options"}
+      ]
+    },
+    isAdd() {
+      return !this.form.id
+    }
+  },
+  data() {
+    return {
+      search: {},
+      page: {current: 1, size: 10, total: 0},
+      tableData: [],
+      dialog: false,
+      form: {},
+      rules: {
+        partyId: {required: true, message: "请选择人员"},
+        remark: {required: true, message: "请输入调整说明"},
+        integralType: {required: true, message: "请选择类型"},
+        integral: [
+          {required: true, message: "请输入分数"},
+          {pattern: /^\d+$/g, message: "请输入正整数"}
+        ],
+      },
+      createTime: "",
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/app/apppartyintegralinfo/list", null, {
+        params: {...this.page, ...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records?.map(e => ({
+            ...e,
+            integral: (e.integralType == 0 ? "-" : '+') + e.integral
+          }))
+          this.page.total = res.data.total
+        }
+      })
+    },
+
+    
+    showDetail(row) {
+      this.form = JSON.parse(JSON.stringify(row))
+      this.dialog = true
+    },
+    submit() {
+      this.$refs.DialogForm.validate(v => {
+        if (v) {
+          let loading = this.$loading({text: "提交中..."})
+          this.instance.post("/app/apppartyintegralinfo/addOrUpdate", this.form).then(res => {
+            loading.close()
+            if (res?.code == 0) {
+              this.$message.success("提交成功!")
+              this.dialog = false
+              this.getTableData()
+            }
+          }).catch(() => loading.close())
+        }
+      })
+    },
+    handleSearchTime(v) {
+      this.page.current = 1
+      this.search.startTime = v?.[0]
+      this.search.endTime = v?.[1]
+      this.getTableData()
+    }
+  },
+  created() {
+    this.getTableData()
+    
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.psfList {
+  height: 100%;
+}
+</style>
diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
new file mode 100644
index 00000000..6f3088f7
--- /dev/null
+++ b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
@@ -0,0 +1,303 @@
+<template>
+  <section class="AppScoreRules">
+    <ai-list v-if="permissions('app_appvillagerintegralrule_detail')">
+      <template slot="title">
+        <ai-title title="积分规则" isShowBottomBorder></ai-title>
+      </template>
+      <template slot="content">
+        <ai-search-bar bottomBorder>
+          <template slot="left">
+            <el-cascader size="small" v-model="search.eventType" placeholder="请选择事件/类型" clearable
+                         :props="{...etOps,checkStrictly:true}" @change="handleTypeSearch" ref="eventTypeSearch"/>
+            <ai-select
+                v-model="search.status"
+                @change="page.current = 1, getList()"
+                placeholder="请选择状态"
+                :selectList="dict.getDict('integralRuleStatus')">
+            </ai-select>
+          </template>
+          <template slot="right">
+          </template>
+        </ai-search-bar>
+        <ai-search-bar style="margin-top: 16px;">
+          <template #left>
+            <el-button type="primary" icon="iconfont iconAdd" @click="dialog=true">添加</el-button>
+          </template>
+        </ai-search-bar>
+        <ai-table
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="page.total" :dict="dict"
+            :current.sync="page.current"
+            :size.sync="page.size"
+            @getList="getList">
+          <el-table-column slot="integral" label="分值" align="center">
+            <template slot-scope="{ row }">
+            <span
+                v-if="row.integralValueType == 1">
+              {{ row.integralStart > 0 ? '+' + row.integralStart : row.integralStart }} ~ {{ row.integralEnd > 0 ? '+' + row.integralEnd : row.integralEnd }}
+            </span>
+              <span v-else>{{ row.integral > 0 ? '+' : '' }}{{ row.integral }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column slot="options" label="操作" align="center" fixed="right" width="200">
+            <template slot-scope="{ row }">
+              <div class="table-options">
+                <el-button type="text" :disabled="!permissions('app_appvillagerintegralrule_edit')" @click="changeStatus(row.id, 0)" v-if="row.status == 1">
+                  停用
+                </el-button>
+                <el-button type="text" :disabled="!permissions('app_appvillagerintegralrule_edit')" @click="changeStatus(row.id, 1)" v-else>启用</el-button>
+                <el-button type="text" :disabled="!permissions('app_appvillagerintegralrule_edit')" @click="toEdit(row)">编辑</el-button>
+                <el-button type="text" :disabled="!permissions('app_appvillagerintegralrule_del')" @click="remove(row.id)">删除</el-button>
+              </div>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-empty v-else>暂无应用权限</ai-empty>
+    <ai-dialog :title="dialogTitle" :visible.sync="dialog" @onConfirm="onConfirm" @closed="form={ladderRule: []}" width="700px">
+      <div class="form_div">
+        <el-form ref="DialogForm" :model="form" :rules="formRules" size="small" label-suffix="：" label-width="100px">
+          <el-form-item label="事件/类型" prop="eventType">
+            <el-cascader v-model="form.eventType" :props="etOps" clearable placeholder="请选择" @change="handleTypeForm"
+                         :options="cacheOps"/>
+          </el-form-item>
+          <el-form-item label="规则" prop="ruleType" v-if="form.ruleType>-1" required>
+            <el-row type="flex" justify="space-between">
+              <div v-text="dict.getLabel('integralRuleRuleType',form.ruleType)"/>
+              <el-button v-if="form.ruleType==1" type="text" icon="iconfont iconAdd"
+                         @click="form.ladderRule.push({viewCount:null,integral:null})">添加
+              </el-button>
+            </el-row>
+            <el-table v-if="form.ruleType==1" :data="form.ladderRule" size="mini" border stripe>
+              <el-table-column label="查看人数(人)" align="center">
+                <template slot-scope="{row}">
+                  <el-input class="tableInput" v-model.number="row.viewCount" clearable placeholder="请输入"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="获得积分(分)" align="center">
+                <template slot-scope="{row}">
+                  <el-input class="tableInput" v-model="row.integral" clearable placeholder="请输入" type="number"
+                            @keyup.native="row.integral=checkIntegral(row.integral)"/>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" align="center">
+                <template slot-scope="{row,$index}">
+                  <el-button type="text" @click="handleDelete($index)">删除</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-form-item>
+          <el-form-item label="周期范围" prop="scoringCycle">
+            <ai-select v-model="form.scoringCycle" :selectList="dict.getDict('integralRuleScoringCycle')"/>
+          </el-form-item>
+          <template v-if="form.ruleType==0">
+            <el-form-item label="奖励次数" prop="numberLimit">
+              <el-input placeholder="请输入,周期范围内,不填写表示不限制" v-model.number="form.numberLimit" clearable/>
+            </el-form-item>
+            <el-form-item label="积分分值" prop="integral">
+              <el-input placeholder="请输入" v-model="form.integral" clearable/>
+            </el-form-item>
+          </template>
+        </el-form>
+      </div>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "AppScoreRules",
+  label: "积分规则(三涧溪)",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    isEdit() {
+      return !!this.form.id
+    },
+    dialogTitle() {
+      return this.isEdit ? "编辑积分规则" : "添加积分规则"
+    },
+    etOps() {
+      return {
+        lazy: true,
+        value: "dictValue",
+        label: "dictName",
+        lazyLoad: (node, resolve) => {
+          if (node.level == 0) resolve(this.dict.getDict('integralRuleEvent'))
+          else if (node.level == 1) {
+            let dict = 'integralRuleEvent' + node.value
+            this.dict.load(dict).then(() => {
+              let nodes = this.dict.getDict(dict).map(e => ({...e, leaf: true}))
+              resolve(nodes)
+            })
+          }
+        }
+      }
+    },
+  },
+  data() {
+    return {
+      search: {status: "", eventType: null},
+      page: {current: 1, size: 10, total: 0},
+      colConfigs: [
+        {prop: "event", label: "事件", dict: "integralRuleEvent"},
+        {prop: "type", label: "类型", dict: "integralRuleEventType"},
+        {prop: "ruleType", label: "规则", dict: "integralRuleRuleType"},
+        {prop: "scoringCycle", label: "周期范围", dict: "integralRuleScoringCycle"},
+        {prop: "status", label: "状态", align: "center", width: 96, dict: "integralRuleStatus"},
+        {slot: "options", label: "操作", align: "center"},
+      ],
+      tableData: [],
+      dialog: false,
+      form: {ladderRule: []},
+      formRules: {
+        eventType: [{required: true, message: "请选择事件/类型", trigger: "change"}],
+        scoringCycle: [{required: true, message: "请选择周期范围", trigger: "change"}],
+        integral: [{required: true, pattern: /^\d*[.\d]\d?$/, message: "请输入积分分值,最多保留一位小数"}],
+        numberLimit: [{pattern: /^\d*$/, message: "请输入正整数"}]
+      },
+      cacheOps: []
+    };
+  },
+  created() {
+    this.dict.load("integralRuleStatus", "integralRuleRuleType", 'integralRuleScoringCycle', 'integralRuleEvent', 'integralRuleEventType').then(() => {
+      this.getList();
+    });
+  },
+  methods: {
+    getList() {
+      this.instance.post(`/app/appvillagerintegralrule/list`, null, {
+        params: {...this.search, ...this.page},
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data.records;
+          this.page.total = res.data.total;
+        }
+      });
+    },
+    toEdit(row) {
+      this.form = this.$copy(row)
+      let {ladderRule, event, type} = this.form,
+          dict = 'integralRuleEvent' + event
+      this.dict.load(dict).then(() => {
+        this.form.eventType = [event, type]
+        this.form.ladderRule = JSON.parse(ladderRule || "[]")
+        this.cacheOps = this.dict.getDict('integralRuleEvent').map(e => {
+          if (e.dictValue == event) {
+            e.children = this.dict.getDict(dict).map(d => ({...d, leaf: true}))
+          }
+          return e
+        })
+        this.$nextTick(() => {
+          this.dialog = true
+        })
+      })
+    },
+    remove(id) {
+      this.$confirm("删除后不可恢复，是否要删除该事项？", {
+        type: 'error'
+      }).then(() => {
+        this.instance
+        .post(`/app/appvillagerintegralrule/delete?ids=${id}`)
+        .then((res) => {
+          if (res.code == 0) {
+            this.$message.success("删除成功！");
+            this.getList();
+          }
+        });
+      });
+    },
+    changeStatus(id, status) {
+      let text = status == 1 ? '启用' : '停用'
+      this.$confirm(`确定${text}该条规则？`).then(() => {
+        this.instance.post(`/app/appvillagerintegralrule/enableOrDisable?id=${id}`).then((res) => {
+          if (res.code == 0) {
+            this.$message.success(`${text}成功！`)
+            this.getList();
+          }
+        });
+      });
+    },
+    onReset() {
+      this.page.current = 1
+      this.search.classification = ""
+      this.search.integralType = ""
+      this.search.ruleStatus = ""
+      this.getList();
+    },
+    onConfirm() {
+      if(this.form.ruleType==1 && !this.form.ladderRule.length) {
+        return this.$message.error('请添加规则')
+      }
+      this.$refs.DialogForm.validate((valid) => {
+        if (valid) {
+          let formData = this.$copy(this.form)
+          formData.ladderRule = JSON.stringify(formData.ladderRule)
+          formData.integral = formData.integral || 0
+          this.instance.post(`/app/appvillagerintegralrule/addOrUpdate`, formData).then((res) => {
+            if (res.code == 0) {
+              this.$message.success(`${this.isEdit ? '编辑成功' : '添加成功'}`)
+              this.onReset()
+              this.dialog = false;
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+    handleTypeSearch(v) {
+      this.search.event = v?.[0]
+      this.search.type = v?.[1]
+      this.page.current = 1
+      this.$refs.eventTypeSearch.dropDownVisible = false
+      this.getList()
+    },
+    handleTypeForm(v) {
+      if (this.dialog) {
+        this.form.event = v?.[0]
+        this.form.type = v?.[1]
+        this.form.ruleType = !this.form.event ? null : this.form.event == 3 ? 1 : 0
+      }
+    },
+    handleDelete(i) {
+      this.$confirm("是否要删除该规则?").then(() => {
+        this.form.ladderRule.splice(i, 1)
+      }).catch(() => 0)
+    },
+    checkIntegral(v) {
+      return /\.\d{2,}$/.test(v) ? Math.abs(v).toFixed(1) : Math.abs(v)
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.AppScoreRules {
+  height: 100%;
+  background: #f3f6f9;
+
+  ::v-deep .ai-list__content--right {
+    width: 100%;
+  }
+
+  ::v-deep .ai-dialog {
+    .el-cascader {
+      width: 100%;
+    }
+
+    .tableInput {
+      & > input {
+        text-align: center;
+        border: none;
+        background: transparent;
+      }
+    }
+  }
+}
+</style>

From 4567edbd5f19eb8f8ea7b402229d62a18f5053e9 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 20 Jun 2022 11:39:43 +0800
Subject: [PATCH 20/68] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue.config.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/vue.config.js b/vue.config.js
index df17a982..8d5b1e8e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -96,6 +96,14 @@ module.exports = {
           '^/ns': '/'
         }
       },
+      '/lns': {
+        target: 'http://localhost:12525',
+        changeOrigin: true,
+        pathRewrite: {
+          //地址重写
+          '^/lns': '/'
+        }
+      },
       '/xsjr': {
         target: 'http://192.168.1.87:39896',
         changeOrigin: true,

From dd9394b9eb9c7e0ee6df4d4960e79f785382e12a Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 20 Jun 2022 13:48:16 +0800
Subject: [PATCH 21/68] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sanjianxi/apps/AppPartyScore/psList.vue   | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/project/sanjianxi/apps/AppPartyScore/psList.vue b/project/sanjianxi/apps/AppPartyScore/psList.vue
index 92e34bdf..b8e4eac6 100644
--- a/project/sanjianxi/apps/AppPartyScore/psList.vue
+++ b/project/sanjianxi/apps/AppPartyScore/psList.vue
@@ -42,11 +42,11 @@
                         value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00','23:59:59']"/>
           </template>
           <template #right>
-            <ai-import :instance="instance" name="党员积分" title="导入党员积分"
-                        suffixName="xlsx"
-                        url="/app/apppartyintegralinfo/downloadTemplate"
-                        importUrl="/app/apppartyintegralinfo/import"
-                        @onSuccess="page.current=1,getTableData()"/>
+            <el-input size="small" placeholder="党员姓名" v-model="search.partyName" clearable
+                      @change="page.current=1,getTableData()" suffix-icon="iconfont iconSearch"/>
+            <ai-download :instance="instance" url="/app/apppartyintegralinfo/downloadTemplate" :params="search" fileName="党员积分" :disabled="tableData.length == 0">
+              <el-button icon="iconfont iconExported" :disabled="tableData.length == 0">导出</el-button>
+            </ai-download>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
@@ -82,10 +82,13 @@ export default {
     ...mapState(['user']),
     colConfigs() {
       return [
-        {label: "姓名", prop: "name"},
-        {label: "个人积分", prop: "integral", align: "center"},
-        {label: "家庭积分", prop: "familySurplusIntegral", align: "center"},
-        {label: "学习强国", prop: "learningIntegral", align: "center"},
+        {label: "排行榜", prop: "name", align: "center"},
+        {label: "党员姓名", prop: "name", align: "center"},
+        {label: "党员类型", prop: "name", align: "center"},
+        {label: "获得积分", prop: "name", align: "center"},
+        // {label: "个人积分", prop: "integral", align: "center"},
+        // {label: "家庭积分", prop: "familySurplusIntegral", align: "center"},
+        // {label: "学习强国", prop: "learningIntegral", align: "center"},
         {slot: "options"}
       ]
     },
@@ -104,7 +107,9 @@ export default {
   },
   data() {
     return {
-      search: {},
+      search: {
+        createTime: '',
+      },
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       dialog: false,

From c378806112ce6aead41522d7ac58f4962efade40 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 20 Jun 2022 14:25:33 +0800
Subject: [PATCH 22/68] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/AppIntegralAudit/components/Detail.vue      | 12 +++++++++---
 project/sanjianxi/apps/AppPartyScore/psDetail.vue    | 12 ++++++++++--
 project/sanjianxi/apps/AppPartyScoreFlow/psfList.vue |  3 +++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
index b3e465c2..ba3e6bd7 100644
--- a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
+++ b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
@@ -81,9 +81,9 @@
         </el-form>
       </ai-dialog>
     </template>
-    <template #footer>
+    <template #footer v-if="info.auditStatus === '0'">
       <el-button @click="cancel">取消</el-button>
-      <el-button type="primary" @click="isShow = true" v-if="info.auditStatus === '0'">审核</el-button>
+      <el-button type="primary" @click="isShow = true">审核</el-button>
     </template>
   </ai-detail>
 </template>
@@ -121,7 +121,7 @@ export default {
         opinion: '',
         pass: ''
       },
-      ruleList: []
+      ruleList: [],
     }
   },
 
@@ -138,10 +138,16 @@ export default {
   },
 
   created() {
+    let loading = this.$loading({
+      text: 'Loading',
+    });
     if (this.params && this.params.id) {
       this.id = this.params.id
       this.dict.load(['atWillReportType', 'auditStatus']).then(() => {
         this.getInfo(this.params.id)
+        this.$nextTick(() => {
+          loading.close()
+        })
       })
     }
   },
diff --git a/project/sanjianxi/apps/AppPartyScore/psDetail.vue b/project/sanjianxi/apps/AppPartyScore/psDetail.vue
index 4c662b8e..cd8663cb 100644
--- a/project/sanjianxi/apps/AppPartyScore/psDetail.vue
+++ b/project/sanjianxi/apps/AppPartyScore/psDetail.vue
@@ -11,6 +11,12 @@
             </template>
           </ai-card>
           <ai-card hideTitle class="staCard fill">
+            <template slot="content">
+              <div class="color-999" v-text="`党员积分`"/>
+              <b class="color-26f" v-text="detail.integral||0"/>
+            </template>
+          </ai-card>
+          <!-- <ai-card hideTitle class="staCard fill">
             <template #content>
               <div class="color-999" v-text="`学习强国`"/>
               <el-button type="text" @click="handleEditLearningIntergral(detail.id)">编辑</el-button>
@@ -28,7 +34,7 @@
               <div class="color-999" v-text="`家庭积分`"/>
               <b class="color-26f" v-text="detail.familySurplusIntegral||0"/>
             </template>
-          </ai-card>
+          </ai-card> -->
         </el-row>
         <ai-card title="余额变动明细">
           <template #content>
@@ -127,8 +133,9 @@ export default {
     color: #26f;
   }
 
-  ::v-deep.staCard {
+  ::v-deep .staCard {
     font-size: 14px;
+    width: 25%;
 
     b {
       font-size: 24px;
@@ -137,6 +144,7 @@ export default {
 
     & + .staCard {
       margin-left: 16px;
+      width: 25%;
     }
 
     .ai-card__body {
diff --git a/project/sanjianxi/apps/AppPartyScoreFlow/psfList.vue b/project/sanjianxi/apps/AppPartyScoreFlow/psfList.vue
index 227187d3..297aa5a3 100644
--- a/project/sanjianxi/apps/AppPartyScoreFlow/psfList.vue
+++ b/project/sanjianxi/apps/AppPartyScoreFlow/psfList.vue
@@ -13,6 +13,9 @@
           <template #right>
             <el-input size="small" placeholder="搜索党员" v-model="search.partyName" clearable
                       @change="page.current=1,getTableData()" suffix-icon="iconfont iconSearch"/>
+            <ai-import :instance="instance" :dict="dict" importUrl="/appcollectiveeconomyequity/import" url="/appcollectiveeconomyequity/downloadTemplate" name="集体经济组织股权管理信息" @success="getTableData(), $message.success('导入成功!')">
+              <el-button size="small">导入</el-button>
+            </ai-import>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"

From 5f208c4510299f427d4e797b744a287add74a294 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 20 Jun 2022 14:52:15 +0800
Subject: [PATCH 23/68] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppIntegralAudit/components/Detail.vue    | 93 ++++++++++++-------
 .../apps/AppIntegralAudit/components/List.vue |  6 +-
 2 files changed, 61 insertions(+), 38 deletions(-)

diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
index ba3e6bd7..d6c1077c 100644
--- a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
+++ b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
@@ -11,27 +11,28 @@
               label-width="120px">
             <ai-info-item label="申请人" :value="info.residentName"></ai-info-item>
             <ai-info-item label="申请时间" :value="info.createTime"></ai-info-item>
-            <!-- <ai-info-item label="积分类型" :value="dict.getLabel('atWillReportType', info.applyIntegralType)"></ai-info-item> -->
+            <ai-info-item label="积分类型" :value="dict.getLabel('atWillReportType', info.applyIntegralType)"></ai-info-item>
+            <ai-info-item label="规则类型" :value="info.residentName"></ai-info-item>
             <ai-info-item label="申请描述" :value="info.description" isLine></ai-info-item>
-            <ai-info-item label="联系电话" isLine :value="info.residentPhone"></ai-info-item>
-            <ai-info-item label="图片" isLine>
+            <!-- <ai-info-item label="联系电话" isLine :value="info.residentPhone"></ai-info-item> -->
+            <ai-info-item label="图片资料" isLine v-show="info.applyFiles">
               <ai-uploader v-model="info.applyFiles" disabled></ai-uploader>
             </ai-info-item>
           </ai-wrapper>
         </template>
       </ai-card>
-      <ai-card title="处理结果" v-if="info.auditStatus !== '0'">
+      <ai-card title="审核详情" v-if="info.auditStatus !== '0'">
         <div slot="content" style="margin-top: 16px;margin-bottom:24px">
           <ai-wrapper
               label-width="120px">
-            <ai-info-item label="审核结果" :value="info.auditStatus === '1' ? '通过' : '拒绝'" isLine></ai-info-item>
-            <ai-info-item label="审核意见" v-if="info.auditStatus === '2'" isLine :value="info.auditOpinion"></ai-info-item>
-            <!--            <ai-info-item label="积分规则类别" v-if="info.auditStatus === '1'" :value="dict.getLabel('atWillReportType', info.auditIntegralType)"></ai-info-item>-->
-            <!--            <ai-info-item label="积分规则事项" v-if="info.auditStatus === '1'" :value="info.auditRuleName"></ai-info-item>-->
+            <ai-info-item label="审核结果" :value="info.auditStatus === '1' ? '通过' : '拒绝'"></ai-info-item>
             <ai-info-item label="积分调整" isLine v-if="info.auditStatus === '1'"
                           :value="(info.auditIntegral >= 0 ? info.auditIntegral : info.auditIntegral) + '分'"></ai-info-item>
             <ai-info-item label="审核人" :value="info.auditUserName"></ai-info-item>
             <ai-info-item label="审核时间" :value="info.auditTime"></ai-info-item>
+            <ai-info-item label="审核意见" v-if="info.auditStatus === '2'" isLine :value="info.auditOpinion"></ai-info-item>
+            <!-- <ai-info-item label="积分规则类别" v-if="info.auditStatus === '1'" :value="dict.getLabel('atWillReportType', info.auditIntegralType)"></ai-info-item> -->
+            <!-- <ai-info-item label="积分规则事项" v-if="info.auditStatus === '1'" :value="info.auditRuleName"></ai-info-item> -->
           </ai-wrapper>
         </div>
       </ai-card>
@@ -42,49 +43,71 @@
           title="事件审核"
           @onConfirm="onConfirm">
         <el-form class="ai-form" label-width="120px" :model="form" ref="form">
+
           <el-form-item label="是否通过审核" prop="pass" style="width: 100%;" :rules="[{ required: true, message: '请选择是否通过审核' }]">
             <el-radio-group v-model="form.pass" @change="onStatusChange">
               <el-radio label="0">否</el-radio>
               <el-radio label="1">是</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item v-if="form.pass === '1'" label="积分调整" prop="auditIntegral" style="width: 100%;" :rules="[{ required: true, message: '请输入积分调整' }]">
-            <el-input v-model.number="form.auditIntegral" clearable placeholder="请输入积分调整" @keyup.native="form.auditIntegral=Math.abs(form.auditIntegral)"/>
+
+          <el-form-item label="积分分值" prop="pass" style="width: 100%;" :rules="[{ required: true, message: '请输入积分分值' }]">
+            <el-input v-model="num" placeholder="请输入1-10的整数"></el-input>
           </el-form-item>
-          <!--          <el-form-item v-if="form.pass === '1'" label="积分规则类别" prop="auditRuleId" style="width: 100%;" :rules="[{ required: true, message: '' }]">-->
-          <!--            <div class="flex-warpper">-->
-          <!--               <el-form-item  label-width="0" prop="auditIntegralType" :rules="[{ required: true, message: '请选择积分规则类别' }]">-->
-          <!--                <ai-select-->
-          <!--                  v-model="form.auditIntegralType"-->
-          <!--                  clearable-->
-          <!--                  style="width: 180px;"-->
-          <!--                  placeholder="请选择积分规则类别"-->
-          <!--                  :selectList="dict.getDict('atWillReportType')"-->
-          <!--                  @change="onChange">-->
-          <!--                </ai-select>-->
-          <!--               </el-form-item>-->
-          <!--               <el-form-item style="margin: 0 10px;" prop="auditRuleId" :rules="[{ required: true, message: '请选择积分规则事项' }]">-->
-          <!--                <ai-select-->
-          <!--                  v-model="form.auditRuleId"-->
-          <!--                  clearable-->
-          <!--                  style="width: 180px;"-->
-          <!--                  placeholder="请选择积分规则事项"-->
-          <!--                  :selectList="ruleList">-->
-          <!--                </ai-select>-->
-          <!--               </el-form-item>-->
-          <!--              <span>{{ integralText }}</span>-->
-          <!--            </div>-->
-          <!--          </el-form-item>-->
+
+          <el-form-item label="积分分值" prop="pass" style="width: 100%;" :rules="[{ required: true, message: '请输入积分分值' }]">
+            <el-input v-model="num" placeholder="请输入1-10的整数"></el-input>
+          </el-form-item>
+
+          <el-form-item label="加分项" prop="pass" style="width: 100%;" :rules="[{ required: true, message: '请选择加分项' }]">
+            <!-- <ai-select v-model="form.integralCalcType" :selectList="dict.getDict('integralCalcType')"/> -->
+          </el-form-item>
+
+          <el-form-item label="积分分值" prop="pass" style="width: 100%;" :rules="[{ required: true, message: '请输入积分分值' }]">
+            <el-input v-model="num" placeholder="请输入1-10的整数"></el-input>
+          </el-form-item>
+
+          <!-- <el-form-item v-if="form.pass === '1'" label="积分调整" prop="auditIntegral" style="width: 100%;" :rules="[{ required: true, message: '请输入积分调整' }]">
+            <el-input v-model.number="form.auditIntegral" clearable placeholder="请输入积分调整" @keyup.native="form.auditIntegral=Math.abs(form.auditIntegral)"/>
+          </el-form-item> -->
+
+          <!-- <el-form-item v-if="form.pass === '1'" label="积分规则类别" prop="auditRuleId" style="width: 100%;" :rules="[{ required: true, message: '' }]">
+            <div class="flex-warpper">
+              <el-form-item  label-width="0" prop="auditIntegralType" :rules="[{ required: true, message: '请选择积分规则类别' }]">
+                <ai-select
+                  v-model="form.auditIntegralType" clearable
+                  style="width: 180px;"
+                  placeholder="请选择积分规则类别"
+                  :selectList="dict.getDict('atWillReportType')"
+                  @change="onChange">
+                </ai-select>
+              </el-form-item>
+              <el-form-item style="margin: 0 10px;" prop="auditRuleId" :rules="[{ required: true, message: '请选择积分规则事项' }]">
+                <ai-select
+                  v-model="form.auditRuleId"
+                  clearable
+                  style="width: 180px;"
+                  placeholder="请选择积分规则事项"
+                  :selectList="ruleList">
+                </ai-select>
+              </el-form-item>
+              <span>{{ integralText }}</span>
+            </div>
+          </el-form-item> -->
+
           <el-form-item label="审核意见" v-if="form.pass === '0'" prop="opinion" style="width: 100%;" :rules="[{ required: true, message: '请输入审核意见' }]">
             <el-input type="textarea" :rows="5" :maxlength="200" v-model="form.opinion" clearable placeholder="请输入审核意见" show-word-limit></el-input>
           </el-form-item>
+
         </el-form>
       </ai-dialog>
     </template>
+
     <template #footer v-if="info.auditStatus === '0'">
       <el-button @click="cancel">取消</el-button>
       <el-button type="primary" @click="isShow = true">审核</el-button>
     </template>
+
   </ai-detail>
 </template>
 
@@ -114,7 +137,7 @@ export default {
         auditStatus: '0'
       },
       id: '',
-      isShow: false,
+      isShow: true,
       form: {
         auditIntegralType: '',
         auditRuleId: '',
diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/List.vue b/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
index c20e9e4e..6cfb0703 100644
--- a/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
+++ b/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
@@ -15,13 +15,13 @@
       <div class="content">
         <ai-search-bar>
           <template #left>
-            <ai-select
+            <!-- <ai-select
               v-model="search.applyIntegralType"
               clearable
               placeholder="请选择积分类型"
               :selectList="dict.getDict('atWillReportType')"
               @change="search.current = 1, getList()">
-            </ai-select>
+            </ai-select> -->
             <ai-select
               v-model="search.auditStatus"
               clearable
@@ -50,7 +50,7 @@
             <el-input
               v-model="search.residentName"
               size="small"
-              placeholder="请输入姓名"
+              placeholder="请输入姓名/事件类型"
               clearable
               v-throttle="() => {search.current = 1, getList()}"
               @clear="search.current = 1, search.residentName = '', getList()"

From 25b4572ec8930ecb4c9b10097ea61fcfe8f793c2 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 20 Jun 2022 16:59:20 +0800
Subject: [PATCH 24/68] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/AppScoreRules/AppScoreRules.vue      | 183 ++++++++++++++----
 1 file changed, 147 insertions(+), 36 deletions(-)

diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
index 6f3088f7..aab80f9a 100644
--- a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
+++ b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
@@ -6,6 +6,7 @@
       </template>
       <template slot="content">
         <ai-search-bar bottomBorder>
+
           <template slot="left">
             <el-cascader size="small" v-model="search.eventType" placeholder="请选择事件/类型" clearable
                          :props="{...etOps,checkStrictly:true}" @change="handleTypeSearch" ref="eventTypeSearch"/>
@@ -16,14 +17,20 @@
                 :selectList="dict.getDict('integralRuleStatus')">
             </ai-select>
           </template>
+
           <template slot="right">
           </template>
+
         </ai-search-bar>
+
         <ai-search-bar style="margin-top: 16px;">
+
           <template #left>
             <el-button type="primary" icon="iconfont iconAdd" @click="dialog=true">添加</el-button>
           </template>
+
         </ai-search-bar>
+
         <ai-table
             :tableData="tableData"
             :col-configs="colConfigs"
@@ -53,55 +60,103 @@
             </template>
           </el-table-column>
         </ai-table>
+
       </template>
     </ai-list>
+
     <ai-empty v-else>暂无应用权限</ai-empty>
-    <ai-dialog :title="dialogTitle" :visible.sync="dialog" @onConfirm="onConfirm" @closed="form={ladderRule: []}" width="700px">
+
+    <ai-dialog :title="dialogTitle" :visible.sync="dialog" @onConfirm="onConfirm" @closed="form={ladderRule: []}" width="800px">
       <div class="form_div">
         <el-form ref="DialogForm" :model="form" :rules="formRules" size="small" label-suffix="：" label-width="100px">
-          <el-form-item label="事件/类型" prop="eventType">
+          <!-- <el-form-item label="事件/类型" prop="eventType">
             <el-cascader v-model="form.eventType" :props="etOps" clearable placeholder="请选择" @change="handleTypeForm"
                          :options="cacheOps"/>
+          </el-form-item> -->
+          <el-form-item label="事件名称" prop="eventType">
+            <el-input v-model="form.name" clearable placeholder="请输入事件名称" type="text" maxlength="30" show-word-limit/>
           </el-form-item>
-          <el-form-item label="规则" prop="ruleType" v-if="form.ruleType>-1" required>
-            <el-row type="flex" justify="space-between">
-              <div v-text="dict.getLabel('integralRuleRuleType',form.ruleType)"/>
-              <el-button v-if="form.ruleType==1" type="text" icon="iconfont iconAdd"
-                         @click="form.ladderRule.push({viewCount:null,integral:null})">添加
-              </el-button>
-            </el-row>
-            <el-table v-if="form.ruleType==1" :data="form.ladderRule" size="mini" border stripe>
-              <el-table-column label="查看人数(人)" align="center">
-                <template slot-scope="{row}">
-                  <el-input class="tableInput" v-model.number="row.viewCount" clearable placeholder="请输入"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="获得积分(分)" align="center">
-                <template slot-scope="{row}">
-                  <el-input class="tableInput" v-model="row.integral" clearable placeholder="请输入" type="number"
-                            @keyup.native="row.integral=checkIntegral(row.integral)"/>
-                </template>
-              </el-table-column>
-              <el-table-column label="操作" align="center">
-                <template slot-scope="{row,$index}">
-                  <el-button type="text" @click="handleDelete($index)">删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
+          <el-form-item label="简介说明" prop="eventType">
+            <el-input v-model="form.name" clearable placeholder="请输入简介说明" type="text" maxlength="100" show-word-limit/>
+          </el-form-item>
+
+          <el-form-item label="规则" prop="ruleType" required>
+            <el-radio-group v-model="form.pass" @change="typeChange">
+              <el-radio label="0">常规</el-radio>
+              <el-radio label="1">区间</el-radio>
+              <el-radio label="2">阶梯</el-radio>
+            </el-radio-group>
           </el-form-item>
           <el-form-item label="周期范围" prop="scoringCycle">
             <ai-select v-model="form.scoringCycle" :selectList="dict.getDict('integralRuleScoringCycle')"/>
           </el-form-item>
-          <template v-if="form.ruleType==0">
-            <el-form-item label="奖励次数" prop="numberLimit">
-              <el-input placeholder="请输入,周期范围内,不填写表示不限制" v-model.number="form.numberLimit" clearable/>
-            </el-form-item>
-            <el-form-item label="积分分值" prop="integral">
-              <el-input placeholder="请输入" v-model="form.integral" clearable/>
-            </el-form-item>
-          </template>
+
+          <el-form-item label="奖励次数">
+            <el-input placeholder="请输入,周期范围内,不填写表示不限制" v-model.number="form.numberLimit" clearable/>
+          </el-form-item>
+
+          <el-form-item label="积分分值" prop="integral" v-if="form.pass == 0">
+            <el-input placeholder="请输入" v-model="form.integral" clearable/>
+          </el-form-item>
+
+          <el-form-item label="积分分值" prop="integral" v-if="form.pass == 1">
+            <div class="flex">
+              <div class="from">
+                <el-input
+                  ref="input_from"
+                  v-model="integralFrom"
+                  placeholder="最小值"
+                  @input="handleInputFrom"
+                ></el-input>
+              </div>
+              <div class="center">
+                <span>至</span>
+              </div>
+              <div class="to">
+                <el-input
+                  ref="input_to"
+                  v-model="integralTo"
+                  placeholder="最大值"
+                  @input="handleInputTo"
+                ></el-input>
+              </div>
+            </div>
+          </el-form-item>
+          
+          <el-form-item label="积分分值" prop="integral" v-if="form.pass == 2">
+            <el-button type="text" @click="innerVisible  = true" style="float: right;">添加</el-button>
+            <ai-table :tableData="integralData" :isShowPagination="false" :col-configs="integralConfigs" :dict="dict">
+                     <!--  @selection-change="v=>ids=v.filter(e=>e.sysUserId).map(e=>e.sysUserId)" -->
+              <el-table-column slot="options" align="center" label="操作" fixed="right" width="160px">
+                <el-row type="flex" justify="center" align="middle" slot-scope="{row}">
+                  <el-button v-if="$permissions('admin_sysuser_distribute')&&!!row.sysUserId"
+                            type="text" @click="appAllot(row)">删除
+                  </el-button>
+                </el-row>
+              </el-table-column>
+            </ai-table>
+          </el-form-item>
+
+          <el-dialog width="30%" title="添加积分分值" :visible.sync="innerVisible" append-to-body>
+            <el-form ref="DialogForm" :model="forms" :rules="formRules" size="small" label-suffix="：" label-width="100px">
+              <el-form-item label="加分项" prop="integral">
+                <el-input placeholder="请输入" v-model="form.integral" clearable/>
+              </el-form-item>
+              <el-form-item label="获得积分" prop="integral">
+                <el-input placeholder="请输入" v-model="form.integral" clearable/>
+              </el-form-item>
+            </el-form>
+
+            <div slot="footer" class="dialog-footer">
+              <el-button @click="innerVisible = false">取 消</el-button>
+              <el-button type="primary" @click="innerVisible = false">提交</el-button>
+            </div>
+          </el-dialog>
         </el-form>
       </div>
+
+      
+
     </ai-dialog>
   </section>
 </template>
@@ -152,6 +207,11 @@ export default {
         {prop: "status", label: "状态", align: "center", width: 96, dict: "integralRuleStatus"},
         {slot: "options", label: "操作", align: "center"},
       ],
+      integralConfigs: [
+        {prop: "event", label: "加分项", dict: "integralRuleEvent"},
+        {prop: "event", label: "获得积分", dict: "integralRuleEvent"},
+        {slot: "options", label: "操作", align: "center"},
+      ],
       tableData: [],
       dialog: false,
       form: {ladderRule: []},
@@ -161,7 +221,12 @@ export default {
         integral: [{required: true, pattern: /^\d*[.\d]\d?$/, message: "请输入积分分值,最多保留一位小数"}],
         numberLimit: [{pattern: /^\d*$/, message: "请输入正整数"}]
       },
-      cacheOps: []
+      cacheOps: [],
+      integralFrom: '',
+      integralTo: '',
+      integralData: [],
+      innerVisible: false,
+      forms: {},
     };
   },
   created() {
@@ -198,6 +263,19 @@ export default {
         })
       })
     },
+
+    typeChange() {
+      this.form.integral = ''
+    },
+
+    handleInputFrom(event) {
+      this.$emit('focusfrom', event)
+    },
+
+    handleInputTo(event) {
+      this.$emit('blurto', event)
+    },
+
     remove(id) {
       this.$confirm("删除后不可恢复，是否要删除该事项？", {
         type: 'error'
@@ -299,5 +377,38 @@ export default {
       }
     }
   }
+
+
+  ::v-deep .el-input--mini .el-input__inner {
+    border: 0px;
+    margin: 0;
+    padding: 0 15px;
+    background-color: transparent;
+  }
+  .input-number-range {
+    background-color: #fff;
+    border: 1px solid #dcdfe6;
+    border-radius: 4px;
+  }
+
+  .flex {
+    display: flex;
+    flex-direction: row;
+    width: 100%;
+    // justify-content: space-between;
+    align-items: center;
+
+    .center {
+      margin: 0 20px;
+      margin-top: 1px;
+    }
+  }
+  .is-disabled {
+    background-color: #eef0f6;
+    border-color: #e4e7ed;
+    color: #c0c4cc;
+    cursor: not-allowed;
+  }
+
 }
 </style>

From 7db8828e0b272679fc326e6526c82ce359fdad41 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 20 Jun 2022 17:44:13 +0800
Subject: [PATCH 25/68] =?UTF-8?q?=E7=A7=AF=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue | 2 +-
 project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue         | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue b/project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue
index 8c2a5991..59e99e85 100644
--- a/project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue
+++ b/project/sanjianxi/apps/AppPartyScoreFlow/AppPartyScoreFlow.vue
@@ -10,7 +10,7 @@ import PsfList from "./psfList";
 export default {
   name: "AppPartyScoreFlow",
   components: {PsfList},
-  label: "党员积分明细(三涧溪)",
+  label: "积分明细(三涧溪)",
   props: {
     instance: Function,
     dict: Object,
diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
index aab80f9a..84ce589a 100644
--- a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
+++ b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
@@ -126,7 +126,6 @@
           <el-form-item label="积分分值" prop="integral" v-if="form.pass == 2">
             <el-button type="text" @click="innerVisible  = true" style="float: right;">添加</el-button>
             <ai-table :tableData="integralData" :isShowPagination="false" :col-configs="integralConfigs" :dict="dict">
-                     <!--  @selection-change="v=>ids=v.filter(e=>e.sysUserId).map(e=>e.sysUserId)" -->
               <el-table-column slot="options" align="center" label="操作" fixed="right" width="160px">
                 <el-row type="flex" justify="center" align="middle" slot-scope="{row}">
                   <el-button v-if="$permissions('admin_sysuser_distribute')&&!!row.sysUserId"

From d3aa3eef945291501f01ed0efc9661ebf4da7a83 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 20 Jun 2022 18:31:30 +0800
Subject: [PATCH 26/68] =?UTF-8?q?=E4=BD=8E=E4=BB=A3=E7=A0=81=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms/apps/develop/AppAiCode/AppAiCode.vue  |   36 +
 project/oms/apps/develop/AppAiCode/acAdd.vue  |  149 +++
 project/oms/apps/develop/AppAiCode/acList.vue |   87 ++
 .../oms/apps/develop/AppAiCode/config.json    |  274 +++++
 .../apps/develop/AppAiCode/detailLayout.vue   | 1074 +++++++++++++++++
 5 files changed, 1620 insertions(+)
 create mode 100644 project/oms/apps/develop/AppAiCode/AppAiCode.vue
 create mode 100644 project/oms/apps/develop/AppAiCode/acAdd.vue
 create mode 100644 project/oms/apps/develop/AppAiCode/acList.vue
 create mode 100644 project/oms/apps/develop/AppAiCode/config.json
 create mode 100644 project/oms/apps/develop/AppAiCode/detailLayout.vue

diff --git a/project/oms/apps/develop/AppAiCode/AppAiCode.vue b/project/oms/apps/develop/AppAiCode/AppAiCode.vue
new file mode 100644
index 00000000..5669c647
--- /dev/null
+++ b/project/oms/apps/develop/AppAiCode/AppAiCode.vue
@@ -0,0 +1,36 @@
+<template>
+  <section class="AppAiCode">
+    <component :is="currentPage" v-bind="$props"/>
+  </section>
+</template>
+
+<script>
+import AcList from "./acList";
+import AcAdd from "./acAdd";
+
+export default {
+  name: "AppAiCode",
+  components: {AcAdd, AcList},
+  label: "低代码生成平台",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentPage() {
+      let {hash} = this.$route
+      return hash == "#add" ? AcAdd : AcList
+    }
+  },
+  created() {
+    this.dict.load("detailType")
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppAiCode {
+  height: 100%;
+}
+</style>
diff --git a/project/oms/apps/develop/AppAiCode/acAdd.vue b/project/oms/apps/develop/AppAiCode/acAdd.vue
new file mode 100644
index 00000000..fd04cac0
--- /dev/null
+++ b/project/oms/apps/develop/AppAiCode/acAdd.vue
@@ -0,0 +1,149 @@
+<template>
+  <section class="acAdd">
+    <ai-detail list>
+      <ai-title slot="title" :title="pageTitle"/>
+      <template #content>
+        <el-form ref="AcForm" :model="form" size="small" label-width="120px" :rules="rules">
+          <el-tabs tab-position="left">
+            <el-tab-pane label="基本信息" lazy>
+              <ai-card title="基本信息">
+                <template #content>
+                  <el-row type="flex">
+                    <div class="fill">
+                      <el-form-item label="应用名称" prop="name">
+                        <el-input v-model="form.name" clearable placeholder="请输入"/>
+                      </el-form-item>
+                      <el-form-item label="应用模块" prop="appName">
+                        <el-input v-model="form.appName" clearable placeholder="请输入"/>
+                      </el-form-item>
+                    </div>
+                    <div class="fill">
+                      <el-form-item label="核心码" prop="rightCode">
+                        <el-input v-model="form.rightCode" clearable placeholder="请输入"/>
+                      </el-form-item>
+                      <el-form-item label="详情方式" prop="detailType">
+                        <el-radio-group v-model="form.detailType">
+                          <el-radio v-for="op in dict.getDict('detailType')" :key="op.dictValue" :label="op.dictValue">{{ op.dictName }}</el-radio>
+                        </el-radio-group>
+                      </el-form-item>
+                    </div>
+                  </el-row>
+                  <el-form-item label="按钮配置" prop="btns">
+                    <el-checkbox-group v-model="form.btns">
+                      <el-checkbox label="insertEnable">添加</el-checkbox>
+                      <el-checkbox label="importEnable">导入</el-checkbox>
+                      <el-checkbox label="exportEnalbe">导出</el-checkbox>
+                      <el-checkbox label="editEnable">编辑</el-checkbox>
+                      <el-checkbox label="deleteEnable">删除</el-checkbox>
+                      <el-checkbox label="batchDelEnable">批量删除</el-checkbox>
+                    </el-checkbox-group>
+                  </el-form-item>
+                </template>
+              </ai-card>
+              <ai-card title="字段设置">
+                <template #right>
+                  <el-button type="text" @click="form.props.push({})">添加</el-button>
+                </template>
+                <template #content>
+                  <ai-table :tableData="form.props" :isShowPagination="false" :colConfigs="colConfigs">
+                    <el-table-column v-for="col in colConfigs" :key="col.slot" v-bind="col">
+                      <template slot-scope="{row}">
+                        <el-checkbox v-if="col.type=='checkBox'" v-model="row[col.slot]"/>
+                        <span v-else-if="col.type=='chbShow'" v-text="row[col.slot]==1?'√':''"/>
+                        <el-input v-else size="small" v-model="row[col.slot]" placeholder="请输入" clearable/>
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="操作" slot="options" align="center">
+                      <template slot-scope="{row,$index}">
+                        <el-button type="text" @click="form.props.splice($index,1)">删除</el-button>
+                      </template>
+                    </el-table-column>
+                  </ai-table>
+                </template>
+              </ai-card>
+            </el-tab-pane>
+            <el-tab-pane label="详情设计" lazy>
+              <detail-layout v-bind="$props" :form="form" v-model="form.props"/>
+            </el-tab-pane>
+          </el-tabs>
+        </el-form>
+      </template>
+      <template #footer>
+        <el-button @click="back">取消</el-button>
+        <el-button type="primary" @click="submit">提交</el-button>
+      </template>
+    </ai-detail>
+  </section>
+</template>
+
+<script>
+import DetailLayout from "./detailLayout";
+
+export default {
+  name: "acAdd",
+  components: {DetailLayout},
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    isEdit: v => !!v.$route.query.id,
+    pageTitle: v => v.isEdit ? "编辑应用" : "新增应用"
+  },
+  data() {
+    return {
+      form: {detailType: "0", props: [], btns: []},
+      rules: {
+        name: {required: true, message: "请输入应用名称"},
+        appName: {required: true, message: "请输入应用模块"},
+        btns: {required: true, message: '请输入按钮配置', trigger: 'change'}
+      },
+      colConfigs: [
+        {slot: 'prop', label: "字段"},
+        {slot: 'label', label: "名称"},
+        {slot: 'isSearch', label: "搜索字段", align: 'center', type: 'checkBox'},
+        {slot: 'isTable', label: "表格字段", align: 'center', type: 'checkBox'},
+        {slot: 'isDetail', label: "详情字段", align: 'center', type: 'chbShow'},
+      ]
+    }
+  },
+  methods: {
+    getDetail() {
+      let {id} = this.$route.query
+      id && this.instance.post("/node/aicode/detail", null, {
+        params: {id}
+      }).then(res => {
+        if (res?.data) {
+          this.form = res.data
+          this.form.props.map(e => ({...e, isDetail: !!e.groupName}))
+        }
+      })
+    },
+    back() {
+      this.$router.push({})
+    },
+    submit() {
+      this.$refs.AcForm.validate(v => {
+        if (v) {
+          this.instance.post("/node/aicode/addOrUpdate", this.form).then(res => {
+            if (res?.code == 0) {
+              this.$message.success("提交成功!")
+              this.back()
+            }
+          })
+        }
+      })
+    },
+  },
+  created() {
+    this.getDetail()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.acAdd {
+  height: 100%;
+}
+</style>
diff --git a/project/oms/apps/develop/AppAiCode/acList.vue b/project/oms/apps/develop/AppAiCode/acList.vue
new file mode 100644
index 00000000..892bf7e3
--- /dev/null
+++ b/project/oms/apps/develop/AppAiCode/acList.vue
@@ -0,0 +1,87 @@
+<template>
+  <section class="acList">
+    <ai-list>
+      <ai-title slot="title" title="低代码生成平台" isShowBottomBorder/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" icon="iconfont iconAdd" @click="handleAdd()">添加</el-button>
+          </template>
+          <template #right>
+            <el-input size="small" placeholder="搜索应用" v-model="search.name" clearable
+                      @change="page.current=1,getTableData()"/>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
+                  @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+          <el-table-column slot="options" label="操作" fixed="right" align="center" width="300">
+            <template slot-scope="{row}">
+              <el-button type="text" @click="handleAdd(row.id)">编辑</el-button>
+              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+              <el-button type="text" v-if="row.download&&row.target" @click="handleDownload(row)">下载</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "acList",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  data() {
+    return {
+      search: {name: ""},
+      page: {current: 1, size: 10, total: 0},
+      tableData: [],
+      colConfigs: [
+        {label: "应用名称", prop: "name", width: 200},
+        {label: "应用模块", prop: "appName"},
+        {label: "权限码", prop: "target"},
+        {label: "详情展示方式", prop: "detailType", dict: "detailType"},
+      ],
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/node/aicode/list", null, {
+        params: {...this.page, ...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+    handleAdd(id) {
+      this.$router.push({hash: "#add", query: {id}})
+    },
+    handleDelete(ids) {
+      this.$confirm("是否要删除该应用?").then(() => {
+        this.instance.post("/node/aicode/delete", null, {
+          params: {ids}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("删除成功")
+            this.getTableData()
+          }
+        })
+      }).catch(() => 0)
+    }
+  },
+  created() {
+    this.getTableData()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.acList {
+}
+</style>
diff --git a/project/oms/apps/develop/AppAiCode/config.json b/project/oms/apps/develop/AppAiCode/config.json
new file mode 100644
index 00000000..5fa7995a
--- /dev/null
+++ b/project/oms/apps/develop/AppAiCode/config.json
@@ -0,0 +1,274 @@
+{
+  "config": [
+    {
+      "type": "info",
+      "tips": "（不能重复添加同一元素）",
+      "label": "信息",
+      "children": [
+        {
+          "type": "name",
+          "fieldName": "姓名",
+          "fieldTips": "请输入姓名",
+          "fixedLabel": "姓名",
+          "disable": "0",
+          "grid": 0.5,
+          "defaultValue": "",
+          "icon": "icontext_box",
+          "mustFill": "1",
+          "maxLength": 20
+        },
+        {
+          "type": "idNumber",
+          "fieldName": "身份证号",
+          "fixedLabel": "身份证号",
+          "fieldTips": "请输入身份证号",
+          "defaultValue": "",
+          "icon": "icontext_area",
+          "mustFill": "1",
+          "maxLength": 20,
+          "disable": "0",
+          "grid": 0.5
+        },
+        {
+          "type": "phone",
+          "fieldName": "联系方式",
+          "fixedLabel": "联系方式",
+          "fieldTips": "请输入联系方式",
+          "defaultValue": "",
+          "icon": "icontext_area",
+          "mustFill": "1",
+          "maxLength": 20,
+          "disable": "0",
+          "grid": 0.5
+        },
+        {
+          "type": "area",
+          "fieldName": "地区",
+          "fixedLabel": "地区",
+          "fieldTips": "请选择地区",
+          "defaultValue": "",
+          "icon": "icontext_area",
+          "mustFill": "1",
+          "areaPattern": "",
+          "disable": "0",
+          "grid": 0.5
+        }
+      ]
+    },
+    {
+      "type": "options",
+      "tips": "（可重复添加）",
+      "label": "选项",
+      "children": [
+        {
+          "type": "radio",
+          "fieldName": "单选",
+          "fixedLabel": "单选",
+          "fieldTips": "请选择",
+          "grid": 0.5,
+          "icon": "iconradio",
+          "mustFill": "1",
+          "disable": "0",
+          "defaultValue": "",
+          "options": [
+            {
+              "label": "选项1",
+              "value": ""
+            },
+            {
+              "label": "选项2",
+              "value": ""
+            }
+          ],
+          "title": ""
+        },
+        {
+          "type": "checkbox",
+          "fieldName": "多选",
+          "fixedLabel": "多选",
+          "fieldTips": "请选择",
+          "icon": "iconcheck_box",
+          "mustFill": "1",
+          "grid": 0.5,
+          "disable": "0",
+          "defaultValue": [],
+          "options": [
+            {
+              "label": "选项1",
+              "value": ""
+            },
+            {
+              "label": "选项2",
+              "value": ""
+            }
+          ],
+          "title": ""
+        },
+        {
+          "type": "select",
+          "fieldName": "单下拉框",
+          "fixedLabel": "单下拉框",
+          "grid": 0.5,
+          "fieldTips": "请选择",
+          "icon": "iconSelect",
+          "mustFill": "1",
+          "defaultValue": "",
+          "disable": "0",
+          "options": [
+            {
+              "label": "选项1",
+              "value": ""
+            },
+            {
+              "label": "选项2",
+              "value": ""
+            }
+          ],
+          "title": ""
+        },
+        {
+          "type": "onOff",
+          "fieldName": "开关",
+          "fixedLabel": "开关",
+          "grid": 0.5,
+          "fieldTips": "请选择开关",
+          "icon": "iconSelect",
+          "mustFill": "1",
+          "defaultValue": "0",
+          "disable": "0",
+          "title": ""
+        },
+        {
+          "type": "date",
+          "fieldName": "日期",
+          "fixedLabel": "日期",
+          "grid": 0.5,
+          "datetimePattern": "yyyy-MM-dd",
+          "fieldTips": "请选择日期",
+          "icon": "iconSelect",
+          "mustFill": "1",
+          "disable": "0",
+          "title": ""
+        },
+        {
+          "type": "time",
+          "fieldName": "时间",
+          "fixedLabel": "时间",
+          "grid": 0.5,
+          "datetimePattern": "HH:mm:ss",
+          "fieldTips": "请选择时间",
+          "icon": "iconSelect",
+          "mustFill": "1",
+          "disable": "0",
+          "title": ""
+        },
+        {
+          "type": "datetime",
+          "fieldName": "日期时间",
+          "fixedLabel": "日期时间",
+          "grid": 0.5,
+          "datetimePattern": "yyyy-MM-dd HH:mm:ss",
+          "fieldTips": "请选择日期时间",
+          "icon": "iconSelect",
+          "mustFill": "1",
+          "disable": "0",
+          "title": ""
+        }
+      ]
+    },
+    {
+      "type": "input",
+      "tips": "（可重复添加）",
+      "label": "填空",
+      "children": [
+        {
+          "type": "input",
+          "fieldName": "单行填空",
+          "fieldTips": "请输入",
+          "fixedLabel": "单行填空",
+          "disable": "0",
+          "grid": 0.5,
+          "defaultValue": "",
+          "icon": "icontext_box",
+          "mustFill": "1",
+          "maxLength": 50
+        },
+        {
+          "type": "textarea",
+          "fieldName": "多行填空",
+          "fixedLabel": "多行填空",
+          "fieldTips": "请输入",
+          "lineNumber": 4,
+          "defaultValue": "",
+          "icon": "icontext_area",
+          "mustFill": "1",
+          "maxLength": 500,
+          "disable": "0",
+          "grid": 1
+        },
+        {
+          "type": "number",
+          "fieldName": "数字输入",
+          "fixedLabel": "数字输入",
+          "fieldTips": "请输入数字",
+          "defaultValue": "",
+          "icon": "icontext_area",
+          "mustFill": "1",
+          "maxValue": 10000,
+          "decimalPlaces": 0,
+          "minValue": 0,
+          "maxLength": 500,
+          "disable": "0",
+          "grid": 0.5
+        },
+        {
+          "type": "rtf",
+          "fieldName": "富文本",
+          "fixedLabel": "富文本",
+          "fieldTips": "请输入",
+          "defaultValue": "",
+          "icon": "icontext_area",
+          "mustFill": "1",
+          "maxLength": 5000,
+          "disable": "0",
+          "grid": 1
+        }
+      ]
+    },
+    {
+      "type": "annex",
+      "tips": "（可重复添加）",
+      "label": "附件",
+      "children": [
+        {
+          "type": "upload",
+          "fieldTips": "请上传",
+          "fieldName": "上传附件",
+          "fixedLabel": "上传附件",
+          "disable": "0",
+          "fileChoseSize": 10,
+          "fileMaxCount": 9,
+          "defaultValue": "",
+          "icon": "iconpic",
+          "mustFill": "1",
+          "grid": 1
+        }
+      ]
+    },
+    {
+      "type": "layout",
+      "tips": "（可重复添加）",
+      "label": "分组",
+      "children": [
+        {
+          "type": "group",
+          "fieldName": "卡片",
+          "fixedLabel": "卡片",
+          "icon": "iconpic",
+          "groupName": "分组标题",
+          "column": []
+        }
+      ]
+    }
+  ]
+}
diff --git a/project/oms/apps/develop/AppAiCode/detailLayout.vue b/project/oms/apps/develop/AppAiCode/detailLayout.vue
new file mode 100644
index 00000000..82be0e9d
--- /dev/null
+++ b/project/oms/apps/develop/AppAiCode/detailLayout.vue
@@ -0,0 +1,1074 @@
+<template>
+  <div class="detailLayout">
+    <el-scrollbar class="left">
+      <div class="left-item" v-for="(component, index) in components" :key="index">
+        <div class="left-item__title">
+          <h2>{{ component.label }}</h2>
+          <span>{{ component.tips }}</span>
+        </div>
+        <div class="left-item__list">
+          <draggable
+              class="components-draggable"
+              :list="component.children"
+              :group="{ name: 'componentsGroup', pull: 'clone', put: false }"
+              :sort="false"
+              :move="onMove"
+              :clone="cloneComponent"
+              @end="onEnd">
+            <div class="left-item__item" v-for="(item, i) in component.children" :key="i" @click="clone(item)">
+              <i class="iconfont" :class="item.icon"></i>
+              <span>{{ item.fixedLabel }}</span>
+            </div>
+          </draggable>
+        </div>
+      </div>
+    </el-scrollbar>
+    <el-scrollbar class="middle">
+      <div class="middle-content">
+        <div class="middle-content__wrapper">
+          <el-form label-width="100px" label-position="right">
+            <draggable
+                class="middle-draggable"
+                style="height: 100%;"
+                :animation="340"
+                scroll
+                v-model="targetList"
+                element="div"
+                @end="onElEnd"
+                :sort="true">
+              <ai-card
+                  :class="[groupIndex === j && isGroup ? 'active' : '']"
+                  :data-index="j"
+                  @click.native.stop="groupIndex = j, activeIndex = -1, isGroup = true"
+                  :title="group.groupName" v-for="(group, j) in targetList"
+                  :key="j">
+                <template #content>
+                  <draggable
+                      class="ai-form"
+                      style="height: 100%;"
+                      v-model="group.column"
+                      :animation="340"
+                      scroll
+                      @end="onElEnd"
+                      element="div"
+                      filter=".components-filter"
+                      draggable=".components-item"
+                      group="componentsGroup"
+                      :sort="true">
+                    <div
+                        class="components-item"
+                        v-for="(item, i) in group.column"
+                        :style="{width: item.grid * 100 + '%'}"
+                        :class="{
+                        'components-filter': item.isInit,
+                        'active': groupIndex === j && activeIndex === i
+                      }"
+                        @click.stop="groupIndex = j, activeIndex = i, isGroup = false"
+                        :key="i">
+                      <div class="left-item__item--remove" title="删除字段" v-show="!item.isInit && groupIndex === j && activeIndex === i"
+                           @click.stop="removeItem(j, i)">
+                        <i class="iconfont iconDelete"></i>
+                        <span>删除字段</span>
+                      </div>
+                      <el-form-item style="width: 100%;" :label="item.fieldName" :rules="[{ required: item.mustFill === '1' }]">
+                        <template v-if="(item.type === 'textarea')">
+                          <el-input :disabled="item.disable === '1'" :rows="item.lineNumber" size="small" type="textarea" :placeholder="item.fieldTips"
+                                    v-model="item.defaultValue"></el-input>
+                        </template>
+                        <template v-if="(item.type === 'resident')">
+                          <el-input :disabled="item.disable === '1'" size="small" placeholder="请选择人员" v-model="item.defaultValue">
+                            <template slot="append">选择人员</template>
+                          </el-input>
+                        </template>
+                        <template v-if="(item.type === 'gird')">
+                          <el-input :disabled="item.disable === '1'" size="small" placeholder="请选择网格" v-model="item.defaultValue">
+                            <template slot="append">选择网格</template>
+                          </el-input>
+                        </template>
+                        <template v-if="item.type === 'radio'">
+                          <el-radio-group v-model="item.defaultValue" :disabled="item.disable === '1'">
+                            <el-radio :label="field.label" v-for="(field, index) in item.options" :key="index">{{ field.label }}</el-radio>
+                          </el-radio-group>
+                        </template>
+                        <template v-if="item.type === 'number'">
+                          <el-input-number v-model="item.defaultValue" :placeholder="item.fieldTips"></el-input-number>
+                        </template>
+                        <template v-if="item.type === 'rtf'">
+                          <ai-editor v-model="item.defaultValue" :placeholder="item.fieldTips" :instance="instance"/>
+                        </template>
+                        <template v-if="item.type === 'time'">
+                          <el-date-picker
+                              v-model="item.defaultValue"
+                              size="small"
+                              :placeholder="item.fieldTips">
+                          </el-date-picker>
+                        </template>
+                        <template v-if="item.type === 'date'">
+                          <el-date-picker
+                              v-model="item.defaultValue"
+                              size="small"
+                              :placeholder="item.fieldTips">
+                          </el-date-picker>
+                        </template>
+                        <template v-if="item.type === 'datetime'">
+                          <el-date-picker
+                              v-model="item.defaultValue"
+                              size="small"
+                              :placeholder="item.fieldTips">
+                          </el-date-picker>
+                        </template>
+                        <template v-if="item.type === 'onOff'">
+                          <el-switch active-value="1" inactive-value="0" v-model="item.defaultValue"></el-switch>
+                        </template>
+                        <template v-if="['input', 'phone', 'name', 'idNumber'].includes(item.type)">
+                          <el-input :disabled="item.disable === '1'" :maxlength="Number(item.maxLength)" size="small" :placeholder="item.fieldTips"
+                                    v-model="item.defaultValue"></el-input>
+                        </template>
+                        <template v-if="item.type === 'area'">
+                          <ai-area-get
+                              :instance="instance"
+                              always-show/>
+                        </template>
+                        <template v-if="item.type === 'select'">
+                          <el-select :disabled="item.disable === '1'" style="width: 100%;" size="small" :placeholder="item.fieldTips"
+                                     v-model="item.defaultValue">
+                            <el-option
+                                v-for="(filed, index) in item.options"
+                                :key="index"
+                                :label="filed.label"
+                                :value="filed.label">
+                            </el-option>
+                          </el-select>
+                        </template>
+                        <template v-if="item.type === 'checkbox'">
+                          <el-checkbox-group v-model="item.defaultValue" :disabled="item.disable === '1'">
+                            <el-checkbox :label="field.label" v-for="(field, index) in item.options" :key="index">{{ field.label }}</el-checkbox>
+                          </el-checkbox-group>
+                        </template>
+                        <template v-if="item.type === 'upload'">
+                          <div class="left-item__item--upload">
+                            <i class="iconfont iconAdd"></i>
+                            <span>添加附件</span>
+                          </div>
+                        </template>
+                      </el-form-item>
+                    </div>
+                  </draggable>
+                </template>
+              </ai-card>
+            </draggable>
+          </el-form>
+        </div>
+      </div>
+    </el-scrollbar>
+    <el-scrollbar class="right">
+      <div class="right-item" v-if="isGroup">
+        <div class="right-item__title no-solid">
+          <h2>分组名称</h2>
+        </div>
+        <div class="right-item__content">
+          <el-input placeholder="请输入分组名称" :maxlength="32" show-word-limit v-model="currTarget.groupName"></el-input>
+        </div>
+      </div>
+      <div class="layout-right__del" @click="removeGroup" v-if="isGroup && targetList.length > 1 && !currTarget.isInit">
+        <span>删除分组</span>
+      </div>
+      <template v-if="activeIndex > -1">
+        <div class="right-item">
+          <div class="right-item__title no-solid">
+            <h2>绑定字段</h2>
+          </div>
+          <div class="right-item__content">
+            <ai-select v-model="currTarget.prop" :selectList="propOps"/>
+          </div>
+        </div>
+      </template>
+
+      <div class="right-item" v-if="['select', 'date', 'time', 'input', 'datetime', 'textarea', 'rtf'].includes(currTarget.type)">
+        <div class="right-item__title no-solid">
+          <h2>占位符</h2>
+        </div>
+        <div class="right-item__content">
+          <el-input placeholder="请输入占位符" :maxlength="32" show-word-limit v-model="currTarget.fieldTips"></el-input>
+        </div>
+      </div>
+      <div class="right-item right-item__select" v-if="['select', 'checkbox', 'radio'].includes(currTarget.type)">
+
+        <div class="right-item__title no-solid">
+          <h2>选项设置</h2>
+        </div>
+        <div class="right-item__select--wrapper">
+          <draggable
+              v-model="currTarget.options"
+              :animation="340"
+              group="select"
+              handle=".mover"
+              :sort="true">
+            <div class="select-item" v-for="(item, index) in currTarget.options" :key="index">
+              <i class="iconfont iconjdq_led_show mover"></i>
+              <el-input placeholder="请输入选项名" :maxlength="30" show-word-limit v-model="item.label"></el-input>
+              <i class="iconfont iconDelete" @click="removeOptions(index)"></i>
+            </div>
+          </draggable>
+        </div>
+        <el-button type="text" class="add-select" @click="addOptions">添加选项</el-button>
+      </div>
+      <div class="right-item__group" v-if="activeIndex > -1" key="radio">
+        <div class="right-item" v-if="['select', 'radio'].includes(currTarget.type)">
+          <div class="right-item__title">
+            <h2>默认值</h2>
+          </div>
+          <div class="right-item__content">
+            <el-select placeholder="请选择默认值" style="width: 100%;" clearable v-model="currTarget.defaultValue">
+              <el-option
+                  v-for="(filed, index) in currTarget.options"
+                  :key="index"
+                  :label="filed.label"
+                  :value="filed.label">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="right-item" v-if="['checkbox'].includes(currTarget.type)" key="checkbox">
+          <div class="right-item__title">
+            <h2>默认值</h2>
+          </div>
+          <div class="right-item__content">
+            <el-select placeholder="请选择默认值" style="width: 100%;" clearable collapse-tags :multiple="true" v-model="currTarget.defaultValue">
+              <el-option
+                  v-for="(filed, index) in currTarget.options"
+                  :key="index"
+                  :label="filed.label"
+                  :value="filed.label">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+        <div class="right-item__group">
+          <div class="right-item" v-if="['onOff'].includes(currTarget.type)">
+            <div class="right-item__title">
+              <h2>默认值</h2>
+            </div>
+            <div class="right-item__content">
+              <el-switch v-model="currTarget.defaultValue" active-value="1" inactive-value="0" active-text="是" inactive-text="否"></el-switch>
+            </div>
+          </div>
+        </div>
+        <div class="right-item__group">
+          <div class="right-item" v-if="['number'].includes(currTarget.type)">
+            <div class="right-item__title">
+              <h2>默认值</h2>
+            </div>
+            <div class="right-item__content">
+              <el-input-number style="width: 100%;" v-model="currTarget.defaultValue" label="默认值"></el-input-number>
+            </div>
+          </div>
+        </div>
+        <div class="right-item__group">
+          <div class="right-item" v-if="['number'].includes(currTarget.type)">
+            <div class="right-item__title">
+              <h2>最大值</h2>
+            </div>
+            <div class="right-item__content">
+              <el-input-number style="width: 100%;" v-model="currTarget.maxValue" label="最大值"></el-input-number>
+            </div>
+          </div>
+        </div>
+        <div class="right-item__group">
+          <div class="right-item" v-if="['number'].includes(currTarget.type)">
+            <div class="right-item__title">
+              <h2>最小值</h2>
+            </div>
+            <div class="right-item__content">
+              <el-input-number style="width: 100%;" v-model="currTarget.minValue" label="最小值"></el-input-number>
+            </div>
+          </div>
+        </div>
+        <div class="right-item__group">
+          <div class="right-item" v-if="['number'].includes(currTarget.type)">
+            <div class="right-item__title">
+              <h2>小数精度</h2>
+            </div>
+            <div class="right-item__content">
+              <el-input-number style="width: 100%;" step-strictly :min="0" v-model="currTarget.decimalPlaces" label="小数精度"></el-input-number>
+            </div>
+          </div>
+        </div>
+        <div class="right-item" v-if="['input', 'textarea', 'phone'].includes(currTarget.type)">
+          <div class="right-item__title">
+            <h2>最多输入字符</h2>
+          </div>
+          <div class="right-item__content">
+            <el-input placeholder="字符个数" v-model="currTarget.maxLength">
+              <span slot="append">个</span>
+            </el-input>
+          </div>
+        </div>
+        <div class="right-item" v-if="['area'].includes(currTarget.type)">
+          <div class="right-item__title">
+            <h2>默认值</h2>
+          </div>
+          <div class="right-item__content">
+            <ai-area-get v-model="currTarget.defaultValue" :instance="instance" always-show></ai-area-get>
+          </div>
+        </div>
+        <div class="right-item" v-if="currTarget.type === 'upload'">
+          <div class="right-item__title">
+            <h2>文件大小（MB）</h2>
+          </div>
+          <div class="right-item__content">
+            <el-input-number style="width: 100%;" v-model="currTarget.fileChoseSize" :min="1" :max="40" label="文件大小"></el-input-number>
+          </div>
+        </div>
+        <div class="right-item" v-if="currTarget.type === 'upload'">
+          <div class="right-item__title">
+            <h2>最大上传数</h2>
+          </div>
+          <div class="right-item__content">
+            <el-input-number style="width: 100%;" step-strictly v-model="currTarget.fileMaxCount" :min="1" :max="20" label="最大上传数"></el-input-number>
+          </div>
+        </div>
+        <div class="right-item">
+          <div class="right-item__title">
+            <h2>是否整行显示</h2>
+            <el-switch v-model="currTarget.grid" :active-value="1" :inactive-value="0.5"></el-switch>
+          </div>
+        </div>
+        <div class="right-item" v-if="currTarget.type === 'textarea'">
+          <div class="right-item__title">
+            <h2>输入框行高</h2>
+          </div>
+          <div class="right-item__content">
+            <el-input-number style="width: 100%;" v-model="currTarget.lineNumber" :min="3" :max="10" label="输入框行高"></el-input-number>
+          </div>
+        </div>
+        <div class="right-item">
+          <div class="right-item__title no-solid">
+            <div class="right-item__title--left">
+              <h2>是否必填</h2>
+            </div>
+            <el-switch v-model="currTarget.mustFill" active-value="1" inactive-value="0"></el-switch>
+          </div>
+        </div>
+        <div class="right-item" v-if="currTarget.type !== 'rtf'">
+          <div class="right-item__title no-solid">
+            <div class="right-item__title--left">
+              <h2>是否禁用</h2>
+            </div>
+            <el-switch v-model="currTarget.disable" active-value="1" inactive-value="0"></el-switch>
+          </div>
+        </div>
+      </div>
+    </el-scrollbar>
+  </div>
+</template>
+
+<script>
+import draggable from 'vuedraggable'
+import options from './config'
+
+export default {
+  name: 'detailLayout',
+  model: {
+    prop: 'value',
+    event: 'change',
+  },
+  props: {
+    instance: Function,
+    dict: Object,
+    form: {default: () => ({})},
+    value: Array
+  },
+  components: {draggable},
+  data() {
+    let {config: components} = options
+    return {
+      isGroup: false,
+      components,
+      groupIndex: -1,
+      activeIndex: -1,
+      currTarget: {},
+      targetList: []
+    }
+  },
+  watch: {
+    activeIndex() {
+      if (this.activeIndex > -1 && this.groupIndex > -1 && !this.isGroup) {
+        const filed = this.targetList[this.groupIndex].column[this.activeIndex]
+        this.currTarget = filed
+        if (filed.type === 'checkbox' && !filed.defaultValue.length) {
+          setTimeout(() => {
+            this.$set(this.currTarget, 'defaultValue', [2])
+            this.$forceUpdate()
+            this.$set(this.currTarget, 'defaultValue', [])
+          }, 100)
+        }
+      } else if (this.groupIndex > -1 && this.isGroup) {
+        this.currTarget = this.targetList[this.groupIndex]
+      } else this.currTarget = {}
+    },
+    groupIndex() {
+      if (this.activeIndex > -1 && this.groupIndex > -1 && !this.isGroup) {
+        const filed = this.targetList[this.groupIndex].column[this.activeIndex]
+        this.currTarget = filed
+        this.$set(this.currTarget, 'defaultValue', filed.defaultValue)
+
+        if (filed.type === 'checkbox' && !filed.defaultValue.length) {
+          this.$nextTick(() => {
+            this.$set(this.currTarget, 'defaultValue', [])
+
+            this.$nextTick(() => {
+              this.$forceUpdate()
+            })
+          })
+        }
+      } else if (this.groupIndex > -1 && this.isGroup) {
+        this.currTarget = this.targetList[this.groupIndex]
+      } else this.currTarget = {}
+    }
+  },
+  computed: {
+    currComponentTitle() {
+      return '表单设置'
+    },
+    propOps: v => v.form.props?.map(e => ({dictValue: e.prop, dictName: e.label})),
+    detailProps: {
+      set(v) {
+        let props = [v.map((e, i) => e.column.map((item, index) => ({
+          ...e,
+          groupIndex: i,
+          groupName: e.groupName,
+          fieldDbName: item.isInit ? item.fieldDbName : (this.isUnique(item.type) ? item.type : `${item.type}${i}${index}`),
+          defaultValue: item.type === 'checkbox' && item.defaultValue ? item.defaultValue.join('`') : item.defaultValue,
+          selectValues: item.options ? item.options.map(o => o.label).join('`') : ''
+        })))].flat()
+        console.log(props)
+        this.$emit('change', props)
+      },
+      get() {
+        const init = {
+          type: 'group',
+          fieldName: '卡片',
+          fixedLabel: '卡片',
+          icon: 'iconpic',
+          groupName: '基础信息',
+          column: []
+        }
+        let arr = this.$copy(this.value),
+            groups = [...new Set(arr?.map(e => e.groupName))].filter(e => !!e)
+        this.targetList = groups?.length > 0 ? groups.map(groupName => ({
+          type: 'group',
+          fieldName: '卡片',
+          fixedLabel: '卡片',
+          icon: 'iconpic',
+          groupName,
+          column: arr.filter(e => e.groupName == groupName)
+        })) : [init]
+        return this.targetList
+      }
+    },
+  },
+  methods: {
+    removeItem(j, i) {
+      this.groupIndex = -1
+      this.activeIndex = -1
+      this.targetList[j].column.splice(i, 1)
+    },
+    removeGroup() {
+      if (this.targetList.length === 1) {
+        return this.$message.error('分组不能小于1')
+      }
+
+      this.targetList.splice(this.groupIndex, 1)
+      this.groupIndex = 0
+      this.isGroup = true
+      this.activeIndex = -1
+    },
+    isUnique(type) {
+      const list = this.components[0].children.map(v => v.type)
+      return list.indexOf(type) > -1
+    },
+    addOptions() {
+      const len = this.targetList[this.groupIndex].column[this.activeIndex].options.length
+      let label = `选项${len + 1}`
+
+      const index = this.targetList[this.groupIndex].column[this.activeIndex].options.findIndex(v => label === v.label)
+      if (index > -1) {
+        label = `新选项${len + 1}`
+      }
+
+      this.targetList[this.groupIndex].column[this.activeIndex].options.push({
+        label: label,
+        value: ''
+      })
+    },
+
+    removeOptions(index) {
+      const len = this.targetList[this.groupIndex].column[this.activeIndex].options.length
+
+      if (len === 2) {
+        return this.$message.error('选项不能少于2个')
+      }
+      this.targetList[this.groupIndex].column[this.activeIndex].options.splice(index, 1)
+    },
+
+    onEnd(e) {
+      const el = e.to.parentElement.parentElement
+      this.isGroup = false
+      this.activeIndex = e.newIndex
+      this.groupIndex = Number(el.getAttribute('data-index'))
+    },
+
+    onElEnd(e) {
+      if (this.isGroup) {
+        this.groupIndex = e.newIndex
+      } else {
+        this.activeIndex = e.newIndex
+      }
+    },
+
+    clone(e) {
+      if (e.type === 'group') {
+        this.targetList.push(JSON.parse(JSON.stringify(e)))
+
+        this.$nextTick(() => {
+          this.isGroup = true
+          this.groupIndex = this.targetList.length - 1
+          this.activeIndex = -1
+        })
+
+        return
+      }
+
+      const list = []
+      this.targetList.map(v => {
+        v.column.forEach(item => {
+          list.push(item.type)
+        })
+      })
+
+      if (list.indexOf(e.type) > -1 && ['name', 'idNumber', 'phone', 'area'].includes(e.type)) {
+        return this.$message.error('信息组件不能重复添加')
+      }
+
+      if (this.isGroup) {
+        this.targetList[this.groupIndex].column.push(JSON.parse(JSON.stringify(e)))
+      } else {
+        if (this.targetList[0]) this.targetList[0]?.column.push(JSON.parse(JSON.stringify(e)))
+        else return this.$message.error("请先添加分组!")
+      }
+
+      this.$nextTick(() => {
+        this.groupIndex = this.isGroup ? this.groupIndex : 0
+        this.activeIndex = this.targetList[0].column.length - 1
+      })
+    },
+
+    onMove(e) {
+      const el = e.draggedContext.element
+      if (el.type === 'group') {
+        return false
+      }
+      const list = []
+      this.targetList.map(v => {
+        v.column.forEach(item => {
+          list.push(item.type)
+        })
+      })
+      return !(list.indexOf(el.type) > -1 && ['name', 'idNumber', 'phone', 'area'].includes(el.type));
+    },
+
+    cloneComponent(e) {
+      if (e.type === 'group') {
+        this.targetList.push(JSON.parse(JSON.stringify(e)))
+
+        return
+      }
+      const list = []
+      this.targetList.map(v => {
+        v.column.forEach(item => {
+          list.push(item.type)
+        })
+      })
+
+      if (list.indexOf(e.type) > -1 && ['name', 'idNumber', 'phone', 'area'].includes(e.type)) {
+        this.$message.error('信息组件不能重复添加')
+      }
+
+
+      return JSON.parse(JSON.stringify(e))
+    }
+  },
+
+}
+</script>
+
+<style lang="scss" scoped>
+.layout-right__del {
+  position: absolute;
+  bottom: 100px;
+  left: 0;
+  z-index: 11;
+  width: 100%;
+  padding: 0 16px;
+
+  span {
+    display: block;
+    width: 100%;
+    height: 40px;
+    line-height: 40px;
+    text-align: center;
+    border-radius: 6px;
+    color: #F46;
+    cursor: pointer;
+    border: 1px solid #F46;
+
+    &:hover {
+      opacity: 0.7;
+    }
+  }
+}
+
+.detailLayout {
+  display: flex;
+
+  .ai-form .el-form-item {
+    margin-bottom: 0;
+  }
+
+  .right-item__maintitle {
+    height: 62px;
+    line-height: 62px;
+    margin-bottom: 20px;
+    border-bottom: 1px solid #EEEEEE;
+    color: #222222;
+
+    h2 {
+      font-size: 14px;
+    }
+  }
+
+  ::v-deep .ai-card {
+    cursor: move;
+
+    &.active {
+      background: #f6f7ff;
+    }
+  }
+
+  ::v-deep .ai-detail__content {
+    height: calc(100% - 52px) !important;
+    padding: 0 !important;
+    overflow: hidden !important;
+  }
+
+  .ai-dialog__success {
+    ::v-deep .ai-dialog__content {
+      max-height: initial !important;
+    }
+  }
+
+  .middle-draggable {
+    // display: flex;
+    // justify-content: space-between;
+    // flex-wrap: wrap;
+    .left-item__item {
+      width: 50%;
+      min-height: 73px;
+    }
+
+    .el-date-editor.el-input {
+      width: 100%;
+    }
+
+    & > span {
+      display: block;
+      width: 100%;
+      height: 100%;
+      min-height: 600px;
+      padding-bottom: 20px;
+    }
+
+    .components-item {
+      position: relative;
+      margin-bottom: 16px;
+      padding: 16px 16px;
+      cursor: move;
+
+      &::after {
+        position: absolute;
+        left: 0;
+        top: 0;
+        z-index: 1111;
+        width: 100%;
+        height: 100%;
+        content: ' ';
+      }
+
+      .left-item__item--remove {
+        display: flex;
+        position: absolute;
+        align-items: center;
+        justify-content: center;
+        right: 4px;
+        top: 4px;
+        z-index: 1113;
+        width: 84px;
+        height: 28px;
+        background: #FF4466;
+        border-radius: 2px;
+        cursor: pointer;
+        color: #fff;
+        font-size: 12px;
+
+        i {
+          margin-right: 6px;
+          font-size: 12px;
+
+          &:hover {
+            color: #fff;
+          }
+        }
+
+        &:hover {
+          opacity: 0.8;
+        }
+      }
+
+      &:hover {
+        background: #f6f7ff;
+      }
+
+      &.active {
+        background: #f6f7ff;
+      }
+
+      .left-item__item--upload {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex-direction: column;
+        width: 120px;
+        height: 120px;
+        line-height: 1;
+        border-radius: 6px;
+        border: 1px dashed #bbb;
+
+        i {
+          font-size: 24px;
+          color: #8899bb;
+        }
+
+        span {
+          margin-top: 10px;
+          font-size: 12px;
+          color: #555;
+        }
+      }
+
+      .text-item {
+        input {
+          display: block;
+          width: 100%;
+          height: 40px;
+          border: none;
+          border-bottom: 1px solid #ddd;
+
+          &:focus {
+            outline: none;
+          }
+
+          &:disabled {
+            background: #fff;
+          }
+        }
+      }
+
+      .textarea-item {
+        textarea {
+          width: 100%;
+          height: 120px;
+          resize: none;
+          border: 1px solid #ddd;
+          padding: 10px;
+
+          &:focus {
+            outline: none;
+          }
+
+          &:disabled {
+            background: #fff;
+          }
+        }
+      }
+
+      .radio-item {
+        display: flex;
+        align-items: center;
+        margin-bottom: 10px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+
+        label {
+          margin-left: 10px;
+        }
+
+        img {
+          margin-left: 10px;
+        }
+      }
+    }
+
+    .left-item__item--title {
+      display: flex;
+      align-items: center;
+      margin-bottom: 10px;
+
+      i {
+        margin-right: 5px;
+        color: #E22120;
+      }
+
+      h2 {
+        color: #333333;
+        font-size: 15px;
+      }
+    }
+  }
+
+  .middle-content {
+    width: 96%;
+    margin: 0 auto;
+    padding: 0px 0 1px;
+
+    .middle-content__wrapper {
+      // min-height: 800px;
+      // background: #fff;
+
+      & > div {
+        &.active {
+          background: #f6f7ff;
+        }
+      }
+
+      .radio-item {
+        img {
+          width: 40px;
+          height: 40px;
+        }
+      }
+    }
+  }
+
+  div {
+    box-sizing: border-box;
+  }
+
+  .right-item__select--wrapper {
+    .select-item {
+      display: flex;
+      align-items: center;
+    }
+  }
+
+  ::v-deep .ai-detail__title {
+    margin: 0 !important;
+    margin-bottom: 4px !important;
+    padding: 0 20px;
+    box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.08);
+  }
+
+  ::v-deep .ai-detail__content--wrapper {
+    display: flex;
+    max-width: 100% !important;
+    height: 100% !important;
+    padding: 0 !important;
+    background: #F5F6F9;
+  }
+
+  .middle {
+    flex: 1;
+    height: 100%;
+
+    ::v-deep .el-scrollbar__view {
+      height: 100%;
+    }
+  }
+
+  .add-select {
+    height: auto;
+    line-height: 1;
+    margin: 10px 0 0 26px;
+    padding: 0;
+  }
+
+  .right-item__select--wrapper {
+    .select-item {
+      margin-bottom: 10px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+
+      i {
+        margin-right: 8px;
+        color: #8c9dbd;
+      }
+
+      .mover {
+        cursor: move;
+      }
+
+      .iconDelete {
+        cursor: pointer;
+        margin-left: 10px;
+      }
+    }
+
+    ::v-deep .el-upload-list__item {
+      width: 40px !important;
+      height: 40px !important;
+      object-fit: cover;
+    }
+
+    .config-item__select {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 40px;
+      height: 40px;
+      border: 1px solid #D0D4DC;
+
+      &:hover {
+        opacity: 0.7;
+      }
+
+      i {
+        font-size: 18px;
+      }
+    }
+  }
+
+  .right {
+    width: 320px;
+    height: 100%;
+    overflow: hidden;
+    background: #FFFFFF;
+
+    .el-checkbox {
+      display: block;
+      margin-bottom: 10px;
+
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    .right-item {
+      margin-top: 20px;
+      padding: 0 20px;
+
+      .right-item__tips {
+        margin-top: 10px;
+        color: #888888;
+        font-size: 12px;
+      }
+    }
+
+    .right-item__title {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-bottom: 10px;
+
+      .right-item__title--left {
+        display: flex;
+        align-items: center;
+
+        i {
+          color: #888888;
+          font-size: 12px;
+          font-style: normal;
+        }
+      }
+
+      h2 {
+        color: #222222;
+        font-size: 14px;
+      }
+    }
+  }
+
+  .left {
+    width: 280px;
+    height: 100%;
+    overflow: hidden;
+    background: #FFFFFF;
+
+    .left-item {
+      padding: 0 20px;
+
+      &:last-child {
+        padding-bottom: 20px;
+      }
+
+      .left-item__title {
+        display: flex;
+        align-items: baseline;
+        margin-bottom: 20px;
+
+        h2 {
+          color: #222222;
+          font-size: 14px;
+          font-weight: 700;
+        }
+
+        span {
+          color: #888888;
+          font-size: 12px;
+        }
+      }
+    }
+
+    .left-item {
+      margin-top: 20px;
+    }
+  }
+}
+
+.left-item__item {
+  display: flex;
+  align-items: center;
+  height: 40px;
+  margin-bottom: 10px;
+  width: 100%;
+  padding: 0 13px;
+  background: #FFFFFF;
+  border-radius: 2px;
+  color: #222222;
+  font-size: 12px;
+  border: 1px solid #E4E8EF;
+  cursor: move;
+
+  &:hover {
+    border: 1px dashed #2367ff;
+    color: #2367ff;
+
+    i {
+      color: #2367ff;
+    }
+  }
+
+  i {
+    margin-right: 13px;
+    font-size: 14px;
+    color: #8899BB;
+  }
+
+  &:last-child {
+    margin-bottom: 0px;
+  }
+}
+</style>

From 340e40b6d188423886dbff8f2493a32dca1b190c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 21 Jun 2022 10:58:33 +0800
Subject: [PATCH 27/68] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sanjianxi/apps/AppPartyScore/psList.vue   | 238 ++----------------
 .../apps/AppScoreRules/AppScoreRules.vue      |  89 ++-----
 2 files changed, 31 insertions(+), 296 deletions(-)

diff --git a/project/sanjianxi/apps/AppPartyScore/psList.vue b/project/sanjianxi/apps/AppPartyScore/psList.vue
index b8e4eac6..903f0503 100644
--- a/project/sanjianxi/apps/AppPartyScore/psList.vue
+++ b/project/sanjianxi/apps/AppPartyScore/psList.vue
@@ -3,35 +3,16 @@
     <ai-list>
       <ai-title slot="title" title="党员积分" isShowBottomBorder/>
       <template #left>
-        <div class="patyCode-left">
-          <div class="patyCode-left__title">
-            <h2>组织目录</h2>
-          </div>
-          <div class="organization-left__list">
-            <div class="organization-left__list--title">
-              <el-input
-                  class="organization-left__list--search"
-                  size="mini"
-                  clearable
-                  placeholder="请输入组织名称"
-                  v-model="organizationName"
-                  suffix-icon="iconfont iconSearch">
-              </el-input>
-            </div>
-            <el-tree
-                :filter-node-method="filterNode"
-                ref="tree"
-                :props="defaultProps"
-                node-key="id"
-                :data="organizationTree"
-                highlight-current
-                :current-node-key="search.organizationName"
-                :default-expanded-keys="defaultExpanded"
-                :default-checked-keys="defaultChecked"
-                @current-change="onTreeChange">
-            </el-tree>
-          </div>
-        </div>
+
+        <ai-tree-menu title="组织目录" searchPlaceholder="请输入党组织名称" @search="onSearch">
+          <ai-party-tree
+              :filter-node-method="filterNode"
+              ref="tree"
+              :instance="instance"
+              :root="user.info.organizationId"
+              :current-node-key="user.info.id"
+              @select="onTreeChange"/>
+        </ai-tree-menu>
       </template>
       <template #content>
         <ai-search-bar>
@@ -70,7 +51,7 @@
 </template>
 
 <script>
-import {mapState} from "vuex";
+import { mapState } from "vuex";
 
 export default {
   name: "psList",
@@ -140,38 +121,9 @@ export default {
         }
       })
     },
-    getTree() {
-      this.instance.post(`/admin/area/queryAllArea?id=${this.user.info.areaId}`).then(res => {
-        if (res.code === 0) {
-          let parent = res.data.map(v => {
-            v.label = v.name
-            v.children = []
-
-            return v
-          }).filter(e => !e.parentid)[0]
-          this.defaultExpanded = [parent.id]
-          this.defaultChecked = [parent.id]
-          this.search.areaId = parent.id
-          this.addChild(parent, res.data)
-          this.organizationTree = [parent]
-
-          this.$nextTick(() => {
-            this.$refs.tree.setCurrentKey(parent.id)
-          })
-        }
-      })
-    },
-
-    addChild(parent, list) {
-      for (let i = 0; i < list.length; i++) {
-        if (list[i].parentId === parent.id) {
-          parent.children.push(list[i])
-        }
-      }
-
-      if (list.length > 0) {
-        parent['children'].map(v => this.addChild(v, list))
-      }
+    
+    onSearch(v) {
+      this.orgTree.filter(v)
     },
 
     onTreeChange(e) {
@@ -212,7 +164,6 @@ export default {
   },
   created() {
     this.getTableData()
-    // this.getTree()
   }
 }
 </script>
@@ -221,165 +172,6 @@ export default {
 .psList {
   height: 100%;
 
-  .organization-left__list {
-    height: calc(100% - 40px);
-    padding: 8px 8px;
-    overflow: auto;
-
-    .organization-left__tags--item {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      height: 40px;
-      padding: 0 8px 0 16px;
-      color: #222222;
-
-      &.organization-left__tags--item-active, &:hover {
-        background: #E8EFFF;
-        color: #2266FF;
-
-        i, span {
-          color: #2266FF;
-        }
-      }
-
-      span {
-        font-size: 14px;
-      }
-
-      i {
-        cursor: pointer;
-        color: #8e9ebf;
-        font-size: 16px;
-      }
-    }
-
-    .organization-left__list--title {
-      display: flex;
-      align-items: center;
-      margin-bottom: 8px;
-
-      .organization-left__list--search {
-        flex: 1;
-
-        ::v-deep input {
-          width: 100%;
-        }
-      }
-
-      .el-button {
-        width: 84px;
-        flex-shrink: 1;
-        margin-right: 8px;
-      }
-    }
-
-    span {
-      color: #222222;
-      font-size: 14px;
-    }
-
-    ::v-deep .el-tree {
-      background: transparent;
-
-      .el-tree-node__expand-icon.is-leaf {
-        color: transparent !important;
-      }
-
-      .el-tree-node__content > .el-tree-node__expand-icon {
-        padding: 4px;
-      }
-
-      .el-tree-node__content {
-        height: 32px;
-      }
-
-      .el-tree__empty-text {
-        color: #222;
-        font-size: 14px;
-      }
-
-      .el-tree-node__children .el-tree-node__content {
-        height: 32px;
-      }
-
-      .el-tree-node__content:hover {
-        background: #E8EFFF;
-        color: #222222;
-        border-radius: 2px;
-      }
-
-      .is-current > .el-tree-node__content {
-        &:hover {
-          background: #2266FF;
-          color: #fff;
-        }
-
-        background: #2266FF;
-
-        span {
-          color: #fff;
-        }
-      }
-    }
-  }
-
-  ::v-deep .ai-list__content--left {
-    margin-right: 2px;
-  }
-
-  .patyCode-left {
-    width: 100%;
-    height: auto;
-    background: #FAFAFB;
-
-    .patyCode-left__title {
-      display: flex;
-      align-items: center;
-      height: 40px;
-      padding: 0 16px;
-      background: #fff;
-
-      h2 {
-        color: #222;
-        font-size: 14px;
-      }
-    }
-
-    .patyCode-left__list {
-      height: calc(100% - 40px);
-      padding: 8px 0;
-      overflow: auto;
-
-      span {
-        display: block;
-        height: 40px;
-        line-height: 40px;
-        padding: 0 24px;
-        color: #222222;
-        font-size: 14px;
-        cursor: pointer;
-        border-right: 2px solid transparent;
-        background: transparent;
-
-        &:hover {
-          color: #2266FF;
-          background: #E8EFFF;
-        }
-
-        &.left-active {
-          color: #2266FF;
-          border-color: #2266FF;
-          background: #E8EFFF;
-        }
-      }
-    }
-  }
-
-  ::v-deep .ai-list__content--right {
-    .ai-list__content--right-wrapper {
-      min-height: 100%;
-    }
-  }
+  
 }
 </style>
diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
index 84ce589a..2be2a9af 100644
--- a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
+++ b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
@@ -100,27 +100,9 @@
           </el-form-item>
 
           <el-form-item label="积分分值" prop="integral" v-if="form.pass == 1">
-            <div class="flex">
-              <div class="from">
-                <el-input
-                  ref="input_from"
-                  v-model="integralFrom"
-                  placeholder="最小值"
-                  @input="handleInputFrom"
-                ></el-input>
-              </div>
-              <div class="center">
-                <span>至</span>
-              </div>
-              <div class="to">
-                <el-input
-                  ref="input_to"
-                  v-model="integralTo"
-                  placeholder="最大值"
-                  @input="handleInputTo"
-                ></el-input>
-              </div>
-            </div>
+            <ai-range v-model="form.num" ref="resetagefoo" />
+              <!-- @change="search.current = 1, getList()"
+                      @closeVal="search.age = []"/ -->
           </el-form-item>
           
           <el-form-item label="积分分值" prop="integral" v-if="form.pass == 2">
@@ -137,7 +119,7 @@
           </el-form-item>
 
           <el-dialog width="30%" title="添加积分分值" :visible.sync="innerVisible" append-to-body>
-            <el-form ref="DialogForm" :model="forms" :rules="formRules" size="small" label-suffix="：" label-width="100px">
+            <el-form ref="innerForm" :model="table" :rules="formRules" size="small" label-suffix="：" label-width="100px">
               <el-form-item label="加分项" prop="integral">
                 <el-input placeholder="请输入" v-model="form.integral" clearable/>
               </el-form-item>
@@ -148,7 +130,7 @@
 
             <div slot="footer" class="dialog-footer">
               <el-button @click="innerVisible = false">取 消</el-button>
-              <el-button type="primary" @click="innerVisible = false">提交</el-button>
+              <el-button type="primary" @click="save">保存</el-button>
             </div>
           </el-dialog>
         </el-form>
@@ -225,7 +207,7 @@ export default {
       integralTo: '',
       integralData: [],
       innerVisible: false,
-      forms: {},
+      table: {},
     };
   },
   created() {
@@ -262,6 +244,15 @@ export default {
         })
       })
     },
+    // 保存
+    save() {
+      this.$refs.innerForm.validate((valid)=>{
+        if (valid) {
+          this.innerData.push(this.table)
+        }
+        this.innerVisible = false
+      })
+    },
 
     typeChange() {
       this.form.integral = ''
@@ -359,55 +350,7 @@ export default {
   height: 100%;
   background: #f3f6f9;
 
-  ::v-deep .ai-list__content--right {
-    width: 100%;
-  }
-
-  ::v-deep .ai-dialog {
-    .el-cascader {
-      width: 100%;
-    }
-
-    .tableInput {
-      & > input {
-        text-align: center;
-        border: none;
-        background: transparent;
-      }
-    }
-  }
-
-
-  ::v-deep .el-input--mini .el-input__inner {
-    border: 0px;
-    margin: 0;
-    padding: 0 15px;
-    background-color: transparent;
-  }
-  .input-number-range {
-    background-color: #fff;
-    border: 1px solid #dcdfe6;
-    border-radius: 4px;
-  }
-
-  .flex {
-    display: flex;
-    flex-direction: row;
-    width: 100%;
-    // justify-content: space-between;
-    align-items: center;
-
-    .center {
-      margin: 0 20px;
-      margin-top: 1px;
-    }
-  }
-  .is-disabled {
-    background-color: #eef0f6;
-    border-color: #e4e7ed;
-    color: #c0c4cc;
-    cursor: not-allowed;
-  }
+  
 
 }
 </style>

From 3ac9250f386e1279e9ad10f4e6e8683b0428081c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 21 Jun 2022 14:22:45 +0800
Subject: [PATCH 28/68] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=B1=85=E6=B0=91?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/sanjianxi/apps/AppPartyScore/psList.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/project/sanjianxi/apps/AppPartyScore/psList.vue b/project/sanjianxi/apps/AppPartyScore/psList.vue
index 903f0503..e04518c7 100644
--- a/project/sanjianxi/apps/AppPartyScore/psList.vue
+++ b/project/sanjianxi/apps/AppPartyScore/psList.vue
@@ -171,7 +171,5 @@ export default {
 <style lang="scss" scoped>
 .psList {
   height: 100%;
-
-  
 }
 </style>

From 0ac92994bcc110966b35e7180286056db5e64a8e Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 21 Jun 2022 18:52:25 +0800
Subject: [PATCH 29/68] =?UTF-8?q?=E8=A7=86=E9=A2=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppEquipmentManage/components/List.vue    | 26 +++++++---
 .../components/deviceSlider.vue               | 51 ++++++++++++++++---
 2 files changed, 63 insertions(+), 14 deletions(-)

diff --git a/packages/device/AppEquipmentManage/components/List.vue b/packages/device/AppEquipmentManage/components/List.vue
index 095fd5e2..790beaf5 100644
--- a/packages/device/AppEquipmentManage/components/List.vue
+++ b/packages/device/AppEquipmentManage/components/List.vue
@@ -4,18 +4,15 @@
       <ai-title slot="title" title="广播设备管理" isShowBottomBorder/>
       <template #content>
         <ai-search-bar bottomBorder>
+          <template slot="left">
+            <el-button type="primary" icon="iconfont iconResetting" @click="update" :loading="btnLoading">更新数据</el-button>
+          </template>
           <template slot="right">
             <el-input v-model="search.name" size="small" placeholder="设备名称/设备编号" clearable
                       v-throttle="() => {page.current = 1, getList()}"
                       @clear=";(page.current = 1), (search.name = ''), getList()" suffix-icon="iconfont iconSearch"/>
           </template>
         </ai-search-bar>
-        <ai-search-bar class="ai-search-ba mar-t10">
-          <template slot="left">
-            <!-- <el-button icon="iconfont" type="primary" size="small">数据同步</el-button> -->
-            <!-- <el-button icon="iconfont iconDelete" size="small" @click="removeAll" :disabled="ids.length == 0">删除 </el-button> -->
-          </template>
-        </ai-search-bar>
         <ai-table :tableData="tableData" :col-configs="colConfigs" :total="total" ref="aitableex"
                   :current.sync="page.current" :size.sync="page.size" @getList="getList"
                   @selection-change="(v) => (ids = v.map((e) => e.id))">
@@ -114,6 +111,7 @@ export default {
       areaId: '',
       bindVisible: false,
       changeInfo: {},
+      btnLoading: false,
       locate: false
     }
   },
@@ -198,6 +196,22 @@ export default {
         },
       })
     },
+    update () {
+      this.btnLoading = true
+      this.instance.post(`/app/appdlbquipment/sync`, null, {
+        timeout: 1000000
+      }).then(res => {
+        if (res.code == 0) {
+          this.$message.success('更新成功')
+          this.getList()
+        }
+
+        this.btnLoading = false
+      }).catch(() => {
+        
+        this.btnLoading = false
+      })
+    },
   },
 }
 </script>
diff --git a/packages/device/IntelligentSecurity/components/deviceSlider.vue b/packages/device/IntelligentSecurity/components/deviceSlider.vue
index f134875f..c17368f9 100644
--- a/packages/device/IntelligentSecurity/components/deviceSlider.vue
+++ b/packages/device/IntelligentSecurity/components/deviceSlider.vue
@@ -22,7 +22,10 @@
             prefix-icon="el-icon-search"
             @clear="search.name = '', handleTreeFilter()" clearable/>
       </div>
-      <div title>设备列表</div>
+      <div title>
+        <div>设备列表</div>
+        <el-button type="text" icon="iconfont iconResetting" plain="true" @click="updateDev" size="mini" :loading="btnLoading">
+      </el-button></div>
       <div fill class="deviceList">
         <el-tree ref="deviceTree" highlight-current :render-content="renderItem" :data="treeData" :props="propsConfig"
                  @node-click="handleNodeClick" @node-contextmenu="nodeContextmenu"
@@ -98,7 +101,8 @@ export default {
         x: '',
         y: '',
         node: {}
-      }
+      },
+      btnLoading: false,
     }
   },
   methods: {
@@ -110,8 +114,10 @@ export default {
       this.isShowMenu = false
     },
     getDevices() {
-      this.ins.post("/app/appzyvideoequipment/tree", null, {
-        params: {size: 999}
+      this.instance.post(`/app/appzyvideoequipment/tree`, null, {
+        params: {
+          size: 999
+        }
       }).then(res => {
         if (res?.data) {
           this.staData = res.data.count
@@ -122,6 +128,21 @@ export default {
       })
     },
 
+    updateDev() {
+      this.btnLoading = true
+      this.instance.post(`/app/appzyvideoequipment/sync`, null, {
+        timeout: 1000000
+      }).then(res => {
+        if (res.code == 0) {
+          this.$message.success('更新成功')
+          this.getDevices()
+        }
+        this.btnLoading = false
+      }).catch(() => {
+        this.btnLoading = false
+      })
+    },
+
     handleTreeCommand(e, node) {
       this.$emit('treeCommand', {
         type: e,
@@ -154,14 +175,16 @@ export default {
     handleTreeFilter() {
       this.$refs.deviceTree?.filter(this.search.name)
     },
-
     onChange() {
       this.$refs.deviceTree?.filter(this.search.name)
-    }
+    },
+    
   },
+
   created() {
-    this.dict.load("deviceStatus")
-    this.getDevices()
+    this.$dict.load("deviceStatus").then(()=>{
+      this.getDevices()
+    })
   },
 
   mounted() {
@@ -247,6 +270,18 @@ export default {
       background: #3E4A69;
       padding: 0 16px;
       line-height: 28px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      ::v-deep .el-button {
+        padding: 0 4px;
+        height: 28px;
+        background: #3E4A69;
+      }
+      ::v-deep .el-button:hover {
+        border: none;
+      }
     }
 
     ::v-deep.deviceList {

From 11e8588e0d02517bad7eade02c364c51c2ad6816 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 22 Jun 2022 08:43:38 +0800
Subject: [PATCH 30/68] css

---
 .../device/IntelligentSecurity/components/deviceSlider.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/device/IntelligentSecurity/components/deviceSlider.vue b/packages/device/IntelligentSecurity/components/deviceSlider.vue
index c17368f9..6caf148a 100644
--- a/packages/device/IntelligentSecurity/components/deviceSlider.vue
+++ b/packages/device/IntelligentSecurity/components/deviceSlider.vue
@@ -24,8 +24,8 @@
       </div>
       <div title>
         <div>设备列表</div>
-        <el-button type="text" icon="iconfont iconResetting" plain="true" @click="updateDev" size="mini" :loading="btnLoading">
-      </el-button></div>
+        <el-button type="text" icon="iconfont iconResetting" :plain="true" @click="updateDev" size="mini" :loading="btnLoading">刷新</el-button>
+      </div>
       <div fill class="deviceList">
         <el-tree ref="deviceTree" highlight-current :render-content="renderItem" :data="treeData" :props="propsConfig"
                  @node-click="handleNodeClick" @node-contextmenu="nodeContextmenu"

From 98762e996c2cbb2f51473b696b7af638cbd1b322 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Wed, 22 Jun 2022 09:13:47 +0800
Subject: [PATCH 31/68] instance

---
 .../device/IntelligentSecurity/AppISManage/AppISManage.vue  | 2 +-
 packages/device/IntelligentSecurity/AppISMap/AppISMap.vue   | 2 +-
 .../device/IntelligentSecurity/components/deviceSlider.vue  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue b/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue
index ede77678..cb534700 100644
--- a/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue
+++ b/packages/device/IntelligentSecurity/AppISManage/AppISManage.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="AppISManage">
-    <device-slider :permissions="permissions" :show.sync="slider" :ins="instance" :dict="dict" @treeCommand="handleSliderOption" @select="handleSelectMonitor" :render-item="renderTreeItem" ref="DeviceSlider" />
+    <device-slider :permissions="permissions" :show.sync="slider" :instance="instance" :dict="dict" @treeCommand="handleSliderOption" @select="handleSelectMonitor" :render-item="renderTreeItem" ref="DeviceSlider" />
     <div class="monitorPane" v-loading="isLoading" element-loading-background="rgba(0, 0, 0, 0.6)">
       <div class="headerBar">
         <el-select default-first-option size="small" v-model="splitScreen" @change="onChange">
diff --git a/packages/device/IntelligentSecurity/AppISMap/AppISMap.vue b/packages/device/IntelligentSecurity/AppISMap/AppISMap.vue
index e96f587b..7d2fe7a0 100644
--- a/packages/device/IntelligentSecurity/AppISMap/AppISMap.vue
+++ b/packages/device/IntelligentSecurity/AppISMap/AppISMap.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="AppISMap">
-    <device-slider :show.sync="slider" :ins="instance" :dict="dict" @list="v=>list=v" @select="markerClickEvent"/>
+    <device-slider :show.sync="slider" :instance="instance" :dict="dict" @list="v=>list=v" @select="markerClickEvent"/>
     <div id="amap"/>
     <div ref="selectedInfoWin" class="selected">
       <b>{{ selected.deviceName }}</b>
diff --git a/packages/device/IntelligentSecurity/components/deviceSlider.vue b/packages/device/IntelligentSecurity/components/deviceSlider.vue
index 6caf148a..d6406a8d 100644
--- a/packages/device/IntelligentSecurity/components/deviceSlider.vue
+++ b/packages/device/IntelligentSecurity/components/deviceSlider.vue
@@ -24,7 +24,7 @@
       </div>
       <div title>
         <div>设备列表</div>
-        <el-button type="text" icon="iconfont iconResetting" :plain="true" @click="updateDev" size="mini" :loading="btnLoading">刷新</el-button>
+        <el-button type="text" icon="iconfont iconResetting" @click="updateDev" size="mini" :loading="btnLoading">刷新</el-button>
       </div>
       <div fill class="deviceList">
         <el-tree ref="deviceTree" highlight-current :render-content="renderItem" :data="treeData" :props="propsConfig"
@@ -51,10 +51,10 @@ export default {
   name: "deviceSlider",
   props: {
     show: Boolean,
-    ins: Function,
+    instance: Function,
     dict: Object,
     permissions: Function,
-    renderItem: Function
+    renderItem: Function,
   },
   computed: {
     overview() {

From e7e69d72e3ac26d6abe065ad55f45dc4472710ee Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 22 Jun 2022 10:53:36 +0800
Subject: [PATCH 32/68] bug

---
 .../bigscreen/designer/components/RenderElement.vue   | 11 ++++++++---
 packages/bigscreen/designer/config.js                 |  9 ++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/packages/bigscreen/designer/components/RenderElement.vue b/packages/bigscreen/designer/components/RenderElement.vue
index 6c4ceac2..1323fecf 100644
--- a/packages/bigscreen/designer/components/RenderElement.vue
+++ b/packages/bigscreen/designer/components/RenderElement.vue
@@ -178,10 +178,15 @@ export default {
 
   computed: {
     ...mapState(['user']),
-    values() {
-      return this.data?.[this.data.dataType]?.map(e => {
+
+    values () {
+      if (!this.data) {
+        return []
+      }
+
+      return this.data.type ==='map' ? this.data[this.data.dataType].map(e => {
         return {...e, lng: e['经度'], lat: e['纬度'], label: e['地区名称']}
-      }) || []
+      }) : this.data[this.data.dataType]
     }
   },
   methods: {
diff --git a/packages/bigscreen/designer/config.js b/packages/bigscreen/designer/config.js
index 1d10f649..7d06738a 100644
--- a/packages/bigscreen/designer/config.js
+++ b/packages/bigscreen/designer/config.js
@@ -537,7 +537,10 @@ const components = [
               {
                 content: '中卫慧通',
                 lng: 117.1339399,
-                lat: 36.7190487
+                lat: 36.7190487,
+                地区: '中卫慧通',
+                经度: 117.1339399,
+                纬度: 36.7190487
               }
             ],
             api: '',
@@ -613,11 +616,11 @@ const components = [
             dataType: 'staticData',
             staticData: [
               {
-                key: '个人服务办理',
+                label: '个人服务办理',
                 value: 247
               },
               {
-                key: '同比上月',
+                label: '同比上月',
                 value: 247
               }
             ]

From 834132fec22f5663c59aadd27204def696c2416c Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 22 Jun 2022 11:08:55 +0800
Subject: [PATCH 33/68] =?UTF-8?q?=E4=BD=8E=E4=BB=A3=E7=A0=81=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/router/axios.js                      |  2 +-
 project/oms/apps/develop/AppAiCode/acAdd.vue  | 38 ++++++++++--
 .../apps/develop/AppAiCode/detailLayout.vue   | 61 ++++++-------------
 3 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/examples/router/axios.js b/examples/router/axios.js
index 511a36e5..1970deeb 100644
--- a/examples/router/axios.js
+++ b/examples/router/axios.js
@@ -9,7 +9,7 @@ let baseURLs = {
 instance.defaults.baseURL = baseURLs[process.env.NODE_ENV]
 instance.interceptors.request.use(config => {
   if (config.url.startsWith("/node")) {
-    config.baseURL = "/ns"
+    config.baseURL = "/lns"
   } else if (/\/project\/beta/.test(location.pathname)) {
     config.baseURL = "/wg"
   } else if (/\/project\/sass/.test(location.pathname)) {
diff --git a/project/oms/apps/develop/AppAiCode/acAdd.vue b/project/oms/apps/develop/AppAiCode/acAdd.vue
index fd04cac0..fae4428d 100644
--- a/project/oms/apps/develop/AppAiCode/acAdd.vue
+++ b/project/oms/apps/develop/AppAiCode/acAdd.vue
@@ -4,7 +4,7 @@
       <ai-title slot="title" :title="pageTitle"/>
       <template #content>
         <el-form ref="AcForm" :model="form" size="small" label-width="120px" :rules="rules">
-          <el-tabs tab-position="left">
+          <el-tabs tab-position="left" @tab-click="handleSyncProps">
             <el-tab-pane label="基本信息" lazy>
               <ai-card title="基本信息">
                 <template #content>
@@ -42,6 +42,7 @@
               </ai-card>
               <ai-card title="字段设置">
                 <template #right>
+                  <el-button type="text" @click="handleAddProps">批量添加</el-button>
                   <el-button type="text" @click="form.props.push({})">添加</el-button>
                 </template>
                 <template #content>
@@ -49,7 +50,7 @@
                     <el-table-column v-for="col in colConfigs" :key="col.slot" v-bind="col">
                       <template slot-scope="{row}">
                         <el-checkbox v-if="col.type=='checkBox'" v-model="row[col.slot]"/>
-                        <span v-else-if="col.type=='chbShow'" v-text="row[col.slot]==1?'√':''"/>
+                        <span v-else-if="col.type=='chbShow'" v-text="row[col.slot]==true?'✔':''"/>
                         <el-input v-else size="small" v-model="row[col.slot]" placeholder="请输入" clearable/>
                       </template>
                     </el-table-column>
@@ -63,7 +64,7 @@
               </ai-card>
             </el-tab-pane>
             <el-tab-pane label="详情设计" lazy>
-              <detail-layout v-bind="$props" :form="form" v-model="form.props"/>
+              <detail-layout v-bind="$props" :form="form" v-model="form.detailConfig"/>
             </el-tab-pane>
           </el-tabs>
         </el-form>
@@ -116,7 +117,7 @@ export default {
       }).then(res => {
         if (res?.data) {
           this.form = res.data
-          this.form.props.map(e => ({...e, isDetail: !!e.groupName}))
+          this.handleSyncProps()
         }
       })
     },
@@ -135,6 +136,35 @@ export default {
         }
       })
     },
+    handleSyncProps() {
+      let detailPorps = this.form.detailConfig?.map(e => e.column)?.flat()?.map(e => e.prop)
+      this.form.props = this.form.props.map(e => ({...e, isDetail: !!detailPorps?.includes(e.prop)}))
+    },
+    handleAddProps() {
+      this.$prompt("请输入swagger示例JSON字符串", {
+        type: 'warning',
+        title: "批量添加字段",
+        dangerouslyUseHTMLString: true,
+        center: true,
+      }).then(({value}) => {
+        if (this.$checkJson(value)) {
+          Object.keys(JSON.parse(value)).map(prop => {
+            this.form.props.push({prop})
+          })
+        }
+      }).catch(() => 0)
+    },
+    $checkJson(str) {
+      if (typeof str == 'string') {
+        try {
+          let obj = JSON.parse(str);
+          return !!(typeof obj == 'object' && obj);
+        } catch (e) {
+          return false;
+        }
+      }
+      return false;
+    }
   },
   created() {
     this.getDetail()
diff --git a/project/oms/apps/develop/AppAiCode/detailLayout.vue b/project/oms/apps/develop/AppAiCode/detailLayout.vue
index 82be0e9d..4703df5e 100644
--- a/project/oms/apps/develop/AppAiCode/detailLayout.vue
+++ b/project/oms/apps/develop/AppAiCode/detailLayout.vue
@@ -183,7 +183,6 @@
           </div>
         </div>
       </template>
-
       <div class="right-item" v-if="['select', 'date', 'time', 'input', 'datetime', 'textarea', 'rtf'].includes(currTarget.type)">
         <div class="right-item__title no-solid">
           <h2>占位符</h2>
@@ -425,6 +424,12 @@ export default {
       } else if (this.groupIndex > -1 && this.isGroup) {
         this.currTarget = this.targetList[this.groupIndex]
       } else this.currTarget = {}
+    },
+    targetList: {
+      deep: true,
+      handler(v) {
+        this.$emit('change', v)
+      }
     }
   },
   computed: {
@@ -432,43 +437,17 @@ export default {
       return '表单设置'
     },
     propOps: v => v.form.props?.map(e => ({dictValue: e.prop, dictName: e.label})),
-    detailProps: {
-      set(v) {
-        let props = [v.map((e, i) => e.column.map((item, index) => ({
-          ...e,
-          groupIndex: i,
-          groupName: e.groupName,
-          fieldDbName: item.isInit ? item.fieldDbName : (this.isUnique(item.type) ? item.type : `${item.type}${i}${index}`),
-          defaultValue: item.type === 'checkbox' && item.defaultValue ? item.defaultValue.join('`') : item.defaultValue,
-          selectValues: item.options ? item.options.map(o => o.label).join('`') : ''
-        })))].flat()
-        console.log(props)
-        this.$emit('change', props)
-      },
-      get() {
-        const init = {
-          type: 'group',
-          fieldName: '卡片',
-          fixedLabel: '卡片',
-          icon: 'iconpic',
-          groupName: '基础信息',
-          column: []
-        }
-        let arr = this.$copy(this.value),
-            groups = [...new Set(arr?.map(e => e.groupName))].filter(e => !!e)
-        this.targetList = groups?.length > 0 ? groups.map(groupName => ({
-          type: 'group',
-          fieldName: '卡片',
-          fixedLabel: '卡片',
-          icon: 'iconpic',
-          groupName,
-          column: arr.filter(e => e.groupName == groupName)
-        })) : [init]
-        return this.targetList
-      }
-    },
   },
   methods: {
+    initValue() {
+      let unwatch = this.$watch('value', (v) => {
+        if (this.targetList.length > 0) unwatch && unwatch()
+        else if (!!v) {
+          this.targetList = this.$copy(v)
+          unwatch && unwatch()
+        }
+      }, {immediate: true})
+    },
     removeItem(j, i) {
       this.groupIndex = -1
       this.activeIndex = -1
@@ -502,7 +481,6 @@ export default {
         value: ''
       })
     },
-
     removeOptions(index) {
       const len = this.targetList[this.groupIndex].column[this.activeIndex].options.length
 
@@ -511,14 +489,12 @@ export default {
       }
       this.targetList[this.groupIndex].column[this.activeIndex].options.splice(index, 1)
     },
-
     onEnd(e) {
       const el = e.to.parentElement.parentElement
       this.isGroup = false
       this.activeIndex = e.newIndex
       this.groupIndex = Number(el.getAttribute('data-index'))
     },
-
     onElEnd(e) {
       if (this.isGroup) {
         this.groupIndex = e.newIndex
@@ -526,7 +502,6 @@ export default {
         this.activeIndex = e.newIndex
       }
     },
-
     clone(e) {
       if (e.type === 'group') {
         this.targetList.push(JSON.parse(JSON.stringify(e)))
@@ -563,7 +538,6 @@ export default {
         this.activeIndex = this.targetList[0].column.length - 1
       })
     },
-
     onMove(e) {
       const el = e.draggedContext.element
       if (el.type === 'group') {
@@ -577,7 +551,6 @@ export default {
       })
       return !(list.indexOf(el.type) > -1 && ['name', 'idNumber', 'phone', 'area'].includes(el.type));
     },
-
     cloneComponent(e) {
       if (e.type === 'group') {
         this.targetList.push(JSON.parse(JSON.stringify(e)))
@@ -599,7 +572,9 @@ export default {
       return JSON.parse(JSON.stringify(e))
     }
   },
-
+  created() {
+    this.initValue()
+  }
 }
 </script>
 

From 03bd52194bb4fa6bcca574298c4e49f6528251a3 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 22 Jun 2022 11:20:42 +0800
Subject: [PATCH 34/68] =?UTF-8?q?=E4=BD=8E=E4=BB=A3=E7=A0=81=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oms/apps/develop/AppAiCode/AppAiCode.vue  | 26 +++++++++++++++++++
 project/oms/apps/develop/AppAiCode/acAdd.vue  | 11 ++++++--
 project/oms/apps/develop/AppAiCode/acList.vue |  5 +++-
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/project/oms/apps/develop/AppAiCode/AppAiCode.vue b/project/oms/apps/develop/AppAiCode/AppAiCode.vue
index 5669c647..8abd0500 100644
--- a/project/oms/apps/develop/AppAiCode/AppAiCode.vue
+++ b/project/oms/apps/develop/AppAiCode/AppAiCode.vue
@@ -23,6 +23,32 @@ export default {
       return hash == "#add" ? AcAdd : AcList
     }
   },
+  provide() {
+    return {
+      top: this
+    }
+  },
+  methods: {
+    handleGetCode(id) {
+      id && this.instance.post("/node/aicode/getCode", null, {
+        params: {id},
+        responseType: "blob"
+      }).then(res => {
+        if (res?.code == 1) {
+          this.$message.error(res.err)
+        } else {
+          const link = document.createElement('a')
+          let blob = new Blob([res], {type: 'application/zip'})
+          link.style.display = 'none'
+          link.href = URL.createObjectURL(blob)
+          link.setAttribute('download', row.name + '.zip')
+          document.body.appendChild(link)
+          link.click()
+          document.body.removeChild(link)
+        }
+      })
+    }
+  },
   created() {
     this.dict.load("detailType")
   }
diff --git a/project/oms/apps/develop/AppAiCode/acAdd.vue b/project/oms/apps/develop/AppAiCode/acAdd.vue
index fae4428d..f40d1af9 100644
--- a/project/oms/apps/develop/AppAiCode/acAdd.vue
+++ b/project/oms/apps/develop/AppAiCode/acAdd.vue
@@ -1,7 +1,11 @@
 <template>
   <section class="acAdd">
     <ai-detail list>
-      <ai-title slot="title" :title="pageTitle"/>
+      <ai-title slot="title" :title="pageTitle">
+        <template #rightBtn>
+          <el-button type="primary" v-if="isEdit" @click="top.handleGetCode($route.query.id)">生成代码</el-button>
+        </template>
+      </ai-title>
       <template #content>
         <el-form ref="AcForm" :model="form" size="small" label-width="120px" :rules="rules">
           <el-tabs tab-position="left" @tab-click="handleSyncProps">
@@ -88,6 +92,9 @@ export default {
     dict: Object,
     permissions: Function
   },
+  inject: {
+    top: {}
+  },
   computed: {
     isEdit: v => !!v.$route.query.id,
     pageTitle: v => v.isEdit ? "编辑应用" : "新增应用"
@@ -164,7 +171,7 @@ export default {
         }
       }
       return false;
-    }
+    },
   },
   created() {
     this.getDetail()
diff --git a/project/oms/apps/develop/AppAiCode/acList.vue b/project/oms/apps/develop/AppAiCode/acList.vue
index 892bf7e3..7f4dc68d 100644
--- a/project/oms/apps/develop/AppAiCode/acList.vue
+++ b/project/oms/apps/develop/AppAiCode/acList.vue
@@ -18,7 +18,7 @@
             <template slot-scope="{row}">
               <el-button type="text" @click="handleAdd(row.id)">编辑</el-button>
               <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
-              <el-button type="text" v-if="row.download&&row.target" @click="handleDownload(row)">下载</el-button>
+              <el-button type="text" v-if="row.download&&row.target" @click="top.handleGetCode(row.id)">下载</el-button>
             </template>
           </el-table-column>
         </ai-table>
@@ -35,6 +35,9 @@ export default {
     dict: Object,
     permissions: Function
   },
+  inject: {
+    top: {}
+  },
   data() {
     return {
       search: {name: ""},

From ff322874e299104369478667c9e579974499deea Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 22 Jun 2022 11:24:21 +0800
Subject: [PATCH 35/68] =?UTF-8?q?=E4=BD=8E=E4=BB=A3=E7=A0=81=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/develop/AppAiCode/AppAiCode.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/oms/apps/develop/AppAiCode/AppAiCode.vue b/project/oms/apps/develop/AppAiCode/AppAiCode.vue
index 8abd0500..333768c0 100644
--- a/project/oms/apps/develop/AppAiCode/AppAiCode.vue
+++ b/project/oms/apps/develop/AppAiCode/AppAiCode.vue
@@ -41,7 +41,7 @@ export default {
           let blob = new Blob([res], {type: 'application/zip'})
           link.style.display = 'none'
           link.href = URL.createObjectURL(blob)
-          link.setAttribute('download', row.name + '.zip')
+          link.setAttribute('download', 'aicode.zip')
           document.body.appendChild(link)
           link.click()
           document.body.removeChild(link)

From 1c54bac79c738f2709ae592e22837532efaeb96f Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 22 Jun 2022 16:54:27 +0800
Subject: [PATCH 36/68] =?UTF-8?q?=E4=BD=8E=E4=BB=A3=E7=A0=81=E5=89=8D?=
 =?UTF-8?q?=E7=AB=AF=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/develop/AppAiCode/acAdd.vue  | 7 +++----
 project/oms/apps/develop/AppAiCode/acList.vue | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/project/oms/apps/develop/AppAiCode/acAdd.vue b/project/oms/apps/develop/AppAiCode/acAdd.vue
index f40d1af9..b520aa45 100644
--- a/project/oms/apps/develop/AppAiCode/acAdd.vue
+++ b/project/oms/apps/develop/AppAiCode/acAdd.vue
@@ -26,9 +26,7 @@
                         <el-input v-model="form.rightCode" clearable placeholder="请输入"/>
                       </el-form-item>
                       <el-form-item label="详情方式" prop="detailType">
-                        <el-radio-group v-model="form.detailType">
-                          <el-radio v-for="op in dict.getDict('detailType')" :key="op.dictValue" :label="op.dictValue">{{ op.dictName }}</el-radio>
-                        </el-radio-group>
+                        <ai-select v-model="form.detailType" :selectList="dict.getDict('detailType')"/>
                       </el-form-item>
                     </div>
                   </el-row>
@@ -101,7 +99,7 @@ export default {
   },
   data() {
     return {
-      form: {detailType: "0", props: [], btns: []},
+      form: {props: [], btns: []},
       rules: {
         name: {required: true, message: "请输入应用名称"},
         appName: {required: true, message: "请输入应用模块"},
@@ -110,6 +108,7 @@ export default {
       colConfigs: [
         {slot: 'prop', label: "字段"},
         {slot: 'label', label: "名称"},
+        {slot: 'dict', label: "字典"},
         {slot: 'isSearch', label: "搜索字段", align: 'center', type: 'checkBox'},
         {slot: 'isTable', label: "表格字段", align: 'center', type: 'checkBox'},
         {slot: 'isDetail', label: "详情字段", align: 'center', type: 'chbShow'},
diff --git a/project/oms/apps/develop/AppAiCode/acList.vue b/project/oms/apps/develop/AppAiCode/acList.vue
index 7f4dc68d..3cbc89eb 100644
--- a/project/oms/apps/develop/AppAiCode/acList.vue
+++ b/project/oms/apps/develop/AppAiCode/acList.vue
@@ -18,7 +18,7 @@
             <template slot-scope="{row}">
               <el-button type="text" @click="handleAdd(row.id)">编辑</el-button>
               <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
-              <el-button type="text" v-if="row.download&&row.target" @click="top.handleGetCode(row.id)">下载</el-button>
+              <el-button type="text" @click="top.handleGetCode(row.id)">下载</el-button>
             </template>
           </el-table-column>
         </ai-table>
@@ -46,7 +46,7 @@ export default {
       colConfigs: [
         {label: "应用名称", prop: "name", width: 200},
         {label: "应用模块", prop: "appName"},
-        {label: "权限码", prop: "target"},
+        {label: "权限码", prop: "rightCode"},
         {label: "详情展示方式", prop: "detailType", dict: "detailType"},
       ],
     }

From 503416902c6db40943a20cb10588ad96bfd6e1cb Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 22 Jun 2022 17:45:00 +0800
Subject: [PATCH 37/68] BUG 30288

---
 packages/conv/creditScore/scoreSysUser/ssuDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/conv/creditScore/scoreSysUser/ssuDetail.vue b/packages/conv/creditScore/scoreSysUser/ssuDetail.vue
index f37c5fb9..ac28dd80 100644
--- a/packages/conv/creditScore/scoreSysUser/ssuDetail.vue
+++ b/packages/conv/creditScore/scoreSysUser/ssuDetail.vue
@@ -41,7 +41,7 @@
               </template>
             </ai-search-bar>
             <ai-table :tableData="tableData" :col-configs="colConfigs" :total="page.total" border :dict="dict" :current.sync="page.current"
-                      :size.sync="page.size" @getDetail="getDetail"/>
+                      :size.sync="page.size" @getList="getDetail"/>
           </template>
         </ai-card>
       </template>

From 3b58dec324c859019cf3a49afa4b615260b3d5ce Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 23 Jun 2022 10:29:59 +0800
Subject: [PATCH 38/68] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=8B=E5=8A=A8?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=96=E6=B6=88=E6=89=93=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/router/axios.js                      |  2 +-
 .../oms/apps/develop/AppDeploy/AppDeploy.vue  | 62 +++++++++++++------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/examples/router/axios.js b/examples/router/axios.js
index 1970deeb..511a36e5 100644
--- a/examples/router/axios.js
+++ b/examples/router/axios.js
@@ -9,7 +9,7 @@ let baseURLs = {
 instance.defaults.baseURL = baseURLs[process.env.NODE_ENV]
 instance.interceptors.request.use(config => {
   if (config.url.startsWith("/node")) {
-    config.baseURL = "/lns"
+    config.baseURL = "/ns"
   } else if (/\/project\/beta/.test(location.pathname)) {
     config.baseURL = "/wg"
   } else if (/\/project\/sass/.test(location.pathname)) {
diff --git a/project/oms/apps/develop/AppDeploy/AppDeploy.vue b/project/oms/apps/develop/AppDeploy/AppDeploy.vue
index a8f2b468..fbaa6cb2 100644
--- a/project/oms/apps/develop/AppDeploy/AppDeploy.vue
+++ b/project/oms/apps/develop/AppDeploy/AppDeploy.vue
@@ -32,15 +32,16 @@
             <template slot-scope="{row}">
               <el-button type="text" @click="handleEdit(row)">编辑</el-button>
               <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
-              <el-button type="text" @click="handleZip(row)">打包更新</el-button>
-              <el-button type="text" v-if="row.download&&row.target" @click="handleDownload(row)">下载</el-button>
+              <el-button type="text" @click="handleZip(row)" v-if="row.count==0">打包更新</el-button>
+              <el-button type="text" @click="handleCancelZip(row)" v-else>停止打包</el-button>
+              <el-button type="text" v-if="row.target" @click="handleDownload(row)">下载</el-button>
             </template>
           </el-table-column>
         </ai-table>
       </template>
     </ai-list>
     <ai-dialog :visible.sync="dialog" title="部署任务设置" width="700px" @close="form={}" @onConfirm="submit">
-      <el-form ref="DialogForm" :model="form" size="small" label-width="120px" :rules="rules">
+      <el-form ref="DialogForm" :model="form" size="small" label-width="100px" :rules="rules">
         <el-form-item label="项目/系统" prop="name">
           <el-input v-model="form.name" clearable placeholder="请输入"/>
         </el-form-item>
@@ -59,9 +60,12 @@
         <el-form-item label="打包地址" prop="webUrl">
           <el-input v-model="form.zipPath" clearable placeholder="请输入"/>
         </el-form-item>
-        <el-form-item label="开发环境nginx" prop="target">
+        <el-form-item label="nginx路径" prop="target">
           <el-input v-model="form.target" clearable placeholder="请输入"/>
         </el-form-item>
+        <el-form-item label="node版本" prop="nodeVersion">
+          <el-input v-model="form.nodeVersion" clearable placeholder="请输入"/>
+        </el-form-item>
       </el-form>
     </ai-dialog>
   </section>
@@ -85,9 +89,10 @@ export default {
       return [
         {prop: "libShell", label: "打包脚本", width: 100},
         {prop: "updateShell", label: "更新脚本", width: 100},
-        {prop: "zipPath", label: "打包地址", width: 100},
-        {prop: "target", label: "nginx地址", width: 100},
+        {prop: "zipPath", label: "打包地址", width: 100, isLine},
+        {prop: "target", label: "nginx路径", width: 100, isLine},
         {prop: "webUrl", label: "项目URL", width: 100},
+        {prop: "nodeVersion", label: "node打包版本", width: 100},
       ]
     },
   },
@@ -100,8 +105,7 @@ export default {
         {slot: "expand"},
         {label: "项目/系统名称", prop: "name", width: 200},
         {label: "系统类型", prop: "type", dict: "systemType", width: 80},
-        {label: "项目URL", prop: "webUrl"},
-        {label: "nginx地址", prop: "target"},
+        {label: "nginx路径", prop: "target"},
         {slot: "process"},
         {slot: "options"}
       ],
@@ -109,7 +113,8 @@ export default {
       form: {},
       rules: {
         name: {required: true, message: "请输入项目/系统名称"},
-      }
+      },
+      timer: {}
     }
   },
   methods: {
@@ -144,29 +149,28 @@ export default {
       })
     },
     handleZip(row) {
-      let {id} = row
+      let {id} = row, {timer} = this
       this.instance.post("/node/autodeploy/getZip", null, {
         params: {id}
       }).then(res => {
         if (res?.code == 0) {
           row.count = 1
-          let timer = setInterval(() => {
+          timer[id] = setInterval(() => {
             if (row.count >= 100) {
-              clearInterval(timer)
+              clearInterval(timer[id])
+              row.count = 0
               this.$message.error("打包失败!")
-            } else if (row.count <= 20 && row.target) {
+            } else if (row.count <= 10 && row.target) {
               row.count++
             } else this.handleConfirmZip(row).then(v => {
               if (v.error) {
-                clearInterval(timer)
+                clearInterval(timer[id])
                 this.$message.error("打包失败!")
-                row.download = v.download
-                row.error = v.error
+                this.refreshRow(row, v)
                 row.count = 0
               } else if (v.download) {
-                clearInterval(timer)
-                row.download = v.download
-                row.error = v.error
+                clearInterval(timer[id])
+                this.refreshRow(row, v)
                 row.count = 0
               } else row.count++
             })
@@ -174,6 +178,23 @@ export default {
         }
       })
     },
+    refreshRow(row, v) {
+      row.error = v.error
+      row.download = v.download
+      row.zipTime = v.zipTime
+    },
+    handleCancelZip(row) {
+      let {id} = row
+      return this.instance.post("/node/autodeploy/cancelZip", null, {
+        params: {id}
+      }).then(res => {
+        if (res?.code == 0) {
+          clearInterval(this.timer[id])
+          row.count = 0
+          this.handleConfirmZip(row).then(v => this.refreshRow(row, v))
+        }
+      })
+    },
     handleEdit(row) {
       this.form = JSON.parse(JSON.stringify(row))
       this.dialog = true
@@ -220,6 +241,9 @@ export default {
   created() {
     this.dict.load("systemType")
     this.getTableData()
+  },
+  beforeDestroy() {
+    Object.values(this.timer).map(t => clearInterval(t))
   }
 }
 </script>

From a751e3e70b7e84eb6366002a78ef8a261983fde5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 23 Jun 2022 11:06:48 +0800
Subject: [PATCH 39/68] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue b/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
index c9b64c26..25126bf7 100644
--- a/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
+++ b/project/oms/apps/develop/AppDeployWxmp/AppDeployWxmp.vue
@@ -228,5 +228,6 @@ export default {
 
 <style lang="scss" scoped>
 .AppDeployWxmp {
+  height: 100%;
 }
 </style>

From cc283155a1685db4d53eb655f97b3439910f3da9 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 23 Jun 2022 14:00:34 +0800
Subject: [PATCH 40/68] BUG 30299

---
 .../mattersConfig/components/processApproval.vue              | 4 ++--
 .../mattersConfig/components/processApproval.vue              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/work/processManagement/mattersConfig/components/processApproval.vue b/packages/work/processManagement/mattersConfig/components/processApproval.vue
index 52f8a374..fc67ed96 100644
--- a/packages/work/processManagement/mattersConfig/components/processApproval.vue
+++ b/packages/work/processManagement/mattersConfig/components/processApproval.vue
@@ -45,7 +45,7 @@
                 </div>
               </div>
               <ai-wechat-selecter slot="append" :instance="instance" :props="{id:'wxUserId',label:'name'}"
-                                    v-model="item.candidateList" v-if="item.candidateApproverType==1">
+                                  v-model="item.candidateList" v-if="item.candidateApproverType==1">
                 <el-button size="mini" type="primary">选择指定人员</el-button>
               </ai-wechat-selecter>
             </div>
@@ -206,7 +206,7 @@ export default {
         nodeIndex: '',
         nodeName: '',
         nodeType: '',
-        scopeCandidates: ''
+        scopeCandidates: '1'
       };
       this.$refs['addForm'].resetFields();
     },
diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
index 4ae50b42..c39774c9 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
@@ -253,7 +253,7 @@ export default {
         nodeIndex: '',
         nodeName: '',
         nodeType: '',
-        scopeCandidates: ''
+        scopeCandidates: '1'
       };
       this.$refs.addForm?.resetFields();
     },

From 1a3827e541cc777aed389add919d2214f1f26377 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 23 Jun 2022 14:28:48 +0800
Subject: [PATCH 41/68] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/processApproval.vue            | 11 ++--
 .../components/processApproval.vue            | 54 +++++++++----------
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/packages/work/processManagement/mattersConfig/components/processApproval.vue b/packages/work/processManagement/mattersConfig/components/processApproval.vue
index fc67ed96..fb65fc9a 100644
--- a/packages/work/processManagement/mattersConfig/components/processApproval.vue
+++ b/packages/work/processManagement/mattersConfig/components/processApproval.vue
@@ -53,8 +53,8 @@
         </el-steps>
       </template>
     </ai-card>
-    <el-dialog :title="titleType" class="editStyle" :visible.sync="isAddStep" width="575px" height="380px"
-               :close-on-click-modal="false">
+    <ai-dialog :title="titleType" class="editStyle" :visible.sync="isAddStep" width="575px" height="380px"
+               :close-on-click-modal="false" @onConfirm="saveAddProgress('addForm')">
       <el-form :model="nodeObj" label-width="120px" ref="addForm" :rules="addRules">
         <el-form-item label="审批步骤名称：" prop="nodeName">
           <el-input size="small" v-model="nodeObj.nodeName" placeholder="如：部门主管审批（限10个字）" :maxLength="10"
@@ -87,12 +87,7 @@
           </el-radio-group>
         </el-form-item>
       </el-form>
-      <div slot="footer" style="text-align: center;">
-        <el-button style="width: 92px;" size="small" @click="isAddStep = false">取消</el-button>
-        <el-button style="width: 92px;" size="small" type="primary" @click="saveAddProgress('addForm')">确认
-        </el-button>
-      </div>
-    </el-dialog>
+    </ai-dialog>
   </div>
 </template>
 
diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
index c39774c9..72729ffd 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
@@ -73,8 +73,8 @@
         </el-steps>
       </template>
     </ai-card>
-    <el-dialog :title="titleType" class="editStyle" :visible.sync="isAddStep" width="575px" height="380px"
-               :close-on-click-modal="false">
+    <ai-dialog :title="titleType" class="editStyle" :visible.sync="isAddStep" width="575px" height="380px"
+               :close-on-click-modal="false" @onConfirm="saveAddProgress">
       <el-form size="small" :model="nodeObj" label-width="120px" ref="addForm" :rules="addRules">
         <el-form-item label="审批步骤名称" prop="nodeName">
           <el-input v-model="nodeObj.nodeName" placeholder="如：部门主管审批（限10个字）" :maxLength="10"
@@ -104,32 +104,32 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="数据权限" prop="areaFilter">
-          <el-radio-group v-model="nodeObj.areaFilter">
-            <el-radio :label="0">不限
-              <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看全部申报事项">
-                <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
-              </el-popover>
-            </el-radio>
-            <el-radio :label="1">村社区
-              <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看本村申报事项">
-                <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
-              </el-popover>
-            </el-radio>
-            <el-radio :label="2">镇街
-              <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看本镇申报事项">
-                <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
-              </el-popover>
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
+        <template v-if="nodeObj.nodeType==2">
+          <el-form-item label="数据权限" prop="areaFilter">
+            <el-radio-group v-model="nodeObj.areaFilter">
+              <el-radio :label="0">不限
+                <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看全部申报事项">
+                  <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
+                </el-popover>
+              </el-radio>
+              <el-radio :label="1">村社区
+                <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看本村申报事项">
+                  <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
+                </el-popover>
+              </el-radio>
+              <el-radio :label="2">镇街
+                <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看本镇申报事项">
+                  <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
+                </el-popover>
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="附件图片" prop="areaFilter">
+
+          </el-form-item>
+        </template>
       </el-form>
-      <div slot="footer" style="text-align: center;">
-        <el-button style="width: 92px;" size="small" @click="isAddStep = false">取消</el-button>
-        <el-button style="width: 92px;" size="small" type="primary" @click="saveAddProgress">确认
-        </el-button>
-      </div>
-    </el-dialog>
+    </ai-dialog>
   </div>
 </template>
 

From 16128af70f3a68d76a8481dd1d41feb872c16150 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 23 Jun 2022 14:59:54 +0800
Subject: [PATCH 42/68] =?UTF-8?q?=E7=A7=80=E5=B1=B1=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/processApproval.vue            | 102 ++++++------------
 1 file changed, 31 insertions(+), 71 deletions(-)

diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
index 72729ffd..e9b26eed 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
@@ -44,25 +44,8 @@
                   </el-button>
                 </div>
               </div>
-              <!-- <ai-wechat-selecter slot="append" :instance="instance" :props="{id:'wxUserId',label:'name'}"
-                                    v-model="item.candidateList" v-if="item.candidateApproverType==1">
-                <el-button size="mini" type="primary">选择指定人员</el-button>
-              </ai-wechat-selecter> -->
-              <!-- <ai-user-picker :instance="instance" v-model="item.candidateList"  v-if="item.candidateApproverType==1"/> -->
-              <!-- <ai-people :showAiArea="false" customCliker :instance="instance"
-                        unitUrl="/admin/sysunit/getAll2"
-                        :meta="[]" v-model="item.candidateList"
-                        v-if="item.candidateApproverType==1">
-                <el-button size="mini" type="primary">选择指定人员</el-button>
-              </ai-people> -->
-
-              <!-- <ai-user-picker :instance="instance" v-model="form.portalUserId"/> -->
-              <ai-person-select
-                  :chooseUserList="item.candidateList"
-                  v-if="item.candidateApproverType==1"
-                  :instance="instance" customRightText url="/user/page"
-                  headerTitle="人员列表" dialogTitle="选择" :isMultiple="true"
-                  @selectPerson="e => changeCharge(e, index)">
+              <ai-person-select :chooseUserList="item.candidateList" v-if="item.candidateApproverType==1" :instance="instance" customRightText url="/user/page"
+                                headerTitle="人员列表" dialogTitle="选择" :isMultiple="true" @selectPerson="e => changeCharge(e, index)">
                 <template v-slot:option="{ item }">
                   <span class="iconfont iconProlife">{{ item.name }}</span>
                   <span>{{ item.phone }}</span>
@@ -75,31 +58,16 @@
     </ai-card>
     <ai-dialog :title="titleType" class="editStyle" :visible.sync="isAddStep" width="575px" height="380px"
                :close-on-click-modal="false" @onConfirm="saveAddProgress">
-      <el-form size="small" :model="nodeObj" label-width="120px" ref="addForm" :rules="addRules">
-        <el-form-item label="审批步骤名称" prop="nodeName">
-          <el-input v-model="nodeObj.nodeName" placeholder="如：部门主管审批（限10个字）" :maxLength="10"
-                    clearable/>
+      <el-form size="small" :model="nodeObj" label-width="100px" ref="addForm" :rules="addRules">
+        <el-form-item label="审批步骤" prop="nodeName">
+          <el-input v-model="nodeObj.nodeName" placeholder="如：部门主管审批（限10个字）" :maxLength="10" clearable/>
         </el-form-item>
         <el-form-item label="审批方式" prop="nodeType">
-          <el-radio-group v-model="nodeObj.nodeType">
-            <el-radio :label="2">或签
-              <el-popover
-                  placement="top-start"
-                  width="200"
-                  trigger="click"
-                  content="或签是指该节点指定多名负责人审批时，其中任何一人完成审批即可。适合一个事项只需要某个岗位任何一人审批即可的业务场景。">
-                <el-button class="el-icon-warning" slot="reference"
-                           style="padding:0;height:14px;border:0;"></el-button>
-              </el-popover>
-            </el-radio>
-            <el-radio :label="3">抄送
-              <el-popover
-                  placement="top-start"
-                  width="200"
-                  trigger="click"
-                  content="抄送是指一个事项审批完成后，抄送给需要知晓的单位或个人，被抄送的对象可以查阅该事项内容，无需审批。适合一个事项无需对方审批，但审批完成后需要通知对方知晓的业务场景。">
-                <el-button class="el-icon-warning" slot="reference"
-                           style="padding:0;height:14px;border:0;"></el-button>
+          <el-radio-group v-model="nodeObj.nodeType" @change="nodeObj.areaFilter='',nodeObj.annexEnable='',nodeObj.pictureEnable=''">
+            <el-radio v-for="op in approvalWays" :key="op.value" :label="op.value">
+              <span v-text="op.label"/>
+              <el-popover placement="top-start" width="200" trigger="click" :content="op.tips">
+                <el-button type="text" slot="reference" icon="el-icon-warning" class="color-666"/>
               </el-popover>
             </el-radio>
           </el-radio-group>
@@ -107,25 +75,17 @@
         <template v-if="nodeObj.nodeType==2">
           <el-form-item label="数据权限" prop="areaFilter">
             <el-radio-group v-model="nodeObj.areaFilter">
-              <el-radio :label="0">不限
-                <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看全部申报事项">
-                  <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
-                </el-popover>
-              </el-radio>
-              <el-radio :label="1">村社区
-                <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看本村申报事项">
-                  <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
-                </el-popover>
-              </el-radio>
-              <el-radio :label="2">镇街
-                <el-popover placement="top-start" width="200" trigger="click" content="审批人员可查看本镇申报事项">
-                  <el-button class="el-icon-warning" slot="reference" style="padding:0;height:14px;border:0;"/>
+              <el-radio v-for="op in dict.getDict('processNodeAreaFilter')" :key="op.dictValue" :label="op.dictValue">
+                <span v-text="op.dictName"/>
+                <el-popover placement="top-start" width="200" trigger="click" :content="dict.getLabel('processNodeAreaFilterTips',op.dictValue)">
+                  <el-button type="text" slot="reference" icon="el-icon-warning" class="color-666"/>
                 </el-popover>
               </el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="附件图片" prop="areaFilter">
-
+          <el-form-item label="附件图片">
+            <el-checkbox v-model="nodeObj.annexEnable" label="1">附件</el-checkbox>
+            <el-checkbox v-model="nodeObj.pictureEnable" label="1">图片</el-checkbox>
           </el-form-item>
         </template>
       </el-form>
@@ -149,7 +109,10 @@ export default {
       form: {
         processNodeList: [],
       },
-      areaId: "",
+      approvalWays: [
+        {value: 2, label: '或签', tips: '或签是指该节点指定多名负责人审批时，其中任何一人完成审批即可。适合一个事项只需要某个岗位任何一人审批即可的业务场景。'},
+        {value: 3, label: '抄送', tips: '抄送是指一个事项审批完成后，抄送给需要知晓的单位或个人，被抄送的对象可以查阅该事项内容，无需审批。适合一个事项无需对方审批，但审批完成后需要通知对方知晓的业务场景。'},
+      ],
       isAddStep: false,
       isSelectImg: false,
       isSelectUnit: false,
@@ -190,15 +153,11 @@ export default {
     handleProcessApproval() {
       return Promise.resolve(this.form)
     },
-    /**
-     *删除
-     * */
     deleteInfo(index) {
       this.$confirm("是否删除").then(() => {
         this.form.processNodeList.splice(index, 1)
-      })
+      }).catch(() => 0)
     },
-
     changeCharge(e, i) {
       this.$set(this.form.processNodeList[i], 'candidateList', e.map(v => {
         return {
@@ -209,9 +168,6 @@ export default {
     },
     /**
      * 添加流程
-     * @param index
-     * @param item
-     * @param i
      */
     addAppStep(index, item, i) {
       this.isAddStep = true;
@@ -223,7 +179,7 @@ export default {
         item.areaFilter = item.areaFilter * 1;
         item.candidateApproverType = item.candidateApproverType * 1;
         item.scopeCandidates = item.scopeCandidates * 1;
-        this.nodeObj = JSON.parse(JSON.stringify(item));
+        this.nodeObj = this.$copy(item)
       } else {
         this.titleType = '添加审批步骤';
         if (this.form.processNodeList.length > 0) {
@@ -237,9 +193,9 @@ export default {
         if (valid) {
           if (this.nodeObj.scopeCandidates == 0) this.nodeObj.candidateList = [];
           if (this.indexType == 1) {
-            this.form.processNodeList.push(JSON.parse(JSON.stringify(this.nodeObj)));
+            this.form.processNodeList.push(this.$copy(this.nodeObj));
           } else {
-            this.form.processNodeList.splice(this.bomIndex, 1, JSON.parse(JSON.stringify(this.nodeObj)));
+            this.form.processNodeList.splice(this.bomIndex, 1, this.$copy(this.nodeObj));
           }
           this.$refs.addForm.resetFields();
           this.isAddStep = false;
@@ -259,7 +215,7 @@ export default {
     },
   },
   created() {
-    this.areaId = this.user.info.areaId.substring(0, 6) + '000000'
+    this.dict.load("processNodeAreaFilter", 'processNodeAreaFilterTips')
     if (this.config.detailObj?.id) {
       Object.keys(this.form).map(e => this.form[e] = this.config.detailObj[e])
     }
@@ -442,6 +398,10 @@ export default {
     }
   }
 
+  .color-666 {
+    color: #666;
+  }
+
   .dia_per_content {
     width: 640px;
     height: 400px;
@@ -511,7 +471,7 @@ export default {
   .peraoBtn {
     .el-button--text {
       color: #333;
-      font-size: 12px;
+      font-size: 14px;
     }
   }
 

From 90ab2dec01d6ddf0d878a3c5a592e8cace6735be Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 23 Jun 2022 15:58:25 +0800
Subject: [PATCH 43/68] =?UTF-8?q?=E7=A7=80=E5=B1=B1=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/processApproval.vue            |  3 +-
 .../mattersConfig/AppMattersConfig.vue        | 11 ++----
 .../mattersConfig/components/addConfig.vue    | 34 +++++++------------
 .../mattersConfig/components/applyForm.vue    | 10 +-----
 .../components/processApproval.vue            | 22 +++++-------
 5 files changed, 25 insertions(+), 55 deletions(-)

diff --git a/packages/work/processManagement/mattersConfig/components/processApproval.vue b/packages/work/processManagement/mattersConfig/components/processApproval.vue
index fb65fc9a..3e5dfc67 100644
--- a/packages/work/processManagement/mattersConfig/components/processApproval.vue
+++ b/packages/work/processManagement/mattersConfig/components/processApproval.vue
@@ -170,7 +170,6 @@ export default {
         this.titleType = '编辑审批步骤';
         item.nodeType = item.nodeType * 1;
         item.candidateApproverType = item.candidateApproverType * 1;
-        item.scopeCandidates = item.scopeCandidates * 1;
         this.nodeObj = JSON.parse(JSON.stringify(item));
       } else {
         this.titleType = '添加审批步骤';
@@ -183,7 +182,7 @@ export default {
     saveAddProgress(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          if (this.nodeObj.scopeCandidates == 0) this.nodeObj.candidateList = [];
+          if (this.nodeObj.scopeCandidates == '0') this.nodeObj.candidateList = [];
           if (this.indexType == 1) {
             this.form.processNodeList.push(JSON.parse(JSON.stringify(this.nodeObj)));
           } else {
diff --git a/project/xiushan/apps/processManagement/mattersConfig/AppMattersConfig.vue b/project/xiushan/apps/processManagement/mattersConfig/AppMattersConfig.vue
index 0541ffb2..654e0818 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/AppMattersConfig.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/AppMattersConfig.vue
@@ -13,7 +13,7 @@
         </el-tabs>
       </template>
     </ai-list>
-    <component v-else :is="currentComp" :instance="instance" :dict="dict" :processType="currentTab.value" :row="row" @back="back"/>
+    <component v-else :is="currentTab.detail" :instance="instance" :dict="dict" :processType="currentTab.value" :row="row" @back="back"/>
   </section>
 </template>
 
@@ -35,7 +35,6 @@ export default {
     return {
       currIndex: "0",
       row: {},
-      currentComp: "",
     }
   },
   computed: {
@@ -49,22 +48,18 @@ export default {
       return this.tabs?.[this.currIndex] || {}
     },
     showDetail() {
-      return !!this.$route.query?.id || !!this.$route.query?.processType
+      return this.$route.hash == "#add" || !!this.$route.query?.processType
     }
   },
   methods: {
     goPage(params) {
-      this.row = params.row
-      this.currentComp = params.comp
-      this.$router.push({query: {processType: this.currentTab.value}})
+      this.$router.push({query: {id: params.row.id}, hash: "#add"})
     },
-
     back() {
       this.$router.push({query: {}})
     }
   },
   created() {
-    this.$router.push({query: {}});
     this.$dict.load("hbDepartment", 'sex', 'nation', 'marital', 'native_place', 'education', 'candidateApproverType', 'scopeCandidates', 'nodeType')
   }
 }
diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue b/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
index 2e73bd7a..aace9a65 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
@@ -9,12 +9,12 @@
           </el-steps>
         </div>
       </template>
-      <template #content v-if="refresh">
-        <baseInfo ref="baseInfo" :instance="instance" :dict="dict" v-show="activeStep==0"/>
+      <template #content v-if="detailObj.id">
+        <baseInfo ref="baseInfo" :instance="instance" :dict="dict" v-if="activeStep==0"/>
         <applyForm ref="applyForm" :instance="instance" :dict="dict" v-show="activeStep==1"/>
-        <attachmentMaterial ref="attachmentMaterial" :instance="instance" v-show="activeStep==2"/>
+        <attachmentMaterial ref="attachmentMaterial" :instance="instance" v-if="activeStep==2"/>
         <processApproval ref="processApproval" :approvalSteps="applyForm.approvalSteps" :instance="instance"
-                         :dict="dict" v-show="activeStep==3"/>
+                         :dict="dict" v-if="activeStep==3"/>
       </template>
       <template #footer>
         <el-button class="btn" v-if="activeStep==0" @click="handleBack">取消</el-button>
@@ -39,12 +39,10 @@ export default {
   props: {
     instance: Function,
     dict: Object,
-    row: Object
   },
   components: {baseInfo, applyForm, attachmentMaterial, processApproval},
   data() {
     return {
-      activeStep: 0,
       baseInfo: {},
       applyForm: {
         tableId: "",
@@ -52,7 +50,7 @@ export default {
       },
       processAnnexDefs: [],
       detailObj: {},
-      refresh: true
+      activeStep: 0
     }
   },
   computed: {
@@ -66,7 +64,7 @@ export default {
     },
     detailTitle() {
       return this.detailObj?.id ? "编辑事项" : "添加事项"
-    }
+    },
   },
   methods: {
     /**
@@ -103,9 +101,9 @@ export default {
       }
     },
     handleBaseInfo() {
-      this.$refs['baseInfo'].banseInfoForm().then(res => {
+      this.$refs.baseInfo.banseInfoForm().then(res => {
         if (res) {
-          this.$refs['applyForm'].getFormList()
+          this.$refs.applyForm?.getFormList()
           this.baseInfo = res
           this.activeStep++
         }
@@ -115,18 +113,17 @@ export default {
      * 保存
      */
     save() {
-      this.$refs['processApproval'].handleProcessApproval().then(res => {
+      this.$refs.processApproval?.handleProcessApproval().then(res => {
         this.instance.post(`/approval-process-def/add-update`, {
           ...this.detailObj,
           ...this.baseInfo,
           processDefStatus: Number(this.baseInfo.processDefStatus),
           tableId: this.applyForm.tableId,
-          processType: 0,
           tableType: 2,
-          processAnnexDefs: this.annexs.map(e => ({...e, mustFill: Number(e.mustFill)})),
+          processAnnexDefs: this.annexs?.map(e => ({...e, mustFill: Number(e.mustFill)})),
           processNodeList: res.processNodeList
         }).then(res => {
-          if (res.code == 0) {
+          if (res?.code == 0) {
             this.$message.success("保存成功")
             this.$emit("back")
           }
@@ -139,7 +136,6 @@ export default {
       this.instance.post(`/approval-process-def/info-id`, null, {params: {id}}).then(res => {
         if (res?.data) {
           this.detailObj = res.data
-          this.refreshDetail()
         }
       })
     },
@@ -148,19 +144,13 @@ export default {
       else if (this.activeStep == rowIndex) return "iconfont iconSteps_In_Progress"
       return ""
     },
-    refreshDetail() {
-      this.refresh = false
-      this.$nextTick(() => this.refresh = true)
-    },
     handleBack() {
       this.detailObj?.id && this.$router.push({query: {}})
       this.$emit('back')
     }
   },
   created() {
-    if (this.row.id) {
-      this.getDetail(this.row.id)
-    }
+    this.getDetail(this.$route.query.id)
   }
 }
 </script>
diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/applyForm.vue b/project/xiushan/apps/processManagement/mattersConfig/components/applyForm.vue
index 756ccac4..587976d1 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/applyForm.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/applyForm.vue
@@ -29,15 +29,7 @@
               <el-checkbox :label="p.dictName" v-for="(p,i) in dict.getDict(e.dictionaryCode)"
                            :key="Math.random()"></el-checkbox>
             </el-checkbox-group>
-
-            <el-select placeholder="请选择" disabled size="small" clearable style="width: 100%;" v-if="e.fieldDataType==9">
-              <el-option
-                  v-for="(item,i) in dict.getDict(e.fieldDbName)" :key="i"
-                  :label="item.dictName"
-                  :value="item.dictValue">
-              </el-option>
-            </el-select>
-
+            <ai-select v-if="e.fieldDataType==9" disabled/>
             <el-date-picker
                 v-model="form.picker"
                 v-if="['2','3','7','8'].includes(e.fieldDataType)"
diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
index e9b26eed..d94a5a92 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
@@ -84,8 +84,8 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="附件图片">
-            <el-checkbox v-model="nodeObj.annexEnable" label="1">附件</el-checkbox>
-            <el-checkbox v-model="nodeObj.pictureEnable" label="1">图片</el-checkbox>
+            <el-checkbox v-model="nodeObj.annexEnable" true-label="1" false-label="0">附件</el-checkbox>
+            <el-checkbox v-model="nodeObj.pictureEnable" true-label="1" false-label="0">图片</el-checkbox>
           </el-form-item>
         </template>
       </el-form>
@@ -117,14 +117,7 @@ export default {
       isSelectImg: false,
       isSelectUnit: false,
       isSelectPerson: false,
-      nodeObj: {
-        candidateApproverType: '1',
-        candidateList: [],
-        nodeIndex: '',
-        nodeName: '',
-        nodeType: '',
-        scopeCandidates: ''
-      },
+      nodeObj: {},
       indexType: '',
       titleType: '',
       bomIndex: '',
@@ -176,9 +169,7 @@ export default {
       if (index == 2) {
         this.titleType = '编辑审批步骤';
         item.nodeType = item.nodeType * 1;
-        item.areaFilter = item.areaFilter * 1;
         item.candidateApproverType = item.candidateApproverType * 1;
-        item.scopeCandidates = item.scopeCandidates * 1;
         this.nodeObj = this.$copy(item)
       } else {
         this.titleType = '添加审批步骤';
@@ -191,7 +182,7 @@ export default {
     saveAddProgress() {
       this.$refs.addForm.validate((valid) => {
         if (valid) {
-          if (this.nodeObj.scopeCandidates == 0) this.nodeObj.candidateList = [];
+          if (this.nodeObj.scopeCandidates == '0') this.nodeObj.candidateList = [];
           if (this.indexType == 1) {
             this.form.processNodeList.push(this.$copy(this.nodeObj));
           } else {
@@ -209,7 +200,10 @@ export default {
         nodeIndex: '',
         nodeName: '',
         nodeType: '',
-        scopeCandidates: '1'
+        scopeCandidates: '1',
+        annexEnable: null,
+        pictureEnable: null,
+        areaFilter: null
       };
       this.$refs.addForm?.resetFields();
     },

From 05db88644c9d484c0027ac912323dac95a6f3fac Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Thu, 23 Jun 2022 16:54:06 +0800
Subject: [PATCH 44/68] =?UTF-8?q?=E7=A7=80=E5=B1=B1=E9=9C=80=E6=B1=82?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/approvalDetail.vue             | 74 +++++++------------
 1 file changed, 26 insertions(+), 48 deletions(-)

diff --git a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue
index 3416a170..936411de 100644
--- a/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue
+++ b/project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue
@@ -4,8 +4,8 @@
       <ai-title slot="title" title="审批详情" isShowBack isShowBottomBorder @onBackClick="approval.goBack()">
         <template #rightBtn>
           <template v-if="listType==0&&$permissions('zwsp_oaapprovalapplyinfo_approve')">
-            <el-button size="small" class="iconfont iconClean del-btn-list" @click="agreeRefulse(0)">拒绝</el-button>
-            <el-button size="small" type="primary" class="iconfont iconCorrect" @click="agreeRefulse(1)">同意</el-button>
+            <el-button size="small" icon="iconfont iconClean del-btn-list" @click="agreeRefulse(0)">拒绝</el-button>
+            <el-button size="small" type="primary" icon="iconfont iconCorrect" @click="agreeRefulse(1)">同意</el-button>
           </template>
           <el-button v-if="listType==2&&detail.approvalStatus==0&&$permissions('app_oaapprovalapplyinfo_del')"
                      size="small" class="iconfont iconRevoke del-btn-list" style="width: 76px;" @click="recall">撤回
@@ -157,9 +157,9 @@
                             <span class="li_opinion" v-if="item.annexFiles && item.annexFiles.length>0">审批附件：</span>
                             <div style="flex: 1;">
                               <div class="desc_div">
-                                <img @click="openImg(value.accessUrl)" v-for="(value,_v) in item.pictureFiles" :key="_v"
-                                     :src="value.accessUrl" alt="图片" width="80px" height="80px"
-                                     style="border: 1px solid #ddd;cursor: pointer;">
+                                <el-image v-for="(value,_v) in item.pictureFiles" :key="_v" :preview-src-list="[value.accessUrl]"
+                                          :src="value.accessUrl" alt="图片" width="80px" height="80px"
+                                          style="border: 1px solid #ddd;cursor: pointer;"/>
                               </div>
                               <ul class="file_ul">
                                 <li v-for="(v,_i) in item.annexFiles" :key="_i" @click="downFile(v.accessUrl)">
@@ -205,15 +205,12 @@
       </template>
     </ai-detail>
 
-    <el-dialog :visible.sync="isOpen" width="600px">
-      <img :src="imgUrl" alt="" width="100%" height="500px">
-    </el-dialog>
 
     <!--审批同意、拒绝-->
     <el-dialog :title="titleType" center :visible.sync="isAgree" width="720px" v-loading="loading"
                :close-on-click-modal="false" @close="form.fieldInfos = []">
-      <div style="height: 400px;overflow-y: auto;">
-        <el-form size="small" :model="form" label-width="90px" ref="ruleForm" label-position="right"
+      <div style="max-height: 400px;overflow-y: auto;">
+        <el-form size="small" :model="form" label-width="120px" ref="ruleForm" label-position="right"
                  class="dialog-form">
           <el-form-item v-for="(op,i) in form.fieldInfos" :key="i"
                         :label="op.fieldName + (op.fieldNameSuffix ? op.fieldNameSuffix : '')" class="dynamicFormItem"
@@ -240,15 +237,15 @@
                 type="date"
                 placeholder="请选择">
             </el-date-picker>
-            <ai-select v-if="op.fieldDataType=='9'" v-model="op.fieldValue"
-                       :selectList="dict.getDict(op.dictionaryCode)"/>
+            <ai-select v-if="op.fieldDataType=='9'" v-model="op.fieldValue" :selectList="dict.getDict(op.dictionaryCode)"/>
           </el-form-item>
-          <el-form-item label="审批意见" prop="opinion" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]"
-                        v-if="titleType=='审批拒绝'">
-            <el-input type="textarea" :rows="4" v-model.trim="form.opinion" placeholder="请输入" show-word-limit
-                      :maxlength="150"></el-input>
+          <el-form-item label="指定审批人" prop="appointNextCandidateId" :rules="[{ required: true, message: '请选择指定审批人'}]" v-if="form.nextNodeAreaFilter==3">
+            <ai-select v-model="form.appointNextCandidateId" :selectList="form.nextCandidateList"/>
           </el-form-item>
-          <el-form-item label="图片" prop="imgList" style="position: relative;">
+          <el-form-item label="审批意见" prop="opinion" :rules="[{ required: true, message: '请输入审批意见', trigger: 'blur' }]" v-if="!form.pass">
+            <el-input type="textarea" :rows="4" v-model.trim="form.opinion" placeholder="请输入" show-word-limit :maxlength="150"/>
+          </el-form-item>
+          <el-form-item label="图片" prop="imgList" style="position: relative;" v-if="form.pictureEnable==1">
             <span style="position: absolute;left: -78px;top: 18px;font-size: 12px;color: #999;">（最多9张）</span>
             <el-upload
                 action
@@ -268,7 +265,7 @@
               </div>
             </el-upload>
           </el-form-item>
-          <el-form-item label="附件" prop="fileList">
+          <el-form-item label="附件" prop="fileList" v-if="form.annexEnable==1">
             <el-upload
                 class="upload-demo"
                 action
@@ -324,7 +321,6 @@ export default {
       detailObj: {},
       dataList: [],
       processList: [],
-      titleType: '',
       isAgree: false,
       form: {
         id: '',
@@ -344,7 +340,6 @@ export default {
       fileList: [],
       alreadyList: [],//已审批的
       imgUrl: '',
-      isOpen: false,
       url: "/admin/sysunit/getAll2",
       applyForm: {},
       menuList: ["基本信息", '申请表单', '附件材料', "审批记录"],
@@ -370,7 +365,8 @@ export default {
         {slot: "annex"},
         {slot: "options"}
       ]
-    }
+    },
+    titleType: v => v.form.pass ? '审批同意' : '审批拒绝'
   },
   methods: {
     handleDownload() {
@@ -417,10 +413,6 @@ export default {
       this.fileList = []
       this.isAgree = false
     },
-    openImg(url) {
-      this.isOpen = true;
-      this.imgUrl = url;
-    },
     // 下载
     downFile(url) {
       window.open(url);
@@ -558,36 +550,22 @@ export default {
       let dictionaryArr = []
       this.loading = true
       this.instance.post(`/app/approv-alapply-info/approval-popup?id=${this.detail.id}&type=${index}`).then(res => {
-        this.loading = false
-        if (res && res.data) {
+        if (res?.data) {
           if (index == 1) {
-            res.data.fieldInfos.map(e => {
-              if (e.fieldType == 3 && e.dictionaryCode && dictionaryArr.indexOf(e.dictionaryCode) == -1) {
+            this.form = res.data
+            this.form.fieldInfos = res.data.fieldInfos.filter(e => e.fieldType == 3)
+            this.form.nextCandidateList = this.form.nextCandidateList?.map(e => ({dictValue: e.candidate, dictName: e.name}))
+            this.form.fieldInfos.map(e => {
+              if (e.dictionaryCode && !dictionaryArr.includes(e.dictionaryCode)) {
                 dictionaryArr.push(e.dictionaryCode)
               }
             })
-            if (dictionaryArr.length) {
-              this.dict.load(dictionaryArr).then(() => {
-                this.form.fieldInfos = res.data.fieldInfos.filter(e => e.fieldType == 3)
-              })
-            } else {
-              this.form.fieldInfos = res.data.fieldInfos.filter(e => e.fieldType == 3)
-            }
+            dictionaryArr.length > 0 && this.dict.load(dictionaryArr)
           }
-
+          this.form.pass = index == 1
           this.isAgree = true;
-          if (index == 0) {
-            this.form.pass = false;
-            this.titleType = '审批拒绝';
-          } else {
-            this.form.pass = true;
-            this.titleType = '审批同意';
-          }
         }
-      }).catch(err => {
-        this.loading = false
-        console.log(err);
-      })
+      }).finally(() => this.loading = false)
     },
     saveAgree() {
       this.form.id = this.detail.id;

From 8e04ec040af5c58c9fd1e3f84ba0bf5275c5333f Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Jun 2022 13:51:32 +0800
Subject: [PATCH 45/68] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/main.js                              |   2 +
 package.json                                  |   4 +-
 packages/bigscreen/designer/AppDesigner.vue   |  26 ++-
 .../bigscreen/designer/components/Add.vue     |  61 +++----
 .../bigscreen/designer/components/Layout.vue  |  18 +-
 .../bigscreen/viewer/AppGigscreenViewer.vue   |  25 +--
 packages/index.js                             |   2 +
 project/dvui/AppDVDemo.vue                    | 157 ------------------
 .../dvui/components}/AiDataPanel.vue          |   0
 .../{AiDvPartyOrg => }/AiDvPartyOrg.vue       |   0
 .../dvui/components/AiDvRender.vue            |  41 +++--
 .../dvui/components}/AiStaData.vue            |   0
 .../dvui}/components/AiSwiper.vue             |   0
 .../{AiDvBackground => }/AiDvBackground.vue   |   0
 14 files changed, 78 insertions(+), 258 deletions(-)
 delete mode 100644 project/dvui/AppDVDemo.vue
 rename {packages/bigscreen/ui => project/dvui/components}/AiDataPanel.vue (100%)
 rename project/dvui/components/{AiDvPartyOrg => }/AiDvPartyOrg.vue (100%)
 rename packages/bigscreen/designer/components/RenderElement.vue => project/dvui/components/AiDvRender.vue (90%)
 rename {packages/bigscreen/ui => project/dvui/components}/AiStaData.vue (100%)
 rename {packages/bigscreen/designer => project/dvui}/components/AiSwiper.vue (100%)
 rename project/dvui/layout/{AiDvBackground => }/AiDvBackground.vue (100%)

diff --git a/examples/main.js b/examples/main.js
index 08b4bf8d..6539fb0f 100644
--- a/examples/main.js
+++ b/examples/main.js
@@ -9,10 +9,12 @@ import 'dvcp-ui/lib/styles/common.scss';
 import 'dvcp-ui/lib/dvcp-ui.css';
 import store from './store';
 import dataV from '@jiaminghi/data-view';
+import dvui from '../project/dvui/entries'
 
 Vue.use(dataV);
 Vue.use(ui);
 Vue.use(vcUI);
+Vue.use(dvui)
 //富文本编辑器配置
 Vue.config.productionTip = false;
 Vue.prototype.$axios = axios;
diff --git a/package.json b/package.json
index d1b2e2c5..809cadbc 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "lib:core": "vue-cli-service build --target lib --dest core/dist core/index.js --name dvcp-core&&npm unpublish dvcp-core --force&&npm publish core/",
     "lib:project": "node project/build.js",
     "lib:all": "node project/allProject.js&&npm unpublish --workspaces --force&&npm publish --workspaces",
-    "ui": "npm i dvcp-ui@latest dvcp-dv-ui@latest"
+    "ui": "npm i dvcp-ui@latest"
   },
   "workspaces": [
     "project/*"
@@ -20,8 +20,6 @@
     "@jiaminghi/data-view": "^2.10.0",
     "bin-code-editor": "^0.9.0",
     "dayjs": "^1.8.35",
-    "dvcp-dv": "^1.0.0",
-    "dvcp-dv-ui": "file:project/dvui",
     "dvcp-ui": "^1.42.2",
     "echarts": "^5.1.2",
     "mp4box": "^0.4.1",
diff --git a/packages/bigscreen/designer/AppDesigner.vue b/packages/bigscreen/designer/AppDesigner.vue
index bcacab2f..daf05eba 100644
--- a/packages/bigscreen/designer/AppDesigner.vue
+++ b/packages/bigscreen/designer/AppDesigner.vue
@@ -6,32 +6,28 @@
     <template slot="tabs">
       <el-tabs v-model="currIndex">
         <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
-          <component :urlPrefix="urlPrefix" :areaId="areaId" :ref="tab.name" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance" :dict="dict" :permissions="permissions" />
+          <component :urlPrefix="urlPrefix" :areaId="areaId" :ref="tab.name" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance"
+                     :dict="dict" :permissions="permissions"/>
         </el-tab-pane>
       </el-tabs>
     </template>
   </ai-list>
-  <Add v-else-if="componentName === 'Add'" :urlPrefix="urlPrefix" :areaId="areaId" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></Add>
-  <SourceData v-else-if="componentName === 'SourceData'" :urlPrefix="urlPrefix" :params="params" :instance="instance" :dict="dict" :permissions="permissions" @change="onChange"></SourceData>
+  <Add v-else-if="componentName === 'Add'" :urlPrefix="urlPrefix" :areaId="areaId" :params="params" :instance="instance" :dict="dict" :permissions="permissions"
+       @change="onChange"></Add>
+  <SourceData v-else-if="componentName === 'SourceData'" :urlPrefix="urlPrefix" :params="params" :instance="instance" :dict="dict" :permissions="permissions"
+              @change="onChange"></SourceData>
 </template>
 
 <script>
 import List from './components/List.vue'
 import Add from './components/Add'
 import SourceData from './components/SourceData'
-import dvui from '../../../project/dvui/entries'
-import Vue from "vue";
- 
-Vue.use(dvui)
+
 export default {
-  name: 'AppDesigner' ,
+  name: 'AppDesigner',
   label: '大屏设计',
- 
-  components: {
-    List,
-    Add,
-    SourceData
-  },
+
+  components: {List, Add, SourceData},
 
   props: {
     instance: Function,
@@ -84,8 +80,6 @@ export default {
       }
     }
   },
-  created() {
-  }
 }
 </script>
 
diff --git a/packages/bigscreen/designer/components/Add.vue b/packages/bigscreen/designer/components/Add.vue
index ec66be32..249d05dc 100644
--- a/packages/bigscreen/designer/components/Add.vue
+++ b/packages/bigscreen/designer/components/Add.vue
@@ -33,14 +33,14 @@
           </template>
           <template #content>
             <ai-table
-              :tableData="tableData"
-              :col-configs="colConfigs"
-              :total="total"
-              style="margin-top: 6px;"
-              :border="true"
-              row-key="id"
-              :isShowPagination="false"
-              @getList="() => {}">
+                :tableData="tableData"
+                :col-configs="colConfigs"
+                :total="total"
+                style="margin-top: 6px;"
+                :border="true"
+                row-key="id"
+                :isShowPagination="false"
+                @getList="() => {}">
               <el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
                 <template slot-scope="{ row, column, $index }">
                   <div class="table-options">
@@ -55,22 +55,22 @@
         </ai-card>
       </el-form>
       <Layout
-        v-if="isShowLayout"
-        :instance="instance"
-        :dict="dict"
-        :params="query"
-        @change="onChange"
-        :urlPrefix="urlPrefix"
-        :theme="config.theme"
-        @close="isShowLayout = false">
+          v-if="isShowLayout"
+          :instance="instance"
+          :dict="dict"
+          :params="query"
+          @change="onChange"
+          :urlPrefix="urlPrefix"
+          :theme="config.theme"
+          @close="isShowLayout = false">
       </Layout>
       <ai-dv-wrapper :views="[{label: '返回'}]" :theme="config.theme" @change="screenId = false" v-if="screenId" :title="form.name">
-        <AiDvBackground
-          :theme="config.theme"
-          v-if="config.length || config.theme === '1'"
-          :src="config.theme === '1' ? 'https://cdn.cunwuyun.cn/dvcp/dv/img/dj-bg.png' : config.backgroundImage[0].url">
-        </AiDvBackground>
-        <AppGigscreenViewer :urlPrefix="urlPrefix" :instance="instance" :dict="dict" :id="screenId"></AppGigscreenViewer>
+        <ai-dv-background
+            :theme="config.theme"
+            v-if="config.length || config.theme === '1'"
+            :src="config.theme === '1' ? 'https://cdn.cunwuyun.cn/dvcp/dv/img/dj-bg.png' : config.backgroundImage[0].url">
+        </ai-dv-background>
+        <app-gigscreen-viewer :urlPrefix="urlPrefix" :instance="instance" :dict="dict" :id="screenId"/>
       </ai-dv-wrapper>
       <ai-dialog :visible.sync="dialog" title="定制大屏" @closed="custom={}" @onConfirm="handleCustomizedDV">
         <el-form ref="CustomDVFrom" size="small" :model="custom" :rules="rules" label-width="80px">
@@ -94,29 +94,22 @@
 </template>
 
 <script>
-import AppGigscreenViewer from '../../viewer/AppGigscreenViewer'
 import Layout from './Layout.vue'
 import Sortable from 'sortablejs'
+import AppGigscreenViewer from "../../viewer/AppGigscreenViewer";
 
 export default {
   name: 'Add',
-
   props: {
     instance: Function,
     dict: Object,
     params: Object,
     urlPrefix: String
   },
-
   inject: {
-    home:{default: ''}
+    home: {default: ''}
   },
-
-  components: {
-    Layout,
-    AppGigscreenViewer
-  },
-
+  components: {AppGigscreenViewer, Layout},
   data() {
     return {
       info: {},
@@ -158,7 +151,7 @@ export default {
     }
   },
 
-  mounted () {
+  mounted() {
 
   },
 
@@ -194,7 +187,7 @@ export default {
       const tbody = document.querySelector('.el-table__body-wrapper tbody')
       const _this = this
       Sortable.create(tbody, {
-        onEnd({ newIndex, oldIndex }) {
+        onEnd({newIndex, oldIndex}) {
           const currRow = _this.tableData.splice(oldIndex, 1)[0]
           _this.tableData.splice(newIndex, 0, currRow)
         }
diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue
index 4f3560d7..f2426a19 100644
--- a/packages/bigscreen/designer/components/Layout.vue
+++ b/packages/bigscreen/designer/components/Layout.vue
@@ -91,7 +91,7 @@
                       <div class="coordinate-top"></div>
                       <div class="coordinate-label">{{ item.left }}, {{ item.top }}</div>
                     </div>
-                    <RenderElement :data="item" :theme="dashboard.theme" :index="index"></RenderElement>
+                    <ai-dv-render :data="item" :theme="dashboard.theme" :index="index"/>
                   </vue-draggable-resizable>
                 </div>
               </ai-dv-wrapper>
@@ -335,12 +335,12 @@
     </ai-dialog>
     <ai-dialog :visible.sync="isShowAddImg" width="580px" append-to-body title="添加素材" @closed="form.images = []" @onConfirm="onImageConfirm">
       <ai-uploader
-        :instance="instance"
-        v-model="form.images"
-        fileType="file"
-        :maxSize="100"
-        url="/admin/file/add-unlimited"
-        :limit="9">
+          :instance="instance"
+          v-model="form.images"
+          fileType="file"
+          :maxSize="100"
+          url="/admin/file/add-unlimited"
+          :limit="9">
       </ai-uploader>
     </ai-dialog>
   </div>
@@ -353,7 +353,6 @@ import VueRulerTool from 'vue-ruler-tool'
 import VueDraggableResizable from 'vue-draggable-resizable'
 import 'vue-draggable-resizable/dist/VueDraggableResizable.css'
 import DataConfig from './form/DataConfig.vue'
-import RenderElement from './RenderElement'
 
 export default {
   props: {
@@ -366,7 +365,7 @@ export default {
   data() {
     return {
       colConfigs: [
-        { prop: 'url', label: '图片链接', showOverflowTooltip: false },
+        {prop: 'url', label: '图片链接', showOverflowTooltip: false},
         // {slot: 'img', label: '图片'}
       ],
       form: {
@@ -416,7 +415,6 @@ export default {
   },
 
   components: {
-    RenderElement,
     DataConfig,
     VueRulerTool,
     VueDraggableResizable,
diff --git a/packages/bigscreen/viewer/AppGigscreenViewer.vue b/packages/bigscreen/viewer/AppGigscreenViewer.vue
index b3baafc6..96a0a277 100644
--- a/packages/bigscreen/viewer/AppGigscreenViewer.vue
+++ b/packages/bigscreen/viewer/AppGigscreenViewer.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="AppGigscreenViewer">
+  <section class="AppGigscreenViewer">
     <div v-if="!component">
       <div
           class="component-item"
@@ -14,21 +14,18 @@
         }"
           v-for="(item, index) in componentList"
           :key="index">
-        <RenderElement :instance="instance" :data="item" :index="index" :theme="dashboard.theme"></RenderElement>
+        <ai-dv-render :instance="instance" :data="item" :index="index" :theme="dashboard.theme"/>
       </div>
     </div>
     <components v-else :is="component" :dict="dict" :instance="instance" :nav="meta"/>
-  </div>
+  </section>
 </template>
 
 <script>
 
-import RenderElement from '../designer/components/RenderElement'
-
 export default {
   name: 'AppGigscreenViewer',
   label: '大屏预览',
-
   props: {
     instance: Function,
     dict: Object,
@@ -38,17 +35,11 @@ export default {
       default: '/app'
     }
   },
-
   watch: {
     id(v) {
       this.getInfo(v)
     }
   },
-
-  components: {
-    RenderElement
-  },
-
   data() {
     return {
       component: '',
@@ -65,32 +56,25 @@ export default {
       meta: {}
     }
   },
-
   created() {
     this.getInfo(this.id)
-
-    // this.scale = document.body.clientWidth / 1920
   },
-
   mounted() {
     this.$nextTick(() => {
       let content = document.querySelector('#dv-full-screen-container')
       if (content) {
         const transform = content.style.transform
         const scale = transform.replace('scale', '').replace('(', '').replace(')', '')
-
         if (scale == 1) {
           this.scale = document.body.clientWidth / 1920
         }
       }
-
     })
   },
-
   methods: {
     getInfo(id) {
       this.component = null
-      this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryLargeScreenDetailById?id=${id}`).then(res => {
+      id && this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryLargeScreenDetailById?id=${id}`).then(res => {
         if (res?.data) {
           const config = JSON.parse(res.data.config)
           if (config.custom) {
@@ -123,7 +107,6 @@ export default {
         }
       })
     },
-
     getSourceData(item, index) {
       const api = item.dataType === 'apiData' ? item.api : `${this.urlPrefix}/appdiylargescreen/statisticsByLsid?id=${item.sourceDataId}`
       this.instance.post(api).then(res => {
diff --git a/packages/index.js b/packages/index.js
index fb1360cc..753e9b0f 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -5,6 +5,7 @@
  * @param params showList:打印加载的应用;apps:加载的应用文件名数组
  */
 import core from './core.import'
+import dvui from '../project/dvui/entries'
 
 const install = function (Vue, params) {
   if (install.installed) return
@@ -31,6 +32,7 @@ const install = function (Vue, params) {
     apps.push(app.component)
     Vue.component(app.name, app.component)
   })
+  Vue.use(dvui)
   return Promise.resolve(apps)
 }
 
diff --git a/project/dvui/AppDVDemo.vue b/project/dvui/AppDVDemo.vue
deleted file mode 100644
index 190514fb..00000000
--- a/project/dvui/AppDVDemo.vue
+++ /dev/null
@@ -1,157 +0,0 @@
-<template>
-  <section class="AppDVDemo">
-    <ai-list>
-      <ai-title slot="title" title="数据大屏草稿板" isShowBottomBorder/>
-      <template #content>
-        <div class="showPanel">
-          <ai-dv-wrapper :views="views" v-model="active">
-            <ai-echart :ops="ops" :data="views" theme="1"></ai-echart>
-          </ai-dv-wrapper>
-        </div>
-      </template>
-    </ai-list>
-  </section>
-</template>
-
-<script>
-
-import AiDvWrapper from "./layout/AiDvWrapper/AiDvWrapper";
-import ops from './components/AiEchart/template/pie/pieChart3'
-import AiDvPanel from "./layout/AiDvPanel/AiDvPanel";
-import AiDvDisplay from "./layout/AiDvDisplay/AiDvDisplay";
-import AiDvSummary from "./layout/AiDvSummary/AiDvSummary";
-import AiMonitor from "./components/AiMonitor/AiMonitor";
-
-export default {
-  name: "AppDVDemo",
-  label: "数据大屏草稿板",
-  components: {AiMonitor, AiDvPanel, AiDvWrapper, AiDvDisplay, AiDvSummary},
-  data() {
-    return {
-      ops,
-      active: '',
-      views: [
-        {
-          "name": "阿斯达",
-          "v1": 23,
-          "v2": 33
-        },
-        {
-          "name": "水电费",
-          "v1": 12,
-          "v2": 34
-        },
-        {
-          "name": "凡哥",
-          "v1": 67,
-          "v2": 25
-        },
-        {
-          "name": "党费",
-          "v1": 98,
-          "v2": 85
-        }
-      ],
-      list: [
-        {name: '阿斯达', v1: 23, v2: 33},
-        {name: '水电费', v1: 12, v2: 34},
-        {name: '凡哥', v1: 67, v2: 25},
-        {name: '党费', v1: 98, v2: 85},
-        {name: '阿萨德', v1: 98, v2: 85},
-        {name: '电饭锅', v1: 98, v2: 85},
-        {name: '户籍科', v1: 98, v2: 85},
-      ],
-      data: [
-        {
-          "key": "阿斯达",
-          "value": '22',
-          "percentage": 33,
-          text: '同比上月'
-        },
-        {
-          "key": "阿斯达",
-          "value": '22',
-          "percentage": -33,
-          text: '同比上月'
-        }
-      ],
-      value: [
-        {
-          "key": "宅基地 ",
-          "value": 1252292,
-          "value1": 12592,
-          "value2": 12592,
-          "value3": 12592,
-          "value4": 12592
-        },
-        {
-          "key": "人数",
-          "value": 12592,
-          "value1": 12592,
-          "value2": 12592,
-          "value3": 12592,
-          "value4": 12592
-        },
-        {
-          "key": "户数 ",
-          "value": 12592,
-          "value1": 12592,
-          "value2": 12592,
-          "value3": 12592,
-          "value4": 12592
-        },
-        {
-          "key": "村社区",
-          "value": 12592,
-          "value1": 12592,
-          "value2": 12592,
-          "value3": 12592,
-          "value4": 12592
-        }
-      ],
-      markers: []
-    }
-  },
-  methods: {
-    getMarkers() {
-      this.$request.post('/app/appcommunitybuildinginfo/listByBuildingAndHomestead', null, {
-        params: {current: 1, size: 1000000},
-        withoutToken: true
-      }).then(res => {
-        if (res?.data) {
-          this.markers = res.data.map(e => ({
-            ...e,
-            icon: "https://cdn.cunwuyun.cn/dvcp/dv/monitor.svg",
-            label: e.communityName
-          }))
-        }
-      })
-    }
-  },
-  created() {
-    // this.getMarkers()
-    setTimeout(() => {
-      this.list = this.list.map(e => ({name: e.name, '电费': e.v1, '水费': e.v2 * 2}))
-    }, 2000)
-  },
-  mounted() {
-    this.$initWxOpenData()
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import "./lib/animation";
-
-.AppDVDemo {
-  height: 100%;
-
-  .showPanel {
-    height: 600px;
-  }
-
-  .AiDvPanel {
-    width: 600px;
-  }
-}
-</style>
diff --git a/packages/bigscreen/ui/AiDataPanel.vue b/project/dvui/components/AiDataPanel.vue
similarity index 100%
rename from packages/bigscreen/ui/AiDataPanel.vue
rename to project/dvui/components/AiDataPanel.vue
diff --git a/project/dvui/components/AiDvPartyOrg/AiDvPartyOrg.vue b/project/dvui/components/AiDvPartyOrg.vue
similarity index 100%
rename from project/dvui/components/AiDvPartyOrg/AiDvPartyOrg.vue
rename to project/dvui/components/AiDvPartyOrg.vue
diff --git a/packages/bigscreen/designer/components/RenderElement.vue b/project/dvui/components/AiDvRender.vue
similarity index 90%
rename from packages/bigscreen/designer/components/RenderElement.vue
rename to project/dvui/components/AiDvRender.vue
index 1323fecf..462d47a5 100644
--- a/packages/bigscreen/designer/components/RenderElement.vue
+++ b/project/dvui/components/AiDvRender.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="render-element" style="width: 100%; height: 100%;">
+  <div class="AiDvRender" style="width: 100%; height: 100%;">
     <ai-dv-display v-if="data.type === 'display'" :title="data.title" :list="values"></ai-dv-display>
     <ai-dv-panel
         style="height: 100%; width: 100%;"
@@ -137,9 +137,9 @@
           :ops="pieChart3"/>
       <ai-map :markers="values" v-else-if="data.type=='map'" :mask="data.mask === '1'" :areaId="data.areaId || user.info.areaId"
               :map-style="`amap://styles/${data.mapStyle}`" :pulseLines="data.pulseLines==1" :map.sync="map" :lib.sync="lib"/>
-      <ai-monitor :src="data.src" v-else-if="data.type === 'monitor'" :type="data.monitorType"></ai-monitor>
-      <video style="width: 100%; height: 100%; object-fit: fill;" loop :src="data.src" autoplay v-else-if="data.type === 'video'"></video>
-      <AiDvPartyOrg style="width: 100%; height: 100%;" v-else-if="data.type === 'partyOrg'" :instance="instance"></AiDvPartyOrg>
+      <ai-monitor :src="data.src" v-else-if="data.type === 'monitor'" :type="data.monitorType"/>
+      <video style="width: 100%; height: 100%; object-fit: fill;" loop :src="data.src" autoplay v-else-if="data.type === 'video'"/>
+      <AiDvPartyOrg style="width: 100%; height: 100%;" v-else-if="data.type === 'partyOrg'" :instance="instance"/>
     </ai-dv-panel>
   </div>
 </template>
@@ -147,19 +147,26 @@
 <script>
 import {mapState} from 'vuex'
 import AiSwiper from './AiSwiper.vue'
-import pieChart from 'dvcp-dv-ui/components/AiEchart/template/pie/pieChart2'
-import pieChart1 from 'dvcp-dv-ui/components/AiEchart/template/pie/pieChart1'
-import pieChart3 from 'dvcp-dv-ui/components/AiEchart/template/pie/pieChart3'
-import lineChart1 from 'dvcp-dv-ui/components/AiEchart/template/line/lineChart1'
-import lineChart2 from 'dvcp-dv-ui/components/AiEchart/template/line/lineChart2'
-import lineChart5 from 'dvcp-dv-ui/components/AiEchart/template/line/lineChart5'
+import pieChart from './AiEchart/template/pie/pieChart2'
+import pieChart1 from './AiEchart/template/pie/pieChart1'
+import pieChart3 from './AiEchart/template/pie/pieChart3'
+import lineChart1 from './AiEchart/template/line/lineChart1'
+import lineChart2 from './AiEchart/template/line/lineChart2'
+import lineChart5 from './AiEchart/template/line/lineChart5'
+import AiMonitor from "./AiMonitor/AiMonitor";
+import AiDvPanel from "../layout/AiDvPanel/AiDvPanel";
+import AiDvDisplay from "../layout/AiDvDisplay/AiDvDisplay";
+import AiDvSummary from "../layout/AiDvSummary/AiDvSummary";
+
 
 export default {
-  name: 'RenderElement',
-
+  name: 'AiDvRender',
   props: ['data', 'index', 'theme', 'instance'],
-
   components: {
+    AiDvSummary,
+    AiDvDisplay,
+    AiDvPanel,
+    AiMonitor,
     AiSwiper
   },
 
@@ -179,12 +186,12 @@ export default {
   computed: {
     ...mapState(['user']),
 
-    values () {
+    values() {
       if (!this.data) {
         return []
       }
 
-      return this.data.type ==='map' ? this.data[this.data.dataType].map(e => {
+      return this.data.type === 'map' ? this.data[this.data.dataType].map(e => {
         return {...e, lng: e['经度'], lat: e['纬度'], label: e['地区名称']}
       }) : this.data[this.data.dataType]
     }
@@ -230,7 +237,7 @@ export default {
       if (AMap) {
         let infoWin = new AMap.InfoWindow({content: ""})
         map.clearMap()
-        let markers = this.values.filter(e=>e.lng).map(e => {
+        let markers = this.values.filter(e => e.lng).map(e => {
           return new AMap.Marker({
             map,
             label: e.label,
@@ -267,7 +274,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.render-element {
+.AiDvRender {
   ::v-deep .dvScrollBoard1 {
 
     .header {
diff --git a/packages/bigscreen/ui/AiStaData.vue b/project/dvui/components/AiStaData.vue
similarity index 100%
rename from packages/bigscreen/ui/AiStaData.vue
rename to project/dvui/components/AiStaData.vue
diff --git a/packages/bigscreen/designer/components/AiSwiper.vue b/project/dvui/components/AiSwiper.vue
similarity index 100%
rename from packages/bigscreen/designer/components/AiSwiper.vue
rename to project/dvui/components/AiSwiper.vue
diff --git a/project/dvui/layout/AiDvBackground/AiDvBackground.vue b/project/dvui/layout/AiDvBackground.vue
similarity index 100%
rename from project/dvui/layout/AiDvBackground/AiDvBackground.vue
rename to project/dvui/layout/AiDvBackground.vue

From d8817261caa3e3d3cb44e74b56d2e7db3375f202 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 24 Jun 2022 15:08:02 +0800
Subject: [PATCH 46/68] =?UTF-8?q?=E7=BE=A4=E5=8F=91=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppMassNotification/components/Add.vue    | 22 ++++++++++++-------
 .../AppMassNotification/components/List.vue   |  1 +
 .../AppIntegralAudit/components/Detail.vue    |  1 +
 .../apps/AppIntegralAudit/components/List.vue |  1 -
 .../apps/AppScoreRules/AppScoreRules.vue      |  2 --
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index 026c8c6f..1d24ba30 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -16,19 +16,25 @@
           <template #content>
             <el-form class="ai-form" :rules="rules" ref="form" :model="form" label-width="100px" label-position="right">
 
+              <el-form-item label="发送方式" prop="sendType"  style="width: 50%">
+                <el-radio v-model="form.sendType" label="0">居民群</el-radio>
+                <el-radio v-model="form.sendType" label="1">居民</el-radio>
+              </el-form-item>
+
               <el-form-item label="地区选择" style="width: 100%">
                 <ai-area-get v-model="areaId" :root="areaRootId"  :instance="instance" @select="handleAreaSelect" multiple  size="small" placeholder="全部地区"/>
               </el-form-item>
 
-              <!-- <el-form-item label="用户选择" prop="name" style="width: 100%">
+              <el-form-item label="用户选择" prop="name" style="width: 100%">
                 <el-input size="small" v-model="form.name" placeholder="请选择" disabled>
-                  <ai-wechat-selecter slot="append" :isMultiple="false" refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson">
+                  <!-- :isMultiple="true" -->
+                  <ai-wechat-selecter slot="append"  refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson">
                     <el-button size="small" type="info">选择成员</el-button>
                   </ai-wechat-selecter>
                 </el-input>
-              </el-form-item> -->
+              </el-form-item>
 
-              <el-form-item label="标签选择" style="width: 100%">
+              <el-form-item label="标签选择" style="width: 100%" v-if="form.sendType == 0">
                 <div class="tags" v-for="items in subTags" :key="items.id">
                   <div class="tag_title">{{ items.name }}</div>
                   <div class="tag_item">
@@ -48,19 +54,19 @@
               <el-form-item class="el-form-item__textarea" label="群发内容" prop="content" style="width: 100%">
                 <el-input type="textarea" placeholder="请输入…" v-model="form.content" maxlength="1000" :rows="5" show-word-limit></el-input>
               </el-form-item>
-              <el-form-item label="群发方式" prop="sendType"  style="width: 50%">
+              <!-- <el-form-item label="群发方式" prop="sendType"  style="width: 50%">
                 <el-radio v-model="form.sendType" label="0">立即发送</el-radio>
                 <el-radio v-model="form.sendType" label="1">定时发送</el-radio>
-              </el-form-item>
+              </el-form-item> -->
 
-              <el-form-item label="群发时间" prop="sendTime"  style="width: 50%" v-if="form.sendType == 1">
+              <!-- <el-form-item label="群发时间" prop="sendTime"  style="width: 50%" v-if="form.sendType == 1">
                 <el-date-picker size="small"
                   v-model="form.sendTime"
                   type="datetime"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="选择日期时间">
                 </el-date-picker>
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item label="其他类型" prop="explain" style="width: 100%">
                 <el-radio-group v-model="form.contentType" @change="onTypeChange">
                   <el-radio label="image">图片</el-radio>
diff --git a/packages/wxwork/AppMassNotification/components/List.vue b/packages/wxwork/AppMassNotification/components/List.vue
index e09d0574..fa1b3a2a 100644
--- a/packages/wxwork/AppMassNotification/components/List.vue
+++ b/packages/wxwork/AppMassNotification/components/List.vue
@@ -78,6 +78,7 @@ export default {
       return [
         { prop: "fileList", label: '消息类型', align: "center", width: "250px", formart: v => v?.map(e=> conType[e.contentType]).toString() },
         { prop: "fileList", label: '消息类容', align: "center", width: "250px", formart: v => v?.filter(e=> e.contentType == 'text')[0].content },
+        // { prop: "fileList", label: '消息内容', align: "center", width: "250px", formart: v => v?.filter(e => e.contentType == 'text')[0].content},
         // { slot: 'type' },
         { prop: "sendType", label: '发送类型', align: "center", width: "250px", formart: v => v == 0 ? '立即发送' : '定时发送'},
         { prop: "createTime", label: '创建时间', align: "center", width: "250px"},
diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
index d6c1077c..b9b9e0f9 100644
--- a/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
+++ b/project/sanjianxi/apps/AppIntegralAudit/components/Detail.vue
@@ -145,6 +145,7 @@ export default {
         pass: ''
       },
       ruleList: [],
+      num: ''
     }
   },
 
diff --git a/project/sanjianxi/apps/AppIntegralAudit/components/List.vue b/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
index 6cfb0703..eba582eb 100644
--- a/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
+++ b/project/sanjianxi/apps/AppIntegralAudit/components/List.vue
@@ -84,7 +84,6 @@
   import { mapState } from 'vuex'
   export default {
     name: 'List',
-
     props: {
       instance: Function,
       dict: Object
diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
index 2be2a9af..3801c1b9 100644
--- a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
+++ b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
@@ -101,8 +101,6 @@
 
           <el-form-item label="积分分值" prop="integral" v-if="form.pass == 1">
             <ai-range v-model="form.num" ref="resetagefoo" />
-              <!-- @change="search.current = 1, getList()"
-                      @closeVal="search.age = []"/ -->
           </el-form-item>
           
           <el-form-item label="积分分值" prop="integral" v-if="form.pass == 2">

From e55e0fc2cc0e0fbdab6730f39dd663fd08bc58ad Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Jun 2022 17:03:35 +0800
Subject: [PATCH 47/68] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/bigscreen/designer/AppDesigner.vue   |  31 +-
 .../bigscreen/designer/components/Add.vue     |  43 +-
 .../bigscreen/designer/components/List.vue    | 247 ++++---
 .../designer/components/SourceData.vue        | 624 +++++++++---------
 .../bigscreen/designer/components/preview.vue |  58 ++
 5 files changed, 509 insertions(+), 494 deletions(-)
 create mode 100644 packages/bigscreen/designer/components/preview.vue

diff --git a/packages/bigscreen/designer/AppDesigner.vue b/packages/bigscreen/designer/AppDesigner.vue
index daf05eba..bb83fc23 100644
--- a/packages/bigscreen/designer/AppDesigner.vue
+++ b/packages/bigscreen/designer/AppDesigner.vue
@@ -1,34 +1,19 @@
 <template>
-  <ai-list v-if="!isShowDetail">
-    <template slot="title">
-      <ai-title title="大屏列表" :isShowBottomBorder="false" :instance="instance"></ai-title>
-    </template>
-    <template slot="tabs">
-      <el-tabs v-model="currIndex">
-        <el-tab-pane v-for="(tab,i) in tabs" :key="i" :label="tab.label">
-          <component :urlPrefix="urlPrefix" :areaId="areaId" :ref="tab.name" v-if="currIndex == i" :is="tab.comp" @change="onChange" lazy :instance="instance"
-                     :dict="dict" :permissions="permissions"/>
-        </el-tab-pane>
-      </el-tabs>
-    </template>
-  </ai-list>
-  <Add v-else-if="componentName === 'Add'" :urlPrefix="urlPrefix" :areaId="areaId" :params="params" :instance="instance" :dict="dict" :permissions="permissions"
-       @change="onChange"></Add>
-  <SourceData v-else-if="componentName === 'SourceData'" :urlPrefix="urlPrefix" :params="params" :instance="instance" :dict="dict" :permissions="permissions"
-              @change="onChange"></SourceData>
+  <section class="AppDesigner">
+    <component :is="currentPage" v-bind="$props"/>
+  </section>
 </template>
 
 <script>
 import List from './components/List.vue'
 import Add from './components/Add'
 import SourceData from './components/SourceData'
+import Preview from "./components/preview";
 
 export default {
   name: 'AppDesigner',
   label: '大屏设计',
-
-  components: {List, Add, SourceData},
-
+  components: {Preview, List, Add, SourceData},
   props: {
     instance: Function,
     dict: Object,
@@ -40,6 +25,12 @@ export default {
   },
 
   computed: {
+    currentPage() {
+      const {hash} = this.$route
+      return hash == "#sourceData" ? SourceData :
+          hash == "#add" ? Add :
+              hash == "#preview" ? Preview : List
+    },
     tabs() {
       return [
         {label: '大屏列表', name: 'FormList', comp: List, permission: ''}
diff --git a/packages/bigscreen/designer/components/Add.vue b/packages/bigscreen/designer/components/Add.vue
index 249d05dc..5868997f 100644
--- a/packages/bigscreen/designer/components/Add.vue
+++ b/packages/bigscreen/designer/components/Add.vue
@@ -1,8 +1,7 @@
 <template>
   <ai-detail>
     <template slot="title">
-      <ai-title :title="id ? '编辑项目' : '添加项目'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
-      </ai-title>
+      <ai-title :title="id ? '编辑项目' : '添加项目'" isShowBack isShowBottomBorder @onBackClick="cancel"/>
     </template>
     <template slot="content">
       <el-form ref="form" :model="form" label-width="110px" label-position="right">
@@ -64,14 +63,6 @@
           :theme="config.theme"
           @close="isShowLayout = false">
       </Layout>
-      <ai-dv-wrapper :views="[{label: '返回'}]" :theme="config.theme" @change="screenId = false" v-if="screenId" :title="form.name">
-        <ai-dv-background
-            :theme="config.theme"
-            v-if="config.length || config.theme === '1'"
-            :src="config.theme === '1' ? 'https://cdn.cunwuyun.cn/dvcp/dv/img/dj-bg.png' : config.backgroundImage[0].url">
-        </ai-dv-background>
-        <app-gigscreen-viewer :urlPrefix="urlPrefix" :instance="instance" :dict="dict" :id="screenId"/>
-      </ai-dv-wrapper>
       <ai-dialog :visible.sync="dialog" title="定制大屏" @closed="custom={}" @onConfirm="handleCustomizedDV">
         <el-form ref="CustomDVFrom" size="small" :model="custom" :rules="rules" label-width="80px">
           <el-form-item label="大屏标题" prop="title">
@@ -103,7 +94,6 @@ export default {
   props: {
     instance: Function,
     dict: Object,
-    params: Object,
     urlPrefix: String
   },
   inject: {
@@ -145,24 +135,18 @@ export default {
 
   created() {
     this.dict.load('customizedDVs')
-    if (this.params && this.params.id) {
-      this.id = this.params.id
-      this.getInfo(this.params.id)
-    }
+    this.getInfo()
   },
 
-  mounted() {
-
-  },
 
   methods: {
-    getInfo(id) {
+    getInfo() {
+      let {id} = this.$route.query
       this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryLargeScreenProjectDetailById?id=${id}`).then(res => {
-        if (res.code === 0) {
+        if (res?.data) {
           this.form = {
             ...res.data
           }
-
           if (res.data.relationLsIds) {
             this.tableData = res.data.lsList.map(v => {
               let conf = JSON.parse(v.config || '') || {}
@@ -195,14 +179,8 @@ export default {
     },
 
     toViewer(id) {
-      this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryLargeScreenDetailById?id=${id}`).then(res => {
-        if (res.data) {
-          this.config = JSON.parse(res.data.config).dashboard
-        }
-      })
-      this.screenId = id
+      this.$router.push({query: {id}, hash: "#preview"})
     },
-
     onChange(e) {
       const ids = this.tableData.map(v => v.id)
       if (ids.indexOf(e.id) < 0) {
@@ -260,7 +238,7 @@ export default {
 
               this.home && this.home.refreshDvOptions && this.home.refreshDvOptions()
               setTimeout(() => {
-                this.cancel(true)
+                this.cancel()
               }, 600)
             }
           })
@@ -268,11 +246,8 @@ export default {
       })
     },
 
-    cancel(isRefresh) {
-      this.$emit('change', {
-        type: 'list',
-        isRefresh: !!isRefresh
-      })
+    cancel() {
+      this.$router.push({})
     },
 
     handleCustomizedDV() {
diff --git a/packages/bigscreen/designer/components/List.vue b/packages/bigscreen/designer/components/List.vue
index e46c9fe6..a8a0eb9a 100644
--- a/packages/bigscreen/designer/components/List.vue
+++ b/packages/bigscreen/designer/components/List.vue
@@ -1,38 +1,39 @@
 <template>
-  <ai-list class="form-list" isTabs style="width: 100%">
+  <ai-list>
+    <ai-title slot="title" title="大屏列表" isShowBottomBorder/>
     <template slot="content">
       <ai-search-bar>
         <template #left>
           <ai-select
-            v-model="search.status"
-            @change="search.current = 1, getList()"
-            placeholder="发布状态"
-            :selectList="dict.getDict('cwpStatus')">
+              v-model="search.status"
+              @change="search.current = 1, getList()"
+              placeholder="发布状态"
+              :selectList="dict.getDict('cwpStatus')">
           </ai-select>
           <el-button type="primary" @click="toEdit('')">添加大屏</el-button>
           <el-button type="primary" @click="toAddData">数据源管理</el-button>
         </template>
         <template #right>
           <el-input
-            v-model="search.name"
-            size="small"
-            placeholder="请输入模板名称或创建人"
-            clearable
-            v-throttle="() => {search.current = 1, getList()}"
-            @clear="search.current = 1, search.title = '', getList()"
-            suffix-icon="iconfont iconSearch">
+              v-model="search.name"
+              size="small"
+              placeholder="请输入模板名称或创建人"
+              clearable
+              v-throttle="() => {search.current = 1, getList()}"
+              @clear="search.current = 1, search.title = '', getList()"
+              suffix-icon="iconfont iconSearch">
           </el-input>
         </template>
       </ai-search-bar>
       <ai-table
-        :tableData="tableData"
-        :col-configs="colConfigs"
-        :total="total"
-        v-loading="loading"
-        style="margin-top: 6px;"
-        :current.sync="search.current"
-        :size.sync="search.size"
-        @getList="getList">
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total"
+          v-loading="loading"
+          style="margin-top: 6px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @getList="getList">
         <el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
@@ -43,11 +44,11 @@
         </el-table-column>
       </ai-table>
       <ai-dialog
-        :visible.sync="isShowAdd"
-        width="780px"
-        title="复制大屏"
-        @close="onClose"
-        @onConfirm="onConfirm">
+          :visible.sync="isShowAdd"
+          width="780px"
+          title="复制大屏"
+          @close="onClose"
+          @onConfirm="onConfirm">
         <el-form ref="form" :model="form" label-width="110px" label-position="right">
           <div class="ai-form" :model="form" label-width="110px" label-position="right">
             <el-form-item label="名称" prop="name" style="width: 100%;" :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]">
@@ -61,118 +62,106 @@
 </template>
 
 <script>
-  export default {
-    name: 'FormList',
-    props: {
-      instance: Function,
-      dict: Object,
-      areaId: String,
-      urlPrefix: String
+export default {
+  name: 'FormList',
+  props: {
+    instance: Function,
+    dict: Object,
+    areaId: String,
+    urlPrefix: String
+  },
+
+  data() {
+    return {
+      search: {
+        current: 1,
+        status: '',
+        size: 10,
+        name: ''
+      },
+      form: {
+        name: ''
+      },
+      id: '',
+      isShowAdd: false,
+      colConfigs: [
+        {prop: 'name', label: '模板名称'},
+        {prop: 'createUserName', align: 'center', label: '创建人'},
+        {prop: 'description', align: 'center', label: '描述'},
+        {prop: 'status', align: 'center', label: '状态', formart: v => this.dict.getLabel('cwpStatus', v)},
+        {prop: 'createTime', align: 'center', label: '创建时间'}
+      ],
+      tableData: [],
+      total: 0,
+      loading: false
+    }
+  },
+
+  created() {
+
+    this.dict.load('cwpStatus').then(() => {
+      this.getList()
+    })
+  },
+
+  mounted() {
+    this.loading = true
+  },
+
+  methods: {
+    copy(id) {
+      this.id = id
+      this.isShowAdd = true
     },
 
-    data () {
-      return {
-        search: {
-          current: 1,
-          status: '',
-          size: 10,
-          name: ''
-        },
-        form: {
-          name: ''
-        },
-        id: '',
-        isShowAdd: false,
-        colConfigs: [
-          { prop: 'name', label: '模板名称' },
-          { prop: 'createUserName', align: 'center', label: '创建人' },
-          { prop: 'description', align: 'center', label: '描述' },
-          { prop: 'status', align: 'center', label: '状态', formart: v => this.dict.getLabel('cwpStatus', v) },
-          { prop: 'createTime', align: 'center', label: '创建时间' }
-        ],
-        tableData: [],
-        total: 0,
-        loading: false
-      }
+    onClose() {
+      this.id = ''
+      this.form.name = ''
     },
 
-    created () {
-      
-      this.dict.load('cwpStatus').then(() => {
-        this.getList()
+    onConfirm() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.instance.post(`${this.urlPrefix}/appdiylargescreen/copyLargeScreenProject`, null, {
+            params: {
+              ...this.form,
+              id: this.id
+            }
+          }).then(res => {
+            if (res.code === 0) {
+              this.$message.success('复制成功')
+              this.isShowAdd = false
+
+              this.getList()
+            }
+          })
+        }
       })
     },
 
-    mounted () {
-      this.loading = true
-    },
-
-    methods: {
-      copy (id) {
-        this.id = id
-        this.isShowAdd = true
-      },
-
-      onClose () {
-        this.id = ''
-        this.form.name = ''
-      },
-
-      onConfirm () {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            this.instance.post(`${this.urlPrefix}/appdiylargescreen/copyLargeScreenProject`, null, {
-              params: {
-                ...this.form,
-                id: this.id
-              }
-            }).then(res => {
-              if (res.code === 0) {
-                this.$message.success('复制成功')
-                this.isShowAdd = false
-
-                this.getList()
-              }
-            })
-          }
-        })
-      },
-
-      getList () {
-        this.instance.post(`${this.urlPrefix}/appdiylargescreen/allLargeScreenProjectByPage`, null, {
-          params: {
-            ...this.search
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.tableData = res.data.records
-            this.total = res.data.total
-            this.loading = false
-          } else {
-            this.loading = false
-          }
-        }).catch(() => {
+    getList() {
+      this.instance.post(`${this.urlPrefix}/appdiylargescreen/allLargeScreenProjectByPage`, null, {
+        params: {
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
           this.loading = false
-        })
-      },
-
-      toEdit (id) {
-        this.$emit('change', {
-          type: 'add',
-          params: {
-            id: id || ''
-          }
-        })
-      },
-
-      toAddData () {
-        this.$emit('change', {
-          type: 'SourceData'
-        })
-      }
+        } else {
+          this.loading = false
+        }
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    toEdit(id) {
+      this.$router.push({hash: "#add", query: {id}})
+    },
+    toAddData() {
+      this.$router.push({hash: "#sourceData"})
     }
   }
+}
 </script>
-
-<style scoped lang="scss">
-</style>
diff --git a/packages/bigscreen/designer/components/SourceData.vue b/packages/bigscreen/designer/components/SourceData.vue
index b116f15d..7af308dc 100644
--- a/packages/bigscreen/designer/components/SourceData.vue
+++ b/packages/bigscreen/designer/components/SourceData.vue
@@ -1,7 +1,7 @@
 <template>
   <ai-detail>
     <template slot="title">
-      <ai-title title="数据源" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      <ai-title title="数据源" isShowBack isShowBottomBorder @onBackClick="cancel">
       </ai-title>
     </template>
     <template slot="content">
@@ -13,25 +13,25 @@
           <ai-search-bar class="search-bar">
             <template slot="right">
               <el-input
-                v-model="search.name"
-                size="small"
-                v-throttle="() => {search.current = 1, getList()}"
-                placeholder="请输入名字"
-                clearable
-                @clear="search.current = 1, search.name = '', getList()"
-                suffix-icon="iconfont iconSearch">
+                  v-model="search.name"
+                  size="small"
+                  v-throttle="() => {search.current = 1, getList()}"
+                  placeholder="请输入名字"
+                  clearable
+                  @clear="search.current = 1, search.name = '', getList()"
+                  suffix-icon="iconfont iconSearch">
               </el-input>
             </template>
           </ai-search-bar>
           <ai-table
-            :tableData="tableData"
-            :col-configs="colConfigs"
-            :total="total"
-            style="margin-top: 6px;"
-            :border="true"
-            :current.sync="search.current"
-            :size.sync="search.size"
-            @getList="getList">
+              :tableData="tableData"
+              :col-configs="colConfigs"
+              :total="total"
+              style="margin-top: 6px;"
+              :border="true"
+              :current.sync="search.current"
+              :size.sync="search.size"
+              @getList="getList">
             <el-table-column slot="options" width="160px" fixed="right" label="操作" align="center">
               <template slot-scope="{ row }">
                 <div class="table-options">
@@ -44,18 +44,18 @@
         </template>
       </ai-card>
       <ai-dialog
-        :visible.sync="isShow"
-        width="920px"
-        title="数据源"
-        @close="onClose"
-        @onConfirm="onConfirm">
+          :visible.sync="isShow"
+          width="920px"
+          title="数据源"
+          @close="onClose"
+          @onConfirm="onConfirm">
         <el-form ref="form" :model="form" label-width="110px" label-position="right">
           <div class="ai-form">
             <el-form-item label="数据源描述" style="width: 100%;" prop="description" :rules="[{ required: true, message: '请输入数据源描述', trigger: 'blur' }]">
               <el-input
-                size="small"
-                placeholder="请输入数据源描述"
-                v-model="form.description">
+                  size="small"
+                  placeholder="请输入数据源描述"
+                  v-model="form.description">
               </el-input>
             </el-form-item>
             <el-form-item label="类型" style="width: 100%;" prop="dataRange" :rules="[{ required: true, message: '请选择数据范围', trigger: 'change' }]">
@@ -64,56 +64,61 @@
                 <el-radio label="1">SQL</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item v-if="form.type === '1'" label="sql语句" style="width: 100%;" prop="description" :rules="[{ required: true, message: '请输入sql语句', trigger: 'blur' }]">
+            <el-form-item v-if="form.type === '1'" label="sql语句" style="width: 100%;" prop="description"
+                          :rules="[{ required: true, message: '请输入sql语句', trigger: 'blur' }]">
               <el-input
-                :rows="8"
-                size="small"
-                type="textarea"
-                placeholder="请输入数据源描述"
-                v-model="form.sqlContent">
+                  :rows="8"
+                  size="small"
+                  type="textarea"
+                  placeholder="请输入数据源描述"
+                  v-model="form.sqlContent">
               </el-input>
             </el-form-item>
-            <el-form-item v-if="form.type === '0'" label="村微应用" style="width: 100%;" prop="appId" :rules="[{ required: true, message: '请选择村微应用', trigger: 'change' }]">
+            <el-form-item v-if="form.type === '0'" label="村微应用" style="width: 100%;" prop="appId"
+                          :rules="[{ required: true, message: '请选择村微应用', trigger: 'change' }]">
               <el-select size="small" style="width: 100%;" v-model="form.appId" placeholder="请选择村微应用" @change="onAppChange">
                 <el-option
-                  v-for="item in appList"
-                  :key="item.id"
-                  :label="item.appName"
-                  :value="item.id">
+                    v-for="item in appList"
+                    :key="item.id"
+                    :label="item.appName"
+                    :value="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item v-if="form.type === '0'" label="数据范围" style="width: 100%;" prop="dataRange" :rules="[{ required: true, message: '请选择数据范围', trigger: 'change' }]">
+            <el-form-item v-if="form.type === '0'" label="数据范围" style="width: 100%;" prop="dataRange"
+                          :rules="[{ required: true, message: '请选择数据范围', trigger: 'change' }]">
               <el-radio-group v-model="form.dataRange">
                 <el-radio label="0">全部</el-radio>
                 <el-radio label="1">自定义条数</el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="数据条数" style="width: 100%;" v-if="form.dataRange === '1' && form.type === '0'" prop="count" :rules="[{ required: true, message: '请输入数据条数', trigger: 'blur' }]">
+            <el-form-item label="数据条数" style="width: 100%;" v-if="form.dataRange === '1' && form.type === '0'" prop="count"
+                          :rules="[{ required: true, message: '请输入数据条数', trigger: 'blur' }]">
               <el-input
-                size="small"
-                placeholder="请输入数据条数"
-                v-model="form.count">
+                  size="small"
+                  placeholder="请输入数据条数"
+                  v-model="form.count">
               </el-input>
             </el-form-item>
             <div v-if="form.type === '0'">
               <el-form-item :label="'统计项' + index" style="width: 100%;" v-for="(item, index) in form.statisticsConfigs" :key="'statisticsConfigs' + index">
                 <div class="form-flex">
                   <div>
-                    <el-select size="small" style="width: 160px;" v-model="item.fieldName" @change="e => onChooseField('statisticsConfigs', e, index)" placeholder="请选择" clearable>
+                    <el-select size="small" style="width: 160px;" v-model="item.fieldName" @change="e => onChooseField('statisticsConfigs', e, index)"
+                               placeholder="请选择" clearable>
                       <el-option
-                        v-for="(item, index) in filedList"
-                        :key="index"
-                        :label="item.fieldCnName"
-                        :value="item.fieldName">
+                          v-for="(item, index) in filedList"
+                          :key="index"
+                          :label="item.fieldCnName"
+                          :value="item.fieldName">
                       </el-option>
                     </el-select>
                     <el-select size="small" style="margin: 0 10px; width: 160px;" v-model="item.calcType" placeholder="请选择" clearable>
                       <el-option
-                        v-for="item in dict.getDict('diyLargeScreenDatasourceCalcType2')"
-                        :key="item.id"
-                        :label="item.dictName"
-                        :value="item.dictValue">
+                          v-for="item in dict.getDict('diyLargeScreenDatasourceCalcType2')"
+                          :key="item.id"
+                          :label="item.dictName"
+                          :value="item.dictValue">
                       </el-option>
                     </el-select>
                     <el-input size="small" style="width: 165px;" placeholder="请输入别名" v-model="item.alias"></el-input>
@@ -131,10 +136,10 @@
                   <div>
                     <el-select size="small" style="width: 160px;" v-model="item.fieldName" placeholder="请选择" clearable>
                       <el-option
-                        v-for="item in filedList"
-                        :key="item.id"
-                        :label="item.fieldCnName"
-                        :value="item.fieldName">
+                          v-for="item in filedList"
+                          :key="item.id"
+                          :label="item.fieldCnName"
+                          :value="item.fieldName">
                       </el-option>
                     </el-select>
                   </div>
@@ -151,18 +156,18 @@
                   <div>
                     <el-select size="small" style="width: 160px;" v-model="item.fieldName" placeholder="请选择" clearable>
                       <el-option
-                        v-for="item in filedList"
-                        :key="item.id"
-                        :label="item.fieldCnName"
-                        :value="item.fieldName">
+                          v-for="item in filedList"
+                          :key="item.id"
+                          :label="item.fieldCnName"
+                          :value="item.fieldName">
                       </el-option>
                     </el-select>
                     <el-select size="small" style="width: 160px; margin-left: 10px;" v-model="item.orderType" placeholder="请选择" clearable>
                       <el-option
-                        v-for="item in orderTypeDict"
-                        :key="item.id"
-                        :label="item.label"
-                        :value="item.value">
+                          v-for="item in orderTypeDict"
+                          :key="item.id"
+                          :label="item.label"
+                          :value="item.value">
                       </el-option>
                     </el-select>
                   </div>
@@ -181,277 +186,274 @@
 </template>
 
 <script>
-  export default {
-    name: 'SourceData',
+export default {
+  name: 'SourceData',
 
-    props: {
-      instance: Function,
-      dict: Object,
-      params: Object,
-      urlPrefix: String
-    },
+  props: {
+    instance: Function,
+    dict: Object,
+    params: Object,
+    urlPrefix: String
+  },
 
-    data () {
-      return {
-        isShow: false,
-        search: {
-          current: 1,
-          size: 10,
-          name: ''
+  data() {
+    return {
+      isShow: false,
+      search: {
+        current: 1,
+        size: 10,
+        name: ''
+      },
+      total: 0,
+      colConfigs: [
+        {prop: 'appName', label: '应用名'},
+        {prop: 'appTableName', align: 'center', label: '表名'},
+        {prop: 'description', align: 'center', label: '描述'},
+        {prop: 'type', align: 'center', label: '类型', formart: v => v === '0' ? '村微应用' : 'sql语句'},
+        {prop: 'createUserName', align: 'center', label: '创建人'},
+        {prop: 'createTime', align: 'center', label: '创建时间'}
+      ],
+      tableData: [],
+      filedList: [],
+      appList: [],
+      form: {
+        orderType: 'asc',
+        dataRange: '0',
+        type: '0',
+        sqlContent: '',
+        appId: '',
+        description: '',
+        appName: '',
+        appTableName: '',
+        count: '100',
+        statisticsConfigs: [{
+          alias: '',
+          calcType: '',
+          dictCode: '',
+          fieldCnName: '',
+          fieldName: ''
+        }],
+        orderConfigs: [{
+          alias: '',
+          calcType: '',
+          dictCode: '',
+          fieldCnName: '',
+          fieldName: ''
+        }],
+        groupConfigs: [{
+          alias: '',
+          calcType: '',
+          dictCode: '',
+          fieldCnName: '',
+          fieldName: ''
+        }]
+      },
+      id: '',
+      orderTypeDict: [
+        {
+          value: 'asc',
+          label: '升序'
         },
-        total: 0,
-        colConfigs: [
-          { prop: 'appName', label: '应用名' },
-          { prop: 'appTableName', align: 'center', label: '表名' },
-          { prop: 'description', align: 'center', label: '描述' },
-          { prop: 'type', align: 'center', label: '类型', formart: v => v === '0' ? '村微应用' : 'sql语句' },
-          { prop: 'createUserName', align: 'center', label: '创建人' },
-          { prop: 'createTime', align: 'center', label: '创建时间' }
-        ],
-        tableData: [],
-        filedList: [],
-        appList: [],
-        form: {
-          orderType: 'asc',
-          dataRange: '0',
-          type: '0',
-          sqlContent: '',
-          appId: '',
-          description: '',
-          appName: '',
-          appTableName: '',
-          count: '100',
-          statisticsConfigs: [{
-            alias: '',
-            calcType: '',
-            dictCode: '',
-            fieldCnName: '',
-            fieldName: ''
-          }],
-          orderConfigs: [{
-            alias: '',
-            calcType: '',
-            dictCode: '',
-            fieldCnName: '',
-            fieldName: ''
-          }],
-          groupConfigs: [{
-            alias: '',
-            calcType: '',
-            dictCode: '',
-            fieldCnName: '',
-            fieldName: ''
-          }]
-        },
-        id: '',
-        orderTypeDict: [
-          {
-            value: 'asc',
-            label: '升序'
-          },
-          {
-            value: 'desc',
-            label: '降序'
+        {
+          value: 'desc',
+          label: '降序'
+        }
+      ]
+    }
+  },
+
+  created() {
+    this.dict.load(['diyLargeScreenDatasourceCalcType2']).then(() => {
+      this.getList()
+      this.getAppList()
+    })
+  },
+
+  methods: {
+    getInfo(id) {
+      this.instance.post(`${this.urlPrefix}/wxcp/wxuser/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form = {
+            ...res.data
           }
-        ]
-      }
-    },
-
-    created () {
-      this.dict.load(['diyLargeScreenDatasourceCalcType2']).then(() => {
-        this.getList()
-        this.getAppList()
+        }
       })
     },
 
-    methods: {
-      getInfo (id) {
-        this.instance.post(`${this.urlPrefix}/wxcp/wxuser/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.form = {
-              ...res.data
-            }
+    onChooseField(type, fieldName, index) {
+      const dictCode = this.filedList.filter(v => v.fieldName === fieldName)[0].dictCode
+      this.$set(this.form[type][index], 'dictCode', dictCode)
+    },
+
+    add(type) {
+      this.form[type].push({
+        alias: '',
+        calcType: '',
+        dictCode: '',
+        fieldCnName: '',
+        fieldName: ''
+      })
+    },
+
+    removeConfig(type, index) {
+      this.form[type].splice(index, 1)
+    },
+
+    toEdit(e) {
+      this.id = e.id
+      this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryDatasourceDetailById?id=${e.id}`).then(res => {
+        if (res.code === 0) {
+          this.form = {
+            ...res.data
           }
-        })
-      },
 
-      onChooseField (type, fieldName, index) {
-        const dictCode = this.filedList.filter(v => v.fieldName === fieldName)[0].dictCode
-        this.$set(this.form[type][index], 'dictCode', dictCode)
-      },
-
-      add (type) {
-        this.form[type].push({
-          alias: '',
-          calcType: '',
-          dictCode: '',
-          fieldCnName: '',
-          fieldName: ''
-        })
-      },
-
-      removeConfig (type, index) {
-        this.form[type].splice(index, 1)
-      },
-
-      toEdit (e) {
-        this.id = e.id
-        this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryDatasourceDetailById?id=${e.id}`).then(res => {
-          if (res.code === 0) {
-            this.form = {
-              ...res.data
-            }
-
-            this.form.dataRange = this.form.dataRange === '0' ? '0' : '1'
-            this.form.count = res.data.dataRange
-            this.filedList = this.appList.filter(v => v.id === res.data.appId).length && this.appList.filter(v => v.id === res.data.appId)[0].fields.map(item => {
-              let value = []
-              res.data.configs.forEach(v => {
-                if (v.fieldName === item.fieldName) {
-                  value.push(v.calcType)
-                }
-              })
-
-              return {
-                ...item,
-                value
+          this.form.dataRange = this.form.dataRange === '0' ? '0' : '1'
+          this.form.count = res.data.dataRange
+          this.filedList = this.appList.filter(v => v.id === res.data.appId).length && this.appList.filter(v => v.id === res.data.appId)[0].fields.map(item => {
+            let value = []
+            res.data.configs.forEach(v => {
+              if (v.fieldName === item.fieldName) {
+                value.push(v.calcType)
               }
             })
-            this.isShow = true
+
+            return {
+              ...item,
+              value
+            }
+          })
+          this.isShow = true
+        }
+      })
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`${this.urlPrefix}/appquestionnairetemplate/delete?id=${id}`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('删除成功！')
+            this.getList()
           }
         })
-      },
+      })
+    },
+
+    getList() {
+      this.instance.post(`${this.urlPrefix}/appdiylargescreen/allDatasourceByPage`, null, {
+        params: {
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      })
+    },
+
+    getAppList() {
+      this.instance.post(`${this.urlPrefix}/appdiylargescreen/allDatasourceApp`).then(res => {
+        if (res.code === 0) {
+          this.appList = res.data
+        }
+      })
+    },
+
+    onClose() {
+      this.id = ''
+      this.form.orderType = 'asc'
+      this.form.dataRange = 0
+      this.form.appId = ''
+      this.form.description = ''
+      this.form.appName = ''
+      this.form.appTableName = ''
+      this.form.count = 100
+    },
+
+    onAppChange(e) {
+      const value = this.appList.filter(v => v.id === e)[0]
+      this.form.appTableName = value.appTableName
+      this.form.appName = value.appName
+      this.form.statisticsConfigs = [{
+        alias: '',
+        calcType: '',
+        dictCode: '',
+        fieldCnName: '',
+        fieldName: ''
+      }]
+      this.form.orderConfigs = [{
+        alias: '',
+        calcType: '',
+        dictCode: '',
+        fieldCnName: '',
+        fieldName: ''
+      }]
+      this.form.groupConfigs = [{
+        alias: '',
+        calcType: '',
+        dictCode: '',
+        fieldCnName: '',
+        fieldName: ''
+      }]
+      this.filedList = value.fields.map(v => {
+        return {
+          ...v,
+          value: ''
+        }
+      })
+    },
+
+    onConfirm() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          let configs = []
+
+          if (this.filedList.length) {
+            this.filedList.forEach(item => {
+              if (item.value.length) {
+                item.value.forEach(v => {
+                  configs.push({
+                    alias: item.fieldCnName,
+                    calcType: v,
+                    fieldCnName: item.fieldCnName,
+                    fieldName: item.fieldName,
+                    dictCode: item.dictCode,
+                    orderType: this.orderType
+                  })
+                })
+              }
+            })
+          }
+
+          this.instance.post(`${this.urlPrefix}/appdiylargescreen/addOrUpdateDatasource`, {
+            ...this.form,
+            configs,
+            id: this.id ? this.id : '',
+            dataRange: this.form.dataRange === '0' ? 0 : this.form.count
+          }).then(res => {
+            if (res.code === 0) {
+              this.$message.success(this.id ? '编辑成功' : '添加成功')
+              this.search.current = 1
+              this.isShow = false
 
-      remove (id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`${this.urlPrefix}/appquestionnairetemplate/delete?id=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
               this.getList()
             }
           })
-        })
-      },
+        }
+      })
+    },
 
-      getList () {
-        this.instance.post(`${this.urlPrefix}/appdiylargescreen/allDatasourceByPage`, null, {
-          params: {
-            ...this.search
-          }
-        }).then(res => {
-          if (res.code == 0) {
-            this.tableData = res.data.records
-            this.total = res.data.total
-          }
-        })
-      },
-
-      getAppList () {
-        this.instance.post(`${this.urlPrefix}/appdiylargescreen/allDatasourceApp`).then(res => {
-          if (res.code === 0) {
-            this.appList = res.data
-          }
-        })
-      },
-
-      onClose () {
-        this.id = ''
-        this.form.orderType = 'asc'
-        this.form.dataRange = 0
-        this.form.appId = ''
-        this.form.description = ''
-        this.form.appName = ''
-        this.form.appTableName = ''
-        this.form.count = 100
-      },
-
-      onAppChange (e) {
-        const value = this.appList.filter(v => v.id === e)[0]
-        this.form.appTableName = value.appTableName
-        this.form.appName = value.appName
-        this.form.statisticsConfigs = [{
-          alias: '',
-          calcType: '',
-          dictCode: '',
-          fieldCnName: '',
-          fieldName: ''
-        }]
-        this.form.orderConfigs = [{
-          alias: '',
-          calcType: '',
-          dictCode: '',
-          fieldCnName: '',
-          fieldName: ''
-        }]
-        this.form.groupConfigs = [{
-          alias: '',
-          calcType: '',
-          dictCode: '',
-          fieldCnName: '',
-          fieldName: ''
-        }]
-        this.filedList = value.fields.map(v => {
-          return {
-            ...v,
-            value: ''
-          }
-        })
-      },
-
-      onConfirm () {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            let configs = []
-
-            if (this.filedList.length) {
-              this.filedList.forEach(item => {
-                if (item.value.length) {
-                  item.value.forEach(v => {
-                    configs.push({
-                      alias: item.fieldCnName,
-                      calcType: v,
-                      fieldCnName: item.fieldCnName,
-                      fieldName: item.fieldName,
-                      dictCode: item.dictCode,
-                      orderType: this.orderType
-                    })
-                  })
-                }
-              })
-            }
-
-            this.instance.post(`${this.urlPrefix}/appdiylargescreen/addOrUpdateDatasource`, {
-              ...this.form,
-              configs,
-              id: this.id ? this.id : '',
-              dataRange: this.form.dataRange === '0' ? 0 : this.form.count
-            }).then(res => {
-              if (res.code === 0) {
-                this.$message.success(this.id ? '编辑成功' : '添加成功')
-                this.search.current = 1
-                this.isShow = false
-
-                this.getList()
-              }
-            })
-          }
-        })
-      },
-
-      cancel (isRefresh) {
-        this.$emit('change', {
-          type: 'list',
-          isRefresh: !!isRefresh
-        })
-      }
+    cancel() {
+      this.$router.push({})
     }
   }
+}
 </script>
 
 <style scoped lang="scss">
-  .form-flex {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-  }
+.form-flex {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
diff --git a/packages/bigscreen/designer/components/preview.vue b/packages/bigscreen/designer/components/preview.vue
new file mode 100644
index 00000000..83547203
--- /dev/null
+++ b/packages/bigscreen/designer/components/preview.vue
@@ -0,0 +1,58 @@
+<template>
+  <section class="preview">
+    <ai-dv-wrapper :views="[{label: '返回'}]" :theme="config.theme" @change="$router.back()" v-if="screenId" :title="info.name">
+      <ai-dv-background
+          :theme="config.theme"
+          v-if="config.length || config.theme === '1'"
+          :src="config.theme === '1' ? 'https://cdn.cunwuyun.cn/dvcp/dv/img/dj-bg.png' : config.backgroundImage[0].url">
+      </ai-dv-background>
+      <app-gigscreen-viewer :urlPrefix="urlPrefix" :instance="instance" :dict="dict" :id="screenId"/>
+    </ai-dv-wrapper>
+  </section>
+</template>
+
+<script>
+import AppGigscreenViewer from "../../viewer/AppGigscreenViewer";
+
+export default {
+  name: "preview",
+  components: {AppGigscreenViewer},
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+    urlPrefix: {
+      type: String,
+      default: '/app'
+    }
+  },
+  computed: {
+    screenId: v => v.$route.query.id
+  },
+  data() {
+    return {
+      info: {},
+      config: {}
+    }
+  },
+  methods: {
+    getDvData() {
+      let {id} = this.$route.query
+      this.instance.post(`${this.urlPrefix}/appdiylargescreen/queryLargeScreenDetailById?id=${id}`).then(res => {
+        if (res?.data) {
+          this.info = res.data
+          this.config = JSON.parse(res.data.config).dashboard
+        }
+      })
+    }
+  },
+  created() {
+    this.getDvData()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.preview {
+}
+</style>

From 8a7d6f746f12fafef453b5de742d16a183681940 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Jun 2022 19:58:27 +0800
Subject: [PATCH 48/68] BUG 30302

---
 .../mattersConfig/components/addConfig.vue               | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue b/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
index aace9a65..f1c41792 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
@@ -9,7 +9,7 @@
           </el-steps>
         </div>
       </template>
-      <template #content v-if="detailObj.id">
+      <template #content v-if="loaded">
         <baseInfo ref="baseInfo" :instance="instance" :dict="dict" v-if="activeStep==0"/>
         <applyForm ref="applyForm" :instance="instance" :dict="dict" v-show="activeStep==1"/>
         <attachmentMaterial ref="attachmentMaterial" :instance="instance" v-if="activeStep==2"/>
@@ -50,7 +50,8 @@ export default {
       },
       processAnnexDefs: [],
       detailObj: {},
-      activeStep: 0
+      activeStep: 0,
+      loaded: true
     }
   },
   computed: {
@@ -133,7 +134,7 @@ export default {
       })
     },
     getDetail(id) {
-      this.instance.post(`/approval-process-def/info-id`, null, {params: {id}}).then(res => {
+      return this.instance.post(`/approval-process-def/info-id`, null, {params: {id}}).then(res => {
         if (res?.data) {
           this.detailObj = res.data
         }
@@ -150,7 +151,7 @@ export default {
     }
   },
   created() {
-    this.getDetail(this.$route.query.id)
+    this.getDetail(this.$route.query.id).finally(() => this.loaded = false)
   }
 }
 </script>

From d979943852e9e3267b52ed17d50d3f8794d8c46b Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Jun 2022 20:41:54 +0800
Subject: [PATCH 49/68] BUG 29877

---
 .../mattersConfig/components/addConfig.vue                | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue b/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
index f1c41792..a3ad542f 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/addConfig.vue
@@ -51,7 +51,7 @@ export default {
       processAnnexDefs: [],
       detailObj: {},
       activeStep: 0,
-      loaded: true
+      loaded: false
     }
   },
   computed: {
@@ -134,11 +134,11 @@ export default {
       })
     },
     getDetail(id) {
-      return this.instance.post(`/approval-process-def/info-id`, null, {params: {id}}).then(res => {
+      this.instance.post(`/approval-process-def/info-id`, null, {params: {id}}).then(res => {
         if (res?.data) {
           this.detailObj = res.data
         }
-      })
+      }).finally(() => this.loaded = true)
     },
     getStepIcon(rowIndex) {
       if (rowIndex < this.activeStep) return "iconfont iconSteps_Finished"
@@ -151,7 +151,7 @@ export default {
     }
   },
   created() {
-    this.getDetail(this.$route.query.id).finally(() => this.loaded = false)
+    this.getDetail(this.$route.query.id)
   }
 }
 </script>

From 356758a18491e5a8d5e3004c8d8666dc4d4c901f Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 24 Jun 2022 20:45:45 +0800
Subject: [PATCH 50/68] =?UTF-8?q?=E7=BE=A4=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppMassNotification/components/Add.vue    | 186 +++++++++---------
 .../AppMassNotification/components/List.vue   |   6 +-
 .../components/SelectDeptUser.vue             |   0
 3 files changed, 98 insertions(+), 94 deletions(-)
 create mode 100644 packages/wxwork/AppMassNotification/components/SelectDeptUser.vue

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index 1d24ba30..2abbbb44 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -9,32 +9,36 @@
         <ai-card>
           <template #title>
             <div class="ai-card__title">
-              <h2>条件选择</h2>
+              <h2>发送条件</h2>
             </div>
           </template>
 
           <template #content>
             <el-form class="ai-form" :rules="rules" ref="form" :model="form" label-width="100px" label-position="right">
 
-              <el-form-item label="发送方式" prop="sendType"  style="width: 50%">
-                <el-radio v-model="form.sendType" label="0">居民群</el-radio>
-                <el-radio v-model="form.sendType" label="1">居民</el-radio>
+              <el-form-item label="发送方式" prop="messageSource"  style="width: 50%">
+                <el-radio v-model="form.messageSource" label="2">居民群</el-radio>
+                <el-radio v-model="form.messageSource" label="1">居民</el-radio>
               </el-form-item>
 
               <el-form-item label="地区选择" style="width: 100%">
-                <ai-area-get v-model="areaId" :root="areaRootId"  :instance="instance" @select="handleAreaSelect" multiple  size="small" placeholder="全部地区"/>
+                <ai-area-get v-model="areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect" multiple  size="small" placeholder="全部地区"/>
               </el-form-item>
 
-              <el-form-item label="用户选择" prop="name" style="width: 100%">
-                <el-input size="small" v-model="form.name" placeholder="请选择" disabled>
-                  <!-- :isMultiple="true" -->
-                  <ai-wechat-selecter slot="append"  refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson">
-                    <el-button size="small" type="info">选择成员</el-button>
-                  </ai-wechat-selecter>
-                </el-input>
+              <el-form-item label="选择组织" style="width: 100%">
+                <el-input size="small" :value="orgSelect" placeholder="请选择" disabled />
+                <el-button size="small" type="info" class="selectDeptUser">选择组织</el-button>
+                  <!-- <ai-wechat-selecter slot="append"  refs="addTags" :instance="instance" isChooseUnit isStrictly v-model="orgNameList"  @change="getSelectPerson">
+                    <el-button size="small" type="info">选择组织</el-button>
+                  </ai-wechat-selecter> -->
+                <!-- </el-input> -->
+                <!-- <ai-table-select nodeName="name" :instance="instance" extra="serialNo" searchKey="name" :action="`/app/wxcp/wxdepartment/listAllByCorp`"
+                              @select="organizationSelect" multiple/> -->
+                              <!-- v => formData.serialNo = v.map(e=> e.serialNo).toString() -->
+                
               </el-form-item>
 
-              <el-form-item label="标签选择" style="width: 100%" v-if="form.sendType == 0">
+              <el-form-item label="标签选择" style="width: 100%" v-if="form.messageSource == 2">
                 <div class="tags" v-for="items in subTags" :key="items.id">
                   <div class="tag_title">{{ items.name }}</div>
                   <div class="tag_item">
@@ -54,39 +58,18 @@
               <el-form-item class="el-form-item__textarea" label="群发内容" prop="content" style="width: 100%">
                 <el-input type="textarea" placeholder="请输入…" v-model="form.content" maxlength="1000" :rows="5" show-word-limit></el-input>
               </el-form-item>
-              <!-- <el-form-item label="群发方式" prop="sendType"  style="width: 50%">
-                <el-radio v-model="form.sendType" label="0">立即发送</el-radio>
-                <el-radio v-model="form.sendType" label="1">定时发送</el-radio>
-              </el-form-item> -->
-
-              <!-- <el-form-item label="群发时间" prop="sendTime"  style="width: 50%" v-if="form.sendType == 1">
-                <el-date-picker size="small"
-                  v-model="form.sendTime"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择日期时间">
-                </el-date-picker>
-              </el-form-item> -->
-              <el-form-item label="其他类型" prop="explain" style="width: 100%">
-                <el-radio-group v-model="form.contentType" @change="onTypeChange">
-                  <el-radio label="image">图片</el-radio>
-                  <el-radio label="video">视频</el-radio>
-                  <el-radio label="file">附件</el-radio>
-                </el-radio-group>
-              </el-form-item>
               <!-- 图片 -->
-              <el-form-item label="图片" style="width: 100%" v-if="form.contentType == 'image'">
-                <ai-uploader :instance="instance" isWechat v-model="imgList" acceptType=".jpg,.png,.jpeg" :limit="1" url="/app/wxcp/upload/uploadFile?type=image"></ai-uploader>
+              <el-form-item label="图片" style="width: 100%">
+                <ai-uploader :instance="instance" isWechat v-model="imgList" multiple acceptType=".jpg,.png,.jpeg" :limit="9" url="/app/wxcp/upload/uploadFile?type=image"></ai-uploader>
               </el-form-item>
               <!-- 视频 -->
-              <el-form-item label="视频" style="width: 100%" v-if="form.contentType == 'video'">
-                <ai-uploader :instance="instance" fileType="file" isWechat acceptType=".mp4" v-model="videoList" :limit="1" url="/app/wxcp/upload/uploadFile?type=video"></ai-uploader>
+              <el-form-item label="视频" style="width: 100%">
+                <ai-uploader :instance="instance" fileType="file" isWechat multiple acceptType=".mp4" v-model="videoList" :limit="9" url="/app/wxcp/upload/uploadFile?type=video"></ai-uploader>
               </el-form-item>
               <!-- 附件 -->
-              <el-form-item label="附件" style="width: 100%" v-if="form.contentType == 'file'">
-                <ai-uploader :instance="instance" fileType="file" isWechat v-model="filesList" :limit="1" url="/app/wxcp/upload/uploadFile?type=file"></ai-uploader>
+              <el-form-item label="附件" style="width: 100%">
+                <ai-uploader :instance="instance" fileType="file" isWechat multiple v-model="filesList" :limit="9" url="/app/wxcp/upload/uploadFile?type=file"></ai-uploader>
               </el-form-item>
-
             </el-form>
           </template>
         </ai-card>
@@ -108,8 +91,8 @@
           <template #content>
             <ai-wrapper>
               <ai-info-item label="创建者" :value="data.userName" isLine></ai-info-item>
-              <ai-info-item label="发送类型" :value="data.sendType" isLine>{{ data.sendType | format }}</ai-info-item>
-              <ai-info-item label="发送时间" :value="data.sendTime" isLine v-if="data.sendType == 1"></ai-info-item>
+              <ai-info-item label="发送类型" :value="data.messageSource" isLine>{{ data.messageSource | format }}</ai-info-item>
+              <ai-info-item label="发送时间" :value="data.sendTime" isLine v-if="data.messageSource == 1"></ai-info-item>
             </ai-wrapper>
 
             <ai-wrapper v-for="item in data.fileList" :key="item.id">
@@ -160,23 +143,17 @@ export default {
       form: {
         areaId: '',
         tag: '',
-        sendType: '0',
+        messageSource: '2',
         sendTime: '',
         content: '',
         contentType: 'text',
-        fileList: [
-          {
-            accessAppid: "",
-            accessDesc: "",
-            accessImgurl: "",
-            accessTitle: "",
-            accessUrl: "",
-            content: "",
-            contentType: "",
-            createdA: 0,
-            mediaId: ""
-          }
-        ],
+        fileList: [],
+        organization: '',
+        deptList: [{
+          corpId: "",
+          objList: [],
+          tagId: [],
+        }],
       },
       tags: [],
       subTags: {},
@@ -189,31 +166,43 @@ export default {
       areaRootId: '',
       users: [],
       images: [],
+      imgs: [],
+      videos: [],
+      files: [],
+      orgIdList: '',
+      orgNameList: [],
+      orgSelect: '',
+      orgAllList: [],
       rules: {
         content: [{ required: true, message: '请输入群发内容'}],
-        sendType: [{ required: true, message: '请选择群发方式' }],
+        messageSource: [{ required: true, message: '请选择群发方式' }],
         sendTime: [{ required: true, message: '请选择群发时间' }],
       },
     }
   },
 
   computed: {
+    ...mapState(['user']),
     tagsChange() {
-      if(this.tags.length) {
+      if(this.tags?.length) {
         return this.form.tag = this.tags.toString();
       }
     },
     areaid() {
       return this.form.areaId = this.areaId.toString();
     },
-    ...mapState(['user'])
+  },
+  watch: {
+    orgNameList: {
+      handler: function (v) {
+        this.orgSelect = `已选择${v.length}个组织`
+      }
+    }
   },
 
   created () {
     if (this.params.id) {
       this.getInfo()
-    } else {
-      this.getSubTags()
     }
     this.areaRootId = [this.user.info.areaId.substr(0, 6),'000000'].join("")
   },
@@ -233,15 +222,27 @@ export default {
       this.areaName = v?.[0]?.label
     },
     getSelectPerson(val) {
-      this.form.name = val[0].name;
-      this.form.phone = val[0].phone;
-      this.form.userId = val[0].sysUserId
-      this.form.wxUserId = val[0].id
+      console.log(val);
+      this.orgNameList = val?.map(item=> item.name)
+      this.orgIdList = val?.map(e=> e.id).toString(); 
+      // this.orgAllList = val
+      this.form.deptList = val?.map(o=>{
+        return {
+          corpId: o.corpId,
+          // objList: ,
+          // tagId: ,
+        }
+      })
+      this.getSubTags()
+    },
+    organizationSelect(value) {
+      console.log(value);
     },
     // 标签
     getSubTags () {
-      this.instance.post(`/app/wxcp/wxcorptag/listAll`).then(res => {
+      this.instance.post(`/app/wxcp/wxgroupchattag/listAllByCorp?dvcpId=${this.orgIdList}`).then(res => {
         if (res?.data) {
+          console.log(res);
           this.subTags = res.data.records
         }
       })
@@ -259,39 +260,42 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.form.fileList = []
-          let contentList = {
+          let contentList = [{
             content: this.form.content,
             contentType: 'text'
-          }
-          this.form.fileList.push(contentList)
+          }]
 
-          if(this.imgList.length) {
-            let item = {
-              contentType: 'image',
-              mediaId: this.imgList[0].media.mediaId,
-              accessUrl: this.imgList[0].url
-            }
-            this.form.fileList.push(item)
+          if (this.imgList.length) {
+            this.imgs = this.imgList.map(item => {
+              return {
+                contentType: 'image',
+                mediaId: item.media.mediaId,
+                accessUrl: item.url,
+              }
+            })
           }
 
-          if(this.videoList.length) {
-            let item = {
-              contentType: 'video',
-              mediaId: this.videoList[0].media.mediaId,
-              accessUrl: this.videoList[0].url
-            }
-            this.form.fileList.push(item)
+          if (this.videoList.length) {
+            this.videos = this.videoList.map(item => {
+              return {
+                contentType: 'video',
+                mediaId: item.media.mediaId,
+                accessUrl: item.url,
+              }
+            })
           }
 
-          if(this.filesList.length) {
-            let item = {
-              contentType: 'file',
-              mediaId: this.filesList[0].media.mediaId,
-              accessUrl: this.filesList[0].url
-            }
-            this.form.fileList.push(item)
+          if (this.filesList.length) {
+            this.files = this.filesList.map(item => {
+              return {
+                contentType: 'file',
+                mediaId: item.media.mediaId,
+                accessUrl: item.url,
+              }
+            })
           }
 
+          this.form.fileList = [...contentList, ...this.imgs, ...this.videos, ...this.files]
           this.instance.post(`/app/pushmessage/addOrUpdate`, {
             ...this.form
           }).then(res => {
@@ -435,4 +439,6 @@ export default {
       }
     }
   }
+
+  
 </style>
diff --git a/packages/wxwork/AppMassNotification/components/List.vue b/packages/wxwork/AppMassNotification/components/List.vue
index fa1b3a2a..5eb2f297 100644
--- a/packages/wxwork/AppMassNotification/components/List.vue
+++ b/packages/wxwork/AppMassNotification/components/List.vue
@@ -76,13 +76,12 @@ export default {
         file: "附件"
       }
       return [
-        { prop: "fileList", label: '消息类型', align: "center", width: "250px", formart: v => v?.map(e=> conType[e.contentType]).toString() },
+        // { prop: "fileList", label: '消息类型', align: "center", width: "250px", formart: v => v?.map(e=> conType[e.contentType]).toString() },
         { prop: "fileList", label: '消息类容', align: "center", width: "250px", formart: v => v?.filter(e=> e.contentType == 'text')[0].content },
         // { prop: "fileList", label: '消息内容', align: "center", width: "250px", formart: v => v?.filter(e => e.contentType == 'text')[0].content},
         // { slot: 'type' },
-        { prop: "sendType", label: '发送类型', align: "center", width: "250px", formart: v => v == 0 ? '立即发送' : '定时发送'},
+        { prop: "messageSource", label: '消息类型', align: "center", formart: v => v==1? '居民': '居民群'},
         { prop: "createTime", label: '创建时间', align: "center", width: "250px"},
-        { prop: "sendTime", label: '发送时间', align: "center", width: "250px"},
         { prop: "userName", label: '创建人', align: "center", width: "250px", },
         { slot: "options" ,},
       ]
@@ -97,7 +96,6 @@ export default {
           ...this.page,
         }
       }).then(res => {
-        console.log(res);
         if (res?.data) {
           this.tableData = res.data.records
           this.page.total = res.data.total
diff --git a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
new file mode 100644
index 00000000..e69de29b

From 9292429c8cd435279e9b4918b90e1d9a1df47bb0 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Jun 2022 20:50:47 +0800
Subject: [PATCH 51/68] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=95=B4=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppMassNotification.vue                   |  24 +-
 .../AppMassNotification/components/Add.vue    | 277 +++++++++---------
 .../AppMassNotification/components/List.vue   | 141 ++++-----
 3 files changed, 222 insertions(+), 220 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/AppMassNotification.vue b/packages/wxwork/AppMassNotification/AppMassNotification.vue
index 4e3b37ed..9cc7d628 100644
--- a/packages/wxwork/AppMassNotification/AppMassNotification.vue
+++ b/packages/wxwork/AppMassNotification/AppMassNotification.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="AppMassNotification">
     <keep-alive :include="['List']">
-      <component ref="component" :is="component" :instance="instance" :params="params" :dict="dict" @change="onChange"/>
+      <component ref="component" :is="currentPage" :instance="instance" :params="params" :dict="dict" @change="onChange"/>
     </keep-alive>
   </section>
 </template>
@@ -25,22 +25,18 @@ export default {
       include: [],
     }
   },
+  computed: {
+    currentPage() {
+      const {hash} = this.$route
+      return hash == "#add" ? Add : List
+    },
+  },
   methods: {
     onChange(data) {
       if (data.type === "Add") {
-        this.component = "Add";
-        this.params = data.params;
-      }
-
-      if (data.type === "List") {
-        this.component = "List";
-        this.params = data.params;
-
-        this.$nextTick(() => {
-          if (data.isRefresh) {
-            this.$refs.component.getTableData();
-          }
-        });
+        this.$router.push({hash: "#add", query: data.params})
+      } else {
+        this.$router.push({})
       }
     },
   },
diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index 1d24ba30..637f0b94 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="Add">
-    <ai-detail v-if="!params.id">
+    <ai-detail v-if="!$route.query.id">
       <template slot="title">
         <ai-title title="群发通知" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
       </template>
@@ -16,19 +16,19 @@
           <template #content>
             <el-form class="ai-form" :rules="rules" ref="form" :model="form" label-width="100px" label-position="right">
 
-              <el-form-item label="发送方式" prop="sendType"  style="width: 50%">
+              <el-form-item label="发送方式" prop="sendType" style="width: 50%">
                 <el-radio v-model="form.sendType" label="0">居民群</el-radio>
                 <el-radio v-model="form.sendType" label="1">居民</el-radio>
               </el-form-item>
 
               <el-form-item label="地区选择" style="width: 100%">
-                <ai-area-get v-model="areaId" :root="areaRootId"  :instance="instance" @select="handleAreaSelect" multiple  size="small" placeholder="全部地区"/>
+                <ai-area-get v-model="areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect" multiple size="small" placeholder="全部地区"/>
               </el-form-item>
 
               <el-form-item label="用户选择" prop="name" style="width: 100%">
                 <el-input size="small" v-model="form.name" placeholder="请选择" disabled>
                   <!-- :isMultiple="true" -->
-                  <ai-wechat-selecter slot="append"  refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson">
+                  <ai-wechat-selecter slot="append" refs="addTags" :instance="instance" v-model="users" @change="getSelectPerson">
                     <el-button size="small" type="info">选择成员</el-button>
                   </ai-wechat-selecter>
                 </el-input>
@@ -42,7 +42,7 @@
                       <el-checkbox v-for="item in items.tagList" :key="item.id" :label="item.id">{{ item.name }}</el-checkbox>
                     </el-checkbox-group>
                   </div>
-                </div>  
+                </div>
               </el-form-item>
             </el-form>
           </template>
@@ -76,15 +76,18 @@
               </el-form-item>
               <!-- 图片 -->
               <el-form-item label="图片" style="width: 100%" v-if="form.contentType == 'image'">
-                <ai-uploader :instance="instance" isWechat v-model="imgList" acceptType=".jpg,.png,.jpeg" :limit="1" url="/app/wxcp/upload/uploadFile?type=image"></ai-uploader>
+                <ai-uploader :instance="instance" isWechat v-model="imgList" acceptType=".jpg,.png,.jpeg" :limit="1"
+                             url="/app/wxcp/upload/uploadFile?type=image"></ai-uploader>
               </el-form-item>
               <!-- 视频 -->
               <el-form-item label="视频" style="width: 100%" v-if="form.contentType == 'video'">
-                <ai-uploader :instance="instance" fileType="file" isWechat acceptType=".mp4" v-model="videoList" :limit="1" url="/app/wxcp/upload/uploadFile?type=video"></ai-uploader>
+                <ai-uploader :instance="instance" fileType="file" isWechat acceptType=".mp4" v-model="videoList" :limit="1"
+                             url="/app/wxcp/upload/uploadFile?type=video"></ai-uploader>
               </el-form-item>
               <!-- 附件 -->
               <el-form-item label="附件" style="width: 100%" v-if="form.contentType == 'file'">
-                <ai-uploader :instance="instance" fileType="file" isWechat v-model="filesList" :limit="1" url="/app/wxcp/upload/uploadFile?type=file"></ai-uploader>
+                <ai-uploader :instance="instance" fileType="file" isWechat v-model="filesList" :limit="1"
+                             url="/app/wxcp/upload/uploadFile?type=file"></ai-uploader>
               </el-form-item>
 
             </el-form>
@@ -99,7 +102,7 @@
 
     </ai-detail>
 
-    <ai-detail class="add" v-if="params.id">
+    <ai-detail class="add" v-if="$route.query.id">
       <template slot="title">
         <ai-title title="群发通知详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
       </template>
@@ -143,17 +146,14 @@
 
 <script>
 import {mapState} from "vuex";
-import AiDvWrapper from '../../../../project/dvui/layout/AiDvWrapper/AiDvWrapper.vue';
+
 export default {
-  components: { AiDvWrapper },
   name: 'Add',
   props: {
     instance: Function,
-    dict: Object,
-    params: Object
+    dict: Object
   },
-
-  data () {
+  data() {
     return {
       isShow: false,
       data: {},
@@ -190,16 +190,16 @@ export default {
       users: [],
       images: [],
       rules: {
-        content: [{ required: true, message: '请输入群发内容'}],
-        sendType: [{ required: true, message: '请选择群发方式' }],
-        sendTime: [{ required: true, message: '请选择群发时间' }],
+        content: [{required: true, message: '请输入群发内容'}],
+        sendType: [{required: true, message: '请选择群发方式'}],
+        sendTime: [{required: true, message: '请选择群发时间'}],
       },
     }
   },
 
   computed: {
     tagsChange() {
-      if(this.tags.length) {
+      if (this.tags.length) {
         return this.form.tag = this.tags.toString();
       }
     },
@@ -209,20 +209,20 @@ export default {
     ...mapState(['user'])
   },
 
-  created () {
-    if (this.params.id) {
+  created() {
+    if (this.$route.query.id) {
       this.getInfo()
     } else {
       this.getSubTags()
     }
-    this.areaRootId = [this.user.info.areaId.substr(0, 6),'000000'].join("")
+    this.areaRootId = [this.user.info.areaId.substr(0, 6), '000000'].join("")
   },
 
   filters: {
     format(value) {
-      if(value == 0) {
+      if (value == 0) {
         return '立即发送'
-      } else if(value == 1) {
+      } else if (value == 1) {
         return '定时发送'
       }
     }
@@ -239,23 +239,23 @@ export default {
       this.form.wxUserId = val[0].id
     },
     // 标签
-    getSubTags () {
+    getSubTags() {
       this.instance.post(`/app/wxcp/wxcorptag/listAll`).then(res => {
         if (res?.data) {
           this.subTags = res.data.records
         }
       })
     },
-    getInfo () {
-      this.instance.post(`/app/pushmessage/detail?id=${this.params.id}`).then(res => {
+    getInfo() {
+      this.instance.post(`/app/pushmessage/detail?id=${this.$route.query.id}`).then(res => {
         if (res?.data) {
           this.data = res.data
-          this.images = [{ url: res.data.fileList.filter(e=> e.contentType == "image")[0]?.accessUrl }]
-          this.fileDownLoad = [{ url:res.data.fileList.filter(e=> e.contentType == "file")[0]?.accessUrl }]
+          this.images = [{url: res.data.fileList.filter(e => e.contentType == "image")[0]?.accessUrl}]
+          this.fileDownLoad = [{url: res.data.fileList.filter(e => e.contentType == "file")[0]?.accessUrl}]
         }
       })
     },
-    confirm () {
+    confirm() {
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.form.fileList = []
@@ -265,7 +265,7 @@ export default {
           }
           this.form.fileList.push(contentList)
 
-          if(this.imgList.length) {
+          if (this.imgList.length) {
             let item = {
               contentType: 'image',
               mediaId: this.imgList[0].media.mediaId,
@@ -274,7 +274,7 @@ export default {
             this.form.fileList.push(item)
           }
 
-          if(this.videoList.length) {
+          if (this.videoList.length) {
             let item = {
               contentType: 'video',
               mediaId: this.videoList[0].media.mediaId,
@@ -283,7 +283,7 @@ export default {
             this.form.fileList.push(item)
           }
 
-          if(this.filesList.length) {
+          if (this.filesList.length) {
             let item = {
               contentType: 'file',
               mediaId: this.filesList[0].media.mediaId,
@@ -305,7 +305,7 @@ export default {
         }
       })
     },
-    cancel (isRefresh) {
+    cancel(isRefresh) {
       this.$emit('change', {
         type: 'List',
         isRefresh: isRefresh ? true : false
@@ -316,123 +316,126 @@ export default {
 </script>
 
 <style scoped lang="scss">
-  .Add {
-    height: 100%;
+.Add {
+  height: 100%;
+}
+
+.ai-card__title {
+  display: flex;
+  align-items: center;
+
+  h2 {
+    margin-right: 20px;
+    color: #222222;
+    font-size: 16px;
+    font-weight: 700;
   }
 
-  .ai-card__title {
+  span {
+    color: #888888;
+    font-size: 14px;
+  }
+}
+
+.appletss {
+  display: flex;
+  flex-wrap: wrap;
+
+  .applets-item {
     display: flex;
     align-items: center;
+    width: 400px;
+    height: 60px;
+    margin-right: 8px;
+    margin-bottom: 8px;
+    padding: 0 17px;
+    background: #FFFFFF;
+    border-radius: 2px;
+    border: 1px solid #D0D4DC;
+    cursor: pointer;
 
-    h2 {
-      margin-right: 20px;
-      color: #222222;
-      font-size: 16px;
-      font-weight: 700;
+    &:hover {
+      border-color: #2266FF;
+    }
+
+    ::v-deep {
+      .el-radio__label {
+        display: none;
+      }
+    }
+
+    img {
+      width: 40px;
+      height: 40px;
+      margin: 0 8px 0 13px;
     }
 
     span {
-      color: #888888;
-      font-size: 14px;
+      color: #222222;
+      font-size: 12px;
+    }
+
+    .el-radio {
+      margin: 0;
+    }
+
+    &.applets-active {
+      border-color: #2266FF;
     }
   }
+}
 
-  .appletss {
-    display: flex;
-    flex-wrap: wrap;
+.tips {
+  position: relative;
+  top: 2px;
+  padding-left: 8px;
+  color: #222222;
+  font-size: 14px;
+}
 
-    .applets-item {
-      display: flex;
-      align-items: center;
-      width: 400px;
-      height: 60px;
+.el-form-item-item__textarea {
+  position: relative;
+}
+
+.el-form-item__btn {
+  position: absolute;
+  bottom: 12px;
+  left: 12px;
+  line-height: 1;
+  z-index: 1;
+  color: #2266FF;
+  font-size: 14px;
+  user-select: none;
+  background: #fff;
+  cursor: pointer;
+}
+
+.tags {
+  // padding: 10px;
+  .tag_title {
+    font-weight: 600;
+  }
+
+  .tag_item {
+    margin: 5px 0;
+
+    span {
+      display: inline-block;
+      // padding: 5px 10px;
+      width: 80px;
+      text-align: center;
+      height: 30px;
+      line-height: 30px;
+      background: #DDD;
+      color: #333;
+      border-radius: 4px;
       margin-right: 8px;
-      margin-bottom: 8px;
-      padding: 0 17px;
-      background: #FFFFFF;
-      border-radius: 2px;
-      border: 1px solid #D0D4DC;
-      cursor: pointer;
+    }
 
-      &:hover {
-        border-color: #2266FF;
-      }
-
-      ::v-deep {
-        .el-radio__label {
-          display: none;
-        }
-      }
-
-      img {
-        width: 40px;
-        height: 40px;
-        margin: 0 8px 0 13px;
-      }
-
-      span {
-        color: #222222;
-        font-size: 12px;
-      }
-
-      .el-radio {
-        margin: 0;
-      }
-
-      &.applets-active {
-        border-color: #2266FF;
-      }
-    }
-  }
-
-  .tips {
-    position: relative;
-    top: 2px;
-    padding-left: 8px;
-    color: #222222;
-    font-size: 14px;
-  }
-
-  .el-form-item-item__textarea  {
-    position: relative;
-  }
-
-  .el-form-item__btn {
-    position: absolute;
-    bottom: 12px;
-    left: 12px;
-    line-height: 1;
-    z-index: 1;
-    color: #2266FF;
-    font-size: 14px;
-    user-select: none;
-    background: #fff;
-    cursor: pointer;
-  }
-
-  .tags {
-    // padding: 10px;
-    .tag_title {
-      font-weight: 600;
-    }
-    .tag_item {
-      margin: 5px 0;
-      span {
-        display: inline-block;
-        // padding: 5px 10px;
-        width: 80px;
-        text-align: center;
-        height: 30px;
-        line-height: 30px;
-        background: #DDD;
-        color: #333;
-        border-radius: 4px;
-        margin-right: 8px;
-      }
-      .active {
-        background: #53bcea;
-        color: #FFFFFF;
-      }
+    .active {
+      background: #53bcea;
+      color: #FFFFFF;
     }
   }
+}
 </style>
diff --git a/packages/wxwork/AppMassNotification/components/List.vue b/packages/wxwork/AppMassNotification/components/List.vue
index fa1b3a2a..c9205944 100644
--- a/packages/wxwork/AppMassNotification/components/List.vue
+++ b/packages/wxwork/AppMassNotification/components/List.vue
@@ -5,9 +5,9 @@
     </template>
     <template #content>
       <ai-search-bar>
-          <template #left>
-            <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
-          </template>
+        <template #left>
+          <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
+        </template>
       </ai-search-bar>
       <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
                 @getList="getTableData" show-overflow-tooltip :col-configs="colConfigs" :dict="dict">
@@ -37,7 +37,7 @@
             </el-popover>
           </template>
         </el-table-column>         -->
-        <el-table-column slot="options" label="操作"  align="center">
+        <el-table-column slot="options" label="操作" align="center">
           <template slot-scope="{ row }">
             <el-button type="text" @click="toAdd(row.id)">详情</el-button>
             <!-- <el-button type="text" @click="handleDelete(row.id)">删除</el-button> -->
@@ -49,7 +49,8 @@
 </template>
 
 <script>
-import { mapState } from 'vuex'
+import {mapState} from 'vuex'
+
 export default {
   name: "List",
   props: {
@@ -60,7 +61,7 @@ export default {
   data() {
     return {
       tableData: [],
-      page: {current: 1, size: 10, total: 0,pages: 0},
+      page: {current: 1, size: 10, total: 0, pages: 0},
       id: '',
     }
   },
@@ -76,15 +77,15 @@ export default {
         file: "附件"
       }
       return [
-        { prop: "fileList", label: '消息类型', align: "center", width: "250px", formart: v => v?.map(e=> conType[e.contentType]).toString() },
-        { prop: "fileList", label: '消息类容', align: "center", width: "250px", formart: v => v?.filter(e=> e.contentType == 'text')[0].content },
+        {prop: "fileList", label: '消息类型', align: "center", width: "250px", formart: v => v?.map(e => conType[e.contentType]).toString()},
+        {prop: "fileList", label: '消息类容', align: "center", width: "250px", formart: v => v?.filter(e => e.contentType == 'text')[0].content},
         // { prop: "fileList", label: '消息内容', align: "center", width: "250px", formart: v => v?.filter(e => e.contentType == 'text')[0].content},
         // { slot: 'type' },
-        { prop: "sendType", label: '发送类型', align: "center", width: "250px", formart: v => v == 0 ? '立即发送' : '定时发送'},
-        { prop: "createTime", label: '创建时间', align: "center", width: "250px"},
-        { prop: "sendTime", label: '发送时间', align: "center", width: "250px"},
-        { prop: "userName", label: '创建人', align: "center", width: "250px", },
-        { slot: "options" ,},
+        {prop: "sendType", label: '发送类型', align: "center", width: "250px", formart: v => v == 0 ? '立即发送' : '定时发送'},
+        {prop: "createTime", label: '创建时间', align: "center", width: "250px"},
+        {prop: "sendTime", label: '发送时间', align: "center", width: "250px"},
+        {prop: "userName", label: '创建人', align: "center", width: "250px",},
+        {slot: "options",},
       ]
     },
     ...mapState(['user'])
@@ -105,7 +106,7 @@ export default {
       })
     },
 
-    mapType (type) {
+    mapType(type) {
       return {
         'image': '图片',
         'video': '视频',
@@ -122,7 +123,7 @@ export default {
         },
       })
     }
-    
+
   },
 }
 </script>
@@ -131,6 +132,7 @@ export default {
 .List {
   height: 100%;
   background: #f3f4f5;
+
   .count {
     cursor: pointer;
     color: #2266FF;
@@ -142,68 +144,69 @@ export default {
   }
 
 }
-  img, video {
-    width: 40px;
-    height: 40px;
-    margin-right: 10px;
-    object-fit: cover;
+
+img, video {
+  width: 40px;
+  height: 40px;
+  margin-right: 10px;
+  object-fit: cover;
+}
+
+.message-info {
+  padding: 8px;
+  min-height: 116px;
+
+  h2 {
+    color: #222222;
+    font-weight: 500;
+    font-size: 14px;
   }
 
-  .message-info {
-    padding: 8px;
-    min-height: 116px;
+  .message-info__wrapper {
+    display: flex;
+    align-items: center;
+    width: 368px;
+    height: 60px;
+    padding: 10px;
+    background: #FFFFFF;
+    border-radius: 2px;
+    border: 1px solid #D0D4DC;
 
-    h2 {
+    .message-info__wrapper--right {
+      flex: 1;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    h3 {
+      width: 100%;
       color: #222222;
-      font-weight: 500;
       font-size: 14px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      font-weight: normal;
     }
 
-    .message-info__wrapper {
-      display: flex;
-      align-items: center;
-      width: 368px;
-      height: 60px;
-      padding: 10px;
-      background: #FFFFFF;
-      border-radius: 2px;
-      border: 1px solid #D0D4DC;
+    img, video {
+      width: 40px;
+      height: 40px;
+      margin-right: 10px;
+      object-fit: cover;
+    }
 
-      .message-info__wrapper--right {
-        flex: 1;
-        overflow: hidden;
-        text-overflow:ellipsis;
-        white-space: nowrap;
-      }
-
-      h3 {
-        width: 100%;
-        color: #222222;
-        font-size: 14px;
-        overflow: hidden;
-        text-overflow:ellipsis;
-        white-space: nowrap;
-        font-weight: normal;
-      }
-
-      img, video {
-        width: 40px;
-        height: 40px;
-        margin-right: 10px;
-        object-fit: cover;
-      }
-
-      p {
-        margin-top: 6px;
-        font-size: 14px;
-        color: #888888;
-      }
+    p {
+      margin-top: 6px;
+      font-size: 14px;
+      color: #888888;
     }
   }
+}
 
-  .row-content { 
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow:ellipsis;
-  }
-</style>
\ No newline at end of file
+.row-content {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+</style>

From a1ca224a98441ec00380ad60abdd9e6efb4d1786 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Jun 2022 23:12:16 +0800
Subject: [PATCH 52/68] =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppMassNotification/components/Add.vue    |  93 +++++----
 .../components/SelectDeptUser.vue             | 189 ++++++++++++++++++
 2 files changed, 239 insertions(+), 43 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index 6854ba78..ca4d7ade 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -14,27 +14,26 @@
           </template>
 
           <template #content>
-            <el-form class="ai-form" :rules="rules" ref="form" :model="form" label-width="100px" label-position="right">
+            <el-form size="small" class="ai-form" :rules="rules" ref="form" :model="form" label-width="100px" label-position="right">
 
-              <el-form-item label="发送方式" prop="messageSource"  style="width: 50%">
+              <el-form-item label="发送方式" prop="messageSource" style="width: 50%">
                 <el-radio v-model="form.messageSource" label="2">居民群</el-radio>
                 <el-radio v-model="form.messageSource" label="1">居民</el-radio>
               </el-form-item>
 
               <el-form-item label="地区选择" style="width: 100%">
-                <ai-area-get v-model="areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect" multiple  size="small" placeholder="全部地区"/>
+                <ai-area-get v-model="areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect" multiple size="small" placeholder="全部地区"/>
               </el-form-item>
 
-              <el-form-item label="选择组织" style="width: 100%">
-                <el-input size="small" :value="orgSelect" placeholder="请选择" disabled />
-                <el-button size="small" type="info" class="selectDeptUser">选择组织</el-button>
-                  <!-- <ai-wechat-selecter slot="append"  refs="addTags" :instance="instance" isChooseUnit isStrictly v-model="orgNameList"  @change="getSelectPerson">
-                    <el-button size="small" type="info">选择组织</el-button>
-                  </ai-wechat-selecter> -->
+              <el-form-item label="发送范围" style="width: 100%">
+                <select-dept-user v-model="form.deptList" v-bind="$props" :source="form.messageSource"/>
+                <!-- <ai-wechat-selecter slot="append"  refs="addTags" :instance="instance" isChooseUnit isStrictly v-model="orgNameList"  @change="getSelectPerson">
+                  <el-button size="small" type="info">选择组织</el-button>
+                </ai-wechat-selecter> -->
                 <!-- </el-input> -->
                 <!-- <ai-table-select nodeName="name" :instance="instance" extra="serialNo" searchKey="name" :action="`/app/wxcp/wxdepartment/listAllByCorp`"
                               @select="organizationSelect" multiple/> -->
-                              <!-- v => formData.serialNo = v.map(e=> e.serialNo).toString() -->
+                <!-- v => formData.serialNo = v.map(e=> e.serialNo).toString() -->
 
               </el-form-item>
 
@@ -60,15 +59,18 @@
               </el-form-item>
               <!-- 图片 -->
               <el-form-item label="图片" style="width: 100%">
-                <ai-uploader :instance="instance" isWechat v-model="imgList" multiple acceptType=".jpg,.png,.jpeg" :limit="9" url="/app/wxcp/upload/uploadFile?type=image"></ai-uploader>
+                <ai-uploader :instance="instance" isWechat v-model="imgList" multiple acceptType=".jpg,.png,.jpeg" :limit="9"
+                             url="/app/wxcp/upload/uploadFile?type=image"></ai-uploader>
               </el-form-item>
               <!-- 视频 -->
               <el-form-item label="视频" style="width: 100%">
-                <ai-uploader :instance="instance" fileType="file" isWechat multiple acceptType=".mp4" v-model="videoList" :limit="9" url="/app/wxcp/upload/uploadFile?type=video"></ai-uploader>
+                <ai-uploader :instance="instance" fileType="file" isWechat multiple acceptType=".mp4" v-model="videoList" :limit="9"
+                             url="/app/wxcp/upload/uploadFile?type=video"></ai-uploader>
               </el-form-item>
               <!-- 附件 -->
               <el-form-item label="附件" style="width: 100%">
-                <ai-uploader :instance="instance" fileType="file" isWechat multiple v-model="filesList" :limit="9" url="/app/wxcp/upload/uploadFile?type=file"></ai-uploader>
+                <ai-uploader :instance="instance" fileType="file" isWechat multiple v-model="filesList" :limit="9"
+                             url="/app/wxcp/upload/uploadFile?type=file"></ai-uploader>
               </el-form-item>
             </el-form>
           </template>
@@ -126,9 +128,11 @@
 
 <script>
 import {mapState} from "vuex";
+import SelectDeptUser from "./SelectDeptUser";
 
 export default {
   name: 'Add',
+  components: {SelectDeptUser},
   props: {
     instance: Function,
     dict: Object
@@ -171,9 +175,9 @@ export default {
       orgSelect: '',
       orgAllList: [],
       rules: {
-        content: [{ required: true, message: '请输入群发内容'}],
-        messageSource: [{ required: true, message: '请选择群发方式' }],
-        sendTime: [{ required: true, message: '请选择群发时间' }],
+        content: [{required: true, message: '请输入群发内容'}],
+        messageSource: [{required: true, message: '请选择群发方式'}],
+        sendTime: [{required: true, message: '请选择群发时间'}],
       },
     }
   },
@@ -181,7 +185,7 @@ export default {
   computed: {
     ...mapState(['user']),
     tagsChange() {
-      if(this.tags?.length) {
+      if (this.tags?.length) {
         return this.form.tag = this.tags.toString();
       }
     },
@@ -220,10 +224,10 @@ export default {
     },
     getSelectPerson(val) {
       console.log(val);
-      this.orgNameList = val?.map(item=> item.name)
-      this.orgIdList = val?.map(e=> e.id).toString();
+      this.orgNameList = val?.map(item => item.name)
+      this.orgIdList = val?.map(e => e.id).toString();
       // this.orgAllList = val
-      this.form.deptList = val?.map(o=>{
+      this.form.deptList = val?.map(o => {
         return {
           corpId: o.corpId,
           // objList: ,
@@ -236,7 +240,7 @@ export default {
       console.log(value);
     },
     // 标签
-    getSubTags () {
+    getSubTags() {
       this.instance.post(`/app/wxcp/wxgroupchattag/listAllByCorp?dvcpId=${this.orgIdList}`).then(res => {
         if (res?.data) {
           console.log(res);
@@ -411,31 +415,34 @@ export default {
   cursor: pointer;
 }
 
-  .tags {
-    // padding: 10px;
-    .tag_title {
-      font-weight: 600;
+.tags {
+  // padding: 10px;
+  .tag_title {
+    font-weight: 600;
+  }
+
+  .tag_item {
+    margin: 5px 0;
+
+    span {
+      display: inline-block;
+      // padding: 5px 10px;
+      width: 80px;
+      text-align: center;
+      height: 30px;
+      line-height: 30px;
+      background: #DDD;
+      color: #333;
+      border-radius: 4px;
+      margin-right: 8px;
     }
-    .tag_item {
-      margin: 5px 0;
-      span {
-        display: inline-block;
-        // padding: 5px 10px;
-        width: 80px;
-        text-align: center;
-        height: 30px;
-        line-height: 30px;
-        background: #DDD;
-        color: #333;
-        border-radius: 4px;
-        margin-right: 8px;
-      }
-      .active {
-        background: #53bcea;
-        color: #FFFFFF;
-      }
+
+    .active {
+      background: #53bcea;
+      color: #FFFFFF;
     }
   }
+}
 
 
 </style>
diff --git a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
index e69de29b..fd371256 100644
--- a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
+++ b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
@@ -0,0 +1,189 @@
+<template>
+  <section class="SelectDeptUser">
+    <el-input :value="selectText" disabled size="small" @click.native="dialog=true">
+      <el-button type="text" slot="append">开始选择</el-button>
+    </el-input>
+    <ai-dialog :visible.sync="dialog" title="选择部门/人员" width="700px" @onConfirm="handleSubmit" @close="selected=[]">
+      <el-breadcrumb separator="/">
+        <el-breadcrumb-item v-for="(item, index) in selectDeptPath" :key="index">
+          <el-button type="text" @click="deptNameClick(item)">{{ item.name }}</el-button>
+        </el-breadcrumb-item>
+      </el-breadcrumb>
+      <div class="optionsItem" v-for="(row, index) in options" :key="index">
+        <el-row type="flex">
+          <el-checkbox class="fill" :label="row.uid" v-model="row.checked" @change="handleCheck(row,index)">{{ row.name }}</el-checkbox>
+          <el-button type="text" v-if="!row.parentid&&row.kind=='dept'" @click="openDialogTag(row)">添加标签</el-button>
+          <el-button type="text" v-if="row.kind=='dept'" @click="itemClick(row)">更多</el-button>
+        </el-row>
+        <el-tag effect="dark" size="small" v-for="tag in row.selectedTags" :key="tag.id" class="mar-4">{{ tag.name }}</el-tag>
+      </div>
+      <ai-empty v-if="!options.length"/>
+      <ai-dialog :visible.sync="dialogTag" title="选择标签" width="500px" @onConfirm="handleSelectTag" @close="selectedTags=[]" append-to-body>
+        <el-checkbox-group v-model="selectedTags">
+          <div class="optionsItem" v-for="(cls, index) in tagOps" :key="index">
+            <ai-title :title="cls.name"/>
+            <el-checkbox class="fill" v-for="(op, i) in cls.tagList" :key="i" :label="op.id">{{ op.name }}</el-checkbox>
+          </div>
+        </el-checkbox-group>
+        <ai-empty v-if="!tagOps.length"/>
+      </ai-dialog>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "SelectDeptUser",
+  model: {
+    event: "change",
+    prop: "value"
+  },
+  props: {
+    value: {default: ""},
+    instance: Function,
+    dict: Object,
+    source: {default: 1}
+  },
+  computed: {
+    selectText: v => !!v.value ? "已选择" : "请选择",
+    tagAction: v => v.source == 1 ? '/app/wxcp/wxgroupchattag/listAllByCorp' : '/app/wxcp/wxcorptag/listAllByCorp'
+  },
+  data() {
+    return {
+      dialog: false,
+      dialogTag: false,
+      currentCorp: {},
+      selected: [],
+      selectDeptPath: [],
+      selectedTags: [],
+      options: [],
+      tagOps: [],
+      allData: [],
+      tags: {}
+    }
+  },
+  methods: {
+    getDepts() {
+      this.instance.post('/app/wxcp/wxdepartment/listAllByCorp').then(res => {
+        if (res?.data) {
+          let parents = res.data.map(e => e.parentid)
+          this.allData = res.data.map(e => ({
+            ...e,
+            hasChildren: parents.includes(e.id),
+            uid: [e.corpId, e.id].join("_"),
+            kind: 'dept',
+            checked: false
+          }))
+          this.deptInit()
+        }
+      })
+    },
+    getTagsByCorp(dvcpCorpId) {
+      return this.instance.post(this.tagAction, null, {
+        params: {dvcpCorpId, size: 9999}
+      }).then(res => {
+        if (res?.data) {
+          return this.tagOps = res.data.records || []
+        }
+      })
+    },
+    deptInit() {
+      this.options = this.allData.filter(e => !e.parentid)
+      this.selectDeptPath = [{name: "可选范围", id: ''}]
+    },
+    itemClick(row) {
+      let index = this.selectDeptPath.findIndex(e => e.id == row.id)
+      if (index == -1) {
+        this.selectDeptPath.push(row)
+        this.getDeptsAndUsersByParent(row)
+      }
+    },
+    getDeptsAndUsersByParent(row) {
+      let {id: departmentId, corpId: cid} = row
+      this.options = this.allData.filter(e => e.parentid == departmentId && e.corpId == cid) || []
+      this.instance.post(`/app/wxcp/wxuser/listByDeptId`, null, {
+        params: {departmentId, status: 1, cid}
+      }).then(res => {
+        if (res?.data) {
+          res.data = res.data.map(e => ({...e, kind: "user"}))
+          this.options = [this.options, res.data].flat()
+        }
+      })
+    },
+    deptNameClick(row, index) {
+      if (!index) { //第一级别
+        this.deptInit()
+      } else {
+        let length = this.selectDeptPath.length - index
+        this.selectDeptPath.splice(index + 1, length)
+        this.getDeptsAndUsersByParent(row.id)
+      }
+    },
+    openDialogTag(row) {
+      this.getTagsByCorp(row.corpId).then(() => {
+        this.currentCorp = row
+        this.dialogTag = true
+      })
+    },
+    handleSelectTag() {
+      let {corpId} = this.currentCorp
+      this.currentCorp.selectedTags = this.$copy(this.tagOps.map(e => e.tagList).flat().filter(e => this.selectedTags.includes(e.id)))
+      this.tags[corpId] = this.$copy(this.currentCorp.selectedTags)
+      this.dialogTag = false
+    },
+    handleSubmit() {
+      let result = {}
+      this.selected?.map(e => {
+        let {kind, id} = e
+        result[e.corpId] = [result[e.corpId], {kind, id}].flat()
+      })
+      let selected = Object.keys(result).map(corpId => {
+        let res
+        if (result[corpId]) {
+          res = {
+            corpId,
+            objList: result[corpId].filter(e => !!e)
+          }
+          if (this.tags[corpId]?.length > 0) {
+            res.tagId = this.tags[corpId]?.map(e => e.id)
+          }
+        }
+        return res
+      }).filter(e => !!e)
+      this.$emit("change", selected)
+      this.dialog = false
+    },
+    isSelected(uid) {
+      return !!this.selected.find(e => e.uid == uid)
+    },
+    handleCheck(row, i) {
+      row.checked = !row.checked
+      if (row.checked) {
+        this.selected.push(row)
+      } else {
+        this.selected.splice(i, 1)
+      }
+      this.$forceUpdate()
+    }
+  },
+  created() {
+    this.getDepts()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.SelectDeptUser {
+  ::v-deep.optionsItem {
+    border: 1px solid #eee;
+    margin-bottom: 8px;
+    padding: 8px;
+    border-radius: 4px;
+
+    .mar-4 {
+      margin-right: 4px;
+      margin-bottom: 4px;
+    }
+  }
+}
+</style>

From 47b681c99d99d2fb247a4e19a3aa9badaa8107a2 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 24 Jun 2022 23:21:18 +0800
Subject: [PATCH 53/68] =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/wxwork/AppMassNotification/components/Add.vue  | 8 ++++----
 packages/wxwork/AppMassNotification/components/List.vue | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index ca4d7ade..d00f7781 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -37,7 +37,7 @@
 
               </el-form-item>
 
-              <el-form-item label="标签选择" style="width: 100%" v-if="form.messageSource == 2">
+              <!-- <el-form-item label="标签选择" style="width: 100%" v-if="form.messageSource == 2">
                 <div class="tags" v-for="items in subTags" :key="items.id">
                   <div class="tag_title">{{ items.name }}</div>
                   <div class="tag_item">
@@ -46,7 +46,7 @@
                     </el-checkbox-group>
                   </div>
                 </div>
-              </el-form-item>
+              </el-form-item> -->
             </el-form>
           </template>
         </ai-card>
@@ -93,8 +93,8 @@
           <template #content>
             <ai-wrapper>
               <ai-info-item label="创建者" :value="data.userName" isLine></ai-info-item>
-              <ai-info-item label="发送类型" :value="data.messageSource" isLine>{{ data.messageSource | format }}</ai-info-item>
-              <ai-info-item label="发送时间" :value="data.sendTime" isLine v-if="data.messageSource == 1"></ai-info-item>
+              <!-- <ai-info-item label="发送类型" :value="data.messageSource" isLine>{{ data.messageSource | format }}</ai-info-item> -->
+              <!-- <ai-info-item label="发送时间" :value="data.sendTime" isLine v-if="data.messageSource == 1"></ai-info-item> -->
             </ai-wrapper>
 
             <ai-wrapper v-for="item in data.fileList" :key="item.id">
diff --git a/packages/wxwork/AppMassNotification/components/List.vue b/packages/wxwork/AppMassNotification/components/List.vue
index b271a0a9..c1bc4b94 100644
--- a/packages/wxwork/AppMassNotification/components/List.vue
+++ b/packages/wxwork/AppMassNotification/components/List.vue
@@ -78,7 +78,7 @@ export default {
       }
       return [
         // { prop: "fileList", label: '消息类型', align: "center", width: "250px", formart: v => v?.map(e=> conType[e.contentType]).toString() },
-        { prop: "fileList", label: '消息类容', align: "center", width: "250px", formart: v => v?.filter(e=> e.contentType == 'text')[0].content },
+        { prop: "fileList", label: '消息内容', align: "center", width: "250px", formart: v => v?.filter(e=> e.contentType == 'text')[0].content },
         // { prop: "fileList", label: '消息内容', align: "center", width: "250px", formart: v => v?.filter(e => e.contentType == 'text')[0].content},
         // { slot: 'type' },
         { prop: "messageSource", label: '消息类型', align: "center", formart: v => v==1? '居民': '居民群'},

From 3e466e01cb69b0f77f1d123025c2885cfab81e25 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 27 Jun 2022 08:54:51 +0800
Subject: [PATCH 54/68] BUG 30330

---
 .../wxwork/AppMassNotification/components/SelectDeptUser.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
index fd371256..3f14a1cc 100644
--- a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
+++ b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
@@ -45,7 +45,7 @@ export default {
     source: {default: 1}
   },
   computed: {
-    selectText: v => !!v.value ? "已选择" : "请选择",
+    selectText: v => v.value?.length > 0 ? "已选择" : "请选择",
     tagAction: v => v.source == 1 ? '/app/wxcp/wxgroupchattag/listAllByCorp' : '/app/wxcp/wxcorptag/listAllByCorp'
   },
   data() {

From a3cb513b575907a298c661c4193bac7686eaa4c3 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 27 Jun 2022 09:03:16 +0800
Subject: [PATCH 55/68] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppMassNotification/components/Add.vue    | 85 +++++--------------
 1 file changed, 21 insertions(+), 64 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index d00f7781..fa28190b 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -27,26 +27,8 @@
 
               <el-form-item label="发送范围" style="width: 100%">
                 <select-dept-user v-model="form.deptList" v-bind="$props" :source="form.messageSource"/>
-                <!-- <ai-wechat-selecter slot="append"  refs="addTags" :instance="instance" isChooseUnit isStrictly v-model="orgNameList"  @change="getSelectPerson">
-                  <el-button size="small" type="info">选择组织</el-button>
-                </ai-wechat-selecter> -->
-                <!-- </el-input> -->
-                <!-- <ai-table-select nodeName="name" :instance="instance" extra="serialNo" searchKey="name" :action="`/app/wxcp/wxdepartment/listAllByCorp`"
-                              @select="organizationSelect" multiple/> -->
-                <!-- v => formData.serialNo = v.map(e=> e.serialNo).toString() -->
-
               </el-form-item>
 
-              <!-- <el-form-item label="标签选择" style="width: 100%" v-if="form.messageSource == 2">
-                <div class="tags" v-for="items in subTags" :key="items.id">
-                  <div class="tag_title">{{ items.name }}</div>
-                  <div class="tag_item">
-                    <el-checkbox-group v-model="tags">
-                      <el-checkbox v-for="item in items.tagList" :key="item.id" :label="item.id">{{ item.name }}</el-checkbox>
-                    </el-checkbox-group>
-                  </div>
-                </div>
-              </el-form-item> -->
             </el-form>
           </template>
         </ai-card>
@@ -94,7 +76,6 @@
             <ai-wrapper>
               <ai-info-item label="创建者" :value="data.userName" isLine></ai-info-item>
               <!-- <ai-info-item label="发送类型" :value="data.messageSource" isLine>{{ data.messageSource | format }}</ai-info-item> -->
-              <!-- <ai-info-item label="发送时间" :value="data.sendTime" isLine v-if="data.messageSource == 1"></ai-info-item> -->
             </ai-wrapper>
 
             <ai-wrapper v-for="item in data.fileList" :key="item.id">
@@ -170,10 +151,10 @@ export default {
       imgs: [],
       videos: [],
       files: [],
-      orgIdList: '',
-      orgNameList: [],
-      orgSelect: '',
-      orgAllList: [],
+      // orgIdList: '',
+      // orgNameList: [],
+      // orgSelect: '',
+      // orgAllList: [],
       rules: {
         content: [{required: true, message: '请输入群发内容'}],
         messageSource: [{required: true, message: '请选择群发方式'}],
@@ -193,13 +174,13 @@ export default {
       return this.form.areaId = this.areaId.toString();
     },
   },
-  watch: {
-    orgNameList: {
-      handler: function (v) {
-        this.orgSelect = `已选择${v.length}个组织`
-      }
-    }
-  },
+  // watch: {
+  //   orgNameList: {
+  //     handler: function (v) {
+  //       this.orgSelect = `已选择${v.length}个组织`
+  //     }
+  //   }
+  // },
 
   created() {
     if (this.$route.query.id) {
@@ -208,46 +189,22 @@ export default {
     this.areaRootId = [this.user.info.areaId.substr(0, 6), '000000'].join("")
   },
 
-  filters: {
-    format(value) {
-      if (value == 0) {
-        return '立即发送'
-      } else if (value == 1) {
-        return '定时发送'
-      }
-    }
-  },
 
   methods: {
     handleAreaSelect(v) {
       this.areaName = v?.[0]?.label
     },
-    getSelectPerson(val) {
-      console.log(val);
-      this.orgNameList = val?.map(item => item.name)
-      this.orgIdList = val?.map(e => e.id).toString();
-      // this.orgAllList = val
-      this.form.deptList = val?.map(o => {
-        return {
-          corpId: o.corpId,
-          // objList: ,
-          // tagId: ,
-        }
-      })
-      this.getSubTags()
-    },
-    organizationSelect(value) {
-      console.log(value);
-    },
+
     // 标签
-    getSubTags() {
-      this.instance.post(`/app/wxcp/wxgroupchattag/listAllByCorp?dvcpId=${this.orgIdList}`).then(res => {
-        if (res?.data) {
-          console.log(res);
-          this.subTags = res.data.records
-        }
-      })
-    },
+    // getSubTags() {
+    //   this.instance.post(`/app/wxcp/wxgroupchattag/listAllByCorp?dvcpId=${this.orgIdList}`).then(res => {
+    //     if (res?.data) {
+    //       console.log(res);
+    //       this.subTags = res.data.records
+    //     }
+    //   })
+    // },
+    
     getInfo() {
       this.instance.post(`/app/pushmessage/detail?id=${this.$route.query.id}`).then(res => {
         if (res?.data) {

From b5ae298ee968d41653f030f4b956c4b4dfb67c14 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 27 Jun 2022 09:43:01 +0800
Subject: [PATCH 56/68] bug

---
 packages/bigscreen/designer/components/Layout.vue      |  2 +-
 .../bigscreen/designer/components/form/DataConfig.vue  | 10 +++++++---
 packages/bigscreen/viewer/AppGigscreenViewer.vue       |  6 +++++-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/bigscreen/designer/components/Layout.vue b/packages/bigscreen/designer/components/Layout.vue
index f2426a19..131c06b6 100644
--- a/packages/bigscreen/designer/components/Layout.vue
+++ b/packages/bigscreen/designer/components/Layout.vue
@@ -91,7 +91,7 @@
                       <div class="coordinate-top"></div>
                       <div class="coordinate-label">{{ item.left }}, {{ item.top }}</div>
                     </div>
-                    <ai-dv-render :data="item" :theme="dashboard.theme" :index="index"/>
+                    <ai-dv-render :data="item" :theme="dashboard.theme" :index="index" :instance="instance" />
                   </vue-draggable-resizable>
                 </div>
               </ai-dv-wrapper>
diff --git a/packages/bigscreen/designer/components/form/DataConfig.vue b/packages/bigscreen/designer/components/form/DataConfig.vue
index c7a13e51..35cf2ae5 100644
--- a/packages/bigscreen/designer/components/form/DataConfig.vue
+++ b/packages/bigscreen/designer/components/form/DataConfig.vue
@@ -29,7 +29,7 @@
       <div class="layout-config__code" v-if="options.dataType === 'staticData'">
         <el-button @click="showEditor" class="layout-config__code--btn" title="编辑" type="text" icon="iconfont iconjdq_led_edit"></el-button>
         <vue-json-editor
-          :value="options.staticData" 
+          :value="options.staticData"
           :show-btns="false"
           mode="view"
           lang="zh">
@@ -206,7 +206,7 @@
             this.options.src = JSON.parse(res.data).url
           }
         })
-      }, 
+      },
 
       getDataList () {
         this.instance.post(`${this.urlPrefix}/appdiylargescreen/allDatasourceByPage`, null, {
@@ -227,7 +227,7 @@
         this.instance.post(this.options.api).then(res => {
           if (res.code == 0) {
             if (res.data.length) {
-              if (this.options.type === 'table') { 
+              if (this.options.type === 'table') {
                 const keys = Object.keys(res.data[0])
                 const list = res.data
                 this.options.apiData = keys.map(v => {
@@ -259,6 +259,8 @@
                 this.keys = Object.keys(res.data[0])
               }
             }
+          } else {
+            this.options.dynamicData = []
           }
         })
       },
@@ -312,6 +314,8 @@
                 this.list = res.data
                 this.keys = Object.keys(res.data[0])
               }
+            } else {
+              this.options.dynamicData = []
             }
           }
         })
diff --git a/packages/bigscreen/viewer/AppGigscreenViewer.vue b/packages/bigscreen/viewer/AppGigscreenViewer.vue
index 96a0a277..48e0d151 100644
--- a/packages/bigscreen/viewer/AppGigscreenViewer.vue
+++ b/packages/bigscreen/viewer/AppGigscreenViewer.vue
@@ -157,9 +157,13 @@ export default {
                     ...obj
                   })
                 })
-              } else dynamicData = res.data
+              } else {
+                dynamicData = res.data
+              }
             }
             this.$set(this.componentList[index], item.dataType, dynamicData)
+          } else {
+            this.$set(this.componentList[index], item.dataType, [])
           }
         }
       })

From aa846b62a72421e5756ede57bd5c4c251a29b2c6 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 27 Jun 2022 10:34:15 +0800
Subject: [PATCH 57/68] bug 30322

---
 .../components/SelectDeptUser.vue             |  7 +++++--
 .../apps/AppScoreRules/AppScoreRules.vue      | 19 ++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
index 3f14a1cc..91e74ad2 100644
--- a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
+++ b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
@@ -46,7 +46,7 @@ export default {
   },
   computed: {
     selectText: v => v.value?.length > 0 ? "已选择" : "请选择",
-    tagAction: v => v.source == 1 ? '/app/wxcp/wxgroupchattag/listAllByCorp' : '/app/wxcp/wxcorptag/listAllByCorp'
+    tagAction: v => v.source == 2 ? '/app/wxcp/wxgroupchattag/listAllByCorp' : '/app/wxcp/wxcorptag/listAllByCorp'
   },
   data() {
     return {
@@ -80,7 +80,10 @@ export default {
     },
     getTagsByCorp(dvcpCorpId) {
       return this.instance.post(this.tagAction, null, {
-        params: {dvcpCorpId, size: 9999}
+        params: {
+          dvcpCorpId,
+          size: 9999
+        }
       }).then(res => {
         if (res?.data) {
           return this.tagOps = res.data.records || []
diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
index 3801c1b9..87f996a1 100644
--- a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
+++ b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
@@ -81,10 +81,10 @@
           </el-form-item>
 
           <el-form-item label="规则" prop="ruleType" required>
-            <el-radio-group v-model="form.pass" @change="typeChange">
-              <el-radio label="0">常规</el-radio>
-              <el-radio label="1">区间</el-radio>
-              <el-radio label="2">阶梯</el-radio>
+            <el-radio-group v-model.trim="form.pass" @change="typeChange">
+              <el-radio :label="0">常规</el-radio>
+              <el-radio :label="1">区间</el-radio>
+              <el-radio :label="2">阶梯</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="周期范围" prop="scoringCycle">
@@ -193,7 +193,10 @@ export default {
       ],
       tableData: [],
       dialog: false,
-      form: {ladderRule: []},
+      form: {
+        ladderRule: [],
+        pass: 0,
+      },
       formRules: {
         eventType: [{required: true, message: "请选择事件/类型", trigger: "change"}],
         scoringCycle: [{required: true, message: "请选择周期范围", trigger: "change"}],
@@ -206,6 +209,7 @@ export default {
       integralData: [],
       innerVisible: false,
       table: {},
+      
     };
   },
   created() {
@@ -252,8 +256,9 @@ export default {
       })
     },
 
-    typeChange() {
-      this.form.integral = ''
+    typeChange(val) {
+      // console.log(val);
+      this.form.pass = val
     },
 
     handleInputFrom(event) {

From 6e5a1c3921d8fdd08c1ffaaf22bf64f1db40cd74 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 27 Jun 2022 10:45:29 +0800
Subject: [PATCH 58/68] BUG 30340

---
 .../AppMassNotification/components/Add.vue    | 38 +------------------
 .../components/SelectDeptUser.vue             |  3 +-
 2 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index fa28190b..7933039e 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -15,20 +15,16 @@
 
           <template #content>
             <el-form size="small" class="ai-form" :rules="rules" ref="form" :model="form" label-width="100px" label-position="right">
-
               <el-form-item label="发送方式" prop="messageSource" style="width: 50%">
                 <el-radio v-model="form.messageSource" label="2">居民群</el-radio>
                 <el-radio v-model="form.messageSource" label="1">居民</el-radio>
               </el-form-item>
-
               <el-form-item label="地区选择" style="width: 100%">
                 <ai-area-get v-model="areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect" multiple size="small" placeholder="全部地区"/>
               </el-form-item>
-
               <el-form-item label="发送范围" style="width: 100%">
                 <select-dept-user v-model="form.deptList" v-bind="$props" :source="form.messageSource"/>
               </el-form-item>
-
             </el-form>
           </template>
         </ai-card>
@@ -131,11 +127,7 @@ export default {
         contentType: 'text',
         fileList: [],
         organization: '',
-        deptList: [{
-          corpId: "",
-          objList: [],
-          tagId: [],
-        }],
+        deptList: [],
       },
       tags: [],
       subTags: {},
@@ -151,10 +143,6 @@ export default {
       imgs: [],
       videos: [],
       files: [],
-      // orgIdList: '',
-      // orgNameList: [],
-      // orgSelect: '',
-      // orgAllList: [],
       rules: {
         content: [{required: true, message: '请输入群发内容'}],
         messageSource: [{required: true, message: '请选择群发方式'}],
@@ -162,7 +150,6 @@ export default {
       },
     }
   },
-
   computed: {
     ...mapState(['user']),
     tagsChange() {
@@ -174,37 +161,16 @@ export default {
       return this.form.areaId = this.areaId.toString();
     },
   },
-  // watch: {
-  //   orgNameList: {
-  //     handler: function (v) {
-  //       this.orgSelect = `已选择${v.length}个组织`
-  //     }
-  //   }
-  // },
-
   created() {
     if (this.$route.query.id) {
       this.getInfo()
     }
     this.areaRootId = [this.user.info.areaId.substr(0, 6), '000000'].join("")
   },
-
-
   methods: {
     handleAreaSelect(v) {
       this.areaName = v?.[0]?.label
     },
-
-    // 标签
-    // getSubTags() {
-    //   this.instance.post(`/app/wxcp/wxgroupchattag/listAllByCorp?dvcpId=${this.orgIdList}`).then(res => {
-    //     if (res?.data) {
-    //       console.log(res);
-    //       this.subTags = res.data.records
-    //     }
-    //   })
-    // },
-    
     getInfo() {
       this.instance.post(`/app/pushmessage/detail?id=${this.$route.query.id}`).then(res => {
         if (res?.data) {
@@ -270,7 +236,7 @@ export default {
     cancel(isRefresh) {
       this.$emit('change', {
         type: 'List',
-        isRefresh: isRefresh ? true : false
+        isRefresh: !!isRefresh
       })
     }
   }
diff --git a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
index 91e74ad2..fb94055b 100644
--- a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
+++ b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
@@ -108,7 +108,7 @@ export default {
         params: {departmentId, status: 1, cid}
       }).then(res => {
         if (res?.data) {
-          res.data = res.data.map(e => ({...e, kind: "user"}))
+          res.data = res.data.map(e => ({...e, kind: "user", checked: false}))
           this.options = [this.options, res.data].flat()
         }
       })
@@ -160,7 +160,6 @@ export default {
       return !!this.selected.find(e => e.uid == uid)
     },
     handleCheck(row, i) {
-      row.checked = !row.checked
       if (row.checked) {
         this.selected.push(row)
       } else {

From 96aec2e69fd2b624f7782b148a4a3cc83d917373 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 27 Jun 2022 11:00:46 +0800
Subject: [PATCH 59/68] bug

---
 project/dv/apps/AppGridDV.vue | 40 ++++++-----------------------------
 1 file changed, 7 insertions(+), 33 deletions(-)

diff --git a/project/dv/apps/AppGridDV.vue b/project/dv/apps/AppGridDV.vue
index cb3708e9..62eedeeb 100644
--- a/project/dv/apps/AppGridDV.vue
+++ b/project/dv/apps/AppGridDV.vue
@@ -233,6 +233,7 @@
       handleNodeClick (e) {
         this.girdLevel = e.girdLevel
         this.isLoading = true
+        console.log(e)
         this.getGirdInfo(e.id, e.girdLevel)
         this.getStatisticsInfo(e.id)
       },
@@ -341,43 +342,16 @@
         this.y = '50%'
       },
 
-      getGirdInfo (id, level) {
+      getGirdInfo (id) {
         this.instance.post(`/app/appgirdinfo/listAllGirdAndMemberByTop?id=${id || ''}`).then((res) => {
           if (res.code == 0) {
             const chartData = this.formatList([res.data])
-            if (res.data) {
-              const parentGirdInfo = res.data
-              const girdMemberList = parentGirdInfo.girdMemberManageList ? parentGirdInfo.girdMemberManageList.map(v => {
-                return {
-                  ...v,
-                  label: v.name,
-                  id: v.id,
-                  checkType: '2',
-                  girdName: parentGirdInfo.girdName,
-                  girdLevel: parentGirdInfo.girdLevel,
-                  isUser: true
-                }
-              }) : [{
-                label: '-',
-                id: parentGirdInfo.id,
-                girdLevel: parentGirdInfo.girdLevel,
-                girdName: parentGirdInfo.girdName
-              }]
-              this.chartData = [{
-                label: parentGirdInfo.girdName,
-                id: parentGirdInfo.id,
-                girdLevel: parentGirdInfo.girdLevel,
-                isUser: false,
-                children: chartData,
-                userList: girdMemberList
-              }]
-            } else {
-              this.chartData = chartData
-            }
+            console.log(chartData)
+            this.chartData = chartData
 
             this.$nextTick(() => {
               if (id) {
-                this.getUserList(id)
+                this.getUserList(id, chartData[0].id)
               } else {
                 this.isLoading = false
                 this.autoScale()
@@ -387,7 +361,7 @@
         })
       },
 
-      getUserList (id) {
+      getUserList (id, parentId) {
         this.instance.post(`/app/appgirdmemberresident/listByGirdMember`, null, {
           params: {
             size: 1000,
@@ -410,7 +384,7 @@
               return false
             }
 
-            const node = this.$refs.VueOkrTree.getNode(id)
+            const node = this.$refs.VueOkrTree.getNode(parentId)
             this.$refs.VueOkrTree.append({
               id: new Date().getTime(),
               label: '子节点',

From a59a96b0922c9cf0f5cfb7c803a96cd3c7ac1061 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 27 Jun 2022 11:10:14 +0800
Subject: [PATCH 60/68] 30344

---
 packages/wxwork/AppMassNotification/components/Add.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index 7933039e..89038e93 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -20,9 +20,9 @@
                 <el-radio v-model="form.messageSource" label="1">居民</el-radio>
               </el-form-item>
               <el-form-item label="地区选择" style="width: 100%">
-                <ai-area-get v-model="areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect" multiple size="small" placeholder="全部地区"/>
+                <ai-area-get v-model="areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect" multiple size="small" placeholder="请选择"/>
               </el-form-item>
-              <el-form-item label="发送范围" style="width: 100%">
+              <el-form-item label="发送范围" style="width: 100%" prop="deptList">
                 <select-dept-user v-model="form.deptList" v-bind="$props" :source="form.messageSource"/>
               </el-form-item>
             </el-form>
@@ -146,7 +146,7 @@ export default {
       rules: {
         content: [{required: true, message: '请输入群发内容'}],
         messageSource: [{required: true, message: '请选择群发方式'}],
-        sendTime: [{required: true, message: '请选择群发时间'}],
+        deptList: [{required: true, message: '请选择发送范围'}],
       },
     }
   },

From 0a154f0c1f575be94640fc582f999ffa14fbd5a8 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 27 Jun 2022 11:17:22 +0800
Subject: [PATCH 61/68] 30346

---
 .../wxwork/AppMassNotification/components/Add.vue     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index 89038e93..e92ca511 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -16,8 +16,11 @@
           <template #content>
             <el-form size="small" class="ai-form" :rules="rules" ref="form" :model="form" label-width="100px" label-position="right">
               <el-form-item label="发送方式" prop="messageSource" style="width: 50%">
-                <el-radio v-model="form.messageSource" label="2">居民群</el-radio>
-                <el-radio v-model="form.messageSource" label="1">居民</el-radio>
+                <el-radio-group v-model="form.messageSource" @change="sourceChange" >
+                  <el-radio label="2">居民群</el-radio>
+                  <el-radio label="1">居民</el-radio>
+                </el-radio-group>
+                
               </el-form-item>
               <el-form-item label="地区选择" style="width: 100%">
                 <ai-area-get v-model="areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect" multiple size="small" placeholder="请选择"/>
@@ -171,6 +174,10 @@ export default {
     handleAreaSelect(v) {
       this.areaName = v?.[0]?.label
     },
+    sourceChange(val) {
+      this.form.messageSource = val
+      this.form.deptList = []
+    },
     getInfo() {
       this.instance.post(`/app/pushmessage/detail?id=${this.$route.query.id}`).then(res => {
         if (res?.data) {

From a9e4aae6628ee3568273cd8675d8730b8fe1e0b6 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 27 Jun 2022 14:37:00 +0800
Subject: [PATCH 62/68] 30355

---
 .../wxwork/AppMassNotification/components/Add.vue  |  7 +++++--
 .../sanjianxi/apps/AppScoreRules/AppScoreRules.vue | 14 +++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index e92ca511..18a79d83 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -25,7 +25,7 @@
               <el-form-item label="地区选择" style="width: 100%">
                 <ai-area-get v-model="areaId" :root="areaRootId" :instance="instance" @select="handleAreaSelect" multiple size="small" placeholder="请选择"/>
               </el-form-item>
-              <el-form-item label="发送范围" style="width: 100%" prop="deptList">
+              <el-form-item label="发送范围" prop="deptList" style="width: 100%">
                 <select-dept-user v-model="form.deptList" v-bind="$props" :source="form.messageSource"/>
               </el-form-item>
             </el-form>
@@ -147,9 +147,9 @@ export default {
       videos: [],
       files: [],
       rules: {
+        deptList: [{required: true, message: '请选择发送范围'}],
         content: [{required: true, message: '请输入群发内容'}],
         messageSource: [{required: true, message: '请选择群发方式'}],
-        deptList: [{required: true, message: '请选择发送范围'}],
       },
     }
   },
@@ -188,6 +188,9 @@ export default {
       })
     },
     confirm() {
+      if(!this.form.deptList.length) {
+        return this.$message.error('请选择发送范围')
+      }
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.form.fileList = []
diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
index 87f996a1..b715e943 100644
--- a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
+++ b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
@@ -6,10 +6,9 @@
       </template>
       <template slot="content">
         <ai-search-bar bottomBorder>
-
           <template slot="left">
-            <el-cascader size="small" v-model="search.eventType" placeholder="请选择事件/类型" clearable
-                         :props="{...etOps,checkStrictly:true}" @change="handleTypeSearch" ref="eventTypeSearch"/>
+            <!-- <el-cascader size="small" v-model="search.eventType" placeholder="请选择事件/类型" clearable
+                         :props="{...etOps,checkStrictly:true}" @change="handleTypeSearch" ref="eventTypeSearch"/> -->
             <ai-select
                 v-model="search.status"
                 @change="page.current = 1, getList()"
@@ -17,18 +16,16 @@
                 :selectList="dict.getDict('integralRuleStatus')">
             </ai-select>
           </template>
-
           <template slot="right">
+            <el-input size="small" placeholder="事件名称" v-model="search.partyName" clearable
+                      @change="page.current=1,getTableData()" suffix-icon="iconfont iconSearch"/>
           </template>
-
         </ai-search-bar>
 
         <ai-search-bar style="margin-top: 16px;">
-
           <template #left>
             <el-button type="primary" icon="iconfont iconAdd" @click="dialog=true">添加</el-button>
           </template>
-
         </ai-search-bar>
 
         <ai-table
@@ -195,7 +192,7 @@ export default {
       dialog: false,
       form: {
         ladderRule: [],
-        pass: 0,
+        pass: '0',
       },
       formRules: {
         eventType: [{required: true, message: "请选择事件/类型", trigger: "change"}],
@@ -257,7 +254,6 @@ export default {
     },
 
     typeChange(val) {
-      // console.log(val);
       this.form.pass = val
     },
 

From 7b3fcef56ec1562e7a1561090c392c067d351ba6 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 27 Jun 2022 17:22:52 +0800
Subject: [PATCH 63/68] BUG 30360

---
 .../wxwork/AppMassNotification/components/SelectDeptUser.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
index fb94055b..58611384 100644
--- a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
+++ b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
@@ -3,7 +3,7 @@
     <el-input :value="selectText" disabled size="small" @click.native="dialog=true">
       <el-button type="text" slot="append">开始选择</el-button>
     </el-input>
-    <ai-dialog :visible.sync="dialog" title="选择部门/人员" width="700px" @onConfirm="handleSubmit" @close="selected=[]">
+    <ai-dialog :visible.sync="dialog" title="选择部门/人员" width="700px" @onConfirm="handleSubmit" @close="selected=[],getDepts()">
       <el-breadcrumb separator="/">
         <el-breadcrumb-item v-for="(item, index) in selectDeptPath" :key="index">
           <el-button type="text" @click="deptNameClick(item)">{{ item.name }}</el-button>

From d5fadfc498b1d2a597a8b8a67352eb627b7b85dc Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 27 Jun 2022 17:33:31 +0800
Subject: [PATCH 64/68] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wxwork/AppMassNotification/components/Add.vue     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index 18a79d83..4808efbc 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -74,7 +74,7 @@
           <template #content>
             <ai-wrapper>
               <ai-info-item label="创建者" :value="data.userName" isLine></ai-info-item>
-              <!-- <ai-info-item label="发送类型" :value="data.messageSource" isLine>{{ data.messageSource | format }}</ai-info-item> -->
+              <ai-info-item label="发送方式" :value="data.messageSource" isLine>{{ data.messageSource | format }}</ai-info-item>
             </ai-wrapper>
 
             <ai-wrapper v-for="item in data.fileList" :key="item.id">
@@ -170,6 +170,15 @@ export default {
     }
     this.areaRootId = [this.user.info.areaId.substr(0, 6), '000000'].join("")
   },
+  filters: {
+    format(val) {
+      if(val == 1) {
+        return '居民'
+      } else if(val == 2) {
+        return '居民群'
+      }
+    }
+  },
   methods: {
     handleAreaSelect(v) {
       this.areaName = v?.[0]?.label

From 0ac30e762e529f396336e8d9c2d5b32f0ad1a200 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 27 Jun 2022 17:41:44 +0800
Subject: [PATCH 65/68] BUG 30372

---
 .../AppMassNotification/components/SelectDeptUser.vue       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
index 58611384..48a1aaa4 100644
--- a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
+++ b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
@@ -108,7 +108,11 @@ export default {
         params: {departmentId, status: 1, cid}
       }).then(res => {
         if (res?.data) {
-          res.data = res.data.map(e => ({...e, kind: "user", checked: false}))
+          res.data = res.data.map(e => ({
+            ...e, kind: "user", checked: this.selected.some(s => {
+              if (e.id == s.id) return true
+            })
+          }))
           this.options = [this.options, res.data].flat()
         }
       })

From 4b93111ae066ee85295a7a3fe4f8b4b809cac17c Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 27 Jun 2022 17:54:50 +0800
Subject: [PATCH 66/68] 30371

---
 .../AppMassNotification/components/Add.vue    | 40 +++++++++++++++++--
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index 4808efbc..81fa7e8f 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -81,9 +81,9 @@
               <ai-info-item label="群发内容" :value="item.content" isLine v-if="item.contentType == 'text'"></ai-info-item>
             </ai-wrapper>
 
-            <ai-wrapper v-for="item in data.fileList" :key="item.id">
+            <!-- <ai-wrapper v-for="item in data.fileList" :key="item.id">
               <ai-info-item label="图片" isLine v-if="item.contentType == 'image'">
-                <ai-uploader v-model="images" :instance="instance" :limit="1" disabled/>
+                <ai-uploader v-model="images" :instance="instance" :limit="9" disabled/>
               </ai-info-item>
             </ai-wrapper>
 
@@ -97,6 +97,23 @@
               <ai-info-item label="附件" isLine v-if="item.contentType == 'file'">
                 <ai-file-list :fileList="fileDownLoad"></ai-file-list>
               </ai-info-item>
+            </ai-wrapper> -->
+            <ai-wrapper>
+              <ai-info-item label="图片" isLine v-show="images.length">
+                <ai-uploader v-model="images" :instance="instance" :limit="9" disabled/>
+              </ai-info-item>
+            </ai-wrapper>
+
+            <ai-wrapper>
+              <ai-info-item label="视频" isLine v-show="videoArr.length" v-for="(item,index) in videoArr" :key="index">
+                <video :src="item.accessUrl" style="width: 100%; height:100%; object-fit: fill;" muted controls="controls"></video>
+              </ai-info-item>
+            </ai-wrapper>
+
+            <ai-wrapper>
+              <ai-info-item label="附件" isLine v-show="fileDownLoad.length">
+                <ai-file-list :fileList="fileDownLoad"></ai-file-list>
+              </ai-info-item>
             </ai-wrapper>
 
           </template>
@@ -145,6 +162,7 @@ export default {
       images: [],
       imgs: [],
       videos: [],
+      videoArr: [],
       files: [],
       rules: {
         deptList: [{required: true, message: '请选择发送范围'}],
@@ -191,8 +209,22 @@ export default {
       this.instance.post(`/app/pushmessage/detail?id=${this.$route.query.id}`).then(res => {
         if (res?.data) {
           this.data = res.data
-          this.images = [{url: res.data.fileList.filter(e => e.contentType == "image")[0]?.accessUrl}]
-          this.fileDownLoad = [{url: res.data.fileList.filter(e => e.contentType == "file")[0]?.accessUrl}]
+          // this.images = [{url: res.data.fileList.filter(e => e.contentType == "image").map().accessUrl}]
+          // this.fileDownLoad = [{url: res.data.fileList.filter(e => e.contentType == "file")[0]?.accessUrl}]
+          this.images = res.data.fileList.filter(e => e.contentType == "image")?.map(i => {
+            return {
+              url: i.accessUrl
+            }
+          })
+          this.fileDownLoad = res.data.fileList.filter(e => e.contentType == "file")?.map(v => {
+            return {
+              url: v.accessUrl
+            }
+          })
+          if (res.data.fileList.filter(e => e.contentType == "video")) {
+            this.videoArr = res.data.fileList.filter(e => e.contentType == "video")
+          }
+
         }
       })
     },

From 513db9b4b96662273e8d2a2845b0f13d219fe8a6 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 27 Jun 2022 17:56:32 +0800
Subject: [PATCH 67/68] BUG 30350

---
 .../mattersConfig/components/processApproval.vue                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
index d94a5a92..5fb526f4 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
@@ -117,7 +117,7 @@ export default {
       isSelectImg: false,
       isSelectUnit: false,
       isSelectPerson: false,
-      nodeObj: {},
+      nodeObj: {areaFilter:[]},
       indexType: '',
       titleType: '',
       bomIndex: '',

From e0221ae9ee912df6bdb253e769d7ad63585a59a7 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 27 Jun 2022 18:03:37 +0800
Subject: [PATCH 68/68] BUG 30351

---
 .../mattersConfig/components/processApproval.vue                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
index 5fb526f4..fec186d3 100644
--- a/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
+++ b/project/xiushan/apps/processManagement/mattersConfig/components/processApproval.vue
@@ -117,7 +117,7 @@ export default {
       isSelectImg: false,
       isSelectUnit: false,
       isSelectPerson: false,
-      nodeObj: {areaFilter:[]},
+      nodeObj: {areaFilter: [], annexEnable: null, pictureEnable: null},
       indexType: '',
       titleType: '',
       bomIndex: '',