From 592dcfcbe8da9fca0872fdb181c55cb4ef4787a2 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 24 Sep 2020 14:09:01 +0800
Subject: [PATCH] login msg

---
 client/src/views/ability/cma.vue           | 550 +++++++++++----------
 client/src/views/ability/cma2.vue          |  18 +-
 client/src/views/ability/qualification.vue |  17 +-
 client/src/views/login/index.vue           |   2 +-
 server/apps/system/views.py                |   5 +-
 server/db.sqlite3                          | Bin 44654592 -> 44654592 bytes
 6 files changed, 322 insertions(+), 270 deletions(-)

diff --git a/client/src/views/ability/cma.vue b/client/src/views/ability/cma.vue
index 1c47532..90dc5bf 100644
--- a/client/src/views/ability/cma.vue
+++ b/client/src/views/ability/cma.vue
@@ -1,112 +1,130 @@
 <template>
   <div class="app-container">
-        <div>
-          <el-input
-            v-model="listQuery.search"
-            placeholder="项目/标准/编号/中心"
-            style="width: 600px;"
-            class="filter-item"
-            @keyup.enter.native="handleFilter"
-          />
-          <el-button
-            class="filter-item"
-            type="primary"
-            icon="el-icon-search"
-            @click="handleFilter"
-          >搜索</el-button>
-          <el-button
-            class="filter-item"
-            style="margin-left: 10px;"
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="resetFilter"
-          >刷新重置</el-button>
-        </div>
-        <div style="margin-top:10px">
-          <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="checkPermission(['cma_create'])">新增</el-button> -->
-          <el-popover
-  placement="top"
-  width="160"
-  v-if="checkPermission(['ability_import'])"
-  v-model="popovervisible"
-  >
-  <p>导入能力列表压缩包.</p>
-  <div style="text-align: left; margin: 0;">
-    <el-upload
-  :action="upUrl"
-  :on-success="handleUploadSuccess"
-  accept=".rar,.zip"
-  :headers="upHeaders"
-  :show-file-list ="false"
-  >
-  <el-button size="small" type="primary" @click="popovervisible = false">上传导入</el-button>
-</el-upload>
-  </div>
-  
-  <el-button slot="reference">导入CMA能力</el-button>
-</el-popover>
-<el-popover
-  placement="top"
-  width="160"
-  v-if="checkPermission(['ability_import'])"
-  v-model="popovervisible2"
-  >
-  <p>导入能力列表压缩包.</p>
-  <div style="text-align: left; margin: 0;">
-    <el-upload
-  :action="upUrl"
-  :on-success="handleUploadSuccess2"
-  accept=".rar"
-  :headers="upHeaders"
-  :show-file-list ="false"
-  >
-  <el-button size="small" type="primary" @click="popovervisible2 = false">上传导入</el-button>
-</el-upload>
-  </div>
-  
-  <el-button slot="reference">导入CNAS能力</el-button>
-</el-popover>
-        </div>
-        <el-table
-          v-loading="listLoading"
-          :data="cmaList.results"
-          style="width: 100%;margin-top:10px;"
-          border
-          fit
-          stripe
-          highlight-current-row
-          max-height="300"
-          ref="filterTable"
-          @filter-change="filterChange"
-        >
-          <el-table-column type="index" width="50" />
-          <el-table-column align="center" label="大类名称">
-            <template slot-scope="scope">{{ scope.row.dlmc }}</template>
-          </el-table-column>
-          <el-table-column align="header-center" label="类别名称">
-            <template slot-scope="scope">{{ scope.row.lbmc }}</template>
-          </el-table-column>
-          <el-table-column align="header-center" label="项目序号">
-            <template slot-scope="scope">{{ scope.row.xmxh }}</template>
-          </el-table-column>
-          <el-table-column align="header-center" label="项目名称">
-            <template slot-scope="scope">{{ scope.row.xmmc }}</template>
-          </el-table-column>
-          <el-table-column align="header-center" label="标准名称">
-            <template slot-scope="scope">{{ scope.row.bzmc }}</template>
-          </el-table-column>
-          <el-table-column align="header-center" label="标准编号">
-            <template slot-scope="scope">{{ scope.row.bzbh }}</template>
-          </el-table-column>
-          <el-table-column align="header-center" label="所属中心"
-          prop="sszx"
-           column-key="sszx"
-          :filters="groupBy.sszx"
-          :filter-multiple="false"
+    <el-row :gutter="6">
+    <el-col :xs="24" :md="16">
+      <el-input
+        v-model="listQuery.search"
+        placeholder="项目/标准/编号/中心"
+        style="width: 100%"
+        class="filter-item"
+        @keyup.enter.native="handleFilter"
+      />
+    </el-col>
+    <el-col :xs="24" :md="8" >
+      <el-button
+        class="filter-item"
+        type="primary"
+        icon="el-icon-search"
+        @click="handleFilter"
+        >搜索</el-button
+      >
+      <el-button
+        class="filter-item"
+        type="primary"
+        icon="el-icon-refresh-left"
+        @click="resetFilter"
+        >刷新重置</el-button
+      >
+    </el-col>
+    </el-row>
+    <div style="margin-top: 10px">
+      <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="checkPermission(['cma_create'])">新增</el-button> -->
+      <el-popover
+        placement="top"
+        width="160"
+        v-if="checkPermission(['ability_import'])"
+        v-model="popovervisible"
+      >
+        <p>导入能力列表压缩包.</p>
+        <div style="text-align: left; margin: 0">
+          <el-upload
+            :action="upUrl"
+            :on-success="handleUploadSuccess"
+            accept=".rar,.zip"
+            :headers="upHeaders"
+            :show-file-list="false"
           >
-            <template slot-scope="scope">{{ scope.row.sszx }}</template>
-          </el-table-column>
-          <!-- <el-table-column align="center" label="操作">
+            <el-button
+              size="small"
+              type="primary"
+              @click="popovervisible = false"
+              >上传导入</el-button
+            >
+          </el-upload>
+        </div>
+
+        <el-button slot="reference">导入CMA能力</el-button>
+      </el-popover>
+      <el-popover
+        placement="top"
+        width="160"
+        v-if="checkPermission(['ability_import'])"
+        v-model="popovervisible2"
+      >
+        <p>导入能力列表压缩包.</p>
+        <div style="text-align: left; margin: 0">
+          <el-upload
+            :action="upUrl"
+            :on-success="handleUploadSuccess2"
+            accept=".rar"
+            :headers="upHeaders"
+            :show-file-list="false"
+          >
+            <el-button
+              size="small"
+              type="primary"
+              @click="popovervisible2 = false"
+              >上传导入</el-button
+            >
+          </el-upload>
+        </div>
+
+        <el-button slot="reference">导入CNAS能力</el-button>
+      </el-popover>
+    </div>
+    <el-card style="margin-top: 6px">
+    <el-table
+      v-loading="listLoading"
+      :data="cmaList.results"
+      style="width: 100%; "
+      border
+      fit
+      stripe
+      highlight-current-row
+      max-height="320"
+      ref="filterTable"
+      @filter-change="filterChange"
+    >
+      <el-table-column type="index" width="50" />
+      <el-table-column align="center" label="大类名称">
+        <template slot-scope="scope">{{ scope.row.dlmc }}</template>
+      </el-table-column>
+      <el-table-column align="header-center" label="类别名称">
+        <template slot-scope="scope">{{ scope.row.lbmc }}</template>
+      </el-table-column>
+      <el-table-column align="header-center" label="项目序号">
+        <template slot-scope="scope">{{ scope.row.xmxh }}</template>
+      </el-table-column>
+      <el-table-column align="header-center" label="项目名称">
+        <template slot-scope="scope">{{ scope.row.xmmc }}</template>
+      </el-table-column>
+      <el-table-column align="header-center" label="标准名称">
+        <template slot-scope="scope">{{ scope.row.bzmc }}</template>
+      </el-table-column>
+      <el-table-column align="header-center" label="标准编号">
+        <template slot-scope="scope">{{ scope.row.bzbh }}</template>
+      </el-table-column>
+      <el-table-column
+        align="header-center"
+        label="所属中心"
+        prop="sszx"
+        column-key="sszx"
+        :filters="groupBy.sszx"
+        :filter-multiple="false"
+      >
+        <template slot-scope="scope">{{ scope.row.sszx }}</template>
+      </el-table-column>
+      <!-- <el-table-column align="center" label="操作">
             <template slot-scope="scope">
               <el-button
                 :disabled="!checkPermission(['cma_update'])"
@@ -124,48 +142,47 @@
               />
             </template>
           </el-table-column> -->
-        </el-table>
+    </el-table>
 
-        <pagination
-          v-show="cmaList.count>0"
-          :total="cmaList.count"
-          :page.sync="listQuery.page"
-          :limit.sync="listQuery.page_size"
-          @pagination="getList"
-        />
-
-        <el-table
-          v-loading="listLoading2"
-          :data="cnasList.results"
-          style="width: 100%;margin-top:10px;"
-          border
-          fit
-          stripe
-          highlight-current-row
-          max-height="300"
-          
-        >
-          <el-table-column type="index" width="50" />
-          <el-table-column align="header-center" label="类别名称">
-            <template slot-scope="scope">{{ scope.row.lbmc }}</template>
-          </el-table-column>
-          <el-table-column align="header-center" label="项目名称">
-            <template slot-scope="scope">{{ scope.row.xmmc }}</template>
-          </el-table-column>
-          <el-table-column align="header-center" label="标准名称">
-            <template slot-scope="scope">{{ scope.row.bzmc }}</template>
-          </el-table-column>
-          <el-table-column align="header-center" label="标准编号">
-            <template slot-scope="scope">{{ scope.row.bzbh }}</template>
-          </el-table-column>
-          <el-table-column align="header-center" label="标准条款">
-            <template slot-scope="scope">{{ scope.row.bztk }}</template>
-          </el-table-column>
-          <el-table-column align="header-center" label="所属中心"
-          >
-            <template slot-scope="scope">{{ scope.row.sszx }}</template>
-          </el-table-column>
-          <!-- <el-table-column align="center" label="操作">
+    <pagination
+      v-show="cmaList.count > 0"
+      :total="cmaList.count"
+      :page.sync="listQuery.page"
+      :limit.sync="listQuery.page_size"
+      @pagination="getList"
+    />
+    </el-card>
+    <el-card style="margin-top:6px">
+    <el-table
+      v-loading="listLoading2"
+      :data="cnasList.results"
+      style="width: 100%;"
+      border
+      fit
+      stripe
+      highlight-current-row
+      max-height="320"
+    >
+      <el-table-column type="index" width="50" />
+      <el-table-column align="header-center" label="类别名称">
+        <template slot-scope="scope">{{ scope.row.lbmc }}</template>
+      </el-table-column>
+      <el-table-column align="header-center" label="项目名称">
+        <template slot-scope="scope">{{ scope.row.xmmc }}</template>
+      </el-table-column>
+      <el-table-column align="header-center" label="标准名称">
+        <template slot-scope="scope">{{ scope.row.bzmc }}</template>
+      </el-table-column>
+      <el-table-column align="header-center" label="标准编号">
+        <template slot-scope="scope">{{ scope.row.bzbh }}</template>
+      </el-table-column>
+      <el-table-column align="header-center" label="标准条款">
+        <template slot-scope="scope">{{ scope.row.bztk }}</template>
+      </el-table-column>
+      <el-table-column align="header-center" label="所属中心">
+        <template slot-scope="scope">{{ scope.row.sszx }}</template>
+      </el-table-column>
+      <!-- <el-table-column align="center" label="操作">
             <template slot-scope="scope">
               <el-button
                 :disabled="!checkPermission(['cnas_update'])"
@@ -183,18 +200,26 @@
               />
             </template>
           </el-table-column> -->
-        </el-table>
+    </el-table>
 
-        <pagination
-          v-show="cnasList.count>0"
-          :total="cnasList.count"
-          :page.sync="listQuery2.page"
-          :limit.sync="listQuery2.page_size"
-          @pagination="getList2"
-        />
-
-    <el-dialog :visible.sync="dialogVisible" :title="dialogType==='edit'?'编辑':'新增'">
-      <el-form ref="Form" :model="cma" label-width="80px" label-position="right" >
+    <pagination
+      v-show="cnasList.count > 0"
+      :total="cnasList.count"
+      :page.sync="listQuery2.page"
+      :limit.sync="listQuery2.page_size"
+      @pagination="getList2"
+    />
+    </el-card>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :title="dialogType === 'edit' ? '编辑' : '新增'"
+    >
+      <el-form
+        ref="Form"
+        :model="cma"
+        label-width="80px"
+        label-position="right"
+      >
         <el-form-item label="姓名" prop="name">
           <el-input v-model="cma.name" placeholder="姓名" />
         </el-form-item>
@@ -202,36 +227,44 @@
           <el-input v-model="cma.username" placeholder="账户" />
         </el-form-item>
       </el-form>
-      <div style="text-align:right;">
-        <el-button type="danger" @click="dialogVisible=false">取消</el-button>
+      <div style="text-align: right">
+        <el-button type="danger" @click="dialogVisible = false">取消</el-button>
         <el-button type="primary" @click="confirm('Form')">确认</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 <style >
-.el-table-filter{
-  width:300px;
+.el-table-filter {
+  width: 300px;
   max-height: 300px;
   overflow-y: auto;
 }
 </style>
 <script>
-import { getCMAList, createCMA, deleteCMA, updateCMA, importCMA, getCNASList, importCNAS, getCMAGroup } from "@/api/cma";
-import checkPermission from "@/utils/permission"
-import { upUrl, upHeaders } from "@/api/file"
-import Pagination from "@/components/Pagination" // secondary package based on el-pagination
+import {
+  getCMAList,
+  createCMA,
+  deleteCMA,
+  updateCMA,
+  importCMA,
+  getCNASList,
+  importCNAS,
+  getCMAGroup,
+} from "@/api/cma";
+import checkPermission from "@/utils/permission";
+import { upUrl, upHeaders } from "@/api/file";
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
 const defaultCMA = {
   id: "",
-  dlxh:null,
-  dlmc:null,
-
+  dlxh: null,
+  dlmc: null,
 };
 const dflistQuery = {
   page: 1,
   page_size: 20,
-  type:'center'
-}
+  type: "center",
+};
 export default {
   components: { Pagination },
   data() {
@@ -239,19 +272,19 @@ export default {
       cma: defaultCMA,
       upHeaders: upHeaders(),
       upUrl: upUrl(),
-      groupBy:{sszx:[]},
-      cmaList: {count:0},
-      cnasList: {count:0},
+      groupBy: { sszx: [] },
+      cmaList: { count: 0 },
+      cnasList: { count: 0 },
       listLoading: true,
-      listLoading2:false,
+      listLoading2: false,
       listQuery: Object.assign({}, dflistQuery),
       listQuery2: {
         page: 1,
-        page_size: 20
+        page_size: 20,
       },
       enabledOptions: [
         { key: "true", display_name: "激活" },
-        { key: "false", display_name: "禁用" }
+        { key: "false", display_name: "禁用" },
       ],
       dialogVisible: false,
       dialogType: "new",
@@ -260,131 +293,138 @@ export default {
     };
   },
   computed: {},
-  watch: {
-  },
+  watch: {},
   created() {
-    this.getList()
-    this.getGroup()
-    this.getList2()
+    this.getList();
+    this.getGroup();
+    this.getList2();
   },
   methods: {
     checkPermission,
     handleUploadSuccess(res, file) {
-        const loading = this.openLoading()
-        let data = {path:res.data.path}
-        importCMA(data).then(res=>{
-      this.$message({
-          message: '导入成功',
-          type: 'success'
+      const loading = this.openLoading();
+      let data = { path: res.data.path };
+      importCMA(data)
+        .then((res) => {
+          this.$message({
+            message: "导入成功",
+            type: "success",
+          });
+          loading.close();
+          this.resetFilter();
         })
-        loading.close()
-        this.resetFilter()
-        }).catch(error=>{loading.close()})
+        .catch((error) => {
+          loading.close();
+        });
     },
     handleUploadSuccess2(res, file) {
-        const loading = this.openLoading()
-        let data = {path:res.data.path}
-        importCNAS(data).then(res=>{
-      this.$message({
-          message: '导入成功',
-          type: 'success'
+      const loading = this.openLoading();
+      let data = { path: res.data.path };
+      importCNAS(data)
+        .then((res) => {
+          this.$message({
+            message: "导入成功",
+            type: "success",
+          });
+          loading.close();
+          this.resetFilter();
         })
-        loading.close()
-        this.resetFilter()
-        }).catch(error=>{loading.close()})
+        .catch((error) => {
+          loading.close();
+        });
     },
     getList() {
       this.listLoading = true;
-      getCMAList(this.listQuery).then(response => {
+      getCMAList(this.listQuery).then((response) => {
         if (response.data) {
-          this.cmaList = response.data
+          this.cmaList = response.data;
         }
-        this.listLoading = false
-      })
+        this.listLoading = false;
+      });
     },
     getGroup() {
-      for(let key in this.groupBy){
-        let data = Object.assign({}, this.listQuery)
-        data.group_by = key
-        getCMAGroup(data).then(response => {
-        this.groupBy[key] = response.data
-      })
+      for (let key in this.groupBy) {
+        let data = Object.assign({}, this.listQuery);
+        data.group_by = key;
+        getCMAGroup(data).then((response) => {
+          this.groupBy[key] = response.data;
+        });
       }
     },
     getList2() {
       this.listLoading2 = true;
-      getCNASList(this.listQuery2).then(response => {
+      getCNASList(this.listQuery2).then((response) => {
         if (response.data) {
-          this.cnasList = response.data
+          this.cnasList = response.data;
         }
-        this.listLoading2 = false
-      })
+        this.listLoading2 = false;
+      });
     },
     resetFilter() {
-      this.listQuery = Object.assign({}, dflistQuery),
-      this.listQuery2 = {
-        page: 1,
-        page_size: 20
-      }
-      this.getList()
-      this.getList2()
-      this.getGroup()
+      (this.listQuery = Object.assign({}, dflistQuery)),
+        (this.listQuery2 = {
+          page: 1,
+          page_size: 20,
+        });
+      this.getList();
+      this.getList2();
+      this.getGroup();
     },
     handleFilter() {
-      this.listQuery.page = 1
-      this.getList()
-      this.listQuery2.page = 1
-      this.listQuery2.search = this.listQuery.search
-      this.getList2()
-      this.getGroup()
+      this.listQuery.page = 1;
+      this.getList();
+      this.listQuery2.page = 1;
+      this.listQuery2.search = this.listQuery.search;
+      this.getList2();
+      this.getGroup();
     },
     handleAdd() {
-      this.cma = Object.assign({}, defaultCMA)
-      this.dialogType = "new"
-      this.dialogVisible = true
+      this.cma = Object.assign({}, defaultCMA);
+      this.dialogType = "new";
+      this.dialogVisible = true;
       this.$nextTick(() => {
-        this.$refs["Form"].clearValidate()
-      })
+        this.$refs["Form"].clearValidate();
+      });
     },
     handleEdit(scope) {
-      this.cma = Object.assign({}, scope.row) // copy obj
-      this.dialogType = "edit"
-      this.dialogVisible = true
+      this.cma = Object.assign({}, scope.row); // copy obj
+      this.dialogType = "edit";
+      this.dialogVisible = true;
       this.$nextTick(() => {
-        this.$refs["Form"].clearValidate()
-      })
+        this.$refs["Form"].clearValidate();
+      });
     },
     handleDelete(scope) {
       this.$confirm("确认删除?", "警告", {
         confirmButtonText: "确认",
         cancelButtonText: "取消",
-        type: "error"
+        type: "error",
       })
         .then(async () => {
           await deleteCMA(scope.row.id);
           this.cmaList.splice(scope.row.index, 1);
           this.$message({
             type: "success",
-            message: "成功删除!"
+            message: "成功删除!",
           });
         })
-        .catch(err => {
+        .catch((err) => {
           console.error(err);
         });
     },
-    filterChange (obj) { 
-for(let key in obj){
-  this.listQuery[key] = obj[key][0]
-}
-this.listQuery.page=1
-this.getList()
-},
+    filterChange(obj) {
+      for (let key in obj) {
+        this.listQuery[key] = obj[key][0];
+      }
+      this.listQuery.page = 1;
+      this.getList();
+    },
     async confirm(form) {
-      this.$refs[form].validate(valid => {
+      this.$refs[form].validate((valid) => {
         if (valid) {
           const isEdit = this.dialogType === "edit";
           if (isEdit) {
-            updateCMA(this.cma.id, this.cma).then(res => {
+            updateCMA(this.cma.id, this.cma).then((res) => {
               if (res.code >= 200) {
                 this.getList();
                 this.dialogVisible = false;
@@ -392,12 +432,12 @@ this.getList()
                   title: "成功",
                   message: "编辑成功",
                   type: "success",
-                  duration: 2000
+                  duration: 2000,
                 });
               }
             });
           } else {
-            createCMA(this.cma).then(res => {
+            createCMA(this.cma).then((res) => {
               if (res.code >= 200) {
                 this.getList();
                 this.dialogVisible = false;
@@ -405,7 +445,7 @@ this.getList()
                   title: "成功",
                   message: "新增成功",
                   type: "success",
-                  duration: 2000
+                  duration: 2000,
                 });
               }
             });
@@ -414,7 +454,7 @@ this.getList()
           return false;
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>
diff --git a/client/src/views/ability/cma2.vue b/client/src/views/ability/cma2.vue
index b717a62..930445e 100644
--- a/client/src/views/ability/cma2.vue
+++ b/client/src/views/ability/cma2.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="app-container">
-        <div>
-            <el-select v-model="listQuery.sszx" placeholder="所属中心" @change="handleFilter2" clearable>
+    <el-row :gutter="6">
+        <el-col :xs="24" :md="4">
+            <el-select v-model="listQuery.sszx" placeholder="所属中心" @change="handleFilter2" clearable style="width: 100%;">
     <el-option
       v-for="item in groupBy.sszx"
       :key="item.value"
@@ -9,13 +10,18 @@
       :value="item.value">
     </el-option>
   </el-select>
+        </el-col>
+
+        <el-col :xs="24" :md="8">
           <el-input
             v-model="listQuery.search"
             placeholder="项目/标准/编号/中心"
-            style="width: 600px;"
+            style="width: 100%;"
             class="filter-item"
             @keyup.enter.native="handleFilter"
           />
+        </el-col>
+        <el-col :xs="24" :md="6">
           <el-button
             class="filter-item"
             type="primary"
@@ -24,12 +30,12 @@
           >搜索</el-button>
           <el-button
             class="filter-item"
-            style="margin-left: 10px;"
             type="primary"
             icon="el-icon-refresh-left"
             @click="resetFilter"
           >刷新重置</el-button>
-        </div>
+        </el-col>
+        </el-row>
         <div style="margin-top:10px">
           <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="checkPermission(['cma_create'])">新增</el-button> -->
           <el-popover
@@ -62,7 +68,7 @@
           fit
           stripe
           highlight-current-row
-          max-height="600"
+          max-height="700"
           ref="filterTable"
           @filter-change="filterChange"
         >
diff --git a/client/src/views/ability/qualification.vue b/client/src/views/ability/qualification.vue
index 669d892..7638ad3 100644
--- a/client/src/views/ability/qualification.vue
+++ b/client/src/views/ability/qualification.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="app-container">
-        <div>
-            <el-select v-model="listQuery.sszx" placeholder="所属单位" @change="handleFilter2" clearable>
+        <el-row :gutter="6">
+          <el-col :xs="24" :md="4">
+            <el-select v-model="listQuery.sszx" placeholder="所属单位" @change="handleFilter2" clearable style="width: 100%;">
     <el-option
       v-for="item in groupBy.sszx"
       :key="item.value"
@@ -9,13 +10,17 @@
       :value="item.value">
     </el-option>
   </el-select>
+          </el-col>
+          <el-col :xs="24" :md="8">
           <el-input
             v-model="listQuery.search"
             placeholder="资质/服务"
-            style="width: 40%;"
+            style="width: 100%;"
             class="filter-item"
             @keyup.enter.native="handleFilter"
           />
+          </el-col>
+          <el-col :xs="24" :md="6">
           <el-button
             class="filter-item"
             type="primary"
@@ -24,12 +29,12 @@
           >搜索</el-button>
           <el-button
             class="filter-item"
-            style="margin-left: 10px;"
             type="primary"
             icon="el-icon-refresh-left"
             @click="resetFilter"
           >刷新</el-button>
-        </div>
+          </el-col>
+        </el-row>
         <div style="margin-top:10px">
           <el-button type="primary" icon="el-icon-plus" @click="handleAdd" v-if="checkPermission(['qualification_create'])">新增</el-button>
           <!-- <el-popover
@@ -62,7 +67,7 @@
           fit
           stripe
           highlight-current-row
-          max-height="600"
+          max-height="700"
           ref="filterTable"
           @filter-change="filterChange"
         >
diff --git a/client/src/views/login/index.vue b/client/src/views/login/index.vue
index 5250b56..bb4d84a 100644
--- a/client/src/views/login/index.vue
+++ b/client/src/views/login/index.vue
@@ -140,7 +140,7 @@ export default {
       disabled:false,
       buttonmsg:'发送验证码',
       count:20,
-      activeName: "pwd",
+      activeName: "msg",
       loginForm: {
         username: "",
         password: "",
diff --git a/server/apps/system/views.py b/server/apps/system/views.py
index 79ec0fc..c081604 100644
--- a/server/apps/system/views.py
+++ b/server/apps/system/views.py
@@ -65,7 +65,7 @@ class Login2View(APIView):
         msg = request.data['msg']
         if not User.objects.filter(username=mail).exists():
             return Response('账户不存在', status=status.HTTP_400_BAD_REQUEST)
-        if Message.objects.filter(mail=mail).last().msg == msg:
+        if Message.objects.filter(mail=mail).exists() and Message.objects.filter(mail=mail).last().msg == msg:
             user = User.objects.get(username=mail)
             return Response(get_tokens_for_user(user), status=status.HTTP_200_OK)
         return Response('验证码错误', status=status.HTTP_400_BAD_REQUEST)
@@ -75,7 +75,7 @@ class sendMsg(APIView):
     permission_classes = []
 
     def post(self, request):
-        code = random.randint(1000,9999)
+        code = random.randint(10000,99999)
         my_sender = 'caoqianming@ctc.ac.cn'
         my_user = request.data['mail']
         my_pass = '9093QQww'
@@ -101,6 +101,7 @@ class sendMsg(APIView):
             server.sendmail(my_sender,[my_user,],msg.as_string())  
             # 关闭连接
             server.quit()
+            Message.objects.filter(mail=my_user).delete()
             Message.objects.create(mail=my_user, msg=code)
         except:
             return Response('验证码发送失败', status=status.HTTP_400_BAD_REQUEST)
diff --git a/server/db.sqlite3 b/server/db.sqlite3
index a5da8d376552f7659fbd9bbbabe01f8c89f38c1b..b7c6d5960254cc2c1ba3dca744cffd92a1f7f864 100644
GIT binary patch
delta 4898
zcma*pd0bRw7YA_e%)l@pTs09~h##9f!)0df3=Eo(TG^teY3_)CMs6UY85){)+*j1e
zTyrUHF-?tDF>TM%%E~si45ievGTYzY-yP5pvG@Js`#dwB%X7|s&U5ZurtRGvF^v|t
zP`WH>*+uEHW7wt`bK~%mGAj~%vD;4#tUy7bQWaD)`7#g^7ZtuIAgXbaxvf$(xoAS(
zn5;2*MMc>o^UP(7?9-IcvWCe`l~!e~lkH0M&VI?;G8!bR?E=(4)C+1KwPRU$LB~MV
zt!ip{?BXwNia+oY)6UaHokJr7&59D=%0DLh#{`QxK#AX(S^Dz1$fE(l>b?N=cl9Ur
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
O5qgxin6_c7DdWGNiL7S;

delta 3569
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
Mm#3UNvBR11AEl-|n*aa+