From 769d69b8bee3e76ad18fc72e5c432f7f2d57eca5 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 22 Sep 2022 11:22:34 +0800
Subject: [PATCH 1/2] bug

---
 packages/bigscreen/dv/AppYyxDv.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/bigscreen/dv/AppYyxDv.vue b/packages/bigscreen/dv/AppYyxDv.vue
index 773b6795..f5d54b54 100644
--- a/packages/bigscreen/dv/AppYyxDv.vue
+++ b/packages/bigscreen/dv/AppYyxDv.vue
@@ -41,11 +41,11 @@
             <div class="chart2" style="width: 100%; height: 200px;"></div>
           </div>
           <div class="item">
-            <div class="title">村社统计</div>
+            <div class="title">组织统计</div>
             <div class="item-top jmq">
               <div class="header">
                 <span>居民群</span>
-                <span>{{ isChoose ? '村社区' : '乡镇街道' }}</span>
+                <span>组织</span>
                 <span>群成员</span>
               </div>
               <div class="item-top__list">

From 1f9295f1a7b4714004ffb5f2ab0607cf09b3137c Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 22 Sep 2022 14:28:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apps/AppRiskArea/AppRiskArea.vue          |  65 ++++++++
 .../apps/AppRiskArea/components/Add.vue       | 154 ++++++++++++++++++
 .../apps/AppRiskArea/components/List.vue      | 141 ++++++++++++++++
 3 files changed, 360 insertions(+)
 create mode 100644 project/pingchang/apps/AppRiskArea/AppRiskArea.vue
 create mode 100644 project/pingchang/apps/AppRiskArea/components/Add.vue
 create mode 100644 project/pingchang/apps/AppRiskArea/components/List.vue

diff --git a/project/pingchang/apps/AppRiskArea/AppRiskArea.vue b/project/pingchang/apps/AppRiskArea/AppRiskArea.vue
new file mode 100644
index 00000000..42064025
--- /dev/null
+++ b/project/pingchang/apps/AppRiskArea/AppRiskArea.vue
@@ -0,0 +1,65 @@
+<template>
+  <div class="doc-circulation ailist-wrapper">
+    <keep-alive :include="['List']">
+      <component ref="component" :moduleName="moduleName" :moduleId="moduleId" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+  import List from './components/List'
+  import Add from './components/Add'
+
+  export default {
+    name: 'AppRiskArea',
+    label: '风险配置',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        component: 'List',
+        params: {},
+        moduleId: '',
+        include: [],
+        moduleName: ''
+      }
+    },
+
+    components: {
+      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.getList()
+            }
+          })
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .doc-circulation {
+    height: 100%;
+    background: #F3F6F9;
+    overflow: auto;
+  }
+</style>
diff --git a/project/pingchang/apps/AppRiskArea/components/Add.vue b/project/pingchang/apps/AppRiskArea/components/Add.vue
new file mode 100644
index 00000000..cefc6124
--- /dev/null
+++ b/project/pingchang/apps/AppRiskArea/components/Add.vue
@@ -0,0 +1,154 @@
+<template>
+  <ai-detail class="content-add">
+    <template slot="title">
+      <ai-title :title="params.id ? '编辑风险区域' : '添加风险区域'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+          <el-form class="ai-form" :model="form" label-width="120px" ref="form">
+            <el-form-item prop="areaId" style="width: 100%;" label="选择地区" :rules="[{required: true, message: '请选择地区', trigger: 'change'}]">
+              <ai-area-select clearable @fullname="v => form.areaName = v" always-show :instance="instance" v-model="form.areaId"></ai-area-select>
+            </el-form-item>
+            <el-form-item label="风险等级" style="width: 100%;" prop="level" :rules="[{required: true, message: '请选择风险等级', trigger: 'change'}]">
+              <ai-select
+                v-model="form.level"
+                clearable
+                placeholder="请选择风险等级"
+                :selectList="dict.getDict('epidemicDangerousAreaLevel')">
+              </ai-select>
+            </el-form-item>
+          </el-form>
+        </template>
+      </ai-card>
+    </template>
+    <template #footer>
+      <el-button @click="cancel">取消</el-button>
+      <el-button type="primary" @click="confirm">提交</el-button>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'Add',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object,
+      moduleName: String
+    },
+    data () {
+      return {
+        info: {},
+        form: {
+          level: '',
+          areaId: '',
+          areaName: ''
+        },
+        id: ''
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    created () {
+      this.dict.load('epidemicDangerousAreaLevel').then(() => {
+        if (this.params && this.params.id) {
+          this.id = this.params.id
+          this.getInfo(this.params.id)
+        }
+      })
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appepidemicdangerousarea/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+          }
+        })
+      },
+
+      confirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/appepidemicdangerousarea/addOrUpdate`, {
+              ...this.form
+            }).then(res => {
+              if (res.code == 0) {
+                this.$message.success('提交成功')
+                setTimeout(() => {
+                  this.cancel(true)
+                }, 600)
+              }
+            })
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'list',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .content-add {
+    .video {
+      width: 640px;
+      height: 360px;
+      border-radius: 4px;
+      border: 1px dashed #D0D4DC;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+
+      .icon {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+
+        span:nth-child(2) {
+          display: inline-block;
+          font-size: 16px;
+          color: #333333;
+          line-height: 30px;
+        }
+
+        .iconfont {
+          display: inline-block;
+          font-size: 40px;
+          color: #2266FF;
+        }
+      }
+
+      .tips {
+        display: inline-block;
+        font-size: 12px;
+        color: #999999;
+        line-height: 26px;
+      }
+    }
+
+    .video-com {
+      width: 640px;
+      height: 360px;
+      background: rgba(0, 0, 0, 0.5);
+      border-radius: 2px;
+      border: 1px solid #D0D4DC;
+      margin-top: -40px;
+    }
+  }
+</style>
diff --git a/project/pingchang/apps/AppRiskArea/components/List.vue b/project/pingchang/apps/AppRiskArea/components/List.vue
new file mode 100644
index 00000000..5e1fffd1
--- /dev/null
+++ b/project/pingchang/apps/AppRiskArea/components/List.vue
@@ -0,0 +1,141 @@
+<template>
+  <ai-list class="notice">
+    <template slot="title">
+      <ai-title title="风险区域配置" isShowBottomBorder></ai-title>
+    </template>
+    <template slot="content">
+      <ai-search-bar class="search-bar">
+        <template #left>
+          <ai-select
+            v-model="search.level"
+            clearable
+            placeholder="请选择风险等级"
+            :selectList="dict.getDict('epidemicDangerousAreaLevel')"
+            @change="search.current = 1, getList()">
+          </ai-select>
+          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
+        </template>
+        <template #right>
+          <el-input
+            v-model="search.province"
+            class="search-input"
+            size="small"
+            v-throttle="() => {search.current = 1, getList()}"
+            placeholder="省级名称/市级名称/区级名称"
+            clearable
+            @clear="search.current = 1, search.province = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
+      </ai-search-bar>
+      <ai-table
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="total"
+        style="margin-top: 6px;"
+        :current.sync="search.current"
+        :size.sync="search.size"
+        @getList="getList">
+        <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
+              <el-button type="text" @click="remove(row.id)">删除</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  import { mapState } from 'vuex'
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      moduleName: String
+    },
+
+    data() {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          level: '',
+          province: ''
+        },
+        currIndex: -1,
+        areaList: [],
+        total: 10,
+        colConfigs: [
+          { prop: 'province',  label: '省级', align: 'left', width: '200px' },
+          { prop: 'city', label: '市级', align: 'center' },
+          { prop: 'district', label: '区级', align: 'center' },
+          { prop: 'town', label: '镇级', align: 'center' },
+          { prop: 'village', label: '村级', align: 'center' },
+          { prop: 'level', label: '等级', align: 'center', formart: v => this.dict.getLabel('epidemicDangerousAreaLevel', v) },
+          { prop: 'createTime', label: '设置时间', align: 'center' },
+          { prop: 'createUserName', label: '添加人', align: 'center' },
+          { slot: 'options', label: '操作', align: 'center' }
+        ],
+        areaName: '',
+        unitName: '',
+        tableData: []
+      }
+    },
+
+    computed: {
+      ...mapState(['user'])
+    },
+
+    created() {
+      this.dict.load('epidemicDangerousAreaLevel').then(() => {
+        this.getList()
+      })
+    },
+
+    methods: {
+      getList() {
+        this.instance.post(`/app/appepidemicdangerousarea/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      remove(id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appepidemicdangerousarea/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
+      toAdd(id) {
+        this.$emit('change', {
+          type: 'Add',
+          params: {
+            id: id || ''
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .notice {
+  }
+</style>