修改新增知识

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

@@ -31,9 +31,9 @@
             <div>点评量</div>
           </div>
         </div>
-        <div class="button-group" v-if="false">
-          <a-button style="background:#406CC4;color:#fff;margin-right: 1.14583vw;" @click="handleSaveClick">提交</a-button>
-          <a-button @click="$router.back()" style="color: #406CC4;border-color: #406CC4;">取消</a-button>
+        <div class="button-group" v-if="detailDataBase.actionFlag.indexOf('edit')>-1">
+          <a-button style="background:#406CC4;color:#fff;margin-right: 1.14583vw;" @click="changeEdite">编辑</a-button>
+          <a-button @click="$router.back()" style="color: #406CC4;border-color: #406CC4;display: none;">取消</a-button>
         </div>
       </div>
       <div class="userEnd">
@@ -48,7 +48,7 @@
         <div class="addTitleText">{{ titleData }}</div>
         <div class="button-groupAdd">
           <a-button style="background:#406CC4;color:#fff;margin-right: 1.25vw;" @click="handleSaveClick">提交</a-button>
-          <a-button @click="$router.back()" style="color: #406CC4;border-color: #406CC4;">取消</a-button>
+          <a-button @click="goBack" style="color: #406CC4;border-color: #406CC4;">取消</a-button>
         </div>
       </div>
       <a-form-model labelAlign="right" ref="knowledgeRef" :rules="knowledgeRules" :model="knowledgeForm" layout="inline" >
@@ -115,7 +115,7 @@
     </div>
     <div class="searchBoxContent" v-show="(tapAction==0)">
       <div class="DataBoxContent" style="position: relative;">
-        <a-input :disabled="!(isAdd)" @change='detailChange' class="detailBox" v-model="detailData" type="textarea" :autosize="{minRows: 10, maxRows: 26}" placeholder="请输入" >
+        <a-input maxLength="500" :disabled="!(isAdd)" @change='detailChange' class="detailBox" v-model="detailData" type="textarea" :autosize="{minRows: 10, maxRows: 26}" placeholder="请输入" >
         </a-input>
       </div>
     </div>
@@ -125,7 +125,7 @@
           <div class="albumBoxLeft">
             <a-button class="creatBtn" @click="addOpen" v-if="isAdd">创建目录</a-button>
             <div class="albumList" v-if="isAdd">
-              <div v-dragging="{item: item, list:albumArr}" :key="index" :draggable= "true" @click="changeCatalogue(index)" :class="albumIndex==index?'albumitem actionAlbum':'albumitem'" v-for="(item, index) in albumArr">
+              <div v-dragging="{item: item, list:albumArr}" :key="index" :draggable= "true" @click="changeCatalogue(index)" :class="albumPkId==item.pkId?'albumitem actionAlbum':'albumitem'" v-for="(item, index) in albumArr">
                 <div class="leftPoint"></div>
                 <div class="pointText">{{item.name}}</div>
                 <div class="albumitemBtn">
@@ -135,7 +135,7 @@
               </div>
             </div>
             <div class="albumList" v-else>
-              <div :key="index" @click="changeCatalogue(index)" :class="albumIndex==index?'albumitem actionAlbum':'albumitem'" v-for="(item, index) in albumArr">
+              <div :key="index" @click="changeCatalogue(index)" :class="albumPkId==item.pkId?'albumitem actionAlbum':'albumitem'" v-for="(item, index) in albumArr">
                 <div class="leftPoint0"></div>
                 <div class="pointText">{{item.name}}</div>
               </div>
@@ -218,7 +218,7 @@
               :confirmLoading="saveLoading">
       <a-form :model="catalogueForm" layout="inline" :label-col="{ span: 5 }">
         <a-form-item prop="name" style="margin-top:10px;" label="目录名称">
-          <a-input v-model="catalogueForm.name" placeholder="请输入" />
+          <a-input v-model="catalogueForm.name" placeholder="请输入" maxLength="20"/>
         </a-form-item>
         <a-form-item prop="solt" style="margin-top:10px;" label="排序">
           <a-input-number :min="1" v-model="catalogueForm.solt" placeholder="请输入" />
@@ -395,8 +395,8 @@ export default {
         {}
       ],
       albumArr:[
-
       ],
+      albumPkId:'',
       albumIndex:0,
       dataList:[],
       yelpPageNum:1,
@@ -432,6 +432,7 @@ export default {
       this.albumArr.forEach((item,index) => {
         item.solt=soltArr[index]
       })
+      //this.dataList = this.albumArr[this.albumIndex].dataList
       // 将排序后的结果重新赋值
       //this.albumArr = result.value.list;
     });
@@ -560,7 +561,7 @@ export default {
         this.approverData = res.data.flows
       })
       album.catalogue(getData).then((res) => {
-        res.data.forEach(item => {
+        res.data.forEach((item,index) => {
           item.contents.forEach(item => {
             item.categoryArr = item.category.split("|")
             item.titles = item.title
@@ -571,13 +572,25 @@ export default {
             }
           })
           item.dataList=item.contents
+          item.solt=index+1
         })
         this.albumArr = res.data
+        this.albumPkId = this.albumArr[this.albumIndex].pkId
         this.dataList = this.albumArr[this.albumIndex].dataList
         this.showDelete = this.albumArr[this.albumIndex].actionFlag.indexOf('delete')>-1
         //this.showDelete = true
       })
     },
+    changeEdite(){
+      this.isAdd = true
+    },
+    goBack(){
+      if(this.$route.query.isAdd==1){
+        this.$router.back()
+      }else{
+        this.isAdd = false
+      }
+    },
     //上传图片
     handleSaveClick(){
       //const hide = this.$message.loading('验证码发送中..', 0)
@@ -666,6 +679,7 @@ export default {
     },
     changeCatalogue(num){
       this.albumIndex = num
+      this.albumPkId = this.albumArr[this.albumIndex].pkId
       this.dataList = this.albumArr[this.albumIndex].dataList
     },
     titlesChange(){
@@ -725,6 +739,11 @@ export default {
       this.delVisible = true
     },
     addOpen(){
+      if(this.albumArr.length==0){
+        this.catalogueForm.solt = 1
+      }else{
+        this.catalogueForm.solt = Number(this.albumArr[this.albumArr.length-1].solt)+1
+      }
       this.catalogueShow = true
     },
     addDataOpen(){
@@ -759,9 +778,10 @@ export default {
       let pushEnd = false
       that.catalogueForm.dataList = []
       let catalogueForm = JSON.parse(JSON.stringify(that.catalogueForm))
+      catalogueForm.pkId = Date.parse(new Date())
       for (let index = 0; index < that.albumArr.length; index++) {
         let element = that.albumArr[index]
-        if(element.solt>catalogueForm.solt||element.solt==catalogueForm.solt){
+        if(element.solt>catalogueForm.solt){
           pushEnd = true
           that.albumArr.splice(index,0,catalogueForm)
           break;
@@ -771,6 +791,9 @@ export default {
       if(!pushEnd){
         that.albumArr.push(catalogueForm)
       }
+      if(that.albumArr.length==1){
+        that.albumPkId = that.albumArr[0].pkId
+      }
       that.catalogueShow=false
     },
     //知识分类转化
@@ -1115,7 +1138,7 @@ export default {
   margin-bottom: 2vw;
 }
 .tableBoxAlbum /deep/.ant-table-thead{
-  height: 3.69791vw;
+  height: 4.69791vw;
   font-size: 0.9375vw;
   color: #202124;
   background: #F9F9FA;

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

@@ -12,16 +12,19 @@
               <div @click="changeScope(1)">
                 <img src="../../../../image/album/my.png"/>
                 我的专辑
+                <div class="actionBoxRow" v-if="scope==1"></div>
               </div>
               <div @click="changeScope(2)">
                 <img src="../../../../image/album/all.png"/>
                 全部专辑
+                <div class="actionBoxRow" v-if="scope==2"></div>
               </div>
             </div>
-            <div class="boxRow" @click="changeScope(3)">
-              <div>
+            <div class="boxRow">
+              <div @click="changeScope(3)">
                 <img src="../../../../image/album/comment.png" style="width:1vw"/>
                 我的点评
+                <div class="actionBoxRow" v-if="scope==3"></div>
               </div>
               <div @click="goCreatData">
                 <img src="../../../../image/album/add.png"/>
@@ -159,6 +162,7 @@ export default {
     //删除end
     changeScope(num){
       this.scope = num
+      this.pageNum = 1
       this.getData()
     },
     //查询数据
@@ -205,7 +209,9 @@ export default {
     },
     //关闭所有分类
     clearAllLevel(){
-      this.showLevel1Num = -1
+      if(this.level2Action==-1){
+        this.showLevel1Num = -1
+      }
     },
     //选择分类1级
     selectLevel(num,pkId){
@@ -358,6 +364,7 @@ export default {
 .userBtns div{
   display: flex;
   align-items: center;
+  flex-wrap: wrap;
 }
 .userBtns div:last-child{
   margin-left: auto;
@@ -369,7 +376,8 @@ export default {
 .boxRow{
   width: 100%;
   display: flex;
-  margin-bottom: 1.25vw;
+  align-items: baseline!important;
+  height: 2.7vw;
 }
 .boxRow div{
   font-size: 0.9375vw;
@@ -389,5 +397,10 @@ export default {
 .classifyRightAction{
   transform: rotate(0deg);
 }
-
+.actionBoxRow{
+  background: #406cc4;
+  height: 3px;
+  width: 70%;
+  margin-top: 4px;
+}
 </style>

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

@@ -6,12 +6,15 @@
         <p class="userMidleNum"><span>上传文件数量</span><span>{{ dataDetail.contentTotal }}</span></p>
       </div>
     </div>
-    <div class="tabBoxContent">
+    <div class="tabBoxContent" style="display: none;">
       <div v-for="(item, index) in dataDetail.routes" :key="index" @click="changeAction(index)">
-        <span>{{item.name}}{{ item.state==0?'(未完成)':'(已完成)' }}</span>
+        <span>{{item.name.length>5?item.name.substr(0,5)+'...':item.name}}{{ item.state==0?'(未完成)':'(已完成)' }}</span>
         <img v-if="tapAction==index" src="../../../../image/tabAction.png"/>
       </div>
     </div>
+    <a-tabs default-active-key="1" @change="changeAction" class="tabBoxContent">
+      <a-tab-pane :key="index" :tab="item.state==0?item.name+'(未完成)':item.name+'(已完成)'" v-for="(item, index) in dataDetail.routes"></a-tab-pane>
+    </a-tabs>
     <div class="searchBoxContent">
       <div class="noDataBox" v-if="dataList.length==0">
         <img src="../../../../image/noDataNew.png" class="noData"/>
@@ -187,14 +190,43 @@ export default {
   font-size:1.14vw;
 }
 .tabBoxContent{
-  display: flow-root;
+  display: flex;
   width: 78.12vw;
   margin: 0px 10.94vw;
   background: #fff;
   margin-top: 1.25vw;
-  border-bottom: 1px solid #EEEEEE;
   border-top-left-radius: 10px;
   border-top-right-radius: 10px;
+  height: 4.6875vw;
+}
+.tabBoxContent /deep/.ant-tabs-nav-wrap{
+  height: 4.6875vw;
+}
+.tabBoxContent /deep/.ant-tabs-tab{
+  color: #202124;
+  font-size: 0.9375vw;
+  padding-top: 1.5625vw;
+  padding-bottom: 1.8vw;
+  font-weight: 500;
+}
+.tabBoxContent /deep/.ant-tabs-content{
+  display: none;
+}
+.tabBoxContent /deep/.ant-tabs-tab-prev-icon-target{
+  font-size: 1.2vw;
+}
+.tabBoxContent /deep/.ant-tabs-tab-next-icon-target{
+  font-size: 1.2vw;
+}
+.tabBoxContent /deep/.ant-tabs-tab-active{
+  border: none;
+}
+.tabBoxContent /deep/.ant-tabs-ink-bar{
+  background: url(../../../../image/tabAction.png);
+  background-size:4.6vw;
+  background-repeat: no-repeat;
+  height: 0.442vw;
+  background-position:center center
 }
 .tabBoxContent div{
   width: 9.8vw;

src/views/modules/knowledge/warehouse/knowledgeAddUpdate.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="page">
     <div class="content">
-      <div class="title">新增知识</div>
+      <div class="title">{{this.knowledgeForm.bastype==1?'新增文档知识':this.knowledgeForm.bastype==2?'新增维基知识':'新增知识'}}</div>
       <a-form-model ref="knowledgeRef" :rules="knowledgeRules" :model="knowledgeForm" layout="inline" >
         <a-form-model-item class="knowledgeAddUpdateLabel oneline" label="所选分类:" prop="categoryId" style="font-size:0.93vw">
           <a-cascader v-model="knowledgeForm.categoryId" 
@@ -15,7 +15,7 @@
             <a-icon slot="suffixIcon" type="caret-down" class="classifyIconBox"/>
           </a-cascader>
         </a-form-model-item>
-        <a-form-model-item class="knowledgeAddUpdateLabel oneline" label="知识类型:" prop="type" style="margin-top: -5px;">
+        <a-form-model-item v-if="!this.knowledgeForm.bastype" class="knowledgeAddUpdateLabel oneline" label="知识类型:" prop="type" style="margin-top: -5px;">
           <a-select class="addItemBox" v-model="knowledgeForm.type" placeholder="请选择" :disabled="!!this.knowledgeForm.bastype">
             <a-icon slot="suffixIcon" type="caret-down" style="font-size: 1vw;"/>
             <a-select-option class="dropdownClassli" v-for="(item,index) in knowledgeList" :key="index" :value="item.value">