update

src/common/api/axios.js

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2020-05-18 12:05:37
  * @LastEditors: XuTongZhang
- * @LastEditTime: 2020-07-29 10:45:59
+ * @LastEditTime: 2020-08-10 19:58:38
  * @FilePath     : \batterycloud-admin\src\common\api\axios.js
  */
 import axios from 'axios'
@@ -29,7 +29,7 @@ service.interceptors.request.use(
       'from': 0,
       'page': 1,
       'rows': 10,
-      'companyId': 1 || localStorage.getItem('managerid') - 0,
+      'companyId': 2 || localStorage.getItem('managerid') - 0,
       'sidx': '',
       'sord': '',
       'token': localStorage.getItem('token'),

src/views/candidateManage/candidateAll.vue

@@ -4,7 +4,7 @@
  * @Autor: XuTongZhang
  * @Date: 2020-07-30 10:17:25
  * @LastEditors: XuTongZhang
- * @LastEditTime: 2020-08-05 20:09:41
+ * @LastEditTime: 2020-08-10 19:07:37
 -->
 <template>
   <div class="indexPage">
@@ -134,7 +134,7 @@ export default {
           },
           {
             label: '面试结果',
-            props: 'isPass',
+            props: 'interviewResult',
             options: ['未通过', '已通过', '已淘汰']
           }
         ],

src/views/candidateManage/candidateList.vue

@@ -4,7 +4,7 @@
  * @Autor: XuTongZhang
  * @Date: 2020-07-28 15:25:06
  * @LastEditors: XuTongZhang
- * @LastEditTime: 2020-08-10 14:48:42
+ * @LastEditTime: 2020-08-10 19:27:12
 -->
 <template>
   <div class="indexPage">
@@ -386,12 +386,12 @@ export default {
         a = valid
       })
       if (!a) return
+      let resumeInfoStatusList = this.copyPickList.map(item => ({ id: item, templateId: this.form.templateId }))
       this.copyPickList.length
         ? this.$api
           .post('/resumeInfo/sendInviteMail', {
             reqdata: {
-              ids: this.copyPickList,
-              templateId: this.form.templateId
+              resumeInfoStatusList
             }
           })
           .then((res) => {
@@ -451,7 +451,7 @@ export default {
     },
     del (row, type = false) {
       let ids = type ? row : [row.id]
-      let deleteResumeInfoList = ids.map(item => ({ id: item, status: 1 }))
+      let resumeInfoStatusList = ids.map(item => ({ id: item, status: 1 }))
       this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -461,7 +461,7 @@ export default {
           this.$api
             .post('/resumeInfo/deleteResumeInfo', {
               reqdata: {
-                deleteResumeInfoList
+                resumeInfoStatusList
               }
             })
             .then((res) => {

src/views/candidateManage/mailManage.vue

@@ -4,7 +4,7 @@
  * @Autor: XuTongZhang
  * @Date: 2020-08-03 09:38:03
  * @LastEditors: XuTongZhang
- * @LastEditTime: 2020-08-03 10:50:07
+ * @LastEditTime: 2020-08-10 19:59:58
 -->
 <template>
   <div class="mailManage">
@@ -52,6 +52,8 @@ export default {
   data () {
     let determine = function (val) {
       let reqdata = val === 0 ? this.form51 : val === 1 ? this.formzl : this.form58
+      reqdata.companyId = 2
+      // reqdata.id = 3
       reqdata.cmpMailType = val
       this.$api
         .post('/companyAccount/updateCompanyAccount', {

src/views/candidateManage/resume.vue

@@ -4,48 +4,54 @@
  * @Autor: XuTongZhang
  * @Date: 2020-07-30 10:32:00
  * @LastEditors: XuTongZhang
- * @LastEditTime: 2020-08-05 20:23:31
+ * @LastEditTime: 2020-08-10 19:22:25
 -->
 <template>
-    <div>
-        <el-dialog :visible.sync="dialogFormVisible" width="1400px" :before-close="close" :close-on-click-modal="false">
-            <div class="flex">
-                <div class="left">
-                    <div class="top">
-                        <div class="title">{{info.delivererName}}的面试视频：</div>
-                        <div class="video">
-                            <video width="100%" controls :src="$img + '/yc1min/videoLibrary/20200729/86a4a324-7e90-415d-9685-41e2f4a75c03.mp4'"></video>
-                        </div>
-                        <!-- https://vdept.bdstatic.com/324b4d51474d51685674525a7a397737/424e6c6a6b354875/e4f949c59a0a5afc39446b7e83c8e2893ec5727c25bd8fde06c2adaa08b7cf820228b97312bb8b487ef1f73ac3aaf66af73fd54d4fd6f64d5f280059490670d7.mp4?auth_key=1596084985-0-0-014de3491d14f4f16a570bc972366f96 -->
-                        <div class="list">
-                            <div @click="active = 0" :class="active === 0 ? 'is-active' : ''">视频第一段</div>
-                            <div @click="active = 1" :class="active === 1 ? 'is-active' : ''">视频第二段</div>
-                            <div @click="active = 2" :class="active === 2 ? 'is-active' : ''">视频第三段</div>
-                            <!-- <div v-for="(i, j) in item.videoIdList" :key="j" class="active" @click="active = j" :class="active === j ? 'is-active' : ''">{{downList.some(k => k.id === i).videoName ? downList.find(k => k.id === i).videoName : '无数据'}}</div> -->
-                        </div>
-                    </div>
-                    <div class="center">
-                        <div class="title">简历备注：</div>
-                        <el-input
-                            type="textarea"
-                            :rows="4"
-                            resize="none"
-                            placeholder="请输入内容"
-                            v-model="remark"
-                        ></el-input>
-                    </div>
-                    <div class="footer">
-                        <el-button type="primary" @click="submit">提交备注</el-button>
-                        <el-button type="danger" @click="through(2)">标记为未通过</el-button>
-                        <el-button type="success" @click="through(1)">标记为通过</el-button>
-                    </div>
-                </div>
-                <div class="right">
-                    <iframe width="100%" height="100%" :src="$img + info.filePath"></iframe>
-                </div>
+  <div>
+    <el-dialog
+      :visible.sync="dialogFormVisible"
+      width="1400px"
+      :before-close="close"
+      :close-on-click-modal="false"
+    >
+      <div class="flex">
+        <div class="left">
+          <div class="top" v-if="info.answerVideoList && info.answerVideoList.length">
+            <div class="title">{{info.delivererName}}的面试视频：</div>
+            <div class="video">
+              <video
+                width="100%"
+                controls
+                v-if="info.answerVideoList && info.answerVideoList.length"
+                :src="$img + info.answerVideoList[active].answerVideoPath"
+              ></video>
             </div>
-        </el-dialog>
-    </div>
+            <div class="list">
+              <div
+                v-for="(item, index) in info.answerVideoList"
+                :key="item.id"
+                class="active"
+                @click="active = index"
+                :class="active === index ? 'is-active' : ''"
+              >第{{index + 1}}段</div>
+            </div>
+          </div>
+          <div class="center">
+            <div class="title">简历备注：</div>
+            <el-input type="textarea" :rows="4" resize="none" placeholder="请输入内容" v-model="remark"></el-input>
+          </div>
+          <div class="footer">
+            <el-button type="primary" @click="submit">提交备注</el-button>
+            <el-button type="danger" @click="through(2)">标记为未通过</el-button>
+            <el-button type="success" @click="through(1)">标记为通过</el-button>
+          </div>
+        </div>
+        <div class="right">
+          <iframe width="100%" height="100%" :src="$img + info.filePath"></iframe>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -80,11 +86,14 @@ export default {
   },
   methods: {
     through (val) {
-      let deleteResumeInfoList = [this.info.id].map(item => ({ id: item, isPass: val }))
+      let resumeInfoStatusList = [this.info.id].map((item) => ({
+        id: item,
+        interviewResult: val
+      }))
       this.$api
         .post('/resumeInfo/changeInterviewResult', {
           reqdata: {
-            deleteResumeInfoList
+            resumeInfoStatusList
           }
         })
         .then((res) => {
@@ -112,61 +121,60 @@ export default {
     }
   }
 }
-
 </script>
 
 <style lang="scss" scoped>
-    .flex {
+.flex {
+  display: flex;
+  justify-content: space-between;
+  .left {
+    flex: 1;
+    margin-right: 20px;
+    .top {
+      .title {
+        font-size: 28px;
+        margin-bottom: 10px;
+      }
+      .list {
+        margin-top: 10px;
+        font-size: 14px;
         display: flex;
-        justify-content: space-between;
-        .left {
-            flex: 1;
-            margin-right: 20px;
-            .top {
-                .title {
-                    font-size: 28px;
-                    margin-bottom: 10px;
-                }
-                .list {
-                    margin-top: 10px;
-                    font-size: 14px;
-                    display: flex;
-                    color: rgb(42, 117, 216);
-                    > div {
-                        cursor: pointer;
-                        margin: 10px;
-                    }
-                    .is-active {
-                        color: #000;
-                        font-size: 16px;
-                        margin-top: 7px;
-                    }
-                }
-            }
-            .center {
-                margin-top: 10px;
-                .title {
-                    font-size: 22px;
-                    margin-bottom: 10px;
-                }
-            }
-            .footer {
-                margin-top: 30px;
-                display: flex;
-                justify-content: center;
-            }
+        color: rgb(42, 117, 216);
+        > div {
+          cursor: pointer;
+          margin: 10px;
         }
-        .right {
-            // margin-left: 30px;
-            // flex: 1;
-            overflow: scroll;
-            width: 770px;
-            iframe {
-                border: none;
-                html {
-                    width: 100%;
-                }
-            }
+        .is-active {
+          color: #000;
+          font-size: 16px;
+          margin-top: 7px;
         }
+      }
+    }
+    .center {
+      margin-top: 10px;
+      .title {
+        font-size: 22px;
+        margin-bottom: 10px;
+      }
+    }
+    .footer {
+      margin-top: 30px;
+      display: flex;
+      justify-content: center;
     }
+  }
+  .right {
+    // margin-left: 30px;
+    // flex: 1;
+    overflow: scroll;
+    width: 770px;
+    iframe {
+      border: none;
+      html {
+        width: 100%;
+      }
+    }
+  }
+}
 </style>

src/views/candidateManage/resumeList.vue

@@ -4,7 +4,7 @@
  * @Autor: XuTongZhang
  * @Date: 2020-07-30 09:53:19
  * @LastEditors: XuTongZhang
- * @LastEditTime: 2020-08-10 14:49:02
+ * @LastEditTime: 2020-08-10 20:09:51
 -->
 <template>
   <div class="indexPage">
@@ -43,7 +43,6 @@
       :visible.sync="dialogFormVisible"
       width="600px"
       :before-close="close"
-      :show-close="false"
       :close-on-click-modal="false"
       >
       <el-form :model="form" ref="form" label-width="140px" :rules="rules" label-position="left">
@@ -133,11 +132,11 @@ export default {
           type: 'primary',
           method: 'search'
         },
-        {
-          name: '通知面试',
-          type: 'success',
-          method: 'notice'
-        },
+        // {
+        //   name: '通知面试',
+        //   type: 'success',
+        //   method: 'notice'
+        // },
         {
           name: '标记通过',
           type: 'primary',
@@ -203,11 +202,11 @@ export default {
             method: 'details',
             type: 'info'
           },
-          {
-            title: '通知面试',
-            method: 'notice',
-            type: 'success'
-          },
+          // {
+          //   title: '通知面试',
+          //   method: 'notice',
+          //   type: 'success'
+          // },
           {
             title: '标记通过',
             method: 'through',
@@ -370,12 +369,12 @@ export default {
         a = valid
       })
       if (!a) return
+      let resumeInfoStatusList = this.copyPickList.map(item => ({ id: item, templateId: this.form.templateId }))
       this.copyPickList.length
         ? this.$api
           .post('/resumeInfo/sendInviteMail', {
             reqdata: {
-              ids: this.copyPickList,
-              templateId: this.form.templateId
+              resumeInfoStatusList
             }
           })
           .then((res) => {
@@ -500,11 +499,11 @@ export default {
               method: 'details',
               type: 'info'
             },
-            {
-              title: '通知面试',
-              method: 'notice',
-              type: 'success'
-            },
+            // {
+            //   title: '通知面试',
+            //   method: 'notice',
+            //   type: 'success'
+            // },
             {
               title: '标记通过',
               method: 'through',