auto comit

package-lock.json

@@ -3269,6 +3269,11 @@
       "integrity": "sha1-M1bMoZyIlUTy16le1JzlCKDs9VI=",
       "dev": true
     },
+    "china-area-data": {
+      "version": "5.0.1",
+      "resolved": "https://registry.nlark.com/china-area-data/download/china-area-data-5.0.1.tgz",
+      "integrity": "sha1-eUO4OgYZ8DO7WJPagMtG5S5EvmY="
+    },
     "chokidar": {
       "version": "2.1.8",
       "resolved": "https://registry.nlark.com/chokidar/download/chokidar-2.1.8.tgz?cache=0&sync_timestamp=1623763535523&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchokidar%2Fdownload%2Fchokidar-2.1.8.tgz",
@@ -4779,6 +4784,15 @@
       "integrity": "sha1-uqn7XCS5tYDwj7JFy7UqIvj8j6g=",
       "dev": true
     },
+    "element-china-area-data": {
+      "version": "5.0.2",
+      "resolved": "https://registry.nlark.com/element-china-area-data/download/element-china-area-data-5.0.2.tgz",
+      "integrity": "sha1-AGwmWUuIZcthmZQGPHMlYuRYPTA=",
+      "requires": {
+        "china-area-data": "^5.0.1",
+        "lodash-es": "^4.17.15"
+      }
+    },
     "element-ui": {
       "version": "2.15.6",
       "resolved": "https://registry.nlark.com/element-ui/download/element-ui-2.15.6.tgz",
@@ -7400,6 +7414,11 @@
       "integrity": "sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw=",
       "dev": true
     },
+    "lodash-es": {
+      "version": "4.17.21",
+      "resolved": "https://registry.nlark.com/lodash-es/download/lodash-es-4.17.21.tgz",
+      "integrity": "sha1-Q+YmxG5lkbd1C+srUBFzkMYJ4+4="
+    },
     "lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npm.taobao.org/lodash.debounce/download/lodash.debounce-4.0.8.tgz",

src/assets/scss/base.scss

@@ -1,7 +1,7 @@
 body, html {
   line-height: 1;
   font-family: 'PingFang SC', 'STHeitiSC-Light', 'Helvetica-Light', arial, sans-serif, 'Droid Sans Fallback';
-  user-select: none;
+  // user-select: none;
   -webkit-tap-highlight-color: transparent;
   background: $color-background;
   color: $color-text;

src/components/applys.vue

@@ -1,7 +1,10 @@
 <template>
   <div class="jobs">
     <section class="jobs-top">
-      <div class="left">近一个月共有<span>22</span>个人应聘</div>
+      <div class="left">
+        近一个月共有<span>{{ lastMonthRecruitNum }}</span
+        >个人应聘
+      </div>
       <!-- <div class="add-job">刷新</div> -->
     </section>
     <section class="job-type-til">
@@ -28,6 +31,7 @@
       </dd>
     </dl>
     <section class="job-list applys-list">
+      <Empty v-if="applyList.length < 1" text="暂无应聘信息" />
       <div class="job-item" v-for="item in applyList" :key="item.id">
         <div class="left">
           <div class="name">
@@ -134,16 +138,26 @@
 
 <script>
 import { getApplyList, getDicData } from "@/utils/api";
+import Empty from "@/components/empty.vue";
 export default {
   name: "",
-  components: {},
+  components: {
+    Empty,
+  },
+  props: {
+    lastMonthRecruitNum: {
+      type: Number,
+      default: 0,
+    },
+  },
   data() {
     return {
       dialogVisible: false,
       queryParams: {
         pageNum: 1,
-        pageSize: 3,
+        pageSize: 10,
         postName: "",
+        status: "",
       },
       total: 10,
       applyList: [],
@@ -220,11 +234,7 @@ export default {
       });
     },
     handlegetApplyList() {
-      getApplyList({
-        pageNum: this.queryParams.pageNum,
-        pageSize: this.queryParams.pageSize,
-        postName: this.queryParams.postName,
-      })
+      getApplyList(this.queryParams)
         .then((res) => {
           console.log("getComPostList", res);
           this.applyList = res.data.rows;
@@ -237,7 +247,7 @@ export default {
     },
     filterData(item) {
       this.filterIndex = item.dictValue;
-      this.queryParams.postName = item.dictLabel;
+      this.queryParams.status = item.dictValue;
       this.handlegetApplyList();
     },
     edit(item) {

src/components/empty.vue

@@ -0,0 +1,85 @@
+<template>
+  <div
+    class="empty"
+    v-if="show"
+    :style="{
+      marginTop: marginTop + 'px',
+    }"
+  >
+    <img
+      :style="{ imgWidth: imgWidth + 'px', imgHeight: imgHeight + 'px' }"
+      v-if="imgSrc"
+      :src="imgSrc"
+      alt=""
+    />
+    <div
+      :style="{ color: color, fontSize: fontSize + 'px', marginTop: '10px' }"
+    >
+      {{ text }}
+    </div>
+    <div class="slot-wrap">
+      <slot name="bottom"></slot>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "empty",
+  components: {},
+  props: {
+    // 图片路径
+    imgSrc: {
+      type: String,
+      default: "",
+    },
+    // 提示文字
+    text: {
+      type: String,
+      default: "暂无内容",
+    },
+    // 文字大小，单位rpx
+    fontSize: {
+      type: [String, Number],
+      default: 26,
+    },
+    // 文字颜色
+    color: {
+      type: String,
+      default: "#c0c4cc",
+    },
+    //  图标宽度，单位px
+    imgWidth: {
+      type: [String, Number],
+      default: 120,
+    },
+    // 图标高度，单位px
+    imgHeight: {
+      type: [String, Number],
+      default: "auto",
+    },
+    // 是否显示组件
+    show: {
+      type: Boolean,
+      default: true,
+    },
+    // 组件距离上一个元素之间的距离
+    marginTop: {
+      type: [String, Number],
+      default: 24,
+    },
+  },
+  data() {
+    return {};
+  },
+  created() {},
+  methods: {},
+};
+</script>
+
+<style lang='scss' scoped>
+.empty {
+  padding: 10px;
+  text-align: center;
+}
+</style>

src/components/header.vue

@@ -2,7 +2,7 @@
   <div id="header">
     <div class="inner">
       <div class="header-left">
-        <a class="link" href="#">进入退役军人教育培训服务门户网站</a>
+        <router-link class="link" to="/">首页</router-link>
       </div>
       <div class="header-right">
         <ul>
@@ -10,10 +10,12 @@
           <li><span>|</span></li> -->
           <!-- <li><a class="link" href="#">收藏夹</a></li>
           <li><span>|</span></li> -->
-          <li>
+          <li v-if="$store.state.vuex_name" class="user">
             <a class="link" href="#">
-              王二<i class="name-icon el-icon-caret-bottom"></i>
+              {{ $store.state.vuex_name
+              }}<i class="name-icon el-icon-caret-bottom"></i>
             </a>
+            <div class="logout" @click="logout">退出登录</div>
           </li>
         </ul>
       </div>
@@ -27,7 +29,15 @@ export default {
   props: {
     msg: String,
   },
-  created() {},
+  created() {
+    // console.log("vuex_user", this.$store.state.vuex_name);
+  },
+  methods: {
+    logout() {
+      this.$mc.vuex("vuex_token", "");
+      this.$router.push("/login");
+    },
+  },
 };
 </script>
 
@@ -65,6 +75,26 @@ export default {
             color: #fff;
             opacity: 0.4;
           }
+          &.user:hover {
+            .logout {
+              display: block;
+            }
+          }
+          .logout {
+            display: none;
+            position: absolute;
+            bottom: -34px;
+            z-index: 99;
+            background: #fff;
+            line-height: 1;
+            right: 0;
+            padding: 10px 30px;
+            box-sizing: border-box;
+            border-radius: 5px;
+            min-width: 120px;
+            text-align: center;
+            cursor: pointer;
+          }
         }
       }
     }

src/components/jobs.vue

@@ -1,10 +1,13 @@
 <template>
   <div class="jobs">
     <section class="jobs-top">
-      <div class="left">近两个月共有<span>22</span>个在招职位</div>
+      <div class="left">
+        近两个月共有<span>{{ lastSecondNum }}</span
+        >个在招职位
+      </div>
       <div class="add-job" @click="add">新增职位</div>
     </section>
-    <dl class="job-type">
+    <!-- <dl class="job-type">
       <dt>职位：</dt>
       <dd>
         <span class="active">全部</span>
@@ -12,8 +15,9 @@
         <span>运营</span>
         <span>技术工</span>
       </dd>
-    </dl>
+    </dl> -->
     <section class="job-list">
+      <Empty v-if="jobList.length < 1" text="暂无在招职位" />
       <div class="job-item" v-for="item in jobList" :key="item.id">
         <div class="left">
           <div class="name">{{ item.postName }}</div>
@@ -21,11 +25,12 @@
             <span class=""
               >{{ item.lowestSalary }}K-{{ item.highestSalary }}K</span
             >
-            工作年限:{{ item.workYear }} 年以上 / {{ useJobList(item.educationBg) }}
+            工作年限:{{ filterworkYear(item.workYear) }} /
+            {{ filterEducations(item.educationBg) }}
           </div>
         </div>
         <div class="right">
-          <div class="time">{{ item.updateTime }} 发布</div>
+          <div class="time">{{ item.updateTime || item.createTime }} 发布</div>
           <div class="tool">
             <span style="color: #4aad78" @click="goDetails(item.id)">查看</span>
             <span style="color: #4aad78" @click="edit(item)">修改</span>
@@ -47,16 +52,31 @@
             label="职位名称"
             prop="postName"
             :label-width="formLabelWidth"
-
           >
-            <el-input v-model="form.postName" placeholder="请录入职位名称" autocomplete="off"></el-input>
+            <el-input
+              v-model="form.postName"
+              placeholder="请录入职位名称"
+              autocomplete="off"
+            ></el-input>
           </el-form-item>
           <el-form-item
             label="工作经历（年）"
             prop="workYear"
             :label-width="formLabelWidth"
           >
-            <el-input v-model="form.workYear" placeholder="请录入工作经验限制，输入0则为不限"  autocomplete="off"></el-input>
+            <!-- <el-input
+              v-model="form.workYear"
+              placeholder="请录入工作经验限制，输入0则为不限"
+              autocomplete="off"
+            ></el-input> -->
+            <el-select v-model="form.workYear" placeholder="请选择">
+              <el-option
+                v-for="item in workYear"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="Number(item.dictValue)"
+              ></el-option>
+            </el-select>
           </el-form-item>
           <el-form-item
             label="最低学历"
@@ -64,8 +84,12 @@
             :label-width="formLabelWidth"
           >
             <el-select v-model="form.educationBg" placeholder="请选择">
-
-              <el-option v-for=" (item) in jobForm.educations" :key="item.dictValue" :label="item.dictLabel" :value="item.dictValue"></el-option>
+              <el-option
+                v-for="item in jobForm.educations"
+                :key="item.dictValue"
+                :label="item.dictLabel"
+                :value="Number(item.dictValue)"
+              ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item
@@ -75,9 +99,9 @@
           >
             <el-col :span="24">
               <text-edit
-                  :minHeight="jobForm.description.minHeight"
-                  :show-tool="1"
-                  v-model="form.description"
+                :minHeight="jobForm.description.minHeight"
+                :show-tool="1"
+                v-model="form.description"
               ></text-edit>
             </el-col>
           </el-form-item>
@@ -89,43 +113,61 @@
             <el-col :span="10">
               <el-select v-model="form.lowestSalary" placeholder="请选择">
                 <el-option
-                    v-for="item of 50"
-                    :disabled="item >= form.highestSalary "
-                    :key="item"
-                    :label="item"
-                    :value="item">
+                  v-for="item of 50"
+                  :disabled="item >= form.highestSalary"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                >
                 </el-option>
               </el-select>
             </el-col>
             <el-col :span="2">
-              <div :style="{width:'100%',fontSize:'50px'}">~</div>
+              <div
+                :style="{
+                  width: '100%',
+                  fontSize: '50px',
+                  textAlign: 'center',
+                }"
+              >
+                ~
+              </div>
             </el-col>
             <el-col :span="10">
               <el-select v-model="form.highestSalary" placeholder="请选择">
                 <el-option
-                    v-for="item of 50"
-                    :disabled="item <= form.lowestSalary "
-                    :key="item"
-                    :label="item"
-                    :value="item">
+                  v-for="item of 50"
+                  :disabled="item <= form.lowestSalary"
+                  :key="item"
+                  :label="item"
+                  :value="item"
+                >
                 </el-option>
               </el-select>
             </el-col>
             <el-col :span="2">
-              <div :style="{width:'100%',fontSize:'40px',paddingLeft: '3px',fontWeight: 1 }">K</div>
+              <div
+                :style="{
+                  width: '100%',
+                  fontSize: '40px',
+                  paddingLeft: '3px',
+                  fontWeight: 1,
+                }"
+              >
+                K
+              </div>
             </el-col>
           </el-form-item>
-          <el-form-item
-            label="工作地点"
-            :label-width="formLabelWidth"
-          >
+          <el-form-item label="工作地点" :label-width="formLabelWidth">
             <el-cascader
-                size="large"
-                ref="addressSelect"
-                :options="addressOptions"
-                v-model="form.workPlace"
-                :leafOnly="true"
-                @change="handleChange">
+              filterable
+              size="large"
+              ref="addressSelect"
+              :options="addressOptions"
+              v-model="form.workPlace"
+              :leafOnly="true"
+              @change="handleChange"
+            >
             </el-cascader>
           </el-form-item>
         </el-form>
@@ -139,33 +181,50 @@
 </template>
 
 <script>
-import { addcomPost, getComPostList, updateComPost,getDicData,dlComPost } from "@/utils/api";
+import {
+  addcomPost,
+  getComPostList,
+  updateComPost,
+  getDicData,
+  dlComPost,
+} from "@/utils/api";
 
-import { regionDataPlus } from 'element-china-area-data'
-import textEdit from './edit/index'
+import { regionDataPlus } from "element-china-area-data";
+import textEdit from "./edit/index";
+import Empty from "@/components/empty.vue";
 export default {
   name: "",
   components: {
     textEdit,
+    Empty,
+  },
+  props: {
+    lastSecondNum: {
+      type: Number,
+      default: 0,
+    },
   },
   data() {
     return {
+      defaultArea: ["520000", "520100", "520102"],
       addressOptions: regionDataPlus,
       queryParams: {
         pageNum: 1,
         pageSize: 10,
         postName: "",
       },
-      jobForm:{
-        educations:[],
+      jobForm: {
+        educations: [],
         description: {
-          minHeight: 150
-        }
+          minHeight: 150,
+        },
       },
+      workYear: [],
       jobList: [],
+      total: 10,
       dialogTitle: "",
       dialogVisible: false,
-      form: {},
+      form: { workPlace: ["520000", "520100", "520102"] },
       formLabelWidth: "120px",
       rules: {
         postName: [
@@ -189,118 +248,131 @@ export default {
       },
     };
   },
-  computed:{
-
-
+  computed: {
+    filterEducations() {
+      return function (value) {
+        let v = "";
+        for (let i = 0; i < this.jobForm.educations.length; i++) {
+          // console.log("value", value);
+          // console.log("value", this.educations[i]);
+          let item = this.jobForm.educations[i];
+          if (value == item.dictValue) {
+            v = item.dictLabel;
+            break;
+          }
+        }
+        return v;
+      };
+    },
+    filterworkYear() {
+      return function (value) {
+        let v = "";
+        for (let i = 0; i < this.workYear.length; i++) {
+          // console.log("value", value);
+          // console.log("value", this.educations[i]);
+          let item = this.workYear[i];
+          if (value == item.dictValue) {
+            v = item.dictLabel;
+            break;
+          }
+        }
+        return v;
+      };
+    },
   },
   created() {
     this.handlegetComPostList();
-    this.getDicData();
+    this.getEducations();
     this.initMap();
+    this.getWorkYear();
   },
   methods: {
-
-    useJobList: function(data){
-      debugger;
-      let useList = '不限';
-
-      let index = this.jobForm.educations.find(item => {
-
-        return item.dictValue == data
-      })
-      useList=index.dictLabel;
-      return useList;
+    getEducations() {
+      let eduDictType = "degr_educ";
+      getDicData(eduDictType).then((res) => {
+        this.jobForm.educations = res.data;
+      });
     },
-
-    getDicData(){
-      let eduDictType = 'degr_educ';
-      getDicData(eduDictType)
-        .then((res) => {
-          this.jobForm.educations = res.data;
-
-        })
-
+    getWorkYear() {
+      getDicData("work_year").then((res) => {
+        this.workYear = res.data;
+      });
     },
 
-
     //初始化省市的数据  修改“全部" 为 "全国" "全省" "全市"
-    initMap(){
-      let mapInitData = []
-      regionDataPlus.forEach(function (item,index) {
-        if (item.label=="全部"){
+    initMap() {
+      let mapInitData = [];
+      regionDataPlus.forEach(function (item, index) {
+        if (item.label == "全部") {
           item.label = "全国";
           mapInitData.push(item);
-        }else if (item.children){
+        } else if (item.children) {
           let childerCity = [];
-          item.children.forEach(function (cityItem,index){
-            if (cityItem.label=="全部"){
+          item.children.forEach(function (cityItem, index) {
+            if (cityItem.label == "全部") {
               cityItem.label = "全省";
               childerCity.push(cityItem);
-            }else if (cityItem.children){
+            } else if (cityItem.children) {
               let childerArea = [];
-              cityItem.children.forEach(function (areaItem,index){
-                if (areaItem.label=="全部"){
+              cityItem.children.forEach(function (areaItem, index) {
+                if (areaItem.label == "全部") {
                   areaItem.label = "全市";
                   childerArea.push(areaItem);
-                }else {
+                } else {
                   childerArea.push(areaItem);
                 }
-              })
-              cityItem.children=childerArea;
+              });
+              cityItem.children = childerArea;
               childerCity.push(cityItem);
             }
           });
-          item.children=childerCity;
+          item.children = childerCity;
           mapInitData.push(item);
         }
-      })
-      this.addressOptions=mapInitData;
+      });
+      this.addressOptions = mapInitData;
     },
 
     //修改以后数据的值
-    handleChange (value) {
-      if (value.length!=0){
-        let arr = this.$refs['addressSelect'].getCheckedNodes()[0].pathLabels;
-        delete this.form['grovinceId'];
-        delete this.form['grovinceName'];
-
-        delete this.form['cityId'];
-        delete this.form['cityName'];
+    handleChange(value) {
+      if (value && value.length != 0) {
+        let arr = this.$refs["addressSelect"].getCheckedNodes()[0].pathLabels;
+        delete this.form["provinceId"];
+        delete this.form["provinceName"];
 
-        delete this.form['areaId'];
-        delete this.form['areaName'];
+        delete this.form["cityId"];
+        delete this.form["cityName"];
 
-        value.forEach((addId,index)=>{
+        delete this.form["areaId"];
+        delete this.form["areaName"];
 
-              if (!addId==''){
-
-                switch (index) {
-                  case 0:
-                    this.form.grovinceId = addId;
-                    this.form.grovinceName = arr[index];
-                    break;
-                  case 1:
-                    this.form.cityId = addId;
-                    this.form.cityName = arr[index];
-                    break;
-                  case 2:
-                    this.form.areaId = addId;
-                    this.form.areaName = arr[index];
-                    break;
-                }
-
-              }
-
-
-        })
+        value.forEach((addId, index) => {
+          if (!addId == "") {
+            switch (index) {
+              case 0:
+                this.form.provinceId = addId;
+                this.form.provinceName = arr[index];
+                break;
+              case 1:
+                this.form.cityId = addId;
+                this.form.cityName = arr[index];
+                break;
+              case 2:
+                this.form.areaId = addId;
+                this.form.areaName = arr[index];
+                break;
+            }
+          }
+        });
       }
-      console.log(this.form);
+      // console.log("this.form", this.form);
     },
     goDetails(id) {
       this.$router.push({ path: "/jobdetails", query: { id: id } });
     },
     cancel() {
-      (this.form = {}), (this.dialogVisible = false);
+      (this.form = { workPlace: this.defaultArea }),
+        (this.dialogVisible = false);
     },
     add() {
       this.dialogTitle = "新增职位";
@@ -310,20 +382,30 @@ export default {
       this.dialogTitle = "编辑职位";
       this.dialogVisible = true;
       this.form = item;
+      this.form.workPlace = ["520000", "520100", "520102"];
+      this.form.workPlace[0] = item.provinceId.toString();
+      this.form.workPlace[1] = item.cityId.toString();
+      this.form.workPlace[2] = item.areaId.toString();
       console.log("item", item);
     },
     del(item) {
-      dlComPost(item).then(
-          (res)=>{
+      this.$confirm("确认删除？")
+        .then((res) => {
+          dlComPost(item).then((res) => {
             this.handlegetComPostList();
-          }
-      )
+            this.$emit("getTotal");
+          });
+        })
+        .catch((err) => {
+          console.log("err", err);
+        });
     },
     handlegetComPostList() {
       getComPostList({ pageNum: 1, pageSize: 30, postName: "" })
         .then((res) => {
           console.log("getComPostList", res);
           this.jobList = res.data.rows;
+          this.total = res.data.total;
         })
         .catch((err) => {
           this.$message.error(err.msg);
@@ -331,6 +413,7 @@ export default {
         });
     },
     submit() {
+      console.log("this.form", this.form);
       if (this.dialogTitle == "新增职位") {
         this.$refs["form"].validate((valid) => {
           if (valid) {
@@ -354,8 +437,9 @@ export default {
           if (valid) {
             updateComPost(this.form)
               .then((res) => {
-                console.log("addcomPost", res);
+                // console.log("addcomPost", res);
                 this.$message(res.msg);
+                this.dialogVisible = false;
               })
               .catch((err) => {
                 this.$message.error(err.msg);
@@ -384,33 +468,33 @@ export default {
 <style lang='scss' scoped>
 //@import url()
 @import "./jobs.scss";
-.add-job-div{
+.add-job-div {
   width: 76%;
   height: 70%;
   margin: auto;
-  .dialog-footer{
+  .dialog-footer {
     width: 180px;
     margin: auto;
   }
 }
-::v-deep{
-  .el-cascader{
+::v-deep {
+  .el-cascader {
     width: 100%;
   }
-  .el-select{
+  .el-select {
     width: 100%;
   }
-  .el-dialog{
+  .el-dialog {
     -moz-box-shadow: rgba(169, 169, 169, 0.6) 0px 0px 0px 20px; /* 老的 Firefox */
     box-shadow: rgba(169, 169, 169, 0.6) 0px 0px 0px 20px;
     border-radius: 0px;
-    .el-dialog__header{
-      background: rgb(0,179,138);
-      span{
+    .el-dialog__header {
+      background: rgb(0, 179, 138);
+      span {
         color: white;
         font-size: 16px;
-      };
-      .el-dialog__headerbtn .el-dialog__close{
+      }
+      .el-dialog__headerbtn .el-dialog__close {
         color: white;
       }
     }

src/components/mainmenu.vue

@@ -6,7 +6,9 @@
       mode="horizontal"
       @select="handleSelect"
     >
-      <el-menu-item index="1">招聘</el-menu-item>
+      <el-menu-item index="1"
+        ><router-link to="/">招聘</router-link></el-menu-item
+      >
       <el-menu-item index="2">
         <router-link to="/Policy">政策</router-link></el-menu-item
       >
@@ -18,9 +20,15 @@
 export default {
   name: "Mainmenu",
   components: {},
+  props: {
+    activeIndex: {
+      type: String,
+      default: "1",
+    },
+  },
   data() {
     return {
-      activeIndex: "1",
+      // activeIndex: "1",
     };
   },
   created() {},
@@ -42,8 +50,6 @@ export default {
     font-size: 26px;
     color: #8f8f8f;
     padding: 0;
-    height: 66px;
-    line-height: 66px;
     & + li {
       margin-left: 55px;
     }
@@ -51,6 +57,11 @@ export default {
       color: #4aad78;
       border-bottom: 3px solid #4aad78;
     }
+    a {
+      display: block;
+      height: 66px;
+      line-height: 66px;
+    }
   }
 }
 </style>

src/router/index.js

@@ -16,6 +16,11 @@ const routes = [
     name: 'Policy',
     component: () => import('../views/policy.vue')
   },
+  {
+    path: '/Policydetail',
+    name: 'Policydetail',
+    component: () => import('../views/policydetail.vue')
+  },
   {
     path: '/jobdetails',
     name: 'Jobdetails',

src/store/index.js

@@ -14,7 +14,7 @@ try {
 }
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
-let saveStateKeys = ['vuex_user', 'vuex_token'];
+let saveStateKeys = ['vuex_user', 'vuex_token', 'vuex_name'];
 
 // 保存变量到本地存储中
 const saveLifeData = function (key, value) {
@@ -37,6 +37,7 @@ const store = new Vuex.Store({
     vuex_user: lifeData.vuex_user ? lifeData.vuex_user : { name: '' },
     // 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式
     vuex_version: '1.0.1',
+    vuex_name: '',
     vuex_token: '',
   },
   mutations: {

src/utils/api.js

@@ -108,6 +108,15 @@ export function getComPostList(data) {
   })
 }
 
+// 获取职位详细信息
+export function getJobdetails(params) {
+  return request({
+    url: '/comPost/get/' + params.id,
+    method: 'get'
+  })
+}
+
+
 // 添加职位
 export function addcomPost(data) {
   return request({
@@ -144,18 +153,20 @@ export function getApplyList(data) {
 }
 
 // 政策法规
-export function getPolicyList() {
+export function getPolicyList(params) {
   return request({
     url: '/policy/article/list',
-    method: 'get'
+    method: 'get',
+    params: params
   })
 }
 
 // 查看政策法规详情
-export function getPolicyInfo() {
+export function getPolicyInfo(id) {
   return request({
     url: '/policy/article/info',
-    method: 'get'
+    method: 'get',
+    params: id
   })
 }
 

src/utils/auth.js

@@ -2,7 +2,7 @@
 
 export function getToken() {
   let lifeData = localStorage.getItem("lifeData");
-  console.log('lifeData', lifeData);
+  // console.log('lifeData', lifeData);
   if (lifeData) {
     return JSON.parse(localStorage.getItem("lifeData")).vuex_token
   } else {

src/utils/request.js

@@ -15,7 +15,7 @@ const service = axios.create({
 
 // request拦截器
 let token = getToken();
-console.log('token', token);
+// console.log('token', token);
 service.interceptors.request.use(config => {
 
   if (token) {
@@ -60,21 +60,6 @@ service.interceptors.response.use(
           //   location.reload()// 为了重新实例化vue-router对象 避免bug
           // })
         })
-      }else if (res.code === 400) {
-        MessageBox.confirm('你已被登出，可以取消继续留在该页面，或者重新登录', '确定登出', {
-          confirmButtonText: '重新登录',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          console.log('location', location);
-          localStorage.setItem('fromUrl', location.hash);
-          location.href = '/#/login';
-          localStorage.setItem("lifeData", JSON.stringify({}));
-          // location.reload()
-          // store.dispatch('FedLogOut').then(() => {
-          //   location.reload()// 为了重新实例化vue-router对象 避免bug
-          // })
-        })
       }
       return Promise.reject('error')
     } else {

src/views/Home.vue

@@ -148,8 +148,15 @@
           </div>
         </div>
         <!-- company-details end -->
-        <Jobs v-if="companymenuIndex == '2'" />
-        <Applys v-if="companymenuIndex == '3'" />
+        <Jobs
+          v-if="companymenuIndex == '2'"
+          @getTotal="getCompanyInfo"
+          :lastSecondNum="companyTotal.lastSecondNum"
+        />
+        <Applys
+          v-if="companymenuIndex == '3'"
+          :lastMonthRecruitNum="companyTotal.lastMonthRecruitNum"
+        />
       </div>
       <div class="base-info">
         <div class="name">公司基本信息</div>
@@ -178,7 +185,12 @@ import Mainmenu from "@/components/mainmenu.vue";
 import Jobs from "@/components/jobs.vue";
 import Applys from "@/components/applys.vue";
 
-import { getCompanyInfo, getTrade, getScope,getCompanyTotalInfo } from "@/utils/api";
+import {
+  getCompanyInfo,
+  getTrade,
+  getScope,
+  getCompanyTotalInfo,
+} from "@/utils/api";
 
 export default {
   name: "Home",
@@ -194,7 +206,7 @@ export default {
       activeName: "second",
       companymenuIndex: "1",
       companyInfo: {},
-      companyTotal:{},
+      companyTotal: {},
       trade: [],
       scope: [],
     };
@@ -243,6 +255,7 @@ export default {
         .then((res) => {
           this.companyInfo = res.data;
           console.log("fetchList", res);
+          this.$mc.vuex("vuex_name", res.data.userName);
         })
         .catch((err) => {
           console.log("fetchList err", err);
@@ -253,9 +266,7 @@ export default {
         .then((res) => {
           this.companyTotal = res.data;
         })
-        .catch((err) => {
-
-        });
+        .catch((err) => {});
     },
     handelGetTrade() {
       let that = this;

src/views/jobdetails.vue

@@ -4,11 +4,16 @@
     <Mainmenu />
     <section class="job-base">
       <div class="wrap">
-        <div class="name">顺丰速运股份有限公司贵州分公司</div>
-        <div class="position">服务员</div>
+        <div class="name">{{ companyInfo.companyName }}</div>
+        <div class="position">{{ jobdetails.postName }}</div>
         <div class="details">
-          <span>2K-3K</span>
-          经验不限 / 本科
+          <span
+            >{{ jobdetails.lowestSalary }}K-{{
+              jobdetails.highestSalary
+            }}K</span
+          >
+          工作年限:{{ filterworkYear(jobdetails.workYear) }} /
+          {{ filterEducations(jobdetails.educationBg) }}
         </div>
       </div>
     </section>
@@ -16,7 +21,8 @@
       <div class="left-content">
         <div class="job-details">
           <div class="big-title">职位描述：</div>
-          <div class="block">
+          <div v-html="jobdetails.description"></div>
+          <!-- <div class="block">
             <div class="title">岗位职责</div>
             <ul>
               <li>
@@ -67,21 +73,22 @@
             <ul>
               <li>贵阳市乌当区-水东路</li>
             </ul>
-          </div>
+          </div> -->
         </div>
         <!-- job-details end -->
       </div>
       <div class="base-info">
         <div class="name">公司基本信息</div>
         <div class="base-info-item">
-          <i class="el-icon-s-marketing"></i>运输业
+          <i class="el-icon-s-marketing"></i
+          >{{ filterTradeStatus(companyInfo.trade) }}
         </div>
         <div class="base-info-item">
-          <i class="el-icon-s-custom"></i>50-150人
+          <i class="el-icon-s-custom"></i
+          >{{ filterScopeStatus(companyInfo.scope) }}
         </div>
         <div class="base-info-item">
-          <i class="el-icon-location"></i
-          >贵州省贵阳市乌当区新天办事处顺海中路88号保利温泉新城
+          <i class="el-icon-location"></i>{{ companyInfo.companyAddress }}
         </div>
       </div>
     </section>
@@ -91,7 +98,13 @@
 <script>
 import Header from "@/components/header.vue";
 import Mainmenu from "@/components/mainmenu.vue";
-import { getCompanyInfo } from "@/utils/api";
+import {
+  getCompanyInfo,
+  getJobdetails,
+  getTrade,
+  getScope,
+  getDicData,
+} from "@/utils/api";
 export default {
   name: "",
   components: {
@@ -100,27 +113,151 @@ export default {
   },
   data() {
     return {
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-      },
+      id: "",
+      companyInfo: {},
+      jobdetails: {},
+      trade: [],
+      scope: [],
+      educations: [],
+      workYear: [],
     };
   },
+  computed: {
+    filterEducations() {
+      return function (value) {
+        let v = "";
+        for (let i = 0; i < this.educations.length; i++) {
+          // console.log("value", value);
+          // console.log("value", this.educations[i]);
+          let item = this.educations[i];
+          if (value == item.dictValue) {
+            v = item.dictLabel;
+            break;
+          }
+        }
+        return v;
+      };
+    },
+    filterTradeStatus() {
+      return function (value) {
+        let v = "";
+        for (let i = 0; i < this.trade.length; i++) {
+          let item = this.trade[i];
+          if (value == item.value) {
+            v = item.label;
+            break;
+          }
+        }
+        return v;
+      };
+    },
+    filterScopeStatus() {
+      return function (value) {
+        let v = "";
+        for (let i = 0; i < this.scope.length; i++) {
+          let item = this.scope[i];
+          if (value == item.value) {
+            v = item.label;
+            break;
+          }
+        }
+        return v;
+      };
+    },
+    filterworkYear() {
+      return function (value) {
+        let v = "";
+        for (let i = 0; i < this.workYear.length; i++) {
+          // console.log("value", value);
+          // console.log("value", this.educations[i]);
+          let item = this.workYear[i];
+          if (value == item.dictValue) {
+            v = item.dictLabel;
+            break;
+          }
+        }
+        return v;
+      };
+    },
+  },
   created() {
-    setTimeout(() => {
-      this.getinfo();
-    }, 1000);
+    this.id = this.$route.query.id;
+    this.handleGetJobdetails();
+    this.getinfo();
+    this.getEducations();
+    this.getWorkYear();
+  },
+  mounted() {
+    this.handelGetTrade();
+    this.handelGetScope();
   },
   methods: {
+    getWorkYear() {
+      getDicData("work_year").then((res) => {
+        this.workYear = res.data;
+      });
+    },
     getinfo() {
       getCompanyInfo()
         .then((res) => {
           console.log("fetchList", res);
+          this.companyInfo = res.data;
         })
         .catch((err) => {
           console.log("fetchList err", err);
         });
     },
+    handleGetJobdetails() {
+      getJobdetails({ id: this.id })
+        .then((res) => {
+          console.log("getJobdetails", res);
+          this.jobdetails = res.data;
+        })
+        .catch((err) => {
+          console.log("getJobdetails err", err);
+        });
+    },
+    getEducations() {
+      getDicData("degr_educ").then((res) => {
+        this.educations = res.data;
+      });
+    },
+    handelGetTrade() {
+      let that = this;
+      getTrade()
+        .then((res) => {
+          console.log("getTrade", res);
+          if (res.code == 200) {
+            res.data.map(function (currentValue) {
+              that.trade.push({
+                value: currentValue.dictValue,
+                label: currentValue.dictLabel,
+              });
+            });
+          }
+        })
+        .catch((err) => {
+          console.log("getTrade err", err);
+        });
+    },
+    handelGetScope() {
+      let that = this;
+      getScope()
+        .then((res) => {
+          console.log("getScope", res);
+          if (res.code == 200) {
+            res.data.map(function (currentValue) {
+              that.scope.push({
+                value: currentValue.dictValue,
+                label: currentValue.dictLabel,
+              });
+            });
+          }
+        })
+        .catch((err) => {
+          console.log("getScope err", err);
+        });
+    },
   },
 };
 </script>

src/views/login.vue

@@ -51,7 +51,15 @@
               <i class="el-icon-edit"></i>
             </span>
           </el-form-item>
-          <el-form-item style="display: flex;flex-wrap: nowrap;flex-direction:column;flejustify-content: space-between" prop="code">
+          <el-form-item
+            style="
+              display: flex;
+              flex-wrap: nowrap;
+              flex-direction: column;
+              flejustify-content: space-between;
+            "
+            prop="code"
+          >
             <span class="svg-container svg-container-admin">
               <i class="el-icon-s-help"></i>
             </span>
@@ -183,7 +191,7 @@ export default {
     },
     handleLogin() {
       let that = this;
-      let backUrl = "";
+      let backUrl = "/";
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.loading = true;

src/views/policy.vue

@@ -1,14 +1,29 @@
 <template>
   <div class="">
     <Header />
-    <Mainmenu />
+    <Mainmenu activeIndex="2" />
     <div class="wrap">
       <div class="title">政策解读</div>
       <div class="policy-list">
-        <div class="policy-item" v-for="item in policyList" :key="item.id">
+        <div
+          class="policy-item"
+          @click="goPolicy(item.artId)"
+          v-for="item in policyList"
+          :key="item.artId"
+        >
           <div class="left">{{ item.artTitle }}</div>
-          <div class="right">{{ item.artPostTime }}</div>
+          <div class="right">{{ handleparseTime(item.updateTime) }}</div>
+          <!-- <div class="right">{{ item.artPostTime }}</div> -->
         </div>
+        <el-pagination
+          :hide-on-single-page="true"
+          @current-change="handleCurrentChange"
+          :current-page.sync="queryParams.pageNum"
+          :page-size="queryParams.pageSize"
+          layout="prev, pager, next, jumper"
+          :total="total"
+        >
+        </el-pagination>
       </div>
     </div>
   </div>
@@ -32,22 +47,44 @@ export default {
         pageSize: 10,
       },
       policyList: [],
+      total: 10,
     };
   },
+  computed: {
+    handleparseTime() {
+      return function (val) {
+        // console.log("val", val);
+        if (val) {
+          return parseTime(val);
+        } else {
+          return null;
+        }
+      };
+    },
+  },
   created() {
     this.handelGetPolicyList();
   },
   methods: {
     handelGetPolicyList() {
-      getPolicyList()
+      getPolicyList(this.queryParams)
         .then((res) => {
-          console.log("getPolicyList", res);
+          // console.log("getPolicyList", res);
           this.policyList = res.rows;
+          this.total = res.total;
         })
         .catch((err) => {
           console.log("getPolicyList err", err);
         });
     },
+    goPolicy(id) {
+      // console.log("goPolicy", id);
+      this.$router.push({ path: "/Policydetail", query: { id: id } });
+    },
+    handleCurrentChange(val) {
+      this.handelGetPolicyList();
+      console.log(`当前页: ${val}`);
+    },
   },
 };
 </script>
@@ -59,11 +96,14 @@ export default {
 .title {
   margin-bottom: 24px;
   font-size: 24px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #ddd;
 }
 .policy-list {
   .policy-item {
     overflow: hidden;
     margin-bottom: 20px;
+    cursor: pointer;
     .left {
       float: left;
     }

src/views/policydetail.vue

@@ -0,0 +1,65 @@
+<template>
+  <div class="">
+    <Header />
+    <Mainmenu activeIndex="2" />
+    <div class="wrap">
+      <div class="title">{{ policyInfo.artTitle }}</div>
+      <div v-html="policyInfo.artContent"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Header from "@/components/header.vue";
+import Mainmenu from "@/components/mainmenu.vue";
+import { getPolicyInfo } from "@/utils/api";
+export default {
+  name: "",
+  components: {
+    Header,
+    Mainmenu,
+  },
+  data() {
+    return {
+      id: "",
+      policyInfo: {},
+    };
+  },
+  created() {
+    this.id = this.$route.query.id;
+    this.handelGetPolicyInfo();
+  },
+  methods: {
+    handelGetPolicyInfo() {
+      getPolicyInfo({ id: this.id })
+        .then((res) => {
+          console.log("getPolicyInfo", res);
+          this.policyInfo = res.data;
+        })
+        .catch((err) => {
+          console.log("getPolicyInfo err", err);
+        });
+    },
+  },
+};
+</script>
+
+<style lang='scss' scoped>
+.wrap {
+  padding-top: 50px;
+  overflow: hidden;
+  .title {
+    text-align: center;
+    margin-bottom: 24px;
+    font-size: 24px;
+  }
+  /deep/ img {
+    max-width: 100%;
+  }
+  /deep/ p {
+    line-height: 1.5;
+    margin-bottom: 10px;
+  }
+}
+//@import url()
+</style>

vue.config.js

@@ -13,7 +13,8 @@ module.exports = {
   devServer: {
     proxy: {
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://wx.hw.hongweisoft.com/veterans/company/`,
+        // target: `http://wx.hw.hongweisoft.com/veterans/company/`,
+        target: `http://172.16.90.64:7200/company/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''