知识资源接口

src/api/modules/knowledge.js

@@ -7,18 +7,210 @@ export const eventInterface = {
    * @returns 
    */
   getClassify: params => {
-    return http.get("/report_approve/flow/list",params)
-  }
-}
+    return http.get("/knowledge/classify/list",params)
+  },
+
+  /**
+   * 添加分类
+   * @param {*} params ClassifyName ParentId ResourceType
+   * @returns 
+   */
+  addClassify: params => {
+    return http.post("/knowledge/classify/add",params)
+  },
+
+  /**
+   * 编辑分类
+   * @param {*} params
+   *  ResourceType 
+   *  "ClassifyName": "分类3",
+      "ParentId": 0,
+      "ClassifyId": 6
+   * @returns 
+   */
+  editClassify: params => {
+    return http.post("/knowledge/classify/edit",params)
+  },
+
+  /**
+   * 移动分类
+   * @param {*} params 
+   * "ClassifyId": 3,
+    "PrevClassifyId": 0,
+    "NextClassifyId": 6
+    ResourceType
+   * @returns 
+   */
+  moveClassify: params => {
+    return http.post("/knowledge/classify/move",params)
+  },
+
+  /**
+   * 删除分类检测
+   * @param {*} params ClassifyId
+   * @returns 
+   */
+  delClassifyCheck: params => {
+    return http.get("/knowledge/classify/checkDelete",params)
+  },
+
+  /**
+   * 删除分类
+   * @param {*} params 
+   * ClassifyId
+   * @returns 
+   */
+  delClassify: params => {
+    return http.post("/knowledge/classify/delete",params)
+  },
 
-export const policyInterface = {
+  /**
+   * 事件列表
+   * @param {*} params 
+   * PageSize CurrentIndex ClassifyIds SysUserIds TagIds Keyword
+   * @returns 
+   */
+  getEventList: params => {
+    return http.get("/knowledge/resource/list",params)
+  },
 
-}
+  /**
+   * 新建事件
+   * @param {*} params 
+   * "ResourceType": 0,
+    "ClassifyId": 6,
+    "Title": "美联储",
+    "Content": "第二届“一带一路”国际合作高峰论坛",
+    "SourceFrom": "中华网",
+    "TagId": 0,
+    "StartTime": "2024-09-26 10:12:00",
+    "EndTime": "2024-09-30 10:12:00",
+    "FileUrl": ""
+   * @returns 
+   */
+  addEvent: params => {
+    return http.post('/knowledge/resource/add',params)
+  },
 
-export const pointInterface = {
+  /**
+   * 编辑事件
+   * @param {*} params 
+   * ResourceType
+   * "KnowledgeResourceId": 1,
+    "ClassifyId": 9,
+    "Title": "美联储22",
+    "Content": "00000第届“一带一路”国际合作高峰论坛",
+    "SourceFrom": "中华网11",
+    "TagId": 0,
+    "StartTime": "2024-09-26 10:12:00"
+   * @returns 
+   */
+  editEvent: params => {
+    return http.post('/knowledge/resource/edit',params) 
+  },
 
-}
+  /**
+   * 删除事件
+   * @param {*} params  KnowledgeResourceId ResourceType
+   * @returns 
+   */
+  delEvent: params => {
+    return http.post('/knowledge/resource/delete',params) 
+  },
 
-export const knowInterface = {
+  /**
+   * 获取事件详情
+   * @param {*} params KnowledgeResourceId ResourceType
+   * @returns 
+   */
+  getEventDetail: params => {
+    return http.get('/knowledge/resource/detail',params)
+  },
 
+  /**
+   * 标签列表
+   * @param {*} params 
+   *  ResourceType
+   * @returns 
+   */
+  getTagList: params => {
+    return http.get('/knowledge/tag/list',params)
+  },
+
+  /**
+   * 新增标签
+   * @param {*} params 
+   * TagName ResourceType
+   * @returns 
+   */
+  addTag: params => {
+    return http.post('/knowledge/tag/add',params)
+  },
+  /**
+   * 编辑标签
+   * @param {*} params 
+   * TagName ResourceType TagId
+   * @returns 
+   */
+  editTag: params => {
+    return http.post('/knowledge/tag/edit',params)
+  },
+  /**
+   * 删除标签
+   * @param {*} params 
+   * TagId ResourceType 
+   * @returns 
+   */
+  delTag: params => {
+    return http.post('/knowledge/tag/delete',params)
+  },
+
+  /**
+   * 删除标签
+   * @param {*} params 
+   * TagId ResourceType  PrevTagId NextTagId
+   * @returns 
+   */
+  moveTag: params => {
+    return http.post('/knowledge/tag/move',params)
+  },
+
+  /**
+   * 来源列表 
+   * @param {*} params Keyword ResourceType
+   * @returns 
+   */
+  getSourcesList: params => {
+    return http.get('/knowledge/resource/source_from',params)
+  },
+
+  /**
+   * 创建人列表
+   * @param {*} params 
+   * Keyword ResourceType=0
+   * @returns 
+   */
+  getUsersList: params => {
+    return http.get('/knowledge/resource/admins',params)
+  },
+
+  /**
+   * excel导入
+   * @param {*} params 
+   * EntryFile ResourceType
+   * @returns 
+   */
+  excelImportUpload: params => {
+    return http.post('/knowledge/resource/import_add',params)
+  },
+
+  /**
+   * 文件导入
+   * @param {*} params 
+   * ResourceType EntryFile
+   * @returns 
+   */
+  fileImportUpload: params => {
+    return http.post('/knowledge/resource/upload',params)
+  }
 }

src/routes/modules/knowledgeRoutes.js

@@ -42,10 +42,13 @@ export default [{
     },
     {
       path: "/knowledgeEdit",
-      name: "编辑事件",
+      name: "编辑",
       component: () => import('@/views/knowledge_manage/edit.vue'),
       meta:{
-        name_en:""
+        name_en:"",
+        pathFrom: "knowledge_event",
+        pathName: "事件库",
+        pathName_en:""
       },
     },
     {
@@ -53,7 +56,10 @@ export default [{
       name: "详情",
       component: () => import('@/views/knowledge_manage/edit.vue'),
       meta:{
-        name_en:""
+        name_en:"",
+        pathFrom: "knowledge_event",
+        pathName: "事件库",
+        pathName_en:""
       },
     },
     {
@@ -61,7 +67,10 @@ export default [{
       name: "标签管理",
       component: () => import('@/views/knowledge_manage/tagSetting.vue'),
       meta:{
-        name_en:""
+        name_en:"",
+        pathFrom: "knowledge_event",
+        pathName: "事件库",
+        pathName_en:""
       },
     },
 

src/utils/buttonConfig.js

@@ -917,7 +917,8 @@ const btnMap  = {
     approvePermission,
     outlinkConfigPermission,
     chartThemePermission,
-    toolBoxPermission
+    toolBoxPermission,
+    knowledgePermission
 }
 
 /**

src/views/knowledge_manage/components/classifyDia.vue

@@ -16,20 +16,19 @@
           ref="treeRef"
           class="classify-tree"
           :data="classifyOptions"
-          node-key="Id"
+          node-key="ClassifyId"
           :props="{
-            value: 'Id',
+            value: 'ClassifyId',
             label: 'ClassifyName',
-            children: 'Children',
+            children: 'Child',
           }"
           :expand-on-click-node="false"
           check-strictly
           empty-text="暂无分类"
-          :allow-drag="canDragHandle"
+          draggable
           :allow-drop="canDropHandle"
           @node-drop="dropOverHandle"
-          @node-drag-leave="dropMouseLeave"
-          @node-drag-enter="dropMouseOver"
+          @current-change="handleNodeChange"
         >
           <div class="custom-tree-node" slot-scope="{ node, data }">
             <span
@@ -38,7 +37,7 @@
               {{ data.ClassifyName  }}
             </span>
 
-            <div>
+            <div v-if="selectItem.ClassifyId===data.ClassifyId">
                 <img
 									src="~@/assets/img/data_m/move_ico.png"
 									class="handle-icon"
@@ -47,24 +46,28 @@
 								<img
 									src="~@/assets/img/set_m/add.png"
 									class="handle-icon"
-									@click.stop="hadnleAddNode(node, data)"
+									@click.stop="handleAddNode(data,node)"
 									v-if="node.level<3"
 								/>
 								<!-- 编辑目录 -->
 								<img
 									src="~@/assets/img/set_m/edit.png"
                   class="handle-icon"
-									style="width: 15px; height: 14px; margin-right: 8px"
-									@click.stop="handleEditNode(node, data)"
+									@click.stop="handleEditNode(data,node)"
 								/>
+                
 								<!-- 删除目录 -->
-								<img
-									slot="reference"
-									src="~@/assets/img/set_m/del.png"
-									class="handle-icon"
-									style="width: 14px; height: 14px"
-									@click.stop="handleRemoveNode(node, data)"
-								/>
+                <el-popconfirm
+                  title="确认删除该分类吗？"
+                  @confirm="handleRemoveNode"
+                >
+                  <img
+                    slot="reference"
+                    src="~@/assets/img/set_m/del_icon.png"
+                    class="handle-icon"
+                  />
+                </el-popconfirm>
+
             </div>
           </div>
         </el-tree>
@@ -100,6 +103,10 @@
           :model="classifyForm"
           :rules="formRules"
       >
+          <el-form-item label="上级分类" prop="parentClassifyId" v-if="classifyForm.parentClassifyId">
+              <span>{{classifyForm.parentName}}</span>
+          </el-form-item>
+          
           <el-form-item label="分类名称" prop="classifyName">
               <el-input
                 v-model="classifyForm.classifyName"
@@ -107,20 +114,7 @@
                 placeholder="请输入指标名称"
               />
           </el-form-item>
-          <el-form-item label="上级分类" prop="parentClassifyId">
-              <el-cascader
-                  :options="classifyOptions"
-                  v-model="classifyForm.parentClassifyId"
-                  :props="{
-                    value: 'Id',
-                    label: 'ClassifyName',
-                    children: 'Child'
-                  }"
-                  clearable
-                  placeholder="请选择上级分类"
-                  style="width:80%;"
-              ></el-cascader>
-          </el-form-item>
+         
       </el-form>
 
       <div class="btn-bottom">
@@ -133,11 +127,14 @@
 
 </template>
 <script>
-import { eventInterface,policyInterface,pointInterface,knowInterface } from '@/api/modules/knowledge';
+import { eventInterface } from '@/api/modules/knowledge';
 export default {
   props: {
     show: {
       type: Boolean
+    },
+    ResourceType: {
+      type: Number
     }
   },
   watch: {
@@ -148,6 +145,7 @@ export default {
   data() {
     return {
       classifyOptions: [],
+      selectItem:{},
 
       //编辑分类弹窗
       isClassifyEditDia:false,
@@ -163,69 +161,143 @@ export default {
   },
   methods:{
     async getClassify() {
-      
+      const res = await eventInterface.getClassify({
+        ResourceType: this.ResourceType
+      })
+      if(res.Ret !== 200) return
+
+      this.classifyOptions = res.Data.List
     },
 
     //添加
-    handleAddNode(data) {
-      if(data) {
-
-      }else { //一级目录
-        this.classifyForm = {
-          classifyName: '',
-          classifyId: 0,
-          parentClassifyId: 0,
-        }
+    handleAddNode(data,node) {
+      console.log(data,node)
+      this.classifyForm = {
+        classifyName: '',
+        classifyId: 0,
+        parentClassifyId: data?data.ClassifyId:0,
+        parentName: data?data.ClassifyName:''
       }
       this.isClassifyEditDia = true
     },
 
     //编辑
-    handleEditNode(data) {
+    handleEditNode(data,node) {
       this.classifyForm = {
-        classifyName: '',
-        classifyId: 0,
-        parentClassifyId: 0,
+        classifyName: data.ClassifyName,
+        classifyId: data.ClassifyId,
+        parentClassifyId: data.ParentId,
+        parentName: node.parent.data.ClassifyName
       }
       this.isClassifyEditDia = true
     },
 
     //删除
-    handleRemoveNode(data) {
-      this.$confirm(
-        '确定删除该分类吗？', 
-        '提示',
-        {
-        type: 'warning'
-      }).then(async() => {
+    async handleRemoveNode({ClassifyId}) {
+      const res = await eventInterface.delClassifyCheck({ClassifyId, ResourceType: this.ResourceType})
 
-      })
+      if(res.Ret !== 200) return
+      if(res.Data.Code!==0) return this.$message.warning(res.Data.Msg)
+
+      const delRes = await eventInterface.delClassify({ClassifyId, ResourceType: this.ResourceType})
+
+      if(delRes.Ret !== 200) return 
+      
+      this.$message.success('删除成功')
+      this.getClassify()
     },
 
+    handleNodeChange(data) {
+      this.selectItem = data;
+    },  
+
     //保存分类信息
     async handleSaveClassify() {
-      // const res = a
+      const { classifyName,parentClassifyId,classifyId } = this.classifyForm
+      let params = {
+        ResourceType: this.ResourceType,
+        ClassifyName: classifyName,
+        ParentId: parentClassifyId
+      }
+      const res = classifyId 
+        ? await eventInterface.editClassify({ ClassifyId: classifyId,...params })
+        : await eventInterface.addClassify(params)
+
+      if(res.Ret !==200) return 
+
+      this.$message.success(classifyId?'编辑成功':'新增成功')
+      this.getClassify()
+      this.isClassifyEditDia = false
     },
 
     cancelHandle() {
       this.$emit('update:show',false)
-    }
+    },
+
+    //拖动结束
+    async dropOverHandle(b,a,i,e) {
+        // 被拖拽节点对应的 Node、结束拖拽时最后进入的节点、被拖拽节点的放置位置
+        const classifyId=b.data.ClassifyId
+        let list=a.parent.childNodes;
+        let PrevClassifyId=0,NextClassifyId=0,targetIndex=0;
+        list.forEach((item,index) => {
+            if(item.data.ClassifyId===classifyId){
+                targetIndex=index
+            }
+        });
+        if(targetIndex===0){
+            NextClassifyId=list[1].data.ClassifyId
+        }else if(targetIndex===list.length-1){
+            PrevClassifyId=list[list.length-1].data.ClassifyId
+        }else{
+            PrevClassifyId=list[targetIndex-1].data.ClassifyId
+            NextClassifyId=list[targetIndex+1].data.ClassifyId
+        }
+
+        const params={
+            ClassifyId:classifyId,
+            PrevClassifyId,
+            NextClassifyId,
+            ResourceType: this.ResourceType
+        }
+        console.log(params);
+        const res = await eventInterface.moveClassify(params)
+
+        if(res.Ret!==200) return
+
+        this.$message.success('移动成功')
+        this.getClassify()
+    },
+
+    //控制同级拖动
+    canDropHandle(draggingNode, dropNode, type){
+      console.log(draggingNode, dropNode, type)
+        if(type==='inner') return false
+        if(draggingNode.level!==dropNode.level) return false
+        if(draggingNode.data.ParentId!=dropNode.data.ParentId) return false
+
+        return true
+    },
   },
 }
 </script>
 <style scoped lang='scss'>
   .main {
+    padding: 0 30px;
     .classify-tree {
       height: 50vh;
       min-height: 300px;
       overflow-y: auto;
       .custom-tree-node {
+        width: 100%;
         display: flex;
         justify-content: space-between;
         align-items: center;
       }
       .handle-icon {
-        width: 14px; height: 14px;
+        width: 16px;
+        height: 16px;
+        margin: 0 4px;
       }
     }
     .clasify-add-cont {

src/views/knowledge_manage/components/eventPreview.vue

@@ -0,0 +1,44 @@
+<template>
+  <div class="event-preview">
+
+    <iframe 
+      :src="fileUrl" 
+      frameborder="0" 
+      v-if="eventDetail.IsFile" 
+      width='100%' 
+      height='550' 
+    />
+
+    <div 
+      v-else
+      class="event-html" 
+      v-html="eventDetail.Content" 
+    ></div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    eventDetail: {
+      type: Object
+    }
+  },
+  computed: {
+    fileUrl() {
+      return `https://view.officeapps.live.com/op/view.aspx?src=${this.eventDetail.FileUrl}`
+    }
+  },
+  data() {
+    return {
+
+    }
+  },
+}
+</script>
+<style scoped lang='scss'>
+.event-preview {
+  .event-html {
+    white-space: pre-wrap;
+  }
+}
+</style>

src/views/knowledge_manage/components/importExcelDia.vue

@@ -10,7 +10,7 @@
     custom-class="dialog-cont"
     width="40%"
   >
-    <div slot="title" style="display: flex; alignitems: center">
+    <div slot="title" style="display: flex; align-items: center">
       <img
         :src="$icons.imp"
         style="color: #fff; width: 16px; height: 16px; margin-right: 5px"
@@ -38,18 +38,13 @@
         <h3>上传导入模板</h3>
         <el-upload
           class="upload-demo"
+          :http-request="handleSuccess"
           :before-upload="beforeUploadFile"
-          multiple
-          :limit="3"
-          :headers="headerConfig"
-          :on-success="handleSuccess"
           :on-progress="handleStarting"
-          :action="action"
-          accept=".xlsx"
-          :name="name"
           :show-file-list="false"
+          accept=".xlsx"
         >
-          <el-button type="primary" icon="el-icon-upload">{{$t('ManualEntryPage.tit_insert_data')}}</el-button>
+          <el-button type="primary" icon="el-icon-upload">导入数据</el-button>
         </el-upload>
       </div>
     </div>
@@ -76,6 +71,7 @@
 
 <script>
 import { dataInterence } from "api/api.js";
+import { eventInterface } from '@/api/modules/knowledge';
 import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
 export default {
   name: "",
@@ -84,6 +80,9 @@ export default {
     show: {
       type: Boolean,
     },
+    ResourceType: {
+      type: Number
+    }
   },
   computed: {
     temImg() {
@@ -99,22 +98,17 @@ export default {
   },
   data() {
     return {
-      action: process.env.VUE_APP_API_ROOT + "/entry/import/data", //上传文件
       downloadErrorlist:
         process.env.VUE_APP_API_ROOT +
-        "/entry/import/failList" +
-        `?${localStorage.getItem("auth")}`, //失败列表下载
-      name: "EntryFile",
+        "/knowledge/resource/download_fail" +
+        `?${localStorage.getItem("auth")}&ResourceType=${this.ResourceType}`, //失败列表下载
 
       templateList: [
         {
           name:/* "模板1"  */this.$t('ManualEntryPage.tem_msg',{index:1}),
-          url: process.env.VUE_APP_API_ROOT + "/entry/template?Source=1"
+          url: process.env.VUE_APP_API_ROOT + `/knowledge/resource/template?ResourceType=${this.ResourceType}&${localStorage.getItem("auth")}`
         }
       ],
-      headerConfig: {
-        Authorization: localStorage.getItem("auth"),
-      },
       isLoading: false,
 
       showImgViewer: false,
@@ -134,52 +128,51 @@ export default {
         return false;
       }
       if (size > 10) {
-        this.$message.warning(/* "文件大小不得超过10M" */this.$t('ManualEntryPage.upload_size_msg'));
+        this.$message.warning("文件大小不得超过10M");
         return false;
       }
     },
     handleStarting() {
       this.isLoading = true;
     },
-    // 上传成功之后
-    handleSuccess(result) {
-      //兼容下结构
-      let res = this.$parseData({
-        headers: {
-          dk: sessionStorage.getItem('dk')||""
-        },
-        data: result
-      });
-      if (res.Ret === 200) {
+    // 上传
+    async handleSuccess(e) {
+      let {file} = e;
+      
+      this.isLoading = true;
+      let formData = new FormData()
+      formData.append('EntryFile',file)
+      formData.append('ResourceType',this.ResourceType)
+      
+      const res = await eventInterface.excelImportUpload(formData)
+
+      this.isLoading = false;
+
+      if(res.Ret !== 200) return
         // 0成功 1部分失败 -1全部失败
-        let str = `
-						<h2 style="margin-bottom:30px">导入成功</h2>
-						<p> 本次共成功导入${res.Data.SuccessCount}条数据</p>
-					`;
-        if (res.Data.Status === 1) {
-          // this.$message.warning('部分导入失败')
-          str = `
-							<h2 style="margin-bottom:30px">部分导入失败</h2>
-							<p>${this.$t('ManualEntryPage.upload_tip_msg2',{success_count:res.Data.SuccessCount,fail_count:res.Data.FailCount})}</p>
-							<a style="display:inline;color:#5882EF;" href="${this.downloadErrorlist}" download>${this.$t('ManualEntryPage.down_fail_list2')}</a>
-						`;
-        } else if (res.Data.Status === -1) {
-          // this.$message.success("导入成功!");
-          str = `
-							<h2 style="margin-bottom:30px">导入失败！</h2>
-							<a style="display:inline;color:#5882EF;" href="${this.downloadErrorlist}" download>${this.$t('ManualEntryPage.down_fail_list2')}</a>
-						`;
-        }
-        this.$alert(str, "", {
-          dangerouslyUseHTMLString: true,
-          center: true,
-          showConfirmButton: false,
-        });
-        this.$emit("importSuccess");
-      } else {
-        this.$message.warning(res.Msg);
+      let str = `
+          <h2 style="margin-bottom:30px">导入成功</h2>
+          <p> 本次共成功导入${res.Data.SuccessCount}条数据</p>
+        `;
+      if (res.Data.Status === 1) {
+        str = `
+            <h2 style="margin-bottom:30px">部分导入失败</h2>
+            <p>${this.$t('ManualEntryPage.upload_tip_msg2',{success_count:res.Data.SuccessCount,fail_count:res.Data.FailCount})}</p>
+            <a style="display:inline;color:#5882EF;" href="${this.downloadErrorlist}" download>${this.$t('ManualEntryPage.down_fail_list2')}</a>
+          `;
+      } else if (res.Data.Status === -1) {
+        str = `
+            <h2 style="margin-bottom:30px">导入失败！</h2>
+            <a style="display:inline;color:#5882EF;" href="${this.downloadErrorlist}" download>${this.$t('ManualEntryPage.down_fail_list2')}</a>
+          `;
       }
-      this.isLoading = false;
+      this.$alert(str, "", {
+        dangerouslyUseHTMLString: true,
+        center: true,
+        showConfirmButton: false,
+      });
+      this.cancelHandle()
+      this.$emit("success");
     },
 
     handlePreviewImg() {

src/views/knowledge_manage/components/importFileDia.vue

@@ -0,0 +1,242 @@
+<template>
+   <el-dialog
+      :visible.sync="show"
+      :close-on-click-modal="false"
+      :modal-append-to-body="false"
+      @close="cancelHandle"
+      custom-class="knowledge-import-dialog"
+      top="10vh"
+      v-dialogDrag
+      title="事件信息"
+      width="650px"
+    >
+      <el-form
+        ref="formRef"
+        hide-required-asterisk
+        :model="eventForm"
+        :rules="formRules"
+        label-width="100px"
+      >
+        <el-form-item prop="title" label="标题">
+          <el-input 
+            v-model="eventForm.title" 
+            placeholder="请输入标题"
+            style="width:80%"
+          />
+        </el-form-item>
+        <el-form-item prop="classifyId" label="分类">
+          <el-cascader
+              :options="classifyOptions"
+              v-model="eventForm.classifyId"
+              :props="{
+                value: 'ClassifyId',
+                label: 'ClassifyName',
+                children: 'Child',
+                emitPath:false
+              }"
+              clearable
+              placeholder="请选择分类"
+              style="width:80%"
+          ></el-cascader>
+        </el-form-item>
+
+        <el-form-item prop="source" label="来源">
+          <el-select
+              v-model="eventForm.source"
+              placeholder="请选择来源"
+              size="medium"
+              clearable
+              style="width:80%"
+          >
+              <el-option 
+                v-for="item in sourcesOptions" 
+                :key="item"
+                :label="item" 
+                :value="item" 
+              />
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="tagId" label="标签">
+          <el-select
+              v-model="eventForm.tagId"
+              placeholder="请选择标签"
+              size="medium"
+              clearable
+              style="width:80%"
+          >
+              <el-option 
+                v-for="item in tagsOptions" 
+                :key="item.TagId"
+                :label="item.TagName" 
+                :value="item.TagId" 
+              />
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="startTime" label="开始时间">
+          <el-date-picker
+            v-model="eventForm.startTime"
+            :value-format="formatTime"
+            :format="formatTime"
+            :type="[2,3].includes(ResourceType)?'date':'datetime'"
+            placeholder="请选择开始时间"
+            style="width:80%"
+          />
+        </el-form-item>
+        <el-form-item prop="endTime" v-if="![2,3].includes(ResourceType)" label="结束时间">
+          <el-date-picker
+            v-model="eventForm.endTime"
+            :value-format="formatTime"
+            :format="formatTime"
+            :type="[2,3].includes(ResourceType)?'date':'datetime'"
+            placeholder="请选择结束时间"
+            style="width:80%"
+          />
+        </el-form-item>
+      </el-form>
+
+      <div class="btn-bottom">
+        <el-button type="primary" plain @click="cancelHandle">取消</el-button>
+        <el-button type="primary" @click="handleConfirmEvent">确定</el-button>
+      </div>
+  </el-dialog>  
+</template>
+<script>
+import { eventInterface } from '@/api/modules/knowledge';
+export default {
+  props: {
+    show: {
+      type: Boolean
+    },
+    ResourceType: {
+      type: Number
+    },
+    importFileUrl: {
+      type: String
+    }
+  },
+  computed: {
+    formatTime() {
+      return [2,3].includes(this.ResourceType) ? 'yyyy-MM-dd' : 'yyyy-MM-dd HH:mm:ss'
+    }
+  },
+  watch: {
+    show(nval) {
+      if(!nval) return 
+
+      this.getClassifyList();
+      this.getSourceList();
+      this.getTagsList();
+    }
+  },
+  data() {
+    return {
+      eventForm: {
+        title: '',
+        classifyId: 0,
+        source:'',
+        tagId:'',
+        startTime:'',
+        endTime:''
+      },
+      formRules:{
+        title:[
+          { required: true, message: '标题不能为空', trigger: 'blur' },
+        ],
+        classifyId:[
+          { required: true, message: '分类不能为空', trigger: 'blur' },
+        ],
+        source:[
+          { required: true, message: '来源不能为空', trigger: 'blur' },
+        ],
+        startTime:[
+          { required: true, message: '开始时间不能为空', trigger: 'blur' },
+        ],
+      },
+      
+      classifyOptions: [],
+      sourcesOptions:[],
+      tagsOptions:[],
+    }
+  },
+  mounted(){
+
+  },
+  methods:{
+    async getClassifyList() {
+      const res = await eventInterface.getClassify({
+        ResourceType: this.ResourceType
+      })
+      if(res.Ret !== 200) return
+
+      this.classifyOptions = res.Data.List || []
+    },
+
+    async getSourceList() {
+      const res = await eventInterface.getSourcesList({
+        ResourceType: this.ResourceType
+      })
+      if(res.Ret !== 200) return
+
+      this.sourcesOptions = res.Data.List || []
+    },
+
+    async getTagsList() {
+      const res = await eventInterface.getTagList({ResourceType:this.ResourceType})
+      if(res.Ret !== 200) return
+
+      this.tagsOptions=res.Data.List || []
+    },
+
+
+    async handleConfirmEvent() {
+      await this.$refs.formRef.validate()
+      
+      const { 
+        title,
+        classifyId,
+        source,
+        tagId,
+        startTime,
+        endTime
+      } = this.eventForm;
+      let params = {
+        ResourceType: this.ResourceType,
+        ClassifyId: classifyId,
+        Title: title,
+        Content: '',
+        SourceFrom: source,
+        TagId: tagId || 0,
+        StartTime: startTime,
+        EndTime: endTime || '',
+        FileUrl: this.importFileUrl
+      }
+      const res = await eventInterface.addEvent(params)
+
+      if(res.Ret !== 200) return 
+
+      this.$message.success('添加成功')
+
+      this.$emit('confirm')
+      this.cancelHandle()
+    },
+
+    cancelHandle() {
+      this.$refs.formRef.resetFields()
+      this.$emit('update:show',false)
+    }
+  },
+}
+</script>
+<style scoped lang='scss'>
+.el-form {
+  padding: 0 40px;
+}
+.btn-bottom {
+  display: flex;
+  justify-content: center;
+  margin: 30px 0;
+  .el-button {
+    width: 130px;
+  }
+}
+</style>

src/views/knowledge_manage/edit.vue

@@ -22,13 +22,13 @@
               :options="classifyOptions"
               v-model="eventForm.classifyId"
               :props="{
-                value: 'Id',
+                value: 'ClassifyId',
                 label: 'ClassifyName',
-                children: 'Child'
+                children: 'Child',
+                emitPath:false
               }"
               clearable
               placeholder="请选择分类"
-              style="width:100%;"
           ></el-cascader>
         </el-form-item>
 
@@ -38,7 +38,6 @@
               placeholder="请选择来源"
               size="medium"
               clearable
-              style="width:100%;"
           >
               <el-option 
                 v-for="item in sourcesOptions" 
@@ -48,21 +47,18 @@
               />
           </el-select>
         </el-form-item>
-        <el-form-item prop="tag">
+        <el-form-item prop="tagId">
           <el-select
-              v-model="eventForm.tags"
+              v-model="eventForm.tagId"
               placeholder="请选择标签"
               size="medium"
               clearable
-              style="width:100%;"
-              multiple
-              @change="filterChange"
           >
               <el-option 
                 v-for="item in tagsOptions" 
-                :key="item"
-                :label="item" 
-                :value="item" 
+                :key="item.TagId"
+                :label="item.TagName" 
+                :value="item.TagId" 
               />
           </el-select>
         </el-form-item>
@@ -70,68 +66,240 @@
           <label>开始时间</label>
           <el-date-picker
             v-model="eventForm.startTime"
-            type="datetime"
+            :value-format="formatTime"
+            :format="formatTime"
+            :type="[2,3].includes(ResourceType)?'date':'datetime'"
             placeholder="请选择开始时间"
           />
         </el-form-item>
-        <el-form-item prop="startTime">
+        <el-form-item prop="endTime" v-if="![2,3].includes(ResourceType)">
           <label>结束时间</label>
           <el-date-picker
             v-model="eventForm.endTime"
-            type="datetime"
+            :value-format="formatTime"
+            :format="formatTime"
+            :type="[2,3].includes(ResourceType)?'date':'datetime'"
             placeholder="请选择结束时间"
           />
         </el-form-item>
-        
-        <el-form-item v-if="!isEdit">
-          <el-button type="primary" @click="handleSaveTarget">编辑</el-button>
-        </el-form-item>
+
       </el-form>
+
+      <el-button type="primary" @click="handleEdit" v-if="!isEdit">编辑</el-button>
     </header>
     <div class="main">
-      <template v-if="isEdit">
+      <!-- 编辑 -->
+      <template v-if="isEdit&&(!eventDetail||(eventDetail&&!eventDetail.IsFile))">
         <editor 
           ref="editorRef"
         />
 
         <div class="btn-bottom">
-          <el-button type="primary" plain @click="$router.replace({path: ''})">取消</el-button>
-          <el-button type="primary" @click="">确定</el-button>
+          <el-button type="primary" plain @click="handleBack">取消</el-button>
+          <el-button type="primary" @click="handleConfirmEvent">确定</el-button>
+        </div>
+      </template>
+
+      <!-- 详情 -->
+      <template v-if="!isEdit || (eventDetail&&eventDetail.IsFile)">
+        <eventPreview
+          :eventDetail="eventDetail||{}"
+        />
+
+        <div class="btn-bottom" v-if="isEdit&&eventDetail.IsFile">
+          <el-button type="primary" plain @click="handleBack">取消</el-button>
+          <el-button type="primary" @click="handleConfirmEvent">确定</el-button>
         </div>
       </template>
     </div>
   </div>
 </template>
 <script>
+import { eventInterface } from '@/api/modules/knowledge';
 import editor from '@/views/semantics_manage/summery/components/editor.vue';
+import eventPreview from './components/eventPreview.vue';
 export default {
-  components: { editor },
+  components: { editor,eventPreview },
   computed: {
     isEdit() {
       return this.$route.path==='/knowledgeEdit'
+    },
+    currentPath() {
+      const pathMap = {
+        0:'/knowledge_event',
+        1:'/knowledge_policy',
+        2:'/knowledge_viewpoint',
+        3:'/knowledge_know',
+      }
+
+      return pathMap[this.ResourceType] && pathMap[this.ResourceType]
+    },
+    formatTime() {
+      return [2,3].includes(this.ResourceType) ? 'yyyy-MM-dd' : 'yyyy-MM-dd HH:mm:ss'
     }
   },
   data() {
     return {
+      ResourceType: Number(this.$route.query.source),
+      id: Number(this.$route.query.id),
+      eventDetail: null,
       eventForm: {
         title: '',
         classifyId: 0,
         source:'',
-        tags:[],
+        tagId:'',
         startTime:'',
         endTime:''
       },
-      formRules:[],
-
+      formRules:{
+        title:[
+          { required: true, message: '标题不能为空', trigger: 'blur' },
+        ],
+        classifyId:[
+          { required: true, message: '分类不能为空', trigger: 'blur' },
+        ],
+        source:[
+          { required: true, message: '来源不能为空', trigger: 'blur' },
+        ],
+        startTime:[
+          { required: true, message: '开始时间不能为空', trigger: 'blur' },
+        ],
+      },
+      
+      classifyOptions:[],
       sourcesOptions:[],
       tagsOptions:[],
     }
   },
+  beforeRouteEnter(to,from,next) {
+    
+    if(to.query.source){
+      let pathMap = {
+        0: { name: '事件库',path:'knowledge_event' },
+        1: { name: '政策库',path:'knowledge_policy' },
+        2: { name: '观点库',path:'knowledge_viewpoint' },
+        3: { name: '知识库',path:'knowledge_know' },
+      }
+      to.meta.pathFrom=pathMap[to.query.source].path;
+      to.meta.pathName=pathMap[to.query.source].name;
+    }
+    next()
+
+  },
   mounted(){
+    this.getClassifyList()
+    this.getSourceList()
+    this.getTagsList()
 
+    this.id && this.getEventDetail()
   },
   methods:{
 
+    async getClassifyList() {
+      const res = await eventInterface.getClassify({
+        ResourceType: this.ResourceType
+      })
+      if(res.Ret !== 200) return
+
+      this.classifyOptions = res.Data.List || []
+    },
+
+    async getSourceList() {
+      const res = await eventInterface.getSourcesList({
+        ResourceType: this.ResourceType
+      })
+      if(res.Ret !== 200) return
+
+      this.sourcesOptions = res.Data.List || []
+    },
+
+    async getTagsList() {
+      const res = await eventInterface.getTagList({ResourceType:this.ResourceType})
+      if(res.Ret !== 200) return
+
+      this.tagsOptions=res.Data.List || []
+    },
+
+    async getEventDetail() {
+      const res = await eventInterface.getEventDetail({
+        ResourceType: this.ResourceType,
+        KnowledgeResourceId: this.id
+      })
+
+      if(res.Ret !== 200) return
+      this.eventDetail = {
+        ...res.Data,
+        StartTime: res.Data.StartTime 
+          ? this.$moment(res.Data.StartTime).format([2,3].includes(this.ResourceType)?'YYYY-MM-DD':'YYYY-MM-DD HH:mm:ss') 
+          : '',
+        EndTime:res.Data.EndTime 
+          ? this.$moment(res.Data.EndTime).format([2,3].includes(this.ResourceType)?'YYYY-MM-DD':'YYYY-MM-DD HH:mm:ss') 
+          : '',
+      };
+      this.eventForm = {
+        title: this.eventDetail.Title,
+        classifyId: this.eventDetail.ClassifyId,
+        source: this.eventDetail.SourceFrom,
+        tagId: this.eventDetail.TagId||'',
+        startTime: this.eventDetail.StartTime,
+        endTime:this.eventDetail.EndTime
+      }
+      
+      this.$refs.editorRef&&this.$refs.editorRef.initData(this.eventDetail.Content)
+    },
+
+    async handleConfirmEvent() {
+      await this.$refs.formRef.validate()
+      const { 
+        title,
+        classifyId,
+        source,
+        tagId,
+        startTime,
+        endTime
+      } = this.eventForm;
+      let params = {
+        ResourceType: this.ResourceType,
+        ClassifyId: classifyId,
+        Title: title,
+        Content: this.$refs.editorRef?this.$refs.editorRef.content:'',
+        SourceFrom: source,
+        TagId: tagId || 0,
+        StartTime: startTime,
+        EndTime: endTime || '',
+        FileUrl: this.eventDetail?this.eventDetail.FileUrl:''
+      }
+      const res = this.id
+        ? await eventInterface.editEvent({
+          ...params,
+          KnowledgeResourceId: this.id
+        })
+        : await eventInterface.addEvent(params)
+
+      if(res.Ret !== 200) return 
+
+      this.$message.success(this.id?'编辑成功':'添加成功')
+      
+      this.$router.replace({
+        path: this.currentPath
+      })
+    },
+
+    handleBack() {
+      this.$router.replace({
+        path: this.currentPath
+      })
+    },
+
+    handleEdit() {
+      this.$router.push({
+        path:'/knowledgeEdit',
+        query: {
+          id: this.id,
+          source: this.ResourceType
+        }
+      })
+    }
   },
 }
 </script>
@@ -146,6 +314,14 @@ export default {
       border: 1px solid #C8CDD9;
       border-radius: 4px;
     }
+    header {
+      display: flex;
+      justify-content: space-between;
+      flex-wrap: wrap;
+      .el-button {
+        width: 130px;
+      }
+    }
     .main {
       flex: 1;
       margin-top: 20px;
@@ -167,5 +343,8 @@ export default {
     .fr-element {
       height: calc(100vh - 500px);
     }
+    #froala-editor-documentContent {
+      display: none !important;
+    }
   }
 </style>

src/views/knowledge_manage/list.vue

@@ -2,19 +2,35 @@
   <div class="knowledge-box">
       <header>
         <div class="left-filter">
-          <el-button type="primary" @click="$router.push({path:'/knowledgeEdit'})">添加事件</el-button>
+          <el-button 
+            type="primary" 
+            @click="$router.push({path:'/knowledgeEdit',query: { source: ResourceType }})"
+            v-if="checkBtnAuth('add')"
+          >添加{{ titlePath }}</el-button>
           <el-dropdown 
             split-button
             type="primary" 
             @click="isImportExcelDia=true"
+            v-if="checkBtnAuth('import')"
+            @command="handleImport"
           >
             Excel导入
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="file">文件导入</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <el-button type="primary" plain @click="isOpenClassifyDia=true">分类管理</el-button>
-          <el-button type="primary" plain @click="handleGoTagSet">标签管理</el-button>
+          <el-button 
+            type="primary" 
+            plain 
+            @click="isOpenClassifyDia=true"
+            v-if="checkBtnAuth('classifyEdit')"
+          >分类管理</el-button>
+          <el-button 
+            type="primary" 
+            plain 
+            @click="handleGoTagSet"
+            v-if="checkBtnAuth('tagEdit')"
+          >标签管理</el-button>
         </div>
 
         <div class="right-filter">
@@ -29,17 +45,20 @@
               <div class="select-wrap">
                   <div class="select-top">
                     <h4>筛选条件</h4>
-                    <span><i class="el-icon-delete"/>清空所选条件</span>
+                    <span @click="handleClearFilter"><i class="el-icon-delete"/>清空所选条件</span>
                   </div>
                   <div class="select-item">
                     <el-cascader
-                        :options="classifyOptions"
                         v-model="filterForm.classifys"
+                        :options="classifyOptions"
                         :props="{
-                          value: 'Id',
+                          value: 'ClassifyId',
                           label: 'ClassifyName',
-                          children: 'Child'
+                          children: 'Child',
+                          emitPath:false,
+                          multiple:true,
                         }"
+                        :show-all-levels="false"
                         clearable
                         placeholder="请选择分类"
                         style="width:100%;"
@@ -48,11 +67,12 @@
                   </div>
                   <div class="select-item">
                       <el-select
-                          v-model="filterForm.source"
+                          v-model="filterForm.sources"
                           placeholder="请选择来源"
                           size="medium"
                           clearable
                           style="width:100%;"
+                          multiple
                           @change="filterChange"
                       >
                           <el-option 
@@ -76,33 +96,46 @@
                       >
                           <el-option 
                             v-for="item in tagsOptions" 
-                            :key="item"
-                            :label="item" 
-                            :value="item" 
+                            :key="item.TagId"
+                            :label="item.TagName" 
+                            :value="item.TagId" 
                           />
                       </el-select>
                   </div>
                   <div class="select-item">
-                      <el-cascader
-                          @change="filterChange"
-                          :options="usersOptions"
+                      <el-select
                           v-model="filterForm.users"
+                          placeholder="请选择用户"
+                          size="medium"
                           clearable
-                          placeholder="请选择添加人"
                           style="width:100%;"
-                      ></el-cascader>
+                          multiple
+                          @change="filterChange"
+                      >
+                          <el-option 
+                            v-for="item in usersOptions" 
+                            :key="item.AdminId"
+                            :label="item.AdminRealName" 
+                            :value="item.AdminId" 
+                          />
+                      </el-select>
                   </div>
+
+                  <!-- <div class="select-bot">
+                    <el-button type="primary" plain>取消</el-button>
+                    <el-button type="primary">确认</el-button>
+                  </div> -->
               </div>
               <div class="select-btn" slot="reference">
                   <img src="~@/assets/icons/filter.svg">
+                  <span class="select-num">{{selectNum}}</span>
                   <span>筛选条件</span>
-                  <span class="select-num">+{{selectNum}}</span>
               </div>
           </el-popover>
 
           <el-input
             @input="filterChange"
-            placeholder="名称"
+            placeholder="标题名称"
             v-model="filterForm.keyWord"
             clearable
             style="width:300px"
@@ -135,7 +168,6 @@
           <el-table-column
             :label="$t('Table.column_operations')"
             align="center"
-            v-if="!isRise"
           >
             <template slot-scope="{row}">
               <div>
@@ -160,44 +192,79 @@
         </div>
       </div>
 
+      <input type="file" @change="fileSelectedImport" id="file"  style="display: none;">
+
       <!-- 分类管理弹窗 -->
       <classifyDia
         :show.sync="isOpenClassifyDia"
+        :ResourceType="ResourceType"
       />
 
       <!-- 导入excel弹窗 -->
       <importExcelDia
         :show.sync="isImportExcelDia"
+        :ResourceType="ResourceType"
+        @success="getTableData"
+      />
+      
+      <!-- 导入文件信息弹窗 -->
+      <importFileDia
+        :show.sync="isImportFileDia"
+        :importFileUrl="importFileUrl"
+        :ResourceType="ResourceType"
+        @confirm="getTableData"
       />
   </div>
 </template>
 <script>
-import { eventInterface,policyInterface,pointInterface,knowInterface } from '@/api/modules/knowledge';
+import { eventInterface } from '@/api/modules/knowledge';
 import classifyDia from './components/classifyDia.vue'
 import importExcelDia from './components/importExcelDia.vue';
+import importFileDia from './components/importFileDia.vue';
 import mPage from '@/components/mPage.vue'
 export default {
-  components: { mPage,classifyDia,importExcelDia },
+  components: { mPage,classifyDia,importExcelDia,importFileDia },
   computed: {
-    api() {
+    ResourceType() {
       const apiMap = {
-        '/knowledge_event': eventInterface,
-        '/knowledge_policy': policyInterface,
-        '/knowledge_viewpoint': pointInterface,
-        '/knowledge_know': knowInterface,
+        '/knowledge_event': 0,
+        '/knowledge_policy': 1,
+        '/knowledge_viewpoint': 2,
+        '/knowledge_know': 3,
       }
 
       return apiMap[this.$route.path] && apiMap[this.$route.path]
     },
+    titlePath() {
+      const titleMap = {
+        '/knowledge_event': '事件',
+        '/knowledge_policy': '政策',
+        '/knowledge_viewpoint': '观点',
+        '/knowledge_know': '知识',
+      }
+
+      return titleMap[this.$route.path] && titleMap[this.$route.path]
+    },
     tableColums() {
       return [
-        { label: '开始时间',key: 'Createtime' },
+        { label: '开始时间',key: 'CreateTime' },
         { label: '标题',key: 'Title',minwidthsty:'150px' },
-        { label: '来源',key: 'Source' },
-        { label: '分类',key: 'ClassifyName' },
-        { label: '标签',key: 'Tag' },
-        { label: '添加人',key: 'Creator' },
+        { label: '来源',key: 'SourceFrom' },
+        { label: '分类',key: 'ClassifyFullName' },
+        { label: '标签',key: 'TagName' },
+        { label: '添加人',key: 'AdminRealName' },
       ]
+    },
+
+    selectNum() {
+      let num = 0;
+
+      this.filterForm.classifys.length && num++;
+      this.filterForm.sources.length && num++;
+      this.filterForm.tags.length && num++;
+      this.filterForm.users.length && num++;
+
+      return num
     }
   },
   data() {
@@ -205,8 +272,8 @@ export default {
       filterForm: {
         pageNo: 1,
         pageSize:15,
-        classsifys: [],
-        source: '',
+        classifys: [],
+        sources: [],
         tags: [],
         users: [],
         keyWord:"",
@@ -216,26 +283,83 @@ export default {
       tagsOptions:[],
       usersOptions:[],
       total: 0,
-      tableData: [
-        {Title: 'dwdw',Source:'wind',ClassifyName:'分类1、分类2',Createtime:'2024/9/25',Tag:'多空',Creator:'DW'},
-        {Title: 'dwdw',Source:'wind',ClassifyName:'分类1、分类2',Createtime:'2024/9/25',Tag:'多空',Creator:'DW'},
-        {Title: 'dwdw',Source:'wind',ClassifyName:'分类1、分类2',Createtime:'2024/9/25',Tag:'多空',Creator:'DW'},
-        {Title: 'dwdw',Source:'wind',ClassifyName:'分类1、分类2',Createtime:'2024/9/25',Tag:'多空',Creator:'DW'},
-      ],
+      tableData: [],
 
       //分类弹窗
       isOpenClassifyDia: false,
       
       //excel导入弹窗
       isImportExcelDia: false,
+
+      //文件导入弹窗
+      isImportFileDia: false,
+      importFileUrl:''
     }
   },
   mounted(){
-
+    this.getClassifyOptions();
+    this.getSourceOptions();
+    this.getTagOptions()
+    this.getUsersOptions()
+    this.getTableData()
   },
   methods:{
+    async getClassifyOptions() {
+      const res = await eventInterface.getClassify({
+        ResourceType: this.ResourceType
+      })
+      if(res.Ret !== 200) return
+
+      this.classifyOptions = res.Data.List || []
+    },
+
+    async getSourceOptions() {
+      const res = await eventInterface.getSourcesList({
+        ResourceType: this.ResourceType
+      })
+      if(res.Ret !== 200) return
+
+      this.sourcesOptions = res.Data.List || []
+    },
+    async getTagOptions() {
+      const res = await eventInterface.getTagList({ResourceType:this.ResourceType})
+      if(res.Ret !== 200) return
+
+      this.tagsOptions=res.Data.List || []
+    },
+
+    async getUsersOptions() {
+      const res = await eventInterface.getUsersList({ ResourceType:this.ResourceType })
+      if(res.Ret !== 200) return
+
+      this.usersOptions=res.Data.List || []
+    },
+
+
     async getTableData() {
+      const { pageNo,
+        pageSize,
+        classifys,
+        sources,
+        tags,
+        users,
+        keyWord } = this.filterForm;
+      let params = {
+        PageSize:pageSize,
+        CurrentIndex:pageNo,
+        ClassifyIds:classifys.join(','),
+        SysUserIds:users.join(','),
+        TagIds:tags.join(','),
+        Keyword:keyWord,
+        SourceFrom: sources.join(','),
+        ResourceType: this.ResourceType
+      }
+      const res = await eventInterface.getEventList(params)
+
+      if(res.Ret !==200 ) return 
 
+      this.tableData = res.Data.List||[]
+      this.total = res.Data.Paging.Totals
     },
 
     filterChange() {
@@ -248,35 +372,92 @@ export default {
       this.getTableData()
     },
 
+    handleClearFilter() {
+      this.filterForm.classifys = []
+      this.filterForm.sources = []
+      this.filterForm.tags = []
+      this.filterForm.users = []
+      this.filterChange()
+    },
+
     lookDetailHandle(item,type) {
       const { href } = this.$router.resolve({
         path: type==='look'?'/knowledgeDetail':'/knowledgeEdit',
         query: {
-          id: item.id
+          id: item.KnowledgeResourceId,
+          source: this.ResourceType
         }
       }) 
 
       window.open(href,'_blank')
     },
 
-    handleDelItem(item) {
+    handleDelItem({KnowledgeResourceId}) {
       this.$confirm(
         '确定删除该事件吗？', 
         '提示',
         {
         type: 'warning'
       }).then(async() => {
+        const res = await eventInterface.delEvent({
+          KnowledgeResourceId,
+          ResourceType: this.ResourceType
+        })
 
+        if(res.Ret !==200) return 
+        this.$message.success('删除成功')
+        this.getTableData()
       })
     },
 
     handleGoTagSet() {
       this.$router.push({
         path: '/knowledge_tag',
+        query: {
+          source: this.ResourceType
+        }
       })
     },
 
+
+    handleImport(type) {
+      if(type === 'file') {
+        $(`#file`).click()
+      }
+    },
+    //选择文件上传
+    async fileSelectedImport(){ 
+      let file = document.getElementById('file').files[0];
+      let reg = new RegExp(/\.pdf|\.docx|\.pptx|\.ppt$/,'i')
+
+      if(file){
+        if(!reg.test(file.name)) return this.$message.warning('只能上传pdf/docx/ppt等文件');
+        if(file.size > 5.1*1024*1024) return this.$message.warning("上传文件大小不超过50MB");
+
+        let downloadHint = this.$message({
+            type:"info",
+            message:'上传中，请稍后······',
+            duration:0,
+            iconClass:'el-icon-loading'
+        })
+
+        let formData = new FormData()
+        formData.append('File',file)
+        formData.append('ResourceType',this.ResourceType)
+
+        const res = await eventInterface.fileImportUpload(formData)
+
+        downloadHint.close()
+        if(res.Ret !== 200) return
+
+        this.importFileUrl = res.Data.FileUrl
+        
+        this.isImportFileDia = true;
+      } 
+		},
+
     checkBtnAuth(key) {
+      const {isShowBtn}=this.permissionBtn
        const authMap = {
         '/knowledge_event': 'event',
         '/knowledge_policy': 'policy',
@@ -284,7 +465,9 @@ export default {
         '/knowledge_know': 'know',
       }
 
-      return true
+      let permission_prefix = authMap[this.$route.path]&&authMap[this.$route.path]
+
+      return isShowBtn('knowledgePermission',`${permission_prefix}_${key}`)
     }
   },
 }
@@ -343,6 +526,14 @@ export default {
   .select-item{
       margin-top:20px;
   }
+  .select-bot {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+    .el-button{
+      width: 120px;
+    }
+  }
 }
 </style>
 <style lang="scss">

src/views/knowledge_manage/tagSetting.vue

@@ -9,9 +9,9 @@
         <div class="content-box">
             <el-tree
 			    :data="list"
-				node-key="ReportChapterTypeId"
+				node-key="TagId"
                 :props="{
-                    label: 'ReportChapterTypeName',
+                    label: 'TagName',
                     children: 'Child'
                 }"
 				check-strictly
@@ -25,7 +25,7 @@
 					slot-scope="{ data }"
 				>
                     <div>
-                        <span>{{data.ReportChapterTypeName}}</span>
+                        <span>{{data.TagName}}</span>
                     </div>
 					
                     <div class="opt-box">
@@ -52,9 +52,9 @@
         <div style="display: flex;align-items: center;justify-content: center;">
             <el-form :model="tagForm" label-width="auto" :rules="tagFormRules" ref="tagFormRef">
                 <!-- 名称 -->
-                <el-form-item label="标签名称" prop="ReportChapterTypeName">
+                <el-form-item label="标签名称" prop="TagName">
                     <el-input 
-                        v-model="tagForm.ReportChapterTypeName" 
+                        v-model="tagForm.TagName" 
                         style="width: 317px;" 
                         placeholder="请输入标签名称">
                     </el-input>
@@ -63,7 +63,7 @@
         </div>
         <div solt="footer" style="padding: 20px 0;text-align: center;">
             <el-button size="medium" style="width:130px;" @click="addDialogShow=false">{{ $t('Dialog.cancel_btn') }}</el-button>
-            <el-button type="primary" size="medium" style="margin-left: 16px;width:130px ;" @click="addChapterSave">{{ $t('Dialog.confirm_save_btn') }}</el-button>
+            <el-button type="primary" size="medium" style="margin-left: 16px;width:130px ;" @click="handleSaveEditTag">{{ $t('Dialog.confirm_save_btn') }}</el-button>
       </div>
     </el-dialog>
         
@@ -73,6 +73,7 @@
 <script>
 import mDialog from '@/components/mDialog.vue';
 import { getchapterTypeList,addChapterType,editChapterType,} from 'api/api.js';
+import { eventInterface } from '@/api/modules/knowledge';
 import {setChapterEnable,setChapterSort} from '@/api/modules/oldApi.js'
 export default {
     name:"tagSetting",
@@ -83,97 +84,99 @@ export default {
             // 添加/编辑弹窗
             addDialogShow:false,
             tagForm:{
-                ReportChapterTypeName:"",
-                id:0
+                TagName:"",
+                TagId:0
             },
-            parentClassifyName: '',
+            ResourceType: Number(this.$route.query.source),
 
             reportVarietyList:[],//中文品种列表
         }
     },
+    beforeRouteEnter(to,from,next) {
+    
+        if(to.query.source){
+            let pathMap = {
+                0: { name: '事件库',path:'knowledge_event' },
+                1: { name: '政策库',path:'knowledge_policy' },
+                2: { name: '观点库',path:'knowledge_viewpoint' },
+                3: { name: '知识库',path:'knowledge_know' },
+            }
+            to.meta.pathFrom=pathMap[to.query.source].path;
+            to.meta.pathName=pathMap[to.query.source].name;
+        }
+        next()
+
+    },
     mounted(){
-        this.parentClassifyName = this.$route.query.classifyName || ''
         this.getList()
     },
     methods: {
-        getList(type){
-            getchapterTypeList({ClassifyId:198}).then(res=>{
-                if(res.Ret == 200){
-                    this.list=res.Data.List || []
-                }
-            })
+        async getList(){
+
+            const res = await eventInterface.getTagList({ResourceType:this.ResourceType})
+                if(res.Ret !== 200) return
+
+                this.list=res.Data.List || []
         },
 
         handleAddTag(){
             this.addDialogShow=true
             this.tagForm = {
-                ReportChapterTypeName:"",
-                id:0
+                TagName:"",
+                TagId:0
             }
         },
 
         handleEditTag(row){
-
             this.tagForm={
-                ReportChapterTypeName:row.ReportChapterTypeName,
-                ReportChapterTypeId:row.ReportChapterTypeId,
-                ChartPermissionIdList:row.ChartPermissionIdList||''
+                TagName:row.TagName,
+                TagId:row.TagId
             }
             this.addDialogShow=true
         },
 
 
-        handleDelTag() {
+        handleDelTag({TagId}) {
             this.$confirm(
                 '确定删除该标签吗？', 
                 '提示',
                 {
                 type: 'warning'
             }).then(async() => {
+                const res = await eventInterface.delTag({
+                    TagId,
+                    ResourceType:this.ResourceType
+                })
 
+                if(res.Ret !== 200) return 
+
+                this.$message.success('删除成功')
+                this.getList()
             })
         },
 
         // 保存
-        async addChapterSave(){
+        async handleSaveEditTag(){
             await this.$refs.tagFormRef.validate()
-                // 添加小程序是否显示参数 0显示，1隐藏
-                let params={
-                    ...this.tagForm,
-                    ClassifyId: Number(this.$route.query.id),
-                    ChartPermissionIdList:this.tagForm.ChartPermissionIdList||[]
-                }
-                // 请求方法
-                let requestMethod;
-                // console.log(params);
-                if(params.ReportChapterTypeId){
-                // 编辑
-                requestMethod=editChapterType
-                }else{
-                // 新增
-                requestMethod=addChapterType
-                }
-                requestMethod(params).then(res=>{
-                    if(res.Ret == 200){
-                        this.$message.success(
-                            params.ReportChapterTypeId
-                            ?this.$t('ReportManage.CategoryList.edit_section_successful')
-                            :this.$t('ReportManage.CategoryList.add_section_successful')
-                        )
-                        this.addDialogShow=false
-                        this.getList()
-                    }
-                })
-        },
+            // 添加小程序是否显示参数 0显示，1隐藏
+            let params={
+                ...this.tagForm,
+                ResourceType:this.ResourceType
+            }
 
+            const res = params.TagId
+                ? await eventInterface.editTag(params)
+                : await eventInterface.addTag(params)
 
-        filterNodes(arr) {
-            arr.length && arr.forEach(item => {
-                item.Child && item.Child.length && this.filterNodes(item.Child)
-                if((item.Child && !item.Child.length)) {
-                    delete item.Child
-                }
-            })
+            if(res.Ret !== 200) return
+
+            this.$message.success(
+                params.TagId
+                ?'编辑成功'
+                :'添加成功'
+            )
+            this.addDialogShow=false
+            this.getList()
         },
 
         //控制只能同级拖动
@@ -183,27 +186,24 @@ export default {
         },
 
         //拖动结束
-        dropOverHandle(b,a,i,e) {
+        async dropOverHandle(b,a,i,e) {
             // 被拖拽节点对应的 Node、结束拖拽时最后进入的节点、被拖拽节点的放置位置
-            const ReportChapterTypeId=b.data.ReportChapterTypeId
-            let index=this.list.findIndex(item=>item.ReportChapterTypeId===ReportChapterTypeId)
-            const PrevReportChapterTypeId=index==0?0:this.list[index-1].ReportChapterTypeId
-            const NextReportChapterTypeId=index==this.list.length-1?0:this.list[index+1].ReportChapterTypeId
+            const TagId=b.data.TagId
+            let index=this.list.findIndex(item=>item.TagId===TagId)
+            const PrevTagId=index==0?0:this.list[index-1].TagId
+            const NextTagId=index==this.list.length-1?0:this.list[index+1].TagId
 
             
             const params={
-                ReportChapterTypeId,
-                PrevReportChapterTypeId,
-                NextReportChapterTypeId
+                TagId,
+                PrevTagId,
+                NextTagId,
+                ResourceType:this.ResourceType
             }
-            console.log(params);
-            setChapterSort(params).then(res=>{
-                if(res.Ret===200){
-                    this.$message.success(this.$t('ReportManage.CategoryList.move_successful'))
-                }else{
-                    this.getList()
-                }
-            })
+            const res = await eventInterface.moveTag(params)
+
+            if(res.Ret!==200) return
+            this.$message.success('移动成功')
         },
         
     },