From e73a89d0d27ccb61e324208d5984f0e1e550347b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?=
 <819653817@qq.com>
Date: Mon, 3 Mar 2025 09:53:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E4=BA=AB=E7=A9=BA=E9=97=B4=EF=BC=8C12?=
 =?UTF-8?q?345=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/smartExcel/cpts/picture-add.vue      |  12 +
 .../smartExcel/cpts/picture-collection.vue    |  12 +
 .../base/smartExcel/cpts/picture-list.vue     |   4 +-
 .../shequzhili/eventHandling/index.vue        |   4 +-
 .../workSys/sysConfigure/cpts/custom-type.vue | 292 ++++++++++++++++++
 .../modules/workSys/sysConfigure/index.vue    |  87 ++++--
 6 files changed, 386 insertions(+), 25 deletions(-)
 create mode 100644 src/views/modules/workSys/sysConfigure/cpts/custom-type.vue

diff --git a/src/views/modules/base/smartExcel/cpts/picture-add.vue b/src/views/modules/base/smartExcel/cpts/picture-add.vue
index 45e1feb86..e2034b0a7 100644
--- a/src/views/modules/base/smartExcel/cpts/picture-add.vue
+++ b/src/views/modules/base/smartExcel/cpts/picture-add.vue
@@ -107,6 +107,18 @@
     },
  
     methods: {
+            async listServerOrg() {
+            const url = "/data/aggregator/org/agencyAllTree";
+            const { data, code, msg } = await requestPost(url, {
+                agencyId: this.$store.state.user.agencyId,
+            });
+            if (code === 0) {
+                this.total = data.total || 0;
+                this.pictureList = data.list
+            } else {
+                this.$message.error(msg);
+            }
+        },
         removedImg() {
             this.formData.coverPicture = ''
         },
diff --git a/src/views/modules/base/smartExcel/cpts/picture-collection.vue b/src/views/modules/base/smartExcel/cpts/picture-collection.vue
index 47f1838b3..db0d5d392 100644
--- a/src/views/modules/base/smartExcel/cpts/picture-collection.vue
+++ b/src/views/modules/base/smartExcel/cpts/picture-collection.vue
@@ -81,6 +81,18 @@ mounted() {
     this.getTableData()
 },
 methods: {
+    // async getTableData() {
+    //         const url = "/gov/org/customeragency/organizetree?agencyId="+this.$store.state.user.agencyId;
+    //         const { data, code, msg } = await requestPost(url, {
+    //             agencyId: this.$store.state.user.agencyId,
+    //         });
+    //         if (code === 0) {
+    //             this.total = data.total || 0;
+    //             this.pictureList = data.list
+    //         } else {
+    //             this.$message.error(msg);
+    //         }
+    //     },
     async getTableData() {
             const url = "/actual/base/albums/page";
             const { data, code, msg } = await requestGet(url, {
diff --git a/src/views/modules/base/smartExcel/cpts/picture-list.vue b/src/views/modules/base/smartExcel/cpts/picture-list.vue
index 30f011e2d..eb149aabe 100644
--- a/src/views/modules/base/smartExcel/cpts/picture-list.vue
+++ b/src/views/modules/base/smartExcel/cpts/picture-list.vue
@@ -102,8 +102,8 @@ methods: {
     async handleDelete(row) {
         const url = "/actual/base/albums/deleteByIds"
         const params={
-            ids : [row.albumsId],
-            albumsId:this.formedate.id
+            ids : [row.id],
+            albumsId:row.albumsId
         }
         const { data, code, msg } = await requestPost(url, params)
         if (code === 0) {
diff --git a/src/views/modules/shequzhili/eventHandling/index.vue b/src/views/modules/shequzhili/eventHandling/index.vue
index ee40216cd..6c98fc876 100644
--- a/src/views/modules/shequzhili/eventHandling/index.vue
+++ b/src/views/modules/shequzhili/eventHandling/index.vue
@@ -119,10 +119,10 @@
                     </el-table-column>
                     <el-table-column fixed="right" label="操作" align="center" width="200px" prop="status">
                         <template slot-scope="scope">
-                            <el-button @click="handleWatch(scope.row)" type="text" size="small" v-if="scope.row.operationTypeName!='正常退件'">查看</el-button>latestOperationType
+                            <el-button @click="handleWatch(scope.row)" type="text" size="small" v-if="scope.row.operationTypeName!='正常退件'">查看</el-button>
                             <!-- <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if="scope.row.canOperate && scope.row.operationType != '11'&&scope.row.operationType!= '12' ">办理</el-button>
                             <el-button  @click="handleDispose(scope.row,'return')" type="text" size="small" v-if="scope.row.canOperate && scope.row.deptId && scope.row.latestOperatedTime && isWithinTwoHours(scope.row.latestOperatedTime) && scope.row.operationType!='11' &&scope.row.operationType!= '12'">退件</el-button> -->
-                            <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if=" scope.row.operationType != '11'&&scope.row.operationType!= '12'&&scope.row.operationTypeName!='正常退件' ">办理</el-button>
+                            <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if=" scope.roanalysisw.operationType != '11'&&scope.row.operationType!= '12'&&scope.row.operationTypeName!='正常退件' ">办理</el-button>
                             <el-button  @click="handleDispose(scope.row,'return')" type="text" size="small" v-if="scope.row.status !=='closed_case'&&scope.row.operationTypeName!='正常退件'">退件</el-button>
                            
                         </template>
diff --git a/src/views/modules/workSys/sysConfigure/cpts/custom-type.vue b/src/views/modules/workSys/sysConfigure/cpts/custom-type.vue
new file mode 100644
index 000000000..dbabf09ec
--- /dev/null
+++ b/src/views/modules/workSys/sysConfigure/cpts/custom-type.vue
@@ -0,0 +1,292 @@
+<template >
+    <div class="g-main">
+        <div class="m-table">
+  <div class="u-table-btn2">
+
+    <div class="u-table-btn2-left">
+      <el-button style=""
+                 size="small"
+                 class="diy-button--blue"
+                 icon="el-icon-plus"
+                 @click="handlereturn()">返回</el-button>
+      <el-button style=""
+                 size="small"
+                 class="diy-button--blue"
+                 icon="el-icon-plus"
+                 @click="handleAdd({},'add')">新增分类</el-button>
+
+    </div>
+  </div>
+
+  <div class="m-table-item">
+    <el-table :data="tableList" style="width: 100%;margin-bottom: 20px;" row-key="id" border
+          :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+          <el-table-column prop="categoryName" label="事件类型">
+          </el-table-column>
+          <el-table-column label="操作"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         class="operate">
+          <template slot-scope="scope">
+            <el-button 
+                       v-if="scope.row.pid==0" 
+                       type="text"
+                       class="div-table-button--blue"
+                       size="small"
+                       @click="handleAdd(scope.row,'add0')">添加二级分类</el-button>
+            <el-button 
+                       type="text"
+                       class="div-table-button--blue"
+                       size="small"
+                       @click="handleAdd(scope.row,'edit')">修改</el-button>
+
+            <el-button 
+                       type="text"
+                       class="div-table-button--blue"
+                       size="small"
+                       @click="handleDelete(scope.row)">删除</el-button>
+          </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="pageSize"
+                     layout="sizes, prev, pager, next, total"
+                     :total="total">
+      </el-pagination>
+    </div>
+  </div>
+        </div>
+        <el-dialog :visible.sync="formShow"
+               :close-on-click-modal="false"
+               :close-on-press-escape="false"
+               :title="formTitle"
+               width="670px"
+               top="5vh"
+               class="dialog-h"
+               @closed="diaClose">
+               
+    </el-dialog>
+    </div>
+  </template>
+  
+  <script>
+  import { requestPost,requestGet } from "@/js/dai/request";
+  import { mapGetters } from 'vuex'
+  import { Loading } from 'element-ui' // 引入Loading服务
+  import axios from 'axios'
+  let loading // 加载动画
+  export default {
+    data () {
+      return {
+        searchHeight: 0,//搜索栏高度,
+        pageNo:0,
+        pageSize:20,
+        total:0,
+        formTitle:"",
+        formShow:false,
+        tableData: [],
+        tableList:[]
+      }
+    },
+
+    activated () {
+  
+    },
+    async mounted () {
+      console.log("dsfjsdklf");
+      this.getCategoryTree()
+    },
+  
+    methods: {
+      //事件类型统计
+      async getCategoryTree() {
+        const url = "/governance/icEvent/getCategoryTree";
+        let param = {
+          endDate : "2025-12-31 23:59:59",
+          startDate : "2025-01-01 00:00:00",
+          usableFlag: true
+        }
+        const { data, code, msg } = await requestPost(url, param);
+        if (code === 0) {
+          this.tableList = data
+          // this.tableList=this.flattenTree(data);
+          console.log(this.tableList);
+          console.log(this.tableList, "lksdjfklj s");
+        } else {
+          this.$message.error(msg);
+        }
+      },
+      handlereturn(){
+        this.$emit('close')
+      },
+      async loadTable () {
+        const url =  "/governance/commonServiceType/treeList"
+        let {data,msg,code } = await requestGet(url)
+        if(code == 0){
+            this.tableData = data
+        }else{
+            this.$message.error(msg)
+        }
+        
+      },
+      diaClose () {
+      this.$refs.ref_form.resetData()
+      this.formShow = false
+      },  
+      addFormOk () {
+      this.formShow = false
+      this.loadTable()
+      },
+      addFormCancle () {
+        this.formShow = false
+      },
+      async handleDetail (row) {
+        this.detailShow = true
+        const _data = await this.detail(row)
+        this.$nextTick(() => {
+          this.$refs.ref_form_detail.initForm(_data)
+        })
+      },
+  
+      handleAdd (row,type) {
+        if(type=="add"){
+            console.log(row.id);
+            this.formTitle = '新增分类'
+            this.formShow = true
+            this.$nextTick(() => {
+            this.$refs.ref_form.initForm(type, row)
+          })
+        } else if(type=="add0"){
+            this.formTitle = '新增分类'
+            this.formShow = true
+            this.$nextTick(() => {
+              this.$refs.ref_form.initForm(type, row)
+            }) 
+        } else if (type == 'edit') {
+            this.formTitle = '修改分类'
+            this.formShow = true
+            this.$nextTick(() => {
+              this.$refs.ref_form.initForm(type, row)
+            })
+        }
+      
+      },
+
+      selectAll (selection) {
+  
+        this.selection = selection
+  
+  
+      },
+      selectionChange (selection) {
+        this.selection = selection
+  
+      },
+  
+      async handleDelete (row) {
+  
+        this.$confirm("确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        })
+          .then(() => {
+            this.deleteDemand(row)
+          })
+          .catch(err => {
+            if (err == "cancel") {
+              this.$message({
+                type: "info",
+                message: "已取消删除"
+              });
+            }
+  
+          });
+      },
+      async deleteDemand (row) {
+        const url = `/governance/commonServiceType/delete/${row.id}`
+        const { data, code, msg } = await requestPost(url)
+        if (code === 0) {
+          this.$message({
+            type: "success",
+            message: "删除成功"
+          });
+          this.loadTable()
+        } else if (code > 8000) {
+          this.$message({
+            message: msg,
+            duration: 0
+          })
+          this.loadTable()
+        } else {
+          this.$message.error(msg)
+        }
+      },
+      
+    
+      handleDiyClose () {
+        this.diyDialog = false;
+      },
+      handleClose (done) {
+        this.diyDialog = false
+      },
+   
+      handleSizeChange (val) {
+        this.pageSize = val
+        this.pageNo = 1
+        this.loadTable()
+      },
+      handleCurrentChange (val) {
+        this.pageNo = val
+        this.loadTable()
+      },
+  
+      // 开启加载动画
+      startLoading () {
+        loading = Loading.service({
+          lock: true, // 是否锁定
+          text: '正在加载……', // 加载中需要显示的文字
+          background: 'rgba(0,0,0,.7)' // 背景颜色
+        })
+      },
+      // 结束加载动画
+      endLoading () {
+        // clearTimeout(timer);
+        if (loading) {
+          loading.close()
+        }
+      }
+    },
+    computed: {
+      tableHeight () {
+        console.log(this.searchHeight)
+        let height = this.searchHeight + 270
+        return this.$store.state.inIframe ? this.clientHeight - height + this.iframeHeight : this.clientHeight - height
+  
+      },
+  
+      ...mapGetters(['clientHeight', 'iframeHeight'])
+    },
+    watch: {
+    },
+    props: {
+    
+    }
+  }
+  </script>
+  <style lang="scss" scoped >
+  @import "@/assets/scss/modules/management/list-main.scss";
+  </style>
+  
+  <style >
+  .el-message.is-closable .el-message__content {
+    line-height: 20px;
+  }
+  </style>
+  
+  
\ No newline at end of file
diff --git a/src/views/modules/workSys/sysConfigure/index.vue b/src/views/modules/workSys/sysConfigure/index.vue
index b9557417e..5eabd3927 100644
--- a/src/views/modules/workSys/sysConfigure/index.vue
+++ b/src/views/modules/workSys/sysConfigure/index.vue
@@ -1,14 +1,14 @@
 <template>
-    <div class="g-main">
-        <div>
-            <div class="m-table">
+    <div  class="g-main">
+            <div class="m-table"v-if="!customTypeShow">
                 <h2>系统高级配置</h2>
                 <div style="width: 100%; display: flex; align-items: center;">
                     <div class=""
                         style="width: 100%; display: flex; flex-direction: column;margin-left: 50px;align-items: center;justify-content: center ">
                         <div style="width: 100%; display: flex; flex-direction: column; justify-content: center">
                             <h3>12345政务热线</h3>
-                            <div class="m-table1" style=" width: 50%; display: flex; flex-direction:column;align-items: center;justify-content: space-between;">
+                            <div class="m-table1"
+                                style=" width: 50%; display: flex; flex-direction:column;align-items: center;justify-content: space-between;">
                                 <div style="display: flex; flex-direction: column;">
                                     <div
                                         style="display: flex;border-bottom: 1px dotted rgba(0, 0, 0, 0.3); flex-direction: row; align-items: center; justify-content: space-between;">
@@ -167,7 +167,7 @@
                                                     是否需要开启答复情况选项
                                                 </div>
                                             </div>
-                                            <div 
+                                            <div
                                                 style=" margin: 20px;font-size: 14px; display: flex; align-items: center;">
                                                 若开启答复情况选项，事件办结时需要填写相应的答复信息。
                                             </div>
@@ -186,14 +186,14 @@
                                                     是否需要开启办理中选项
                                                 </div>
                                             </div>
-                                            <div 
+                                            <div
                                                 style=" margin: 20px;font-size: 14px; display: flex; align-items: center;">
                                                 若开启办理中选项，事件办理状态中需要加上办理中选项。
                                             </div>
                                         </div>
-                                        <el-switch v-model="sysAdvancedList.eventState"
-                                            active-color="#13ce66" :active-value=3 :inactive-value=1
-                                            inactive-color="#eaecf0" @change="handleChange()">
+                                        <el-switch v-model="sysAdvancedList.eventState" active-color="#13ce66"
+                                            :active-value=3 :inactive-value=1 inactive-color="#eaecf0"
+                                            @change="handleChange()">
                                         </el-switch>
                                     </div>
                                     <div
@@ -205,14 +205,14 @@
                                                     是否需要开启回访情况选项
                                                 </div>
                                             </div>
-                                            <div 
+                                            <div
                                                 style=" margin: 20px;font-size: 14px; display: flex; align-items: center;">
                                                 若开启回访情况选项，事件办结时需要填写相应的回访信息。
                                             </div>
                                         </div>
-                                        <el-switch v-model="sysAdvancedList.columnsIgnore"
-                                            active-color="#13ce66" :active-value=0 :inactive-value=1
-                                            inactive-color="#eaecf0" @change="handleChange()">
+                                        <el-switch v-model="sysAdvancedList.columnsIgnore" active-color="#13ce66"
+                                            :active-value=0 :inactive-value=1 inactive-color="#eaecf0"
+                                            @change="handleChange()">
                                         </el-switch>
                                     </div>
                                     <div
@@ -256,42 +256,80 @@
                                                 </el-select>
                                             </div>
                                         </div>
-                                        <!-- <el-switch v-model="sysAdvancedList" active-color="#13ce66"
-                                            inactive-color="#eaecf0">
-                                        </el-switch> -->
+                                    </div>
+                                    <div
+                                        style=" margin-top: 20px;display: flex; flex-direction: row; align-items: center; justify-content: space-between;">
+                                        <div>
+                                            <div style="display: flex; flex-direction: row; align-items: center;">
+                                                <div style="width: 10px; height: 10px; background-color: #4e89ec"></div>
+                                                <div style="font-weight:800;font-size: 14px; margin-left: 10px;">
+                                                    分析报告统计时间段默认设置
+                                                </div>
+                                            </div>
+                                            <div
+                                                style=" margin: 20px;font-size: 14px; display: flex; align-items: center;">
+                                                <div style="margin-right: 10px;">
+                                                    统计时间段(默认):
+                                                </div>
+
+                                                <el-radio v-model="statisticalTimeReport" label="1">当年</el-radio>
+                                                <el-radio v-model="statisticalTimeReport" label="2">当月</el-radio>
+                                                <el-radio v-model="statisticalTimeReport" label="3">本周</el-radio>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div
+                                        style=" margin-top: 20px;display: flex; flex-direction: row; align-items: center; justify-content: space-between;">
+                                        <div>
+                                            <div style="display: flex; flex-direction: row; align-items: center;">
+                                                <div style="width: 10px; height: 10px; background-color: #4e89ec"></div>
+                                                <div style="font-weight:800;font-size: 14px; margin-left: 10px;">
+                                                    分析报告自定义类型统计设置
+                                                </div>
+                                            </div>
+                                            <div
+                                                style=" margin: 20px;font-size: 14px; display: flex; align-items: center;">
+                                                <div style="margin-right: 10px;">
+                                                    请设置自定义类型:
+                                                </div>
+                                                <el-button type="primary" @click="handleClose()">开始自定义</el-button>
+                                            </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
                         </div>
 
                     </div>
+
                 </div>
             </div>
-        </div>
-
+            <custom-type ref="ref_form" v-if="customTypeShow" @close="close" >
+            </custom-type>
     </div>
 </template>
 <script>
 import { requestPost,requestGet } from '@/js/dai/request';
 import nextTick from 'dai-js/tools/nextTick';
 import { mapGetters } from 'vuex';
-// import addForm from './residentCategoryComponents/addForm.vue';
+import customType from './cpts/custom-type.vue';
 import axios from 'axios';
 export default {
 	data() {
 		return {
+            customTypeShow:false,
             radio:"",
 			num:"",
             HotlineShow:1,
 			customerId:"",
             govroleList:[],
-
+            statisticalTimeReport:"",
 			sysAdvancedList:{
                 
             }
 		};
 	},
-	components: {  },
+	components: {customType  },
 	created() {},
 	computed: {
 		maxTableHeight() {
@@ -308,6 +346,12 @@ export default {
         this.getGovroleList()
 	},
 	methods: {
+        close(){
+            this.customTypeShow=false
+        },
+        handleClose(){
+            this.customTypeShow=true
+        },
         handleSwitch(row){
             console.log(row,this.num,"sdgmlsdlgjk");
             const url = '/sys/sysAdvanced/update';
@@ -434,5 +478,6 @@ export default {
       position: relative;
     }
   }
+  
 
 </style>