初步设计完毕

ce_client/src/router/index.js

@@ -82,11 +82,18 @@ export const asyncRoutes = [
     path: '/search',
     component: Layout,
     redirect: '/search',
+    meta: { title: '专家检索', icon: 'search' },
     children: [{
       path: 'search',
       name: 'Search',
       component: () => import('@/views/search/index'),
-      meta: { title: '专家检索', icon: 'search' }
+      meta: { title: '专家检索(卡片)', icon: 'search' }
+    },
+    {
+      path: 'search2',
+      name: 'Search2',
+      component: () => import('@/views/search/index2'),
+      meta: { title: '专家检索(列表)', icon: 'search' }
     }]
   },
   {

ce_client/src/views/login/index.vue

@@ -1,11 +1,19 @@
 <template>
   <div class="login-container">
-    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
-
+    <el-form
+      ref="loginForm"
+      :model="loginForm"
+      :rules="loginRules"
+      class="login-form"
+      auto-complete="on"
+      label-position="left"
+    >
+    <div style="text-align:center;margin-bottom:8px">
+      <!-- <img class="logo" src="../../assets/logo.png" /> -->
+    </div>
       <div class="title-container">
         <h3 class="title">总院专家库</h3>
       </div>
-
       <el-form-item prop="username">
         <span class="svg-container">
           <svg-icon icon-class="user" />
@@ -37,17 +45,24 @@
           @keyup.enter.native="handleLogin"
         />
         <span class="show-pwd" @click="showPwd">
-          <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
+          <svg-icon
+            :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"
+          />
         </span>
       </el-form-item>
 
-      <el-button :loading="loading" type="primary" style="width:100%;margin-bottom:30px;" @click.native.prevent="handleLogin">登陆</el-button>
+      <el-button
+        :loading="loading"
+        type="primary"
+        style="width: 100%; margin-bottom: 30px"
+        @click.native.prevent="handleLogin"
+        >登陆</el-button
+      >
 
       <!-- <div class="tips">
         <span style="margin-right:20px;">username: admin</span>
         <span> password: any</span>
       </div> -->
-
     </el-form>
   </div>
 </template>
@@ -56,7 +71,7 @@
 // import { validUsername } from '@/utils/validate'
 
 export default {
-  name: 'Login',
+  name: "Login",
   data() {
     // const validateUsername = (rule, value, callback) => {
     //   if (!validUsername(value)) {
@@ -67,78 +82,82 @@ export default {
     // }
     const validatePassword = (rule, value, callback) => {
       if (value.length < 4) {
-        callback(new Error('密码长度小于4位!'))
+        callback(new Error("密码长度小于4位!"));
       } else {
-        callback()
-      }
+        callback();
       }
+    };
     return {
       loginForm: {
-        username: '',
-        password: ''
+        username: "",
+        password: "",
       },
       loginRules: {
-        username: [{ required: true, trigger: 'blur', message: '请输入账户' }],
-        password: [{ required: true, trigger: 'blur', validator: validatePassword, message: '请输入密码' }]
+        username: [{ required: true, trigger: "blur", message: "请输入账户" }],
+        password: [
+          {
+            required: true,
+            trigger: "blur",
+            validator: validatePassword,
+            message: "请输入密码",
+          },
+        ],
       },
       loading: false,
-      passwordType: 'password',
-      redirect: undefined
-    }
+      passwordType: "password",
+      redirect: undefined,
+    };
   },
   watch: {
     $route: {
-      handler: function(route) {
-        this.redirect = route.query && route.query.redirect
+      handler: function (route) {
+        this.redirect = route.query && route.query.redirect;
+      },
+      immediate: true,
     },
-      immediate: true
-    }
   },
   methods: {
     showPwd() {
-      if (this.passwordType === 'password') {
-        this.passwordType = ''
+      if (this.passwordType === "password") {
+        this.passwordType = "";
       } else {
-        this.passwordType = 'password'
+        this.passwordType = "password";
       }
       this.$nextTick(() => {
-        this.$refs.password.focus()
-      })
+        this.$refs.password.focus();
+      });
     },
     handleLogin() {
-      this.$refs.loginForm.validate(valid => {
+      this.$refs.loginForm.validate((valid) => {
         if (valid) {
-          this.loading = true
-          this.$store.dispatch('user/login', this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || '/' })
-            this.loading = false
-          }).catch(() => {
-            this.loading = false
+          this.loading = true;
+          this.$store
+            .dispatch("user/login", this.loginForm)
+            .then(() => {
+              this.$router.push({ path: this.redirect || "/crm/consumer" });
+              this.loading = false;
             })
+            .catch(() => {
+              this.loading = false;
+            });
         } else {
-          console.log('error submit!!')
-          return false
+          console.log("error submit!!");
+          return false;
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss">
 /* 修复input 背景不协调 和光标变色 */
 /* Detail see https://github.com/PanJiaChen/vue-element-admin/pull/927 */
 
-$bg:#283443;
-$light_gray:#fff;
+$bg: #283443;
+$light_gray: #fff;
 $cursor: #fff;
 
-@supports (-webkit-mask: none) and (not (cater-color: $cursor)) {
-  .login-container .el-input input {
-    color: $cursor;
-  }
-}
-
 /* reset element-ui css */
 .login-container {
   .el-input {
@@ -152,20 +171,18 @@ $cursor: #fff;
       -webkit-appearance: none;
       border-radius: 0px;
       padding: 12px 5px 12px 15px;
-      color: $light_gray;
+      // color: $light_gray;
       height: 47px;
-      caret-color: $cursor;
+      // caret-color: $cursor;
 
-      &:-webkit-autofill {
-        box-shadow: 0 0 0px 1000px $bg inset !important;
-        -webkit-text-fill-color: $cursor !important;
-      }
+      // &:-webkit-autofill {
+      //   box-shadow: 0 0 0px 1000px inset !important;
+      // }
     }
   }
 
   .el-form-item {
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    background: rgba(0, 0, 0, 0.1);
+    border: 1px solid;
     border-radius: 5px;
     color: #454545;
   }
@@ -173,23 +190,26 @@ $cursor: #fff;
 </style>
 
 <style lang="scss" scoped>
-$bg:#2d3a4b;
-$dark_gray:#889aa4;
-$light_gray:#eee;
+$bg: #2d3a4b;
+$dark_gray: #889aa4;
+$light_gray: #eee;
 
 .login-container {
-  min-height: 100%;
-  width: 100%;
-  background-color: $bg;
-  overflow: hidden;
-
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 100%;
+  background-image: url("../../assets/background.jpg");
+  background-size: cover;
   .login-form {
-    position: relative;
-    width: 520px;
-    max-width: 100%;
-    padding: 160px 35px 0;
-    margin: 0 auto;
-    overflow: hidden;
+    border-radius: 6px;
+    background: #ffffff;
+    padding: 25px 25px 5px 25px;
+    width: 400px;
+    .logo {
+      width: 350px;
+      height: 140px;
+    }
   }
 
   .tips {
@@ -206,7 +226,7 @@ $light_gray:#eee;
 
   .svg-container {
     padding: 6px 5px 6px 15px;
-    color: $dark_gray;
+    // color: $dark_gray;
     vertical-align: middle;
     width: 30px;
     display: inline-block;
@@ -217,8 +237,8 @@ $light_gray:#eee;
 
     .title {
       font-size: 26px;
-      color: $light_gray;
-      margin: 0px auto 40px auto;
+      color: #0174d7;
+      margin: 0px auto 20px auto;
       text-align: center;
       font-weight: bold;
     }
@@ -229,7 +249,7 @@ $light_gray:#eee;
     right: 10px;
     top: 7px;
     font-size: 16px;
-    color: $dark_gray;
+    // color: $dark_gray;
     cursor: pointer;
     user-select: none;
   }

ce_client/src/views/search/index.vue

@@ -75,7 +75,7 @@
               <el-row :gutter="8">
                 <el-col :xs="9" :sm="10" :lg="8" :xl="8">
                   <el-image
-                    style="width: 100%"
+                    style="width: 80px"
                     :src="item.photo"
                     :preview-src-list="[item.photo]"
                   >
@@ -85,7 +85,7 @@
                   </el-image>
                 </el-col>
                 <el-col :xs="15" :sm="14" :lg="16" :xl="16">
-                  <div style="text-align: center">
+                  <div >
                     <div
                       style="
                         font-weight: bold;
@@ -93,6 +93,8 @@
                         margin-top: 4px;
                       "
                     >
+                      
+                      {{ item.name }}
                       <i
                         class="el-icon-male"
                         style="color: blue; font-weight: bold"
@@ -103,7 +105,6 @@
                         style="color: blue; font-weight: red"
                         v-else
                       ></i>
-                      {{ item.name }}
                     </div>
                     <div style="margin-top: 4px">{{ item.hdegree }}</div>
                     <div style="margin-top: 4px">{{ item.idnumber }}</div>
@@ -260,7 +261,7 @@ export default {
                 let sm = data[i][arg][x]
                 sm.name_ = data[i][arg][x].name.replace(
                   searchList[m],
-                  '<span style="color:red;">' + searchList[m] + "</span>"
+                  '<span style="color:red;font-weight:bold">' + searchList[m] + "</span>"
                 );
                 ll.push(sm);
               }

ce_client/src/views/search/index2.vue

@@ -0,0 +1,238 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <div slot="header" class="clearfix">
+        <span>专家库检索</span>
+      </div>
+      <el-row type="flex">
+        <el-col :sm="18">
+          <el-row :gutter="8">
+            <el-col :xs="16" :sm="20">
+              <el-input
+                v-model="listQuery.search"
+                placeholder="请输入关键字"
+                @keyup.enter.native="handleFilter"
+              ></el-input>
+            </el-col>
+            <el-col :xs="8" :sm="4">
+              <el-button
+                type="primary"
+                style="width: 100%"
+                @click="handleFilter"
+                >搜索一下</el-button
+              >
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+      <el-row style="margin-top:6px">
+        <el-col :xs="12" :sm="12" :lg="6" :xl="6">
+        <el-select
+            v-model="listQuery.hdegree"
+            placeholder="最高学历"
+            clearable
+            @change="handleFilter"
+            style="width:100%"
+          >
+            <el-option
+              v-for="item in degreeOptions"
+              :key="item.key"
+              :label="item.label"
+              :value="item.key"
+            />
+          </el-select>
+        </el-col>
+      </el-row>
+    </el-card>
+    <el-card style="margin-top: 6px">
+      <div slot="header" class="clearfix">
+        <span>专家库</span>
+      </div>
+        <el-table
+          v-loading="listLoading"
+          :data="tableData.results"
+          highlight-current-row
+          row-key="id"
+          height="100"
+          stripe
+          v-el-height-adaptive-table="{bottomOffset: 50}"
+        >
+          <el-table-column type="index" width="50" />
+          <el-table-column align="center" label="证件照" width="80px">
+            <template slot-scope="scope" >
+              <el-image
+                    style="width: 100%"
+                    :src="scope.row.photo"
+                    :preview-src-list="[scope.row.photo]"
+                  >
+                    <div slot="error" class="image-slot">
+                      <i class="el-icon-picture-outline"></i>
+                    </div>
+                  </el-image>
+            </template>
+          </el-table-column>
+          <el-table-column label="基本信息">
+            <template slot-scope="scope">
+                    <div
+                      style="
+                        font-weight: bold;
+                        font-size: 18px;
+                        margin-top: 4px;
+                      "
+                    >
+                      {{ scope.row.name }}
+                      <i
+                        class="el-icon-male"
+                        style="color: blue; font-weight: bold"
+                        v-if="scope.row.gender == '男'"
+                      ></i>
+                      <i
+                        class="el-icon-female"
+                        style="color: blue; font-weight: red"
+                        v-else
+                      ></i>
+                    </div>
+                    <div style="margin-top: 4px">{{ scope.row.hdegree }}</div>
+                    <div style="margin-top: 4px">{{ scope.row.idnumber }}</div>
+
+            </template>
+          </el-table-column>
+          <el-table-column align="header-center" label="项目经历">
+            <template slot-scope="scope"><div v-for="x in scope.row.project_" v-bind:key="x.id" class="tip" v-html="x.name_">
+                  </div></template>
+          </el-table-column>
+          <el-table-column align="header-center" label="论文著作">
+            <template slot-scope="scope">
+              <div v-for="x in scope.row.paper_" v-bind:key="x.id" class="tip" v-html="x.name_">
+                  </div></template>
+          </el-table-column>
+          <el-table-column label="所获奖项">
+            <template slot-scope="scope">
+              <div v-for="x in scope.row.award_" v-bind:key="x.id" class="tip" v-html="x.name_">
+                  </div>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="操作">
+            <template slot-scope="scope">
+              <el-button
+                type="primary"
+                size="small"
+                @click="handleEdit(scope)"
+              >更多信息</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+      <pagination
+        style="margin-top: 6px"
+        v-show="tableData.count > 0"
+        :total="tableData.count"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.page_size"
+        @pagination="getList"
+      />
+    </el-card>
+  </div>
+</template>
+<script>
+import { getExpertList } from "@/api/expert";
+import checkPermission from "@/utils/permission";
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+export default {
+  components: { Pagination },
+  data() {
+    return {
+      search: null,
+      listQuery: {
+        page: 1,
+        page_size: 12,
+        search: "",
+      },
+      listLoading: false,
+      tableData: {
+        count: 0,
+        results: [],
+      },
+      degreeOptions:[
+        { key: "博士研究生", value: "博士研究生" },
+        { key: "硕士研究生", value: "硕士研究生" },
+        { key: "本科", value: "本科" },
+        { key: "大专", value: "大专" },
+      ]
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    checkPermission,
+    getList() {
+      this.listLoading = true;
+      getExpertList(this.listQuery)
+        .then((res) => {
+          this.listLoading = false;
+          this.tableData = res.data;
+          //高亮显示
+          this.showLight();
+        })
+        .catch((e) => {
+          this.listLoading = false;
+        });
+    },
+    handleFilter() {
+      this.page = 1;
+      this.getList();
+    },
+    lessStr(data, arg) {
+      for (var i = 0; i < data.length; i++) {
+        let len1 = data[i][arg].length;
+        if (len1 > 2) {
+          data[i][arg] = data[i][arg].slice(0, 2);
+        }
+        for (var x = 0; x < data[i][arg].length; x++) {
+          data[i][arg][x].name_ = data[i][arg][x].name;
+        }
+      }
+    },
+    lessStr2(data, arg, searchList) {
+      for (var i = 0; i < data.length; i++) {
+          //项目经历
+          var ll = [];
+          for (var x = 0; x < data[i][arg].length; x++) {
+            for (var m = 0; m < searchList.length; m++) {
+              if (data[i][arg][x].name.indexOf(searchList[m]) != -1) {
+                let sm = data[i][arg][x]
+                sm.name_ = data[i][arg][x].name.replace(
+                  searchList[m],
+                  '<span style="color:red;font-weight:bold">' + searchList[m] + "</span>"
+                );
+                ll.push(sm);
+              }
+            }
+          }
+          data[i][arg]=ll
+        }
+
+    },
+    showLight() {
+      var data = this.tableData.results
+      if (this.listQuery.search == "") {
+        
+        //项目经历
+        this.lessStr(data, "project_");
+        //论文
+        this.lessStr(data, "paper_");
+        //获奖
+        this.lessStr(data, "award_");
+      } else {
+        let searchList = this.listQuery.search.split(" ");
+        this.lessStr2(data, 'project_', searchList)
+        this.lessStr2(data, 'paper_', searchList)
+        this.lessStr2(data, 'award_', searchList)
+      }
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

ce_server/apps/expert/models.py

@@ -23,7 +23,7 @@ class Expert(CommonBModel):
     idnumber = models.CharField(verbose_name="身份证号", max_length=40)
     paddress = models.TextField(verbose_name="通讯地址")
     photo = models.CharField(verbose_name="证件照", max_length=100, null=True, blank=True)
-    hdegree = models.CharField(verbose_name="最高学历",choices=gender_choices, default='本科', max_length=10)
+    hdegree = models.CharField(verbose_name="最高学历",choices=degree_choices, default='本科', max_length=10)
 
     class Meta:
         verbose_name = '专家信息'