对接接口

src/api/knowledge/album/album.js

@@ -33,10 +33,10 @@ returnData.approve=function () {
 }
 
 // 删除专辑
-// returnData.deleteBanner=function (parameter) {
-//   var url= returnData.baseUrl + '/album/del'
-//   return rxAjax.postJson(url,parameter).then (res => {
-//     return res
-//   })
-// }
+returnData.deleteBanner=function (parameter) {
+  var url= returnData.baseUrl + '/album/del'
+  return rxAjax.postJson(url,parameter).then (res => {
+    return res
+  })
+}
 export default returnData

src/api/knowledge/album/albumInfo.js

@@ -36,6 +36,14 @@ returnData.yelp=function (parameter) {
   })
 }
 
+// 查询点评回复列表
+returnData.queryComment=function (parameter) {
+  var url= returnData.baseUrl + '/album/yelp/queryComment'
+  return rxAjax.postJson(url,parameter).then (res => {
+    return res
+  })
+}
+
 // 转移负责人
 returnData.transferOwner=function (parameter) {
   var url= returnData.baseUrl + '/album/transferOwner'
@@ -52,4 +60,12 @@ returnData.close=function (parameter) {
   })
 }
 
+// 转移负责人
+returnData.removeKnowledgeAndYelp=function (parameter) {
+  var url= returnData.baseUrl + '/album//removeKnowledgeAndYelp'
+  return rxAjax.postJson(url,parameter).then (res => {
+    return res
+  })
+}
+
 export default returnData

src/api/knowledge/album/checkInfo.js

@@ -0,0 +1,23 @@
+import rxAjax from '@/assets/js/ajax.js';
+// 栏目定义 api接口
+export const returnData = {};
+
+returnData.baseUrl= '/api-knowledge';
+
+// 专辑详情
+returnData.info=function (parameter) {
+  var url= returnData.baseUrl + '/album/yelp/info'
+  return rxAjax.get(url,parameter).then (res => {
+    return res
+  })
+}
+
+// 专辑点评审核
+returnData.approve=function (parameter) {
+  var url= returnData.baseUrl + '/album/yelp/approve'
+  return rxAjax.postJson(url,parameter).then (res => {
+    return res
+  })
+}
+
+export default returnData

src/api/knowledge/album/commentAudit.js

@@ -0,0 +1,11 @@
+import rxAjax from '@/assets/js/ajax.js';
+// 栏目定义 api接口
+export const returnData = {};
+
+returnData.baseUrl= '/api-knowledge';
+
+
+// 点评审核列表搜索查询
+returnData.query = returnData.baseUrl + '/album/yelp/approve/query'
+
+export default returnData

src/config/router.config.js

@@ -205,18 +205,7 @@ export const constantRouterMap = [
                 path: 'checkProcessMaintain',
                 name: 'checkProcessMaintain',
                 component: () => import('@/views/modules/knowledge/album/checkProcessMaintain')
-            },
-            // 搜索服务平台(里程碑2)
-            {
-                path: 'joinUpServeList',
-                name: 'joinUpServeList',
-                component: () => import('@/views/modules/knowledge/serve/joinUpServeList')
-            },
-            {
-                path: 'addUpdateJoinUpServe',
-                name: 'addUpdateJoinUpServe',
-                component: () => import('@/views/modules/knowledge/serve/addUpdateJoinUpServe')
-            },
+            }
         ]
     },
     {

src/layouts/MainLayout.vue

@@ -125,7 +125,10 @@
                   'auditProcessMaintain',
                   'mapList',
                   'addUpdateMap',
-                  'albumInfo']
+                  'albumInfo',
+                  'albumAuditList',
+                  'commentAuditList',
+                  'checkInfo']
                 ">
                 <router-view :key="$route.fullPath" />
               </keep-alive>

src/views/modules/knowledge/aMixin/mixin.js

@@ -1,5 +1,3 @@
-import { set } from "nprogress"
-
 export default (deleteTitle) => {
   return {
     // data() {

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

@@ -82,8 +82,7 @@
                     </div>
                   </div>
                 </a-form>
-                <!-- <rx-button alias="processEdit" :butn-icon="'false'" @click="$router.push('/knowledge/auditProcessMaintain')">维护审核流程</rx-button> -->
-                <rx-button alias="processBatch" :butn-icon="'false'" @click="handldAuditClick('batch')">批量审核</rx-button>
+                <rx-button alias="albumAuditListBatch" :butn-icon="'false'" @click="handldAuditClick('batch')">批量审核</rx-button>
               </div>
             </div>
           </div>
@@ -105,11 +104,11 @@
         > 
           <template slot="action" slot-scope="{text,record}">
             <template v-if="record.actionFlag.indexOf('approve') > -1">
-              <rx-button class="clearBtn" alias="processDo" :butn-icon="'none'" @click="handleJumpUpdateClick(record,true)">审核</rx-button>
-              <rx-button class="clearBtn" alias="processFast" :butn-icon="'none'" @click="handldAuditClick('fast',record)">快速审核</rx-button>
+              <rx-button class="clearBtn" alias="albumAuditListProcess" :butn-icon="'none'" @click="handleJumpUpdateClick(record,true)">审核</rx-button>
+              <rx-button class="clearBtn" alias="albumAuditListFast" :butn-icon="'none'" @click="handldAuditClick('fast',record)">快速审核</rx-button>
             </template>
             <template v-else>
-              <rx-button class="clearBtn" alias="processLook" :butn-icon="'none'" @click="handleJumpUpdateClick(record,false)">查看</rx-button>
+              <rx-button class="clearBtn" alias="albumAuditListlook" :butn-icon="'none'" @click="handleJumpUpdateClick(record,false)">查看</rx-button>
             </template>
           </template>
         </rx-grid>
@@ -142,7 +141,6 @@ import orgPeople from './components/orgPeople'
 import api from '@/api/knowledge/album/albumAudit'
 import albumApi from '@/api/knowledge/album/album'
 import mixin from "../aMixin/mixin"
-import initMixin from "../aMixin/initMixin"
 const auditMixin = new mixin('audit')
 export default {
   name: 'auditManageList',
@@ -150,7 +148,7 @@ export default {
     breadcrumb,
     orgPeople
   },
-  mixins: [ initMixin, auditMixin ],
+  mixins: [ auditMixin ],
   data() {
     return {
       api,
@@ -208,12 +206,6 @@ export default {
           align: 'center',
           width: 100
         },
-        // {
-        //   title: '申请人',
-        //   dataIndex: 'author',
-        //   align: 'center',
-        //   width: 100
-        // },
         {
           title: '提交时间',
           dataIndex: 'createTime',
@@ -255,42 +247,12 @@ export default {
     }
   },
   created() {
-    // 从知识管理页跳转
-    // if(this.$route.query.showUnchecked) {
-    //   this.urls = api.findAllAuditKnowledge
-    //    this.approvalStatusList = [
-    //     {value: '1', label: '待节点审核'},
-    //     {value: '3', label: '待最终审核'}
-    //   ]
-    // } else {
-    //   this.urls = api.findAllKnowledgeApprove
-    //   this.approvalStatusList = [
-    //     {value: '1', label: '待节点审核'},
-    //     {value: '2', label: '节点驳回'},
-    //     {value: '3', label: '待最终审核'},
-    //     {value: '4', label: '最终驳回'},
-    //     {value: '5', label: '最终通过'},
-    //   ]
-    // }
-    this.init()
-  },
-  computed: {
-    getApprovalStatus(){
-      return function(arg) {
-        switch(arg) {
-          case 1:
-            return '待节点审核'
-          case 2:
-            return '节点驳回'
-          case 3:
-            return '待最终审核'
-          case 4:
-            return '最终驳回'
-          case 5:
-            return '最终通过'
-        }
-      }
+    if(this.$route.query.showOnlyUser) {
+      this.queryParam.type = 2
+    } else {
+      this.queryParam.type = 1
     }
+    this.init()
   },
   methods: {
     async init() {
@@ -325,52 +287,6 @@ export default {
         // pkId  showCheck: 是否显示审核
         query: { pkId: record.pkId, showCheck: arg}
       })
-      // 从知识管理跳转
-      // let query = {}
-      // if(this.$route.query.showUnchecked) {
-      //   if(arg) {
-      //     // 查看
-      //     query = {
-      //       pkId: record.pkId, 
-      //       type: 'auditManageList', 
-      //       auditId: record.approvalsFirst.pkId,
-      //       show: true,
-      //     }
-      //   } else {
-      //     // 审核
-      //     query = {
-      //       pkId: record.pkId, 
-      //       type: 'auditManageList', 
-      //       auditId: record.approvalsFirst.pkId,
-      //       show: true,
-      //       isAudit: true
-      //     }
-      //   }
-      // } else {
-      //   // 当前审核管理跳转
-      //   if(arg) {
-      //     // 查看
-      //     query = {
-      //       pkId: record.knowledgerId, 
-      //       type: 'auditManageList', 
-      //       auditId: record.pkId,
-      //       show: true
-      //     }
-      //   } else {
-      //     // 审核
-      //     query = {
-      //       pkId: record.knowledgerId, 
-      //       type: 'auditManageList', 
-      //       auditId: record.pkId,
-      //       show: true,
-      //       isAudit: true
-      //     }
-      //   }
-      // }
-      // this.$router.push({
-      //   path: '/knowledge/knowledgeAddUpdate',
-      //   query
-      // })
     },
     // 确认审核
     handleOk(){

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

@@ -21,7 +21,7 @@
                     <a-button type="primary" @click="handleSearchClick">查询</a-button>
                   </div>
                 </a-form>
-                <rx-button alias="classificationAdd" :butn-icon="'none'" @click="handleAddClassClick">新增分类</rx-button>
+                <rx-button alias="albumClassifyListAdd" :butn-icon="'none'" @click="handleAddClassClick">新增分类</rx-button>
               </div>
             </div>
           </div>
@@ -42,13 +42,13 @@
             <div style="white-space: pre-line">{{ text }}</div>
           </template>
           <template slot="action" slot-scope="{text,record,index}">
-            <rx-button class="clearBtn" alias="classificationEdit" :butn-icon="'none'" v-if="record.isSys != 1" @click="handleUpdateClassifyClick(record)">编辑</rx-button>
-            <rx-button class="clearBtn" alias="classificationLook" :butn-icon="'none'" @click="handleJumpKnowledgeManage(record)">查看专辑</rx-button>
+            <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="classificationRise" :butn-icon="'none'"  @click="handleActionClick(record,2)">下降</rx-button>
-              <rx-button v-if="index != 0" class="clearBtn" alias="classificationRise" :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>
+              <rx-button v-if="index != 0" class="clearBtn" alias="albumClassifyListRise" :butn-icon="'none'" @click="handleActionClick(record,1)">上升</rx-button>
             </template>
-            <rx-button class="clearBtn" alias="classificationDel" :butn-icon="'none'" v-if="record.isSys != 1" @click="handleDeleteClick(record)">删除</rx-button>
+            <rx-button class="clearBtn" alias="albumClassifyListDel" :butn-icon="'none'" v-if="record.isSys != 1" @click="handleDeleteClick(record)">删除</rx-button>
           </template>
         </rx-grid>
       </rx-fit>

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

@@ -6,9 +6,10 @@
         <div class="body-head">
           <div class="body-head-title">
             <div>基本信息</div>
-            <div v-if="action == 'edit'">
-              <a-button style="margin-right: 20px;" type="primary" @click="showAuditFlag = true">转移负责人</a-button>
-              <a-button type="primary" @click="handleSwitchClick" :loading="saveLoading">{{ this.state == 1 ? '专辑关闭' : '开启专辑'}}</a-button>
+            <div>
+              <a-button v-if="actionFlag.indexOf('transfer') > -1" style="margin-right: 20px;" type="primary" @click="showAuditFlag = true">转移负责人</a-button>
+              <a-button v-if="actionFlag.indexOf('open') > -1" type="primary" @click="handleSwitchClick" :loading="saveLoading">开启专辑</a-button>
+              <a-button v-if="actionFlag.indexOf('close') > -1" type="primary" @click="handleSwitchClick" :loading="saveLoading">专辑关闭</a-button>
             </div>
           </div>
           <div class="body-head-details">
@@ -43,11 +44,11 @@
                 <div>{{ versionInfo.summary }}</div>
               </div>
               <a-divider />
+               <!--  专辑目录  -->
               <template v-if="catalogInfo.length">
-                <!--  专辑目录  -->
                 <div class="album-catalog">
                   <div>专辑目录</div>
-                  <album-catalog :catalogInfo="catalogInfo" />
+                  <album-catalog :catalogInfo="catalogInfo" @handleRemoveId="setId" />
                 </div>
                 <!--  专辑page  -->
                 <div class="album-page">
@@ -70,12 +71,12 @@
               <template v-else>
                 <div class="album-catalog">
                   <div>专辑目录</div>
-                  <div style="text-indent: 2em">无</div>
+                  <div style="text-indent: 2em">无内容</div>
                 </div>
               </template>
               <!--  专辑审批   -->
               <!-- 审核页进入的并且版本状态是审核中的才能审批-->
-              <template v-if="showCheck && item.state == 1">
+              <template v-if="(actionFlag.indexOf('open') > -1) && item.state == 1">
                 <div class="album-check">
                   <div>专辑审批</div>
                   <a-radio-group v-model="auditForm.result" style="margin-bottom: 16px;">
@@ -85,7 +86,7 @@
                   <a-input v-model="auditForm.remark" type="textarea" :autosize="{minRows: 3, maxRows: 6}" :maxLength="200" placeholder="请输入审批意见" />
                   <a-row :gutter="24" type="flex" justify="end" style="margin-top: 20px;padding-right:12px;">
                     <a-button style="margin-right: 20px;" @click="$router.back()">取消</a-button>
-                    <a-button type="primary">保存</a-button>
+                    <a-button type="primary" :loading="saveLoading" @click="handleCheckClick">保存</a-button>
                   </a-row>
                 </div>
               </template>
@@ -101,59 +102,59 @@
             </a-tab-pane>
           </a-tabs>
         </div>
+        <!-- 点评信息 -->
         <template> 
           <div class="body-footer">
-            <div>点评信息</div>
-            <a-collapse v-model="collapseCheckKey">
-              <a-collapse-panel key="1" :style="panelStyle">
-                <!-- head -->
-                <div slot="header" class="collapse-check">
-                  <div>
-                    <img :src="test" style="width:20px;height:20px;border-radius:50%;" alt="">
-                    <span>林东东</span>
-                  </div>
-                  <div>
-                    我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是
-                    评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容
-                    我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是
-                    评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容
-                  </div>
-                  <div>
-                    <span>2017-10-01 18:00</span>
-                    <a-button type="link">移除</a-button>  
-                  </div>
-                </div>
-                <!-- body -->
-                <div style="padding-right: 6px;" class="collapse-check">
-                  <div>
-                    <img :src="test" style="width:20px;height:20px;border-radius:50%;" alt="">
-                    <span>林东东</span>
-                  </div>
-                  <div>
-                    我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是
-                    评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容
-                    我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是
-                    评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容
+            <template v-if="yelpList.length">
+              <div>点评信息</div>
+              <a-collapse v-model="collapseCheckKey" @change="handlePanelChange">
+                <a-collapse-panel v-for="(item,index) in yelpList" :key="index + 1 + ''" :style="(yelpList.length != index + 1) && panelStyle">
+                  <!-- head -->
+                  <div slot="header" class="collapse-check">
+                    <div>
+                      <img :src="'/api/api-system/system/core/sysFile/previewFile?fileId='+item.createPhoto" style="width:20px;height:20px;border-radius:50%;" alt="">
+                      <span>{{ item.createName }}</span>
+                    </div>
+                    <div>
+                      {{ item.content  }}
+                    </div>
+                    <div>
+                      <span>{{ item.createTime  }}</span>
+                      <a-button type="link" @click="handleRemarkDelClick(index,item.pkId)">删除</a-button>  
+                    </div>
                   </div>
-                  <div>
-                    <span>2017-10-01 18:00</span>
-                    <a-button type="link">移除</a-button>  
+                  <!-- body -->
+                  <template v-if="item.replies">
+                    <div style="padding-right: 6px;" v-for="(iten,indey) in item.replies" :key="indey" class="collapse-check">
+                      <div>
+                        <img :src="'/api/api-system/system/core/sysFile/previewFile?fileId='+iten.createPhoto" style="width:20px;height:20px;border-radius:50%;" alt="">
+                        <span>{{ iten.createName }}</span>
+                      </div>
+                      <div>
+                        {{ iten.content }}
+                      </div>
+                      <div>
+                        <span>{{ iten.createTime }}</span>
+                        <a-button type="link" @click="handleReplyDelClick(index,indey,iten.pkId)">删除</a-button>  
+                      </div>
+                    </div>
+                  </template>
+                  <template v-else>
+                    <div>无内容</div>
+                  </template>
+                  <div v-if="item.replyCount > 2" class="show-return-info" @click="handleMoreClick(item.pkId)">
+                    查看全部{{ item.replyCount - 2 }}条回复内容>
                   </div>
-                </div>
-                <div class="show-return-info">
-                  查看全部312条回复内容>
-                </div>
-              </a-collapse-panel>
-              <a-collapse-panel key="2" header="目录名称" :style="panelStyle">
-                <p>{{ 2222 }}</p>
-              </a-collapse-panel>
-                <a-collapse-panel key="3" header="目录名称">
-                <p>{{ 2222 }}</p>
-              </a-collapse-panel>
-            </a-collapse>
-            <a-row v-if="action == 'edit'" :gutter="24" type="flex" justify="end" style="margin-top: 20px;padding-right:12px;">
+                </a-collapse-panel>
+              </a-collapse>
+            </template>
+            <template v-else>
+              <div>点评信息</div>
+              <div>无内容</div>
+            </template>
+            <a-row :gutter="24" type="flex" justify="end" style="margin-top: 20px; padding-right:12px;">
               <a-button style="margin-right: 20px;" @click="$router.back()">取消</a-button>
-              <a-button type="primary">保存</a-button>
+              <a-button v-if="actionFlag.indexOf('edit') > -1" type="primary" :loading="saveLoading" @click="handleSaveClick">保存</a-button>
             </a-row>
           </div>
         </template>
@@ -171,11 +172,12 @@
 </template>
 
 <script>
-import test from '@/assets/img/test.png'
 import breadcrumb from '../components/breadcrumb'
 import orgPeople from './components/orgPeople'
 import albumCatalog from './components/albumCatalog.vue'
 import api from '@/api/knowledge/album/albumInfo'
+import albumAuditApi from '@/api/knowledge/album/albumAudit'
+
 export default {
   name: 'albumInfo',
   components: {
@@ -189,10 +191,6 @@ export default {
       api,
       // 专辑id
       pkId: '',
-      showCheck: false,
-      state: '',
-      action: '',
-      // versionState: '',
       baseInfo: {
         name: '',
         owner: '',
@@ -205,7 +203,7 @@ export default {
         versionState: '',
         cover: ''
       },
-      test,
+      actionFlag: [],
       tabsList: [],
       tabsKeys: '1',
       // 版本id
@@ -257,30 +255,30 @@ export default {
       },
       total: 0,
       collapseCheckKey: '1',
+      yelpList: [],
+      yelpIndexInfo: [],
       auditForm: {
+        pkIds: [],
         result: '1',
         remark: ''
       },
       panelStyle: 'border-bottom: 5px solid #fff;',
       showAuditFlag: false,
       // 目标人id
-      target: ''
+      target: '',
+      catalogueIdAndKnowledgeList: {},
+      yelps: []
     }
   },
   created() {
-    // pkId   state: 专辑状态  versionState: 版本状态
-    // 只有审核中状态显示审批
     this.pkId = this.$route.query.pkId
-    this.showCheck = this.$route.query.showCheck
-    this.state = this.$route.query.state
-    this.action = this.$route.query.action
-    // this.versionState = this.$route.query.versionState
     this.init()
   },
   beforeDestroy() {
     this.baseInfo = Object.assign({},this.$options.data().baseInfo)
     this.versionInfo = Object.assign({},this.$options.data().versionInfo)
     this.catalogInfo = Object.assign({},this.$options.data().catalogInfo)
+    this.auditForm = Object.assign({},this.$options.data().auditForm)
   },
   computed: {
     computedTabName() {
@@ -294,22 +292,35 @@ export default {
       let detailData = await api.detail({pkId: this.pkId})
       let detailInfo = detailData.data
       this.baseInfo = { ...detailInfo, versionState: this.getVersionStateName(detailInfo.versionState)}
+      this.actionFlag = detailInfo.actionFlag
       this.tabsList = detailInfo.versions || []
       if(this.tabsList.length) {
         this.versionId = this.tabsList[0].pkId
         this.getCatalogData()
-        // let yelpData = await api.yelp({albumId: this.pkId})
-        // console.log(yelpData)
+        api.yelp({albumId: this.pkId}).then(res => {
+          if(res.code == 200) {
+            if(res.data.length) {
+              this.yelpList = res.data
+              console.log(res.data)
+            }
+          }
+        })
       }
     },
     async getCatalogData() {
-      let versionData = await api.version({pkId: this.versionId})
-      this.versionInfo = { ...versionData.data }
+      api.version({pkId: this.versionId}).then(res => {
+        if(res.code == 200) {
+          this.versionInfo = { ...res.data }
+        }
+      })
       this.queryParam.params.albumId = this.pkId
       this.queryParam.params.versionId = this.versionId
-      let catalogData = await api.catalogue(this.queryParam)
-      this.total = catalogData.result.totalCount
-      this.catalogInfo = catalogData.result.data
+      api.catalogue(this.queryParam).then(res => {
+        if(res.code == 200) {
+          this.total = res.result.totalCount
+          this.catalogInfo = res.result.data
+        }
+      })
     },
     getVersionStateName(state) {
       switch (state) {
@@ -328,7 +339,7 @@ export default {
       this.saveLoading = true
       api.close({pkId: this.pkId}).then(res => {
         if(res.code == 200) {
-          if(this.state == 0) {
+          if(this.actionFlag.indexOf('open') > -1) {
             this.$message.success('开启成功')
           } else {
             this.$message.success('关闭成功')
@@ -383,6 +394,79 @@ export default {
       this.queryParam.pageNo = pageNumber
       this.getCatalogData()
     },
+    // 审核
+    handleCheckClick() {
+      this.handleCheckClick = false
+      this.auditForm.pkIds = [ this.pkId ]
+      api.albumAuditApi(this.auditForm).then(res => {
+        if(res.code) {
+          setTimeout(() => 
+            {
+              this.$router.back()
+              this.saveLoading = false
+            }
+          ,1000)
+        }
+      })
+    },
+    // 切换点评
+    handlePanelChange(key) {
+      // if(!key.length) return
+      // let repliesData = this.yelpList[key[0] - 1].replies
+      // this.yelpIndexInfo = repliesData.length < 2 ? repliesData : repliesData.slice(0,2)
+    },
+    // 显示更多回复
+    handleMoreClick(yelpId) {
+      // this.yelpIndexInfo = this.yelpList[parseInt(this.collapseCheckKey) - 1].replies
+      let query = {
+        pageNo: 1,
+        pageSize: 100,
+        sortField: "",
+        sortOrder:"asc",
+        params:{
+          // 专辑id
+          albumId: this.pkId,
+          // yelpId
+          yelpId: yelpId
+        }
+      }
+      // 暂时还没写
+      // api.queryComment(query).then(res => {
+      //   if(res.code == 200) {
+      //     this.yelpList[parseInt(this.collapseCheckKey) - 1].replies.push(...res.data)
+      //   }
+      // })
+    },
+    // 添加要删除的知识
+    setId(arg) {
+      if(arg.pkId in this.catalogueIdAndKnowledgeList) {
+        this.catalogueIdAndKnowledgeList[arg.pkId].push(arg.knowledgeId)
+      } else {
+        this.catalogueIdAndKnowledgeList[arg.pkId] = [arg.knowledgeId]
+      }
+    },
+    // 删除点评信息
+    handleRemarkDelClick(index,pkId) {
+      this.yelpList.splice(index, 1)
+      this.yelps.push(pkId)
+    },
+    // 删除回复信息
+    handleReplyDelClick(index,indey,pkId) {
+      this.yelpList[index].replies.splice(indey, 1)
+      this.yelps.push(pkId)
+    },
+    // 保存
+    handleSaveClick() {
+      let query = {
+        pkId: this.pkId,
+        versionId: this.versionId,
+        catalogueIdAndKnowledgeList: this.catalogueIdAndKnowledgeList,
+        yelps: this.yelps
+      }
+      api.removeKnowledgeAndYelp(query).then(res => {
+        console.log(res)
+      })
+    }
   }
 }
 </script>
@@ -531,13 +615,13 @@ export default {
       }
 
       >div:nth-child(2) {
-        margin: 10px 0 20px;
+        margin: 10px 0;
       }
 
       >div:nth-child(3) {
         display: flex;
         justify-content: space-between;
-        align-items: center;
+        align-items: flex-start;
 
         span {
           color: #aaa;
@@ -555,7 +639,6 @@ export default {
    padding: 5px 20px;
    background: #f0f2f5;
    color: #aaa;
-   margin-top: 15px;
    cursor: pointer;
 }
 .clearBtn {
@@ -585,7 +668,7 @@ export default {
   border: none;
 }
 /deep/ .ant-collapse-content > .ant-collapse-content-box {
-  padding: 20px 30px 2px 50px;
+  padding: 20px 30px 15px 50px;
 }
 /deep/ .ant-input {
   border-radius: 0;

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

@@ -83,8 +83,8 @@
                     </div>
                   </div>
                 </a-form>
-                <rx-button :class="{'knowledge-manage':yelpNum != 0}" :data-attr="yelpNum" alias="knowProcess" :butn-icon="'false'" @click="handleJumpPathClick">点评审核</rx-button>
-                <rx-button :class="{'knowledge-manage':approveNum != 0}" :data-attr="approveNum" alias="knowProcess" :butn-icon="'false'" @click="handleJumpPathClick">专辑审核</rx-button>
+                <rx-button :class="{'knowledge-manage':yelpNum != 0}" :data-attr="yelpNum" alias="albumListComment" :butn-icon="'false'" @click="handleJumpPathClick('comment')">点评审核</rx-button>
+                <rx-button :class="{'knowledge-manage':approveNum != 0}" :data-attr="approveNum" alias="albumListAudit" :butn-icon="'false'" @click="handleJumpPathClick('album')">专辑审核</rx-button>
               </div>
             </div>
           </div>
@@ -107,9 +107,9 @@
           </template>
           <template slot="action" slot-scope="{text,record}">
             <template v-if="record.actionFlagM.length">
-              <rx-button v-show="record.actionFlagM.indexOf('edit') > -1" class="clearBtn" alias="knowEdit" :butn-icon="'none'"  @click="handleJumpUpdateClick(record,'edit')">编辑</rx-button>
-              <rx-button v-show="record.actionFlagM.indexOf('delete') > -1" class="clearBtn" alias="knowDel" :butn-icon="'none'" @click="handleDeleteClick(record)">删除</rx-button>
-              <rx-button v-show="record.actionFlagM.indexOf('view') > -1" class="clearBtn" alias="knowShow" :butn-icon="'none'" @click="handleJumpUpdateClick(record,'view')">查看</rx-button>
+              <rx-button v-show="record.actionFlagM.indexOf('edit') > -1" class="clearBtn" alias="albumListEdite" :butn-icon="'none'"  @click="handleJumpUpdateClick(record)">编辑</rx-button>
+              <rx-button v-show="record.actionFlagM.indexOf('delete') > -1" class="clearBtn" alias="albumListDel" :butn-icon="'none'" @click="handleDeleteClick(record)">删除</rx-button>
+              <rx-button v-show="record.actionFlagM.indexOf('view') > -1" class="clearBtn" alias="albumListLook" :butn-icon="'none'" @click="handleJumpUpdateClick(record)">查看</rx-button>
             </template>
           </template>
         </rx-grid>
@@ -249,10 +249,10 @@ export default {
   },
   methods: {
     async init() {
-      // let yelp = await api.yelp()
-      // this.yelpNum = yelp.data
-      // let approve = await api.approve()
-      // this.approveNum = approve.data
+      let yelp = await api.yelp()
+      this.yelpNum = yelp.data || 0
+      let approve = await api.approve()
+      this.approveNum = approve.data || 0
       let res = await api.categories()
       this.classifyLevelList = this.formatData(res.data)
     },
@@ -278,18 +278,26 @@ export default {
       this.reloadTable()
     },
     // 跳转审核管理
-    handleJumpPathClick() {
-      // this.$router.push({
-      //   path: '/knowledge/auditManageList',
-      //   query: { showUnchecked: true }
-      // })
+    handleJumpPathClick(arg) {
+      if(arg == 'comment') {
+        this.$router.push({
+          path: '/knowledge/commentAuditList',
+          query: { showOnlyUser: true }
+        })
+      } else {
+        this.$router.push({
+          path: '/knowledge/albumAuditList',
+          query: { showOnlyUser: true }
+        })
+      }
+ 
     },
     // 编辑
-    handleJumpUpdateClick(record,action) {
+    handleJumpUpdateClick(record) {
       this.$router.push({
         path: '/knowledge/albumInfo',
         // pkId   state: 专辑状态  versionState: 版本状态 showCheck
-        query: { pkId: record.pkId, state: record.state, showCheck: false, action}
+        query: { pkId: record.pkId }
       })
     },
     // 重新加载表格

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

@@ -7,75 +7,45 @@
           <div class="content">
             <!--  待点评内容  -->
             <div class="wait-check-info">
-              <div>点评信息</div>
+              <div>{{ showCheck ? '待审核点评内容' : '点评信息' }}</div>
               <a-collapse v-model="collapseCheckKey">
                  <template #expandIcon>
                   <a-icon type="none" />
                 </template>
                 <a-collapse-panel key="1">
                   <!-- head -->
-                  <div slot="header" class="collapse-check">
+                  <div v-if="parentInfo" slot="header" class="collapse-check">
                     <div>
-                      <img :src="test" style="width:20px;height:20px;border-radius:50%;" alt="">
-                      <span>林东东</span>
+                      <img :src="'/api/api-system/system/core/sysFile/previewFile?fileId='+parentInfo.createPhoto" style="width:20px;height:20px;border-radius:50%;" alt="">
+                      <span>{{ parentInfo.createName }}</span>
                     </div>
                     <div>
-                      我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是
-                      评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容
-                      我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是
-                      评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容
+                      {{ parentInfo.content }}
                     </div>
                     <div>
-                      <span>2017-10-01 18:00</span>
+                      <span>{{ parentInfo.createTime }}</span>
                     </div>
                   </div>
                   <!-- body -->
-                  <div style="padding-right: 6px;color: #1890ff;" class="collapse-check">
+                  <div :slot="!parentInfo ? 'header' : null" style="padding-right: 6px;color: #1890ff;" class="collapse-check">
                     <div>
-                      <img :src="test" style="width:20px;height:20px;border-radius:50%;" alt="">
-                      <span>林东东</span>
+                      <img :src="'/api/api-system/system/core/sysFile/previewFile?fileId='+childrenInfo.createPhoto" style="width:20px;height:20px;border-radius:50%;" alt="">
+                      <span>{{ childrenInfo.createName }}</span>
                     </div>
                     <div>
-                      我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是
-                      评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容
-                      我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是
-                      评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容我是评论内容
+                      {{ childrenInfo.content }}
                     </div>
                     <div>
-                      <span>2017-10-01 18:00</span>
-                      <a-button type="link" :style="{ color: albumStatus == 1 ? 'green' : 'orange' }">{{ albumStatus == 1 ? '审核通过' : '待审核' }}</a-button>  
+                      <span>{{ childrenInfo.createTime }}</span>
+                      <span :style="{ color: childrenInfo.state == 1 == 1 ? 'green' : 'orange' }">{{ childrenInfo.state == 1 ? '审核通过' : '待审核' }}</span>  
                     </div>
                   </div>
                 </a-collapse-panel>
               </a-collapse>
             </div>
             <a-divider />
-            <!--  专辑基本信息  -->
-            <div class="body-head">
-              <div class="body-head-title">
-                基本信息
-              </div>
-              <div class="body-head-details">
-                <div>
-                  <span>专辑名称: 我是专辑名称</span>
-                  <span>专辑负责人: 张三</span>
-                  <span>创建时间: 2022年12月6日</span>
-                </div>
-                <div>
-                  <span>所属公司: 长沙惠科科技有限公司</span>
-                  <span>所属部门: XXXXXX部门</span>
-                  <span>专辑分类: 一级分类名称|二级分类名称</span>
-                </div>
-                <div>
-                  <span>阅读数量: 56985</span>
-                  <span>点评数量: 656565223</span>
-                  <span>发布状态: 已发布</span>
-                </div>
-              </div>
-            </div>
-            <a-divider />
             <!--  专辑审批   -->
-            <template v-if="albumStatus == 2">
+            <template v-if="showCheck">
               <div class="album-check">
                 <div>专辑审批</div>
                 <a-radio-group v-model="auditForm.result" style="margin-bottom: 16px;">
@@ -85,11 +55,35 @@
                 <a-input v-model="auditForm.remark" type="textarea" :autosize="{minRows: 3, maxRows: 6}" :maxLength="200" placeholder="请输入审批意见" />
                 <a-row :gutter="24" type="flex" justify="end" style="margin-top: 20px;padding-right:12px;">
                   <a-button style="margin-right: 20px;" @click="$router.back()">取消</a-button>
-                  <a-button type="primary">保存</a-button>
+                  <a-button type="primary" :loading="saveLoading" @click="handleSaveClick">保存</a-button>
                 </a-row>
               </div>
             <a-divider />
             </template>
+            <!--  专辑基本信息  -->
+            <div class="body-head">
+              <div class="body-head-title">
+                专辑基本信息
+              </div>
+              <div class="body-head-details">
+                <div>
+                  <span>专辑名称: {{ baseInfo.name }}</span>
+                  <span>专辑负责人: {{ baseInfo.owner }}</span>
+                  <span>创建时间: {{ baseInfo.createTime }}</span>
+                </div>
+                <div>
+                  <span>所属公司: {{ baseInfo.ownerCompany }}</span>
+                  <span>所属部门: {{ baseInfo.ownerDepartment }}</span>
+                  <span>专辑分类: {{ baseInfo.categoryName }}</span>
+                </div>
+                <div>
+                  <span>阅读数量: {{ baseInfo.views }}</span>
+                  <span>点评数量: {{ baseInfo.yelpTotal }}</span>
+                  <span>发布状态: {{ baseInfo.versionStateName }}</span>
+                </div>
+              </div>
+            </div>
+            <a-divider />
             <!--  专辑审批记录  -->
             <div class="album-check-record">
               <div>专辑审批记录</div>
@@ -98,7 +92,7 @@
                 </a-table>
               </div>
             </div>
-            <template v-if="albumStatus == 1">
+            <template v-if="!showCheck">
               <a-row :gutter="24" type="flex" justify="end" style="margin-top: 20px;padding-right:12px;">
                 <a-button style="margin-right: 20px;" @click="$router.back()">取消</a-button>
               </a-row>
@@ -111,8 +105,9 @@
 </template>
 
 <script>
-import test from '@/assets/img/test.png'
 import breadcrumb from '../components/breadcrumb'
+import api from '@/api/knowledge/album/checkInfo'
+import commentAuditApi from '@/api/knowledge/album/commentAudit'
 export default {
   name: 'checkInfo',
   components: {
@@ -120,9 +115,26 @@ export default {
   },
   data() {
     return {
-      // 1.审核通过  2.待审核
-      albumStatus: 1,
-      test,
+      saveLoading: false,
+      api,
+      // 点评id
+      pkId: '',
+      showCheck: false,
+      baseInfo: {
+        name: '',
+        owner: '',
+        createTime: '',
+        ownerCompany: '',
+        ownerDepartment: '',
+        categoryName: '',
+        views: '',
+        yelpTotal: '',
+        versionStateName: '',
+      },
+      // 父级点评信息
+      parentInfo: {},
+      // 子集点评信息
+      childrenInfo: {},
       collapseCheckKey: '1',
       approverColumns: [
         {
@@ -133,7 +145,7 @@ export default {
         {
           title: '审批人',
           align: 'center',
-          dataIndex: 'approverName',
+          dataIndex: 'actualApproverName',
         },
         {
           title: '审批状态',
@@ -143,26 +155,64 @@ export default {
         {
           title: '审批备注',
           align: 'center',
-          dataIndex: 'remark',
+          dataIndex: 'comment',
         },
         {
           title: '时间',
           align: 'center',
-          dataIndex: 'approvalTime',
+          dataIndex: 'createTime',
         },
       ],
-      approverData: [
-        { name: 1, approverName: 1, approvalStatus: 1, remark: 1, approvalTime: 1},
-        { name: 1, approverName: 1, approvalStatus: 1, remark: 1, approvalTime: 1},
-        { name: 1, approverName: 1, approvalStatus: 1, remark: 1, approvalTime: 1},
-      ],
+      approverData: [],
       auditForm: {
+        pkIds: [],
         result: '1',
         remark: ''
       }
     }
   },
+  created() {
+    this.auditForm = Object.assign({},this.$options.data().auditForm)
+    // pkId   state: 专辑状态  versionState: 版本状态
+    this.pkId = this.$route.query.pkId
+    this.showCheck = this.$route.query.showCheck
+    // this.versionState = this.$route.query.versionState
+    this.init()
+  },
   methods: {
+    async init() {
+      let detailData = await api.info({pkId: this.pkId})
+      let detailInfo = detailData.data
+      this.parentInfo = detailInfo.yelp
+      console.log(this.parentInfo)
+      if(!this.parentInfo) {
+        let collapseNode = document.querySelector('.ant-collapse-content')
+        collapseNode.style.display = 'none'
+      }
+      this.childrenInfo = {
+        createPhoto: detailInfo.createPhoto,
+        createName: detailInfo.createName,
+        content: detailInfo.content,
+        createTime: detailInfo.createTime,
+        state: detailInfo.state
+      }
+      this.baseInfo = { ...detailInfo.ablum }
+      this.approverData = detailInfo.flows
+    },
+    handleSaveClick() {
+      this.handleSaveClick = false
+      this.auditForm.pkIds = [ this.pkId ]
+      commentAuditApi.approve(this.auditForm).then(res => {
+        if(res.code) {
+          setTimeout(() => 
+            {
+              this.$router.back()
+              this.saveLoading = false
+            }
+          ,1000)
+        }
+      })
+    } 
   }
 }
 </script>
@@ -216,16 +266,16 @@ export default {
           }
 
           >div:nth-child(2) {
-            margin: 10px 0 20px;
+            margin: 10px 0 15px;
           }
 
           >div:nth-child(3) {
             display: flex;
             justify-content: space-between;
-            align-items: center;
+            align-items: flex-start;
 
-            button {
-              padding: 3px;
+            >span:nth-child(2) {
+              cursor: pointer;
             }
           }
         }
@@ -305,7 +355,7 @@ export default {
   border: none;
 }
 /deep/ .ant-collapse-content > .ant-collapse-content-box {
-  padding: 20px 30px 2px 50px;
+  padding: 20px 30px 20px 50px;
 }
 /deep/ .ant-input {
   border-radius: 0;

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

@@ -3,7 +3,7 @@
     <div slot="center" style>
       <rx-fit>   
         <div slot="toolheader" border="false" foldbtn="false">
-          <breadcrumb firstLevel="专辑管理" lastLevel="点评审核" />
+          <breadcrumb firstLevel="点评管理" lastLevel="点评审核" />
           <div class="mainContent">
             <div class="body" :style="{'padding-right': $store.state.appSetting.collapsed ? '0px' : '20px' }">
               <div class="content">
@@ -12,13 +12,13 @@
                     <div style="display:flex;flex-wrap:wrap;">
                         <a-form-item
                           style="width:320px;margin: 5px 40px 5px 0;"
-                          label="知识标题"
+                          label="专辑名称"
                           name="name">
-                          <a-input v-model="queryParam.titles" placeholder="请输入"/>
+                          <a-input v-model="queryParam.name" placeholder="请输入"/>
                         </a-form-item>
                         <a-form-item
                           style="width:320px;margin: 5px 40px 5px 0;"
-                          label="创建时间"
+                          label="提交时间"
                           name="createTime">
                           <a-range-picker v-model="createTime" 
                                           separator="→"
@@ -28,24 +28,14 @@
                             <a-icon v-if="$store.state.appSetting.collapsed" slot="suffixIcon" type="calendar" />
                           </a-range-picker>
                         </a-form-item>
-                        <!-- <a-form-item
-                          style="width:320px;margin: 5px 40px 5px 0;"
-                          label="审核状态"
-                          name="online">
-                          <a-select v-model="queryParam.approvalStatus" placeholder="请选择"  allowClear>
-                            <a-select-option v-for="(item,index) in approvalStatusList" :key="index" :value="item.value">
-                              {{item.label}}
-                            </a-select-option>
-                          </a-select>
-                        </a-form-item> -->
                     </div>
                     <div style="display:flex;flex-wrap:wrap;" v-if="extend" :class="{'show-other': extend}">
                       <a-form-item
                         style="width:320px;margin: 5px 40px 5px 0;"
-                        label="知识分类"
-                        name="online">
-                        <a-select v-model="queryParam.type" placeholder="请选择"  allowClear>
-                          <a-select-option v-for="(item,index) in knowledgeList" :key="index" :value="item.value">
+                        label="审核状态"
+                        name="approvalState">
+                        <a-select v-model="queryParam.approvalState" placeholder="请选择"  allowClear>
+                          <a-select-option v-for="(item,index) in approvalStateList" :key="index" :value="item.value">
                             {{item.label}}
                           </a-select-option>
                         </a-select>
@@ -55,7 +45,7 @@
                         label="所属分类"
                         name="categoryIds">
                         <a-cascader v-model="categoryIds" 
-                                    :options="classifyList" 
+                                    :options="classifyLevelList" 
                                     :fieldNames="{ label: 'name', value: 'pkId', children: 'children' }"
                                     placeholder="请选择"
                                     changeOnSelect
@@ -63,9 +53,9 @@
                       </a-form-item>
                       <a-form-item
                         style="width:320px;margin: 5px 40px 5px 0;"
-                        label="作者"
-                        name="creator">
-                        <a-input v-model="queryParam.author" placeholder="请输入" />
+                        label="提交人"
+                        name="createName">
+                        <a-input v-model="queryParam.createName" placeholder="请输入" />
                       </a-form-item>
                      </div>
                   </div>
@@ -92,50 +82,36 @@
                     </div>
                   </div>
                 </a-form>
-                <!-- <rx-button alias="processEdit" :butn-icon="'false'" @click="$router.push('/knowledge/auditProcessMaintain')">维护审核流程</rx-button> -->
-                <rx-button alias="processBatch" :butn-icon="'false'" @click="handldAuditClick('batch')">批量审核</rx-button>
+                <rx-button alias="commentAuditListBatch" :butn-icon="'false'" @click="handldAuditClick('batch')">批量审核</rx-button>
               </div>
             </div>
           </div>
         </div>    
 
         <rx-grid
-          ref="auditRef"
+          ref="commentRef"
           class="table-style"
           style="background: #fff"
           :columns="columns"
           :allowRowSelect="true"
           :multiSelect="true"
-          :url="urls"
+          :url="api.query"
           :queryParam="queryParam"
           data-field="result.data"
           :defaultPageSize="10"
           :pageSizeOptions="['10','20','30','40']"
           idField="pkId"
         > 
-          <template slot="pkId" slot-scope="{text,record}">
-            <div>{{ $route.query.showUnchecked ? record.approvalsFirst.pkId : text }}</div>
-          </template>
-           <template slot="titles" slot-scope="{text}">
-            <div style="white-space: pre-line">{{ text }}</div>
-          </template>
-          <template slot="type" slot-scope="{text}">
-            <div>{{ text == 1 ? '文档知识' : '维基知识' }}</div>
-          </template>
-          <template slot="knowledgeCategoryAdminVo" slot-scope="{text}">
-            <div>{{ getCategory(text) }}</div>
-          </template>
           <template slot="approvalStatus" slot-scope="{text}">
             <div>{{ getApprovalStatus(text) }}</div>
           </template>
           <template slot="action" slot-scope="{text,record}">
-            <template v-if="($route.query.showUnchecked ? true : record.isAudit == 0) && (record.approvalStatus == 1 || record.approvalStatus == 3)" >
-            <!-- <template v-if="(record.approvalStatus == 1 || record.approvalStatus == 3) && record.approverId == $store.state.appSetting.user.userId" > -->
-              <rx-button class="clearBtn" alias="processDo" :butn-icon="'none'" @click="handleJumpUpdateClick(record)">审核</rx-button>
-              <rx-button class="clearBtn" alias="processFast" :butn-icon="'none'" @click="handldAuditClick('fast',record)">快速审核</rx-button>
+            <template v-if="record.actionFlag.indexOf('approve') > -1">
+              <rx-button class="clearBtn" alias="commentAuditListProcess" :butn-icon="'none'" @click="handleJumpUpdateClick(record,true)">审核</rx-button>
+              <rx-button class="clearBtn" alias="commentAuditListFast" :butn-icon="'none'" @click="handldAuditClick('fast',record)">快速审核</rx-button>
             </template>
             <template v-else>
-              <rx-button class="clearBtn" alias="processLook" :butn-icon="'none'" @click="handleJumpUpdateClick(record,true)">查看</rx-button>
+              <rx-button class="clearBtn" alias="commentAuditListlook" :butn-icon="'none'" @click="handleJumpUpdateClick(record,false)">查看</rx-button>
             </template>
           </template>
         </rx-grid>
@@ -156,25 +132,8 @@
           <a-form-item prop="remark" style="margin-top:10px;">
             <a-input v-model="auditForm.remark" type="textarea" :autosize="{minRows: 3, maxRows: 6}" :maxLength="200" placeholder="请输入审批意见" />
           </a-form-item>
-          <a-form-item v-if="isShowOrg && isDocument" label="权限:" prop="actualApproverName" style="margin-top:10px;">
-            <div @click="showAuditFlag = true">
-              <a-select v-model="authName" :showArrow="false" :open="false" placeholder="请选择组织部门、职系、职称等授予知识访问权限"></a-select>
-            </div>
-          </a-form-item>
         </a-form>
-      </a-modal>
-      <a-modal v-model="showAuditFlag" 
-          width="800"
-          title="选择组织架构" 
-          centered
-          okText="保存"
-          @ok="handleSaveOk">
-        <org-people style="width:800px;height:65vh;" 
-                    :isOnlyOrg="false"  
-                    @transCheckedTarget="transCheckedTarget"
-                    @returnSequencesInfo="handleSequencesChange"
-                    @returnGradeInfo="handleGradeChange" ></org-people>
-      </a-modal>  
+      </a-modal> 
     </div> 
   </rx-layout>
 </template>
@@ -182,79 +141,68 @@
 <script>
 import breadcrumb from '../components/breadcrumb'
 import orgPeople from './components/orgPeople'
-import api from '@/api/knowledge/audit'
-import classApi from '@/api/knowledge/classify'
-import { getCategory } from '../aJs/getClassifyTree'
+import api from '@/api/knowledge/album/commentAudit'
+import albumApi from '@/api/knowledge/album/album'
 import mixin from "../aMixin/mixin"
-import initMixin from "../aMixin/initMixin"
 const auditMixin = new mixin('audit')
 export default {
-  name: 'auditManageList',
+  name: 'commentAuditList',
   components: {
     breadcrumb,
     orgPeople
   },
-  mixins: [ initMixin, auditMixin ],
+  mixins: [ auditMixin ],
   data() {
     return {
       api,
-      classApi,
       saveLoading: false,
       urls: '',
       modalTitle: '快速审核',
       extend: true,
       queryParam: {
-        titles: '',
-        beginTime: '',
-        endTime: '',
-        approvalStatus: undefined,
-        type: undefined,
+        type: 1,
+        name: '',
+        createTimeStart: '',
+        createTimeEnd: '',
+        approvalState: undefined,
         categoryId: '',
-        author: '',
+        createName: '',
       },
       createTime: [],
       categoryIds: [],
-      knowledgeList: [
-        {value: null, label: '全部'},
-        {value: '1', label: '文档知识'},
-        {value: '2', label: '维基知识'}
-      ],
-      approvalStatusList: [
-        {value: '1', label: '待节点审核'},
-        {value: '2', label: '节点驳回'},
-        {value: '3', label: '待最终审核'},
-        {value: '4', label: '最终驳回'},
-        {value: '5', label: '最终通过'},
+      classifyLevelList: [],
+      approvalStateList: [
+        {value: 1, label: '待节点审核'},
+        {value: 2, label: '节点驳回'},
+        {value: 3, label: '待最终审核'},
+        {value: 4, label: '最终驳回'},
+        {value: 5, label: '最终通过'}
       ],
       columns: [
         {
           title: '点评ID',
           dataIndex: 'pkId',
-          align: 'center',
-          scopedSlots: {customRender: 'pkId'}
+          align: 'center'
         },
          {
           title: '点评内容',
-          dataIndex: 'titles',
+          dataIndex: 'content',
           align: 'center',
-          scopedSlots: {customRender: 'titles'}
+          width: 300
         },
         {
           title: '专题名称',
-          dataIndex: 'titles',
-          align: 'center',
-          scopedSlots: {customRender: 'titles'}
+          dataIndex: 'albumName',
+          align: 'center'
         },
         {
           title: '所属分类',
-          dataIndex: 'knowledgeCategoryAdminVo',
+          dataIndex: 'categoryName',
           align: 'center',
-          width: 300,
-          scopedSlots: {customRender: 'knowledgeCategoryAdminVo'}
         },
          {
           title: '提交人',
-          dataIndex: 'author',
+          dataIndex: 'createName',
           align: 'center',
           width: 100
         },
@@ -265,20 +213,19 @@ export default {
         },
          {
           title: '状态',
-          dataIndex: 'approvalStatus',
+          dataIndex: 'approvalStateName',
           align: 'center',
-          scopedSlots: {customRender: 'approvalStatus'},
           width: 100
         },
          {
           title: '审核人',
-          dataIndex: 'approverName',
+          dataIndex: 'previousApproverName',
           align: 'center',
           width: 100
         },
          {
           title: '最后一次审核时间',
-          dataIndex: 'approvalTime',
+          dataIndex: 'previousApproverTime',
           align: 'center',
         },
         { 
@@ -290,47 +237,20 @@ export default {
         }
       ],
       auditShow: false,
-      showAuditFlag: false,
       // 要审核的数据
       willAuditData: [],
       auditForm: {
-        pkId: '',
+        pkIds:'',
         result:'1',
         remark:'',
-        actualApprover: '',
-        actualApproverName: '',
-        organizationId: ''
-      },
-      authName: undefined,
-      isShowOrg: false,
-      classifyList: [],
-      // 组织架构
-      checkedTarget: {},
-      // 职系
-      sequencesInfo: {},
-      // 职等
-      gradesInfo: {},
-      // 文档知识不能选择权限
-      isDocument: false
+      }
     }
   },
   created() {
-    // 从知识管理页跳转
-    if(this.$route.query.showUnchecked) {
-      this.urls = api.findAllAuditKnowledge
-       this.approvalStatusList = [
-        {value: '1', label: '待节点审核'},
-        {value: '3', label: '待最终审核'}
-      ]
+    if(this.$route.query.showOnlyUser) {
+      this.queryParam.type = 2
     } else {
-      this.urls = api.findAllKnowledgeApprove
-      this.approvalStatusList = [
-        {value: '1', label: '待节点审核'},
-        {value: '2', label: '节点驳回'},
-        {value: '3', label: '待最终审核'},
-        {value: '4', label: '最终驳回'},
-        {value: '5', label: '最终通过'},
-      ]
+      this.queryParam.type = 1
     }
     this.init()
   },
@@ -353,11 +273,25 @@ export default {
     }
   },
   methods: {
-    getCategory,
+    async init() {
+      let res = await albumApi.categories()
+      this.classifyLevelList = this.formatData(res.data)
+    },
+    formatData(data) {
+      const that = this
+      data.forEach((element) => {
+        if (element.children && element.children.length > 0) {
+          that.formatData(element.children)
+        } else {
+          delete element.children
+        }
+      })
+      return data
+    },
     handleSearchClick() {
       if(this.createTime && this.createTime.length) {
-        this.queryParam.beginTime = this.createTime[0]
-        this.queryParam.endTime = this.createTime[1]
+        this.queryParam.createTimeStart = this.createTime[0]
+        this.queryParam.createTimeEnd = this.createTime[1]
       }
       if(this.categoryIds && this.categoryIds.length) {
         this.queryParam.categoryId = this.categoryIds.slice('-1')[0]
@@ -365,153 +299,51 @@ export default {
       this.reloadTable()
     },
     // 审核
-    handleJumpUpdateClick(record,arg) {
-      // 从知识管理跳转
-      // let query = {}
-      // if(this.$route.query.showUnchecked) {
-      //   if(arg) {
-      //     // 查看
-      //     query = {
-      //       pkId: record.pkId, 
-      //       type: 'auditManageList', 
-      //       auditId: record.approvalsFirst.pkId,
-      //       show: true,
-      //     }
-      //   } else {
-      //     // 审核
-      //     query = {
-      //       pkId: record.pkId, 
-      //       type: 'auditManageList', 
-      //       auditId: record.approvalsFirst.pkId,
-      //       show: true,
-      //       isAudit: true
-      //     }
-      //   }
-      // } else {
-      //   // 当前审核管理跳转
-      //   if(arg) {
-      //     // 查看
-      //     query = {
-      //       pkId: record.knowledgerId, 
-      //       type: 'auditManageList', 
-      //       auditId: record.pkId,
-      //       show: true
-      //     }
-      //   } else {
-      //     // 审核
-      //     query = {
-      //       pkId: record.knowledgerId, 
-      //       type: 'auditManageList', 
-      //       auditId: record.pkId,
-      //       show: true,
-      //       isAudit: true
-      //     }
-      //   }
-      // }
-      // this.$router.push({
-      //   path: '/knowledge/knowledgeAddUpdate',
-      //   query
-      // })
+    handleJumpUpdateClick(record,arg = false) {
+      this.$router.push({
+        path: '/knowledge/checkInfo',
+        // pkId  showCheck: 是否显示点评
+        query: { pkId: record.pkId, showCheck: arg}
+      })
     },
     // 确认审核
     handleOk(){
       this.saveLoading = true
-      let ids = this.willAuditData.map(item => item.pkId)
-      if(this.$route.query.showUnchecked) {
-        ids = this.willAuditData.map(item => item.approvalsFirst.pkId)
-      }
-      this.auditForm.actualApprover = this.$store.state.appSetting.user.userId
-      this.auditForm.actualApproverName = this.$store.state.appSetting.user.fullName
-      // 快速审核
-      if(ids.length == 1) {
-        this.auditForm.pkId = ids[0]
-        api.knowledgeApproveById(this.auditForm).then(res => {
-          if(res.code == 200) {
-            this.auditShow = false
-            this.reloadTable()
-            this.saveLoading = false
-          }
-        })
-      } else {
-        // 批量审核
-        this.auditForm.pkIds = ids
-        api.knowledgeApproveBatchById(this.auditForm).then(res => {
-          if(res.code == 200) {
-            this.auditShow = false
-            this.reloadTable()
-            this.saveLoading = false
-          }
-        })
-      }
+      this.auditForm.pkIds = this.willAuditData.map(item => item.pkId)
+      this.auditForm.result = parseInt(this.auditForm.result)
+      api.approve(this.auditForm).then(res => {
+        if(res.code == 200) {
+          this.auditShow = false
+          this.reloadTable()
+          this.saveLoading = false
+        }
+      })
     },
     // 快速审核/批量审核
     handldAuditClick(title,arg = {}) {
       this.modalTitle = title == 'fast' ? '快速审核' : '批量审核'
       this.auditForm = Object.assign({},this.$options.data().auditForm)
-      this.authName = undefined
       this.willAuditData = []
       if(title == 'fast') {
-        this.isDocument = arg.type == 1 ? true : false
-        this.isShowOrg = arg.approvalStatus == 3 ? true : false
         this.willAuditData.push(arg)
       } else {
-        this.willAuditData = this.$refs.auditRef.getSelectedRows()
+        this.willAuditData = this.$refs.commentRef.getSelectedRows()
+        if(!this.willAuditData.length) {
+          this.$message.error("请选择要审核的专辑");
+            return 
+        } 
         for(let i of this.willAuditData) {
-          if(i.approvalStatus != 1 && i.approvalStatus != 3) {
+          if(i.approvalStateName != '待节点审核' && i.approvalStateName != '待最终审核') {
             this.$message.error("审核存在状态为驳回/通过的节点,无法审批");
             return 
           }
-          if(i.approvalStatus == 3) {
-            this.isShowOrg = true
-            this.isDocument = i.type == 1 ? true : false
-            break
-          } else {
-            this.isShowOrg = false
-          }
         }
       }
-      if(!this.willAuditData.length) return
       this.auditShow = true
-    },
-    transCheckedTarget(arg) {
-      this.checkedTarget = arg
-    },
-    handleSequencesChange(arg) {
-      this.sequencesInfo = arg
-    },
-    handleGradeChange(arg) {
-      this.gradesInfo = arg
-    },
-    handleSaveOk() {
-      if(this.isShowOrg) {
-        let info = []
-        let res = []
-        if(this.checkedTarget.organizationId) {
-          info.push(`${this.checkedTarget.organizationTree.join('-')}`)
-          res.push(this.checkedTarget)
-        }
-        if(this.sequencesInfo.gradeId) {
-          info.push(`职系-${this.sequencesInfo.gradeName}`)
-          res.push(this.sequencesInfo)
-        }
-        if(this.gradesInfo.gradeLevelId) {
-          info.push(`职等-${this.gradesInfo.gradeLevelName}`)
-          res.push(this.gradesInfo)
-        }
-         if(info.length) {
-          this.authName = info.join('/')
-        }
-        if(res.length) {
-          this.auditForm.organizationId = JSON.stringify([...res])
-        } else {
-          this.auditForm.organizationId = ""
-        }
-      }
-      this.showAuditFlag = false
     },
       // 重新加载表格
     reloadTable() {
-      this.$refs.auditRef.loadData()
+      this.$refs.commentRef.loadData()
     }
   }
 }

src/views/modules/knowledge/album/components/albumCatalog.vue

@@ -7,7 +7,7 @@
           <div>
             <div>知识分类: {{ iten.category }}</div>
             <div>  
-              <a-button type="link" v-if="item.actionFlag && item.actionFlag.indexOf('delete') > -1">
+              <a-button type="link" v-if="item.actionFlag && item.actionFlag.indexOf('delete') > -1" @click="handleRemoveKnowledgeClick(index,indey,item.pkId,iten.knowledgeId)">
               移除
               </a-button>  
               <a-button type="link" @click="handleLookKnowledgeClick(iten.knowledgeId)">
@@ -23,6 +23,9 @@
           <a-divider v-if="item.contents.length != (indey + 1)" style="margin:0 0 10px;" />
         </div>
       </template>
+      <template v-else>
+        <span>无内容</span>
+      </template>
     </a-collapse-panel>
   </a-collapse>
 </template>
@@ -45,6 +48,12 @@ export default {
     }
   },
   methods: {
+    // 移除知识 
+    // index 目录索引  indey 知识索引  pkId 目录id  knowledgeId 知识id
+    handleRemoveKnowledgeClick(index,indey,pkId,knowledgeId) {
+      this.catalogInfo[index].contents.splice(indey,1)
+      this.$emit('handleRemoveId',{pkId: pkId, knowledgeId: knowledgeId})
+    },
     handleLookKnowledgeClick(pkId) {
       console.log(pkId)
       this.$router.push({

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

@@ -366,7 +366,18 @@ export default {
             this.mapForm.groupId = info.groupId.split(',')
             this.mapForm.groupSummary = info.groupSummary
             this.mapForm.groupPurview = info.groupPurview.toString()
-            this.tabRouteList = info.routes || []
+            if(info.routes.length) {
+              let disposeRoutes = info.routes 
+              disposeRoutes.forEach(item => {
+                if(!item.contents) {
+                  item.contents = []
+                }
+              })
+              this.tabRouteList = disposeRoutes
+            } else {
+              this.tabRouteList = []
+            }
+            console.log(this.tabRouteList)
             if(this.mapForm.groupPurview == 2) {
               let queryParam = {
                 pageNo: 1,

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

@@ -85,7 +85,7 @@
                     </div>
                   </div>
                 </a-form>
-                <rx-button alias="bannerAdd" :butn-icon="'none'" @click="$router.push('/knowledge/addUpdateMap')">新增地图</rx-button>
+                <rx-button alias="mapAdd" :butn-icon="'none'" @click="$router.push('/knowledge/addUpdateMap')">新增地图</rx-button>
               </div>
             </div>
           </div>
@@ -107,8 +107,8 @@
             <div style="white-space: pre-line">{{ text }}</div>
           </template>
           <template slot="action" slot-scope="{text,record,index}">
-            <rx-button class="clearBtn" alias="bannerEdite" :butn-icon="'none'" @click='handleJumpUpdateClick(record)'>编辑</rx-button>
-            <rx-button class="clearBtn" alias="bannerDel" :butn-icon="'none'" @click="handleDeleteClick(record)">删除</rx-button>
+            <rx-button class="clearBtn" alias="mapEdite" :butn-icon="'none'" @click='handleJumpUpdateClick(record)'>编辑</rx-button>
+            <rx-button class="clearBtn" alias="mapDel" :butn-icon="'none'" @click="handleDeleteClick(record)">删除</rx-button>
           </template>
         </rx-grid>
       </rx-fit>

src/views/modules/knowledge/serve/addUpdateJoinUpServe.vue

@@ -1,141 +0,0 @@
-<template>
-  <rx-layout>
-    <div slot="center" style>
-      <rx-fit>   
-        <div slot="toolheader" border="false" foldbtn="false">
-          <breadcrumb firstLevel="接入服务管理" lastLevel="业务系统详情" />
-          <div class="mainContent">
-            <div class="body">
-              <div class="content">
-                <div style="padding: 20px;">业务系统详情</div>
-                <a-divider style="margin: 0;" />
-                  <a-form-model ref="joinRef" :model="form" :rules="joinUpRules" layout="inline">
-                    <div class="rowList">*业务系统名称</div>
-                    <a-form-model-item prop="name">
-                      <a-input v-model="form.name" placeholder="请输入" />
-                    </a-form-model-item>
-                    <div class="rowList">*Nacos注册应用名称</div>
-                    <a-form-model-item prop="useName">
-                      <a-input v-model="form.useName" placeholder="请输入" />
-                    </a-form-model-item>
-                    <div class="rowList">文件下载地址</div>
-                    <a-form-model-item>
-                      <a-input v-model="form.downUrl" placeholder="请输入" />
-                    </a-form-model-item>
-                    <div class="rowList">业务Appkey</div>
-                    <a-form-model-item>
-                      <a-input v-model="form.key" placeholder="请输入" />
-                    </a-form-model-item>
-                    <div class="rowList">Appsecret</div>
-                    <a-form-model-item>
-                      <a-input v-model="form.secret" placeholder="请输入" />
-                    </a-form-model-item>
-                    <div class="rowList">*业务系统访问地址</div>
-                    <a-form-model-item prop="url"> 
-                      <a-input v-model="form.url" placeholder="请输入" />
-                    </a-form-model-item>
-                    <a-row :gutter="24" type="flex" justify="end">
-                      <a-button @click="$router.back()">取消</a-button>
-                      <a-button type="primary" @click="handleSaveClick" :loading="saveLoading">保存</a-button>
-                    </a-row>
-                  </a-form-model>
-              </div>
-            </div>
-          </div>
-        </div>    
-      </rx-fit> 
-    </div> 
-  </rx-layout>
-</template>
-
-<script>
-import breadcrumb from '../components/breadcrumb'
-import api from '@/api/knowledge/auditProcess'
-export default {
-  name: 'addUpdateJoinUpServe',
-  components: {
-    breadcrumb,
-  },
-  data() {
-    return {
-      api,
-      saveLoading: false,
-      form: {
-        name: '',
-        useName: '',
-        downUrl: '',
-        key: '',
-        secret: '',
-        url: ''
-      },
-      joinUpRules:  {
-        name: [
-          { required: true, message: '请输入业务系统名称', trigger: 'blur' }
-        ],
-        useName: [
-          { required: true, message: '请输入Nacos注册应用名称', trigger: 'blur' }
-        ],
-        url: [
-          { required: true, message: '请输入业务系统访问地址', trigger: 'blur' }
-        ],
-      }
-    }
-  },
-  created() {
-    this.init()
-  },
-  beforeDestroy() {
-    this.$refs.joinRef.clearValidate()
-  },
-  methods: {
-    init() {},
-    handleSaveClick() {
-      this.$refs.joinRef.validate(valid => {
-        if(valid) {
-          console.log(this.form)
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-@gary:  #f8f8f8;
-@white: #fff;
-.rx-fit {
-  padding: 40px!important;
-  background: @gary;
-  overflow-y: auto!important;;
-  .fit-header {
-    .mainContent {
-      width: 100%;
-      .body {
-        background: @white;
-        // padding: 0 20px;
-        .content {
-          background: @white;
-
-          .ant-form {
-            padding: 10px 20px;
-
-            .rowList{
-              margin-bottom: 10px!important;
-            }
-            
-            .ant-form-item {
-              width: 50%;
-              margin-bottom: 15px;
-            }
-
-            button {
-              margin-right: 20px;
-              margin-top: 30px;
-            }
-          }
-        }
-      }
-    }
-  }
-}
-</style>

src/views/modules/knowledge/serve/joinUpServeList.vue

@@ -1,321 +0,0 @@
-<template>
-  <rx-layout>
-    <div slot="center" style>
-      <rx-fit>   
-        <div slot="toolheader" border="false" foldbtn="false">
-          <breadcrumb firstLevel="接入服务管理" lastLevel="接入列表" />
-          <div class="mainContent">
-            <div class="body">
-              <div class="content">
-                <a-form ref="searchForm" layout="inline" style="display:flex;">
-                  <div style="width:80%;display:flex;flex-wrap:wrap;">
-                    <a-form-item
-                      style="width:300px;margin: 5px 40px 5px 0;"
-                      label="系统名称"
-                      name="name">
-                      <a-input v-model="queryParam.name" placeholder="请输入"/>
-                    </a-form-item>
-                  </div>
-                  <div style="width:20%;display:flex;justify-content:flex-end;margin-top: 8px;">
-                    <a-button @click="handleResetClick">重置</a-button>
-                    <a-button type="primary" @click="handleSearchClick">查询</a-button>
-                  </div>
-                </a-form>
-                <rx-button alias="classificationAdd" :butn-icon="'none'" @click="handleAddClassClick">新增接入系统</rx-button>
-              </div>
-            </div>
-          </div>
-        </div>
-        <rx-grid
-          ref="classifyRef"
-          class="table-style"
-          style="background: #fff"
-          :columns="columns"
-          :url="api.findAllKnowledgeCategory"
-          :queryParam="queryParam"
-          data-field="result.data"
-          :defaultPageSize="10"
-          :pageSizeOptions="['10','20','30','40']"
-          idField="pkId"
-        >
-          <template slot="action" slot-scope="{text,record,index}">
-            <rx-button class="clearBtn" alias="classificationEdit" :butn-icon="'none'" @click="handleUpdateClassifyClick(record)">编辑</rx-button>
-          </template>
-        </rx-grid>
-      </rx-fit>
-      <a-modal v-model="knowledgeShow" 
-               :title="title" 
-               centered
-               okText="保存"
-               @ok="handleOk"
-               :confirmLoading="saveLoading"
-               @cancel="handleCancel">
-        <a-form ref="classRef" :model="classForm" layout="inline" :label-col="{ span: 4 }">
-          <a-form-item label="分类名称" prop="name">
-            <a-input v-model="classForm.name" :maxLength="10" placeholder="请输入" />
-          </a-form-item>
-          <a-form-item label="上级分类" prop="parent" v-if="chooseLevel != 1">
-            <a-cascader v-model="classForm.parent" 
-                        ref="cascader"
-                        :options="classifyLevelList" 
-                        :fieldNames="{ label: 'name', value: 'pkId', children: 'children' }"
-                        placeholder="请选择上级分类，创建一级分类无需选择"
-                        :changeOnSelect="changeOnSelect" />
-          </a-form-item>
-          <a-form-item label="排序" prop="sort">
-            <div style="width:40%">
-              <a-input-number v-model="classForm.sort" :min="0" />
-            </div>
-          </a-form-item>
-        </a-form>
-      </a-modal>
-    </div> 
-  </rx-layout>
-</template>
-
-<script>
-import breadcrumb from '../components/breadcrumb.vue'
-import api from '@/api/knowledge/classify'
-import classApi from '@/api/knowledge/classify'
-import { getCategoryId } from '../aJs/getClassifyTree'
-import mixin from "../aMixin/mixin"
-const classifyMixin = new mixin('classify')
-export default {
-  components: {
-    breadcrumb
-  },
-  mixins: [ classifyMixin ],
-  data() {
-    return {
-      api,
-      saveLoading: false,
-      title: '',
-      knowledgeShow: false,
-      queryParam: {
-        name: ''
-      },
-      columns:[
-        {
-          title: 'ID',
-          dataIndex: 'pkId',
-          align: 'center'
-        },
-        {
-          title: '业务系统名称',
-          dataIndex: 'operatorName',
-          align: 'center',
-        },
-        {
-          title: '操作人',
-          dataIndex: 'operatorName',
-          align: 'center'
-        },
-        {
-          title: '操作时间',
-          dataIndex: 'updateTime',
-          align: 'center'
-        },
-        { 
-          title: '操作',
-          dataIndex: 'action', 
-          align: 'center',
-          scopedSlots: {customRender: 'action'},
-        }
-      ],
-      classForm: {
-        pkId: '',
-        name: '',
-        parent: [],
-        sort: 0
-      },
-      // 所有分类数据
-      classifyList: [],
-      // 编辑时不同等级的分类数据
-      classifyLevelList: [],
-      // 显示上升下降按钮
-      isShowButton: true,
-      // 选中的分类等级
-      chooseLevel: 0,
-      changeOnSelect: true
-    }
-  },
-  created() {
-    this.init()
-  },
-  methods: {
-    async init() {
-      let res = await classApi.getAllByCategoryId()
-      this.classifyList = this.getData(res.data.children)
-      this.classifyLevelList = JSON.parse(JSON.stringify(this.classifyList))
-    },
-    // 格式化数据 disabled 编辑三分类时,只有一级分类没有二级分类,则不可选一级分类
-    getData(data,disabled = false) {
-      data.forEach((element) => {
-        if(element.children && element.children.length > 0 && element.level == 2) {
-          this.getData(element.children)
-        } else {
-          if(disabled && element.level == 2) {
-            element.disabled = true
-          } 
-          delete element.children
-        }
-      })
-      return data
-    },
-    // 搜索
-    handleSearchClick() {
-      this.isShowButton = this.queryParam.name ? false : true
-      this.reloadTable()
-    },
-    handleAddClassClick() {
-      this.title ='新增分类'
-      this.chooseLevel = 0
-      this.changeOnSelect = true
-      this.init()
-      this.knowledgeShow = true
-    },
-    // 编辑页面显示
-    async handleUpdateClassifyClick(record) {
-      this.title = '编辑分类'
-      this.chooseLevel = record.level
-      this.changeOnSelect = false
-      if(record.level == 2) {
-        this.classifyLevelList = JSON.parse(JSON.stringify(this.classifyList))
-        this.classifyLevelList.forEach(element => {
-          if(element.level == 2) {
-            delete element.children
-          }
-        })
-      }
-      if(record.level == 3) {
-        this.classifyLevelList = this.getData(JSON.parse(JSON.stringify(this.classifyList)), true)
-      }
-      let res = await this.api.findAllParentByCategoryId(record.pkId)
-      let gategoryId 
-      if(!res.data.parents) {
-        gategoryId = []
-      } else {
-        gategoryId = getCategoryId(res.data.parents)
-      }
-      this.classForm = {
-        pkId: record.pkId,
-        name: record.name,
-        parent: gategoryId,
-        sort: record.sort
-      }
-      this.knowledgeShow = true
-    },
-    async handleOk() {
-      if(!this.classForm.name) {
-        this.$message.error("请输入分类名称");
-        return
-      }
-      if((this.chooseLevel == 2 || this.chooseLevel == 3) && !this.classForm.parent.length) {
-        this.$message.error("请选择上级分类");
-        return
-      }
-      this.saveLoading = true
-      let parentId = this.classForm.parent
-      let res = await this.api.save({...this.classForm, parent: parentId.length ? parentId.reverse()[0] : null})
-      if(res.code == 200) {
-        this.reloadTable()
-        this.handleCancel()
-        this.saveLoading = false
-      }
-    },
-    handleCancel() {
-      this.knowledgeShow = false
-      this.classForm = Object.assign({},this.$options.data().classForm)
-    },
-    handleJumpKnowledgeManage(record) {
-      this.$router.push({
-        path: '/knowledge/knowledgeManageList',
-        query: {pkId: record.pkId}
-      })
-    },
-     // 重新加载表格
-    reloadTable() {
-      this.$refs.classifyRef.loadData()
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-@gary:  #f8f8f8;
-@white: #fff;
-.rx-fit {
-  padding: 40px!important;
-  background: @gary;
-  .fit-header {
-    .mainContent {
-      width: 100%;
-      .body {
-        background: @white;
-        padding: 10px 20px;
-        .content {
-          background: @white;
-
-          button:first-child {
-            margin-right: 20px;
-          }
-
-          >button {
-            margin: 10px;
-            margin-left: 0;
-          }
-        }
-      }
-    }
-  }
-  .table-style {
-    padding: 20px;
-
-    .clearBtn {
-      background: none;
-      color: #3294F7;
-      text-shadow: none;
-      padding: 0px 6px;
-      border: none;
-      box-shadow: none;
-    }
-  }
-
-}
-.show-other{
-	width: 100%;
-	animation:show-other-search 0.8s;
-}
-
-@keyframes show-other-search{
-	0%{opacity:0;}
-  50%{opacity:0.8;}
-	100%{opacity: 1;}
-}
-
-</style>
-<style scoped>
-/deep/ .ant-table-row-expand-icon{
-  position: relative;
-    z-index: 100;
-}
-/deep/.ant-btn > .anticon + span {
-  margin-left: 0;
-}
- /deep/.ant-table-thead > tr > th {
-  text-align: center; 
-  height: 54px;
-}
-/deep/ .ant-table-tbody > tr > td {
-  height: 54px;
-}
-/deep/ .ant-form{
-  padding: 0;
-}
-/deep/ .gridContent{
-  border: none;
-}
-/deep/ .gridContent .ant-table-content .ant-table-tbody>tr>td:nth-child(2) {
-  padding-left: 60px!important;
-}
-</style>

vue.config.js

@@ -158,8 +158,8 @@ const vueConfig = {
             // target: 'http://10.5.100.64:5208',
             // target: 'http://10.5.100.230:9009',//服务器
             // target: 'http://www.hkcqjy.com.cn:8088',
-            target: 'http://192.168.0.185:7206',    // 张哲
-            //target: 'http://192.168.0.176:7206',//柳哥
+            // target: 'http://192.168.0.185:7206',    // 张哲
+            target: 'http://192.168.0.205:7206',//柳哥
             // target: 'http://10.5.0.233:9900',
             // target: 'http://10.5.100.64:9900',
             pathRewrite: { '^/api': '' },