Merge branch 'pre' of http://git.dgtis.com/sunlupeng/pointsMall

src/App.vue

@@ -74,6 +74,9 @@ export default {
 }
 </script>
 <style>
+.el-card__body{
+    padding: 0 10px !important;
+}
 .el-dialog__body{
   padding-top: 0px !important;
 }

src/api/allApi.js

@@ -1,5 +1,22 @@
 import request from '@/utils/request'
 
+//获取培训上传备注
+export function remarkHtml(query) {
+  return request({
+    url: '/news/mall/getNotice',
+    method: 'get',
+    params: query
+  })
+}
+
+//员工互动记录列表
+export function postList(query) {
+  return request({
+    url: '/mall-post/user/center/list',
+    method: 'get',
+    params:query
+  })
+}
 
 //员工互动提交
 export function postInteractSave(data) {

src/components/AppSidebar.vue

@@ -69,13 +69,7 @@ export default {
                 icon:'icon-mall-hongbao',
                 checked:false,
             },
-            {
-                value:'myCenter',
-                name:'个人中心',
-                path:'/home/myCenter',
-                icon:'icon-mall-gerenzhongxin',
-                checked:false,
-            },
+            
             {
                 value:'earnPoints',
                 name:'积分获取',
@@ -83,13 +77,20 @@ export default {
                 icon:'icon-mall-zuorenwuzhuanjifen',
                 checked:false,
             },
-            // {
-            //     value:'postInteract',
-            //     name:'员工互动',
-            //     path:'/home/postInteract',
-            //     icon:'icon-mall-neibuzhengyiguanli',
-            //     checked:false,
-            // },
+            {
+                value:'postInteract',
+                name:'员工互动',
+                path:'/home/postInteract',
+                icon:'icon-mall-neibuzhengyiguanli',
+                checked:false,
+            },
+            {
+                value:'myCenter',
+                name:'个人中心',
+                path:'/home/myCenter',
+                icon:'icon-mall-gerenzhongxin',
+                checked:false,
+            },
         ],
         employeeDynamics: false,
         pointsMall: false,

src/views/HomeView/EarnPoints.vue

@@ -111,7 +111,7 @@
             </el-pagination>
           </div>
         </el-tab-pane>
-        <!-- <el-tab-pane label="培训列表" name="fourth">
+        <el-tab-pane label="培训列表" name="fourth">
           <el-button size="small" type="primary" @click="handleClickCreate('上传培训')">上传培训</el-button>
           <el-table size="small" :data="dataListTrain" border style="margin-top: 20px;width: 960px">
             <el-table-column align="center" type="index" width="50" label="序号"></el-table-column>
@@ -121,6 +121,19 @@
             </el-table-column>
             <el-table-column align="center" prop="endTime" min-width="150" label="结束时间">
             </el-table-column>
+            <el-table-column min-width="100" align="center" label="状态">
+              <template slot-scope="props">
+                <el-popover trigger="hover">
+                  <el-table :data="props.row.trainLogs" border size="mini">
+                    <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
+                    <el-table-column min-width="160" align="center" prop="comment" label="处理结果"></el-table-column>
+                    <!-- <el-table-column min-width="120" align="center" prop="statusName" label="状态"></el-table-column> -->
+                    <el-table-column min-width="180" align="center" prop="createTime" label="处理时间"></el-table-column>
+                  </el-table>
+                  <span style="color: #1e80ff;cursor: pointer;" slot="reference">{{ props.row.statusName }}</span>
+                </el-popover>
+              </template>
+            </el-table-column>
             <el-table-column align="center" prop="lecturerName" min-width="150" label="培训讲师">
             </el-table-column>
             <el-table-column align="center" min-width="100" label="参加人员">
@@ -166,18 +179,7 @@
               </template>
             </el-table-column>
             <el-table-column min-width="150" align="center" prop="createTime" label="上传时间"></el-table-column>
-            <el-table-column min-width="100" align="center" label="状态">
-              <template slot-scope="props">
-                <el-popover trigger="hover">
-                  <el-table :data="props.row.trainLogs" border size="mini">
-                    <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
-                    <el-table-column min-width="160" align="center" prop="comment" label="处理结果"></el-table-column>
-                    <el-table-column min-width="180" align="center" prop="createTime" label="处理时间"></el-table-column>
-                  </el-table>
-                  <span style="color: #1e80ff;cursor: pointer;" slot="reference">{{ props.row.statusName }}</span>
-                </el-popover>
-              </template>
-            </el-table-column>
+            
             
             <el-table-column fixed="right" align="center" label="操作" width="160px" class-name="small-padding fixed-width">
               <template slot-scope="scope">
@@ -186,13 +188,14 @@
               </template>
             </el-table-column>
           </el-table>
+          <!-- 分页 -->
           <div class="myPage">
             <el-pagination @size-change="handleSizeChangeTrain" @current-change="handleCurrentChangeTrain"
               :current-page="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"
               layout="total, sizes, prev, pager, next, jumper" :total="totalTrain">
             </el-pagination>
           </div>
-        </el-tab-pane> -->
+        </el-tab-pane>
         <el-tab-pane label="积分获取规则" name="second">
           <el-empty v-if="!integralRules" :image-size="200"></el-empty>
           <div v-else v-html="integralRules"></div>
@@ -230,7 +233,7 @@
           </el-select>
         </el-form-item>
         <el-form-item v-if="dataFormCite.type == '1'" label="集体人员:" prop="groupIds">
-          <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormCite.groupIds" multiple filterable placeholder="请选择"
+          <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormCite.groupIds" multiple filterable placeholder="请选择(支持输入姓名检索)"
             style="width: 95%;">
             <el-option :key="item.loginId" v-for="item in recipientsList"
               :label="item.deptName + '_' + item.userName + '_' + item.employeNo" :value="item.loginId">
@@ -279,14 +282,14 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="培训讲师:" prop="lecturer">
-          <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormTrain.lecturer" filterable placeholder="请选择" style="width: 95%;">
+          <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormTrain.lecturer" filterable placeholder="请选择(支持输入姓名检索)" style="width: 95%;">
             <el-option :key="item.loginId" v-for="item in recipientsList"
               :label="item.deptName + '_' + item.userName + '_' + item.employeNo" :value="item.loginId">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="参加人员:" prop="traineeIds">
-          <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormTrain.traineeIds" multiple filterable placeholder="请选择"
+          <el-select :disabled="dialogStatus=='view'?true:false" size="small" v-model="dataFormTrain.traineeIds" multiple filterable placeholder="请选择(支持输入姓名检索)"
             style="width: 95%;">
             <el-option :key="item.loginId" v-for="item in recipientsList"
               :label="item.deptName + '_' + item.userName + '_' + item.employeNo" :value="item.loginId">
@@ -304,7 +307,7 @@
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
         </el-form-item>
-        <el-form-item label="签到表照片:" prop="signPhotos">
+        <el-form-item label="签到表:" prop="signPhotos">
           <el-upload :disabled="dialogStatus=='view'?true:false" :action="fileUrl" :file-list="dataFormTrain.signPhotoFiles" :on-success="handleAvatarSuccessTrain1"
             :before-upload="beforeUploadFileTrain" :on-remove="handleRemoveTrain1">
             <el-button size="small" type="primary">点击上传</el-button>
@@ -316,6 +319,11 @@
             <el-button size="small" type="primary">点击上传</el-button>
           </el-upload>
         </el-form-item>
+        <el-form-item v-if="dialogStatus!='view'" label="备注:">
+          <el-card shadow="never" style="width: 95%;padding: 0;min-height: 100px;line-height: normal;">
+            <div v-html="remarkHtml"></div>
+          </el-card>
+        </el-form-item>
         <el-table v-if="dialogStatus=='create'?false:true" :data="trainLogsList" border size="mini">
                     <el-table-column min-width="120" align="center" prop="auditor" label="处理人"></el-table-column>
                     <el-table-column min-width="160" align="center" prop="comment" label="处理结果"></el-table-column>
@@ -329,11 +337,12 @@
   </div>
 </template>
 <script scoped>
-import { certificatePage, certificateUpload, notice, certificatType, dictList, allUserList, citeList, uploadCite, editCite, trainList, uploadTrain,editTrain } from "@/api/allApi";
+import { certificatePage, certificateUpload, notice, certificatType, dictList, allUserList, citeList, uploadCite, editCite, trainList, uploadTrain,editTrain,remarkHtml } from "@/api/allApi";
 import { handleTree } from '@/utils/index'
 export default {
   data() {
     return {
+      remarkHtml:'',
       citeLogsList:[],
       trainLogsList:[],
       integralRules: '',
@@ -403,7 +412,10 @@ export default {
         materials: [{ required: true, message: "请上传培训材料", trigger: "blur" }],
         signPhotos: [{ required: true, message: "请上传签到表照片", trigger: "blur" }],
         sitePhotos: [{ required: true, message: "请上传现场照片", trigger: "blur" }],
-        content: [{ required: true, message: '请填写培训内容', trigger: 'blur' }],
+        content: [
+          { required: true, message: '请填写培训内容', trigger: 'blur' },
+          { min: 50, max: 500, message: '培训内容的描述不得低于50字！', trigger: 'blur' }
+        ],
       },
       totalTrain: 0,
       listQueryTrain: {
@@ -440,8 +452,15 @@ export default {
     this.getTypeList();
     this.getDataList();
     this.getIntegralNotice();
+    this.getRemarkHtml('trainrule');
   },
   methods: {
+    getRemarkHtml(val) {
+      remarkHtml({ noticeType: val }).then(response => {
+          console.log(response.data.data);
+          this.remarkHtml = response.data.data.content
+      })    
+    },
     handleClickCreate(val){
       this.dialogStatus = 'create';
       if(val=='上传表彰'){

src/views/HomeView/MyCenter.vue

@@ -219,6 +219,42 @@
                         </div>
                         
                     </div>
+                    <div v-if="fourthTabPosition == '4'">
+                        <el-date-picker
+                        style="width: 220px; margin-right: 30px;"
+                        size="small"
+                        class="filter-item"
+                        value-format="yyyy-MM-dd"
+                        v-model="listQuery.createTime"
+                        type="date"
+                        placeholder="互动日期">
+                        </el-date-picker>
+                        <el-button size="small" style="margin-right: 30px;" type="primary" @click="handleFilterPostList">查询</el-button>
+                        <el-empty v-if="postList.length==0" :image-size="200"></el-empty>
+                        <div v-else>
+                            <el-table size="small" :data="postList" border style="margin-top: 30px;width: 960px">
+                                <el-table-column align="center" type="index" width="50" label="序号"></el-table-column>
+                                <el-table-column align="center" min-width="100px" label="标题" prop="title">
+                                </el-table-column>
+                                <el-table-column align="center" min-width="80px" label="类型" prop="typeName">
+                                </el-table-column>
+                                <el-table-column align="center" min-width="80px" label="积分" prop="integral">
+                                </el-table-column>
+                                <el-table-column align="center" min-width="100px" label="截止日期" prop="deadline">
+                                </el-table-column>
+                                <el-table-column align="center" min-width="100px" label="创建日期" prop="createTime">
+                                </el-table-column>
+                                <el-table-column align="center" min-width="80px" label="状态" prop="complateStatusName">
+                                </el-table-column>
+                            </el-table>
+                            <div class="myPage">
+                                <el-pagination @size-change="handleSizeChangePostList" @current-change="handleCurrentChangePostList"
+                                    :current-page="currentPage" :page-sizes="[10, 20, 30, 40]" :page-size="10"
+                                    layout="total, sizes, prev, pager, next, jumper" :total="total">
+                                </el-pagination>
+                            </div>
+                        </div>
+                    </div>
                 </el-tab-pane>
             </el-tabs>
         </div>
@@ -226,7 +262,7 @@
     </div>
 </template>
 <script scoped>
-import { orderList, myWelfareList,notice,integralTypes,userlogs,answerList,prizeList,gameLogList } from "@/api/allApi";
+import { orderList, myWelfareList,notice,integralTypes,userlogs,answerList,prizeList,gameLogList,postList } from "@/api/allApi";
 import { getTab,setTab } from '@/utils/auth'
 export default {
     data() {
@@ -234,6 +270,7 @@ export default {
             answerList:[],
             prizeList:[],
             gameLogList:[],
+            postList:[],
             firstList:[],
             firstTabPosition: 'integralList',
             firstTabsList: [
@@ -260,6 +297,10 @@ export default {
                     value: '3',
                     name: '游戏',
                 },
+                {
+                    value: '4',
+                    name: '互动',
+                },
             ],
             
             secondList:[
@@ -342,6 +383,12 @@ export default {
                 this.total = response.data.data.total;
             })
         },
+        getPostList(){
+            postList(this.listQuery).then(response=>{
+                this.postList = response.data.data.items; 
+                this.total = response.data.data.total;
+            })
+        },
         setTab(){
             setTab('gift');
         },
@@ -397,6 +444,7 @@ export default {
             this.listQuery.page = val;
             this.getFirstList();
         },
+        //答题
         handleFilterAnswerList() {
             this.listQuery.page = 1
             this.getAnswerList();
@@ -409,6 +457,7 @@ export default {
             this.listQuery.page = val;
             this.getAnswerList();
         },
+        //抽奖
         handleFilterPrizeList() {
             this.listQuery.page = 1
             this.getPrizeList();
@@ -421,6 +470,7 @@ export default {
             this.listQuery.page = val;
             this.getPrizeList();
         },
+        //游戏
         handleFilterGameLogList() {
             this.listQuery.page = 1
             this.getGameLogList();
@@ -433,6 +483,20 @@ export default {
             this.listQuery.page = val;
             this.getGameLogList();
         },
+        //互动
+        handleFilterPostList() {
+            this.listQuery.page = 1
+            this.getPostList();
+        },
+        handleSizeChangePostList(val) {
+            this.listQuery.limit = val;
+            this.getPostList();
+        },
+        handleCurrentChangePostList(val) {
+            this.listQuery.page = val;
+            this.getPostList();
+        },
+
         handleClickTabs(val) {
             this.total = 0;
             this.listQuery = {
@@ -450,7 +514,11 @@ export default {
             if(val=='3'){
                 this.getGameLogList();
             }
+            if(val=='4'){
+                this.getPostList();
+            }
         },
+
         handleClickSecondTabs(val) {
             if(val=='all'){
                 val = '0,1,2,3,4'

src/views/HomeView/postInteract/detail.vue

@@ -15,7 +15,7 @@
                     <div class="quesList">
                         <div class="listItem" v-for="(item, index) in dataList" :key="index">
                             <div v-if="item.type == 'SCQ'">
-                                <div class="itemTitle">{{ index + 1 }}. {{ item.description }}<el-tag size="small" type="danger"> 单选</el-tag></div>
+                                <div class="itemTitle">{{ index + 1 }}. {{ item.description }}<el-tag class="elTag" size="small" type="danger">单选</el-tag></div>
                                 <el-radio-group v-model="item.comment" class="flex-column">
                                     <el-radio class="myRadio" :disabled="data.interactUserStatus == 0?false:true" v-for="(childItem, childIndex) in item.options" :key="childIndex"
                                         :label="childItem.id">{{ childItem.name }}</el-radio>
@@ -23,15 +23,18 @@
                             </div>
 
                             <div v-if="item.type == 'MCQ'">
-                                <div class="itemTitle">{{ index + 1 }}. {{ item.description }}<el-tag size="small" type="danger"> 多选</el-tag></div>
+                                <div class="itemTitle">{{ index + 1 }}. {{ item.description }}<el-tag class="elTag" size="small" type="danger">多选</el-tag></div>
                                 <el-checkbox-group v-model="item.comment" class="flex-column">
                                     <el-checkbox class="myRadio" :disabled="data.interactUserStatus == 0?false:true" v-for="(childItem, childIndex) in item.options" :key="childIndex"
                                         :label="childItem.id">{{ childItem.name }}</el-checkbox>
                                 </el-checkbox-group>
                             </div>
                             <div v-if="item.type == 'SAQ'">
-                                <div class="itemTitle">{{ index + 1 }}. {{ item.description }}<el-tag size="small" type="danger"> 问答</el-tag></div>
-                                <el-input :disabled="data.interactUserStatus == 0?false:true" type="textarea" :rows="4" placeholder="请输入内容" v-model="item.comment"></el-input>
+                                <div class="itemTitle">{{ index + 1 }}. {{ item.description }}<el-tag class="elTag" size="small" type="danger">问答</el-tag></div>
+                                <div v-if="data.interactUserStatus != 0" class="myText">
+                                    {{ item.comment }}
+                                </div>
+                                <el-input v-else type="textarea" :rows="6" maxlength="200" show-word-limit placeholder="请输入内容" v-model="item.comment"></el-input>
                             </div>
                         </div>
                         <div v-if="data.interactUserStatus == 0" class="footBut">
@@ -76,6 +79,12 @@ export default {
     methods: {
         save() {
             console.log(this.dataList);
+            for(var i=0;i<this.dataList.length;i++){
+                if(this.dataList[i].comment=='' || this.dataList[i].comment==[]){
+                    this.$message.error('还有题目未完成，无法提交！');
+                    return
+                }
+            }
             let dataList = [];
             this.dataList.forEach(item => {
                 if (item.type == "MCQ") {
@@ -133,7 +142,26 @@ export default {
 }
 </script>
 <style scoped>
+.myText {
+    display: block;
+    resize: vertical;
+    padding: 5px 15px;
+    line-height: 1.5;
+    box-sizing: border-box;
+    width: 100%;
+    font-size: 14px;
+    color: #606266;
+    background-color: #FFF;
+    background-image: none;
+    border: 1px solid #DCDFE6;
+    border-radius: 4px;
+    transition: border-color .2s cubic-bezier(.645,.045,.355,1);
+}
 .myRadio{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    white-space:normal !important;
     margin: 10px !important;
 }
 .flex-column{
@@ -160,6 +188,9 @@ export default {
     margin-bottom: 10px;
     font-weight: 700;
 }
+.elTag{
+    margin-left: 5px;
+}
 
 .userInfo {
     width: 65px;

vue.config.js

@@ -14,7 +14,7 @@ const cdn = {
 };
 module.exports = defineConfig({
   devServer:{
-    host: '192.168.100.205',
+    host: '192.168.100.104',
     open:true
   },
   transpileDependencies: true,