From 1934cfaafc4d031e8e7624d5f5c70e764a5d51da Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 10 May 2023 10:22:21 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=B7=AB=E6=BA=AA=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E5=B9=B3=E6=98=8C=E5=85=9A=E5=BB=BA=E5=85=9A=E5=91=98=E9=98=B5?=
 =?UTF-8?q?=E5=9C=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/AppCommunityInfo/AppCommunityInfo.vue |  74 +++++++++
 .../app/AppCommunityInfo/components/Add.vue   | 134 +++++++++++++++
 .../AppCommunityInfo/components/Detail.vue    |  63 ++++++++
 .../app/AppCommunityInfo/components/List.vue  | 152 ++++++++++++++++++
 4 files changed, 423 insertions(+)
 create mode 100644 project/wuxi/app/AppCommunityInfo/AppCommunityInfo.vue
 create mode 100644 project/wuxi/app/AppCommunityInfo/components/Add.vue
 create mode 100644 project/wuxi/app/AppCommunityInfo/components/Detail.vue
 create mode 100644 project/wuxi/app/AppCommunityInfo/components/List.vue

diff --git a/project/wuxi/app/AppCommunityInfo/AppCommunityInfo.vue b/project/wuxi/app/AppCommunityInfo/AppCommunityInfo.vue
new file mode 100644
index 00000000..2834a533
--- /dev/null
+++ b/project/wuxi/app/AppCommunityInfo/AppCommunityInfo.vue
@@ -0,0 +1,74 @@
+<template>
+  <div class="doc-circulation ailist-wrapper">
+    <keep-alive :include="['List']">
+      <component ref="component" :is="component" @change="onChange" :params="params" v-bind="$props"/>
+    </keep-alive>
+  </div>
+</template>
+
+<script>
+import List from './components/List'
+import Add from './components/Add'
+import Detail from './components/Detail'
+
+export default {
+  name: 'AppCommunityInfo',
+  label: '党员阵地',
+
+  props: {
+    instance: Function,
+    dict: Object,
+    menuName: {default: "党员阵地"}
+  },
+
+  data() {
+    return {
+      component: 'List',
+      params: {},
+      include: []
+    }
+  },
+
+  components: {
+    Add,
+    List,
+    Detail
+  },
+
+  mounted() {
+  },
+
+  methods: {
+    onChange(data) {
+      if (data.type === 'Add') {
+        this.component = 'Add'
+        this.params = data.params
+      }
+
+      if (data.type === 'Detail') {
+        this.component = 'Detail'
+        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/wuxi/app/AppCommunityInfo/components/Add.vue b/project/wuxi/app/AppCommunityInfo/components/Add.vue
new file mode 100644
index 00000000..d69298d0
--- /dev/null
+++ b/project/wuxi/app/AppCommunityInfo/components/Add.vue
@@ -0,0 +1,134 @@
+<template>
+  <ai-detail>
+    <template slot="title">
+      <ai-title :title="pageTitle" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+          <el-form :model="form" label-width="120px" ref="form">
+            <el-form-item label="标题" prop="title" :rules="[{required: true, message: '请输入标题', trigger: 'blur'}]">
+              <el-input type="input" v-model="form.title" clearable placeholder="请输入..." maxlength="30" show-word-limit></el-input>
+            </el-form-item>
+            <el-form-item prop="areaId" label="发布地区" :rules="[{required: true, message: '请选择地区', trigger: 'change'}]">
+              <ai-area-select clearable always-show :instance="instance" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
+            </el-form-item>
+            <el-form-item label="正文" prop="content" :rules="[{required: true, message: '请输入内容', trigger: 'change'}]">
+              <ai-editor v-model="form.content" :instance="instance"/>
+            </el-form-item>
+            <el-form-item label="缩略图" prop="thumbUrl">
+              <ai-uploader
+                :instance="instance"
+                isShowTip
+                v-model="form.thumbUrl"
+                :limit="1"
+                :cropOps="cropOps"
+                is-crop>
+                <template slot="tips">
+                  <p>最多上传1张图片,单个文件最大10MB，支持jpg、jpeg、png格式</p>
+                  <p>图片比例：1.6：1</p>
+                </template>
+              </ai-uploader>
+            </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,
+      menuName: String
+    },
+
+    data () {
+      return {
+        info: {},
+        form: {
+          title: '',
+          content: '',
+          areaId: '',
+          createUnitName: '',
+          createUserName: '',
+          status: '',
+          thumbUrl: []
+        },
+        cropOps: {
+          width: "336px",
+          height: "210px"
+        },
+        id: ''
+      }
+    },
+
+    computed: {
+      ...mapState(['user']),
+      pageTitle: v => `${!!v.params.id ? '编辑' : '添加'}${v.menuName}`
+    },
+
+    created () {
+      this.form.areaId = this.user.info.areaId
+      this.disabledLevel = this.user.info.areaList.length
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appcountrysidetourism/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+            this.form.thumbUrl = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl) : []
+          }
+        })
+      },
+
+      confirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/appcountrysidetourism/addOrUpdate`, {
+              ...this.form,
+              type: 5,
+              createUserName: this.user.info.name,
+              thumbUrl: this.form.thumbUrl.length ? JSON.stringify([{
+                url: this.form.thumbUrl[0].url
+              }]) : ''
+            }).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">
+</style>
diff --git a/project/wuxi/app/AppCommunityInfo/components/Detail.vue b/project/wuxi/app/AppCommunityInfo/components/Detail.vue
new file mode 100644
index 00000000..c410229d
--- /dev/null
+++ b/project/wuxi/app/AppCommunityInfo/components/Detail.vue
@@ -0,0 +1,63 @@
+<template>
+  <ai-detail>
+    <template slot="title">
+      <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      </ai-title>
+    </template>
+    <template slot="content">
+      <ai-card title="基本信息">
+        <template #content>
+        </template>
+      </ai-card>
+    </template>
+  </ai-detail>
+</template>
+
+<script>
+  export default {
+    name: 'Detail',
+
+    props: {
+      instance: Function,
+      dict: Object,
+      params: Object
+    },
+
+    data () {
+      return {
+        info: {},
+        id: ''
+      }
+    },
+
+    created () {
+      if (this.params && this.params.id) {
+        this.id = this.params.id
+        this.getInfo(this.params.id)
+      }
+    },
+
+    methods: {
+      getInfo (id) {
+        this.instance.post(`/app/appeveryvillagecode/queryDetailById?id=${id}`).then(res => {
+          if (res.code === 0) {
+            this.form = res.data
+            this.form.codeUrl = [{
+              url: res.data.codeUrl
+            }]
+          }
+        })
+      },
+
+      cancel (isRefresh) {
+        this.$emit('change', {
+          type: 'list',
+          isRefresh: !!isRefresh
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/project/wuxi/app/AppCommunityInfo/components/List.vue b/project/wuxi/app/AppCommunityInfo/components/List.vue
new file mode 100644
index 00000000..fa86247a
--- /dev/null
+++ b/project/wuxi/app/AppCommunityInfo/components/List.vue
@@ -0,0 +1,152 @@
+<template>
+  <ai-list class="notice">
+    <template slot="title">
+      <ai-title :title="menuName" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
+    </template>
+    <template slot="content">
+      <ai-search-bar class="search-bar">
+        <template #left>
+          <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
+        </template>
+        <template #right>
+          <el-input
+              v-model="search.title"
+              class="search-input"
+              size="small"
+              v-throttle="() => {search.current=1,getList()}"
+              placeholder="请输入标题"
+              clearable
+              @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"
+          style="margin-top: 6px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @getList="getList">
+        <el-table-column slot="tags" label="标签">
+          <template slot-scope="{ row }">
+            <div class="table-tags">
+              <el-tag type="info" v-for="(item, index) in row.tags" size="small" :key="index">{{ item }}</el-tag>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column slot="options" width="220px" fixed="right" label="操作" align="center">
+          <template slot-scope="{ row }">
+            <div class="table-options">
+              <el-button type="text" :title="row.status == 1 ? '取消发布' : '发布'" @click="changeStatus(row)">{{ row.status == 1 ? '取消发布' : '发布' }}</el-button>
+              <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
+  },
+
+  data() {
+    return {
+      search: {
+        current: 1,
+        size: 10,
+        title: '',
+        areaId: ''
+      },
+      currIndex: -1,
+      areaList: [],
+      total: 10,
+      colConfigs: [
+        {prop: 'title', label: '标题', align: 'left', width: '200px'},
+        {prop: 'areaName', label: '地区', align: 'center'},
+        {prop: 'status', label: '发布状态', align: 'center', format: v => v === '1' ? '已发布' : '未发布'},
+        {prop: 'createUserName', label: '发布人', align: 'center'},
+        {prop: 'createDate', label: '发布时间', align: 'center'},
+        {slot: 'options', label: '操作', align: 'center'}
+      ],
+      areaName: '',
+      unitName: '',
+      tableData: []
+    }
+  },
+
+  computed: {
+    ...mapState(['user'])
+  },
+
+  mounted() {
+    this.search.areaId = this.user.info.areaId
+    this.getList()
+  },
+
+  methods: {
+    getList() {
+      this.instance.post(`/app/appcountrysidetourism/list`, null, {
+        params: {
+          type: 5,
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      })
+    },
+
+    changeStatus(item) {
+      let title = item.status == '1' ? '是否要取消发布?' : '是否要发布?';
+      this.$confirm(title, {type: 'warning'}).then(() => {
+        item.status = item.status == '1' ? '0' : '1'
+        this.instance.post('/app/appcountrysidetourism/addOrUpdate', item).then(res => {
+          if (res && res.code == 0) {
+            title == '是否要发布?' ? this.$message.success('发布成功') : this.$message.success('取消发布成功')
+            this.getList()
+          }
+        })
+      })
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appcountrysidetourism/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>

From 8acfa11f94db5a6ad7651e1599fc22e46bafa859 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 10 May 2023 16:55:57 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wuxi/app/AppReportAiWill/components/List.vue   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/project/wuxi/app/AppReportAiWill/components/List.vue b/project/wuxi/app/AppReportAiWill/components/List.vue
index 8351e26f..f4335649 100644
--- a/project/wuxi/app/AppReportAiWill/components/List.vue
+++ b/project/wuxi/app/AppReportAiWill/components/List.vue
@@ -32,7 +32,7 @@
           <el-cascader ref="cascader1" v-model="girdArr" :options="girdOptions" placeholder="所属网格" size="small"
             :props="defaultProps" :show-all-levels="false" @change="gridChange" clearable></el-cascader>
           <el-date-picker size="small" v-model="searchDotime" type="daterange" range-separator="至" @change="timeChange"
-            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd"></el-date-picker>
+            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
         </template>
         <template #right>
           <el-input
@@ -82,7 +82,9 @@ export default {
         eventStatus: '',
         content: '',
         eventSource: '',
-        groupId: ''
+        groupId: '',
+        createTimeStart: '',
+        createTimeEnd: ''
       },
       total: 0,
       tableData: [],
@@ -136,11 +138,11 @@ export default {
   methods: {
     timeChange() {
       if (this.searchDotime) {
-        this.search.doTimeStart = this.searchDotime[0]
-        this.search.doTimeEnd = this.searchDotime[1]
+        this.search.createTimeStart = this.searchDotime[0]
+        this.search.createTimeEnd = this.searchDotime[1]
       } else {
-        this.search.doTimeStart = null
-        this.search.doTimeEnd = null
+        this.search.createTimeStart = null
+        this.search.createTimeEnd = null
       }
       this.search.current = 1
       this.getList()

From 3ec7a262d4a163923b2b981c1d95fe5aeea145e2 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 10 May 2023 17:02:33 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/wuxi/app/AppReportAiWill/components/List.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/project/wuxi/app/AppReportAiWill/components/List.vue b/project/wuxi/app/AppReportAiWill/components/List.vue
index f4335649..46460000 100644
--- a/project/wuxi/app/AppReportAiWill/components/List.vue
+++ b/project/wuxi/app/AppReportAiWill/components/List.vue
@@ -84,7 +84,8 @@ export default {
         eventSource: '',
         groupId: '',
         createTimeStart: '',
-        createTimeEnd: ''
+        createTimeEnd: '',
+        girdId: ''
       },
       total: 0,
       tableData: [],
@@ -149,7 +150,7 @@ export default {
     },
     // 所有网格
     getGridList() {
-      this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
+      this.instance.post(`/app/appgirdinfo/queryGirdMemberGirdsById`).then((res) => {
         if (res?.code == 0) {
           this.girdOptions = this.toTree(res.data)
         }
@@ -177,7 +178,7 @@ export default {
     },
     gridChange(val) {
       this.girdArr = val
-      this.girdId = val?.[val.length - 1]
+      this.search.girdId = val?.[val.length - 1]
       this.$refs.cascader1.dropDownVisible = false;
       this.search.current = 1
       this.getList()

From 399180d2cf9ea0ffa517ad98c02881597b8eaaad Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 10 May 2023 17:18:54 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E4=B8=8A=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/wuxi/app/AppReportAiWill/components/List.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/wuxi/app/AppReportAiWill/components/List.vue b/project/wuxi/app/AppReportAiWill/components/List.vue
index 46460000..abd8356e 100644
--- a/project/wuxi/app/AppReportAiWill/components/List.vue
+++ b/project/wuxi/app/AppReportAiWill/components/List.vue
@@ -150,7 +150,7 @@ export default {
     },
     // 所有网格
     getGridList() {
-      this.instance.post(`/app/appgirdinfo/queryGirdMemberGirdsById`).then((res) => {
+      this.instance.post(`/app/appgirdmemberinfo/queryMyGirdList`).then((res) => {
         if (res?.code == 0) {
           this.girdOptions = this.toTree(res.data)
         }

From ef06d88bd49cae81e65ce38de11659c5833308e9 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 11 May 2023 09:45:12 +0800
Subject: [PATCH 5/6] status

---
 project/wuxi/app/AppReportAiWill/components/Detail.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/wuxi/app/AppReportAiWill/components/Detail.vue b/project/wuxi/app/AppReportAiWill/components/Detail.vue
index a2542205..4a6ebd79 100644
--- a/project/wuxi/app/AppReportAiWill/components/Detail.vue
+++ b/project/wuxi/app/AppReportAiWill/components/Detail.vue
@@ -76,8 +76,8 @@
           </el-form-item>
           <el-form-item label="处理结果" prop="eventStatus" style="width: 100%;" :rules="[{ required: true, message: '请选择处理结果' }]">
             <el-radio-group v-model="form.eventStatus">
-              <el-radio label="2">已办结</el-radio>
-              <el-radio label="3">已拒绝</el-radio>
+              <el-radio label="1">已办结</el-radio>
+              <el-radio label="0">已拒绝</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item label="处理意见" prop="content" style="width: 100%;" :rules="[{ required: true, message: '请输入处理意见' }]">
@@ -193,7 +193,7 @@ export default {
         groupId: '',
         groupName: '',
         content: [],
-        eventStatus: '2'
+        eventStatus: '1'
       },
       evaluation: {}
     }

From f92602a7c1d25244cf1964293574d1b1024f8df2 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 11 May 2023 09:52:13 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 project/wuxi/app/AppReportAiWill/components/List.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/wuxi/app/AppReportAiWill/components/List.vue b/project/wuxi/app/AppReportAiWill/components/List.vue
index abd8356e..4bc4ef47 100644
--- a/project/wuxi/app/AppReportAiWill/components/List.vue
+++ b/project/wuxi/app/AppReportAiWill/components/List.vue
@@ -40,7 +40,7 @@
               class="search-input"
               size="small"
               v-throttle="() => {search.current = 1, getList()}"
-              placeholder="请输入内容描述/上报居民/联系方式"
+              placeholder="请输入内容描述/上报人员/联系方式"
               clearable
               @change="getList"
               @clear="search.current = 1, search.content = '', getList()"