提交代码

src/views/modules/knowledge/aJs/cache.js

@@ -0,0 +1,25 @@
+class SessionCache {
+  setCache(key, value) {
+    window.sessionStorage.setItem(key, JSON.stringify(value))
+  }
+
+  getCache(key) {
+    // obj => string => obj
+    const value = window.sessionStorage.getItem(key)
+    if (value) {
+      return JSON.parse(value)
+    } else {
+      return false
+    }
+  }
+
+  deleteCache(key) {
+    window.sessionStorage.removeItem(key)
+  }
+
+  clearCache() {
+    window.sessionStorage.clear()
+  }
+}
+
+export default new SessionCache()

src/views/modules/knowledge/album/albumAuditList.vue

@@ -102,6 +102,12 @@
           :pageSizeOptions="['10','20','30','40']"
           idField="pkId"
         > 
+          <template slot="albumName" slot-scope="{text}">
+            <div style="white-space: pre-line">{{ text }}</div>
+          </template>
+          <template slot="categoryName" slot-scope="{text}">
+            <div style="white-space: pre-line">{{ text }}</div>
+          </template>
           <template slot="action" slot-scope="{text,record}">
             <template v-if="record.actionFlag.indexOf('approve') > -1">
               <rx-button class="clearBtn" alias="albumAuditListProcess" :butn-icon="'none'" @click="handleJumpUpdateClick(record,true)">审核</rx-button>
@@ -186,13 +192,16 @@ export default {
         {
           title: '专辑名称',
           dataIndex: 'albumName',
-          align: 'center'
+          align: 'center',
+          width: 150,
+          scopedSlots: {customRender: 'albumName'}
         },
         {
           title: '所属分类',
           dataIndex: 'categoryName',
           align: 'center',
           width: 150,
+          scopedSlots: {customRender: 'categoryName'}
         },
         {
           title: '收录知识量',

src/views/modules/knowledge/album/albumClassifyList.vue

@@ -45,8 +45,8 @@
             <rx-button class="clearBtn" alias="albumClassifyListEdit" :butn-icon="'none'" v-if="record.isSys != 1" @click="handleUpdateClassifyClick(record)">编辑</rx-button>
             <rx-button class="clearBtn" alias="albumClassifyListLook" :butn-icon="'none'" @click="handleJumpKnowledgeManage(record)">查看专辑</rx-button>
             <template v-if="isShowButton">
-              <rx-button v-if="index != (getDataLength(record) - 1)" class="clearBtn" alias="albumClassifyListRise" :butn-icon="'none'"  @click="handleActionClick(record,2)">下降</rx-button>
               <rx-button v-if="index != 0" class="clearBtn" alias="albumClassifyListRise" :butn-icon="'none'" @click="handleActionClick(record,1)">上升</rx-button>
+              <rx-button v-if="index != (getDataLength(record) - 1)" class="clearBtn" alias="albumClassifyListRise" :butn-icon="'none'"  @click="handleActionClick(record,2)">下降</rx-button>
             </template>
             <rx-button class="clearBtn" alias="albumClassifyListDel" :butn-icon="'none'" v-if="record.isSys != 1" @click="handleDeleteClick(record)">删除</rx-button>
           </template>
@@ -135,7 +135,7 @@ export default {
         pkId: '',
         name: '',
         parent: [],
-        sort: 0
+        sort: 1
       },
       // 编辑时不同等级的分类数据
       classifyLevelList: [],

src/views/modules/knowledge/album/albumInfo.vue

@@ -15,19 +15,19 @@
           <div class="body-head-details">
             <div>
               <div>
-                <span>专辑名称: {{ baseInfo.name }}</span>
-                <span>专辑负责人: {{ baseInfo.owner }}</span>
-                <span>创建时间: {{ baseInfo.createTime }}</span>
+                <span><span>专辑名称:</span>{{ baseInfo.name }}</span>
+                <span><span>专辑负责人:</span>{{ baseInfo.owner }}</span>
+                <span><span>创建时间:</span>{{ baseInfo.createTime }}</span>
               </div>
               <div>
-                <span>所属公司: {{ baseInfo.ownerCompany }}</span>
-                <span>所属部门: {{ baseInfo.ownerDepartment }}</span>
-                <span>专辑分类: {{ baseInfo.categoryName }}</span>
+                <span><span>所属公司:</span>{{ baseInfo.ownerCompany }}</span>
+                <span><span>所属部门:</span>{{ baseInfo.ownerDepartment }}</span>
+                <span><span>专辑分类:</span>{{ baseInfo.categoryName }}</span>
               </div>
               <div>
-                <span>阅读数量: {{ baseInfo.views }}</span>
-                <span>点评数量: {{ baseInfo.yelpTotal }}</span>
-                <span>发布状态: {{ baseInfo.versionStateName }}</span>
+                <span><span>阅读数量:</span>{{ baseInfo.views }}</span>
+                <span><span>点评数量:</span>{{ baseInfo.yelpTotal }}</span>
+                <span><span>发布状态:</span>{{ baseInfo.versionStateName }}</span>
               </div>
             </div>
             <div>
@@ -41,7 +41,7 @@
               <!--  专辑简介  -->
               <div class="album-desc"> 
                 <div>专辑简介</div>
-                <div>{{ versionInfo.summary }}</div>
+                <div v-html="versionInfo.summary ? (versionInfo.summary.replaceAll('\n\r','</br>').replaceAll('\r\n','</br>').replaceAll('\n','</br>').replaceAll('\r','</br>').replaceAll('\\n','</br>')) : ''"></div>
               </div>
               <a-divider />
                <!--  专辑目录  -->
@@ -285,7 +285,7 @@ export default {
   computed: {
     computedTabName() {
       return function(item) {
-        return item.createTime.split(' ')[0] + ' (' + item.stateName + ')'
+        return item.stateName ? item.createTime.split(' ')[0] + ' (' + item.stateName + ')' : item.createTime.split(' ')[0]
       }
     }
   },
@@ -429,7 +429,7 @@ export default {
       api.queryComment(query).then(res => {
         if(res.code == 200) {
           let key = parseInt(this.collapseCheckKey.slice(-1)[0]) - 1
-          this.yelpList[key].replies.push(...res.result.data)
+          this.yelpList[key].replies = res.result.data
           this.yelpList[key].isShowMore = true
         }
       })
@@ -520,10 +520,15 @@ export default {
           // align-items: center;
           flex:1;
 
-          span {
-            display: inline-block;
+          >span {
             width: 100%;
-            white-space: pre-line;
+            display: flex;
+
+            span {
+              flex-shrink: 0;
+              white-space: pre-line;
+              margin-right: 8px;
+            }
           }
         }
       }
@@ -542,7 +547,7 @@ export default {
   }
   .body-content {
     background: @white;
-    padding: 20px 15px 20px 40px;
+    padding: 20px 40px;
     margin-top: 20px;
 
     .album-desc {
@@ -552,7 +557,7 @@ export default {
 
       >div:last-child {
         margin-top: 20px;
-        text-indent:2em;
+        // text-indent:2em;
         padding-right: 40px;
       }
     }
@@ -587,13 +592,13 @@ export default {
       }
 
       >div:last-child {
-        width: 70%;
+        // width: 70%;
       }
     }
   }
   .body-footer {
     background: @white;
-    padding: 20px 15px 20px 40px;
+    padding: 20px 40px;
     margin-top: 20px;
 
     >div:first-child {
@@ -663,6 +668,10 @@ export default {
 /deep/ .ant-tabs-bar {
   padding-left: 0;
 }
+/deep/ .ant-tabs-ink-bar {
+  bottom: 3px;
+  height: 1.5px;
+}
 /deep/ .ant-collapse {
   border-radius: 0px;
 }
@@ -681,13 +690,13 @@ export default {
 /deep/ .ant-pagination {
   margin: 1px;
 }
- /* /deep/.ant-table-thead > tr > th {
+ /deep/.ant-table-thead > tr > th {
   text-align: center; 
   height: 54px;
 }
 /deep/ .ant-table-tbody > tr > td {
   height: 54px;
-} */
+}
 /deep/ .ant-modal-footer {
     padding: 10px 24px;
 }

src/views/modules/knowledge/album/albumList.vue

@@ -102,6 +102,12 @@
           :pageSizeOptions="['10','20','30','40']"
           idField="pkId"
         >
+          <template slot="name" slot-scope="{text,record}">
+            <div style="white-space: pre-line">{{ text }}</div>
+          </template>
+          <template slot="categoryName" slot-scope="{text,record}">
+            <div style="white-space: pre-line">{{ text }}</div>
+          </template>
           <template slot="state" slot-scope="{text,record}">
             <div>{{ record.state == 0 ? '专辑关闭' : computedState(record.versionState) }}</div>
           </template>
@@ -156,12 +162,15 @@ export default {
         {
           title: '专辑名称',
           dataIndex: 'name',
-          align: 'center'
+          align: 'center',
+          scopedSlots: {customRender: 'name'},
+          width: 150
         },
         {
           title: '所属分类',
           dataIndex: 'categoryName',
           align: 'center',
+          scopedSlots: {customRender: 'categoryName'},
           width: 150
         },
         {

src/views/modules/knowledge/album/checkInfo.vue

@@ -46,10 +46,10 @@
               </a-collapse>
             </div>
             <a-divider />
-            <!--  专辑审批   -->
+            <!--  点评审批   -->
             <template v-if="showCheck">
               <div class="album-check">
-                <div>专辑审批</div>
+                <div>点评审批</div>
                 <a-radio-group v-model="auditForm.result" style="margin-bottom: 16px;">
                   <a-radio value="1">通过</a-radio>
                   <a-radio value="0">驳回</a-radio>

src/views/modules/knowledge/album/checkProcessMaintain.vue

@@ -14,7 +14,7 @@
                         <a-col :span="24" >
                           <a-form-item
                           >
-                            <span slot="label" style="font-size: 16px;">专辑审核流程:</span>
+                            <span slot="label" style="font-size: 16px;">专辑审核流程</span>
                           </a-form-item>
                         </a-col>
                       </a-row>
@@ -58,7 +58,7 @@
                         <a-col :span="24" >
                           <a-form-item
                           >
-                            <span slot="label" style="font-size: 16px;">点评审核流程:</span>
+                            <span slot="label" style="font-size: 16px;">点评审核流程</span>
                           </a-form-item>
                         </a-col>
                       </a-row>

src/views/modules/knowledge/album/commentAuditList.vue

@@ -102,6 +102,15 @@
           :pageSizeOptions="['10','20','30','40']"
           idField="pkId"
         > 
+          <template slot="content" slot-scope="{text}">
+            <div style="white-space: pre-line">{{ text }}</div>
+          </template>
+          <template slot="albumName" slot-scope="{text}">
+            <div style="white-space: pre-line">{{ text }}</div>
+          </template>
+          <template slot="categoryName" slot-scope="{text}">
+            <div style="white-space: pre-line">{{ text }}</div>
+          </template>
           <template slot="approvalStatus" slot-scope="{text}">
             <div>{{ getApprovalStatus(text) }}</div>
           </template>
@@ -188,17 +197,22 @@ export default {
           title: '点评内容',
           dataIndex: 'content',
           align: 'center',
-          width: 300
+          width: 200,
+          scopedSlots: {customRender: 'content'}
         },
         {
           title: '专题名称',
           dataIndex: 'albumName',
-          align: 'center'
+          align: 'center',
+          width: 150,
+          scopedSlots: {customRender: 'albumName'}
         },
         {
           title: '所属分类',
           dataIndex: 'categoryName',
           align: 'center',
+          width: 150,
+          scopedSlots: {customRender: 'categoryName'}
         },
          {
           title: '提交人',

src/views/modules/knowledge/map/addUpdateMap.vue

@@ -15,18 +15,18 @@
                   <a-button class="totBtn" style="margin-right: 20px;" type="primary" @click="handleSaveClick" :loading="saveLoading">保存</a-button>
                 </a-col>
               </a-row>
-              <a-form-model-item label="*地图类型:" prop="type">
+              <a-form-model-item style="margin-left: 12px;" label="*地图类型:" prop="type">
                 <a-select v-model="mapForm.type" placeholder="请选择" prop="type" :disabled="!!pkId" :showArrow="false">
                   <a-select-option v-for="(item,index) in mapTypeList" :key="index" :value="item.value">
                     {{item.name}}
                   </a-select-option>
                 </a-select>
               </a-form-model-item>
-              <a-form-model-item label="*地图名称:" prop="name">
+              <a-form-model-item style="margin-left: 12px;" label="*地图名称:" prop="name">
                 <a-input v-model="mapForm.name" placeholder="请输入" :maxLength="10" />
               </a-form-model-item>
               <span class="titleBox">权限信息</span>
-              <a-form-model-item label="*所属组织:" prop="groupId">
+              <a-form-model-item style="margin-left: 12px;" label="*所属组织:" prop="groupId">
                 <a-tree-select
                   v-model="mapForm.groupId"
                   
@@ -43,7 +43,7 @@
                 >
                 </a-tree-select>
               </a-form-model-item>
-              <a-form-model-item label="*阅读权限:" prop="groupPurview">
+              <a-form-model-item style="margin-left: 12px;" label="*阅读权限:" prop="groupPurview">
                 <a-select v-model="mapForm.groupPurview" placeholder="请选择" :disabled="!mapForm.groupId.length" :showArrow="false">
                   <a-select-option v-for="(item,index) in authList" :key="index" :value="item.value" >
                     {{item.label}}
@@ -51,15 +51,16 @@
                 </a-select>
               </a-form-model-item>
               <template v-if="mapForm.groupPurview == 2">
-                <a-form-model-item label="可阅读者">
+                <a-form-model-item style="margin-left: 12px;" label="可阅读者">
                   <a-button class="totBtn" style="margin-top: 6px;float: left;" type="primary" @click="handleAddUserShow">添加员工</a-button>
                 </a-form-model-item>
                 <rx-grid
-                    class="table-style"
-                    :columns="userColumns"
-                    :dataSource="userList"
-                    :defaultPageSize="5"
-                    :heightauto="true"
+                  class="table-style"
+                  :columns="userColumns"
+                  :dataSource="userList"
+                  :defaultPageSize="5"
+                  :heightauto="true"
+                    
                   > 
                   <template slot="groupSummary" slot-scope="{text}">
                     <div style="white-space: pre-line">{{ text }}</div>
@@ -87,8 +88,8 @@
                       <a-icon type="form" :style="{ color: '#000' }" @click.stop="handleEditTabClick(item,index)"/>
                       <a-icon type="close" :style="{ color: '#000' }" @click.stop="handleDelTabClick(index)"/>
                     </span>
-                    <a-button type="dashed" style="width: 100%;" @click.stop="addLearnInfo"><a-icon type="plus" />新增学习内容</a-button>
-                      <pageList :contents="item.contents" @delItem="handleDelItemClick" @actionItem="handleActionItemClick"></pageList>
+                    <a-button type="dashed" style="width: 100%;color: #aaa;" @click.stop="addLearnInfo"><a-icon type="plus" style="margin-right: 8px;color: #aaa;" />新增学习内容</a-button>
+                    <pageList :contents="item.contents" @delItem="handleDelItemClick" @actionItem="handleActionItemClick" @setAddMapData="setAddMapData"></pageList>
                   </a-tab-pane>
                 </a-tabs>
               </template>
@@ -132,6 +133,7 @@
           title="添加学习内容" 
           centered
           okText="保存"
+          :confirmLoading="saveLoading"
           @ok="handleSaveLearnOk">
           <a-form-model ref="learnRef" :model="learnForm" :rules="learnRules" style="width: 500px;" >
             <a-form-model-item label="内容类型" prop="type">
@@ -181,6 +183,7 @@ import OsGroupApi from '@/api/user/org/osGroup'
 import classApi from '@/api/knowledge/classify'
 import initMixin from "../aMixin/initMixin"
 import getTimeNow from '@/views/modules/knowledge/aJs/getTimeNow'
+import SessionCache from '../aJs/cache'
 import { getParentNode } from '@/views/modules/knowledge/aJs/getClassifyTree'
 export default {
   name: 'knowledgeAddUpdate',
@@ -244,7 +247,8 @@ export default {
           title: '所属组织',
           dataIndex: 'groupSummary',
           align:'center',
-          scopedSlots: {customRender: 'groupSummary'}
+          scopedSlots: {customRender: 'groupSummary'},
+          width: 240
         },
         {
           title: '职位',
@@ -307,7 +311,8 @@ export default {
       infoTypeList:[
         {value: '1', label: '外部系统'},
         {value: '2', label: '维基知识'}
-      ]
+      ],
+      timeStamp: ''
     }
   },
   created() {
@@ -380,6 +385,21 @@ export default {
             }
           })
         }
+        if(this.$route.query.timeStamp) {
+          this.timeStamp = this.$route.query.timeStamp
+          if(SessionCache.getCache(this.timeStamp)) {
+            let info = SessionCache.getCache(this.timeStamp)
+            this.mapForm.type = info.type ? this.mapTypeList.find(item => item.value == info.type).value : undefined
+            this.mapForm.name = info.name
+            this.mapForm.groupId = info.groupId ? info.groupId.split(',') : []
+            this.mapForm.groupSummary = info.groupSummary
+            this.mapForm.groupPurview = info.groupPurview && info.groupPurview.toString()
+            if(this.mapForm.groupPurview == 2) {
+              this.userList = info.purviewUsers
+            }
+            this.tabRouteList = info.routes
+          }
+        }
       })
       /*OsGroupApi.getAdminOrg().then(resp => {
           let data = resp.data;
@@ -431,14 +451,15 @@ export default {
         item.createTime = getTimeNow()
       })
       this.showUserFlag = false
-      if(this.pkId) {
-        this.userList = [ ...this.userList, ...res ]
-        const map = new Map()
-        let filterList = this.userList.filter(el => !map.has(el.userId) && map.set(el.userId,true))
-        this.userList = filterList
-      } else {
-        this.userList = [ ...res ]
-      }
+      // if(this.pkId) {
+      this.userList = [ ...this.userList, ...res ]
+      const map = new Map()
+      let filterList = this.userList.filter(el => !map.has(el.userId) && map.set(el.userId,true))
+      this.userList = filterList
+      this.$refs.orgPeopleRef.$refs.mapRef.selectedRowKeys = []
+      // } else {
+      //   this.userList = [ ...res ]
+      // }
     },
     // 移除指定员工
     handleRemoveUserClick(record){
@@ -590,12 +611,14 @@ export default {
     },
     // 保存学习内容
     handleSaveLearnOk() {
+      this.saveLoading = true
       this.$refs.learnRef.validate(valid => {
           if(valid) {
             let tabs = this.tabRouteList[parseInt(this.tabsKeys)-1].contents
             if(this.learnForm.type == 1) {
               if(tabs.some(item => item.outerSystemName == this.learnForm.outerSystemName) || tabs.some(item => item.outerContentName == this.learnForm.outerContentName)) {
                 this.$message.error('已添加相同的学习内容')
+                this.saveLoading = false
                 return
               }
               tabs.unshift({
@@ -608,6 +631,7 @@ export default {
               })
             }
             this.showLearnFlag = false
+            this.saveLoading = false
           }
         } 
       )
@@ -675,6 +699,22 @@ export default {
         }
       })
     },
+    // 存储到浏览器缓存
+    setAddMapData() {
+      if(!this.timeStamp) return
+      let data = {
+        ...this.mapForm,
+        type: parseInt(this.mapForm.type),
+        groupId: this.mapForm.groupId.join(','),
+        groupSummary: this.orgList.length ? 
+            this.orgList.filter(item => this.mapForm.groupId.indexOf(item.id) > -1).map(item => { return item.name}).join("/") 
+            : 
+            this.mapForm.groupSummary,
+        purviewUsers: this.userList,
+        routes: this.tabRouteList
+      }
+      SessionCache.setCache(this.timeStamp,data)
+    },
     //加载左树下的子节点
     onLoadGroupTree(treeNode) {
       if (treeNode.dataRef.children) {
@@ -732,7 +772,7 @@ export default {
       background: #f8f8f8;
       form{
         background: @white;
-        padding: 20px 15px 8px 40px;
+        padding: 20px 40px 8px;
       }
       .ant-form-item {
         width: 50%;
@@ -784,6 +824,15 @@ export default {
 }
 /deep/ .ant-tabs .ant-tabs-large-bar .ant-tabs-tab {
   margin: 0 10px!important;
+  padding: 23px 0;
+}
+/deep/ .ant-tabs-ink-bar {
+  width: 120px!important;
+  bottom: 3px;
+  height: 1.5px;
+}
+/deep/ .ant-tabs-nav-container {
+  font-size: 14px!important;
 }
 .totBtn{
   float: right;
@@ -800,4 +849,19 @@ export default {
 /* /deep/ .ant-select-selection__choice {
   padding: 0 10px;
 } */
+/deep/.gridContent {
+  border: none!important;;
+}
+/deep/.ant-table-thead > tr > th {
+  text-align: center; 
+  height: 54px;
+}
+/deep/ .ant-table-tbody > tr > td {
+  height: 54px;
+}
+/deep/ .ant-btn-dashed:hover, .ant-btn-dashed:focus {
+  color: #aaa;
+  background-color: #fff;
+  border-color: #ccc;
+}
 </style>

src/views/modules/knowledge/map/components/orgPeople.vue

@@ -84,19 +84,20 @@
             confirmLoading: false,
             quitTime: "",
             osUserTypes:[],
+            selectedRowKeys: [],
             // 表头
             columns: [
                 {
                     title: '员工ID',
                     align: 'center',
                     dataIndex: 'userId',
-                    width: 80
+                    width: 100
                 },
                 {
                     title: '工号',
                     align: 'center',
                     dataIndex: 'userNo',
-                    width: 80
+                    width: 100
                 },
                 {
                     title: '员工姓名',

src/views/modules/knowledge/map/components/pageList.vue

@@ -16,7 +16,7 @@
               位于: {{ item.outerSystemName }}
             </template>
             <template v-else>
-              <div><img style="width:24px;height:24px;" :src="item.authorHead ? ('/api/api-system/system/core/sysFile/previewFile?fileId='+item.authorHead) : header0"/></div>
+              <div><img style="width:20px;height:20px;border-radius: 50%;" :src="item.authorHead ? ('/api/api-system/system/core/sysFile/previewFile?fileId='+item.authorHead) : header0"/></div>
               <div>{{ item.author }}</div>
               <div>{{ item.createTime }}</div>
             </template>
@@ -25,12 +25,12 @@
             <div class="button-style" @click="handleDelDataClick(index)">
               <span>移除</span>
             </div>
-            <div v-if="index != (contents.length - 1)" class="button-style" @click="handleActionDataClick(index, 'down')">
-              <span>下降</span>
-            </div>
             <div v-if="index != 0" class="button-style" @click="handleActionDataClick(index, 'up')">
               <span>上升</span>
             </div>
+            <div v-if="index != (contents.length - 1)" class="button-style" @click="handleActionDataClick(index, 'down')">
+              <span>下降</span>
+            </div>
             <div class="button-style" @click="handleLookDataClick(item)">
               <span>查看</span>
             </div>
@@ -135,8 +135,9 @@ export default {
       if(item.type == 1) {
          window.open(item.outerAccessUrl)
       } else {
-        // this.jump(item.knowledgeId)
-        window.open(`knowledgeAddUpdate?pkId=${item.knowledgeId}&show=true`)
+        this.$emit('setAddMapData')
+        this.jump(item.knowledgeId)
+        // window.open(`knowledgeAddUpdate?pkId=${item.knowledgeId}&show=true`)
       }
     },
     jump(pkId){
@@ -167,12 +168,14 @@ export default {
   }
   .other {
     color: #aaa;
+    height: 16px;
     >div {
-      margin-right: 20px;
+      margin-right: 15px;
       img {
         width:16px;
         height:16px;
-        margin-right: 6px;
+        margin-right: 3px;
+        margin-top: 2px;
       }
     }
   }

src/views/modules/knowledge/map/mapList.vue

@@ -86,7 +86,7 @@
                     </div>
                   </div>
                 </a-form>
-                <rx-button alias="mapAdd" :butn-icon="'none'" @click="$router.push('/knowledge/addUpdateMap')">新增地图</rx-button>
+                <rx-button alias="mapAdd" :butn-icon="'none'" @click="handleAddUpdateMap">新增地图</rx-button>
               </div>
             </div>
           </div>
@@ -211,6 +211,13 @@ export default {
           this.orgData = [...temp];
       })
     },
+    // 新增
+    handleAddUpdateMap() {
+      this.$router.push({
+        path: '/knowledge/addUpdateMap',
+        query: {timeStamp: new Date().getTime()}
+      })
+    },
     // 编辑
     handleJumpUpdateClick(record) {
       this.$router.push({