From 82baab54013a1155d7fcf0c4ac361a7c0fc2f28e Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 30 Nov 2022 09:07:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .npmrc                                        |   2 +-
 .../AppGridMemberScore/AppGridMemberScore.vue |  56 ++
 .../components/ApplyList.vue                  | 117 ++++
 .../AppGridMemberScore/components/gmScore.vue |  94 +++
 .../components/gridScoreDetail.vue            | 355 ++++++++++
 .../components/gridScoreManage.vue            | 365 ++++++++++
 .../components/gridScoreRules.vue             | 492 +++++++++++++
 .../components/gridScoreStatistics.vue        | 653 ++++++++++++++++++
 .../pidu/app/AppOrder/components/Detail.vue   |   9 -
 vue.config.js                                 |   2 +-
 10 files changed, 2134 insertions(+), 11 deletions(-)
 create mode 100644 project/pidu/app/AppGridMemberScore/AppGridMemberScore.vue
 create mode 100644 project/pidu/app/AppGridMemberScore/components/ApplyList.vue
 create mode 100644 project/pidu/app/AppGridMemberScore/components/gmScore.vue
 create mode 100644 project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue
 create mode 100644 project/pidu/app/AppGridMemberScore/components/gridScoreManage.vue
 create mode 100644 project/pidu/app/AppGridMemberScore/components/gridScoreRules.vue
 create mode 100644 project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue

diff --git a/.npmrc b/.npmrc
index d8bc5fe4..81dffa18 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,4 +1,4 @@
-registry=http://cli.sinoecare.net/
+registry=http://192.168.1.87:4873/
 email=aixianling@sinoecare.com
 always-auth=true
 _auth="YWRtaW46YWRtaW4xMjM="
diff --git a/project/pidu/app/AppGridMemberScore/AppGridMemberScore.vue b/project/pidu/app/AppGridMemberScore/AppGridMemberScore.vue
new file mode 100644
index 00000000..48db606a
--- /dev/null
+++ b/project/pidu/app/AppGridMemberScore/AppGridMemberScore.vue
@@ -0,0 +1,56 @@
+<template>
+  <keep-alive include="gmScore">
+    <component :is="currentPage" v-bind="$props" @change="onChange"/>
+  </keep-alive>
+</template>
+
+<script>
+import gridScoreManage from "./components/gridScoreManage.vue"
+import gridScoreRules from "./components/gridScoreRules.vue"
+import gridScoreStatistics from './components/gridScoreStatistics.vue'
+import gridScoreDetail from './components/gridScoreDetail.vue'
+import gmScore from './components/gmScore.vue'
+
+export default {
+  name: 'AppGridMemberScore',
+  label: "网格员积分",
+
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+    menuName: {default: "网格员积分"}
+  },
+  computed: {
+    currentPage() {
+      let {hash} = this.$route
+      return hash == "#gridScoreDetail" ? gridScoreDetail :
+          hash == "#gridScoreRules" ? gridScoreRules :
+              hash == "#gridScoreStatistics" ? gridScoreStatistics :
+                  hash == "#gridScoreManage" ? gridScoreManage : gmScore
+    }
+  },
+  components: {
+    gmScore,
+    gridScoreManage,
+    gridScoreRules,
+    gridScoreStatistics,
+    gridScoreDetail,
+  },
+
+  methods: {
+    onChange(data) {
+      let {type, params: query} = data,
+          hash = ["gridScoreManage", "gridScoreRules", "gridScoreStatistics"].includes(type) ? "" : "#" + type
+      this.$router.push({hash, query})
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppGridMemberScore {
+  height: 100%;
+  width: 100%;
+}
+</style>
diff --git a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
new file mode 100644
index 00000000..3464f731
--- /dev/null
+++ b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
@@ -0,0 +1,117 @@
+<template>
+  <ai-list class="list">
+    <template slot="content">
+      <ai-table
+        :tableData="tableData"
+        :col-configs="colConfigs"
+        :total="total"
+        style="margin-top: 16px;"
+        :current.sync="search.current"
+        :size.sync="search.size"
+        @getList="getList">
+        <el-table-column slot="goods" width="240px" label="商品" align="left">
+          <template slot-scope="{ row }">
+            <div class="goods">
+              <img :src="row.imageUrl">
+              <span>{{ row.merchandiseName }}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <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="operation(row.id)">积分审核</el-button>
+            </div>
+          </template>
+        </el-table-column>
+      </ai-table>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+  export default {
+    name: 'List',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+          name: ''
+        },
+        name: '',
+        info: {},
+        colConfigs: [
+          { slot: 'goods', label: '商品' },
+          { prop: 'merchandiseIntegral', align: 'center', label: '单价' },
+          { prop: 'merchandiseNumber', align: 'center', label: '数量' },
+          {
+            prop: 'arriveTime',
+            align: 'center',
+            label: '兑换量'
+          },
+          {
+            prop: 'visibleRange',
+            align: 'center',
+            label: '可见范围',
+            formart: v => v === '0' ? '不限' : '指定网格'
+          },
+          {
+            prop: 'status',
+            align: 'center',
+            label: '状态',
+            formart: v => this.mapStatus(v)
+          }
+        ],
+        tableData: [],
+        total: 0
+      }
+    },
+
+    created () {
+      this.getList()
+    },
+
+    methods: {
+      getList () {
+        this.instance.post(`/app/appintegralmemberapply/listByGirdMember`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+
+      operation (id) {
+        this.$confirm('请根据申请事项和凭证选是否审核通过').then(() => {
+          this.instance.post(`/app/appintegralmemberapply/auditApply?id=${id}&opType=1`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('操作成功')
+              this.getList()
+            }
+          })
+        }).catch(() => {
+          this.instance.post(`/app/appintegralmemberapply/auditApply?id=${id}&opType=2`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('操作成功')
+              this.getList()
+            }
+          })
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/project/pidu/app/AppGridMemberScore/components/gmScore.vue b/project/pidu/app/AppGridMemberScore/components/gmScore.vue
new file mode 100644
index 00000000..11b380db
--- /dev/null
+++ b/project/pidu/app/AppGridMemberScore/components/gmScore.vue
@@ -0,0 +1,94 @@
+<template>
+  <ai-list class="AppGridMemberScore">
+    <template slot="title">
+      <ai-title :title="menuName" :isShowBottomBorder="false" :instance="instance">
+        <template slot="sub">
+          <div>网格员可通过完成某些任务获取一定数量的积分，积分可去兑换相应的奖励。</div>
+        </template>
+      </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 :is="tab.comp" v-if="currIndex === String(i)" :ref="tab.name" v-on="$listeners" :areaId="areaId" v-bind="$props"/>
+        </el-tab-pane>
+      </el-tabs>
+    </template>
+  </ai-list>
+</template>
+
+<script>
+import girdScoreManage from "./gridScoreManage.vue"
+import gridScoreRules from "./gridScoreRules.vue"
+import ApplyList from './ApplyList.vue'
+import gridScoreStatistics from './gridScoreStatistics.vue'
+import {mapState} from 'vuex'
+
+export default {
+  name: 'gmScore',
+  components: {
+    girdScoreManage,
+    gridScoreRules,
+    ApplyList,
+    gridScoreStatistics
+  },
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+    menuName: String
+  },
+
+  data() {
+    return {
+      currIndex: "0",
+      areaId: '',
+    }
+  },
+
+  computed: {
+    ...mapState(['user']),
+    tabs() {
+      return [
+        {
+          label: "积分管理",
+          name: "girdScoreManage",
+          comp: girdScoreManage,
+          permission: "",
+        },
+        {
+          label: "积分申请",
+          name: "ApplyList",
+          comp: ApplyList,
+          permission: "",
+        },
+        {
+          label: "积分规则",
+          name: "gridScoreRules",
+          comp: gridScoreRules,
+          permission: "",
+        },
+        {
+          label: "积分统计",
+          name: "gridScoreStatistics",
+          comp: gridScoreStatistics,
+          permission: "",
+        },
+      ]
+    }
+  },
+  created() {
+    this.areaId = this.user.info.areaId
+    // this.$dict.load("")
+  },
+  methods: {},
+
+}
+</script>
+
+<style lang="scss" scoped>
+.AppGridMemberScore {
+  height: 100%;
+  width: 100%;
+}
+</style>
diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue
new file mode 100644
index 00000000..f47ca071
--- /dev/null
+++ b/project/pidu/app/AppGridMemberScore/components/gridScoreDetail.vue
@@ -0,0 +1,355 @@
+<template>
+  <section class="gridScoreDetail">
+    <ai-title slot="title" :title="`${menuName}详情`" isShowBottomBorder :isShowBack="true" @onBackClick="cancel(false)"/>
+    <el-row style="margin-top: 20px;">
+      <div class="card_list">
+        <div class="card">
+          <h2>姓名</h2>
+          <p class="color1">{{ data.userName }}</p>
+        </div>
+        <div class="card">
+          <h2>积分余额</h2>
+          <p class="color2">{{ data.integral || 0 }}</p>
+        </div>
+        <div class="card">
+          <h2>已用积分</h2>
+          <p class="color3">{{ data.usedIntegral || 0 }}</p>
+        </div>
+      </div>
+    </el-row>
+    <el-row class="echertsBox" style="margin-bottom: 16px">
+      <div class="title">
+        <h4>事件汇总</h4>
+        <div class="timecSelect">
+          时间：
+          <el-date-picker size="small" value-format="yyyy-MM-dd" @change="timeChange" v-model="timeList" type="daterange" range-separator="至"
+                          :start-placeholder="startPla" :end-placeholder="endPla"></el-date-picker>
+        </div>
+      </div>
+      <div class="bar_Box">
+        <div id="chartDom" style="height: 230px; width: 100%;" v-show="xData.length && yData.length"></div>
+        <ai-empty style="height: 200px; width: 100%;" v-show="!xData.length && !yData.length"></ai-empty>
+      </div>
+    </el-row>
+    <ai-card>
+      <ai-title slot="title" title="余额变动明细"/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <ai-select v-model="search.type" placeholder="请选择类型" @change="search.current=1,getIntegralChange()"
+                       :selectList="dict.getDict('integralType')"/>
+          </template>
+          <template #right>
+            <ai-download :instance="instance" :url="`/app/appintegraluser/changeIntegralExport?id=${$route.query.id}`" :params="search" fileName="网格员余额变动明细"
+                         :disabled="tableData.length == 0">
+              <el-button size="small">导出</el-button>
+            </ai-download>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="tableData" :total="total" :current.sync="search.current" :size.sync="search.size"
+                  @getList="getIntegralChange" :col-configs="colConfigs" :dict="dict">
+          <el-table-column slot="changeIntegral" label="变动积分" align="center">
+            <template slot-scope="{ row }">
+              <span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
+              <span v-if="row.integralType == 0">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column slot="integralType" label="类型" align="center">
+            <template slot-scope="{ row }">
+              <span v-if="row.integralType == 0">积分调整</span>
+              <span v-else>{{ row.eventType }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column slot="eventDesc" label='事件' align="center" width="400px" show-overflow-tooltip>
+            <template slot-scope="{ row }">
+              <span v-if="row.integralType == 0">{{ row.eventDesc }}</span>
+              <span v-else>{{ row.eventName }}</span>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-card>
+  </section>
+</template>
+
+<script>
+import dayjs from "dayjs";
+import * as echarts from 'echarts';
+
+export default {
+  name: "gridScoreDetail",
+  data() {
+    return {
+      myChart: null,
+      tableData: [],
+      search: {
+        name: '',
+        girdId: '',
+        type: '',
+        current: 1,
+        size: 10,
+      },
+      total: 0,
+      girdList: [],
+      timeList: [],
+      data: {},
+      startTime: '',
+      endTime: '',
+      xData: [],
+      yData: [],
+      startPla: '',
+      endPla: ''
+    }
+  },
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+    menuName: String
+  },
+
+  computed: {
+    colConfigs() {
+      return [
+        {prop: "doTime", label: '时间', align: "left", width: "200px"},
+        {slot: "integralType", label: '类型', align: "center", width: "240px", dict: "integralType"},
+        {slot: "changeIntegral"},
+        {prop: "nowIntegral", label: '剩余积分', align: "center", width: "200px"},
+        {slot: "eventDesc"},
+      ]
+    }
+  },
+  created() {
+    this.$dict.load('integralType').then(() => {
+      this.getDetail()
+      this.getIntegralChange()
+      this.getEventSummary()
+      let nowTime = dayjs().format('YYYY-MM-DD')
+      this.startPla = dayjs().subtract(29, 'day').format('YYYY-MM-DD')
+      this.endPla = nowTime
+    })
+
+  },
+  methods: {
+    // 详情
+    getDetail() {
+      this.instance.post(`/app/appintegraluser/girdDetail`, null, {
+        params: {
+          id: this.$route.query.id
+        }
+      }).then(res => {
+        if (res?.data) {
+          this.data = res.data
+        }
+      })
+    },
+
+    // 事件汇总
+    getEventSummary() {
+      this.instance.post(`/app/appintegraluser/eventSummary`, null, {
+        params: {
+          id: this.$route.query.id,
+          startTime: this.startTime,
+          endTime: this.endTime,
+        }
+      }).then(res => {
+        if (res?.data) {
+          this.xData = res.data.map(x => x.eventName)
+          this.yData = res.data.map(y => y.totalIntegral)
+          this.getColEcherts(this.xData, this.yData)
+        }
+      })
+    },
+
+    // 余额变动明细
+    getIntegralChange() {
+      this.instance.post(`/app/appintegraluser/getChangeDetail`, null, {
+        params: {
+          ...this.search,  //积分类型
+          total: this.total,
+          id: this.$route.query.id,
+        }
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      })
+    },
+
+    timeChange() {
+      if (this.timeList.length) {
+        this.startTime = this.timeList[0]
+        this.endTime = this.timeList[1]
+        this.getEventSummary()
+      }
+    },
+
+    getColEcherts(xData, yData) {
+      let chartDom = document.getElementById('chartDom');
+      chartDom.style.width = window.innerWidth - 335 + "px";
+      this.myChart = echarts.init(chartDom);
+      this.myChart.setOption({
+        dataZoom: [
+          {
+            type: "slider",
+            xAxisIndex: [0],
+            filterMode: "filter",
+          },
+        ],
+        grid: {
+          left: '16px',
+          right: '28px',
+          bottom: '14px',
+          top: '30px',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: xData,
+        },
+        yAxis: {
+          type: 'value',
+        },
+        series: [
+          {
+            data: yData,
+            type: 'bar',
+            itemStyle: {
+              normal: {
+                color: "#5087ec",
+                label: {
+                  show: true,  //开启显示
+                  position: 'top',    //在上方显示
+                  textStyle: {
+                    fontSize: 13,
+                    color: '#666'
+                  }
+                },
+              },
+            },
+            barWidth: 20,
+            barGap: '20%',
+          }
+        ]
+      }, true);
+      window.addEventListener("resize", this.onResize)
+    },
+
+    onResize() {
+      this.myChart.resize()
+    },
+
+    cancel(isRefresh) {
+      this.$emit('change', {
+        type: 'gridScoreManage',
+        isRefresh: !!isRefresh
+      })
+    }
+
+  },
+
+  filters: {
+    formatTime(num) {
+      if (num > 0) {
+        return '+' + num
+      } else {
+        return num
+      }
+    }
+  },
+
+  mounted() {
+    this.getColEcherts()
+  },
+
+  destroyed() {
+    window.removeEventListener('resize', this.onResize)
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.gridScoreDetail {
+  width: 100%;
+  height: 100%;
+  padding: 0 20px;
+  box-sizing: border-box;
+  overflow-y: scroll;
+
+  .card_list {
+    display: flex;
+
+    .card {
+      flex: 1;
+      height: 96px;
+      background: #FFFFFF;
+      box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.1500);
+      border-radius: 4px;
+      margin-right: 20px;
+      padding: 16px 24px;
+      box-sizing: border-box;
+
+      h2 {
+        color: #888888;
+        font-weight: 600;
+        font-size: 16px;
+      }
+
+      p {
+        margin-top: 8px;
+        font-size: 24px;
+        font-weight: 600;
+      }
+
+      .color1 {
+        color: #2891FF;
+      }
+
+      .color2 {
+        color: #22AA99;
+      }
+
+      .color3 {
+        color: #F8B425;
+      }
+    }
+
+    .card:last-child {
+      margin-right: 0;
+    }
+  }
+
+  .echertsBox {
+    width: 100%;
+    margin-top: 20px;
+    background: #FFFFFF;
+    box-shadow: 0px 4px 6px -2px rgba(15, 15, 21, 0.1500);
+    border-radius: 4px;
+    padding: 16px;
+    box-sizing: border-box;
+
+    .title {
+      display: flex;
+      justify-content: space-between;
+
+      h4 {
+        color: #222222;
+        font-weight: 600;
+      }
+
+    }
+
+    .bar_Box {
+      width: 100%;
+
+      #chartDom {
+        width: 100%;
+        height: 230px;
+        margin-top: 16px;
+      }
+    }
+
+  }
+}
+</style>
diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreManage.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreManage.vue
new file mode 100644
index 00000000..3fd6fcf1
--- /dev/null
+++ b/project/pidu/app/AppGridMemberScore/components/gridScoreManage.vue
@@ -0,0 +1,365 @@
+<template>
+  <section class="gridScoreManage">
+    <ai-list>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" size="small" icon="iconfont iconAdd" @click="changeIntegral('',0)">&nbsp;批量调整积分</el-button>
+            <el-cascader ref="cascader1" clearable v-model="girdIdList" :options="girdOptions" placeholder="所属网格" size="small"
+              :props="defaultProps" :show-all-levels="false" @change="gridChange"></el-cascader>
+          </template>
+          <template #right>
+            <ai-import :instance="instance" :dict="dict" type="appintegraluser" name="积分管理"
+                      @success="getTableData()">
+              <el-button icon="iconfont iconImport">导入</el-button>
+            </ai-import>
+            <ai-download :instance="instance" url="/app/appintegraluser/girdIntegralExport" :params="search" :fileName="menuName"
+                         :disabled="tableData.length == 0">
+            </ai-download>
+            <el-input size="small" placeholder="姓名" v-model="search.userName" clearable
+              @clear="current = 1, search.userName = '', getTableData()" suffix-icon="iconfont iconSearch"
+              v-throttle="() => {(current = 1), getTableData();}"/>
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="tableData" :total="total" :current.sync="current" :size.sync="size"
+                  @getList="getTableData()" :col-configs="colConfigs" :dict="dict" @sort-change="changeTableSort">
+
+
+          <el-table-column slot="options" label="操作"  align="center">
+            <template slot-scope="{ row }">
+              <el-button type="text" @click="changeIntegral(row,1)">调整积分</el-button>
+              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-dialog
+        title="调整积分"
+        :visible.sync="dialog"
+        :destroyOnClose="true"
+        width="720px"
+        @onConfirm="onConfirm"
+        @closed="form={},chooseUserList=[]">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="选择人员" prop="ids">
+          <ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseUserList"
+              url="/app/appgirdmemberinfo/list" headerTitle="网格员列表"
+              :isMultiple="true" dialogTitle="选择" @selectPerson="selectPerson" class="aipersonselect">
+            <template name="option" v-slot:option="{ item }">
+              <span class="iconfont iconProlife">{{ item.name }}</span>
+              <ai-id mode="show" :show-eyes="false" :value="item.idNumber"/>
+            </template>
+          </ai-person-select>
+        </el-form-item>
+        <el-form-item label="调整说明" prop="eventDesc">
+          <el-input v-model.trim="form.eventDesc" placeholder="请输入..." type="textarea" :rows="4" show-word-limit
+                    maxlength="100"></el-input>
+        </el-form-item>
+        <el-form-item label="上传凭证">
+          <ai-uploader :instance="instance" fileType="file" v-model="form.file" :limit="1"></ai-uploader>
+        </el-form-item>
+        <el-form-item label="类型" prop="integralCalcType">
+          <ai-select v-model="form.integralCalcType" :selectList="dict.getDict('integralCalcType')"/>
+        </el-form-item>
+        <el-form-item label="积分" prop="integral">
+          <el-input v-model.trim="form.integral" placeholder="请输入正数" size="small"></el-input>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+  </section>
+
+</template>
+
+<script>
+import { mapState } from "vuex";
+export default {
+  name: "gridScoreManage",
+  label: "积分管理",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+    menuName:String
+  },
+  data() {
+    return {
+      search: {
+        userName: '',
+        girdId: '',
+        current: 1,
+        size: 10,
+        sortFiled: '',
+        sortRule: '',
+      },
+      girdIdList: [],
+      tableData: [],
+      size: 10,
+      total: 0,
+      current: 1,
+      girdList: [],
+      form: {
+        ids: [],
+        eventDesc: "",
+        enclosure: "",   // 附件
+        integralCalcType: "",
+        integral: '',
+        file: [],
+      },
+      personList: [],
+      dialog: false,
+      girdOptions: [],
+      defaultProps: {
+        label: 'girdName',
+        value: 'id',
+        checkStrictly: true,
+      },
+      chooseUserList: [],
+      flag: false,
+    }
+  },
+  created() {
+    this.$dict.load('integralCalcType')
+    this.getTableData()
+    this.getGridList()
+  },
+  computed: {
+    ...mapState(['user']),
+    colConfigs() {
+      return [
+        { prop: "userName", label: '姓名', align: "left",  },
+        { prop: "girdName", label: '所属网格' },
+        { prop: "integral", label: '积分余额', align: "center", sortable: "custom" },
+        { prop: "totalIntegral", label: '累计积分', align: "center", sortable: "custom" },
+        { prop: "usedIntegral", label: '已用积分', align: "center", sortable: "custom"  },
+        { slot: "options" },
+      ]
+    },
+    rules() {
+      return {
+        ids: [{required: true, message: '请选择人员', trigger: 'blur'}],
+        eventDesc: [{required: true, message: '请输入调整说明', trigger: 'blur'}],
+        integralCalcType: [{required: true, message: '请选择类型', trigger: 'change'}],
+        integral: [{required: true, message: '请输入积分', trigger: 'blur' },
+        {pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, message: '请输入正数且最多只能保留两位小数'}],
+      }
+    },
+  },
+  methods: {
+    getTableData() {
+      this.instance.post(`/app/appintegraluser/integralManager`,null,{
+        params: {
+          ...this.search,
+          current: this.current,
+          size: this.size,
+          total: this.total
+        }
+      }).then(res => {
+        if(res?.data) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      })
+    },
+
+    selectPerson(val) {
+      if (val) {
+        this.personList = val
+        this.form.ids = [...this.personList.map(e => e.id)]
+      } else {
+        this.form.ids = this.chooseUserList.map(e => e.id)
+      }
+    },
+    changeIntegral(row,type) {
+      if(type==0) {
+        this.dialog = true
+      } else if(type ==1) {
+        this.chooseUserList = [{
+          id: row.userId,
+          name: row.userName
+        }]
+        this.form.ids = this.chooseUserList.map(e => e.id)
+        this.dialog = true
+      }
+    },
+    getGridList() {
+      this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
+        if (res.code == 0) {
+          this.girdOptions = this.toTree(res.data)
+        }
+      })
+    },
+
+    // 转树形结构
+    toTree(data) {
+      let result = [];
+      if (!Array.isArray(data)) {
+        return result
+      }
+      let map = {};
+      data.forEach(item => {
+        map[item.id] = item;
+      });
+      data.forEach(item => {
+        let parent = map[item.parentGirdId];
+        if (parent) {
+          (parent.children || (parent.children = [])).push(item);
+        } else {
+          result.push(item);
+        }
+      });
+      return result;
+    },
+
+    gridChange(val) {
+      this.girdIdList = val
+      this.search.girdId = val?.[val.length - 1]
+      this.$refs.cascader1.dropDownVisible = false;
+      this.getTableData()
+    },
+
+    changeTableSort(col) {
+      if(col.prop === 'integral') { // 剩余积分
+        this.search.sortFiled = 0
+        if(col.order === 'ascending') {
+          this.search.sortRule = true
+        } else if(col.order === 'descending') {
+          this.search.sortRule = false
+        } else if(col.order === null) {
+          this.search.sortRule = ''
+        }
+      } else if(col.prop === 'totalIntegral') {  // 累计积分
+        this.search.sortFiled = 1
+        if(col.order === 'ascending') {
+          this.search.sortRule = true
+        } else if(col.order === 'descending') {
+          this.search.sortRule = false
+        } else if(col.order === null) {
+          this.search.sortRule = ''
+        }
+      } else if(col.prop === 'usedIntegral') {  // 已用积分
+        this.search.sortFiled = 2
+        if(col.order === 'ascending') {
+          this.search.sortRule = true
+        } else if(col.order === 'descending') {
+          this.search.sortRule = false
+        } else if(col.order === null) {
+          this.search.sortRule = ''
+        }
+      }
+      this.getTableData()
+    },
+
+    onConfirm() {
+      if(this.flag) return
+
+      if(this.form.file?.length) {
+        this.form.enclosure = this.form.file[0].url
+      }
+      this.$refs.form.validate((valid)=> {
+        if(valid) {
+          this.flag = true
+          this.instance.post(`/app/appintegraluser/changeIntegral`,{
+            ids: this.form.ids,
+            eventDesc: this.form.eventDesc,
+            enclosure: this.form.enclosure,   // 附件
+            integralCalcType: this.form.integralCalcType,
+            integral: this.form.integral,
+          }).then(res => {
+            if(res?.code == 0) {
+              this.$message.success('调整积分成功')
+              setTimeout(() =>{
+                this.dialog = false
+                this.getTableData()
+                this.flag = false
+              }, 600)
+            } else {
+              this.flag = false
+            }
+          })
+        }
+      })
+
+    },
+
+    toDetail(id) {
+      this.$emit('change', {
+        type: 'gridScoreDetail',
+        params: {
+          id: id
+        }
+      })
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.gridScoreManage {
+  height: 100%;
+
+  ::v-deep .ai-dialog .ai-dialog__content {
+    max-height: 600px!important;
+  }
+
+
+
+  .userlist {
+    display: inline-block;
+  }
+
+  .userlist, .user {
+    display: inline-block;
+  }
+
+  .user {
+    position: relative;
+    width: 70px;
+    text-align: center;
+
+    .remove-icon {
+      position: absolute;
+      right: 7px;
+      top: -4px;
+      line-height: 1;
+      padding: 6px 0;
+      font-size: 16px;
+      cursor: pointer;
+
+      &:hover {
+        color: crimson;
+      }
+    }
+
+    img, h2 {
+      display: block;
+      width: 40px;
+      height: 40px;
+      line-height: 40px;
+      text-align: center;
+      margin: 0 auto 4px;
+      font-size: 14px;
+      color: #fff;
+      border-radius: 50%;
+    }
+
+    h2 {
+      background-color: $primaryColor;
+    }
+
+    span {
+      color: #666;
+      font-size: 14px;
+      white-space: nowrap;
+      overflow: hidden;
+      word-break: break-all;
+      text-overflow: ellipsis;
+    }
+  }
+
+  ::v-deep .selectCont .pagination {
+    width: 100%!important;
+    background: pink;
+  }
+}
+</style>
diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreRules.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreRules.vue
new file mode 100644
index 00000000..749badb2
--- /dev/null
+++ b/project/pidu/app/AppGridMemberScore/components/gridScoreRules.vue
@@ -0,0 +1,492 @@
+<template>
+  <section class="gridScoreRules">
+    <!--  v-if="permissions('app_appvillagerintegralrule_detail')" -->
+    <ai-list>
+      <template slot="content">
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" icon="iconfont iconAdd" @click="dialog = true">&nbsp;添加</el-button>
+            <el-cascader size="small" v-model="systemRuleIdList" :options="rulesOps" placeholder="请选择事件/类型" clearable :props="rulesProps"
+                         @change="handleTypeSearch" ref="eventTypeSearch"/>
+            <ai-select v-model="search.status" @change="(page.current = 1), getList()" placeholder="请选择状态" :selectList="$dict.getDict('integralRuleStatus')">
+            </ai-select>
+          </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>{{ 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" @click="changeStatus(row.id, 0)" v-if="row.status == 1">停用</el-button>
+                <el-button type="text" @click="changeStatus(row.id, 1)" v-else>启用</el-button>
+                <el-button type="text" @click="toEdit(row)">编辑</el-button>
+                <el-button type="text" @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="closed" width="900px" @open="beforeSelectTree">
+      <div class="form_div">
+        <el-form ref="DialogForm" :model="form" :rules="formRules" size="small" label-suffix="：" label-width="150px">
+          <el-form-item label="事件类型" prop="systemRuleId">
+            <el-cascader v-model="form.systemRuleId" ref="cascaderArr" :props="etOps" clearable placeholder="请选择" @change="handleTypeForm" :options="rulesOps"/>
+          </el-form-item>
+          <el-form-item label="自定义事件" v-if="form.systemRuleId == '自定义'" prop="ruleName">
+            <el-input placeholder="请输入,周期范围内,不填写表示不限制" v-model="form.ruleName" clearable maxlength="10" show-word-limit/>
+          </el-form-item>
+
+          <el-form-item label="规则">
+            <div>常规</div>
+          </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="{$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')" :disabled="isOneAndTen"/>
+          </el-form-item>
+
+          <el-form-item label="奖励次数">
+            <el-input type="number" placeholder="请输入,周期范围内,不填写表示不限制" v-model.number="form.numberLimit" clearable :disabled="isOneAndTen"/>
+          </el-form-item>
+
+          <el-form-item label="积分分值" prop="integral">
+            <el-input placeholder="请输入" v-model="form.integral" clearable/>
+          </el-form-item>
+
+          <el-form-item label="有效范围" prop="validRangeType" required>
+            <el-radio-group v-model="form.validRangeType">
+              <el-radio label="0">全局</el-radio>
+              <el-radio label="1">指定网格</el-radio>
+            </el-radio-group>
+          </el-form-item>
+
+          <el-form-item label="生效网格" :prop="form.validRangeType == 1 ? 'validRangeData' : ''"
+                        :rules="[{ required: true, message: '请选择生效网格', trigger: 'change' }, ]" v-if="form.validRangeType == 1">
+            <ai-dialog-btn dialogTitle="选择网格" append-to-body @onConfirm="getCheckedTree" :customFooter="false" :text="girdInfoList.length ? '重新选择' : '请选择'">
+              <div class="grid">
+                <el-tree :data="treeObj.treeList" :props="treeObj.defaultProps" node-key="id" :expand-on-click-node="false">
+                  <template slot-scope="{data}">
+                    <el-row class="fill" type="flex" @click.native.stop="handleTreeChecked(data)">
+                      <div class="fill" v-text="data.girdName"/>
+                      <div class="iconfont iconSuccess color-primary mar-r8" v-if="data.checked"/>
+                    </el-row>
+                  </template>
+                </el-tree>
+              </div>
+            </ai-dialog-btn>
+
+            <div v-if="girdInfoList.length">
+              <span v-for="(e,index) in girdNameList" :key="index" class="mar-r8" v-text="e"/>
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "gridScoreRules",
+  label: "积分规则",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+  },
+  data() {
+    var validcode = (rule, value, callback) => {
+      if (value) {
+        if (value != 0) {
+          if (!/^([+-]?([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/.test(value)) {
+            callback(new Error('请输入积分分值，可输入正数、负数、最多保留两位小数'))
+          } else {
+            callback();
+          }
+        } else {
+          callback(new Error('请输入有效的积分分值'));
+        }
+      } else {
+        callback(new Error('请输入积分分值'));
+      }
+    }
+    return {
+      search: {
+        status: "",
+        systemRuleId: "",
+        ruleName: ""
+      },
+      systemRuleIdList: [],
+      page: {current: 1, size: 10, total: 0},
+      colConfigs: [
+        {
+          prop: "parentRuleName",
+          label: "类型",
+          dict: "integralRuleEventType",
+        },
+        {prop: "ruleName", label: "事件", dict: "integralRuleEvent"},
+        {prop: "ruleType", label: "规则", dict: "integralRuleRuleType"},
+        {
+          prop: "scoringCycle",
+          label: "周期范围",
+          dict: "integralRuleScoringCycle",
+          render: (h, {row}) => {
+            return h(
+                "span",
+                {},
+                row.numberLimit.length
+                    ? $dict.getLabel("integralRuleScoringCycle", row.scoringCycle)
+                    : $dict.getLabel("integralRuleScoringCycle", row.scoringCycle) +
+                    row.numberLimit +
+                    "次"
+            );
+          },
+        },
+        {slot: "integral", label: "积分分值", align: "center"},
+        {
+          prop: "validRangeType",
+          label: "有效范围",
+          formart: (v) => (v == 0 ? "全局" : "指定网格"),
+        },
+        {
+          prop: "status",
+          label: "状态",
+          align: "center",
+          width: 96,
+          dict: "integralRuleStatus",
+        },
+        {slot: "options", label: "操作", align: "center"},
+      ],
+      tableData: [],
+      dialog: false,
+      form: {
+        ruleType: "0",
+        systemRuleId: "",
+        ruleName: "",
+        scoringCycle: "",
+        numberLimit: "",
+        integral: "",
+        validRangeType: "0",
+        validRangeData: "",
+      },
+      formRules: {
+        systemRuleId: [
+          {required: true, message: "请选择事件/类型", trigger: "change"},
+        ],
+        ruleName: [
+          {required: true, message: "请输入自定义事件", trigger: "change"},
+        ],
+        scoringCycle: [
+          {required: true, message: "请选择周期范围", trigger: "change"},
+        ],
+        integral: [{required: true, validator: validcode, trigger: "blur"},],
+        validRangeType: [
+          {required: true, message: "请选择有效范围", trigger: "change"},
+        ],
+      },
+      rulesOps: [],
+      rulesProps: {
+        label: "ruleName",
+        value: "id",
+        checkStrictly: true,
+      },
+      radio: 0,
+      treeObj: {
+        treeList: [],
+        defaultProps: {
+          label: "girdName",
+          value: "id",
+          children: 'children',
+          isLeaf: 'leaf'
+        },
+      },
+      treeSelected: {},
+      girdInfoList: [],
+      rulueType: "0",
+      girdNameList: [],
+      list: [],
+      isOneAndTen: false,
+    };
+  },
+  created() {
+    this.$dict.load("integralRuleStatus", "integralRuleRuleType", "integralRuleScoringCycle",
+        "integralRuleEvent", "integralRuleEventType").then(() => {
+      this.getList();
+      this.getRulesList();
+    });
+  },
+  methods: {
+    getList() {
+      this.instance
+      .post(`/app/appintegralrule/list`, null, {
+        params: {
+          ...this.search,
+          ...this.page,
+        },
+      })
+      .then((res) => {
+        if (res?.data) {
+          this.tableData = res.data.records;
+          this.page.total = res.data.total;
+        }
+      });
+    },
+    closed() {
+      this.form = {
+        ruleType: "0",
+        systemRuleId: "",
+        ruleName: "",
+        scoringCycle: "",
+        numberLimit: "",
+        integral: "",
+        validRangeType: "0",
+        validRangeData: "",
+      };
+      this.girdInfoList = []
+      this.treeSelected = {}
+    },
+    toEdit(row) {
+      this.form = {...row}
+      if (this.form?.validRangeData) {
+        this.girdInfoList = JSON.parse(this.form.validRangeData)
+        this.girdNameList = this.girdInfoList.map(e => e.girdName)
+      }
+      this.$nextTick(() => {
+        this.dialog = true;
+      });
+    },
+    remove(id) {
+      this.$confirm("删除后不可恢复，是否要删除该规则？", {
+        type: "error",
+      }).then(() => {
+        this.instance
+        .post(`/app/appintegralrule/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/appintegralrule/enableStatus?id=${id}`)
+        .then((res) => {
+          if (res.code == 0) {
+            this.$message.success(`${text}成功！`);
+            this.getList();
+          }
+        });
+      });
+    },
+    onConfirm() {
+      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/appintegralrule/addOrUpdate`, formData)
+          .then((res) => {
+            if (res.code == 0) {
+              this.$message.success(
+                  `${this.isEdit ? "编辑成功" : "添加成功"}`
+              );
+              this.dialog = false;
+              this.getList();
+              this.closed();
+              this.girdInfoList = []
+              this.girdNameList = []
+            }
+          });
+        } else {
+          return false;
+        }
+      });
+    },
+    handleTypeSearch(v) {
+      this.systemRuleIdList = v
+      this.search.systemRuleId = v?.[v.length - 1];
+      this.search.ruleName = this.$refs.eventTypeSearch.getCheckedNodes()[0]?.label
+      this.page.current = 1;
+      this.$refs.eventTypeSearch.dropDownVisible = false;
+      this.getList();
+    },
+    handleTypeForm(v) {
+      if (this.dialog) {
+        if(v[0] == '1' || v[0]== '10') {
+          this.form.scoringCycle = '0'
+          this.form.numberLimit = '1'
+          this.isOneAndTen = true
+        } else {
+          this.form.scoringCycle = ''
+          this.form.numberLimit = ''
+          this.isOneAndTen = false
+        }
+        this.form.systemRuleId = v?.[v.length - 1];
+      }
+    },
+    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);
+    },
+    getRulesList() {
+      this.instance
+      .post(`/app/appintegralsystemrule/list?current=1&size=3000`)
+      .then((res) => {
+        if (res?.data) {
+          this.rulesOps = this.toTree(res.data.records);
+          this.rulesOps.push({
+            ruleName: "自定义",
+            id: "自定义",
+          });
+        }
+      });
+    },
+    // 转树形结构
+    toTree(data) {
+      let result = [];
+      if (!Array.isArray(data)) {
+        return result;
+      }
+      let map = {};
+      data.forEach((item) => {
+        map[item.id] = item;
+      });
+      data.forEach((item) => {
+        let parent = map[item.parentRuleId];
+        if (parent) {
+          (parent.children || (parent.children = [])).push(item);
+        } else {
+          result.push(item);
+        }
+      });
+      return result;
+    },
+    getCheckedTree() {
+      const selected = Object.values(this.treeSelected)
+      if (!selected.length) {
+        return this.$message.error("请选择网格");
+      }
+
+      this.girdInfoList = selected.map((item) => {
+        return {...item, checkType: true};
+      });
+      let validRangeData = selected.map((e) => ({id: e.id, girdName: e.girdName}))
+      this.girdNameList = validRangeData.map(e => e.girdName)
+      this.form.validRangeData = JSON.stringify(validRangeData)
+    },
+    beforeSelectTree() {
+      this.instance.post(`/app/appgirdinfo/listAll3`, null, null).then((res) => {
+        if (res?.data) {
+          this.list = res.data.map(e => ({...e, checked: !!this.girdInfoList.find(s => s.id == e.id)}))
+          this.girdInfoList.map(e => this.treeSelected[e.id] = e)
+          this.treeObj.treeList = this.$arr2tree(this.list, {parent: 'parentGirdId'})
+        }
+      });
+    },
+    handleTreeChecked(data) {
+      this.list.forEach(v => {
+        return {
+          ...v,
+          checked: false
+        }
+      })
+      data.checked = !data.checked
+      if (data.checked) {
+        this.treeSelected[data.id] = data
+      } else {
+        delete this.treeSelected[data.id]
+      }
+    }
+  },
+  computed: {
+    isEdit() {
+      return !!this.form.id;
+    },
+    dialogTitle() {
+      return this.isEdit ? "编辑积分规则" : "添加积分规则";
+    },
+    etOps() {
+      return {
+        value: "id",
+        label: "ruleName",
+      };
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.gridScoreRules {
+  height: 100%;
+  background: #f3f6f9;
+
+  ::v-deep .ai-list__content--right {
+    width: 100%;
+  }
+
+  // ::v-deep .searchRightZone {
+  //   display: flex;
+  // }
+
+  ::v-deep .ai-dialog {
+    .el-cascader {
+      width: 100%;
+    }
+
+    .tableInput {
+      & > input {
+        text-align: center;
+        border: none;
+        background: transparent;
+      }
+    }
+  }
+}
+</style>
diff --git a/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue
new file mode 100644
index 00000000..f91e2b2f
--- /dev/null
+++ b/project/pidu/app/AppGridMemberScore/components/gridScoreStatistics.vue
@@ -0,0 +1,653 @@
+<template>
+  <section class="gridScoreStatistics">
+    <el-row class="overallStatistics">
+      <div class="title">
+        <p>总体统计</p>
+        <div class="title_right">
+          <div>
+            <span v-for="(item,index) in timeCheck" :key="index" :class="type == index? 'active':''"
+             @click="timeChange(index)">{{ item }}</span>
+          </div>
+            <el-cascader ref="cascader1" v-model="girdArr" :options="girdOptions" placeholder="所属网格" size="small" 
+              :props="defaultProps" :show-all-levels="false" @change="gridChange" clearable></el-cascader>
+        </div>
+      </div>
+      <div class="card_list">
+        <div class="card">
+          <h2>积分余额汇总
+            <el-tooltip
+              placement="right"
+              style="width: 16px;"
+              content="截止目前所有网格员剩余可用积分余额的总和">
+              <i class="el-icon-warning-outline"></i>
+            </el-tooltip>
+          </h2>
+          <p class="color1">{{ data.nowIntegral || 0 }}</p>
+        </div>
+        <div class="card">
+          <h2>发放积分</h2>
+          <p class="color1">{{ data.addIntegral || 0 }}</p>
+        </div>
+        <div class="card">
+          <h2>消耗积分</h2>
+          <p class="color1">{{ Math.abs(data.reduceIntegral) || 0 }}</p>
+        </div>
+      </div>
+      <div class="echertsBox">
+        <div class="left_Box">
+          <p>个人积分排行</p>
+          <div>
+            <div id="chart1" style="height: 300px; width: 100%;" v-show="userSortListX.length && userSortListY.length"></div>
+            <ai-empty v-show="!userSortListX.length && !userSortListY.length" style="height: 200px; width: 100%;" id="empty"></ai-empty>
+          </div>
+        </div>
+        <div class="right_Box">
+          <p>网格积分排行</p>
+          <div>
+            <div id="chart2" style="height: 300px; width: 100%;" v-show="girdSortListX.length && girdSortListY.length"></div>
+            <ai-empty v-show="!girdSortListX.length && !girdSortListY.length" style="height: 200px; width: 100%;" id="empty"></ai-empty>
+          </div>
+        </div>
+      </div>
+    </el-row>
+
+    <ai-card>
+      <ai-title slot="title" title="积分明细"/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-cascader ref="cascader2" v-model="girdIdArr" :options="girdOptions" placeholder="所属网格" size="small" 
+              :props="defaultProps" :show-all-levels="false" clearable @change="gridChangeOpt"></el-cascader>
+            <ai-select v-model="search.integralType" placeholder="请选择类型" @change="current=1, getTableData()" 
+            :selectList="dict.getDict('integralType')"/>
+            <el-date-picker v-model="time" size="small" type="daterange" value-format="yyyy-MM-dd" 
+              range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="onChange">
+            </el-date-picker>
+          </template>
+          <template #right>
+            <el-input size="small" placeholder="请输入姓名" v-model="search.userName" clearable
+              @clear="current = 1, search.userName = '', getTableData()" suffix-icon="iconfont iconSearch"
+              v-throttle="() => {(current = 1), getTableData();}" />
+          </template>
+        </ai-search-bar>
+        <ai-table :tableData="tableData" :total="total" :current.sync="current" :size.sync="size"
+                  @getList="getTableData" :col-configs="colConfigs" :dict="dict">
+          <el-table-column slot="eventDesc" label='事件' align="center" width="400px" show-overflow-tooltip>
+            <template slot-scope="{ row }">
+              <span v-if="row.integralRuleId">{{ row.integralRuleName }}</span>
+              <span v-else>{{ row.eventDesc }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column slot="integralType" label="类型" align="center">
+            <template slot-scope="{ row }">
+              <span v-if="row.integralRuleId">{{ row.eventType }}</span>
+              <span v-else>{{ row.integralRuleName }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column slot="changeIntegral" label="积分变动" align="center">
+            <template slot-scope="{ row }">
+              <span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
+              <span v-if="row.integralType == 0">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column slot="options" label="操作"  align="center">
+            <template slot-scope="{ row }">
+              <el-button type="text" @click="open(row.id)">详情</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-card>
+
+    <el-dialog title="详情" :visible.sync="dialog" customFooter width="700">
+      <ai-detail>
+        <template #content>
+          <ai-wrapper>
+            <ai-info-item label="姓名" :value="details.integralUserName" />
+            <ai-info-item label="所属网格" :value="details.girdName"/>
+            <ai-info-item label="事件" isLine :value="details.eventDesc">
+              <span v-if="details.integralRuleId">{{ details.integralRuleName }}</span>
+              <span v-else>{{ details.eventDesc }}</span>
+            </ai-info-item>
+            <ai-info-item label="时间" isLine :value="details.createTime"/>
+            <ai-info-item label="积分变动" v-if="details.integralType == 3">
+              {{ details.changeIntegral | formatTime }}
+            </ai-info-item>
+            <ai-info-item label="积分变动" v-if="details.integralType == 0">
+              {{ details.changeIntegral > 0 ? '+' : '-' }}{{ details.changeIntegral }}
+            </ai-info-item>
+            <ai-info-item label="积分余额" :value="details.nowIntegral"/>
+            <ai-info-item label="凭证" isLine v-if="fileDownLoad.length">
+              <ai-file-list :fileList="fileDownLoad" style="width: 200px;" :fileOps="{name: 'name'}"></ai-file-list>
+            </ai-info-item>
+          </ai-wrapper>
+        </template>
+      </ai-detail>
+      <span slot="footer" class="dialog-footer" center>
+        <el-button @click="dialog = false" style="width: 92px">关闭</el-button>
+      </span>
+    </el-dialog>
+
+    <ai-dialog :visible.sync="dialogDate" title="选择时间" width="500px" customFooter>
+      <el-date-picker v-model="timeList" size="small" type="daterange" value-format="yyyy-MM-dd"
+        range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
+      </el-date-picker>
+      <el-button slot="footer" @click="selectDete" type="primary">确认</el-button>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+import { mapState } from "vuex"
+import * as echarts from 'echarts';
+export default {
+  name: "gridScoreStatistics",
+  label: "积分统计",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function,
+  },
+  data() {
+    return {
+      myChart1: null,
+      myChart2: null,
+      tableData: [],
+      search: {
+        current: 1,
+        userName: '',
+        girdId: '',
+        integralType: '',
+        startTime: '',
+        endTime: '',
+      },
+      girdIdArr:[],
+      total: 0,
+      size: 10,
+      current: 1,
+      girdList: [],
+      time: [],
+      timeCheck: ['昨日','近7天','近30天','自定义'],
+      dialog: false,
+      dialogDate: false,
+      timeList: [],
+      type: '1',
+      startTime: '',
+      endTime: '',
+      data: {},
+      girdId: '',
+      girdArr: [],
+      girdOptions: [],
+      defaultProps: {
+        label: 'girdName',
+        value: 'id',
+        children: 'children',
+        checkStrictly: true,
+      },
+      details: {},
+      fileDownLoad: [],
+      userSortListX: [],
+      userSortListY: [],
+      girdSortListX: [],
+      girdSortListY: [],
+    }
+  },
+  computed: {
+    ...mapState(['user']),
+    colConfigs() {
+      return [
+        { prop: "integralUserName", label: '姓名', align: "left", width: "200px" },
+        { prop: "girdName", label: '所属网格', align: "center", width: "180px" },
+        { slot: "eventDesc"},
+        { slot: "integralType", label: '类型' },
+        { slot: "changeIntegral", label: '积分变动', align: "center", },
+        { prop: "nowIntegral", label: '剩余积分', align: "center", },
+        { prop: "createTime", label: '时间', align: "center", },
+        { slot: "options" }
+      ]
+    }
+  },
+  created() {
+    this.$dict.load('epidemicDangerousAreaLevel','integralType','integralRuleEvent','integralRuleEventType').then(() => {
+      this.getStatistics()
+      this.getGridList()
+      this.getRanking()
+      this.getTableData()
+    })
+  },
+  methods: {
+    // 统计接口
+    getStatistics() {
+      this.instance.post('/app/appintegraluser/allGirdIntegral',null, {
+        params: {
+          type: this.type,
+          girdId: this.girdId,
+          startTime: this.startTime,
+          endTime: this.endTime,
+        }
+      }).then(res => {
+        if(res?.data) {
+          this.data = res.data
+        }
+      })
+    },
+    
+    // 人员、网格排行
+    getRanking() {
+      this.instance.post('/app/appintegraluser/userAndGirdIntegralSort',null,{
+        params: {
+          type: this.type,
+          girdId: this.girdId,
+          startTime: this.startTime,
+          endTime: this.endTime
+        }
+      }).then((res) => {
+        if(res?.data) {
+          this.userSortListX = res.data.userSortList.map(e=> e.userName).reverse()
+          this.userSortListY = res.data.userSortList.map(e=> e.changeIntegral).reverse()
+          this.girdSortListX = res.data.girdSortList.map(e=> e.girdName).reverse()
+          this.girdSortListY = res.data.girdSortList.map(e=> e.changeIntegral).reverse()
+          this.getColEcherts1(this.userSortListX,this.userSortListY)
+          this.getColEcherts2(this.girdSortListX,this.girdSortListY)
+        }
+      })
+    },
+    // 积分明细
+    getTableData() {
+      this.instance.post('/app/appintegraluser/girdIntegralDetail',null,{
+        params: {
+          ...this.search,
+          current: this.current,
+          size: this.size,
+          total: this.total,
+        }
+      }).then(res => {
+        if(res?.data) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      })
+    },
+
+    gridChangeOpt(val) {
+      this.girdIdArr = val
+      this.search.girdId = val?.[val.length - 1]
+      this.$refs.cascader2.dropDownVisible = false;
+      this.getTableData()
+    },
+
+    getColEcherts1(xData,yData) {
+      let chartDom1 = document.getElementById('chart1');
+      chartDom1.style.width = (window.innerWidth - 435) / 2 + "px";
+      this.myChart1 = echarts.init(chartDom1);
+      this.myChart1.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        grid: {
+          left: '16px',
+          right: '28px',
+          bottom: '14px',
+          top: '16px',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'value',
+          boundaryGap: [0, 0.01],
+        },
+        yAxis: {
+          type: 'category',
+          data: xData,
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+        },
+
+        series: [
+          {
+            data: yData,
+            type: 'bar',
+            itemStyle: {
+              normal: {
+                color: "#5087ec",
+                label: {
+                  show: true,  //开启显示
+                  position: 'right',    //在上方显示
+                  textStyle: {
+                    fontSize: 13,
+                    color: '#666'
+                  }
+                },
+              },
+            },
+            barWidth: 10,
+            barGap: '20%',
+          }
+        ]
+      }, true);
+      window.addEventListener("resize", this.onResize)
+    },
+    getColEcherts2(xData,yData) {
+      let chartDom2 = document.getElementById('chart2');
+      chartDom2.style.width = (window.innerWidth - 435) / 2 + "px";
+      this.myChart2 = echarts.init(chartDom2);
+      this.myChart2.setOption({
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        grid: {
+          left: '16px',
+          right: '28px',
+          bottom: '14px',
+          top: '16px',
+          containLabel: true
+        },
+        xAxis: {
+          type: 'value',
+          boundaryGap: [0, 0.01],
+        },
+        yAxis: {
+          type: 'category',
+          data: xData,
+          axisTick: {
+            show: false,
+          },
+          axisLine: {
+            show: false,
+          },
+          triggerEvent: true,
+            //设置文本过长超出隐藏...表示
+            axisLabel:{
+              margin: 8,
+              formatter: function(params){
+                var val=""
+                if(params.length > 8) {
+                  val = params.substr(0,8)+'...'
+                  return val
+                } else {
+                  return params;
+              }
+            }
+          },
+        },
+        series: [
+          {
+            data: yData,
+            type: 'bar',
+            itemStyle: {
+              normal: {
+                color: "#5087ec",
+                label: {
+                  show: true,  //开启显示
+                  position: 'right',    //在右方显示
+                  textStyle: {
+                    fontSize: 13,
+                    color: '#666'
+                  }
+                },
+              },
+            },
+            barWidth: 10,
+            barGap: '20%',
+          }
+        ]
+      }, true);
+      window.addEventListener("resize", this.onResize2)
+      // this.extension(this.myChart2)
+    },
+    onResize1() {
+      this.myChart1.resize()
+    },
+    onResize2() {
+      this.myChart2.resize()
+    },
+    gridChange(val) {
+      this.girdArr = val
+      this.girdId = val?.[val.length - 1]
+      this.$refs.cascader1.dropDownVisible = false;
+      this.getStatistics()
+      this.getRanking()
+    },
+    // 所有网格
+    getGridList() {
+      this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
+        if (res?.code == 0) {
+          this.girdOptions = this.toTree(res.data)
+        }
+      })
+    },
+
+    // 转树形结构
+    toTree(data) {
+      let result = [];
+      if (!Array.isArray(data)) {
+        return result
+      }
+      let map = {};
+      data.forEach(item => {
+        map[item.id] = item;
+      });
+      data.forEach(item => {
+        let parent = map[item.parentGirdId];
+        if (parent) {
+          (parent.children || (parent.children = [])).push(item);
+        } else {
+          result.push(item);
+        }
+      });
+      return result;
+    },
+
+    timeChange(index) {
+      if(index == 3) {
+        this.dialogDate = true
+      } 
+      this.type = index
+      this.getStatistics()
+      this.getRanking()
+    },
+
+    open(id) {
+      this.dialog = true
+      this.getDetail(id)
+    },
+
+    onChange(val) {
+      this.search.startTime = val?.[0]
+      this.search.endTime = val?.[1]
+      this.getTableData()
+    },
+
+    getDetail(id) {
+      this.instance.post(`/app/appintegraldetail/queryDetailById?id=${id}`).then(res=> {
+        if(res?.data) {
+          this.details = res.data
+          if(res.data.enclosure) {
+            let str = res.data.enclosure.split('/')
+            this.fileDownLoad = [{ 
+              url:res.data.enclosure,
+              name: str?.[str.length - 1]
+            }]
+          }
+        }
+      })
+    },
+
+    selectDete() {
+      if(!this.timeList || !this.timeList.length) {
+        return this.$message.error('请选择自定义时间');
+      }
+      this.startTime = this.timeList?.[0]
+      this.endTime = this.timeList?.[1]
+      this.dialogDate = false
+      this.getStatistics()
+      this.getRanking()
+    },
+
+  },
+
+  filters: {
+    formatTime(num) {
+      if(num > 0) {
+        return '+' + num
+      } else {
+        return num
+      }
+    }
+  },
+
+  mounted() {
+    this.getColEcherts1()
+    this.getColEcherts2()
+  },
+
+  destroyed () {
+    window.removeEventListener('resize', this.onResize1)
+    window.removeEventListener('resize', this.onResize2)
+  },
+
+}
+</script>
+
+<style lang="scss" scoped>
+.gridScoreStatistics {
+  height: 100%;
+  box-sizing: border-box;
+  padding-top: 20px;
+  .overallStatistics {
+    width: 100%;
+    margin-bottom: 16px;
+    padding: 20px;
+    box-sizing: border-box;
+    background: #FFF;
+
+    .title {
+      width: 100%;
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 16px;
+      p {
+        font-size: 16px;
+        font-family: MicrosoftYaHeiSemibold;
+        color: #222222;
+        font-weight: 600;
+      }
+
+      .title_right {
+        display: flex;
+        align-items: center;
+        span {
+          display: inline-block;
+          width: 70px;
+          height: 32px;
+          line-height: 32px;
+          border-radius: 2px;
+          border: 1px solid #D0D4DC;
+          margin-right: 8px;
+          text-align: center;
+          cursor: pointer;
+        }
+        .active {
+          color: #2266FF;
+          border: 1px solid #2266FF;
+        }
+      }
+    }
+
+    .card_list {
+      display: flex;
+      .card {
+        flex: 1;
+        height: 96px;
+        background: #F9F9F9;
+        border-radius: 2px;
+        margin-right: 20px;
+        padding: 16px 24px;
+        box-sizing: border-box;
+        h2 {
+          color: #888888;
+          font-weight: 600;
+          font-size: 16px;
+        }
+        p {
+          margin-top: 8px;
+          font-size: 24px;
+          font-weight: 600;
+        }
+        .color1 {
+          color: #2891FF;
+        }
+        .color2 {
+          color: #22AA99;
+        }
+        .color3 {
+          color: #F8B425;
+        }
+      }
+      .card:last-child {
+        margin-right: 0;
+      }
+    }
+    .echertsBox {
+      width: 100%;
+      margin-top: 20px;
+      background: #FFF;
+      display: flex;
+      .left_Box {
+        margin-right: 16px;
+        flex: 1;
+      }
+      .right_Box {
+        width: 100%;
+        flex: 1;
+      }
+
+      .left_Box,
+      .right_Box {
+        background: #F9F9F9;
+        box-shadow: 0px 4px 6px -2px rgba(15,15,21,0.1500);
+        border-radius: 4px;
+        padding: 16px;
+        box-sizing: border-box;
+        #chart1,
+        #chart2 {
+          width: 100%;
+          height: 300px;
+        }
+        p {
+          font-weight: 600;
+        }
+      }
+    }
+  }
+
+  // .chartCss {
+  //   position: absolute;
+  //   color: black;
+  //   background:white;
+  //   font-family: Aril;
+  //   font-size: 12px;
+  //   padding: 5px;
+  //   display: inline;
+  // }
+
+  ::v-deep .el-dialog__footer {
+    text-align: center;
+  }
+  ::v-deep .el-dialog__header {
+    border-bottom: 1px solid #DDD;
+  }
+  ::v-deep .ai-detail {
+    background: #FFF;
+  }
+ }
+</style>
\ No newline at end of file
diff --git a/project/pidu/app/AppOrder/components/Detail.vue b/project/pidu/app/AppOrder/components/Detail.vue
index d7346639..4e62fd95 100644
--- a/project/pidu/app/AppOrder/components/Detail.vue
+++ b/project/pidu/app/AppOrder/components/Detail.vue
@@ -29,15 +29,6 @@
           </ai-wrapper>
         </template>
       </ai-card>
-      <ai-card title="操作信息">
-        <template #content>
-          <ai-wrapper
-            label-width="120px">
-            <ai-info-item label="核销人" :value="info.auditUserName"></ai-info-item>
-            <ai-info-item label="核销时间" :value="info.auditTime"></ai-info-item>
-          </ai-wrapper>
-        </template>
-      </ai-card>
       <ai-card title="商品信息">
         <template #content>
           <ai-table
diff --git a/vue.config.js b/vue.config.js
index 85a68eba..565fcd69 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -57,7 +57,7 @@ module.exports = {
     proxy: {
       //设置代理,可解决跨5
       '/lan': {
-        target: 'http://dvcp.sinoecare.net',
+        target: 'http://192.168.1.87:9000',
         changeOrigin: true,
         pathRewrite: {
           //地址重写