提交干部代码

src/global-llibs/base-config.js

@@ -99,6 +99,7 @@ const ConfigFn = {
      * 获取登录用户权限数据
      */
     getPersonInfo_I:()=>{
+        debugger;
         // eslint-disable-next-line no-debugger
         // 请求参数
         if (Cookie.get("person_id")){
@@ -209,10 +210,11 @@ const ConfigFn = {
                     // }
                     //兼容结束
                     BaseConfig.userInfo.person_name_cookie = data.table_List.person_name;
+                    BaseConfig.userInfo.person_name = data.table_List.person_name;
                     BaseConfig.person_info_my = PublicFn.extendedObject(BaseConfig.person_info_my,_person_info_my);
                     window.person_info_my = BaseConfig.person_info_my
 
-                    if (BaseConfig.pt_type === ""){
+                    if (!BaseConfig.pt_type || BaseConfig.pt_type === ""){
                         interfaceConfig.callInterface([{
                             url:'golbal/getValueByKey',
                             params:{key:'common.server.location'},

src/views/kcCadreInfo/layout/NavBar/Avatar.vue

@@ -36,10 +36,10 @@
                 user.logout((logoutRes) => {
                     //console.log(logoutRes)
                     //清除Cookie登录信息
-                    this.Cookie.set("person_id", '', 0)
+                    // this.Cookie.set("person_id", '', 0)
-                    this.Cookie.set("identity_id", '', 0)
+                    // this.Cookie.set("identity_id", '', 0)
-                    this.Cookie.unset("person_id")
+                    this.Cookie.delete("person_id")
-                    this.Cookie.unset("identity_id")
+                    this.Cookie.delete("identity_id")
                     //清楚state中登录信息
                     //this.clearUser()
                     this.$store.commit('user/clearUser')

src/views/kcCadreInfo/pages/biz/CadreSearchBySummary.vue

@@ -17,7 +17,7 @@
                 <li>
                     从文化层次上看，领导干部具有
                     <template v-for="(edu, index) in educationList">
-                        {{edu.name}}学历的<span class="number">{{edu.num}}</span>人，占<span class="number">{{edu.ratio}}%</span>
+                        {{edu.name}}学历的<span class="number" :key="index">{{edu.num}}</span>人，占<span class="number">{{edu.ratio}}%</span>
                         <template v-if="index+1 == educationList.length">。</template>
                         <template v-else>；</template>
                     </template>
@@ -25,7 +25,7 @@
                 <li>
                     从年龄结构上看，领导干部平均年龄为<span class="number">{{data.avg_age}}</span>岁。
                     <template v-for="(age, index) in ageList">
-                        其中<span class="number">{{age.year}}</span>年出生（<span class="number">{{age.age}}</span>岁）<span class="number">{{age.num}}</span>人，占<span class="number">{{age.ratio}}%</span>
+                        其中<span class="number" :key="index">{{age.year}}</span>年出生（<span class="number">{{age.age}}</span>岁）<span class="number">{{age.num}}</span>人，占<span class="number">{{age.ratio}}%</span>
                         <template v-if="index+1 == ageList.length">。</template>
                         <template v-else>；</template>
                     </template>
@@ -33,7 +33,7 @@
                 <li>
                     从专业技术等级上看，
                     <template v-for="(tech, index) in technicalList">
-                        {{tech.name}}职称<span class="number">{{tech.num}}</span>人，占<span class="number">{{tech.ratio}}%</span>
+                        {{tech.name}}职称<span class="number" :key="index">{{tech.num}}</span>人，占<span class="number">{{tech.ratio}}%</span>
                         <template v-if="index+1 == technicalList.length">。</template>
                         <template v-else>；</template>
                     </template>
@@ -44,7 +44,7 @@
             <div style="height: 40px; line-height: 40px; margin: auto; text-align: center; vertical-align: middle; font-size: 18px; background-color: #1890ff;">设置参数</div>
             <div>
                 <table>
-                    <tr v-for="(yearCon, index) in yearJson">
+                    <tr v-for="(yearCon, index) in yearJson" :key="index">
                         <td width="20%">{{index+1}}.起止出生年月</td>
                         <td>
                             <a-range-picker
@@ -84,17 +84,14 @@
 <!-- 干部信息查询-》概述 -->
 <script>
     import {mapState} from 'vuex'
-    import {Table, Spin, Button, DatePicker, Icon, Modal} from 'ant-design-vue'
+    import {Button, DatePicker, Icon, Modal} from 'ant-design-vue'
     import cadreManageApi from "../../api/cadreManage"
     import moment from "moment";
     export default {
         name: "CadreSearchBySummary",
         components: {
-            ATable: Table,
-            ASpin: Spin,
             AButton: Button,
             AIcon: Icon,
-            ADatePicker: DatePicker,
             ARangePicker: DatePicker.RangePicker
         },
         data() {

src/views/kcCadreInfo/readme.md

@@ -1,19 +1,3 @@
-## ToDo
-1. 菜单加滚动条，vuescroll
-2. content加进入动画效果
-3. footer加版权信息
-4. 登录加验证码
-5. 去掉目录名称kcCadreInfo，或者改成初始化
-6. 路由权限改成无权限不加载 404
-7. 接口加拦截，判断非登录状态跳转到登录页
-
-## Bugs
-1. 登录页面输入focus
-3. 表格外圈边框粗细、圆角问题
-
-## ToNote
-1. 函数式组件
-2. 从登录到主页执行过程