From 6199670532a58fda109834f676228904e027bf88 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 5 Aug 2022 10:02:23 +0800
Subject: [PATCH 1/6] dd

---
 src/views/modules/shequzhili/xiangmu/index.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/shequzhili/xiangmu/index.vue b/src/views/modules/shequzhili/xiangmu/index.vue
index e5fd933ed..608d5e6dd 100644
--- a/src/views/modules/shequzhili/xiangmu/index.vue
+++ b/src/views/modules/shequzhili/xiangmu/index.vue
@@ -15,7 +15,8 @@
                       prop="orgId">
               <el-cascader ref="cascaderUnit" v-model="orgId" 
                 :options="optionsA" 
-                :props="{ checkStrictly: true, emitPath: false,children:'subOrgList',label:'orgName'}" 
+                :props="{ checkStrictly: true, 
+                emitPath: false,children:'subAgencyList',label:'agencyName', value: 'orgLevel'}" 
                 clearable 
                 @change="handleCalscChange"/>
             </el-form-item>
@@ -619,8 +620,8 @@ export default {
     handleCalscChange(val) {
       console.log('val-----', val)
       const arr = val.split('-')
-      this.fmData.orgId = arr[1]
-      this.fmData.orgType = arr[0]
+      this.fmData.orgId = arr[0]
+      this.fmData.orgType = arr[1] === 'grid' ? 'grid' : 'agency'
     },
     handleCheckbox(val) {
       const { user } = this.$store.state
@@ -822,14 +823,18 @@ export default {
       }
       this.$http
         // .post('/gov/org/userhouse/service/serviceScopeTree')
-        .post('/data/aggregator/org/agencytree', params)
+        // .post('/data/aggregator/org/agencytree', params)
         // .post('/gov/org/customeragency/staffinagencylist')
+        .post('/gov/org/customeragency/agencygridtree')
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
             console.log('获取查询详情成功', res.data)
-            this.optionsA = this.deepTree(res.data, 'subOrgList')
+            // let { agencyList, subAgencyList } = res.data
+            let _arr = []
+            _arr.push(res.data)
+            this.optionsA = this.deepTree(_arr, 'subAgencyList')
             console.log('optionsA----', this.optionsA)
           }
         })
@@ -840,7 +845,7 @@ export default {
     deepTree(arr, child) {
       if (Array.isArray(arr) && arr.length > 0) {
         return arr.map(item => {
-          if (child === 'subOrgList') item.value = item.orgType + '-' + item.orgId
+          // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
           return {
             ...item,
             [child]: item[child] && item[child].length > 0 && this.deepTree(item[child], child) || null

From dce39149c7d1a34976f269c72a7e03864ace3ad5 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 5 Aug 2022 17:22:44 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=81=B5=E5=B1=B1=E5=8D=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shequzhili/xiangmu/index.vue      | 465 ++-------
 .../shequzhili/xiangmu/xiangmu-ling.vue       | 949 ++++++++++++++++++
 2 files changed, 1042 insertions(+), 372 deletions(-)
 create mode 100644 src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue

diff --git a/src/views/modules/shequzhili/xiangmu/index.vue b/src/views/modules/shequzhili/xiangmu/index.vue
index 608d5e6dd..886314332 100644
--- a/src/views/modules/shequzhili/xiangmu/index.vue
+++ b/src/views/modules/shequzhili/xiangmu/index.vue
@@ -10,127 +10,72 @@
           class="demo-form-inline"
         >
           <div>
-
-            <el-form-item label="所属组织" label-width="100px"
-                      prop="orgId">
-              <el-cascader ref="cascaderUnit" v-model="orgId" 
-                :options="optionsA" 
-                :props="{ checkStrictly: true, 
-                emitPath: false,children:'subAgencyList',label:'agencyName', value: 'orgLevel'}" 
-                clearable 
-                @change="handleCalscChange"/>
-            </el-form-item>
-            <el-form-item label="上报渠道"
-                          prop="origin">
-              <el-select v-model="fmData.origin"
-                         placeholder="请选择"
-                         size="small"
-                         clearable
-                         class="item_width_2">
-                <el-option v-for="item in qudaoArray"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="上报人"
-                          prop="staffName">
-              <el-input v-model="fmData.staffName"
-                        class="item_width_2"
-                        size="small"
-                        clearable
-                        placeholder="请输入">
-              </el-input>
-            </el-form-item>
-            <el-form-item label="手机号"
-                          prop="mobile">
-              <el-input v-model="fmData.mobile"
-                        class="item_width_2"
-                        size="small"
-                        clearable
-                        placeholder="请输入">
-              </el-input>
-            </el-form-item>
-            <el-form-item label="事件内容"
-                          prop="backGround">
-              <el-input v-model="fmData.backGround"
-                        class="item_width_2"
-                        size="small"
-                        clearable
-                        placeholder="请输入">
+            <el-form-item label="项目标题" prop="title">
+              <el-input
+                v-model="fmData.title"
+                class="resi-cell-input"
+                size="small"
+                clearable
+                placeholder="请输入"
+              >
               </el-input>
             </el-form-item>
-            <el-form-item label="事件类型"
-                          prop="firstIdList">
-              <el-cascader ref="cascaderEvent" v-model="eventTypeCheck" :options="cateOptions"
-                collapse-tags 
-                :show-all-levels="false"
-                :props="{ 
-                  multiple: true,
-                  checkStrictly: false,
-                  emitPath: false,
-                  children:'subCategory',
-                  label:'name',
-                  value:'id'
-                }" clearable class="item_width_2" @change="handleEventType" />
-                <!-- <template slot-scope="{ node, data }">
-                  <div @click="cascaderClick(node, data)">
-                    <span>{{ data.name }}</span>
-                  </div>
-                </template>
-              </el-cascader> -->
-            </el-form-item>
-            <el-form-item label="事件状态"
-                          prop="status">
-              <el-select class="item_width_2"
-                         v-model="fmData.status"
-                         placeholder="全部"
-                         size="small"
-                         clearable>
-                <el-option v-for="item in optionsStatus"
-                           :key="item.value"
-                           :label="item.label"
-                           :value="item.value">
-                </el-option>
-              </el-select>
 
-            </el-form-item>
-            
-            <el-form-item label="上报时间"
-                          prop="startTime">
-              <el-date-picker v-model="fmData.startTime"
-                              :picker-options="startPickerOptions"
-                              class="item_width_2"
-                              size="small"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              placeholder="开始时间">
+            <el-form-item label="转项目时间" prop="date">
+              <el-date-picker
+                v-model="fmData.startDate"
+                size="small"
+                type="date"
+                value-format="yyyy-MM-dd"
+                style="width: 150px"
+                placeholder="开始时间"
+              >
               </el-date-picker>
-              <span class="data-tag">至</span>
-              <el-date-picker v-model="fmData.endTime"
-                              :picker-options="endPickerOptions"
-                              class="item_width_2 data-tag"
-                              size="small"
-                              type="datetime"
-                              value-format="yyyy-MM-dd HH:mm:ss"
-                              placeholder="结束时间">
+              <span style="margin:0 8px;">至</span>
+              <el-date-picker
+                v-model="fmData.endDate"
+                size="small"
+                type="date"
+                style="width: 150px"
+                value-format="yyyy-MM-dd"
+                placeholder="结束时间"
+              >
               </el-date-picker>
             </el-form-item>
 
-            <el-form-item label="处置选项"
-                          prop="staffId">
-              <el-checkbox v-model="checkStaffId" @change="handleCheckbox"></el-checkbox>
+            <el-form-item label="状态" prop="status">
+              <el-select
+                v-model.trim="fmData.status"
+                placeholder="请选择"
+                size="small"
+                clearable
+                style="width: 150px"
+                class="resi-cell-select"
+              >
+                <el-option
+                  v-for="item in optionsStatus"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
 
+            <el-form-item style="margin-left: 35px">
+              <el-button
+                class="diy-button--search"
+                size="small"
+                @click="handleSearch"
+                >查询</el-button
+              >
+              <el-button
+                class="diy-button--reset"
+                size="small"
+                @click="resetForm('searchForm')"
+                >重置</el-button
+              >
             </el-form-item>
-            <el-button style="margin-left:30px"
-                       size="small"
-                       class="diy-button--search"
-                       @click="handleSearch">查询</el-button>
-            <el-button style="margin-left:10px"
-                       size="small"
-                       class="diy-button--reset"
-                       @click="resetForm('searchForm')">重置</el-button>
           </div>
         </el-form>
       </el-card>
@@ -175,7 +120,7 @@
           </el-upload>
 
           <el-button @click="handleChu" class="diy-button--reset" size="small"
-            :loading="exportLoading">导出</el-button
+            >导出</el-button
           >
         </div>
 
@@ -196,115 +141,59 @@
           <el-table-column
             prop="gridName"
             align="center"
-            label="所属组织/网格"
-            min-width="140"
+            label="所属网格"
             :show-overflow-tooltip="true"
           >
           </el-table-column>
 
           <el-table-column
-            prop="firstName"
-            label="事件类型"
-            min-width="140"
+            prop="title"
+            label="项目标题"
             align="center"
             :show-overflow-tooltip="true"
           >
-            <template slot-scope="scope">
-              {{ scope.row.firstName + '-' + scope.row.secondName }}
-            </template>
           </el-table-column>
 
           <el-table-column
-            prop="staffName"
+            prop="shiftProjectTime"
             width="100"
             align="center"
-            label="报事人"
+            label="转项目时间"
             :show-overflow-tooltip="true"
           >
           </el-table-column>
 
           <el-table-column
-            prop="mobile"
+            prop="projectScheme"
             align="center"
-            label="手机号"
-            width="140"
+            label="项目方案"
             :show-overflow-tooltip="true"
           >
           </el-table-column>
 
           <el-table-column
-            prop="createdTime"
+            prop="internalRemark"
             align="center"
-            label="上报时间"
-            width="160"
+            label="内部备注"
             :show-overflow-tooltip="true"
           >
           </el-table-column>
 
           <el-table-column
-            prop="backGround"
+            prop="departmentNameList"
             align="center"
-            label="事件内容"
-            min-width="160"
+            label="当前处理部门	"
             :show-overflow-tooltip="true"
           >
           </el-table-column>
 
           <el-table-column
-            prop="publicReply"
+            prop="detentionDays"
             align="center"
-            min-width="160"
-            label="办理结果(结案说明)"
+            label="滞留工作日	"
             :show-overflow-tooltip="true"
           >
-            <template slot-scope="scope">
-              {{ scope.row.publicReply }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="urlList"
-            align="center"
-            label="图片	"
-          >
-            <template slot-scope="scope">
-              <el-image v-if="scope.row.urlList&&scope.row.urlList.length>0"
-                        style="width: 40px; height: 40px"
-                        :src="scope.row.urlList[0]"
-                        :preview-src-list="scope.row.urlList">
-              </el-image>
-              <span v-else></span>
-            </template>
           </el-table-column>
-          <el-table-column
-            prop="origin"
-            align="center"
-            label="上报渠道"
-            width="120"
-          />
-            <!-- <template slot-scope="scope">
-              <span v-if="scope.row.origin == 'agency'">网格上报</span>
-              <span v-else-if="scope.row.origin == 'ic_event'">居民上报</span>
-              <span v-else-if="scope.row.origin == 'work_event'">巡查上报</span>
-              <span v-else-if="scope.row.origin == 'issue'">议题上报</span>
-            </template>
-          </el-table-column> -->
-
-          <el-table-column
-            prop="address"
-            align="center"
-            label="地址	"
-            :show-overflow-tooltip="true"
-          />
-          <el-table-column
-            prop="status"
-            align="center"
-            label="状态	"
-            width="70"
-          />
-            <!-- <template slot-scope="scope">
-              {{ scope.row.status == 'pending' ? '处理中' : '已结案' }}
-            </template>
-          </el-table-column> -->
 
           <el-table-column
             fixed="right"
@@ -314,7 +203,7 @@
           >
             <template slot-scope="scope">
               <el-button
-                v-if="scope.row.processable"
+                v-if="scope.row.status == 'pending' && scope.row.processable"
                 @click="handleEdit(scope.$index)"
                 type="text"
                 size="small"
@@ -382,38 +271,11 @@ import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import projectInfo from "./cpts/project-info";
 import axios from "axios";
-const _form = {
-  orgId: '',
-  orgType: '',
-  origin: '',
-  backGround: '',
-  staffName: '',
-  mobile: '',
-  startTime: '',
-  endTime: '',
-  status: '',
-  firstIdList: [],
-  secondIdList: [],
-  staffId: ''
-}
+
 export default {
   components: { projectInfo },
 
   data() {
-    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      if (this.fmData.startTime) {
-        let startTime = new Date(this.fmData.startTime)
-        return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime
-      } else {
-        return time.getTime() > nowData
-      }
-
-    }
-    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-      let nowData = Date.now()
-      return time.getTime() > nowData
-    }
     return {
       pageType: "list", // 列表list 处理dispose 详情info 议题详情issue-info
 
@@ -426,46 +288,25 @@ export default {
       optionsStatus: [
         {
           value: "pending",
-          label: "处理中",
+          label: "未结案",
         },
         {
           value: "closed",
           label: "已结案",
         },
       ],
-      qudaoArray: [
-        {
-          value: "agency",
-          label: "网格上报",
-        },
-        {
-          value: "ic_event",
-          label: "居民上报",
-        },
-        {
-          value: "work_event",
-          label: "巡查上报",
-        },
-        {
-          value: "issue",
-          label: "议题上报",
-        }
-      ],
-      orgId: '',
-      checkStaffId: false,
-      exportLoading: false,
-      cateOptions: [],
-      optionsA: [],
-      fmData: { ..._form },
-      endPickerOptions: {
-        disabledDate: endDisabledDate
-      },
-      startPickerOptions: {
-        disabledDate: startDisabledDate
+
+      fmData: {
+        title: "",
+        status: "",
+        startDate: "",
+        endDate: "",
+        date: ["", ""],
       },
+
       importBtnTitle: "导入",
       importLoading: false,
-      eventTypeCheck: [],
+
       currentProject: {
         projectId: "",
         userId: "",
@@ -476,8 +317,8 @@ export default {
   computed: {
     maxTableHeight() {
       return this.$store.state.inIframe
-        ? this.clientHeight - 410 + this.iframeHeigh
-        : this.clientHeight - 410;
+        ? this.clientHeight - 360 + this.iframeHeigh
+        : this.clientHeight - 360;
     },
     ...mapGetters(["clientHeight", "iframeHeight"]),
   },
@@ -494,8 +335,6 @@ export default {
   },
   mounted() {
     this.getTableData();
-    this.getGridList()
-    this.getCateOptions()
   },
   methods: {
     async handleExportModule() {
@@ -571,12 +410,12 @@ export default {
         message: "导入中，请到系统管理-导入记录中查看进度",
         duration: 0,
       });
-      const fmData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
-      fmData.append("file", file.file); //添加文件对象
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
       await this.$http
         .post(
           "/heart/iccommunityselforganization/importcommunityselforganization",
-          fmData
+          formData
         )
         .then((res) => {
           console.log("res-up", res);
@@ -595,7 +434,7 @@ export default {
       //     window.SITE_CONFIG["apiURL"] +
       //     "/heart/iccommunityselforganization/importcommunityselforganization",
       //   method: "post",
-      //   data: fmData,
+      //   data: formData,
       //   // responseType: "blob",
       // })
       //   .then((res) => {
@@ -617,48 +456,7 @@ export default {
       this.importBtnTitle = "导入";
       this.$refs.upload.clearFiles();
     },
-    handleCalscChange(val) {
-      console.log('val-----', val)
-      const arr = val.split('-')
-      this.fmData.orgId = arr[0]
-      this.fmData.orgType = arr[1] === 'grid' ? 'grid' : 'agency'
-    },
-    handleCheckbox(val) {
-      const { user } = this.$store.state
-      console.log('val---', val)
-      if (val) this.fmData.staffId = user.id
-      else this.fmData.staffId = ''
-    },
-    handleEventType(val) {
-      // console.log('val-----eee', val)
-      console.log('nodes---', this.$refs.cascaderEvent.getCheckedNodes())
-      const nodes = this.$refs.cascaderEvent.getCheckedNodes()
-      this.fmData.firstIdList = []
-      this.fmData.secondIdList = []
-      let level1 = nodes.filter(item => item.level === 1)
-      let level2 = nodes.filter(item => item.level === 2)
-      console.log('level2----1', level2)
-      level1.forEach(item => {
-        console.log('level2----2', level2)
-        if (item.hasChildren) {
-          for (let i = level2.length - 1; i >= 0; i--) {
-            if (level2[i].parent.value === item.value) level2.splice(i, 1)
-          }
-        }
-      })
-      this.fmData.firstIdList = level1.map(item => item.value)
-      this.fmData.secondIdList = level2.map(item => item.value)
-    },
-    cascaderClick (node, nodeData) {
-      console.log('node---', node)
-      console.log('nodeData---', nodeData)
-      // this.fmData.agencyId = nodeData.objectId;
-      // this.fmData.level = nodeData.objectType
-      // this.$refs.cascaderUnit.checkedValue = nodeData.id;
-      // this.$refs.cascaderUnit.computePresentText();
-      // this.$refs.cascaderUnit.toggleDropDownVisible(false);
 
-    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageSize = val;
@@ -672,26 +470,18 @@ export default {
     },
 
     handleSearch(val) {
-      console.log(JSON.stringify(this.fmData));
+      console.log(this.fmData);
       this.pageNo = 1;
       this.getTableData();
     },
     resetForm(formName) {
       this.$refs[formName].resetFields();
-      this.fmData = {
-        ..._form
-      }
-      this.eventTypeCheck = []
-      this.orgId = ''
-      this.checkStaffId = false
       this.handleSearch();
     },
 
     async handleChu() {
-      // const url = "/gov/project/project/project-list-export";
-      const url = '/gov/project/project/orgprojectexport'
+      const url = "/gov/project/project/project-list-export";
       const { pageSize, pageNo, fmData } = this;
-      this.exportLoading = true
       axios({
         url: window.SITE_CONFIG["apiURL"] + url,
         method: "post",
@@ -717,10 +507,8 @@ export default {
           aLink.click();
           document.body.removeChild(aLink); //下载完成移除元素
           window.URL.revokeObjectURL(url); //释放掉blob对象
-          this.exportLoading = false
         })
         .catch((err) => {
-          this.exportLoading = false
           console.log("获取导出情失败", err);
           return this.$message.error("网络错误");
         });
@@ -775,8 +563,7 @@ export default {
 
     async getTableData() {
       // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
-      // const url = "/gov/project/project/project-list";
-      const url ='/gov/project/project/orgprojectlist'
+      const url = "/gov/project/project/project-list";
       const { pageSize, pageNo, fmData } = this;
       const { data, code, msg } = await requestPost(url, {
         pageSize,
@@ -788,71 +575,12 @@ export default {
         this.total = data.total || 0;
         this.tableData = data.list
           ? data.list.map((item) => {
-              return {
-                ...item,
-                urlList: item.urlList && item.urlList.map(n => n.url)
-              };
+              return item;
             })
           : [];
       } else {
       }
     },
-    async getCateOptions() {
-      const url = "/gov/issue/issueprojectcategorydict/list";
-
-      const { data, code, msg } = await requestPost(url, {});
-
-      if (code === 0) {
-        // this.cateOptions = data.map((item) => {
-        //   item.subCategory.forEach((subitem) => {
-        //     delete subitem.subCategory;
-        //   });
-        //   return item;
-        // });
-        this.cateOptions = this.deepTree(data, 'subCategory')
-      } else {
-        this.$message.error(msg);
-      }
-    },
-    getGridList() {
-      const { user } = this.$store.state
-      this.dataListLoading = true
-      const params = {
-        agencyId: user.agencyId,
-        client: 'gov'
-      }
-      this.$http
-        // .post('/gov/org/userhouse/service/serviceScopeTree')
-        // .post('/data/aggregator/org/agencytree', params)
-        // .post('/gov/org/customeragency/staffinagencylist')
-        .post('/gov/org/customeragency/agencygridtree')
-        .then(({ data: res }) => {
-          if (res.code !== 0) {
-            return this.$message.error(res.msg)
-          } else {
-            console.log('获取查询详情成功', res.data)
-            // let { agencyList, subAgencyList } = res.data
-            let _arr = []
-            _arr.push(res.data)
-            this.optionsA = this.deepTree(_arr, 'subAgencyList')
-            console.log('optionsA----', this.optionsA)
-          }
-        })
-        .catch(() => {
-          return this.$message.error('网络错误')
-        })
-    },
-    deepTree(arr, child) {
-      if (Array.isArray(arr) && arr.length > 0) {
-        return arr.map(item => {
-          // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
-          return {
-            ...item,
-            [child]: item[child] && item[child].length > 0 && this.deepTree(item[child], child) || null
-          }
-        })
-      }
-    }
   },
 };
 </script>
@@ -934,13 +662,6 @@ export default {
   .resi-cell-select:last-child {
     margin-right: 0;
   }
-  .item_width_2 {
-    width: 200px;
-  }
-}
-
-.data-tag {
-  margin: 0 5px;
 }
 
 .mt10 {
diff --git a/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
new file mode 100644
index 000000000..608d5e6dd
--- /dev/null
+++ b/src/views/modules/shequzhili/xiangmu/xiangmu-ling.vue
@@ -0,0 +1,949 @@
+<template>
+  <div class="resi-container">
+    <div class="g-page" v-show="pageType == 'list'">
+      <el-card ref="searchCard" class="search-card">
+        <el-form
+          ref="searchForm"
+          :inline="true"
+          :model="fmData"
+          :label-width="'100px'"
+          class="demo-form-inline"
+        >
+          <div>
+
+            <el-form-item label="所属组织" label-width="100px"
+                      prop="orgId">
+              <el-cascader ref="cascaderUnit" v-model="orgId" 
+                :options="optionsA" 
+                :props="{ checkStrictly: true, 
+                emitPath: false,children:'subAgencyList',label:'agencyName', value: 'orgLevel'}" 
+                clearable 
+                @change="handleCalscChange"/>
+            </el-form-item>
+            <el-form-item label="上报渠道"
+                          prop="origin">
+              <el-select v-model="fmData.origin"
+                         placeholder="请选择"
+                         size="small"
+                         clearable
+                         class="item_width_2">
+                <el-option v-for="item in qudaoArray"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="上报人"
+                          prop="staffName">
+              <el-input v-model="fmData.staffName"
+                        class="item_width_2"
+                        size="small"
+                        clearable
+                        placeholder="请输入">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="手机号"
+                          prop="mobile">
+              <el-input v-model="fmData.mobile"
+                        class="item_width_2"
+                        size="small"
+                        clearable
+                        placeholder="请输入">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="事件内容"
+                          prop="backGround">
+              <el-input v-model="fmData.backGround"
+                        class="item_width_2"
+                        size="small"
+                        clearable
+                        placeholder="请输入">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="事件类型"
+                          prop="firstIdList">
+              <el-cascader ref="cascaderEvent" v-model="eventTypeCheck" :options="cateOptions"
+                collapse-tags 
+                :show-all-levels="false"
+                :props="{ 
+                  multiple: true,
+                  checkStrictly: false,
+                  emitPath: false,
+                  children:'subCategory',
+                  label:'name',
+                  value:'id'
+                }" clearable class="item_width_2" @change="handleEventType" />
+                <!-- <template slot-scope="{ node, data }">
+                  <div @click="cascaderClick(node, data)">
+                    <span>{{ data.name }}</span>
+                  </div>
+                </template>
+              </el-cascader> -->
+            </el-form-item>
+            <el-form-item label="事件状态"
+                          prop="status">
+              <el-select class="item_width_2"
+                         v-model="fmData.status"
+                         placeholder="全部"
+                         size="small"
+                         clearable>
+                <el-option v-for="item in optionsStatus"
+                           :key="item.value"
+                           :label="item.label"
+                           :value="item.value">
+                </el-option>
+              </el-select>
+
+            </el-form-item>
+            
+            <el-form-item label="上报时间"
+                          prop="startTime">
+              <el-date-picker v-model="fmData.startTime"
+                              :picker-options="startPickerOptions"
+                              class="item_width_2"
+                              size="small"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              placeholder="开始时间">
+              </el-date-picker>
+              <span class="data-tag">至</span>
+              <el-date-picker v-model="fmData.endTime"
+                              :picker-options="endPickerOptions"
+                              class="item_width_2 data-tag"
+                              size="small"
+                              type="datetime"
+                              value-format="yyyy-MM-dd HH:mm:ss"
+                              placeholder="结束时间">
+              </el-date-picker>
+            </el-form-item>
+
+            <el-form-item label="处置选项"
+                          prop="staffId">
+              <el-checkbox v-model="checkStaffId" @change="handleCheckbox"></el-checkbox>
+
+            </el-form-item>
+            <el-button style="margin-left:30px"
+                       size="small"
+                       class="diy-button--search"
+                       @click="handleSearch">查询</el-button>
+            <el-button style="margin-left:10px"
+                       size="small"
+                       class="diy-button--reset"
+                       @click="resetForm('searchForm')">重置</el-button>
+          </div>
+        </el-form>
+      </el-card>
+
+      <el-card class="resi-card-table">
+        <div class="resi-row-btn">
+          <el-button
+            v-if="false"
+            class="diy-button--add"
+            size="small"
+            @click="handleAdd"
+            >新增</el-button
+          >
+          <el-button
+            v-if="false"
+            class="diy-button--export"
+            size="small"
+            @click="handleExportModule('room')"
+            >下载模板</el-button
+          >
+          <el-upload
+            v-if="false"
+            ref="upload"
+            class="upload-btn"
+            action="uploadUlr"
+            :limit="1"
+            :accept="'.xls,.xlsx'"
+            :with-credentials="true"
+            :show-file-list="false"
+            :auto-upload="true"
+            :on-progress="handleProgress"
+            :on-success="handleExcelSuccess"
+            :before-upload="beforeExcelUpload"
+            :http-request="uploadHttpRequest"
+          >
+            <el-button
+              size="small"
+              class="diy-button--delete"
+              :loading="importLoading"
+              >{{ importBtnTitle }}</el-button
+            >
+          </el-upload>
+
+          <el-button @click="handleChu" class="diy-button--reset" size="small"
+            :loading="exportLoading">导出</el-button
+          >
+        </div>
+
+        <el-table
+          :data="tableData"
+          border
+          style="width: 100%"
+          class="resi-table"
+          :height="maxTableHeight"
+        >
+          <el-table-column
+            label="序号"
+            fixed="left"
+            type="index"
+            align="center"
+            width="50"
+          />
+          <el-table-column
+            prop="gridName"
+            align="center"
+            label="所属组织/网格"
+            min-width="140"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="firstName"
+            label="事件类型"
+            min-width="140"
+            align="center"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.firstName + '-' + scope.row.secondName }}
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="staffName"
+            width="100"
+            align="center"
+            label="报事人"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="mobile"
+            align="center"
+            label="手机号"
+            width="140"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="createdTime"
+            align="center"
+            label="上报时间"
+            width="160"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="backGround"
+            align="center"
+            label="事件内容"
+            min-width="160"
+            :show-overflow-tooltip="true"
+          >
+          </el-table-column>
+
+          <el-table-column
+            prop="publicReply"
+            align="center"
+            min-width="160"
+            label="办理结果(结案说明)"
+            :show-overflow-tooltip="true"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.publicReply }}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="urlList"
+            align="center"
+            label="图片	"
+          >
+            <template slot-scope="scope">
+              <el-image v-if="scope.row.urlList&&scope.row.urlList.length>0"
+                        style="width: 40px; height: 40px"
+                        :src="scope.row.urlList[0]"
+                        :preview-src-list="scope.row.urlList">
+              </el-image>
+              <span v-else></span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="origin"
+            align="center"
+            label="上报渠道"
+            width="120"
+          />
+            <!-- <template slot-scope="scope">
+              <span v-if="scope.row.origin == 'agency'">网格上报</span>
+              <span v-else-if="scope.row.origin == 'ic_event'">居民上报</span>
+              <span v-else-if="scope.row.origin == 'work_event'">巡查上报</span>
+              <span v-else-if="scope.row.origin == 'issue'">议题上报</span>
+            </template>
+          </el-table-column> -->
+
+          <el-table-column
+            prop="address"
+            align="center"
+            label="地址	"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            prop="status"
+            align="center"
+            label="状态	"
+            width="70"
+          />
+            <!-- <template slot-scope="scope">
+              {{ scope.row.status == 'pending' ? '处理中' : '已结案' }}
+            </template>
+          </el-table-column> -->
+
+          <el-table-column
+            fixed="right"
+            label="操作"
+            align="center"
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-button
+                v-if="scope.row.processable"
+                @click="handleEdit(scope.$index)"
+                type="text"
+                size="small"
+                class="div-table-button--edit"
+                >处理</el-button
+              >
+
+              <el-button
+                v-else
+                @click="handleWatch(scope.$index)"
+                type="text"
+                size="small"
+                >查看</el-button
+              >
+
+              <el-popconfirm
+                v-if="false"
+                title="删除之后无法回复，确认删除？"
+                @onConfirm="handleDel(scope.row, scope.$index)"
+                @confirm="handleDel(scope.row, scope.$index)"
+              >
+                <el-button
+                  slot="reference"
+                  type="text"
+                  size="small"
+                  class="div-table-button--delete"
+                  style="margin-left: 10px"
+                  >删除</el-button
+                >
+              </el-popconfirm>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <div>
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page.sync="pageNo"
+            :page-sizes="[20, 50, 100, 200]"
+            :page-size="parseInt(pageSize)"
+            layout="sizes, prev, pager, next, total"
+            :total="total"
+          >
+          </el-pagination>
+        </div>
+      </el-card>
+    </div>
+
+    <div class="g-page" v-if="pageType == 'edit' || pageType == 'info'">
+      <project-info
+        ref="eleEditForm"
+        :type="pageType"
+        :projectId="currentProject.projectId"
+        @close="handleClose"
+        @afterEdit="handleEditSuccess"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { requestPost } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { mapGetters } from "vuex";
+import projectInfo from "./cpts/project-info";
+import axios from "axios";
+const _form = {
+  orgId: '',
+  orgType: '',
+  origin: '',
+  backGround: '',
+  staffName: '',
+  mobile: '',
+  startTime: '',
+  endTime: '',
+  status: '',
+  firstIdList: [],
+  secondIdList: [],
+  staffId: ''
+}
+export default {
+  components: { projectInfo },
+
+  data() {
+    let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now()
+      if (this.fmData.startTime) {
+        let startTime = new Date(this.fmData.startTime)
+        return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime
+      } else {
+        return time.getTime() > nowData
+      }
+
+    }
+    let startDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
+      let nowData = Date.now()
+      return time.getTime() > nowData
+    }
+    return {
+      pageType: "list", // 列表list 处理dispose 详情info 议题详情issue-info
+
+      pageNo: 1,
+      pageSize: window.localStorage.getItem("pageSize") || 20,
+      total: 1,
+
+      tableData: [],
+
+      optionsStatus: [
+        {
+          value: "pending",
+          label: "处理中",
+        },
+        {
+          value: "closed",
+          label: "已结案",
+        },
+      ],
+      qudaoArray: [
+        {
+          value: "agency",
+          label: "网格上报",
+        },
+        {
+          value: "ic_event",
+          label: "居民上报",
+        },
+        {
+          value: "work_event",
+          label: "巡查上报",
+        },
+        {
+          value: "issue",
+          label: "议题上报",
+        }
+      ],
+      orgId: '',
+      checkStaffId: false,
+      exportLoading: false,
+      cateOptions: [],
+      optionsA: [],
+      fmData: { ..._form },
+      endPickerOptions: {
+        disabledDate: endDisabledDate
+      },
+      startPickerOptions: {
+        disabledDate: startDisabledDate
+      },
+      importBtnTitle: "导入",
+      importLoading: false,
+      eventTypeCheck: [],
+      currentProject: {
+        projectId: "",
+        userId: "",
+        categoryCodes: [],
+      },
+    };
+  },
+  computed: {
+    maxTableHeight() {
+      return this.$store.state.inIframe
+        ? this.clientHeight - 410 + this.iframeHeigh
+        : this.clientHeight - 410;
+    },
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+  },
+  watch: {
+    "fmData.date": function (val) {
+      if (Array.isArray(val) && val.length == 2) {
+        this.fmData.startDate = val[0].split("-").join("");
+        this.fmData.endDate = val[1].split("-").join("");
+      } else {
+        this.fmData.startDate = "";
+        this.fmData.endDate = "";
+      }
+    },
+  },
+  mounted() {
+    this.getTableData();
+    this.getGridList()
+    this.getCateOptions()
+  },
+  methods: {
+    async handleExportModule() {
+      let url = "/heart/iccommunityselforganization/import-template-download";
+
+      let params = {};
+      await this.$http({
+        method: "POST",
+        url,
+        responseType: "blob",
+        data: params,
+      })
+        .then((res) => {
+          // this.download(res.data, title + '.xls')
+          if (res.headers["content-disposition"]) {
+            let fileName = window.decodeURI(
+              res.headers["content-disposition"].split(";")[1].split("=")[1]
+            );
+            console.log("filename", fileName);
+            let blob = new Blob([res.data], {
+              type: "application/vnd.ms-excel",
+            });
+            var url = window.URL.createObjectURL(blob);
+            var aLink = document.createElement("a");
+            aLink.style.display = "none";
+            aLink.href = url;
+            aLink.setAttribute("download", fileName);
+            document.body.appendChild(aLink);
+            aLink.click();
+            document.body.removeChild(aLink); //下载完成移除元素
+            window.URL.revokeObjectURL(url); //释放掉blob对象
+          } else this.$message.error("下载失败");
+        })
+        .catch((err) => {
+          console.log("err", err);
+          return this.$message.error("网络错误");
+        });
+    },
+    // 上传大图标成功
+    handleExcelSuccess(res, file) {
+      if (res.code === 0 && res.msg === "success") {
+        console.log("resss---ppp", res);
+      } else {
+        this.$message.error(res.msg);
+      }
+    },
+    handleProgress(event, file, fileList) {
+      console.log("percentage", file.percentage);
+    },
+
+    beforeExcelUpload(file) {
+      console.log("file", file);
+      const isType = file.type === "application/vnd.ms-excel";
+      const isTypeComputer =
+        file.type ===
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+      const fileType = isType || isTypeComputer;
+      const isLt1M = file.size / 1024 / 1024 < 10;
+      if (!fileType) {
+        this.$message.error("上传文件只能是xls/xlsx格式！");
+      }
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+      }
+      return fileType && isLt1M;
+    },
+    async uploadHttpRequest(file) {
+      this.importLoading = true;
+      this.importBtnTitle = "正在上传中...";
+      this.$message({
+        showClose: true,
+        message: "导入中，请到系统管理-导入记录中查看进度",
+        duration: 0,
+      });
+      const fmData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      fmData.append("file", file.file); //添加文件对象
+      await this.$http
+        .post(
+          "/heart/iccommunityselforganization/importcommunityselforganization",
+          fmData
+        )
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            // this.$message.success('导入成功')
+            this.getTableData();
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
+      // axios({
+      //   url:
+      //     window.SITE_CONFIG["apiURL"] +
+      //     "/heart/iccommunityselforganization/importcommunityselforganization",
+      //   method: "post",
+      //   data: fmData,
+      //   // responseType: "blob",
+      // })
+      //   .then((res) => {
+      //     this.importLoading = false;
+      //     this.importBtnTitle = "导入";
+      //     console.log("resresresresresresres", res);
+
+      //     this.getTableData();
+      //     if (res.data.code == 0) {
+      //       return this.$message.success(res.data.data || "导入成功");
+      //     } else {
+      //       return this.$message.error(res.data.msg);
+      //     }
+      //   })
+      //   .catch((err) => {
+      //     console.log("失败", err);
+      //   });
+      this.importLoading = false;
+      this.importBtnTitle = "导入";
+      this.$refs.upload.clearFiles();
+    },
+    handleCalscChange(val) {
+      console.log('val-----', val)
+      const arr = val.split('-')
+      this.fmData.orgId = arr[0]
+      this.fmData.orgType = arr[1] === 'grid' ? 'grid' : 'agency'
+    },
+    handleCheckbox(val) {
+      const { user } = this.$store.state
+      console.log('val---', val)
+      if (val) this.fmData.staffId = user.id
+      else this.fmData.staffId = ''
+    },
+    handleEventType(val) {
+      // console.log('val-----eee', val)
+      console.log('nodes---', this.$refs.cascaderEvent.getCheckedNodes())
+      const nodes = this.$refs.cascaderEvent.getCheckedNodes()
+      this.fmData.firstIdList = []
+      this.fmData.secondIdList = []
+      let level1 = nodes.filter(item => item.level === 1)
+      let level2 = nodes.filter(item => item.level === 2)
+      console.log('level2----1', level2)
+      level1.forEach(item => {
+        console.log('level2----2', level2)
+        if (item.hasChildren) {
+          for (let i = level2.length - 1; i >= 0; i--) {
+            if (level2[i].parent.value === item.value) level2.splice(i, 1)
+          }
+        }
+      })
+      this.fmData.firstIdList = level1.map(item => item.value)
+      this.fmData.secondIdList = level2.map(item => item.value)
+    },
+    cascaderClick (node, nodeData) {
+      console.log('node---', node)
+      console.log('nodeData---', nodeData)
+      // this.fmData.agencyId = nodeData.objectId;
+      // this.fmData.level = nodeData.objectType
+      // this.$refs.cascaderUnit.checkedValue = nodeData.id;
+      // this.$refs.cascaderUnit.computePresentText();
+      // this.$refs.cascaderUnit.toggleDropDownVisible(false);
+
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      window.localStorage.setItem("pageSize", val);
+      this.getTableData();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.pageNo = val;
+      this.getTableData();
+    },
+
+    handleSearch(val) {
+      console.log(JSON.stringify(this.fmData));
+      this.pageNo = 1;
+      this.getTableData();
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.fmData = {
+        ..._form
+      }
+      this.eventTypeCheck = []
+      this.orgId = ''
+      this.checkStaffId = false
+      this.handleSearch();
+    },
+
+    async handleChu() {
+      // const url = "/gov/project/project/project-list-export";
+      const url = '/gov/project/project/orgprojectexport'
+      const { pageSize, pageNo, fmData } = this;
+      this.exportLoading = true
+      axios({
+        url: window.SITE_CONFIG["apiURL"] + url,
+        method: "post",
+        data: {
+          // pageSize,
+          // pageNo,
+          ...fmData,
+        },
+        responseType: "blob",
+      })
+        .then((res) => {
+          let fileName = window.decodeURI(
+            res.headers["content-disposition"].split(";")[1].split("=")[1]
+          );
+          console.log("filename", fileName);
+          let blob = new Blob([res.data], { type: "application/vnd.ms-excel" });
+          var url = window.URL.createObjectURL(blob);
+          var aLink = document.createElement("a");
+          aLink.style.display = "none";
+          aLink.href = url;
+          aLink.setAttribute("download", fileName);
+          document.body.appendChild(aLink);
+          aLink.click();
+          document.body.removeChild(aLink); //下载完成移除元素
+          window.URL.revokeObjectURL(url); //释放掉blob对象
+          this.exportLoading = false
+        })
+        .catch((err) => {
+          this.exportLoading = false
+          console.log("获取导出情失败", err);
+          return this.$message.error("网络错误");
+        });
+    },
+
+    async handleAdd() {},
+    async handleWatch(rowIndex) {
+      let item = this.tableData[rowIndex];
+      this.currentProject = {
+        projectId: item.projectId,
+      };
+      this.pageType = "info";
+    },
+
+    async handleEdit(rowIndex) {
+      let item = this.tableData[rowIndex];
+      this.currentProject = {
+        projectId: item.projectId,
+      };
+      this.pageType = "edit";
+    },
+
+    handleClose() {
+      this.pageType = "list";
+      this.currentProject = {
+        projectId: "",
+      };
+    },
+
+    handleEditSuccess() {
+      this.handleClose();
+      this.getTableData();
+    },
+
+    async handleDel(rowData, rowIndex) {
+      console.log(rowData, rowIndex);
+      const url =
+        "/heart/iccommunityselforganization/delcommunityselforganization";
+      const { tableData } = this;
+
+      const { data, code, msg } = await requestPost(url, {
+        orgId: tableData[rowIndex].orgId,
+      });
+
+      if (code === 0) {
+        this.$message.success("删除成功！");
+        this.getTableData();
+      } else {
+        this.$message.success("操作失败！");
+      }
+    },
+
+    async getTableData() {
+      // const url = "http://yapi.elinkservice.cn/mock/245/gov/project/project/project-list";
+      // const url = "/gov/project/project/project-list";
+      const url ='/gov/project/project/orgprojectlist'
+      const { pageSize, pageNo, fmData } = this;
+      const { data, code, msg } = await requestPost(url, {
+        pageSize,
+        pageNo,
+        ...fmData,
+      });
+      if (code === 0) {
+        console.log("列表请求成功！！！！！！！！！！！！！！");
+        this.total = data.total || 0;
+        this.tableData = data.list
+          ? data.list.map((item) => {
+              return {
+                ...item,
+                urlList: item.urlList && item.urlList.map(n => n.url)
+              };
+            })
+          : [];
+      } else {
+      }
+    },
+    async getCateOptions() {
+      const url = "/gov/issue/issueprojectcategorydict/list";
+
+      const { data, code, msg } = await requestPost(url, {});
+
+      if (code === 0) {
+        // this.cateOptions = data.map((item) => {
+        //   item.subCategory.forEach((subitem) => {
+        //     delete subitem.subCategory;
+        //   });
+        //   return item;
+        // });
+        this.cateOptions = this.deepTree(data, 'subCategory')
+      } else {
+        this.$message.error(msg);
+      }
+    },
+    getGridList() {
+      const { user } = this.$store.state
+      this.dataListLoading = true
+      const params = {
+        agencyId: user.agencyId,
+        client: 'gov'
+      }
+      this.$http
+        // .post('/gov/org/userhouse/service/serviceScopeTree')
+        // .post('/data/aggregator/org/agencytree', params)
+        // .post('/gov/org/customeragency/staffinagencylist')
+        .post('/gov/org/customeragency/agencygridtree')
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            // let { agencyList, subAgencyList } = res.data
+            let _arr = []
+            _arr.push(res.data)
+            this.optionsA = this.deepTree(_arr, 'subAgencyList')
+            console.log('optionsA----', this.optionsA)
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    deepTree(arr, child) {
+      if (Array.isArray(arr) && arr.length > 0) {
+        return arr.map(item => {
+          // if (child === 'subAgencyList') item.value = item.orgType + '-' + item.orgId
+          return {
+            ...item,
+            [child]: item[child] && item[child].length > 0 && this.deepTree(item[child], child) || null
+          }
+        })
+      }
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
+.resi-table {
+  ::v-deep .el-button--text {
+    text-decoration: underline;
+  }
+}
+.resi-card-table {
+  margin-top: 20px;
+}
+.resi-row-btn {
+  margin-bottom: 13px;
+  .upload-btn {
+    display: inline-block;
+    margin: 0 10px;
+  }
+}
+
+.resi-btns {
+  margin-top: 20px;
+  text-align: center;
+}
+
+.resi-container .resi-card {
+  position: relative;
+  overflow: visible;
+}
+
+.demo-form-inline {
+  // display: flex;
+  // align-items: center;
+  // margin-bottom: 20px;
+
+  .resi-cell-label {
+    flex-shrink: 0;
+    min-width: 0;
+    box-sizing: border-box;
+    margin-right: 15px;
+    // text-align: right;
+    // line-height: 32;
+  }
+  .resi-cell-label1 {
+    width: max-content;
+  }
+  .resi-cell-value-radio {
+    display: flex;
+    align-items: center;
+    min-height: 32px;
+  }
+  .resi-cell-input {
+    width: 200px;
+  }
+  .resi-cell--daterange {
+    max-width: 260px;
+  }
+  .resi-cell-select {
+    width: 200px;
+    box-sizing: border-box;
+    margin-right: 10px;
+    &-middle {
+      width: 130px;
+    }
+    &-small {
+      width: 88px;
+    }
+  }
+  .resi-cell-select:last-child {
+    margin-right: 0;
+  }
+  .item_width_2 {
+    width: 200px;
+  }
+}
+
+.data-tag {
+  margin: 0 5px;
+}
+
+.mt10 {
+  margin-top: 10px;
+}
+</style>

From c69cf57afc65de34139c0377a5900477b41a3cce Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 8 Aug 2022 13:47:48 +0800
Subject: [PATCH 3/6] dd

---
 .../modules/shequzhili/xiangmu/cpts/project-info.vue      | 3 +--
 .../visual/communityGovern/shijianchuli/event-info.vue    | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 4860e5939..53ea7053c 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -335,9 +335,8 @@
                 >
                 </el-input>
               </el-form-item>
-
+              <!-- v-if="fmData.operateType != 'close'" -->
               <el-form-item
-                v-if="fmData.operateType != 'close'"
                 label="图片/附件："
                 prop="internalFile"
               >
diff --git a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
index 2aed96664..8668aad4b 100644
--- a/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
+++ b/src/views/modules/visual/communityGovern/shijianchuli/event-info.vue
@@ -97,13 +97,13 @@
                   <div class="detail-value">{{ item.departmentName }}</div>
                 </div>
 
-                <!-- <div class="detail"
-                     v-if="item.processName != '转项目' && item.wantServiceTime">
+                <div class="detail"
+                     v-if="item.processName != '转项目' && item.publicReply">
                   <div class="detail-field">说 明：</div>
                   <div class="detail-value">
-                    <fold-text :row="3">{{ item.wantServiceTime }}</fold-text>
+                    <fold-text :row="3">{{ item.publicReply }}</fold-text>
                   </div>
-                </div> -->
+                </div>
 
                 <div class="detail"
                      v-if="item.processName != '转项目' && item.internalRemark">

From f9862ee9bc5776179ceb07dd8b4955956f67bc39 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 8 Aug 2022 13:50:32 +0800
Subject: [PATCH 4/6] dd

---
 src/views/modules/shequzhili/xiangmu/cpts/project-info.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
index 53ea7053c..a174146c8 100644
--- a/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
+++ b/src/views/modules/shequzhili/xiangmu/cpts/project-info.vue
@@ -335,7 +335,7 @@
                 >
                 </el-input>
               </el-form-item>
-              <!-- v-if="fmData.operateType != 'close'" -->
+              
               <el-form-item
                 label="图片/附件："
                 prop="internalFile"

From f93364007cd74c9b6d02984d80c748b6ae563602 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Tue, 9 Aug 2022 16:53:18 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shequzhili/statics/index.vue      | 462 ++++++++++++++++++
 1 file changed, 462 insertions(+)
 create mode 100644 src/views/modules/shequzhili/statics/index.vue

diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue
new file mode 100644
index 000000000..396935fda
--- /dev/null
+++ b/src/views/modules/shequzhili/statics/index.vue
@@ -0,0 +1,462 @@
+<template>
+  <div class="mode-block resi-container">
+    <el-card ref="searchCard" class="search-card">
+      <el-form ref="searchForm" :inline="true" :model="dataForm" size="small">
+        <el-form-item label="所属组织" label-width="100px"
+                      prop="agencyId">
+          <el-cascader ref="cascaderUnit" v-model="dataForm.agencyId" :options="optionsA" :props="{ checkStrictly: true, emitPath: false,children:'subAgencyList',label:'agencyName',value:'agencyId'}" clearable />
+            <!-- <template slot-scope="{ node, data }">
+              <div @click="cascaderClick(data)">
+                <span>{{ data.objectName }}</span>
+                <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+              </div>
+            </template> -->
+        </el-form-item>
+        <el-form-item label="统计类型"
+                      prop="startTime"  label-width="100px">
+          <el-radio v-model="dataForm.type" label="end" @change="handleRadioCHange">截止累计值</el-radio>
+          <el-radio v-model="dataForm.type" label="Interval" @change="handleRadioCHange">区间新增值</el-radio>     
+          <el-date-picker v-if="dataForm.type == 'end'" 
+            v-model="dataForm.startTime"
+            type="datetime"
+            clearable
+            size="small"
+            :picker-options="pickerOptions"
+            value-format="yyyyMMddHHmmss" 
+          />     
+          <el-date-picker v-if="dataForm.type == 'Interval'" v-model="timeRange"
+            type="datetimerange"
+            clearable
+            size="small"
+            :picker-options="pickerOptions"
+            range-separator="至"
+            start-placeholder="选择日期"
+            end-placeholder="选择日期"
+            value-format="yyyy-MM-dd HH:mm:ss" 
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="small" class="diy-button--search" @click="handleSearch">查询</el-button>
+          <el-button
+            class="diy-button--reset"
+            size="small"
+            @click="resetForm('searchForm')"
+            >重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="resi-card-table">
+      <div class="resi-row-btn">
+        <el-button @click="totalHandle"
+                    class="diy-button--add"
+                    size="small">总计</el-button>
+        <el-button @click="exportHandle"
+                    class="diy-button--reset"
+                    size="small" :loading="exportLoading">导出</el-button>
+      </div>
+      <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border  style="width: 100%"
+      :height="tableHeight" show-summary>
+        <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
+        <el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column min-width="100" prop="resiUserCount" label="注册居民数" header-align="center" align="center" >
+          <!-- <template slot-scope="scope">
+            <span v-if="scope.row.orgType==='agency'"><a class="name-a" style="color: #2195fe;" @click="handleClick(scope.row)">{{scope.row.orgName}}</a></span>
+            <span v-else>{{scope.row.orgName}}</span>
+          </template> -->
+        </el-table-column>
+        <el-table-column min-width="100" prop="partyMemberCount" label="注册党员数" header-align="center" align="center" />
+        
+        <el-table-column min-width="100" prop="icEventCount" label="事件总数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="resiEventCount" label="居民上报事件数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="pcEventCount" label="平台录入事件数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="projectCount" label="项目总数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="issueProjectCount" label="议题转项目数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="icEventProjectCount" label="事件立项数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="agencyProjectCount" label="立项数" header-align="center" align="center" />
+      </el-table>
+      <div>
+        <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="pageNo"
+          :page-sizes="[20, 50, 100, 200]"
+          :page-size="pageSize"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
+        </el-pagination>
+      </div>
+    </el-card>
+    <el-dialog
+            title="总计"
+            :visible.sync="totalVisible"
+            width="60%">
+      <template>
+        <el-table
+                :data="tableData"
+                style="width: 100%"
+                height="200">
+          <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
+        <el-table-column min-width="100" prop="resiUserCount" label="注册居民数" header-align="center" align="center" />
+        <el-table-column min-width="100" prop="partyMemberCount" label="注册党员数" header-align="center" align="center" />
+        
+        <el-table-column min-width="100" prop="icEventCount" label="事件总数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="resiEventCount" label="居民上报事件数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="pcEventCount" label="平台录入事件数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="projectCount" label="项目总数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="issueProjectCount" label="议题转项目数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="icEventProjectCount" label="事件立项数" header-align="center" align="center" />
+        <el-table-column min-width="110" prop="agencyProjectCount" label="立项数" header-align="center" align="center" />
+        </el-table>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from "vuex";
+// import AddOrUpdate from './factagencyuserhousedaily-add-or-update'
+import { dateFormats } from '@/utils/index'
+export default {
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/data/stats/factAgencyUserHouseDaily/page',
+        getDataListIsPage: true,
+        deleteURL: '/data/stats/factAgencyUserHouseDaily',
+        deleteIsBatch: true,
+        exportURL: '/data/stats/factAgencyUserHouseDaily/export'
+      },
+      exportLoading: false,
+      dataListLoading: false,
+      optionsA: [],
+      totalVisible: false,
+      pickerOptions: {
+        disabledDate(time) {
+            return time.getTime() > Date.now();
+          },
+      },
+      dataList: [],
+      timeRange: '',
+      dataForm: {
+        customerId: this.$store.state.user.customerId,
+        agencyId: '',
+        startTime: dateFormats('YYYY-mm-dd HH:MM:SS', new Date()),
+        endTime: '',
+        type: 'end'
+      },
+      total: 0,
+      tableData: [],
+      pageNo: 1,
+      pageSize: 20
+    }
+  },
+  components: {
+    // AddOrUpdate
+  },
+  created () {
+    this.getGridList()
+    this.getTableList()
+    // this.getValiheList()
+  },
+  watch: {
+    timeRange (val) {
+      if (Array.isArray(val) && val.length == 2) {
+        this.dataForm.startTime = val[0];
+        this.dataForm.endTime = val[1];
+      } else {
+        this.dataForm.startTime = "";
+        this.dataForm.endTime = "";
+      }
+    }
+  },
+  computed: {
+    ...mapGetters(["clientHeight", "iframeHeight"]),
+    tableHeight() {
+      const h = this.clientHeight - 360 + this.iframeHeigh;
+      const _h = this.clientHeight - 360;
+      return this.$store.state.inIframe ? h : _h;
+    },
+  },
+  methods: {
+    handleClick(row) {
+      this.dataForm.agencyId = row.orgId
+      this.handleSearch()
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+      this.timeRange = "";
+      this.dataForm.startTime = "";
+      this.dataForm.endTime = "";
+      this.dataForm.type = 'end';
+      this.pageNo = 1
+      this.getTableList()
+    },
+    handleSearch() {
+      this.dataForm.type = 1
+      this.pageNo = 1
+      this.getTableList()
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      this.getTableList();
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.pageNo = val;
+      this.getTableList();
+    },
+    handleRadioCHange(val) {
+      console.log('val----', val)
+      this.timeRange = ''
+      this.dataForm.startTime = ''
+      this.dataForm.endTime = ''
+      if (val == 'end') {
+        this.dataForm.startTime = dateFormats('YYYY-mm-dd HH:MM:SS', new Date())
+      }
+    },
+    exportHandle () {
+      const url = '/data/aggregator/org/orgProjectDetailList/export'
+      this.dataForm.type = 1
+      this.exportLoading = true
+      this.$http({
+        method: 'Post',
+        url,
+        responseType: 'blob',
+        data: this.dataForm
+      }).then(res => {
+        // this.download(res.data, title + '.xls')
+        if (res.headers["content-disposition"]) {
+          let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
+          console.log('filename', fileName)
+          let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
+          var url = window.URL.createObjectURL(blob)
+          var aLink = document.createElement('a')
+          aLink.style.display = 'none'
+          aLink.href = url
+          aLink.setAttribute('download', fileName)
+          document.body.appendChild(aLink)
+          aLink.click()
+          document.body.removeChild(aLink) //下载完成移除元素
+          window.URL.revokeObjectURL(url) //释放掉blob对象
+          // this.exportLoading = false
+        } else this.$message.error('下载失败')
+        this.exportLoading = false
+      }).catch(err => {
+        console.log('err', err)
+        this.exportLoading = false
+        return this.$message.error('网络错误')
+      })
+    },
+    cascaderClick (nodeData) {
+      this.dataForm.agencyId = nodeData.objectId;
+      this.dataForm.level = nodeData.objectType
+      this.$refs.cascaderUnit.checkedValue = nodeData.objectId;
+      this.$refs.cascaderUnit.computePresentText();
+      this.$refs.cascaderUnit.toggleDropDownVisible(false);
+
+    },
+    totalHandle () {
+      this.tableData = []
+      let resiUserCount = 0, 
+      partyMemberCount = 0, 
+      icEventCount = 0, 
+      resiEventCount = 0, 
+      pcEventCount = 0, 
+      projectCount = 0, 
+      issueProjectCount = 0, 
+      icEventProjectCount = 0, 
+      agencyProjectCount = 0
+      if (this.dataList.length > 0) {
+        this.dataList.forEach(item => {
+          resiUserCount += item.resiUserCount
+          partyMemberCount += item.partyMemberCount
+          icEventCount += item.icEventCount
+          resiEventCount += item.resiEventCount
+          pcEventCount += item.pcEventCount
+          projectCount += item.projectCount
+          issueProjectCount += item.issueProjectCount
+          resiUicEventProjectCountserCount += item.icEventProjectCount
+          agencyProjectCount += item.agencyProjectCount
+        })
+      }
+      
+      this.tableData.push({
+        resiUserCount, 
+        partyMemberCount, 
+        icEventCount, 
+        resiEventCount, 
+        pcEventCount, 
+        projectCount, 
+        issueProjectCount, 
+        icEventProjectCount, 
+        agencyProjectCount
+      })
+      // this.$http
+      //         .post('/data/aggregator/org/orgProjectDetailList', this.dataForm)
+      //         .then(({ data: res }) => {
+      //           if (res.code !== 0) {
+      //             return this.$message.error(res.msg)
+      //           } else {
+      //             console.log('获取查询详情成功', res.data.list)
+      //             this.tableData = res.data.list
+      //           }
+      //         })
+      //         .catch(() => {
+      //           return this.$message.error('网络错误')
+      //         })
+
+      this.totalVisible = true
+    },
+    getTableList() {
+      const { user } = this.$store.state
+      const _data = {
+        ...this.dataForm,
+        pageNo: this.pageNo,
+        pageSize: this.pageSize
+      }
+      this.$http
+        .post('/data/aggregator/datastats/nowstatsdata', _data)
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            this.dataList = res.data.list
+            this.total = res.data.total
+          }
+        })
+        .catch(() => {
+          return this.$message.error('网络错误')
+        })
+    },
+    getGridList() {
+      const { user } = this.$store.state
+      this.dataListLoading = true
+      const params = {
+        agencyId: user.agencyId,
+        client: 'gov'
+      }
+      this.$http
+        // .post('/gov/org/userhouse/service/serviceScopeTree')
+        // .post('/data/aggregator/org/agencytree', params)
+        .post('/gov/org/customeragency/staffinagencylist')
+        .then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          } else {
+            console.log('获取查询详情成功', res.data)
+            let { agencyList, subAgencyList } = res.data
+            // this.optionsA = res.data
+            // console.log(this.optionsA);
+            this.dataForm.agencyId = agencyList.agencyId
+            const _arr = [{...agencyList, subAgencyList: [...subAgencyList] }]
+            this.optionsA = this.deepTree(_arr)
+            console.log('optionsA----', this.optionsA)
+          }
+        })
+        .catch(() => {
+          this.dataListLoading = false
+          return this.$message.error('网络错误')
+        })
+        this.dataListLoading = false
+    },
+    deepTree(arr) {
+      if (Array.isArray(arr)) {
+        return arr.map(item => {
+          return {
+            ...item,
+            subAgencyList: item.subAgencyList.length > 0 && this.deepTree(item.subAgencyList) || null
+          }
+        })
+      }
+    }
+  }
+}
+</script>
+<style>
+.block{
+  position: absolute;
+  left: 0px;
+  display: inline-block;
+  width: 35px;
+  height: 50px;
+  background: #fff;
+}
+.cascader-block .el-cascader-node>.el-radio{
+  display: none;
+}
+</style>
+<style lang="scss" scoped>
+  .blacklist-reason {
+    width: 100%;
+    height: 80px;
+    border: 1px solid #e4e4e4;
+    border-radius: 4px;
+    resize: none;
+    padding: 8px;
+    box-sizing: border-box;
+  }
+</style>
+<style lang="scss" scoped>
+  @import "@/assets/scss/buttonstyle.scss";
+
+  .resi-container .resi-card-table {
+    ::v-deep .el-table th {
+      color: #fff;
+      background-color: rgba(33, 149, 254, 1);
+      // border-right: 1px solid rgba(33, 149, 254, 1);
+    }
+  }
+  .resi-table {
+    ::v-deep .el-button--text {
+      text-decoration: underline;
+    }
+    ::v-deep .btn-color-del {
+      margin-left: 10px;
+      color: rgba(213, 16, 16, 1);
+    }
+    ::v-deep .btn-color-edit {
+      color: rgba(0, 167, 169, 1);
+    }
+  }
+  .form-wr {
+    .input-width {
+      width: 260px;
+
+    }
+    .input-width-textarea {
+      width: 500px;
+    }
+    .imsg-list {
+      display: flex;
+      align-items: center;
+      .imgs-item {
+        position: relative;
+        margin-right: 10px;
+        .el-icon-delete {
+          position: absolute;
+          top: 0;
+          right: 0;
+          font-size: 18px;
+          color: red;
+          z-index: 3;
+          cursor: pointer;
+        }
+      }
+    }
+  }
+  .div-content {
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .resi-row-btn {
+    margin-bottom: 13px;
+    .upload-btn {
+      display: inline-block;
+      margin: 0 10px;
+    }
+  }
+</style>

From 6817d22353977bda33f29e3a213fea204fa14028 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 10 Aug 2022 10:18:01 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1123?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/shequzhili/statics/index.vue      | 60 ++++++++++---------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue
index 396935fda..5897a5d08 100644
--- a/src/views/modules/shequzhili/statics/index.vue
+++ b/src/views/modules/shequzhili/statics/index.vue
@@ -13,18 +13,18 @@
             </template> -->
         </el-form-item>
         <el-form-item label="统计类型"
-                      prop="startTime"  label-width="100px">
+                      prop="endTime"  label-width="100px">
           <el-radio v-model="dataForm.type" label="end" @change="handleRadioCHange">截止累计值</el-radio>
           <el-radio v-model="dataForm.type" label="Interval" @change="handleRadioCHange">区间新增值</el-radio>     
-          <el-date-picker v-if="dataForm.type == 'end'" 
-            v-model="dataForm.startTime"
+          <el-date-picker v-show="dataForm.type == 'end'" 
+            v-model="dataForm.endTime"
             type="datetime"
             clearable
             size="small"
             :picker-options="pickerOptions"
-            value-format="yyyyMMddHHmmss" 
+            value-format="yyyy-MM-dd HH:mm:ss" 
           />     
-          <el-date-picker v-if="dataForm.type == 'Interval'" v-model="timeRange"
+          <el-date-picker v-show="dataForm.type == 'Interval'" v-model="timeRange"
             type="datetimerange"
             clearable
             size="small"
@@ -58,6 +58,11 @@
       :height="tableHeight" show-summary>
         <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
         <el-table-column type="index" label="序号" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column min-width="100" prop="orgName" label="所属组织" header-align="center" align="center" >
+          <template slot-scope="scope">
+            <a class="name-a" style="color: #2195fe;" @click="handleClick(scope.row)">{{scope.row.orgName}}</a>
+          </template>
+        </el-table-column>
         <el-table-column min-width="100" prop="resiUserCount" label="注册居民数" header-align="center" align="center" >
           <!-- <template slot-scope="scope">
             <span v-if="scope.row.orgType==='agency'"><a class="name-a" style="color: #2195fe;" @click="handleClick(scope.row)">{{scope.row.orgName}}</a></span>
@@ -74,7 +79,7 @@
         <el-table-column min-width="110" prop="icEventProjectCount" label="事件立项数" header-align="center" align="center" />
         <el-table-column min-width="110" prop="agencyProjectCount" label="立项数" header-align="center" align="center" />
       </el-table>
-      <div>
+      <!-- <div>
         <el-pagination
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
@@ -85,7 +90,7 @@
           :total="total"
         >
         </el-pagination>
-      </div>
+      </div> -->
     </el-card>
     <el-dialog
             title="总计"
@@ -97,6 +102,7 @@
                 style="width: 100%"
                 height="200">
           <!-- <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column> -->
+        <el-table-column min-width="100" prop="orgName" label="组织名称" header-align="center" align="center" />
         <el-table-column min-width="100" prop="resiUserCount" label="注册居民数" header-align="center" align="center" />
         <el-table-column min-width="100" prop="partyMemberCount" label="注册党员数" header-align="center" align="center" />
         
@@ -120,13 +126,6 @@ import { dateFormats } from '@/utils/index'
 export default {
   data () {
     return {
-      mixinViewModuleOptions: {
-        getDataListURL: '/data/stats/factAgencyUserHouseDaily/page',
-        getDataListIsPage: true,
-        deleteURL: '/data/stats/factAgencyUserHouseDaily',
-        deleteIsBatch: true,
-        exportURL: '/data/stats/factAgencyUserHouseDaily/export'
-      },
       exportLoading: false,
       dataListLoading: false,
       optionsA: [],
@@ -140,9 +139,9 @@ export default {
       timeRange: '',
       dataForm: {
         customerId: this.$store.state.user.customerId,
-        agencyId: '',
-        startTime: dateFormats('YYYY-mm-dd HH:MM:SS', new Date()),
-        endTime: '',
+        agencyId: this.$store.state.user.agencyId,
+        startTime: '',
+        endTime: dateFormats('YYYY-mm-dd HH:MM:SS', new Date()),
         type: 'end'
       },
       total: 0,
@@ -168,6 +167,7 @@ export default {
         this.dataForm.startTime = "";
         this.dataForm.endTime = "";
       }
+      console.log('startTime----w', this.dataForm.startTime)
     }
   },
   computed: {
@@ -187,13 +187,13 @@ export default {
       this.$refs[formName].resetFields();
       this.timeRange = "";
       this.dataForm.startTime = "";
-      this.dataForm.endTime = "";
+      this.dataForm.endTime = dateFormats('YYYY-mm-dd HH:MM:SS', new Date())
       this.dataForm.type = 'end';
       this.pageNo = 1
       this.getTableList()
     },
     handleSearch() {
-      this.dataForm.type = 1
+      // this.dataForm.type = 1
       this.pageNo = 1
       this.getTableList()
     },
@@ -213,12 +213,15 @@ export default {
       this.dataForm.startTime = ''
       this.dataForm.endTime = ''
       if (val == 'end') {
-        this.dataForm.startTime = dateFormats('YYYY-mm-dd HH:MM:SS', new Date())
+        this.$nextTick(() => {
+          this.dataForm.endTime = dateFormats('YYYY-mm-dd HH:MM:SS', new Date())
+        })
+        console.log('endTime----', this.dataForm.endTime)
       }
     },
     exportHandle () {
-      const url = '/data/aggregator/org/orgProjectDetailList/export'
-      this.dataForm.type = 1
+      const url = '/data/aggregator/datastats/nowstatsdataexport'
+      // this.dataForm.type = 1
       this.exportLoading = true
       this.$http({
         method: 'Post',
@@ -277,12 +280,13 @@ export default {
           pcEventCount += item.pcEventCount
           projectCount += item.projectCount
           issueProjectCount += item.issueProjectCount
-          resiUicEventProjectCountserCount += item.icEventProjectCount
+          icEventProjectCount += item.icEventProjectCount
           agencyProjectCount += item.agencyProjectCount
         })
       }
       
       this.tableData.push({
+        orgName: this.$store.state.user.agencyName,
         resiUserCount, 
         partyMemberCount, 
         icEventCount, 
@@ -313,8 +317,8 @@ export default {
       const { user } = this.$store.state
       const _data = {
         ...this.dataForm,
-        pageNo: this.pageNo,
-        pageSize: this.pageSize
+        // pageNo: this.pageNo,
+        // pageSize: this.pageSize
       }
       this.$http
         .post('/data/aggregator/datastats/nowstatsdata', _data)
@@ -322,8 +326,8 @@ export default {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           } else {
-            this.dataList = res.data.list
-            this.total = res.data.total
+            this.dataList = res.data
+            // this.total = res.data.total
           }
         })
         .catch(() => {
@@ -349,7 +353,7 @@ export default {
             let { agencyList, subAgencyList } = res.data
             // this.optionsA = res.data
             // console.log(this.optionsA);
-            this.dataForm.agencyId = agencyList.agencyId
+            // this.dataForm.agencyId = agencyList.agencyId
             const _arr = [{...agencyList, subAgencyList: [...subAgencyList] }]
             this.optionsA = this.deepTree(_arr)
             console.log('optionsA----', this.optionsA)