Merge branch 'featrue-lingshan' of http://120.46.222.128:10021/elink-star/epmet-work-pc into featrue-lingshan

src/views/modules/pointsManage/pointsRanking/index.vue

@@ -120,7 +120,7 @@
   </div>
 </template>
 <script>
-import { requestPost } from "@/js/dai/request";
+import {requestGet, requestPost} from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 
 let loading // 加载动画
@@ -209,13 +209,13 @@ export default {
       this.currentPage = val;
     },
     async communityActivityList() {
-      const url = "/actual/base/partyActivity/page";
+      const url = "/actual/base/scoreRecord/rank";
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
         ...this.formData,
       };
-      let { data, code, msg } = await requestPost(url, params);
+      let { data, code, msg } = await requestGet(url, params);
       if (code === 0) {
         this.total = data.total
         this.tableData = data.list

src/views/modules/pointsManage/pointsRecord/index.vue

@@ -147,7 +147,7 @@
   </div>
 </template>
 <script>
-import { requestPost } from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 
 let loading // 加载动画
@@ -236,13 +236,13 @@ export default {
       this.currentPage = val;
     },
     async communityActivityList() {
-      const url = "/actual/base/partyActivity/page";
+      const url = "/actual/base/scoreRecord/list";
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
         ...this.formData,
       };
-      let { data, code, msg } = await requestPost(url, params);
+      let { data, code, msg } = await requestGet(url, params);
       if (code === 0) {
         this.total = data.total
         this.tableData = data.list

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

@@ -59,19 +59,19 @@
                 @selection-change="handleSelectionChange" ref="multipleTable">
         <el-table-column type="selection" width="40" align="center"/>
         <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
-        <el-table-column prop="title" header-align="center" align="center" label="所属组织" width="260"></el-table-column>
-        <el-table-column prop="title" header-align="center" align="center" label="党员属性" width="260"></el-table-column>
-        <el-table-column prop="title" header-align="center" align="center" label="姓名" width="260"></el-table-column>
-        <el-table-column prop="title" header-align="center" align="center" label="身份证" width="260"></el-table-column>
-        <el-table-column prop="title" header-align="center" align="center" label="手机" width="260"></el-table-column>
-        <el-table-column prop="title" header-align="center" align="center" label="岗位类型" width="260"></el-table-column>
-        <el-table-column prop="title" header-align="center" align="center" label="服务内容" width="260"></el-table-column>
+        <el-table-column prop="partyOrgName" header-align="center" align="center" label="所属组织" width="260"></el-table-column>
+        <el-table-column prop="partyAttribute" header-align="center" align="center" label="党员属性" width="260"></el-table-column>
+        <el-table-column prop="name" header-align="center" align="center" label="姓名" width="260"></el-table-column>
+        <el-table-column prop="idNum" header-align="center" align="center" label="身份证" width="260"></el-table-column>
+        <el-table-column prop="mobile" header-align="center" align="center" label="手机" width="260"></el-table-column>
+        <el-table-column prop="partyPositionName" header-align="center" align="center" label="岗位类型" width="260"></el-table-column>
+        <el-table-column prop="workContent" header-align="center" align="center" label="服务内容" width="260"></el-table-column>
         <el-table-column prop="coverPic" header-align="center" align="center" label="图片" width="180">
           <template slot-scope="scope">
-            <el-image :src="scope.row.coverPic" style="width: 40px;height: 40px;" :preview-src-list="srcList" @click="imageClick(scope.row.coverPic)"></el-image>
+            <el-image :src="scope.row.servicePhotoUrl" style="width: 40px;height: 40px;" :preview-src-list="srcList" @click="imageClick(scope.row.servicePhotoUrl)"></el-image>
           </template>
         </el-table-column>
-        <el-table-column prop="title" header-align="center" align="center" label="服务时间" width="260"></el-table-column>
+        <el-table-column prop="serviceTime" header-align="center" align="center" label="服务时间" width="260"></el-table-column>
         <el-table-column label="操作" fixed="right" width="130" header-align="center" align="center" class="operate">
           <template slot-scope="scope">
             <el-button type="text" style="color:#1C6AFD;" size="small" @click="handleDetail(scope.row)">查看</el-button>
@@ -93,22 +93,22 @@
           <el-row :gutter="20">
             <el-col :span="8">
               <el-form-item label="所属组织">
-                <span class="form-value">{{ baseForm.organization }}</span>
+                <span class="form-value">{{ baseForm.partyOrgName }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="党员属性">
-                <span class="form-value">{{ baseForm.memberType }}</span>
+                <span class="form-value">{{ baseForm.partyAttribute }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="岗位类型">
-                <span class="form-value">{{ baseForm.postType }}</span>
+                <span class="form-value">{{ baseForm.partyPositionName }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="当前岗位">
-                <span class="form-value">{{ baseForm.currentPost }}</span>
+                <span class="form-value">{{ baseForm.currentPost }}</span>11
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -118,17 +118,17 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="手机号">
-                <span class="form-value">{{ baseForm.phone }}</span>
+                <span class="form-value">{{ baseForm.mobile }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="身份证号">
-                <span class="form-value">{{ baseForm.idCard }}</span>
+                <span class="form-value">{{ baseForm.idNum }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="16">
               <el-form-item label="备注说明">
-                <span class="form-value">{{ baseForm.remark }}</span>
+                <span class="form-value">{{ baseForm.remark }}</span>11
               </el-form-item>
             </el-col>
           </el-row>
@@ -147,23 +147,23 @@
             <!-- 视频模块（有视频才显示） -->
             <el-col :span="24" v-if="serviceForm.videoUrl">
               <el-form-item label="服务视频">
-                <video :src="serviceForm.videoUrl" controls class="video-box"></video>
+                <video :src="serviceForm.videoUrl" controls class="video-box"></video>11
               </el-form-item>
             </el-col>
             <!-- 图片模块 -->
-            <el-col :span="24" v-if="serviceForm.imageUrl">
+            <el-col :span="24" v-if="serviceForm.servicePhotoUrl">
               <el-form-item label="上传图片">
-                <el-image :src="serviceForm.imageUrl" class="preview-img" fit="contain" preview-src-list="[serviceForm.imageUrl]" :preview-options="{ loop: true }"/>
+                <el-image :src="serviceForm.servicePhotoUrl" class="preview-img" fit="contain" preview-src-list="[serviceForm.servicePhotoUrl]" :preview-options="{ loop: true }"/>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="服务时间">
-                <span class="form-value">{{ serviceForm.time }}</span>
+                <span class="form-value">{{ serviceForm.serviceTime }}</span>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="服务地点">
-                <span class="form-value">{{ serviceForm.address }}</span>
+                <span class="form-value">{{ serviceForm.address }}</span>11
               </el-form-item>
             </el-col>
           </el-row>
@@ -176,7 +176,7 @@
   </div>
 </template>
 <script>
-import { requestPost } from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 import { mapGetters } from 'vuex'
 
 let loading // 加载动画
@@ -184,24 +184,9 @@ export default {
   data () {
     return {
       // 基本信息表单（完全匹配党建系统字段排版）
-      baseForm: {
-        organization: "区委组织部",
-        memberType: "有职党员",
-        postType: "政策宣传岗-宣传思想",
-        currentPost: "普通党员",
-        name: "王军",
-        phone: "133****0000",
-        idCard: "3708**********2010",
-        remark: "-"
-      },
+      baseForm: {},
       // 服务信息表单
-      serviceForm: {
-        content: "向群众广泛宣传习近平新时代中国特色社会主义思想,宣传党的路线方针政策,协助组织做好群众的思想政治工作,教育引导广大群众自觉听党话,坚定不移跟党走。",
-        videoUrl: "", // 无视频则留空
-        imageUrl: "https://p3-flow-imagex-sign.byteimg.com/tos-cn-i-a9rns2rl98/b38d0be0b86e4bd1afc793547d9b746b.png~tplv-a9rns2rl98-image.png?lk3s=8e244e95&rcl=202601071642180B1EB491BA6BDBC4BC79&rrcfp=dafada99&x-expires=2083999338&x-signature=9NavNT3PSIDUAdU087JmFfKPqQo%3D",
-        time: "2025-08-16 13:30:20",
-        address: "灵山街道XXXX新村168号"
-      },
+      serviceForm: {},
       srcList: [],
       loading: false,
       total: 0,
@@ -232,13 +217,13 @@ export default {
       this.srcList.push(val)
     },
     async communityActivityList() {
-      const url = "/actual/base/partyActivity/page";
+      const url = "/actual/base/serviceRecord/list";
       let params = {
         pageSize: this.pageSize,
         pageNo: this.pageNo,
         ...this.formData,
       };
-      let { data, code, msg } = await requestPost(url, params);
+      let { data, code, msg } = await requestGet(url, params);
       if (code === 0) {
         this.total = data.total
         this.tableData = data.list
@@ -262,7 +247,15 @@ export default {
       this.detailShow = false
     },
     async handleDetail (row) {
-      this.detailShow = true
+      const url = "/actual/base/serviceRecord/"+row.id;
+      let { data, code, msg } = await requestGet(url, {});
+      if (code === 0) {
+        console.log(data,"++++++++++++++data")
+        this.baseForm = data
+        this.detailShow = true
+      } else {
+        this.$message.error(msg)
+      }
     },
     handleInitAdd (e) {
 

src/views/modules/worklog/components/worklogDialog.vue

@@ -5,50 +5,45 @@
       <div class="subTitle">基本信息</div>
       <el-form ref="ref_form" :model="formData" class="form" label-width="100px">
         <el-form-item label="所属组织" prop="title">
-          <span>1</span>
+          <span>{{ formData.partyOrgName }}</span>
         </el-form-item>
-        <el-form-item label="党员性质" prop="orgName">
-          <span>2</span>
+        <el-form-item label="党员属性" prop="orgName">
+          <span>{{ formData.partyAttribute }}</span>
         </el-form-item>
         <el-form-item label="岗位类型" prop="location">
-          <span>3</span>
+          <span>{{ formData.partyOrgName }}</span>11
         </el-form-item>
         <el-form-item label="当前岗位" prop="socialCapital">
-          <span>4</span>
+          <span>{{ formData.partyPositionName }}</span>
         </el-form-item>
         <el-form-item label="姓名" prop="socialCapital">
-          <span>4</span>
+          <span>{{ formData.name }}</span>
         </el-form-item>
         <el-form-item label="手机号" prop="socialCapital">
-          <span>4</span>
+          <span>{{ formData.mobile }}</span>
         </el-form-item>
         <el-form-item label="身份证" prop="socialCapital">
-          <span>4</span>
+          <span>{{ formData.idNum }}</span>
         </el-form-item>
         <el-form-item class="item_width_2" label="备注说明" prop="socialCapital">
-          <span>4</span>
+          <span>{{ formData.partyOrgName }}</span>11
         </el-form-item>
       </el-form>
-
       <div class="subTitle">日志信息</div>
       <el-form ref="ref_form" :model="formData" class="logForm" label-width="80px">
         <el-form-item class="full" label="服务内容">
-          <div>{{ serviceForm.content }}</div>
+          <div>{{ formData.workContent }}</div>
         </el-form-item>
-
         <el-form-item class="full" label="上传图片">
-          <el-image :src="serviceForm.imageUrl" fit="contain" style="width: 100px; height: 100px;"
-            :preview-src-list="[serviceForm.imageUrl]" :preview-options="{ loop: true }" />
+          <el-image :src="formData.workPhotoUrl" fit="contain" style="width: 100px; height: 100px;"
+            :preview-src-list="[formData.workPhotoUrl]" :preview-options="{ loop: true }" />
         </el-form-item>
-
         <el-form-item label="上报时间">
-          <span class="form-value">{{ serviceForm.time }}</span>
+          <span class="form-value">{{ formData.workTime }}</span>
         </el-form-item>
-
         <el-form-item label="上报地点">
-          <span class="form-value">{{ serviceForm.address }}</span>
+          <span class="form-value">{{ formData.address }}</span>11
         </el-form-item>
-        
         <el-form-item class="full" label="" label-width="0">
           <el-button class="diy-button--add" size="small" @click="handleDownload">下载</el-button>
         </el-form-item>
@@ -100,13 +95,7 @@ export default {
     return {
       formData: _.cloneDeep(defaultFormData),
       btnDisable: false,
-      serviceForm: {
-        content: "向群众广泛宣传习近平新时代中国特色社会主义思想,宣传党的路线方针政策,协助组织做好群众的思想政治工作,教育引导广大群众自觉听党话,坚定不移跟党走。",
-        videoUrl: "", // 无视频则留空
-        imageUrl: "https://p3-flow-imagex-sign.byteimg.com/tos-cn-i-a9rns2rl98/b38d0be0b86e4bd1afc793547d9b746b.png~tplv-a9rns2rl98-image.png?lk3s=8e244e95&rcl=202601071642180B1EB491BA6BDBC4BC79&rrcfp=dafada99&x-expires=2083999338&x-signature=9NavNT3PSIDUAdU087JmFfKPqQo%3D",
-        time: "2025-08-16 13:30:20",
-        address: "灵山街道XXXX新村168号"
-      },
+      serviceForm: {},
     }
 
   },

src/views/modules/worklog/index.vue

@@ -64,30 +64,30 @@
 
         <el-table-column header-align="center" align="center" type="selection" width="50" />
         <el-table-column label="序号" header-align="center" align="center" type="index" width="50" />
-        <el-table-column prop="title" header-align="center" align="center" label="所属组织" />
-        <el-table-column prop="orgName" header-align="center" align="center" label="党员性质" />
-        <el-table-column prop="orgName" header-align="center" align="center" label="姓名" />
-        <el-table-column prop="identityID" header-align="center" align="center" label="身份证" >
+        <el-table-column prop="partyOrgName" header-align="center" align="center" label="所属组织" />
+        <el-table-column prop="partyAttribute" header-align="center" align="center" label="党员性质" />
+        <el-table-column prop="name" header-align="center" align="center" label="姓名" />
+        <el-table-column prop="idNum" header-align="center" align="center" label="身份证" >
           <template slot-scope="{row}">
-            {{ row.identityID.replace(/^(.{4})(?:\d+)(.{4})$/, "$1******$2") }}
+            {{ row.idNum}}
           </template>
         </el-table-column>
-        <el-table-column prop="phone" header-align="center" align="center" label="手机">
+        <el-table-column prop="mobile" header-align="center" align="center" label="手机">
           <template slot-scope="{row}">
-            {{ row.phone.replace(/^(.{3})(?:\d+)(.{4})$/, "$1******$2") }}
+            {{ row.mobile}}
           </template>
         </el-table-column>
-        <el-table-column prop="orgName" header-align="center" align="center" label="当前岗位" />
-        <el-table-column prop="orgName" header-align="center" align="center" label="工作内容" />
-        <el-table-column prop="coverPic" header-align="center" align="center" label="图片" width="80">
+        <el-table-column prop="partyPositionName" header-align="center" align="center" label="当前岗位" />
+        <el-table-column prop="workContent" header-align="center" align="center" label="工作内容" />
+        <el-table-column prop="workPhotoUrl" header-align="center" align="center" label="图片" width="80">
           <template slot-scope="{row}">
-            <el-image :src="row.coverPic" fit="fill" :preview-src-list="[row.coverPic]"
+            <el-image :src="row.workPhotoUrl" fit="fill" :preview-src-list="[row.workPhotoUrl]"
               style="width: 50px; height: 50px;">
             </el-image>
           </template>
         </el-table-column>
 
-        <el-table-column prop="releaseTime" header-align="center" align="center" label="上报时间">
+        <el-table-column prop="workTime" header-align="center" align="center" label="上报时间">
         </el-table-column>
         <el-table-column label="操作" fixed="right" header-align="center" align="center" class="operate">
           <template slot-scope="scope">
@@ -129,10 +129,7 @@ export default {
       organizeOptions: [],
       postOptions: [],
       timeRange: [],
-      tableData: [{
-        phone: '13800000000',
-        identityID: '370214199811091223'
-      }],
+      tableData: [],
       queryParams: {
         orgId: '',
         orgIdList: '',
@@ -148,10 +145,26 @@ export default {
   },
   created() {
     this.getOptions();
-    this.getDataList();
+    this.communityActivityList();
   },
   methods: {
-    getDataList() { },
+    async communityActivityList() {
+      const url = "/actual/base/workRecord/list";
+      let params = {
+        pageSize: this.pageSize,
+        pageNo: this.pageNo,
+        ...this.formData,
+      };
+      let { data, code, msg } = await requestGet(url, params);
+      if (code === 0) {
+        console.log(data,"++++++++++this.data")
+        this.total = data.total
+        this.tableData = data.list
+        console.log(this.tableData,"++++++++++this.tableData")
+      } else {
+        this.$message.error(msg)
+      }
+    },
     // 获取所属组织
     async getOptions() {
       const { data } = await requestPost("/gov/org/customeragency/orgtree", {});
@@ -212,18 +225,18 @@ export default {
     // 搜索
     handleSearch() {
       this.pageNo = 1;
-      this.getDataList();
+      this.communityActivityList();
       console.log('this.queryParams==', this.queryParams)
     },
 
     handleSizeChange(val) {
       this.pageSize = val
       this.pageNo = 1
-      this.getDataList()
+      this.communityActivityList()
     },
     handleCurrentChange(val) {
       this.pageNo = val
-      this.getDataList()
+      this.communityActivityList()
     },
 
     // 重置
@@ -240,12 +253,20 @@ export default {
     },
 
     // 查看
-    handleDetail(row) {
-      this.dialogVisible = true
-      this.dialogTitle = '详情'
-      this.$nextTick(() => {
-        this.$refs.worklogDialog.initForm(row)
-      })
+    async handleDetail(row) {
+      const url = "/actual/base/workRecord/"+row.id;
+      let { data, code, msg } = await requestGet(url, {});
+      if (code === 0) {
+        console.log(data,"++++++++++++++data")
+        this.dialogVisible = true
+        this.dialogTitle = '详情'
+        this.$nextTick(() => {
+          this.$refs.worklogDialog.initForm(data)
+        })
+      } else {
+        this.$message.error(msg)
+      }
+
     },
     //   导出
     handleExport() {