Merge branch 'master' of https://gitee.com/beiwu/cmanager

src/lang/zh.js

@@ -80,7 +80,7 @@ export default {
     code: '请输入您的验证码',
     submit: '登录',
     userLogin: '账号密码',
-    phoneLogin: '德阳市智慧就业服务平台',
+    phoneLogin: '用户登录',
     thirdLogin: '第三方登录',
     msgText: '获取验证码',
     msgSuccess: '秒后重发',

src/page/login/index.vue

@@ -2,11 +2,14 @@
   <div class="login-container" ref="login" @keyup.enter.native="handleLogin">
     <!-- <cmanage-title @change="changeActive"></cmanage-title> -->
     <div class="login-weaper animated bounceInDown">
-      <div style="height: 50px;"></div>
+      <div class="login-page-title">
+        <img src="/img/icon/logo_sczj.png" alt="">
+        四川省人力资源和社会保障</div>
+      <div class="login-wrapper-small">
         <div class="login-content">
-       <!-- <div class="login-left">
+          <div class="login-left">
-          <img class="img" src="/manage/img/logobg.png" alt />
+            <img class="img" src="/img/bg/back_zj.png" alt />
-        </div> -->
+          </div>
           <div class="login-border">
             <user-login v-if="activeName === 'login'" @change="changeActive" />
             <forget-pwd v-else-if="activeName === 'pwd'" @change="changeActive" />
@@ -14,7 +17,11 @@
             <work-station-login v-else-if="activeName === 'workstation'" @change="changeActive"></work-station-login>
           </div>
         </div>
-      <div data-v-3c692830="" style="text-align: center; margin-top: 20px; padding-bottom: 30px;"><div data-v-3c692830="" style="font-size: 12px; color: #40a9ff;">Copyright @ 德阳市智慧就业服务中心</div></div>
+      </div>
+
+      <div data-v-3c692830="" style="text-align: center; margin-top: 20px; padding-bottom: 30px;">
+        <div data-v-3c692830="" style="font-size: 12px; color: #40a9ff;">Copyright @ 德阳市智慧就业服务中心</div>
+      </div>
     </div>
   </div>
 </template>

src/styles/login.scss

@@ -8,7 +8,6 @@
   display: flex;
   flex-direction: column;
 
-
   .login-header {
     width: 100%;
     height: 70px;
@@ -18,7 +17,7 @@
     padding: 0 40px;
     background-color: #fff;
     font-size: 16px;
-    color:#CCCCCC;
+    color: #cccccc;
     display: flex;
     flex-direction: row;
     justify-content: space-between;
@@ -47,18 +46,37 @@
     justify-content: center;
     align-items: center;
     background-color: #f4f6fa;
+    .login-page-title {
+      height: 50px;
+      font-size: 28px;
+      padding: 30px 0 15px 250px;
+      display: flex;
+      align-items: center;
+      img {
+        width: 50px;
+        height: 50px;
+        margin-right: 10px;
+      }
+    }
+
+    .login-wrapper-small {
+      width: 100%;
+      background-image: linear-gradient(0deg, #006dd9 0%, #74b2ec 99%);
       .login-content {
-        width: 1000px;
+        width: 80%;
+        min-height: 40vw;
+
         //height: 100%;
         margin: 0 auto;
         position: relative;
         display: flex;
-        justify-content: center;
+        justify-content: space-around;
         align-items: center;
         flex-direction: row;
         .login-left {
-          width: 530px;
+          width: 35vw;
-          height: 600px;
+          height: 35vw;
+          flex-shrink: 0;
           position: relative;
           .title {
             margin-bottom: 40px;
@@ -75,16 +93,23 @@
           }
         }
         .login-border {
-          width: calc(100% - 484px);
+          width: calc(50% - 304px);
-          min-height: 600px;
+          min-width: 350px;
+          // width: 500px!important;
+          // height: 300px;
+          // min-height: 600px;
           box-sizing: border-box;
-          padding: 50px 40px 0px 0;
+          padding: 20px;
           background-color: #fff;
           border-radius: 4px;
+          // margin-left: 500px;
+          flex-shrink: 0;
           .login-title {
+            width: 80%;
+            margin: 0 auto;
             color: #23a8ff;
-            font-size: 33px;
+            font-size: 20px;
-            text-align: center;
+            text-align: start;
             font-weight: bold;
           }
           .login-form {
@@ -124,7 +149,7 @@
                 }
 
                 .el-form-item__error {
-                  font-size: 12px
+                  font-size: 12px;
                 }
 
                 .login-code {
@@ -138,7 +163,7 @@
                   }
                   .msg-text {
                     cursor: pointer;
-                    color:#5D9DF8;
+                    color: #5d9df8;
                     font-size: 14px;
                   }
                 }
@@ -150,7 +175,7 @@
               text-align: right;
               .el-button {
                 font-size: 14px;
-                color: #5D9DF8;
+                color: #5d9df8;
                 padding: 0px;
               }
               width: 80px;
@@ -163,7 +188,7 @@
               text-align: left;
               .el-button {
                 font-size: 14px;
-                color: #5D9DF8;
+                color: #5d9df8;
                 padding: 0px;
               }
             }
@@ -176,24 +201,25 @@
               border-radius: 8px;
               font-size: 18px;
               letter-spacing: 12px;
-              color: #FFFFFF;
+              color: #ffffff;
               cursor: pointer;
             }
             .register-submit {
               width: 100%;
               height: 50px;
-              background:#5D9DF8;
+              background: #5d9df8;
               margin-top: 24px;
               border-radius: 8px;
               font-size: 18px;
               letter-spacing: 12px;
-              color: #FFFFFF;
+              color: #ffffff;
               cursor: pointer;
             }
           }
         }
       }
     }
+  }
 
   .login-footer {
     width: 100%;
@@ -210,16 +236,16 @@
   input {
     box-shadow: 0 0 0 1000px white inset;
   }
-
 }
 .registerContainer {
   margin-top: -20px;
 }
 .introduceWrapBox {
-  margin: 0 auto;width: 1000px;
+  margin: 0 auto;
+  width: 1000px;
   .introduceBox {
     display: flex;
-    background: #FFFFFF;
+    background: #ffffff;
     align-items: center;
     justify-content: space-between;
     padding: 40px;

src/styles/media.scss

@@ -176,36 +176,36 @@
   .el-message-box {
     width: 98% !important;
   }
-  //登录页面
+  // //登录页面
-  .login-header,login-footer{
+  // .login-header,login-footer{
-    width: 100%!important;
+  //   width: 100%!important;
-  }
+  // }
-  .login-container{
+  // .login-container{
-    width: 100%!important;
+  //   width: 100%!important;
-    margin: 0 auto;
+  //   margin: 0 auto;
-  }
+  // }
-  .login-left {
+  // .login-left {
-    display: none !important;
+  //   display: none !important;
-  }
+  // }
 
-  .login-weaper {
+  // .login-weaper {
-    width: 100%!important;
+  //   width: 100%!important;
-    height: auto!important;
+  //   height: auto!important;
-    margin: 0 auto!important;
+  //   margin: 0 auto!important;
-    min-width:auto!important;
+  //   min-width:auto!important;
-  }
+  // }
-  .login-content{
+  // .login-content{
-    width: 96%!important;
+  //   width: 96%!important;
-    margin: 0 auto!important;
+  //   margin: 0 auto!important;
-  }
+  // }
-  .login-border {
+  // .login-border {
-    width:100%!important;
+  //   width:100%!important;
-    margin: auto!important;
+  //   margin: auto!important;
-    min-height: 420px!important;
+  //   min-height: 420px!important;
-  }
+  // }
-  .login-main {
+  // .login-main {
-    width: 100% !important;
+  //   width: 100% !important;
-  }
+  // }
   //主框架
   .avue-tags {
     display: none;

src/views/tenant/postzp/Table/WaitingMission.vue

@@ -109,8 +109,8 @@
           v-show="vaildData(permission.tenant_mission_cancel, false)"
           >取消</el-button
         >
-        <el-button type="text" size="mini" @click="contrast(row)"
+        <!-- <el-button type="text" size="mini" @click="contrast(row)"
-          >比对人才库</el-button>
+          >比对人才库</el-button> -->
       </div>
     </avue-crud>
     <!--发布 复制 编辑dialog-->

src/views/util/mission-view.vue

@@ -1,11 +1,7 @@
 <template>
   <div class="mission-view">
     <el-form label-position="left" size="small">
-      <el-collapse
+      <el-collapse v-model="activeNames" @change="handleChange" class="avue-group">
-        v-model="activeNames"
-        @change="handleChange"
-        class="avue-group"
-      >
         <el-collapse-item title="任务信息" name="1" disabled="true">
           <template slot="title">
             <div class="avue-group__header">
@@ -31,10 +27,8 @@
               }}</el-form-item>
             </el-col>
             <el-col span="12">
-              <el-form-item label="任务时间："
+              <el-form-item label="任务时间：">{{ format(model.stime) }} 至
-                >{{ format(model.stime) }} 至
+                {{ format(model.etime) }}</el-form-item>
-                {{ format(model.etime) }}</el-form-item
-              >
             </el-col>
           </el-row>
         </el-collapse-item>
@@ -47,15 +41,11 @@
           </template>
           <el-row>
             <el-col span="12">
-              <el-form-item label="招聘人数："
+              <el-form-item label="招聘人数：">{{ model.peopleNum }}人</el-form-item>
-                >{{ model.peopleNum }}人</el-form-item
-              >
             </el-col>
             <el-col span="12">
-              <el-form-item label="参考工资："
+              <el-form-item label="参考工资：">{{ model.wage
-                >{{ model.wage
+              }}{{ wageUnitCategory[model.wageUnitCategory] }}</el-form-item>
-                }}{{ wageUnitCategory[model.wageUnitCategory] }}</el-form-item
-              >
             </el-col>
           </el-row>
           <el-row>
@@ -66,9 +56,7 @@
             </el-col>
             <el-col span="12">
               <el-form-item>
-                <label slot="label"
+                <label slot="label">工&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;种：</label>
-                  >工&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;种：</label
-                >
                 {{ model.worktypeNames }}
               </el-form-item>
             </el-col>
@@ -76,11 +64,7 @@
           <el-row>
             <el-col span="24">
               <el-form-item label="技能要求：">
-                <el-tag
+                <el-tag :key="skill" v-for="skill in getSkill(model.skillNames)">{{ skill }}</el-tag>
-                  :key="skill"
-                  v-for="skill in getSkill(model.skillNames)"
-                  >{{ skill }}</el-tag
-                >
               </el-form-item>
             </el-col>
           </el-row>
@@ -148,19 +132,15 @@
             </el-col>
             <el-col span="8">
               <el-form-item>
-                <label slot="label"
+                <label slot="label">座&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;机：</label>
-                  >座&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;机：</label
-                >
                 {{ model.callNumber }}
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col span="24">
-              <el-form-item label="工作地址：" v-if="model.cityId"
+              <el-form-item label="工作地址：" v-if="model.cityId">{{ city[0] && city[0].label }} {{ city[1] && city[1].label }}
-                >{{ city[0].label }} {{ city[1].label }}
+                {{ city[2] && city[2].label }}</el-form-item>
-                {{ city[2].label }}</el-form-item
-              >
             </el-col>
           </el-row>
           <el-row>
@@ -168,12 +148,7 @@
               <el-form-item label="详细地址：">{{
                 model.address
               }}</el-form-item>
-              <select-map
+              <select-map :lat="model.lat" :lng="model.lon" :isCanEdit="false" :type="'view'"></select-map>
-                :lat="model.lat"
-                :lng="model.lon"
-                :isCanEdit="false"
-                :type="'view'"
-              ></select-map>
             </el-col>
           </el-row>
         </el-collapse-item>
@@ -235,15 +210,19 @@ export default {
 .mission-view .el-tag+.el-tag {
   margin-left: 5px;
 }
+
 .mission-view .el-form {
   padding: 0 20px;
 }
+
 .mission-view .el-form .el-col {
   padding: 0 10px;
 }
+
 .mission-view .el-form .el-col .el-form-item {
   margin-bottom: 18px;
 }
+
 .mission-view .el-collapse {
   border-top: 0px;
 }