feat

src/common/sass/common.scss

@@ -2,4 +2,4 @@
 @import './layout.scss';
 @import './appPage.scss';
 @import './indexPage.scss';
-@import './loginPage.scss';
+// @import './loginPage.scss';

src/lang/zh.js

@@ -23,7 +23,7 @@ let button = {
 }
 
 let field = {
-  numbering: '编号',
+  serialNumber: '序号',
   formName: '表单名称',
   description: '说明'
 }

src/views/candidateManage/candidateAll.vue

@@ -288,9 +288,10 @@ export default {
         })
         .then((res) => {
           this.totalrecords = res.totalrecords
-          this.tableList = res.list.map(item => {
+          this.tableList = res.list.map((item, index) => {
             item.delivererSex = item.delivererSex - 0 || 0
             item.desiredPositionId = item.desiredPositionId - 0 || null
+            item.serialNumber = (this.page - 1) * 10 + index + 1
             // item.desiredPositionId = item.desiredPositionId ? this.downList1.some(i => i.id === item.desiredPositionId) ? this.downList1.find(i => i.id === item.desiredPositionId).positionName : '' : ''
             item.state = item.interviewResult ? ['', '已通过', '未通过'][item.interviewResult] : item.isSendInviteMail ? '已通知' : ['未读', '通过', '淘汰', '待定'][item.isPass]
             return item

src/views/candidateManage/candidateList.vue

@@ -642,9 +642,10 @@ export default {
         })
         .then((res) => {
           this.totalrecords = res.totalrecords
-          this.tableList = res.list.map(item => {
+          this.tableList = res.list.map((item, index) => {
             item.delivererSex = item.delivererSex - 0 || 0
             item.desiredPositionId = item.desiredPositionId - 0 || null
+            item.serialNumber = (this.page - 1) * 10 + index + 1
             // item.desiredPositionId = item.desiredPositionId ? this.downList1.some(i => i.id === item.desiredPositionId) ? this.downList1.find(i => i.id === item.desiredPositionId).positionName : '' : ''
             return item
           })

src/views/candidateManage/resume.vue

@@ -52,6 +52,7 @@
                 <!-- {{item.type === 2 ? ['女', '男'][info[item.fieldName]] : item.type === 8 ? ['女', '男'][info[item.fieldName]] : info[item.fieldName]}} -->
                 <div v-if="item.type === 2">{{['女', '男'][form[item.fieldName]]}}</div>
                 <el-link type="primary" v-else-if="item.type === 8" @click="openNewPage($img + form[item.fieldName])" >{{item.configName + '文件'}}</el-link>
+                <div v-if="item.type === 1" v-html="info[item.fieldName].replace(/\n/g,'<br/>')"></div>
                 <div v-else>{{form[item.fieldName]}}</div>
             </el-form-item>
             <el-form-item label="意向职位">

src/views/candidateManage/resumeList.vue

@@ -52,7 +52,7 @@
                     </el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="简历投递职位" prop="positionApplied">
+            <el-form-item label="投递职位" prop="positionApplied">
                 <el-input placeholder="请输入投递职位" v-model="uform.positionApplied" maxlength="32" show-word-limit></el-input>
             </el-form-item>
             <el-form-item label="工作年限" prop="delivererWorkExp">
@@ -72,7 +72,7 @@
             </el-form-item>
             <el-form-item>
                 <el-button @click="closeDia">取 消</el-button>
-                <el-button type="primary" @click="submit">修改信息</el-button>
+                <el-button type="primary" @click="submit">修改</el-button>
             </el-form-item>
         </el-form>
     </el-dialog>
@@ -82,6 +82,7 @@
                 <!-- {{item.type === 2 ? ['女', '男'][info[item.fieldName]] : item.type === 8 ? ['女', '男'][info[item.fieldName]] : info[item.fieldName]}} -->
                 <div v-if="item.type === 2">{{['女', '男'][info[item.fieldName]]}}</div>
                 <el-link type="primary" v-else-if="item.type === 8" @click="openNewPage($img + info[item.fieldName])" >{{item.configName + '文件'}}</el-link>
+                <div v-if="item.type === 1" v-html="info[item.fieldName].replace(/\n/g,'<br/>')"></div>
                 <div v-else>{{info[item.fieldName]}}</div>
             </el-form-item>
             <el-form-item label="意向职位">
@@ -256,8 +257,8 @@ export default {
       table: {
         selection: true,
         column: [{
-          label: '编号',
-          props: 'id'
+          label: this.$t('field.serialNumber'),
+          props: 'serialNumber'
         },
         {
           label: '姓名',
@@ -274,11 +275,11 @@ export default {
           options: ['51job', '智联招聘', '58同城', '平台']
         },
         {
-          label: '简历投递时间',
+          label: '投递时间',
           props: 'createTime'
         },
         {
-          label: '简历投递职位',
+          label: '投递职位',
           props: 'positionApplied'
         },
         {
@@ -325,7 +326,7 @@ export default {
           type: 'danger'
         },
         {
-          title: '修改信息',
+          title: '修改',
           method: 'update',
           type: 'warning'
         }
@@ -334,8 +335,8 @@ export default {
       table1: {
         selection: true,
         column: [{
-          label: '编号',
-          props: 'id'
+          label: this.$t('field.serialNumber'),
+          props: 'serialNumber'
         },
         {
           label: '姓名',
@@ -352,11 +353,11 @@ export default {
           options: ['51job', '智联招聘', '58同城', '平台']
         },
         {
-          label: '简历投递时间',
+          label: '投递时间',
           props: 'createTime'
         },
         {
-          label: '简历投递职位',
+          label: '投递职位',
           props: 'positionApplied'
         },
         {
@@ -398,7 +399,7 @@ export default {
           type: 'success'
         },
         {
-          title: '修改信息',
+          title: '修改',
           method: 'update',
           type: 'warning'
         }
@@ -407,8 +408,8 @@ export default {
       throughTable: {
         selection: true,
         column: [{
-          label: '编号',
-          props: 'id'
+          label: this.$t('field.serialNumber'),
+          props: 'serialNumber'
         },
         {
           label: '姓名',
@@ -425,7 +426,7 @@ export default {
           options: ['51job', '智联招聘', '58同城', '平台']
         },
         {
-          label: '简历投递时间',
+          label: '投递时间',
           props: 'createTime'
         },
         {
@@ -434,7 +435,7 @@ export default {
           options: ['未面试', '已面试']
         },
         {
-          label: '简历投递职位',
+          label: '投递职位',
           props: 'positionApplied'
         },
         {
@@ -473,7 +474,7 @@ export default {
           type: 'danger'
         },
         {
-          title: '修改信息',
+          title: '修改',
           method: 'update',
           type: 'warning'
         }
@@ -522,7 +523,10 @@ export default {
         })
         .then((res) => {
           this.totalrecords = res.totalrecords
-          this.tableList = res.list
+          this.tableList = res.list.map((item, index) => {
+            item.serialNumber = (this.page - 1) * 10 + index + 1
+            return item
+          })
         })
     },
     queryDownList () {
@@ -821,7 +825,7 @@ export default {
           type: 'danger'
         },
         {
-          title: '修改信息',
+          title: '修改',
           method: 'update',
           type: 'warning'
         }
@@ -842,7 +846,7 @@ export default {
             type: 'danger'
           },
           {
-            title: '修改信息',
+            title: '修改',
             method: 'update',
             type: 'warning'
           }
@@ -867,7 +871,7 @@ export default {
             type: 'danger'
           },
           {
-            title: '修改信息',
+            title: '修改',
             method: 'update',
             type: 'warning'
           }

src/views/companyManage/basicInfo.vue

@@ -32,6 +32,7 @@
             <el-form-item :label="$t('title.companyProfile')">
                 <editor-bar class="editor" v-model.trim="form.companyIntroduce"></editor-bar>
                 <div style="color: #666">提示： 1000字以内为佳</div>
+                <div style="color: #666">已输入：{{getText.length}}字</div>
             </el-form-item>
             <el-form-item v-if="show" class="button-grounp">
                 <el-button type="primary" @click="determine">{{$t('button.confirmTheChanges')}}</el-button>
@@ -136,6 +137,13 @@ export default {
         })
     }
   },
+  computed: {
+    getText () {
+      return this.form.companyIntroduce
+        .replace(/<[^<>]+>/g, '')
+        .replace(/&nbsp;/gi, '')
+    }
+  },
   watch: {
     'form.companyAddress' (val) {
       this.show = this.info.companyAddress !== val

src/views/companyManage/formManage.vue

@@ -133,8 +133,8 @@ export default {
       }],
       table: {
         column: [{
-          label: this.$t('field.numbering'),
-          props: 'id'
+          label: this.$t('field.serialNumber'),
+          props: 'serialNumber'
         },
         {
           label: this.$t('field.formName'),
@@ -199,7 +199,10 @@ export default {
         })
         .then((res) => {
           this.totalrecords = res.totalrecords
-          this.tableList = res.list
+          this.tableList = res.list.map((item, index) => {
+            item.serialNumber = (this.page - 1) * 10 + index + 1
+            return item
+          })
         })
     },
     queryFormConfigList () {

src/views/companyManage/positionInfo.vue

@@ -77,8 +77,8 @@ export default {
       }],
       table: {
         column: [{
-          label: '编号',
-          props: 'id'
+          label: '序号',
+          props: 'serialNumber'
         },
         {
           label: '职位名称',
@@ -129,7 +129,8 @@ export default {
         })
         .then((res) => {
           this.totalrecords = res.totalrecords
-          this.tableList = res.list.map(item => {
+          this.tableList = res.list.map((item, index) => {
+            item.serialNumber = (this.page - 1) * 10 + index + 1
             item.positionIntroduceX = item.positionIntroduce.length > 100 ? item.positionIntroduce.slice(0, 100) + '...' : item.positionIntroduce
             return item
           })

src/views/companyManage/procedureManage.vue

@@ -117,8 +117,8 @@ export default {
       ],
       table: {
         column: [{
-          label: '编号',
-          props: 'id'
+          label: '序号',
+          props: 'serialNumber'
         },
         {
           label: '岗位名称',
@@ -160,7 +160,10 @@ export default {
         })
         .then((res) => {
           this.totalrecords = res.totalrecords
-          this.tableList = res.list
+          this.tableList = res.list.map((item, index) => {
+            item.serialNumber = (this.page - 1) * 10 + index + 1
+            return item
+          })
         })
     },
     queryDownList () {

src/views/companyManage/sceneManage.vue

@@ -61,8 +61,8 @@ export default {
       }],
       table: {
         column: [{
-          label: '编号',
-          props: 'id'
+          label: '序号',
+          props: 'serialNumber'
         },
         {
           label: '场景名称',
@@ -106,7 +106,11 @@ export default {
         })
         .then((res) => {
           this.totalrecords = res.totalrecords
-          this.tableList = res.list
+          // this.tableList = res.list
+          this.tableList = res.list.map((item, index) => {
+            item.serialNumber = (this.page - 1) * 10 + index + 1
+            return item
+          })
         })
     },
     add () {

src/views/companyManage/templateManage.vue

@@ -13,16 +13,16 @@
     <v-pager @page="callPage" :total="totalrecords"></v-pager>
     <el-dialog :visible.sync="dialogFormVisible" :before-close="close" width="650px" :close-on-click-modal="false">
         <el-form :model="form" ref="form" label-width="140px" :rules="rule" label-position="left">
-            <el-form-item label="邀约岗位" prop="templateName">
-                <el-autocomplete v-if="state !== 2" v-model="form.templateName" :fetch-suggestions="querySearch" placeholder="请输入邀约岗位" @select="handleSelect" :maxlength="32" show-word-limit></el-autocomplete>
-                <div v-else>{{form.templateName}}</div>
-            </el-form-item>
             <el-form-item label="关联场景" prop="sceneId">
                 <el-select v-if="state !== 2" filterable clearable v-model="form.sceneId" placeholder="请选择关联场景">
                     <el-option v-for="item in downList0" :key="item.id" :label="item.sceneName" :value="item.id"></el-option>
                 </el-select>
                 <div v-else>{{this.downList0.some(i => i.id === form.sceneId) ? this.downList0.find(i => i.id === form.sceneId).sceneName : ''}}</div>
             </el-form-item>
+            <el-form-item label="邮件主题" prop="templateName">
+                <el-autocomplete v-if="state !== 2" v-model="form.templateName" :fetch-suggestions="querySearch" placeholder="请输入邮件主题" @select="handleSelect" :maxlength="32" show-word-limit></el-autocomplete>
+                <div v-else>{{form.templateName}}</div>
+            </el-form-item>
             <el-form-item v-if="form.sceneId === 1||form.sceneId === 4" label="邮件内容" prop="templateIntroduce">
                 <el-input v-if="state !== 2" type="textarea" :rows="4" resize="none" placeholder="请输入邮件内容" v-model="form.templateIntroduce" maxlength="1024" show-word-limit></el-input>
                 <div v-else>{{form.templateIntroduce}}</div>
@@ -81,7 +81,7 @@ export default {
   data () {
     let validator = (rule, value, callback) => {
       if (value === '') {
-        callback(new Error('请输入邀约岗位!'))
+        callback(new Error('请输入邮件主题!'))
       } else if (this.restaurants.map(item => item.value).filter(item => item !== this.form.name).includes(value)) {
         callback(new Error('该名称已被使用!'))
       } else {
@@ -155,11 +155,11 @@ export default {
       }],
       table: {
         column: [{
-          label: '编号',
-          props: 'id'
+          label: '序号',
+          props: 'serialNumber'
         },
         {
-          label: '邀约岗位',
+          label: '邮件主题',
           props: 'templateName'
         },
         {
@@ -254,11 +254,12 @@ export default {
         })
         .then((res) => {
           this.totalrecords = res.totalrecords
-          this.tableList = res.list.map(item => {
+          this.tableList = res.list.map((item, index) => {
             item.sceneName = this.downList0.some(i => i.id === item.sceneId) ? this.downList0.find(i => i.id === item.sceneId).sceneName : ''
             item.processName = this.downList1.some(i => i.id === item.processId) ? this.downList1.find(i => i.id === item.processId).processName : ''
             item.formName = this.downList2.some(i => i.id === item.formId) ? this.downList2.find(i => i.id === item.formId).formName : ''
             item.type = !(item.sceneId !== 1 && item.sceneId !== 4)
+            item.serialNumber = (this.page - 1) * 10 + index + 1
             return item
           })
           this.restaurants = res.list.map(item => ({ value: item.templateName }))
@@ -447,7 +448,7 @@ export default {
     工作人员将通过电话或邮件与您联系后续相关安排，敬请留意！<br/><br/>
 
 
-      <h4>邀约面试-“邀约岗位”一栏文字     （对应邮件主题）</h4><br/>
+      <h4>邀约面试-“邮件主题”一栏文字     （对应邮件主题）</h4><br/>
    收到您投递的简历，请完成视频初试<br/><br/>
 
     <h4>邀约面试-“邮件内容”一栏文字。  （对应邮件正文）</h4><br/>

src/views/login.vue

@@ -7,15 +7,15 @@
 -->
 <template>
 <div class="loginPage">
-    <div class="login">
-        <!-- login-title -->
+    <!-- <div class="login">
+
         <div class="login-title">
-            <!-- <el-button type="text" style="margin-right: 33px" class="select-btn">优创面试后台管理</el-button> -->
+
           <div class="logo">
               <img src="../../public/img/logo3.png" style="width: 350px;padding:10px 0;display: bolck" alt="">
           </div>
         </div>
-        <!-- pwd -->
+
         <div class="pwd-login">
             <el-form :model="loginForm" :rules="pwdRules" ref="pwdLogin" label-width="0">
                 <el-form-item prop="loginname">
@@ -35,21 +35,140 @@
             <el-button class="login-btn" @click="login">登录</el-button>
         </div>
         <div class="forget" @click="forget">忘记密码？</div>
+    </div> -->
+    <div class="loginPage-left">
+      <div>
+        <img src="../../public/img/logo3.png" alt="">
+        <p>欢迎登录</p>
+        <p>优创后台系统</p>
+      </div>
+    </div>
+    <div class="loginPage-right">
+      <div class="loginPage-right-content">
+        <el-form :model="loginForm" :rules="pwdRules" ref="pwdLogin" label-width="0">
+          <el-form-item prop="loginname">
+            <!-- <el-input v-model="loginForm.loginname" name="loginname" type="tel" autocomplete="new-password" placeholder="请输入账号"> -->
+              <!-- <span slot="prefix" class="iconfont iconshouji"></span> -->
+            <!-- </el-input> --><i class="el-icon-postcard"></i>
+            <input v-model="loginForm.loginname" name="loginname" type="tel" autofocus autocomplete="new-password" placeholder="请输入账号">
+          </el-form-item>
+          <el-form-item prop="password">
+            <!-- <el-input type="password" v-model="loginForm.password" name="password" @keyup.enter.native="login" autocomplete="new-password" placeholder="请输入密码">
+              <span slot="prefix" class="iconfont iconmima"></span>
+            </el-input> --><i class="el-icon-unlock"></i>
+            <input v-model="loginForm.password" name="password" type="password" autocomplete="new-password" @keyup.enter="login" placeholder="请输入密码">
+          </el-form-item>
+        </el-form>
+        <button class="login-btn" @click="login">登录</button>
+        <div class="forget" @click="forget">忘记密码？</div>
+      </div>
     </div>
-    <!--</div>-->
 </div>
 </template>
 
 <style lang="scss" scoped>
-.login-title {
+// .login-title {
+//     display: flex;
+//     justify-content: center;
+//     align-items: center;
+// }
+// .forget {
+//   color: rgb(30, 71, 184);
+//   text-align: right;
+//   line-height: 5px;
+// }
+.loginPage {
+  display: flex;
+  width: 100%;
+  height: 100vh;
+  &-left {
+    flex: 2;
+    background-color: #00A0E9;
     display: flex;
     justify-content: center;
     align-items: center;
-}
-.forget {
-  color: rgb(30, 71, 184);
-  text-align: right;
-  line-height: 5px;
+    flex-direction: column;
+    div {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      position: relative;
+      top: -5%;
+    }
+    img {
+      width: 70%;
+      // margin: 0 auto;
+      // height: auto;
+      margin-bottom: 30px;
+    }
+    p {
+      margin-bottom: 10px;
+      width: 65%;
+      font-size: 30px;
+      color: #fff;
+      font-family:"微软雅黑";
+    }
+  }
+  &-right {
+    flex: 3;
+    height: 100%;
+    &-content {
+      width: 100%;
+      height: 90%;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      margin-top: 7%;
+      .el-form {
+        width: 40%;
+        // height: 20%;
+        background-color: rgba($color: #fff, $alpha: 0);
+        /deep/ .el-form-item__content {
+          display: flex;
+        }
+      }
+      button {
+        border: none;
+        background-color: #00A0E9;
+        height: 60px;
+        width: 160px;
+        font-size: 24px;
+        box-shadow: 5px 5px 5px 3px #888888;
+        margin-top: 30px;
+        color: #fff;
+        font-family:"微软雅黑";
+      }
+      .forget {
+        margin-top: 50px;
+        color: #00A0E9;
+        font-size: 18px;
+      }
+      input {
+        border: none;
+        height: 35px;
+        padding: 5px 65px;
+        font-size: 21px;
+        width: 100%;
+        margin: 15px auto;
+        outline: none;
+        border-bottom: rgb(159, 163, 167) 2px solid;
+        margin-left: -45px;
+      }
+      input:focus {
+        border-bottom: #00A0E9 2px solid;
+      }
+      i {
+        font-size: 34px;
+        line-height: 72px;
+        position: relative;
+        z-index: 66;
+      }
+      .flex {
+        display: flex;
+      }
+    }
+  }
 }
 </style>