临沂

package.json

@@ -46,6 +46,7 @@
     "jsencrypt": "^3.0.3",
     "lodash": "^4.17.15",
     "luckyexcel": "^1.0.1",
+    "marked": "4.0.1",
     "mint-ui": "^2.2.13",
     "moment": "^2.29.4",
     "ol": "7.2.2",

src/router/index.js

@@ -1002,7 +1002,7 @@ const router = new Router({
   scrollBehavior: () => ({
     y: 0,
   }),
-  routes: pageRoutes.concat(moduleRoutes, moduleShujuRoutes, dataBoardRoutes,dataAnalysisRoutes),
+  routes: pageRoutes.concat(moduleRoutes, moduleShujuRoutes, dataBoardRoutes),
 });
 
 router.beforeEach((to, from, next) => {

src/views/main-navbar.vue

@@ -51,6 +51,12 @@
 							<span >智能分析</span>
 						</div>
 					</el-menu-item>
+					<!-- <el-menu-item index="4" @click="handleCLickNav1">
+						<div class="nav-item">
+							<img src="~@/assets/images/main/nav-sjdb.png" />
+							<span >数据分析</span>
+						</div>
+					</el-menu-item> -->
 				</el-menu>
 
 				<el-menu class="aui-navbar__menu" mode="horizontal" style="min-width: 180px">

src/views/modules/informationArchive/elderlyArchives/cpts/info-old.vue

@@ -1,5 +1,5 @@
 <template>
-    <div style="margin: 0  0 0 20px; height: 700px;">
+    <div style="height: 750px; padding: 20px">
         <div class="dialog-h-content scroll-h">
             <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule" class="form">
                 <div class="newqsa"><span class="newqsa_text">基本信息</span></div>

src/views/modules/informationArchive/elderlyArchives/index.vue

@@ -414,6 +414,7 @@
           }
         if (code === 0) {
           this.tableData = data.list
+          this.total=data.total
    
         } else {
           this.$message.error(msg)
@@ -717,7 +718,7 @@
     computed: {
       tableHeight () {
   
-        return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 450
+        return this.$store.state.inIframe ? this.clientHeight - 430 + this.iframeHeight : this.clientHeight - 470
   
       },
   

src/views/modules/informationArchive/serviceTeamManagement/cpts/service-info.vue

@@ -1,5 +1,5 @@
 <template>
-    <div style="padding: 20px;height: 650px;">
+    <div style="padding: 20px;height: 750px;">
         <div class="dialog-h-content scroll-h">
             <el-card shadow="never" class="no-border-card">
                 <table style="width: 100%; border-collapse: collapse;  font-size: 14px;">

src/views/modules/informationArchive/serviceTeamManagement/cpts/volunteers-list.vue

@@ -12,12 +12,12 @@
             placeholder="请输入">
           </el-input>
         </el-form-item>
-        <el-form-item label="注册时间" prop="reportTime" label-width="100px">
-          <el-date-picker class="u-item-width-normal" v-model="formData.reportTime" type="datetime"
+        <el-form-item label="注册时间" prop="startTime" label-width="100px">
+          <el-date-picker class="u-item-width-normal" v-model="formData.startTime" type="datetime"
             style="width: 190px;" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd HH:mm:ss" placeholder="选择日期">
           </el-date-picker>
           <span style="margin: 0 10px;">至</span>
-          <el-date-picker class="u-item-width-normal" v-model="formData.reportTime" type="datetime"
+          <el-date-picker class="u-item-width-normal" v-model="formData.endTime" type="datetime"
             style="width: 190px;" value-format="yyyy-MM-dd HH:mm:ss" value="yyyy-MM-dd HH:mm:ss" placeholder="选择日期">
           </el-date-picker>
         </el-form-item>
@@ -91,7 +91,7 @@ methods: {
   handleDetail(row){
     this.showVolunteers = true
         this.$nextTick(() => {
-          this.$refs.ref_vol.initForm(row)
+          this.$refs.ref_vol.initForm(row.id)
         })
   }, 
 

src/views/modules/informationArchive/serviceTeamManagement/index.vue

@@ -222,6 +222,7 @@
         const { data, code, msg } = await requestPost(url, params)
         if (code === 0) {
           this.tableData = data.list
+          this.total=data.total
         } else {
           this.$message.error(msg)
         }

src/views/modules/informationArchive/toexamine/cpts/service-team.vue

@@ -7,7 +7,7 @@
             <el-radio v-model="formData.auditStatus" :label="2">不通过</el-radio>
           </el-form-item>
           <el-form-item label="不通过原因" prop="mobile" v-if="formData.auditStatus===2">
-            <el-input v-model.trim="formData.remark" size="small"   class="item_width_1" clearable placeholder="请输入">
+            <el-input type="textarea"  :autosize="{ minRows: 4, maxRows: 8}" v-model.trim="formData.remark" size="small"   class="item_width_1" clearable placeholder="请输入">
             </el-input>
           </el-form-item>
         </div>

src/views/modules/informationArchive/toexamine/index.vue

@@ -184,7 +184,7 @@
     methods: {
       closeExamine(){
         this.toExamineShow=false
-        
+        this.getElderlyInfo()
       },
       // 获取所属组织列表
       getFormInfo() {
@@ -266,6 +266,7 @@
         
         const { data, code, msg } = await requestPost(url, params)
         if (code === 0) {
+          this.total=data.total
           this.tableData = data.list
         } else {
           this.$message.error(msg)

src/views/modules/informationArchive/volunteerProfile/cpts/service-info.vue

@@ -1,5 +1,5 @@
 <template>
-    <div style="height: 650px; margin: 20px">
+    <div style="height: 750px; padding: 20px">
         <div class="dialog-h-content scroll-h">
             <el-form ref="ref_form" :inline="true" :model="formData"  class="form">
                 <div>

src/views/modules/informationArchive/volunteerProfile/cpts/service-record.vue

@@ -1,7 +1,7 @@
 <template>
-    <div style="padding: 20px  20px 0 20px ; height: 650px;">
+    <div style="padding: 20px  20px 0 20px ; height: 750px;">
         <div class="dialog-h-content scroll-h">
-            <el-table class="table" :data="tableData" border  height="550px"
+            <el-table class="table" :data="tableData" border  height="650px"
                 style="width: 100%;margin-top:16px"  >
                 <el-table-column type="selection" fixed="left" align="center" width="50"></el-table-column>
                 <el-table-column prop="orgNamePath" header-align="center" align="center" label="所属组织">

src/views/modules/informationArchive/volunteerProfile/index.vue

@@ -317,6 +317,7 @@
           localStorage.removeItem("homeSearchType");
         }
         if (code === 0) {
+          this.total=data.total
           this.tableData = data.list
           this.tableData.forEach(item => {
             console.log(item,"dsflkjsdlk;");

src/views/modules/volunteerService/pairingRecords/index.vue

@@ -278,9 +278,8 @@
         
         const { data, code, msg } = await requestPost(url, params)
         if (code === 0) {
-          console.log(data.list,"ds;kljfjklds");
           this.tableData = data.list
-          console.log(this.tableData,"ds;kljfjklds");
+          this.total=data.total
           
         } else {
           this.$message.error(msg)

src/views/modules/volunteerService/serviceRecord/index.vue

@@ -325,6 +325,7 @@
         const { data, code, msg } = await requestPost(url, params)
         if (code === 0) {
           this.tableData = data.list
+          this.total=data.total
         } else {
           this.$message.error(msg)
         }

src/views/modules/volunteerWelfare/volunteerWelfare/index.vue

@@ -286,6 +286,7 @@
           }
           if (code === 0) {
             this.tableData = data.list
+            this.total=data.total
             this.tableData.forEach(item => {
               console.log(item,"dsflkjsdlk;");
               item.identityName = item.identityType

src/views/modules/volunteerWelfare/welfareProductManagement/index.vue

@@ -318,6 +318,7 @@
             localStorage.removeItem("homeSearchType");
           }
           if (code === 0) {
+            this.total=data.total
             this.tableData = data.list
             this.tableData.forEach(item => {
               console.log(item,"dsflkjsdlk;");