Merge branch 'master' into eta1.7.6

README.md

@@ -7,15 +7,10 @@
 
 ### branch
 - master  debug  sandbox
-
-### pack
-- 在static/下新建base_config.js
-- base_config.js用于导出正式环境加密用的key，`window.key='对应环境的密钥'`
-- 在index.html中引入
-- 在src/api/crypto.js中，将key替换成window.key
-- 打包完成后，发布不同环境，只需要更改base_config.js中的密钥
+- custom 客户主分支 每周五将要给客户发版的代码合并到此分支上，
+    如果有要临时给客户发版的内容从此分支拉取代码再进行修改。
 
 ### link
 - http://8.136.199.33:7778 弘则测试
 - https://eta.hzinsights.com 弘则正式
-- https://exptest.hzinsights.com 试用平台
+- https://exptest.hzinsights.com 试用平台

config/index.js

@@ -36,6 +36,13 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable:{
+    '/voice':{
+      target: "http://localhost:3003",
+      changeOrigin:true, // 如果接口跨域，需要进行这个参数配置
+      pathRewrite:{
+        '^/voice':'/voice'
+      }
+    },
 		'/adminapi': {
       target: "http://8.136.199.33:7778",
       // target: "http://192.168.77.7:8606",

src/api/modules/classifyApi.js

@@ -14,4 +14,14 @@ export const classifyPermissionInterface={
      editClassifyPermission:params=>{
 	    return http.post('/classify/permission/edit',params)
 	},
+
+	// 拖动排序
+	moveSort:params=>{
+		return http.post('/classify/move',params)
+	},
+
+	//启用\禁用
+	enableSet:params=>{
+		return http.post('/classify/enabled/set',params)
+	},
 }

src/api/modules/classifyEnApi.js

@@ -16,7 +16,7 @@ export const classifyList = params => {
  * @returns 
  */
 export const classifyAdd = params => {
-  return http.get('/english_report/classify/add',params)
+  return http.post('/english_report/classify/add',params)
 }
 
 /**
@@ -25,7 +25,7 @@ export const classifyAdd = params => {
  * @returns 
  */
 export const classifyEdit = params => {
-  return http.get('/english_report/classify/edit',params)
+  return http.post('/english_report/classify/edit',params)
 }
 
 /**
@@ -53,3 +53,16 @@ export const setClassifyVariety=params=>{
   return http.post('/english_classify/permission/edit',params)
 }
 
+/**
+ * 拖动排序
+ */
+export const moveSort=params=>{
+  return http.post('/english_report/classify/move',params)
+}
+
+//启用\禁用
+export const enableSet=params=>{
+  return http.post('/english_report/classify/enabled/set',params)
+}
+
+

src/api/modules/oldApi.js

@@ -295,6 +295,16 @@ const setchapterTPermission=params=>{
 	return http.post('/report/chapter_type/auth_setting',params)
 }
 
+//章节启用\禁用
+const setChapterEnable=params=>{
+	return http.post('/report/chapter_type/enabled/set',params)
+}
+
+//章节拖动排序
+const setChapterSort=params=>{
+	return http.post('/report/chapter_type/move',params)
+}
+
 // 同时推送客群和模板消息
 const reportMessageSend=params=>{
 	return http.post('/report/sendMsg',params)
@@ -401,6 +411,8 @@ export {
 	getBusinessCode,
 	getPublicSettingsApi,
 	recordActiveLogin,
+	setChapterEnable,
+	setChapterSort,
 	getRealPublicSettings,
 	userLogOut
 }

src/api/modules/reportVariety.js

@@ -9,17 +9,24 @@ export const reportVarietyENInterence={
     },
     //获取过滤后的品种列表数据
     filterVarietyOpts:params=>{
+        // return http.get('/en_permission/list',{Enabled:1})
         return new Promise((resolve,reject)=>{
             http.get('/en_permission/list',params).then(res=>{
                 if(res.Ret===200){
-                    const arr=res.Data||[]
-                    arr.forEach(e => {
-                        e.Child&&e.Child.forEach(_e=>{
+                    let temArr=res.Data||[]
+                    temArr=temArr.filter(e=>e.Child&&e.Enabled===1)
+                    
+                    temArr.forEach(e => {
+                        e.Child=e.Child.filter(_e=>_e.Enabled===1)
+                    });
+                    temArr.forEach(e => {
+                        e.Child.forEach(_e=>{
                             delete _e.Child
                         })
                     });
-                    const resArr=arr.filter(e=>e.Child&&e.Child.length>0)
-                    resolve(resArr)
+                    resolve({Ret:200,Data:temArr})
+                }else{
+                    resolve(res)
                 }
             })
         })
@@ -39,6 +46,62 @@ export const reportVarietyENInterence={
     //删除品种
     delVariety:params=>{
         return http.post('/en_permission/remove',params)
+    },
+    sortVariety:params=>{
+        return http.post('/en_permission/move',params)
+    },
+    // 禁用\启用
+    setEnable:params=>{
+        return http.post('/en_permission/enabled/set',params)
     }
 
+}
+
+//中文品种
+export const reportVarietyInterence={
+    // 品种列表
+    varietyList:params=>{
+        return http.get('/permission/list',params)
+    },
+    //获取过滤后的品种列表数据
+    filterVarietyOpts:params=>{
+        // return http.get('/custom/permission/list',params)
+        // 后端给的接口格式有问题 算了 自己通过品种列表判断过滤下把
+        //将禁用的去掉
+        return new Promise((resolve,reject)=>{
+            http.get('/permission/list',params).then(res=>{
+                if(res.Ret===200){
+                    let temArr=res.Data||[]
+                    temArr=temArr.filter(e=>e.Child&&e.Enabled===1)
+                    
+                    temArr.forEach(e => {
+                        e.Child=e.Child.filter(_e=>_e.Enabled===1)
+                    });
+                    temArr.forEach(e => {
+                        e.Child.forEach(_e=>{
+                            delete _e.Child
+                        })
+                    });
+                    resolve({Ret:200,Data:temArr})
+                }else{
+                    resolve(res)
+                }
+            })
+        })
+    },
+    //新增品种
+    addVariety:params=>{
+        return http.post('/permission/add',params)
+    },
+    //编辑品种
+    editVariety:params=>{
+        return http.post('/permission/edit',params)
+    },
+    sortVariety:params=>{
+        return http.post('/permission/move',params)
+    },
+    // 禁用\启用
+    setEnable:params=>{
+        return http.post('/permission/enabled/set',params)
+    }
 }

src/api/modules/semanticsApi.js

@@ -277,6 +277,244 @@ const semanticInterface = {
   }
 }
 
+//语音识别
+const asrInterface = {
+  /**
+   * 获取目录的列表
+   * @param {} 
+   * ParentId
+   */
+  getCatalogueList:params=>{
+    return http.get('/speech_recognition/menu/list',params)
+  },
+  /** 
+   * 获取目录的目录树
+   * @param {} 
+   * ParentId
+  */
+  getCatalogueTree:params=>{
+    return http.get('/speech_recognition/menu/tree',params)
+  },
+  /**
+   * 新增目录
+   * @param {} 
+   * ParentId MenuName
+  */ 
+  addCatalogue:params=>{
+    return http.post('/speech_recognition/menu/add',params)
+  }, 
+  /**
+   * 编辑目录
+   * @param {} 
+   * MenuId MenuName
+  */ 
+  editCatalogue:params=>{
+    return http.post('/speech_recognition/menu/edit',params)
+  },
+  /**
+   * 删除目录-检查
+   * @param {} 
+   * MenuId
+  */ 
+  removeCatalogueCheck:params=>{
+    return http.post('/speech_recognition/menu/remove_check',params)
+  },
+  /**
+   * 删除目录
+   * @param {} 
+   * MenuId
+  */ 
+  removeCatalogue:params=>{
+    return http.post('/speech_recognition/menu/remove',params)
+  },
+  /**
+   * 移动目录/文件
+   * @param {} 
+   * MenuId ParentMenuId PrevMenuId NextMenuId SpeechId PrevSpeechId NextSpeechId
+  */ 
+  moveCatalogueEle:params=>{
+    return http.post('/speech_recognition/menu/move',params)
+  },
+  /**
+   * 获取标签的目录列表
+   * @param {} ParentId
+  */
+  getTagCatalogueList:params=>{
+    return http.get('/speech_recognition/tag/menu/list',params)
+  },
+  /**
+   * 新增标签目录
+   * @param {} 
+   * ParentId MenuName
+  */ 
+  addTagCatalogue:params=>{
+    return http.post('/speech_recognition/tag/menu/add',params)
+  }, 
+  /**
+   * 编辑标签目录
+   * @param {} 
+   * MenuId MenuName
+  */ 
+  editTagCatalogue:params=>{
+    return http.post('/speech_recognition/tag/menu/edit',params)
+  },
+  /**
+   * 删除标签目录-检查
+   * @param {} 
+   * MenuId
+  */ 
+  removeTagCatalogueCheck:params=>{
+    return http.post('/speech_recognition/tag/menu/remove_check',params)
+  },
+  /**
+   * 删除标签目录
+   * @param {} 
+   * MenuId
+  */ 
+  removeTagCatalogue:params=>{
+    return http.post('/speech_recognition/tag/menu/remove',params)
+  },
+  /**
+   * 移动标签目录/标签
+   * @param {} 
+   * MenuId ParentMenuId PrevMenuId NextMenuId TagId PrevTagId NextTagId
+  */ 
+  moveTagCatalogueEle:params=>{
+    return http.post('/speech_recognition/tag/menu/move',params)
+  },
+  /**
+   * 获取标签的目录列表
+  */
+  getTagTree:params=>{
+    return http.get('/speech_recognition/tag/menu/tree',params)
+  },
+  /**
+   * 获取标签列表
+   * Keywords
+  */
+  getTagsList:params=>{
+    return http.get('/speech_recognition/tag/list',params)
+  },
+  /**
+   * 新增标签
+   * @param {} 
+   * MenuId TagName
+  */ 
+  addTag:params=>{
+    return http.post('/speech_recognition/tag/add',params)
+  }, 
+  /**
+   * 编辑标签
+   * @param {} 
+   * TagId TagName
+  */ 
+  editTag:params=>{
+    return http.post('/speech_recognition/tag/edit',params)
+  },
+  /**
+   * 删除标签-检查
+   * @param {} 
+   * TagId
+  */ 
+  removeTagCheck:params=>{
+    return http.post('/speech_recognition/tag/remove_check',params)
+  },
+  /**
+   * 删除标签
+   * @param {} 
+   * TagId
+  */ 
+  removeTag:params=>{
+    return http.post('/speech_recognition/tag/remove',params)
+  },
+  /**
+   * 语音识别列表
+   * @param {} 
+   * 
+  */
+  getSpeechList:params=>{
+    return http.get('/speech_recognition/list',params)
+  },
+  /**
+   * 语音识别-待转换列表
+  */
+  getConvertList:params=>{
+    return http.get('/speech_recognition/convert_list',params)
+  },
+  /**
+   * 校验文件是否重命
+   * @param {} 
+   * MenuId Files:[{FileName,ResourceUrl}] 
+  */ 
+  speechFlieRepetitionCheck:params=>{
+    return http.post('/speech_recognition/convert/check_name',params)
+  },
+  /**
+   * 新建 - 批量转写
+   * @param {} 
+   * MenuId Files:[{FileName,ResourceUrl}] 
+  */ 
+  speechTransfer:params=>{
+    return http.post('/speech_recognition/convert',params)
+  },
+  /**
+   * 获取详情
+   * @param {} 
+   * SpeechRecognitionId
+  */ 
+  getSpeechDetail:params=>{
+    return http.get('/speech_recognition/detail',params)
+  },
+  /**
+   * 重命名
+   * @param {} 
+   * SpeechRecognitionId FileName
+  */ 
+  speechRename:params=>{
+    return http.post('/speech_recognition/rename',params)
+  },
+  /**
+   * 导出 
+   * /speech_recognition/export
+   * SpeechRecognitionId
+   * ExportType 导出类型：1-txt；2-doc；3-pdf 
+   * Timestamp:boolean
+  */ 
+  /**
+   * 删除
+   * @param {} 
+   * SpeechRecognitionId
+  */ 
+  speechRemove:params=>{
+    return http.post('/speech_recognition/remove',params)
+  },
+  /**
+   * 保存标签
+   * @param {} 
+   * SpeechRecognitionId
+   * TagIds:Array
+  */ 
+  speechSaveTag:params=>{
+    return http.post('/speech_recognition/save_tag',params)
+  },
+  /**
+   * 删除音视频
+   * @param {} 
+   * SpeechRecognitionId
+  */ 
+  speechMediaRemove:params=>{
+    return http.post('/speech_recognition/remove_file',params)
+  },
+  /**
+   * 保存
+   * @param {} 
+   * SpeechRecognitionId FileName TagIds:[number] Contents:[{SpeechRecognitionContentId,Content}] 
+  */ 
+  speechSave:params=>{
+    return http.post('/speech_recognition/save',params)
+  },
+}
+
 
 
-export {tagInterface,documentInterface,semanticInterface}
+export {tagInterface,documentInterface,semanticInterface,asrInterface}

src/directives/tooltip-hidable.js

@@ -0,0 +1,28 @@
+// 长度溢出显示ToolTip 请绑定的标签元素包裹住 element-ui的el-tooltip。
+/**
+ * binding.value 为长度溢出的元素的css选择器，没有请设置
+ */
+import { Message } from "element-ui"
+
+export default {
+  bind(el,binding,vnode) {
+    try {
+      // console.log(vnode,'vnode');
+      el.onmouseenter=(e)=>{
+        // console.log(e);
+        if(el.scrollWidth > el.clientWidth){
+          // 超出
+          vnode.componentInstance.disabled=false
+        }else{
+          vnode.componentInstance.disabled=true
+        }
+      }
+    } catch (error) {
+      console.error(error);
+      Message.error(error.message)
+    }
+  },
+  updated(el,binding,vnode) {
+    console.log('updated');
+  },
+}

src/routes/modules/oldRoutes.js

@@ -121,7 +121,7 @@ export default [
       },
       {
         path: "chapterSetting",
-        component: () => import("@/views/classify_manage/chapterSetting.vue"),
+        component: () => import("@/views/classify_manage/chapterSettingV2.vue"),
         name: "章节设置",
         hidden: true,
         meta: {
@@ -253,8 +253,8 @@ export default [
       // },
       {
         path: "reportvariety",
-        name: "英文品种配置",
-        component: () => import("@/views/report_manage/reportVariety.vue"),
+        name: "品种管理",
+        component: () => import("@/views/report_manage/reportVarietyV2.vue"),
       },
       {
         path: "smartReportList",

src/routes/modules/semanticsRoutes.js

@@ -59,6 +59,11 @@ export default [{
             pathName:'文档对比',
             keepAlive: false
         }
+    },
+    {
+      path: "ASR",
+      name: "语音识别",
+      component: () => import('@/views/semantics_manage/asr/ASR.vue')
     }
   ]
 }]

src/utils/buttonConfig.js

@@ -75,27 +75,39 @@ export const enReportManageBtn = {
 */
 export const classifyBtn={
     classifyList_cnClassify:'classifyList:cnClassify',//中文分类这个选项卡是否显示
-    classifyList_cnClassify_classifyDel:'classifyList:cnClassify:classifyDel',//一二级分类删除
-    classifyList_cnClassify_authSetting:'classifyList:cnClassify:authSetting',//二级分类权限配置
-    classifyList_cnClassify_chapterSetting:'classifyList:cnClassify:chapterSetting',//晨周报章节设置
+    // classifyList_cnClassify_classifyDel:'classifyList:cnClassify:classifyDel',//一二级分类删除
+    // classifyList_cnClassify_authSetting:'classifyList:cnClassify:authSetting',//二级分类权限配置
+    
     /*---------添加编辑分类------------- */
-    classifyList_cnClassify_classifyAdd:'classifyList:cnClassify:classifyAdd',//一二级添加编辑分类
-    classifyList_cnClassify_relateSetting:'classifyList:cnClassify:relateSetting',//表单项：关联设置
-    classifyList_cnClassify_miniHidden:'classifyList:cnClassify:miniHidden',//表单项：小程序隐藏
-    classifyList_cnClassify_pcBackColor:'classifyList:cnClassify:pcBackColor',//表单项：PC端背景颜色
-    classifyList_cnClassify_shareImgs:'classifyList:cnClassify:shareImgs',//表单项：分享链接配图
-    classifyList_cnClassify_reportImgs:'classifyList:cnClassify:reportImgs',//表单项：报告合集配图
-    classifyList_cnClassify_ficcIcon:'classifyList:cnClassify:ficcIcon',//表单项：FICCicon
-    classifyList_cnClassify_ficcSort:'classifyList:cnClassify:ficcSort',//表单项：FICC页排序
-    classifyList_cnClassify_backSort:'classifyList:cnClassify:backSort',//表单项：后台排序
-    classifyList_cnClassify_showType:'classifyList:cnClassify:showType',//表单项：展示形式
-    classifyList_cnClassify_childMenu:'classifyList:cnClassify:childMenu',//表单项：子目录
+    classifyList_cnClassify_classifyAdd:'classifyList:cnClassify:add',//添加分类
+    classifyList_cnClassify_classifyEdit:'classifyList:cnClassify:edit',//添加分类
+    classifyList_cnClassify_connect_variety:'classifyList:cnClassify:variety',//关联品种
+    classifyList_cnClassify_chapterSetting:'classifyList:cnClassify:chapterSetting',//晨周报章节设置
+    classifyList_cnClassify_enable:'classifyList:cnClassify:enable',//启用\禁用
+
+
+    // classifyList_cnClassify_relateSetting:'classifyList:cnClassify:relateSetting',//表单项：关联设置
+    // classifyList_cnClassify_miniHidden:'classifyList:cnClassify:miniHidden',//表单项：小程序隐藏
+    // classifyList_cnClassify_pcBackColor:'classifyList:cnClassify:pcBackColor',//表单项：PC端背景颜色
+    // classifyList_cnClassify_shareImgs:'classifyList:cnClassify:shareImgs',//表单项：分享链接配图
+    // classifyList_cnClassify_reportImgs:'classifyList:cnClassify:reportImgs',//表单项：报告合集配图
+    // classifyList_cnClassify_ficcIcon:'classifyList:cnClassify:ficcIcon',//表单项：FICCicon
+    // classifyList_cnClassify_ficcSort:'classifyList:cnClassify:ficcSort',//表单项：FICC页排序
+    // classifyList_cnClassify_backSort:'classifyList:cnClassify:backSort',//表单项：后台排序
+    // classifyList_cnClassify_showType:'classifyList:cnClassify:showType',//表单项：展示形式
+    // classifyList_cnClassify_childMenu:'classifyList:cnClassify:childMenu',//表单项：子目录
 }
 /*
 *--------英文分类-----------   ETA_1.1.7 不区分英文研报和线上路演 统一使用英文研报的标识
 */
 export const enClassifyBtn = {
     classifyList_enClassify:'classifyList:enClassify',//英文分类这个选项卡是否展示
+    classifyList_enClassify_add:'classifyList:enClassify:rpAddClassify',//英文分类添加按钮
+    classifyList_enClassify_edit:'classifyList:enClassify:rpEdit',//英文分类编辑
+    classifyList_enClassify_enable:'classifyList:enClassify:enable',//启用\禁用
+    classifyList_enClassify_connect_variety:'classifyList:enClassify:variety',//关联品种
+
+
     /* -------------线上路演------------- */ 
     classifyList_enClassify_roadshow:'classifyList:enClassify:roadshow',//线上路演这个选项卡是否展示
     classifyList_enClassify_rsDel:'classifyList:enClassify:rsDel',//线上路演一二级分类删除
@@ -127,11 +139,16 @@ export const authorManage = {
     authorManage_add:'authorManage:add',//添加作者按钮
 }
 /*
-*--------英文品种配置----------- 
+*--------品种配置----------- 
 */
-export const enChartPermission = {
-    enChartPermission_del:'enChartPermission:del',
-    enChartPermission_save:'enChartPermission:save',
+export const reportVariety = {
+    zhVarietyHas:'reportvariety:chinese',//中文品种
+    zhPublicSet:'reportvariety:chinese:ispublic',//公有权限设置
+    zhVarietyEdit:'reportvariety:chinese:set',//品种设置
+    zhVarietyAdd:'reportvariety:chinese:add',//添加品种
+    enVarietyHas:'reportvariety:english',//英文品种
+    enVarietyEdit:'enChartPermission:edit',//品种设置
+    enVarietyAdd:'enChartPermission:save',//添加品种
 }
 /*
 *--------云盘----------- 
@@ -465,6 +482,30 @@ export const semanticPermission = {
     /*-----------标签管理--------- */
     tagPage_del:'tagPage:del',
     tagPage_save:'tagPage:save',//添加编辑标签
+    /*-----------语音识别--------- */
+    ASR_view:'ASR:view',//查看
+    ASR_classify_catalogue_add:'ASR:classify:catalogue:add',//目录树添加
+    ASR_classify_catalogue_edit:'ASR:classify:catalogue:edit',//目录树编辑
+    ASR_classify_catalogue_del:'ASR:classify:catalogue:del',//目录树删除
+    ASR_classify_catalogue_move:'ASR:classify:catalogue:move',//目录树拖动 
+    ASR_classify_tag_add:'ASR:classify:tag:add',//标签目录树添加
+    ASR_classify_tag_edit:'ASR:classify:tag:edit',//标签目录树编辑
+    ASR_classify_tag_del:'ASR:classify:tag:del',//标签目录树删除
+    ASR_classify_tag_move:'ASR:classify:tag:move',//标签目录树拖动 
+    ASR_tagOperation_addTag:'ASR:tagOperation:addTag',//标签添加
+    ASR_tagOperation_editTag:'ASR:tagOperation:editTag',//标签编辑
+    ASR_tagOperation_deleteTag:'ASR:tagOperation:deleteTag',//标签删除
+    ASR_addArticles:'ASR:addArticles',//新建
+    ASR_renameArticles:'ASR:renameArticles',//重命名
+    ASR_exportArticles:'ASR:exportArticles',//导出
+    ASR_deleteArticles:'ASR:deleteArticles',//删除
+    ASR_tagMark_view:'ASR:tagMark:view',//打标签-查看标签
+    ASR_tagMark_add:'ASR:tagMark:add',//打标签-添加标签    
+    ASR_saveArticles:'ASR:saveArticles',//保存
+    ASR_deleteVideo:'ASR:deleteVideo',//删除视频
+    ASR_deleteVoice:'ASR:deleteVoice',//删除音频
+    ASR_copyText:'ASR:copyText',//复制
+    ASR_toggleTimestampShow:'ASR:toggleTimestampShow',//隐藏/显示时间戳
 }
 /*
  * --------------------------------------------------------------------------统计分析------------------------------------------------
@@ -700,7 +741,7 @@ export const chartThemePermission = {
 const btnMap  = {
     reportManageBtn,enReportManageBtn,smartReportManageBtn,
     classifyBtn,enClassifyBtn,authorManage,
-    enChartPermission,cloudDisk,
+    reportVariety,cloudDisk,
     pptPermission,enPPTPermission,
     dataSourcePermission,
     edbDataPermission,predictEdbPermission,chartLibPermission,

src/utils/common.js

@@ -179,15 +179,20 @@ const handleUploadToMinIO=(file,fileName,options={})=>{
     
       minioClient.bucketExists(res.Data.Bucketname, function (err, exists) {
           if (err) {
-              throw "minio 查看桶是否存在失败"+err
-              // return console.log(err);
+              Message.warning("上传失败，请刷新重试");
+              reject('minio 查看桶是否存在失败')
+              // throw "minio 查看桶是否存在失败"+err
+              return console.error("minio 查看桶是否存在失败"+err);
           }
           if (!exists) {
             // 不存在桶，创建桶
             console.log("桶不存在，先创建桶",res.Data.Bucketname);
             minioClient.makeBucket(res.Data.Bucketname, res.Data.RegionId,function (err) {
               if (err) {
-                throw "minio 创建桶失败"+err
+                Message.warning("上传失败，请刷新重试");
+                reject('minio 创建桶失败')
+                return console.error("minio 创建桶失败"+err);
+                // throw "minio 创建桶失败"+err
               }
             
               let reader = new FileReader();
@@ -201,7 +206,10 @@ const handleUploadToMinIO=(file,fileName,options={})=>{
                 // console.log(bufferStream);
                 minioClient.putObject(res.Data.Bucketname, fileName, bufferStream,file.size, metaData, function (err, etag) {
                   if (err){
-                    throw "上传到minio失败："+err
+                    Message.warning("上传失败，请刷新重试");
+                    reject('上传到minio失败')
+                    return console.error("上传到minio失败"+err);
+                    // throw "上传到minio失败："+err
                   }
             
                 })
@@ -220,7 +228,10 @@ const handleUploadToMinIO=(file,fileName,options={})=>{
               bufferStream.end(Buffer.from(dataurl))
               minioClient.putObject(res.Data.Bucketname, fileName, bufferStream, metaData, function (err, etag) {
                 if (err){
-                  throw "上传到minio失败："+err
+                  Message.warning("上传失败，请刷新重试");
+                  reject('上传到minio失败')
+                  return console.error("上传到minio失败"+err);
+                  // throw "上传到minio失败："+err
                 }
                 let fileUrl = fileName.startsWith('/')?res.Data.ImgHost+fileName:res.Data.ImgHost+"/"+fileName
                 resolve(fileUrl)
@@ -232,7 +243,7 @@ const handleUploadToMinIO=(file,fileName,options={})=>{
       console.error(error);
       if (error.name !== "cancel") {
         //不是取消上传的则给错误提示
-        this.$message.warning("上传失败，请刷新重试");
+        Message.warning("上传失败，请刷新重试");
       }
       reject(error)
     }
@@ -240,6 +251,10 @@ const handleUploadToMinIO=(file,fileName,options={})=>{
 }
 //https://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#constructor-property
 const handleUploadToS3=(file,fileName,options={})=>{
+  /**
+   * options 里面包含了一些配置，包括分片上传等…… 测试服目前还没有AWS3 的对象存储器，无法测试，暂不进行配置
+   * s3Client.upload(params={},[options={}],[callback])
+   */
     return new Promise(async(resolve,reject)=>{
         const res=await getOSSSign({StorageSource:3})
         if(res.Ret!==200) reject("获取s3签名错误,res.Ret="+res.Ret)
@@ -296,8 +311,10 @@ const handleUploadToS3=(file,fileName,options={})=>{
                     Key: fileName
                 }, function (err, data) {
                     if (err) {
-                        console.log("Error! err =====> ", err);
-                        throw new Error("上传到s3失败!")
+                        Message.warning("上传失败，请刷新重试");
+                        reject('上传到s3失败')
+                        return console.log("上传到s3失败! Error! err =====> ", err);
+                        // throw new Error("上传到s3失败!")
                     } else {
                         let url = data['Location'];
                         console.log("Successfully uploaded! URL =====> ", url);
@@ -309,7 +326,7 @@ const handleUploadToS3=(file,fileName,options={})=>{
             console.error(error);
             if (error.name !== "cancel") {
               //不是取消上传的则给错误提示
-              this.$message.warning("上传失败，请刷新重试");
+              Message.warning("上传失败，请刷新重试");
             }
             reject(error)
           }

src/views/Home.vue

@@ -896,7 +896,7 @@ export default {
         this.linkSystems = linkArr
     },
 
-    /* 获取动态配置 外部动态链接 */
+    /* 获取动态配置 外部动态链接  */
     async getPublicSettings() {
       const res =  await getPublicSettingsApi();
       if(res.Ret !== 200) return

src/views/Login.vue

@@ -294,7 +294,7 @@ export default {
                 },
                 ],
             },
-            checked: false, //是否保持登录状态
+            checked: false, //是否保持登录状态 
             visible: true, //密码输入类型
 
             activeModel: 'ordinaryModel',
@@ -345,7 +345,7 @@ export default {
                     };
                     userLogin(loginParams).then(async (res) => {
                         if (res.Ret === 200) {
-                            localStorage.setItem("auth", res.Data.Authorization);
+                            localStorage.setItem("auth", res.Data.Authorization); 
                             localStorage.setItem("userName", res.Data.RealName);
                             localStorage.setItem("Role", res.Data.RoleTypeCode);
                             localStorage.setItem("RoleIdentity", res.Data.SysRoleTypeCode);

src/views/classify_manage/chapterSetting.vue

@@ -1,308 +0,0 @@
-<template>
-  <div id="chapter-settring-container">
-    <div class="head-buttons-zone">
-      <el-button @click="addChapter" type="primary" style="width: 112px;">{{$t('ReportManage.CategoryList.add_chapter_btn')}}</el-button>
-    </div>
-    <div class="tablle-zone">
-      <el-table :data="tableData" style="border:1px solid #eaeaea;" header-row-class-name="chapter-table-header">
-        <el-table-column :label="$t('ReportManage.CategoryList.chapter_name_lable')" prop="ReportChapterTypeName" class-name="chapter-name">
-          <template slot-scope="{row}">
-            {{row.ReportChapterTypeName}}
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('Table.column_operations')" prop="operation" width='300' align="center">
-          <template slot-scope="{row}">
-            <span class="editsty" style="margin-right:12px;" @click="setPermission(row)">{{$t('ReportManage.CategoryList.configuration_btn')}}</span>
-            <span class="editsty" style="margin-right:12px;" @click="editChapter(row)">{{$t('Table.edit_btn')}}</span>
-            <span class="deletesty" style="color: #D1433A;" @click="deleteChapter(row)">{{$t('Table.delete_btn')}}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!-- 添加/编辑 章节 -->
-    <el-dialog :title="isShowTitleLang(dialogTitle)" :modal-append-to-body='false' :visible.sync="addDialogShow" 
-    :close-on-click-modal="false" :center="true" v-dialogDrag width="620px" @close="addDialogClose">
-      <div style="display: flex;align-items: center;justify-content: center;">
-        <el-form :model="addForm" label-width="95px" :rules="addFormRules" ref="addForm">
-          <el-form-item :label="$t('ReportManage.CategoryList.chapter_name_lable')" prop="ReportChapterTypeName">
-            <el-input v-model="addForm.ReportChapterTypeName" style="width: 317px;" :placeholder="$t('ReportManage.CategoryList.enter_chapter_name')"></el-input>
-          </el-form-item>
-          <el-form-item :label="$t('ReportManage.CategoryList.icon_not')" prop="UnselectedImage">
-            <input type="file" size="small" name="file" @change="fileSelected(1)" id="file1" class="true-file" style="display: none;">
-            <el-input type="text" v-model="addForm.UnselectedImage" :placeholder="$t('ReportManage.CategoryList.upload_image')" size="medium">
-              <el-button slot="append" type="primary" size="mini" @click.native="clickinput(1)">{{$t('ReportManage.ReportList.select_img_card')}}</el-button>
-            </el-input>
-          </el-form-item>
-          <el-form-item :label="$t('ReportManage.CategoryList.select_icon')"  prop="SelectedImage">
-            <input type="file" size="small" name="file" @change="fileSelected(2)" id="file2" class="true-file" style="display: none;">
-            <el-input type="text" v-model="addForm.SelectedImage" :placeholder="$t('ReportManage.CategoryList.upload_image')" size="medium">
-              <el-button slot="append" type="primary" size="mini" @click.native="clickinput(2)">{{$t('ReportManage.ReportList.select_img_card')}}</el-button>
-            </el-input>
-          </el-form-item>
-          <el-form-item :label="$t('ReportManage.CategoryList.icon_text')"  prop="WordsImage">
-            <input type="file" size="small" name="file" @change="fileSelected(3)" id="file3" class="true-file" style="display: none;">
-            <el-input type="text" v-model="addForm.WordsImage" :placeholder="$t('ReportManage.CategoryList.upload_image')" size="medium">
-              <el-button slot="append" type="primary" size="mini" @click.native="clickinput(3)">{{$t('ReportManage.ReportList.select_img_card')}}</el-button>
-            </el-input>
-          </el-form-item>
-          <el-form-item :label="$t('ReportManage.CategoryList.chapter_img')" prop="EditImgUrl">
-            <input type="file" size="small" name="file" @change="fileSelected(4)" id="file4" class="true-file" style="display: none;">
-            <el-input type="text" v-model="addForm.EditImgUrl" :placeholder="$t('ReportManage.CategoryList.upload_image')" size="medium">
-              <el-button slot="append" type="primary" size="mini" @click.native="clickinput(4)">{{$t('ReportManage.ReportList.select_img_card')}}</el-button>
-            </el-input>
-          </el-form-item>
-          <el-form-item :label="$t('ReportManage.CategoryList.list_sorting')"  prop="Sort">
-            <el-input-number v-model="addForm.Sort" :placeholder="$t('ReportManage.CategoryList.please_number_input')" ></el-input-number>
-          </el-form-item>
-          <el-form-item :label="$t('ReportManage.CategoryList.hide_mini')" prop="mpHidden">
-            <el-switch v-model="addForm.mpHidden" inactive-color="#ededed"></el-switch>
-          </el-form-item>
-        </el-form>
-      </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>
-      </div>
-    </el-dialog>
-    <!-- 权限配置弹窗 -->
-		<PermissionDialog :isShow.sync="permissionDiashow" permissionType="chapterType"
-    :id="chapterId" @saveConfig="savePermission" :haveReset="false" />
-  </div>
-</template>
-
-<script lang="js">
-import { bannerupload ,getchapterTypeList,addChapterType,editChapterType,
-  deleteChapterType,setchapterTPermission} from 'api/api.js';
-import PermissionDialog from './components/PermissionDialog.vue'
-
-  export default {
-    name:"chapterSetting",
-    components:{PermissionDialog},
-    data() {
-      return {
-        tableData:[],
-        dialogTitle:"", // 弹窗标题
-        // 添加/编辑弹窗
-        addDialogShow:false,
-        addForm:{
-          ReportChapterTypeName:"",
-          ResearchType:"",
-          UnselectedImage:"",
-          SelectedImage:"",
-          WordsImage:"",
-          EditImgUrl:"",
-          Sort:0,
-          mpHidden:false
-        },
-        // 列表最后一个的排序值
-        lastSort:0,
-        researchType:'',// day-晨报；week-周报
-
-        // 权限配置弹窗
-        permissionDiashow:false,
-        chapterId:1
-      }
-    },
-    created() {
-      // 类型 周报-晨报
-      this.addForm.ResearchType=this.researchType=this.$route.query.reportType=='week'?'week':'day'
-      this.getList()
-    },
-    methods: {
-      // 弹框的title显示
-      isShowTitleLang(e){
-        if(e=='添加章节') return this.$t('ReportManage.CategoryList.add_chapter_btn')
-        if(e=='编辑章节') return this.$t('ReportManage.CategoryList.chapter_edit_lable')
-        return e
-      },
-      // 获取章节类型列表
-      getList(){
-        getchapterTypeList({ReportType:this.researchType,PageSize:10000,CurrentIndex:1}).then(res=>{
-          if(res.Ret == 200){
-            this.tableData=res.Data.List || []
-            this.lastSort=this.addForm.Sort=this.tableData[this.tableData.length-1].Sort+1
-          }
-        })
-      },
-      addChapter(){
-        this.dialogTitle="添加章节"
-        this.addDialogShow=true
-        console.log(this.addForm);
-      },
-      editChapter(row){
-        // console.log(row);
-        this.addForm={
-          ...this.addForm,
-          ReportChapterTypeName:row.ReportChapterTypeName,
-          ReportChapterTypeId:row.ReportChapterTypeId,
-          Sort:row.Sort,
-          UnselectedImage:row.UnselectedImage,
-          SelectedImage:row.SelectedImage,
-          EditImgUrl:row.EditImgUrl,
-          WordsImage:row.WordsImage,
-          mpHidden:row.IsShow==0?true:false
-        }
-        // console.log(this.addForm);
-        this.dialogTitle="编辑章节"
-        this.addDialogShow=true
-      },
-      // 设置权限
-      setPermission(row){
-        this.chapterId=row.ReportChapterTypeId
-        this.permissionDiashow=true
-      },
-      clickinput(type){  //上传模拟点击
-			  $(`#file${type}`).click();
-		  },
-      fileSelected(type){  //选择文件上传
-			  const that = this;
-		    if( document.getElementById('file'+type).files[0] ){
-          let hostfile = document.getElementById('file'+type).files[0];
-          let size = Math.floor(hostfile.size / 1024 / 1024);
-          if( size>200 ){
-            that.$message.error(this.$t('ReportManage.smart_msg.uploaded_limitation'));
-            hostfile = {};
-            return false
-          }
-          if( hostfile.name.toLowerCase().includes('.png') || hostfile.name.toLowerCase().includes('.jpg') 
-              || hostfile.name.toLowerCase().includes('.jpeg') ){
-            let form = new FormData();
-            form.append('file',hostfile);  //hostfile.name
-            bannerupload(form).then((res) => {
-              if( res.Ret === 200 ){
-                if(type == 1) {
-                  that.addForm.UnselectedImage=res.Data.ResourceUrl;
-                }else if(type == 2) {
-                  that.addForm.SelectedImage=res.Data.ResourceUrl;
-                }else if(type == 3) {
-                  that.addForm.WordsImage=res.Data.ResourceUrl
-                }else if(type == 4) {
-                  that.addForm.EditImgUrl=res.Data.ResourceUrl
-                }
-              }
-              $("#file"+type).val('');
-              hostfile = {};
-            });
-          }else{
-            that.$message.error(this.$t('ReportManage.smart_msg.upload_format'));
-          }
-		    } 
-		  },
-      // 保存
-      addChapterSave(){
-        this.$refs.addForm.validate((valid)=>{
-          if(valid){
-            // 添加小程序是否显示参数 0显示，1隐藏
-            let params={...this.addForm,IsShow:this.addForm.mpHidden?0:1}
-            // 请求方法
-            let requestMethod;
-            // console.log(params);
-            if(params.ReportChapterTypeId){
-              // 编辑
-              requestMethod=editChapterType
-            }else{
-              // 新增
-              requestMethod=addChapterType
-            }
-            requestMethod(params).then(res=>{
-              if(res.Ret == 200){
-                this.$message.success(this.$t('MsgPrompt.operate_success_msg'))
-                this.addDialogShow=false
-                this.getList()
-              }
-            })
-          }
-        })
-      },
-      // 新增/编辑 弹窗关闭回调
-      addDialogClose(){
-        this.addForm={
-          ReportChapterTypeName:"",
-          ResearchType:this.researchType,
-          UnselectedImage:"",
-          SelectedImage:"",
-          WordsImage:"",
-          EditImgUrl:"",
-          Sort:this.lastSort,
-          mpHidden:false
-        }
-        setTimeout(()=>{
-          this.$refs.addForm.clearValidate()
-        },20)
-      },
-      // 保存
-      savePermission(item){
-        // console.log(item);
-        setchapterTPermission({ReportChapterTypeId:item.Id,ChartPermissionIdList:item.ChartPermissionIdList}).then(res=>{
-          if(res.Ret==200){
-            this.$message.success(this.$t('ReportManage.CategoryList.Permission_success_msg'))
-            this.permissionDiashow=false
-          }
-        })
-      },
-      // 删除章节类型
-      deleteChapter(row){
-        this.$confirm(this.$t('ReportManage.CategoryList.is_delete_chapter'), this.$t('Confirm.prompt'), {
-          type: "warning"
-        }).then(() => {
-          deleteChapterType({ReportChapterTypeId:row.ReportChapterTypeId}).then(res=>{
-            if(res.Ret==200){
-              this.$message.success(this.$t('MsgPrompt.delete_msg'))
-              this.getList()
-            }
-          })
-        })
-        .catch(() => {});
-      }
-    },
-    computed: {
-      addFormRules(){
-        return {
-            ReportChapterTypeName:{required:true,message:this.$t('ReportManage.CategoryList.chapter_name_empty'),trigger:'blur'},
-            UnselectedImage:{required:true,message:this.$t('ReportManage.CategoryList.icon_not_empty'),trigger:['blur','change']},
-            SelectedImage:{required:true,message:this.$t('ReportManage.CategoryList.select_icon_empty'),trigger:['blur','change']},
-            WordsImage:{required:true,message:this.$t('ReportManage.CategoryList.icon_text_empty'),trigger:['blur','change']},
-            EditImgUrl:{required:true,message:this.$t('ReportManage.CategoryList.chapter_img_empty'),trigger:['blur','change']},
-            Sort:{required:true,message:this.$t('ReportManage.CategoryList.sorting_empty'),trigger:['blur','change']},
-            mpHidden:{required:true,message:this.$t('ReportManage.CategoryList.select_hide_mini'),trigger:'change'}
-        }
-      }
-    },
-  }
-</script>
-
-<style lang="scss" scoped>
-  #chapter-settring-container{
-    min-height: calc(100vh - 120px);
-    box-sizing: border-box;
-    .head-buttons-zone{
-      background-color: white;
-      padding: 20px 30px;
-      border: solid 1px #DCDFE6;
-      border-radius: 2px;
-      box-shadow: 0px 2px 12px 0px rgba(107, 127, 199, 0.25);
-      position: relative;
-      z-index: 2;
-    }
-    .tablle-zone{
-      background-color: white;
-      padding: 30px;
-      border: solid 1px #eee;
-      box-sizing: border-box;
-    }
-  }
-</style>
-<style lang="scss">
-#chapter-settring-container{
-  .chapter-table-header{
-    color: #333;
-  }
-  .chapter-name{
-    padding-left: 60px;
-  }
-  .el-input{
-    width: 100%;
-  }
-}
-
-</style>

src/views/classify_manage/chapterSettingV2.vue

@@ -0,0 +1,297 @@
+<template>
+    <div class="classify-page">
+        <div class="top-wrap">
+            <el-button 
+                type="primary"
+                @click="addChapter"
+            >添加章节</el-button>
+        </div>
+        <div class="content-box">
+            <el-tree
+			    :data="list"
+				node-key="ReportChapterTypeId"
+                :props="{
+                    label: 'ReportChapterTypeName',
+                    children: 'Child'
+                }"
+				check-strictly
+				empty-text="暂无数据"
+                draggable
+                :allow-drop="canDropHandle"
+                @node-drop="dropOverHandle"
+			>
+				<div
+					class="classify-item-wrap"
+					slot-scope="{ data }"
+				>
+                    <div>
+                        <span :class="['tag', data.Enabled==1?'open':'close']" @click.stop="handleEnableSet(data)">{{data.Enabled==1?'启用':'禁用'}}</span>
+                        <span>{{data.ReportChapterTypeName}}</span>
+                    </div>
+					
+                    <div class="opt-box">
+                        <img class="icon-drag" src="~@/assets/img/data_m/move_ico2.png" alt="">
+                        <img class="icon-set" src="~@/assets/img/icons/variety_set.png" alt="" @click.stop="editChapter(data)">
+                    </div>
+				</div>
+			</el-tree>
+        </div>
+
+        <!-- 添加/编辑 章节 -->
+    <el-dialog 
+        :title="dialogTitle" 
+        :modal-append-to-body='false' 
+        :visible.sync="addDialogShow" 
+        :close-on-click-modal="false" 
+        :center="true" 
+        v-dialogDrag 
+        width="620px" 
+        @close="addDialogClose"
+    >
+        <div style="display: flex;align-items: center;justify-content: center;">
+            <el-form :model="addForm" label-width="95px" :rules="addFormRules" ref="addForm">
+                <el-form-item label="章节名称" prop="ReportChapterTypeName">
+                    <el-input v-model="addForm.ReportChapterTypeName" style="width: 317px;" placeholder="请输入章节名称"></el-input>
+                </el-form-item>
+                <el-form-item label="上级分类">
+                    <el-input  disabled :value="researchType=='day'?'晨报':'周报'" style="width: 317px;" placeholder="请输入章节名称"></el-input>
+                </el-form-item>
+                <el-form-item prop="variety" label="关联品种">
+                    <template slot="label">
+                        <el-tooltip class="item" effect="dark" content="控制报告阅读权限">
+                            <div>
+                                <span>关联品种</span>
+                                <i class="el-icon-info"></i>
+                            </div>
+                        </el-tooltip>
+                    </template>
+                    <el-cascader
+                        :options="reportVarietyList" 
+                        v-model="addForm.ChartPermissionIdList" 
+                        placeholder="请选择"
+                        collapse-tags
+                        :props="{value:'PermissionId',label:'PermissionName',children:'Child',multiple: true,emitPath:false}" 
+                        style="width:317px;"
+                    ></el-cascader>
+                </el-form-item>
+            </el-form>
+        </div>
+        <div solt="footer" style="padding: 20px 0;text-align: center;">
+            <el-button size="medium" style="width:130px;" @click="addDialogShow=false">取消</el-button>
+            <el-button type="primary" size="medium" style="margin-left: 16px;width:130px ;" @click="addChapterSave">保存</el-button>
+      </div>
+    </el-dialog>
+        
+    </div>
+</template>
+
+<script>
+import mDialog from '@/components/mDialog.vue';
+import { getchapterTypeList,addChapterType,editChapterType,} from 'api/api.js';
+import {setChapterEnable,setChapterSort} from '@/api/modules/oldApi.js'
+import {reportVarietyInterence} from '@/api/modules/reportVariety'
+import {classifyPermissionInterface} from '@/api/modules/classifyApi.js'
+export default {
+    name:"chapterSetting",
+    components:{mDialog},
+    beforeRouteEnter(to, from, next) {
+        if(to.query.reportType=='day'){
+            to.matched[1].name='晨报章节设置'
+        }else{
+            to.matched[1].name='周报章节设置'
+        }
+        next()
+    },
+    data() {
+        return {
+            list:[],
+            dialogTitle:'',// 弹窗标题
+            // 添加/编辑弹窗
+            addDialogShow:false,
+            addForm:{
+                ReportChapterTypeName:"",
+                ResearchType:"",
+                ChartPermissionIdList:''
+            },
+            researchType:'',// day-晨报；week-周报
+
+            reportVarietyList:[],//中文品种列表
+        }
+    },
+    mounted(){
+        // 类型 周报-晨报
+        this.addForm.ResearchType=this.researchType=this.$route.query.reportType=='week'?'week':'day'
+        this.getList()
+        this.getReportVarietyList()
+    },
+    methods: {
+        getList(type){
+            getchapterTypeList({ReportType:this.researchType}).then(res=>{
+                if(res.Ret == 200){
+                    this.list=res.Data.List || []
+                }
+            })
+        },
+
+        addChapter(){
+            this.dialogTitle="添加章节"
+            this.addDialogShow=true
+            this.addForm.ReportChapterTypeName=''
+            this.addForm.ChartPermissionIdList=''
+            console.log(this.addForm);
+        },
+
+        editChapter(row){
+            // console.log(row);
+            this.addForm={
+                ...this.addForm,
+                ReportChapterTypeName:row.ReportChapterTypeName,
+                ReportChapterTypeId:row.ReportChapterTypeId,
+                ChartPermissionIdList:row.ChartPermissionIdList||''
+            }
+            this.dialogTitle="编辑章节"
+            this.addDialogShow=true
+        },
+
+        // 保存
+      addChapterSave(){
+        this.$refs.addForm.validate((valid)=>{
+          if(valid){
+            // 添加小程序是否显示参数 0显示，1隐藏
+            let params={...this.addForm,ChartPermissionIdList:this.addForm.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(`${this.dialogTitle}成功`)
+                this.addDialogShow=false
+                this.getList()
+              }
+            })
+          }
+        })
+      },
+
+        
+
+        // 获取品种数据
+        getReportVarietyList(){
+            reportVarietyInterence.filterVarietyOpts().then(res=>{
+                this.reportVarietyList=res.Data||[]
+            })
+        },
+
+        //启用\禁用设置
+        handleEnableSet(item){
+            setChapterEnable({
+                ReportChapterTypeId:item.ReportChapterTypeId,
+                Enabled:item.Enabled==1?0:1
+            }).then(res=>{
+                if(res.Ret===200){
+                    this.$message.success('设置成功')
+                    this.getList()
+                }
+            })
+        },
+
+        //控制只能同级拖动
+        canDropHandle(draggingNode, dropNode, type){
+            if(type==='inner') return false //禁止向内部拖动
+            return true
+        },
+
+        //拖动结束
+        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 params={
+                ReportChapterTypeId,
+                PrevReportChapterTypeId,
+                NextReportChapterTypeId
+            }
+            console.log(params);
+            setChapterSort(params).then(res=>{
+                if(res.Ret===200){
+                    this.$message.success('移动成功')
+                }else{
+                    this.getList()
+                }
+            })
+        },
+        
+    },
+}
+</script>
+
+<style lang="scss">
+.el-cascader .el-input{
+  width: 100%;
+}
+.classify-page{
+    .content-box{
+        .el-tree-node__content{
+            padding-top: 10px;
+            padding-bottom: 10px;
+            border-bottom: 1px solid #C8CDD9;
+        }
+    }
+}
+
+</style>
+<style lang="scss" scoped>
+.top-wrap{
+    display: flex;
+    justify-content: space-between;
+    background: #FFFFFF;
+    border-radius: 4px;
+    padding: 20px;
+}
+.content-box{
+    padding: 20px;
+    margin-top: 20px;
+    height: calc(100vh - 260px);
+    overflow-y: auto;
+    background-color: #FFFFFF;
+    .classify-item-wrap{
+        flex: 1;
+        padding-right: 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .tag{
+            display: inline-block;
+            min-width: 76px;
+            line-height: 30px;
+            text-align: center;
+            &.open{
+                background-color: #ECF2FE;
+                color: #0052D9;
+            }
+            &.close{
+                background-color: #0052D9;
+                color: #fff;
+            }
+        }
+        .opt-box{
+            .icon-drag,.icon-set{
+                width: 16px;
+                height: 16px;
+                margin-left: 10px;
+            }
+        }
+    } 
+}
+</style>

src/views/classify_manage/classifyEnlist.vue

@@ -1,572 +0,0 @@
-<template>
-  <div class="classify-en-box">
-    <el-card>
-      <div class="header" slot="header">
-        <div class="type-box">
-					<span @click="$emit('typeChange','1')" v-permission="permissionBtn.classifyBtn.classifyList_cnClassify">{{$t('ReportManage.CategoryList.chinese_tabs')}}</span>
-					<span class="act" v-permission="permissionBtn.enClassifyBtn.classifyList_enClassify">{{$t('ReportManage.CategoryList.english_tabs')}}</span>
-				</div>
-        <div>
-        <el-button v-if="isAddClassifyBtnShow"
-        type="primary" size="small" @click="addClassify"
-          >{{$t('ReportManage.CategoryList.add_category_btn')}}</el-button
-        >
-        <el-input
-          :placeholder="$t('ReportManage.CategoryList.category_name_ipt')"
-          v-model="searchform.key_word"
-          clearable
-          size="small"
-          style="width: 250px"
-          @change="getList"
-        >
-          <i slot="prefix" class="el-input__icon el-icon-search"></i>
-        </el-input>
-        </div>
-      </div>
-      <!-- <div class="tabs-box" :style="authTabsOpt.length>1?'':'border:none'"
-        v-if="authTabsOpt.length">
-        <span 
-          v-for="item in authTabsOpt" 
-          :key="item.val"
-          :class="item.val==aTab?'active':''"
-          @click="handleTabChange(item)"
-        >{{item.name}}</span>
-      </div> -->
-
-      <!-- v-if="authTabsOpt.length" -->
-      <el-table
-        :data="tableData"
-        v-loading="dataLoading"
-        row-class-name="tableRowClassName"
-        :element-loading-text="$t('Table.data_loading')" 
-        :default-expand-all="isexpand"
-        row-key="Id"
-        style="border: 1px solid #dcdfe6"
-        :tree-props="{ children: 'Child', hasChildren: 'hasChildren' }"
-      >
-        <el-table-column
-          v-for="item in tableColums"
-          :key="item.prop"
-          :label="item.label"
-          :width="item.widthsty"
-          :min-width="item.minwidthsty"
-          :prop="item.prop"
-          :align="item.align || 'left'"
-          :default-expand-all="isexpand"
-          row-key="Id"
-          :tree-props="{ children: 'Child', hasChildren: 'hasChildren' }"
-        >
-          <template slot-scope="{ row }">
-            <span v-if="item.prop === 'ClassifyOne'">{{
-              row.level==1 ? row.ClassifyName : "" 
-            }}</span>
-            <span v-else-if="item.prop === 'ClassifyTwo'">{{
-              row.level==2 ? row.ClassifyName : ""
-            }}</span>
-           <span v-else-if="item.prop === 'ClassifyThree'">{{
-              row.level==3 ? row.ClassifyName : ""
-            }}</span>
-
-            <div v-else-if="item.prop === 'handle'">
-              <span 
-                
-                class="editsty"
-                v-if="row.level==3&&isAuthSetBtnShow" 
-                @click="handleShowSetVariety(row)"
-              >{{$t('ReportManage.CategoryList.configuration_btn')}}</span>
-              <span class="editsty" v-if="isEditBtnShow"
-                style="margin:0 20px" @click="itemHandle('edit',row)">{{$t('Dialog.title_prefix_edit')}}</span>
-              <span class="deletesty" v-if="isDeleteBtnShow"
-                @click="itemHandle('del',row)">{{$t('Table.delete_btn')}}</span>
-            </div>
-          </template>
-        </el-table-column>
-        <div slot="empty" style="padding: 100px 0">
-          <tableNoData :text="$t('Table.prompt_slogan')" size="mini"/>
-        </div>
-      </el-table>
-
-      <el-col :span="24" class="toolbar">
-        <m-page
-          :page_no="page_no"
-          :pageSize="15"
-          :total="total"
-          @handleCurrentChange="pageChange"
-        />
-      </el-col>
-    </el-card>
-
-    <!-- 分类弹窗 -->
-    <m-dialog 
-      :title="titleShowLang(classifyForm.title)" 
-      :show.sync="classifyForm.show" 
-      width="650px"
-    >
-      <div style="padding-left: 50px">
-        <el-form 
-          :model="classifyForm" 
-          :rules="formRules" 
-          ref="formRef" 
-          label-position="left"
-          hide-required-asterisk
-          label-width="80px">
-          <!-- <el-form-item prop="type" label="所属模块">
-            <el-select 
-              v-model="classifyForm.type"
-              placeholder="请选择所属模块"
-              size="small"
-              style="width:400px;"
-              @change="FormClassifyChange"
-              :disabled="classifyForm.title=='编辑英文分类'"
-            >
-            <el-option v-for="item in authTabsOpt" :key="item.val" :label="item.name" :value="item.val"/>
-            </el-select>
-
-          </el-form-item> -->
-          <el-form-item prop="classify_name" :label="$t('ReportManage.CategoryList.category_name_ipt')">
-            <el-input 
-              type="text" 
-              v-model="classifyForm.classify_name" 
-              :placeholder="$t('ReportManage.CategoryList.please_input')" 
-              size="small" 
-              style="width:400px;"
-            />
-          </el-form-item>
-          <el-form-item prop="parent_id" :label="$t('ReportManage.CategoryList.parent_category_label')">
-            <!-- <el-select 
-              v-model="classifyForm.parent_id"
-              placeholder="请选择"
-              size="small"
-              style="width:400px;"
-            >
-              <el-option label="无" :value="0"/>
-              <el-option v-for="item in classifyparentArr" :key="item.ClassifyName" :label="item.ClassifyName" :value="item.Id"/>
-            </el-select> -->
-            <el-cascader :options="classifyparentArr" v-model="classifyForm.parent_id" :placeholder="$t('ReportManage.CategoryList.please_select')"
-            :props="{value:'Id',label:'ClassifyName',children:'Child',checkStrictly:true,emitPath:false}" style="min-width:400px;"></el-cascader>
-          </el-form-item>
-          <el-form-item :label="$t('ReportManage.CategoryList.backend_sorting_label')" prop="sort">
-            <el-input 
-              type="number" 
-              v-model="classifyForm.sort" 
-              :placeholder="$t('ReportManage.CategoryList.please_number_input')" 
-              size="small" 
-              style="width:400px;"
-            />
-          </el-form-item>
-        </el-form>
-      </div>
-      <div slot="footer" style="margin-top: 20px;">
-        <el-button
-        @click="cancelClassify"
-        style="width: 132px; height: 40px"
-        >{{$t('Dialog.cancel_btn')}}</el-button>
-        <el-button
-          @click="setClassifyHandle"
-          type="primary"
-          style="width: 132px; height: 40px"
-          >{{$t('Dialog.confirm_save_btn')}}</el-button>
-      </div>
-    </m-dialog>
-
-    <!-- 配置权限 -->
-    <el-dialog 
-      :title="$t('ReportManage.CategoryList.configuration_btn')" 
-      :visible.sync="showSetVariety" 
-      width="705px"
-      append-to-body 
-      :close-on-click-modal="false"
-    > 
-      <div style="padding:10px 40px">
-      <reportVarietyEnSet ref="varietyIns" :checked="checkedVariety" v-if="showSetVariety" />
-      </div>
-      <div style="text-align:center;padding:10px 0 30px 0">
-        <el-button type="primary" plain @click="showSetVariety=false;checkedVariety=[]">{{$t('Dialog.cancel_btn')}}</el-button>
-        <el-button type="primary" style="margin-left:20px" @click="handleSaveVariety">{{$t('Dialog.confirm_save_btn')}}</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import * as classifyEnInterface from "@/api/modules/classifyEnApi.js";
-import mPage from "@/components/mPage.vue";
-import mDialog from '@/components/mDialog.vue';
-import reportVarietyEnSet from '@/components/reportVarietyEnSet.vue'
-export default {
-  components: { mPage,mDialog,reportVarietyEnSet },
-  watch: {
-    'classifyForm.show': {
-      handler(newval) {
-        newval && this.getClassifyOne();
-      }
-    }
-  },
-  computed:{
-      //添加分类是否展示
-      isAddClassifyBtnShow(){
-          // if(this.aTab===0&&this.authTabsOpt.length){
-              return this.permissionBtn.checkPermissionBtn(
-                  this.permissionBtn.enClassifyBtn.classifyList_enClassify_rpAddClassify
-                )
-          // }
-          // if(this.aTab===1&&this.authTabsOpt.length){
-          //   return this.permissionBtn.checkPermissionBtn(
-          //         this.permissionBtn.enClassifyBtn.classifyList_enClassify_rsAddClassify
-          //       )
-          // }
-      },
-      //编辑是否展示
-      isEditBtnShow(){
-        // if(this.aTab===0){
-                return this.permissionBtn.checkPermissionBtn(
-                    this.permissionBtn.enClassifyBtn.classifyList_enClassify_rpEdit
-                )
-            // }else{
-            // return this.permissionBtn.checkPermissionBtn(
-            //         this.permissionBtn.enClassifyBtn.classifyList_enClassify_rsEdit
-            //     )
-            // }
-      },
-      //删除是否展示
-      isDeleteBtnShow(){
-        // if(this.aTab===0){
-                return this.permissionBtn.checkPermissionBtn(
-                    this.permissionBtn.enClassifyBtn.classifyList_enClassify_rpDel
-                )
-            // }else{
-            // return this.permissionBtn.checkPermissionBtn(
-            //         this.permissionBtn.enClassifyBtn.classifyList_enClassify_rsDel
-            //     )
-            // }
-      },
-      //权限设置是否展示
-      isAuthSetBtnShow(){
-        // if(this.aTab===0){
-                return this.permissionBtn.checkPermissionBtn(
-                    this.permissionBtn.enClassifyBtn.classifyList_enClassify_rpAuthSetting
-                )
-            // }else{
-            // return this.permissionBtn.checkPermissionBtn(
-            //         this.permissionBtn.enClassifyBtn.classifyList_enClassify_rsAuthSetting
-            //     )
-            // }
-      },
-      //英文研报、线上路演选项卡 - ETA1.1.7 不区分英文研报和线上路演，统一用英文研报的 按钮标识
-      // authTabsOpt(){
-      //   const isShowTabRoadshow = this.permissionBtn.checkPermissionBtn(
-      //       this.permissionBtn.enClassifyBtn.classifyList_enClassify_roadshow
-      //   )
-      //   const isShowTabReport = this.permissionBtn.checkPermissionBtn(
-      //       this.permissionBtn.enClassifyBtn.classifyList_enClassify_report
-      //   )
-      //   //没时间写更好的写法了，有空再优化
-      //   let authTabs = []
-      //   if(isShowTabReport){
-      //       authTabs.push(this.tabsOpt[0])
-      //   }
-      //   if(isShowTabRoadshow){
-      //       authTabs.push(this.tabsOpt[1])
-      //   }
-      //   return authTabs
-      // },
-      //添加分类时的选项框
-      tableColums(){
-        return [
-          {
-            label: this.$t('ReportManage.CategoryList.one_category_table') ||  "一级分类",
-            prop: "ClassifyOne",
-          },
-          {
-            label:this.$t('ReportManage.CategoryList.two_category_table') ||  "二级分类",
-            prop: "ClassifyTwo",
-          },
-          {
-            label:this.$t('ReportManage.CategoryList.three_category_table') || "三级分类",
-            prop: "ClassifyThree",
-          },
-          {
-            label:this.$t('Table.column_operations') ||  "操作",
-            prop: "handle",
-            align: "center",
-          },
-        ]
-      },
-      formRules() {
-        return {
-          classify_name: [{ required:true,message:this.$t('ReportManage.CategoryList.please_input_name'),trigger:'blur'}],
-          parent_id: [{ required:true,message:this.$t('ReportManage.smart_msg.please_enter'),trigger:'blur'}],
-          sort: [{ required:true,message:this.$t('ReportManage.CategoryList.please_number_input'),trigger:'blur'}],
-        }
-      },
-  },
-  data() {
-    return {
-      searchform: {
-        key_word: "",
-      },
-
-      dataLoading: false,
-      page_no: 1,
-      total: 0,
-      tableData: [],
-
-      
-      classifyparentArr: [],
-      classifyForm: {
-        title: '',
-        show: false,
-        classify_name: '',
-        parent_id: "0", // 数字的0，级联选择器不回显
-        sort: 1,
-        classify_id: '',
-
-        type:0
-      },
-
-
-      tabsOpt:[
-        {
-          name:'英文研报',
-          val:0
-        },
-        {
-          name:'线上路演',
-          val:1
-        }
-      ],
-      aTab:0,
-
-      isexpand:false,
-
-      showSetVariety:false,
-      checkedVariety:[],
-      activeItem:{},//当前编辑权限的分类
-    };
-  },
-
-  methods: {
-    // 弹框标题
-    titleShowLang(e){
-       if(e =='新增英文分类') return this.$t('ReportManage.add_new_en_category') 
-       if(e =='编辑分类') return this.$t('ReportManage.CategoryList.edit_category_btn')
-       return e 
-    },
-    handleShowSetVariety(item){
-      console.log(item.EnPermissions);
-      this.activeItem=item
-      this.checkedVariety=item.EnPermissions?JSON.parse(JSON.stringify(item.EnPermissions)):[]
-      this.showSetVariety=true
-    },
-    handleSaveVariety(){
-
-        let params={
-          ClassifyId:this.activeItem.Id,
-          EnPermissions:this.$refs.varietyIns.checkedItems||[]
-        }
-        // console.log(params);
-        classifyEnInterface.setClassifyVariety(params).then(res=>{
-          if(res.Ret===200){
-            this.$message.success(this.$t('MsgPrompt.set_success_msg'))
-            this.getList();
-            this.showSetVariety=false
-          }
-        })
-      },
-
-    getList() {
-      //获取列表
-      this.dataLoading = true;
-      let params = {
-        CurrentIndex: this.page_no,
-        PageSize: 15,
-        KeyWord: this.searchform.key_word,
-        // ClassifyType:this.aTab
-      };
-      classifyEnInterface.classifyList(params).then(res => {
-        this.dataLoading = false;
-        if (res.Ret === 200) {
-          this.tableData = res.Data.List || [];
-          this.total = parseInt(res.Data.Paging.Totals);
-          this.tableData.forEach((item, index) => {
-            item.level = 1
-            if (item.Child) {
-              // item.hasChildren=true;
-              // let childnode = JSON.parse(JSON.stringify(item.Child));
-              item.Child.forEach((itemchild, i) => {
-                itemchild.level = 2;
-                itemchild.Child && itemchild.Child.forEach((itemChildTwo,i)=>{
-                  itemChildTwo.level=3
-                })
-              });
-              // item.children = childnode;
-            }
-          });
-          console.log(this.tableData,'this.tableData');
-        }
-      });
-    },
-
-    addClassify() {      
-      this.classifyForm = {
-        title: '新增英文分类',
-        show: true,
-        classify_name: '',
-        parent_id: "0",
-        sort: 1,
-        type:0
-      }
-    },
-
-    /* 获取一级分类 */
-    getClassifyOne() {
-      classifyEnInterface.classifyOne({ CurrentIndex: 1, PageSize: 9999 /**,ClassifyType:this.classifyForm.type */ })
-        .then(res => {
-          if(res.Ret !== 200) return
-
-          this.classifyparentArr=res.Data.List || [];
-
-          this.classifyparentArr.unshift({Id:"0",ClassifyName:this.$i18nt.locale==='zh'?'无':'null',Child:null})
-        })
-    },
-
-    /* 操作 */
-    itemHandle(key,row) {
-      const keyMap = {
-        'edit': this.editHandle,
-        'del': this.delHandle
-      }
-
-      keyMap[key](row)
-    },
-
-    editHandle({ClassifyName,Id,ParentId,Sort,ClassifyType}) {
-      this.classifyForm = {
-        title: '编辑分类',
-        show: true,
-        classify_name: ClassifyName,
-        parent_id: ParentId==0?0+'':ParentId,//数字的0，'无'不回显
-        sort: Sort,
-        classify_id: Id,
-        type:ClassifyType
-      }
-    },
-
-    delHandle({Id,ParentId}) {
-
-      this.$confirm( this.$t('ReportManage.smart_msg.delete_it'),this.$t('Confirm.prompt'),{type:'warning'}).then(() => {
-				classifyEnInterface.classifyDel({ClassifyId:Id,ParentId}).then(res =>{
-						if( res.Ret!==200 ) return
-            
-            this.$message.success(res.Msg);
-            this.getList();
-					});
-			}).catch(() => {});
-    },
-
-    /* 日期改变 */
-    pageChange(page) {
-      this.page_no = page;
-
-      this.getList();
-    },
-
-    /* 保存分类 */
-    async setClassifyHandle() {
-      await this.$refs.formRef.validate();
-      console.log(this.classifyForm);
-      // return 
-      const { classify_name,parent_id,sort,classify_id } = this.classifyForm;
-      let params = {
-        ClassifyName: classify_name,
-        ParentId: parseInt(parent_id),
-        Sort: sort
-      }
-
-      const { Ret,Msg } = classify_id 
-        ? await classifyEnInterface.classifyEdit({...params,ClassifyId: classify_id}) 
-        : await classifyEnInterface.classifyAdd(params)
-        // : await classifyEnInterface.classifyAdd({...params,ClassifyType:this.classifyForm.type})
-
-      if(Ret !== 200) return
-      this.$message.success(Msg)
-      this.cancelClassify();
-      this.getList();
-    },
-
-    /* 取消 */
-    cancelClassify() {
-      this.$refs.formRef.resetFields();
-      this.classifyForm.show = false;
-    },
-
-    //切换分类
-    // handleTabChange(item){
-    //   this.aTab=item.val
-    //   this.page_no=1
-    //   this.searchform.key_word=''
-    //   this.getList()
-    // },
-
-    //新增分类时切换分类
-    // FormClassifyChange(){
-    //   this.classifyForm.parent_id=0
-    //   this.getClassifyOne()
-    // }
-  },
-  mounted() {
-      // if(this.authTabsOpt.length){
-      //   this.aTab = this.authTabsOpt[0].val
-        this.getList();
-      // }
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.classify-en-box {
-  .header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    .type-box{
-				span{
-					cursor: pointer;
-					display: inline-block;
-					margin-right: 50px;
-					font-size: 18px;
-					padding-bottom: 10px;
-				}
-				.act{
-					color: #409EFF;
-					border-bottom: 2px solid #409EFF;
-				}
-		}
-  }
-  .tabs-box{
-    margin-bottom: 20px;
-    width: 160px;
-    border: 1px solid #DCDFE6;
-    border-radius: 4px;
-    overflow: hidden;
-    span{
-      display: inline-block;
-      width: 80px;
-      line-height: 40px;
-      color: #666;
-      cursor: pointer;
-      text-align: center;
-    }
-    .active{
-      color: #fff;
-      background-color: #409EFF;
-    }
-  }
-}
-</style>
-<style lang="scss">
-.el-cascader .el-input{
-  width: 100%;
-}
-
-</style>

src/views/classify_manage/classifyEnlistV2.vue

@@ -0,0 +1,363 @@
+<template>
+    <div class="classify-page">
+        <div class="top-wrap">
+            <div class="type-box">
+                <div class="item" @click="$emit('typeChange','1')">中文分类</div>
+                <div class="item active">英文分类</div>
+            </div>
+            <div style="display:flex;padding:10px;gap:10px">
+            <el-button 
+                type="primary"
+                @click="addClassify"
+                v-permission="permissionBtn.enClassifyBtn.classifyList_enClassify_add"
+            >添加分类</el-button>
+            <el-input placeholder="分类名称" v-model="searchVal" style="max-width: 262px;" @change="getList" clearable>
+                <i slot="prefix" class="el-input__icon el-icon-search"></i>
+            </el-input>
+            </div>
+        </div>
+        <div class="content-box">
+            <el-tree
+			    :data="list"
+				node-key="Id"
+                :props="{
+                    label: 'ClassifyName',
+                    children: 'Child'
+                }"
+				check-strictly
+				empty-text="暂无数据"
+                draggable
+                indent='76'
+                :allow-drop="canDropHandle"
+                @node-drop="dropOverHandle"
+			>
+				<div
+					class="classify-item-wrap"
+					slot-scope="{ node, data }"
+				>
+                    <div>
+                        <span :class="['tag', data.Enabled==1?'open':'close']" @click.stop="handleEnableSet(data)">{{data.Enabled==1?'启用':'禁用'}}</span>
+                        <span>{{data.ClassifyName}}</span>
+                    </div>
+					
+                    <div class="opt-box">
+                        <img class="icon-drag" src="~@/assets/img/data_m/move_ico2.png" alt="">
+                        <img class="icon-set" src="~@/assets/img/icons/variety_set.png" alt="" @click.stop="handleEdit(data,node)" v-permission="permissionBtn.enClassifyBtn.classifyList_enClassify_edit">
+                    </div>
+				</div>
+			</el-tree>
+        </div>
+
+        <!-- 分类弹窗 -->
+        <m-dialog 
+            :title="classifyForm.classify_id?'编辑分类':'新增分类'" 
+            :show.sync="classifyForm.show" 
+            width="650px"
+        >
+            <div style="padding-left: 50px">
+                <el-form 
+                    :model="classifyForm" 
+                    :rules="formRules" 
+                    ref="formRef" 
+                    label-position="left"
+                    hide-required-asterisk
+                    label-width="90px">
+                    <el-form-item prop="classify_name" label="分类名称">
+                        <el-input 
+                            type="text" 
+                            v-model="classifyForm.classify_name" 
+                            placeholder="请输入分类名称"
+                            style="width:400px;"
+                        />
+                    </el-form-item>
+                    <el-form-item prop="parent_id" label="上级分类">
+                        <el-cascader :options="classifyparentArr" v-model="classifyForm.parent_id" placeholder="请选择"
+                        :props="{value:'Id',label:'ClassifyName',children:'Child',checkStrictly:true,emitPath:false}" style="min-width:400px;"></el-cascader>
+                    </el-form-item>
+                    <el-form-item prop="variety" label="关联品种" v-if="classifyForm.level==3&&permissionBtn.enClassifyBtn.classifyList_enClassify_connect_variety">
+                        <template slot="label">
+                            <el-tooltip class="item" effect="dark" content="控制报告阅读权限">
+                                <div>
+                                    <span>关联品种</span>
+                                    <i class="el-icon-info"></i>
+                                </div>
+                            </el-tooltip>
+                        </template>
+                        <el-cascader
+                            :options="reportVarietyList" 
+                            v-model="classifyForm.variety" 
+                            placeholder="请选择"
+                            collapse-tags
+                            :props="{value:'PermissionId',label:'PermissionName',children:'Child',multiple: true,emitPath:false}" 
+                            style="min-width:400px;"
+                        ></el-cascader>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div slot="footer" style="margin-top: 20px;">
+                <el-button
+                @click="cancelClassify"
+                style="width: 132px; height: 40px"
+                >取消</el-button>
+                <el-button
+                @click="setClassifyHandle"
+                type="primary"
+                style="width: 132px; height: 40px"
+                >保存</el-button>
+            </div>
+        </m-dialog>
+    </div>
+</template>
+
+<script>
+import draggable from 'vuedraggable';
+import mDialog from '@/components/mDialog.vue';
+import {reportVarietyENInterence} from '@/api/modules/reportVariety'
+import * as classifyEnInterface from "@/api/modules/classifyEnApi.js";
+export default {
+    components:{draggable,mDialog},
+    data() {
+        return {
+            typeVal:1,
+            searchVal:'',
+            list:[],
+
+            classifyForm:{
+                show:false,
+                classify_id:0,
+                classify_name:"",
+                parent_id: '', 
+                variety:'',//关联的品种
+                level:1
+            },
+            formRules: {
+                classify_name: [{ required:true,message:'请输入分类名称',trigger:'blur'}]
+            },
+            classifyparentArr:[],
+
+            reportVarietyList:[],//英文品种列表
+        }
+    },
+    mounted(){
+        this.getList('init')
+        this.getReportVarietyList()
+    },
+    methods: {
+        async getList(type){
+            const res=await classifyEnInterface.classifyList({
+                KeyWord:this.searchVal
+            })
+            if(res.Ret===200){
+                this.list=res.Data.List||[]
+                if(type==='init'){
+                    const arr=JSON.parse(JSON.stringify(this.list))
+                    this.classifyparentArr=arr.map(item=>{
+                        item.Child&&item.Child.forEach(_item=>{
+                            _item.Child=null
+                        })
+                        return {
+                            ...item
+                        }
+                    })
+                    this.classifyparentArr.unshift({Id:'0',ClassifyName:'无',Child:null})
+                }
+            }
+        },
+        
+
+        //启用\禁用设置
+        handleEnableSet(item){
+            // 判断权限
+            const {enClassifyBtn,checkPermissionBtn} = this.permissionBtn
+            if(!checkPermissionBtn(enClassifyBtn.classifyList_enClassify_enable)) return
+
+            classifyEnInterface.enableSet({
+                ClassifyId:item.Id,
+                Enabled:item.Enabled==1?0:1
+            }).then(res=>{
+                if(res.Ret===200){
+                    this.$message.success('设置成功')
+                    this.getList('init')
+                }
+            })
+        },
+
+        addClassify(){
+            this.classifyForm={
+                show:true,
+                classify_id:0,
+                classify_name:"",
+                parent_id: '0',
+                variety:'',//关联的品种
+            }
+        },
+        handleEdit(item,node){
+            this.classifyForm={
+                show:true,
+                classify_id:item.Id,
+                classify_name:item.ClassifyName,
+                parent_id: item.ParentId||'0',
+                variety:item.EnPermissions||'',//关联的品种
+                level:node.level
+            }
+        },
+        async setClassifyHandle(){
+            await this.$refs.formRef.validate();
+            const { classify_name,parent_id,sort,classify_id } = this.classifyForm;
+            let params = {
+                ClassifyName: classify_name,
+                ParentId: Number(parent_id)||0,
+                EnPermissions:this.classifyForm.variety||[]
+            }
+            // console.log(params);
+
+            const { Ret,Msg } = classify_id 
+                ? await classifyEnInterface.classifyEdit({...params,ClassifyId: classify_id}) 
+                : await classifyEnInterface.classifyAdd(params)
+
+            if(Ret !== 200) return
+            this.$message.success(Msg)
+            this.cancelClassify();
+            this.getList('init');
+        },
+        /* 取消 */
+        cancelClassify() {
+            this.$refs.formRef.resetFields();
+            this.classifyForm.show = false;
+        },
+
+        // 获取品种数据
+        getReportVarietyList(){
+            reportVarietyENInterence.filterVarietyOpts().then(res=>{
+                this.reportVarietyList=res.Data||[]
+            })
+        },
+
+        //控制只能同级拖动
+        canDropHandle(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
+        },
+
+        //拖动结束
+        dropOverHandle(b,a,i,e) {
+            // 被拖拽节点对应的 Node、结束拖拽时最后进入的节点、被拖拽节点的放置位置
+            const classifyId=b.data.Id
+            let list=a.parent.childNodes;
+            let PrevClassifyId=0,NextClassifyId=0,targetIndex=0;
+            list.forEach((item,index) => {
+                if(item.data.Id===classifyId){
+                    targetIndex=index
+                }
+            });
+            if(targetIndex===0){
+                NextClassifyId=list[1].data.Id
+            }else if(targetIndex===list.length-1){
+                PrevClassifyId=list[list.length-1].data.Id
+            }else{
+                PrevClassifyId=list[targetIndex-1].data.Id
+                NextClassifyId=list[targetIndex+1].data.Id
+            }
+
+            const params={
+                ClassifyId:classifyId,
+                PrevClassifyId,
+                NextClassifyId
+            }
+            console.log(params);
+            classifyEnInterface.moveSort(params).then(res=>{
+                if(res.Ret===200){
+                    this.$message.success('移动成功')
+                }else{
+                    this.getList()
+                }
+            })
+        },
+    },
+}
+</script>
+
+<style lang="scss">
+.el-cascader .el-input{
+  width: 100%;
+}
+.classify-page{
+    .content-box{
+        .el-tree-node__content{
+            padding-top: 10px;
+            padding-bottom: 10px;
+            border-bottom: 1px solid #C8CDD9;
+        }
+    }
+}
+
+</style>
+<style lang="scss" scoped>
+.top-wrap{
+    display: flex;
+    justify-content: space-between;
+    background: #FFFFFF;
+    border-radius: 4px;
+    .type-box{
+        display: flex;
+        .item{
+            position: relative;
+            cursor: pointer;
+            color: #666;
+            min-width: 88px;
+            line-height: 60px;
+            text-align: center;
+        }
+        .active{
+            color: #0052D9;
+            &::after{
+                content: '';
+                display: block;
+                width: 100%;
+                height: 2px;
+                position: absolute;
+                bottom: 0px;
+                left: 0;
+                background-color: #0052D9;
+            }
+        }
+    }
+}
+.content-box{
+    padding: 20px;
+    margin-top: 20px;
+    height: calc(100vh - 230px);
+    overflow-y: auto;
+    background-color: #FFFFFF;
+    .classify-item-wrap{
+        flex: 1;
+        padding-right: 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .tag{
+            display: inline-block;
+            min-width: 76px;
+            line-height: 30px;
+            text-align: center;
+            &.open{
+                background-color: #ECF2FE;
+                color: #0052D9;
+            }
+            &.close{
+                background-color: #0052D9;
+                color: #fff;
+            }
+        }
+        .opt-box{
+            .icon-drag,.icon-set{
+                width: 16px;
+                height: 16px;
+                margin-left: 10px;
+            }
+        }
+    } 
+}
+</style>

src/views/classify_manage/classifylist.vue

@@ -1,959 +0,0 @@
-<template>
-	<div id="classifylist">
-		<el-card class="box-card">
-			<div slot="header" class="header">
-				<div class="type-box">
-					<span class="act" v-permission="permissionBtn.classifyBtn.classifyList_cnClassify">{{this.$t('ReportManage.CategoryList.chinese_tabs')}}</span>
-					<span @click="$emit('typeChange','2')" v-permission="permissionBtn.enClassifyBtn.classifyList_enClassify">{{this.$t('ReportManage.CategoryList.english_tabs')}}</span>
-				</div>
-				<el-form :inline="true" :model="searchform" @submit.native.prevent>
-					<el-form-item label="">
-						<el-button v-permission="permissionBtn.classifyBtn.classifyList_cnClassify_classifyAdd"
-                            type="primary" size="small" @click="aeDialogTrue">{{$t('ReportManage.CategoryList.add_category_btn')}}</el-button>
-					</el-form-item>
-		  			<el-form-item>
-						<el-input :placeholder="$t('ReportManage.CategoryList.category_name_ipt')" @change="search" v-model="searchform.key_word" clearable size="small">
-							<i class="el-icon-search" slot="prefix" @click="search"></i>
-						</el-input>
-					</el-form-item>
-		  		</el-form>
-			</div>
-			<template>
-				<el-table v-if="isTableShow"
-                    style="border:1px solid #eaeaea;" :data="tableData" v-loading="listLoading" :row-class-name="tableRowClassName" :element-loading-text="$t('Table.data_loading')" :default-expand-all='isexpand' row-key="Id" :tree-props="{children:'children',hasChildren:'hasChildren'}">
-					<!-- <el-table-column prop="id" label="序号" width="100px" align="left">
-						<template slot-scope="scope">
-							<span>{{scope.row.ischild?'':scope.row.id}}</span>
-						</template>
-					</el-table-column> -->
-					<el-table-column prop="classify_name" :label="$t('ReportManage.CategoryList.one_category_table')">
-						<template slot-scope="scope">
-							<span>{{scope.row.ischild?'':scope.row.ClassifyName}}</span>
-							<img style="width:16px;position: relative;top:3px" src="../../assets/img/icons/ppt-icon.png" alt="" v-if="!scope.row.ischild&&scope.row.HasTeleconference">
-						</template>
-					</el-table-column>
-					<el-table-column prop="classify_name" :label="$t('ReportManage.CategoryList.two_category_table')">
-						<template slot-scope="scope">
-							<span>{{scope.row.ischild?scope.row.ClassifyName:''}}</span>
-							<img style="width:16px;position: relative;top:3px" src="../../assets/img/icons/ppt-icon.png" alt="" v-if="scope.row.ischild&&scope.row.HasTeleconference">
-						</template>
-					</el-table-column>
-					<el-table-column :label="$t('Table.column_operations')" align="center">
-						<template slot-scope="scope">
-							<div style="color:#4099ef; font-size:24px;">
-								<span class="editsty" v-permission="permissionBtn.classifyBtn.classifyList_cnClassify_chapterSetting"
-                                    v-if="scope.row.ClassifyName=='晨报' || scope.row.ClassifyName=='周报'" @click="chapterSetting(scope.row)">{{$t('ReportManage.CategoryList.settings_chapter_btn')}}</span>
-								<span class="editsty" v-permission="permissionBtn.classifyBtn.classifyList_cnClassify_authSetting"
-                                    :class="{'editedsty' : editedItems.includes(scope.row.Id)}" v-if="scope.row.ischild" @click="configitem(scope.row)">{{$t('ReportManage.CategoryList.configuration_btn')}}</span>
-								&nbsp;&nbsp;
-								<!-- <i class="el-icon-edit-outline" @click="edititem(scope.row)"></i> -->
-								<span class="editsty" v-permission="permissionBtn.classifyBtn.classifyList_cnClassify_classifyAdd"
-                                    @click="edititem(scope.row)">{{$t('Table.edit_btn')}}</span>
-								&nbsp;&nbsp;
-								<!-- <i class="el-icon-delete" @click="checkdeleteitem(scope.row)"></i> -->
-								<span v-permission="permissionBtn.classifyBtn.classifyList_cnClassify_classifyDel"
-                                    class="deletesty" @click="checkdeleteitem(scope.row)">{{$t('Table.delete_btn')}}</span>
-							</div>
-		  	    		</template>
-					</el-table-column>
-				</el-table>
-			</template>
-			<el-col :span="24" class="toolbar" v-if="isTableShow">
-		  		<el-pagination v-if="ispage" layout="total,prev,pager,next,jumper" background @current-change="handleCurrentChange" :page-size="pageSize" @size-change="handleSizeChange" :total="total" style="float:right;"></el-pagination>
-		  	</el-col>
-		</el-card>
-		<!-- 添加分类弹框 -->
-		<el-dialog :modal-append-to-body='false' :title="isadd? $t('ReportManage.CategoryList.add_category_btn') : $t('ReportManage.CategoryList.edit_category_btn') " :visible.sync="aeDialog" :close-on-click-modal="false" :center="true" v-dialogDrag custom-class="dialogclassLog" width="700px">
-			<div slot="title" style="display:flex;alignItems:center;">
-				<img :src="isadd?$icons.add:$icons.edit" style="color:#fff;width:16px;height:16px;marginRight:5px;">
-				<span style="fontSize:16px;">{{isadd? $t('ReportManage.CategoryList.add_category_btn'): $t('ReportManage.CategoryList.edit_category_btn')}}</span>
-			</div>
-			<el-form :model="aeForm" :rules="aerules" ref="aeForm" label-position="right" label-width="140px" class="aeForm"  @submit.native.prevent>
-				<el-form-item prop="classify_name" :label="$t('ReportManage.CategoryList.category_name_ipt')">
-					<el-input type="text" v-model="aeForm.classify_name" :placeholder="$t('ReportManage.CategoryList.please_input')" size="small" style="width:400px;"></el-input>
-				</el-form-item>
-				<el-form-item prop="parent_id" :label="$t('ReportManage.CategoryList.parent_category_label')">
-					<el-select v-model="aeForm.parent_id" :placeholder="$t('ReportManage.CategoryList.please_input')" size="small" style="width:400px;" @change="parentSelectChange(aeForm.parent_id)">
-						<el-option :label="$i18nt.locale==='zh'?'无':'null'" :value="0"></el-option>
-						<el-option v-for="(item,index) in classifyparentArr" :key="index" :label="item.ClassifyName" :value="item.Id"></el-option>
-					</el-select>
-				</el-form-item>
-				<!-- 下面的表单项除了后台排序，都合成一个buttoncode判断：classifyList_cnClassify_childMenu -->
-				<template v-if="permissionBtn.checkPermissionBtn(permissionBtn.classifyBtn.classifyList_cnClassify_childMenu)">
-					<!-- 一级目录子目录 -->
-					<el-form-item :label="$t('ReportManage.CategoryList.subdirectory_label')"
-						v-if="aeForm.parent_id==0&&aeForm.showType==1">
-						<draggable v-model="ClassifyMenuList" animation="300">
-							<div style="display:inline-block;margin-right:5px" v-for="(item,index) in ClassifyMenuList" :key="item">
-								<el-input
-									v-if="item.inputVisible"
-									v-model="item.MenuName"
-									ref="itemINput"
-									size="small"
-									style="width: 90px;"
-									:autofocus="true"
-									@keyup.enter.native="item.inputVisible=false"
-									@blur="item.inputVisible=false"
-								></el-input>
-								<el-tag
-									v-else
-									closable
-									:disable-transitions="false"
-									@click="showInput(index)"
-									@close="handleClose(index)">
-									{{item.MenuName}}
-								</el-tag>
-							</div>
-						</draggable>
-						<div>
-							<el-input
-								v-if="inputVisible"
-								v-model="inputValue"
-								ref="saveTagInput"
-								size="small"
-								@keyup.enter.native="handleInputConfirm"
-								@blur="handleInputConfirm"
-								style="width: 90px;"
-							>
-							</el-input>
-							<el-button v-else size="small" @click="showInput(-1)">+ {{$t('ReportManage.CategoryList.click_to_add_btn')}}</el-button>
-						</div>
-						
-					</el-form-item>
-					<!-- 二级目录子目录 -->
-					<el-form-item :label="$t('ReportManage.CategoryList.subdirectory_label')" 
-						v-if="aeForm.parent_id!=0">
-						<el-select v-model="aeForm.ClassifyMenuId"  clearable :placeholder="$t('ReportManage.CategoryList.please_select')" style="width:400px;">
-							<el-option 
-								:label="item.MenuName" 
-								:value="item.MenuId" 
-								v-for="item in selectMenuOpt" 
-								:key="item.MenuId"
-							></el-option>
-						</el-select>
-					</el-form-item>
-				</template>
-				<template v-if="permissionBtn.checkPermissionBtn(permissionBtn.classifyBtn.classifyList_cnClassify_childMenu)">
-					<el-form-item prop="label" :label="$t('ReportManage.CategoryList.category_tag_label')" v-if="aeForm.parent_id!=0">
-						<el-input type="textarea" autosize v-model="aeForm.label" :placeholder="$t('ReportManage.CategoryList.please_select')" size="small" style="width:400px;font-size:14px;"></el-input>
-					</el-form-item>
-					<el-form-item :label="$t('ReportManage.CategoryList.display_form_label')"
-						prop="showType" v-if="aeForm.parent_id==0">
-						<el-select v-model="aeForm.showType" :placeholder="$t('ReportManage.CategoryList.please_select')" style="width:400px;">
-							<el-option :label="$t('ReportManage.CategoryList.form_list_option')" :value="1"></el-option>
-							<el-option :label="$t('ReportManage.CategoryList.form_column_option')" :value="2"></el-option>
-							<el-option :label="$t('ReportManage.CategoryList.form_product_option')" :value="3"></el-option>
-						</el-select>
-					</el-form-item>
-				</template>
-				<el-form-item :label="$t('ReportManage.CategoryList.backend_sorting_label')"
-                    prop="Sort" v-if="aeForm.parent_id==0&&permissionBtn.checkPermissionBtn(permissionBtn.classifyBtn.classifyList_cnClassify_backSort)">
-					<el-input-number v-model="aeForm.Sort" :placeholder="$t('ReportManage.CategoryList.please_number_input')"></el-input-number>
-				</el-form-item>
-				<template v-if="permissionBtn.checkPermissionBtn(permissionBtn.classifyBtn.classifyList_cnClassify_childMenu)">
-					<el-form-item :label="$t('ReportManage.CategoryList.page_sorting_label')"
-                    prop="YbFiccSort" v-if="aeForm.parent_id==0">
-					<el-input-number v-model="aeForm.YbFiccSort" :placeholder="$t('ReportManage.CategoryList.please_number_input')"></el-input-number>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.page_icon_label')"
-                    v-if="aeForm.parent_id==0" prop="YbFiccIcon">
-					<input type="file" size="small" name="file" @change="fileSelected(6)" id="file6" class="true-file" style="display:none;">
-					<el-input readonly type="text" v-model="aeForm.YbFiccIcon" placeholder="上传FICC页icon" size="medium" style="width:400px;">
-						<el-button slot="append" type="primary" size="mini" @click.native="clickinput(6)">{{$t('ReportManage.CategoryList.select_img_btn')}}</el-button>
-					</el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.collection_report_label')"
-					v-if="aeForm.parent_id==0&&aeForm.showType!==2" prop="YbRightBanner">
-					<input type="file" size="small" name="file" @change="fileSelected(11)" id="file11" class="true-file" style="display:none;">
-					<el-input readonly type="text" v-model="aeForm.YbRightBanner" :placeholder="$t('ReportManage.CategoryList.up_collection_report_lable')" size="medium" style="width:400px;">
-					  <el-button slot="append" type="primary" size="mini" @click.native="clickinput(11)">{{$t('ReportManage.CategoryList.select_img_btn')}}</el-button>
-				  </el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.share_link_label')" 
-					prop="YbShareBgImg" v-if="aeForm.parent_id==0">
-					<input type="file" size="small" name="file" @change="fileSelected(10)" id="file10" class="true-file" style="display:none;">
-					<el-input readonly type="text" v-model="aeForm.YbShareBgImg" :placeholder="$t('ReportManage.CategoryList.up_share_link_label')" size="medium" style="width:400px;">
-						<el-button slot="append" type="primary" size="mini" @click.native="clickinput(10)">{{$t('ReportManage.CategoryList.select_img_btn')}}</el-button>
-					</el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.pc_bg_label')"
-					prop="YbFiccPcIcon" v-if="aeForm.parent_id==0">
-					<el-select v-model="aeForm.YbFiccPcIcon" :placeholder="$t('ReportManage.CategoryList.select_bg_label')" style="width:400px;">
-						<el-option :label="item.label" :value="item.val" v-for="item in YbFiccPcIconList" :key="item.label"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.mini_hidden_label')"
-					prop="IsShow" v-if="aeForm.parent_id==0">
-					<el-switch v-model="aeForm.IsShow" inactive-color="#ededed"></el-switch>
-				</el-form-item>
-				<el-form-item label="PPT转报告" prop="hasTel" v-if="aeForm.parent_id!=0">
-					<el-select v-model="aeForm.hasTel" :placeholder="$t('ReportManage.CategoryList.please_select')" style="width:400px;">
-						<el-option label="无" :value="0"></el-option>
-						<el-option label="有" :value="1"></el-option>
-					</el-select>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.related_settings_label')" 
-					prop="relate" v-if="!['晨报','周报'].includes(aeForm.classify_name)">
-					<el-select v-model="aeForm.relate" multiple :placeholder="$t('ReportManage.CategoryList.please_select')" style="width:400px;">
-						<el-option :label="$t('ReportManage.CategoryList.teleconference_label')" :value="1"></el-option>
-						<el-option :label="$t('ReportManage.CategoryList.relate_videp_label')" :value="2"></el-option>
-					</el-select>
-				</el-form-item>
-				</template>
-				<!-- 这里开始是二级目录选项 -->
-				<template v-if="permissionBtn.checkPermissionBtn(permissionBtn.classifyBtn.classifyList_cnClassify_childMenu)">
-					<el-form-item :label="$t('ReportManage.CategoryList.share_desctription_label')" v-if="aeForm.parent_id!=0">
-					<el-input type="textarea" autosize v-model="aeForm.descript" :placeholder="$t('ReportManage.CategoryList.please_input')" size="small" style="width:400px;font-size:14px;"></el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.section_author_label')" v-if="aeForm.parent_id!=0&&!parentIsList&&!parentIsVariety" prop="author">
-					<el-input type="text" v-model="aeForm.author" :placeholder="$t('ReportManage.CategoryList.please_input')" size="small" style="width:400px;"></el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.author_introduction_label')" v-if="aeForm.parent_id!=0&&!parentIsList&&!parentIsVariety" prop="authorDsec">
-					<el-input type="text" v-model="aeForm.authorDsec" :placeholder="$t('ReportManage.CategoryList.please_input')" size="small" style="width:400px;"></el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.author_title_label')" v-if="aeForm.parent_id!=0&&!parentIsList&&!parentIsVariety" prop="authorTag">
-					<el-input type="text" v-model="aeForm.authorTag" :placeholder="$t('ReportManage.CategoryList.please_input')" size="small" style="width:400px;"></el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.section_author_label')" v-if="aeForm.parent_id!=0&&!parentIsList&&!parentIsVariety" prop="classifyDsec">
-					<el-input type="textarea" v-model="aeForm.classifyDsec" :placeholder="$t('ReportManage.CategoryList.please_input')" size="small" style="width:400px;font-size:14px;" autosize></el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.share_link_label')" v-if="aeForm.parent_id!=0&&!parentIsList&&!parentIsVariety" prop="YbShareBgImg">
-					<input type="file" size="small" name="file" @change="fileSelected(10)" id="file10" class="true-file" style="display:none;">
-					<el-input readonly type="text" v-model="aeForm.YbShareBgImg" :placeholder="$t('ReportManage.CategoryList.up_share_link_label')" size="medium" style="width:400px;">
-						<el-button slot="append" type="primary" size="mini" @click.native="clickinput(10)">{{$t('ReportManage.CategoryList.select_img_btn')}}</el-button>
-					</el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.homepage_illustrations_label')" v-if="aeForm.parent_id!=0&&!parentIsList&&!parentIsVariety" prop="classifyImg">
-					<input type="file" size="small" name="file" @change="fileSelected(1)" id="file1" class="true-file" style="display:none;">
-					<el-input type="text" v-model="aeForm.classifyImg" :placeholder="$t('ReportManage.CategoryList.up_homepage_illustrations')" size="medium" style="width:400px;">
-						<el-button slot="append" type="primary" size="mini" @click.native="clickinput(1)">{{$t('ReportManage.CategoryList.select_img_btn')}}</el-button>
-					</el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.report_illustrations_label')" v-if="aeForm.parent_id!=0&&!parentIsList&&!parentIsVariety" prop="reportImg">
-					<input type="file" size="small" name="file" @change="fileSelected(5)" id="file5" class="true-file" style="display:none;">
-					<el-input type="text" v-model="aeForm.reportImg" :placeholder="$t('ReportManage.CategoryList.up_report_illustrations')" size="medium" style="width:400px;">
-						<el-button slot="append" type="primary" size="mini" @click.native="clickinput(5)">{{$t('ReportManage.CategoryList.select_img_btn')}}</el-button>
-					</el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.column_illustration_label')" v-if="aeForm.parent_id!=0&&!parentIsList&&!parentIsVariety" prop="columImg">
-					<input type="file" size="small" name="file" @change="fileSelected(4)" id="file4" class="true-file" style="display:none;">
-					<el-input type="text" v-model="aeForm.columImg" :placeholder="$t('ReportManage.CategoryList.up_scolumn_illustration')" size="medium" style="width:400px;">
-						<el-button slot="append" type="primary" size="mini" @click.native="clickinput(4)">{{$t('ReportManage.CategoryList.select_img_btn')}}</el-button>
-					</el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.banner_head_label')" v-if="aeForm.parent_id!=0&&!parentIsList&&!parentIsVariety" prop="bannerImg">
-					<input type="file" size="small" name="file" @change="fileSelected(2)" id="file2" class="true-file" style="display:none;">
-					<el-input type="text" v-model="aeForm.bannerImg" :placeholder="$t('ReportManage.CategoryList.up_banner_head')" size="medium" style="width:400px;">
-						<el-button slot="append" type="primary" size="mini" @click.native="clickinput(2)">{{$t('ReportManage.CategoryList.select_img_btn')}}</el-button>
-					</el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.img_author_label')" v-if="aeForm.parent_id!=0&&!parentIsList&&!parentIsVariety" prop="avatar">
-					<input type="file" size="small" name="file" @change="fileSelected(3)" id="file3" class="true-file" style="display:none;">
-					<el-input type="text" v-model="aeForm.avatar" :placeholder="$t('ReportManage.CategoryList.up_img_author')" size="medium" style="width:400px;">
-						<el-button  slot="append" type="primary" size="mini" @click.native="clickinput(3)">{{$t('ReportManage.CategoryList.select_img_btn')}}</el-button>
-					</el-input>
-				</el-form-item>
-				<el-form-item :label="$t('ReportManage.CategoryList.list_background_image_label')" v-if="aeForm.parent_id!=0&&(parentIsList||parentIsVariety)" prop="YbListImg">
-					<input type="file" size="small" name="file" @change="fileSelected(9)" id="file9" class="true-file" style="display:none;">
-					<el-input readonly type="text" v-model="aeForm.YbListImg" :placeholder="$t('ReportManage.CategoryList.up_list_background_image')" size="medium" style="width:400px;">
-						<el-button slot="append" type="primary" size="mini" @click.native="clickinput(9)">{{$t('ReportManage.CategoryList.select_img_btn')}}</el-button>
-					</el-input>
-				</el-form-item>
-				<!-- 列表、品种的二级分类 展示分享链接配图 但是不是必填的 -->
-				<el-form-item :label="$t('ReportManage.CategoryList.share_link_label')" prop="YbShareBgImg_" v-if="aeForm.parent_id!=0&&(parentIsList||parentIsVariety)">
-					<input type="file" size="small" name="file" @change="fileSelected(12)" id="file12" class="true-file" style="display:none;">
-					<el-input readonly type="text" v-model="aeForm.YbShareBgImg_" :placeholder="$t('ReportManage.CategoryList.xxxxx')" size="medium" style="width:400px;">
-						<el-button slot="append" type="primary" size="mini" @click.native="clickinput(12)">{{$t('ReportManage.CategoryList.up_share_link_label')}}</el-button>
-					</el-input>
-				</el-form-item>
-				</template>
-			</el-form>
-			<div slot="footer" class="dialog-footer" style="text-align:right;">
-				<el-button type="primary" plain size="small" @click.native="aeDialog=false">{{$t('Dialog.cancel_btn')}}</el-button>
-				<el-button type="primary" size="small" @click.native="saveDialog">{{$t('Dialog.confirm_save_btn')}}</el-button>
-			</div>
-		</el-dialog>
-		<!-- 权限配置弹窗 -->
-		<PermissionDialog :isShow.sync="isShowPermissionDia" :id="classifyPermissionId" @saveConfig="saveConfig"/>
-	</div>
-</template>
-
-<script>
-import { classifylist,classifyparent,classifyadd,classifydelete,classifyedit,checkDeleteClassify,bannerupload } from 'api/api.js';
-import PermissionDialog from './components/PermissionDialog.vue'
-import draggable from 'vuedraggable';
-export default{
-	computed:{
-		parentIsList(){
-			//当前上级分类是否为列表
-			let flag=false
-			if(this.aeDialog){
-				this.classifyparentArr.forEach(item=>{
-					if(item.Id==this.aeForm.parent_id){
-						if(item.ShowType==1){
-							flag=true
-						}
-					}
-				})
-			}
-			return flag
-		},
-		parentIsVariety(){
-			//当前上级分类是否为品种
-			let flag=false
-			if(this.aeDialog){
-				this.classifyparentArr.forEach(item=>{
-					if(item.Id==this.aeForm.parent_id){
-						if(item.ShowType==3){
-							flag=true
-						}
-					}
-				})
-			}
-			return flag
-		},
-		selectMenuOpt(){
-			let arr=[]
-			if(this.aeDialog){
-				this.classifyparentArr.forEach(item=>{
-					if(item.Id==this.aeForm.parent_id){
-						arr=item.ClassifyMenuList||[]
-					}
-				})
-			}
-			return arr
-		},
-        //通过计算属性判断是否展示
-        //当没有中文分类页面权限时，啥都不展示
-        isTableShow(){
-            return this.permissionBtn.checkPermissionBtn(
-                this.permissionBtn.classifyBtn.classifyList_cnClassify
-            )
-        },
-		aerules(){
-			return {
-				classify_name:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_input_name'),
-					trigger:'blur'
-				}],
-				parent_id:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_select_category'),
-					trigger:'change'
-				}],
-				abstract:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_input_introduction'),
-					trigger:'blur'
-				}],
-				descript:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_input_description'),
-					trigger:'blur'
-				}],
-				author:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_author_ipt'),
-					trigger:'blur'
-				}],
-				authorDsec:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_author_introduction_ipt'),
-					trigger:'blur'
-				}],
-				classifyDsec:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_input_column_introduction'),
-					trigger:'blur'
-				}],
-				classifyImg:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.up_homepage_illustrations'),
-					trigger:'blur'
-				}],
-				reportImg:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.up_report_illustrations'),
-					trigger:'blur'
-				}],
-				bannerImg:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.up_banner_head'),
-					trigger:'blur'
-				}],
-				avatar:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.up_img_author'),
-					trigger:'blur'
-				}],
-				columImg:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.up_scolumn_illustration'),
-					trigger:'blur'
-				}],
-				label:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_classification_label'),
-					trigger:'blur'
-				}],
-				hasTel:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_select'),
-					trigger:'change'
-				}],
-				showType:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_display_format'),
-					trigger:'change'
-				}],
-				Sort:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_number_input'),
-					trigger:'blur'
-				}],
-				YbFiccSort:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_number_input'),
-					trigger:'blur'
-				}],
-				YbFiccIcon:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.up_page_icon_label'),
-					trigger:'change'
-				}],
-        	YbRightBanner:[{
-			required:true,
-						message:this.$t('ReportManage.CategoryList.up_collection_report_lable'),
-						trigger:'change'
-			}],
-				YbFiccPcIcon:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.select_bg_label'),
-					trigger:'change'
-				}],
-				IsShow:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.mini_hidden_label'),
-					trigger:'change'
-				}],
-				YbListImg:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_upload_label'),
-					trigger:'change'
-				}],
-				YbShareBgImg:[{
-					required:true,
-					message:this.$t('ReportManage.CategoryList.please_upload_label'),
-					trigger:'change'
-				}],
-			}
-		},
-		YbFiccPcIconList(){
-			return [
-				{
-					label:this.$t('ReportManage.CategoryList.blue_color'),
-					val:'https://hzstatic.hzinsights.com/static/yb_wx/ficc_classify_bg_blue.png'
-				},
-				{
-					label:this.$t('ReportManage.CategoryList.green_color'),
-					val:'https://hzstatic.hzinsights.com/static/yb_wx/ficc_classify_bg_green.png'
-				},
-				{
-					label:this.$t('ReportManage.CategoryList.red_color'),
-					val:'https://hzstatic.hzinsights.com/static/yb_wx/ficc_classify_bg_orange.png'
-				},
-			]
-		},
-	},
-	data(){
-		return {
-			PageIndex:0,
-			total:0,
-			pageSize:15,
-			ispage:true,
-			listLoading:false,
-			tableData:[],
-			searchform:{
-				key_word:'',
-			}, 
-			aeDialog:false,
-			aeForm:{
-				classify_name:'',
-				parent_id:0,
-				abstract:'',
-				descript:'',
-				author:'',
-				authorDsec:'',
-				classifyDsec:'',
-				authorTag:'',
-				classifyImg:'',
-				reportImg:'',
-				columImg:'',
-				bannerImg:'',
-				avatar:'',
-				label:"",
-				hasTel:0,//是否有电话会：0-否 1-是
-				showType:1,//展示形式 1-列表 2-专栏 3-品种
-				Sort:'',
-				YbFiccSort:'',
-				YbFiccIcon:'',
-				YbIconUrl:'',
-				YbBgUrl:'',
-				YbFiccPcIcon:'',
-				IsShow:false,//是否在小程序端展示：0-隐藏 1-显示
-				YbListImg:'',//小程序研报列表封面图
-				YbShareBgImg:'',
-				ClassifyMenuId:'',
-        		YbRightBanner:'',//报告合集配图
-				relate:[],
-			},
-			isadd:true,
-			classifyparentArr:[],
-			isexpand:false,
-			isShowPermissionDia: false,	//是否显示权限管理弹窗
-			classifyPermissionId: 0,	//进行权限管理的分类id
-			editedItems:[],	//修改过权限的分类
-
-			inputVisible:false,
-			inputValue:'',
-			ClassifyMenuList:[],
-		}
-	},
-	components: {
-		PermissionDialog,
-		draggable
-	},
-	mounted(){
-		this.getlist();
-		// document.onkeydown=e=>{
-		// 	let keyval=window.event.keyCode;
-		//     if( keyval===13 && this.$route.path === '/classifylist'){
-		// 		this.getlist();
-		//     }
-		// }
-        this.setPermissRules()
-	},
-	methods:{
-		showInput(index){
-			if(index!=-1){
-				this.ClassifyMenuList[index].inputVisible=true
-				this.$nextTick(_ => {
-					this.$refs.itemINput[0].$refs.input.focus();
-				})
-				return
-			}
-			this.inputVisible = true;
-			this.$nextTick(_ => {
-				this.$refs.saveTagInput.$refs.input.focus();
-			});
-		},
-		handleInputConfirm() {
-			let inputValue = this.inputValue;
-			if (inputValue) {
-				this.ClassifyMenuList.push({MenuId:0,MenuName:inputValue,inputVisible:false});
-			}
-			this.inputVisible = false;
-			this.inputValue = '';
-		},
-		handleClose(index){
-			this.ClassifyMenuList.splice(index,1)
-		},
-
-		tableRowClassName({row,rowIndex}) {
-			if( row.ischild ){
-			  return 'success-row';
-			}else{
-				return '';
-			}
-		},
-		edititem(item){  //去编辑
-			classifyparent({}).then((res) => {
-				if( res.Ret==200 ){
-					this.classifyparentArr=[];
-					res.Data.forEach((child,i)=>{
-						// if(child.ClassifyName!=item.ClassifyName){
-							child.Id=parseInt(child.Id);
-							//如果没有子项
-							if(!item.Child){
-								this.classifyparentArr.push(child);
-							}
-						// }
-					});
-				}
-			});
-			console.log(item);
-			// this.aeForm={classify_id:parseInt(item.id),classify_name:item.classify_name,parent_id:parseInt(item.parent_id),abstract:item.abstract,descript:item.descript};
-			this.aeForm={
-				classify_id:parseInt(item.Id),
-				classify_name:item.ClassifyName,
-				parent_id:item.ParentId,
-				descript:item.Descript,
-				author:item.ReportAuthor,
-				authorDsec:item.AuthorDescript,
-				classifyDsec:item.Abstract,
-				authorTag:item.VipTitle,
-				classifyImg:item.ReportImgUrl,
-				reportImg:item.HomeImgUrl,
-				columImg:item.ColumnImgUrl,
-				bannerImg:item.HeadImgUrl,
-				avatar:item.AvatarImgUrl,
-				label:item.ClassifyLabel,
-				hasTel:item.HasTeleconference,
-				showType:item.ShowType,
-				Sort:item.Sort,
-				YbFiccSort:item.YbFiccSort,
-				YbFiccIcon:item.YbFiccIcon,
-				YbIconUrl:item.YbIconUrl,
-				YbBgUrl:item.YbBgUrl,
-				YbFiccPcIcon:item.YbFiccPcIcon,
-				IsShow:item.IsShow==0?true:false,//是否在小程序端展示：0-隐藏 1-显示
-				YbListImg:item.YbListImg,
-				YbShareBgImg:item.YbShareBgImg,
-				ClassifyMenuId:item.ClassifyMenuId||'',
-        YbRightBanner:item.YbRightBanner||'',
-				relate:[item.RelateTel==1?1:null,item.RelateVideo==1?2:null],
-			};
-			this.ClassifyMenuList=item.ClassifyMenuList?item.ClassifyMenuList.map(item=>{
-				return {
-					MenuId:item.MenuId,
-					MenuName:item.MenuName,
-					inputVisible:false
-				}
-			}):[]
-      //若编辑的为列表、品种下的二级分类 需要计算YbShareBgImg_
-      //已填写则获取已填写内容
-      if(item.YbShareBgImg){
-        this.aeForm.YbShareBgImg_ = item.YbShareBgImg
-      }
-      //若未填写则取一级分类的YbShareBgImg
-      else{
-        this.aeForm.YbShareBgImg_ = this.getParentYbShareBgImg(item.ParentId)
-      }
-			this.isadd=false;
-			this.aeDialog=true;
-			this.$nextTick(()=>{
-				this.$refs.aeForm.clearValidate();
-			})
-		},
-		checkdeleteitem(item){  //删除前检测
-			checkDeleteClassify({ClassifyId:parseInt(item.Id)}).then(res =>{
-				if(res.Ret==200){
-					if(res.Data.Code==0){
-				   		this.deleteitem(item);
-					}else{
-						this.$message.error( res.Data.Msg );
-					}
-				}
-			});
-		},
-		deleteitem(item){
-			this.$confirm(this.$t('ReportManage.CommodityConfiguration.delete_info_msg'),this.$t('Confirm.prompt_slogan'),{type:'warning'}).then(() => {
-					classifydelete({ClassifyId:parseInt(item.Id)}).then(res =>{
-						if( res.Ret==200 ){
-							this.$message.success( res.Msg );
-							this.getlist();
-						}
-					});
-			}).catch(() => {});
-		},
-		configitem(item){
-			this.classifyPermissionId=item.Id
-			this.isShowPermissionDia=true
-		},
-		saveDialog(){  //保存
-			this.$refs.aeForm.validate((valid)=>{
-				if( valid ){
-					// let params={classify_name:this.aeForm.classify_name,parent_id:parseInt(this.aeForm.parent_id),abstract:this.aeForm.abstract,descript:this.aeForm.descript};
-					let params={
-						ClassifyName:this.aeForm.classify_name,
-						ParentId:parseInt(this.aeForm.parent_id),
-						Descript:this.aeForm.descript,
-						ReportAuthor:this.aeForm.author,
-						AuthorDescript:this.aeForm.authorDsec,
-						VipTitle:this.aeForm.authorTag,
-						Abstract:this.aeForm.classifyDsec,
-						ColumnImgUrl:this.aeForm.columImg,
-						ReportImgUrl:this.aeForm.classifyImg,
-						HomeImgUrl:this.aeForm.reportImg,
-						HeadImgUrl:this.aeForm.bannerImg,
-						AvatarImgUrl:this.aeForm.avatar,
-						ClassifyLabel:this.aeForm.label,
-						ShowType:this.aeForm.showType,
-						HasTeleconference:this.aeForm.hasTel,
-						Sort:this.aeForm.Sort?Number(this.aeForm.Sort):0,
-						YbFiccSort:this.aeForm.YbFiccSort?Number(this.aeForm.YbFiccSort):0,
-						YbFiccIcon:this.aeForm.YbFiccIcon,
-						YbIconUrl:this.aeForm.YbIconUrl,
-						YbBgUrl:this.aeForm.YbBgUrl,
-						YbFiccPcIcon:this.aeForm.YbFiccPcIcon,
-						IsShow:this.aeForm.IsShow?0:1,//是否在小程序端展示：0-隐藏 1-显示
-						YbListImg:this.aeForm.YbListImg,
-            /* 一级分类为列表、品种的报告，二级分类的分享链接图*/
-						YbShareBgImg:this.aeForm.parent_id!=0&&(this.parentIsList||this.parentIsVariety)?this.aeForm.YbShareBgImg_:this.aeForm.YbShareBgImg,
-						ClassifyMenuId:this.aeForm.ClassifyMenuId||0,
-            YbRightBanner:this.aeForm.YbRightBanner||'',
-						RelateTel:this.aeForm.relate.includes(1)?1:0,
-						RelateVideo:this.aeForm.relate.includes(2)?1:0,
-					};
-					params.MenuList=this.ClassifyMenuList.map(item=>{
-						return {
-							MenuId:item.MenuId,
-							MenuName:item.MenuName
-						}
-					})
-					if( this.isadd ){
-						classifyadd(params).then(res =>{
-							if( res.Ret==200 ){
-								this.$message.success( res.Msg );
-								this.getlist();
-								this.aeDialog=false;
-							}
-						});
-					}else{
-						params.ClassifyId=this.aeForm.classify_id;
-						classifyedit(params).then(res =>{
-							if( res.Ret==200 ){
-								this.$message.success( res.Msg );
-								this.getlist();
-								this.aeDialog=false;
-							}
-						});
-					}
-					// this.isexpand=true;
-				}
-			});
-		},
-		aeDialogTrue(){  //去新增
-			classifyparent({}).then((res) => {
-				if( res.Ret==200 ){
-					this.classifyparentArr=res.Data || [];
-					this.aeForm={
-						classify_name:'',
-						parent_id:0,
-						abstract:'',
-						descript:'',
-						author:'',
-						authorDsec:'',
-						authorTag:'',
-						classifyDsec:'',
-						classifyImg:'',
-						reportImg:'',
-						columImg:'',
-						bannerImg:'',
-						avatar:'',
-						label:'',
-						hasTel:0,
-						showType:1,
-						Sort:'',
-						YbFiccSort:'',
-						YbFiccIcon:'',
-						YbIconUrl:'',
-						YbBgUrl:'',
-						YbFiccPcIcon:'',
-						IsShow:false,//是否在小程序端展示：0-隐藏 1-显示
-						YbListImg:'',
-						YbShareBgImg:'',
-						ClassifyMenuId:'',
-            YbRightBanner:'',
-						relate:[]
-					};
-					this.ClassifyMenuList=[]
-					this.isadd=true;
-					this.aeDialog=true;
-					this.$nextTick(()=>{
-						this.$refs.aeForm.clearValidate();
-					})
-				}
-			});
-		},
-		getlist(){  //获取列表
-			let params={CurrentIndex:this.PageIndex,PageSize:this.pageSize,KeyWord:this.searchform.key_word};
-			this.listLoading = true;
-			classifylist(params).then((res) => {
-				if( res.Ret==200 ){
-					this.tableData = res.Data.List || [];
-					this.total=parseInt(res.Data.Paging.Totals);
-					this.tableData.forEach((item,index)=>{
-						if( item.Child ){
-							// item.hasChildren=true;
-							let childnode=JSON.parse(JSON.stringify(item.Child));
-							childnode.forEach((itemchild,i)=>{
-								itemchild.ischild=true;
-							});
-							item.children=childnode;
-						}
-					});
-					// this.$nextTick(function(){
-					// 	this.isexpand=true;
-					// });
-				}
-				this.listLoading = false;
-			});
-		},
-		search(){  //搜索
-			this.ispage = false;
-			this.$nextTick(() => {
-				this.PageIndex = 0;
-				this.getlist();
-				this.ispage = true;
-			});
-		},
-		handleCurrentChange(current){  //分页页码跳转
-			this.PageIndex = current;
-			this.getlist();
-		},
-		handleSizeChange(val){    //分页页码改变
-	        this.pageSize=val;
-	        this.getlist();
-		},
-		clickinput(type){  //上传模拟点击
-			$(`#file${type}`).click();
-		},
-		fileSelected(type){  //选择文件上传
-			const that = this;
-		    if( document.getElementById('file'+type).files[0] ){
-		        let hostfile = document.getElementById('file'+type).files[0];
-		        let size = Math.floor(hostfile.size / 1024 / 1024);
-		        if( size>200 ){
-		            that.$message.error(this.$t('ReportManage.smart_msg.uploaded_limitation'));
-		            hostfile = {};
-		            return false
-		        }
-		        if( hostfile.name.toLowerCase().includes('.png') || hostfile.name.toLowerCase().includes('.jpg') || hostfile.name.toLowerCase().includes('.jpeg') ){
-		        	let form = new FormData();
-		        	form.append('file',hostfile);  //hostfile.name
-					that.uploadloading=true;
-					bannerupload(form).then((res) => {
-						if( res.Ret === 200 ){
-							if(type == 1) {
-								that.aeForm.classifyImg=res.Data.ResourceUrl;
-							}else if(type == 2) {
-								that.aeForm.bannerImg=res.Data.ResourceUrl;
-							}else if(type == 3) {
-								that.aeForm.avatar=res.Data.ResourceUrl
-							}else if(type == 4) {
-								that.aeForm.columImg=res.Data.ResourceUrl
-							}else if(type == 5) {
-								that.aeForm.reportImg=res.Data.ResourceUrl
-							}else if(type == 6){
-								that.aeForm.YbFiccIcon=res.Data.ResourceUrl
-							}else if(type == 7){
-								that.aeForm.YbIconUrl=res.Data.ResourceUrl
-							}else if(type == 8){
-								that.aeForm.YbBgUrl=res.Data.ResourceUrl
-							}else if(type == 9){
-								this.aeForm.YbListImg=res.Data.ResourceUrl
-							}else if(type == 10){
-								this.aeForm.YbShareBgImg=res.Data.ResourceUrl
-							}else if(type == 11){
-                this.aeForm.YbRightBanner=res.Data.ResourceUrl
-              }else if(type==12){
-                this.aeForm.YbShareBgImg_=res.Data.ResourceUrl
-              }
-						}
-						$("#file"+type).val('');
-						hostfile = {};
-					});
-				}else{
-					that.$message.error(this.$t('ReportManage.smart_msg.upload_format'));
-		        }
-		    } 
-		},
-		// 保存
-		saveConfig(classifyId){
-			if(!this.editedItems.includes(classifyId)) this.editedItems.push(classifyId)
-			this.isShowPermissionDia=false
-		},
-		// 晨报周报 去设置章节
-		chapterSetting(row){
-			let reportType;
-			if(row.ClassifyName=='周报'){
-				reportType='week'
-			}else{
-				reportType='day'
-			}
-			this.$router.push({path:'chapterSetting',query:{reportType}})
-		},
-    //改变上级分类触发
-    parentSelectChange(item){
-      if(!item) return
-      let YbShareBgImg = this.getParentYbShareBgImg(item)
-      if(!this.aeForm.YbShareBgImg){
-        this.$set(this.aeForm,'YbShareBgImg_',YbShareBgImg)
-      }
-    },
-    //根据上级分类id获取YbShareBgImg
-    getParentYbShareBgImg(id){
-      let YbShareBgImg = ''
-      let parent = this.classifyparentArr.find((item)=>{return item.Id===id})
-      if(!parent) return
-      YbShareBgImg = parent.YbShareBgImg||''
-      return YbShareBgImg
-    },
-    //由于表单一些项可配置，表单验证规则也需要过滤掉不展示的项
-    setPermissRules(){
-            const {classifyBtn,checkPermissionBtn} = this.permissionBtn
-            const permissMap={
-                'YbFiccIcon':checkPermissionBtn(classifyBtn.classifyList_cnClassify_ficcIcon),
-                'YbRightBanner':checkPermissionBtn(classifyBtn.classifyList_cnClassify_reportImgs),
-                'YbShareBgImg':checkPermissionBtn(classifyBtn.classifyList_cnClassify_shareImgs),
-                'YbFiccPcIcon':checkPermissionBtn(classifyBtn.classifyList_cnClassify_pcBackColor)
-            }
-            for(let k in permissMap){
-                if(!permissMap[k]&&this.aerules[k]){
-                    delete this.aerules[k]
-                }
-            }
-        }
-	}
-}	
-</script>
-
-<style lang="scss">
-	#classifylist{
-		.header{
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			.type-box{
-				span{
-					cursor: pointer;
-					display: inline-block;
-					margin-right: 50px;
-					font-size: 18px;
-					padding-bottom: 10px;
-				}
-				.act{
-					color: #409EFF;
-					border-bottom: 2px solid #409EFF;
-				}
-			}
-		}
-	}
-
-
-	#classifylist{ overflow:hidden;
-	.dialogclassLog {
-		position:absolute;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%,-50%);
-		margin-top: 0 !important;
-		.el-dialog__body {
-			height:65vh;
-    		overflow-y: auto;
-		}
-	}
-	.el-input{
-    width: 100%;
-  }
-	.el-form-item__label {
-		width: 130px !important;
-	}
-	.editedsty{
-		color: #0030a9;
-	}
-		.header .el-form-item{ margin-bottom:0; }
-	}
-</style>

src/views/classify_manage/classifylistV2.vue

@@ -0,0 +1,377 @@
+<template>
+    <div class="classify-page">
+        <div class="top-wrap">
+            <div class="type-box">
+                <div class="item active" v-permission="permissionBtn.classifyBtn.classifyList_cnClassify">中文分类</div>
+                <div class="item" @click="$emit('typeChange','2')" v-permission="permissionBtn.enClassifyBtn.classifyList_enClassify">英文分类</div>
+            </div>
+            <div style="display:flex;padding:10px;gap:10px">
+            <el-button 
+                type="primary"
+                @click="addClassify"
+                v-permission="permissionBtn.classifyBtn.classifyList_cnClassify_classifyAdd"
+            >添加分类</el-button>
+            <el-input placeholder="分类名称" v-model="searchVal" style="max-width: 262px;" @change="getList" clearable>
+                <i slot="prefix" class="el-input__icon el-icon-search"></i>
+            </el-input>
+            </div>
+        </div>
+        <div class="content-box">
+            <el-tree
+			    :data="list"
+				node-key="Id"
+                :props="{
+                    label: 'ClassifyName',
+                    children: 'Child'
+                }"
+				check-strictly
+				empty-text="暂无数据"
+                draggable
+                indent='76'
+                :allow-drop="canDropHandle"
+                @node-drop="dropOverHandle"
+			>
+				<div
+					class="classify-item-wrap"
+					slot-scope="{ data }"
+				>
+                    <div>
+                        <span :class="['tag', data.Enabled==1?'open':'close']" @click.stop="handleEnableSet(data)">{{data.Enabled==1?'启用':'禁用'}}</span>
+                        <span>{{data.ClassifyName}}</span>
+                    </div>
+					
+                    <div class="opt-box">
+                        <span class="editsty" v-if="['晨报','周报'].includes(data.ClassifyName)" @click="chapterSetting(data)" v-permission="permissionBtn.classifyBtn.classifyList_cnClassify_chapterSetting">章节设置</span>
+                        <img class="icon-drag" src="~@/assets/img/data_m/move_ico2.png" alt="">
+                        <img class="icon-set" src="~@/assets/img/icons/variety_set.png" alt="" @click.stop="handleEdit(data)" v-permission="permissionBtn.classifyBtn.classifyList_cnClassify_classifyEdit">
+                    </div>
+				</div>
+			</el-tree>
+        </div>
+
+        <!-- 分类弹窗 -->
+        <m-dialog 
+            :title="classifyForm.classify_id?'编辑分类':'新增分类'" 
+            :show.sync="classifyForm.show" 
+            width="650px"
+        >
+            <div style="padding-left: 50px">
+                <el-form 
+                    :model="classifyForm" 
+                    :rules="formRules" 
+                    ref="formRef" 
+                    label-position="left"
+                    hide-required-asterisk
+                    label-width="100px">
+                    <el-form-item prop="classify_name" label="分类名称">
+                        <el-input 
+                            type="text" 
+                            v-model="classifyForm.classify_name" 
+                            placeholder="请输入分类名称"
+                            style="width:400px;"
+                        />
+                    </el-form-item>
+                    <el-form-item prop="parent_id" label="上级分类">
+                        <el-select v-model="classifyForm.parent_id" placeholder="请选择" style="width:400px;">
+                            <el-option label="无" :value="0"></el-option>
+                            <el-option v-for="(item,index) in classifyparentArr" :key="index" :label="item.ClassifyName" :value="item.Id"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item prop="variety" label="关联品种" v-if="classifyForm.parent_id&&permissionBtn.classifyBtn.classifyList_cnClassify_connect_variety">
+                        <template slot="label">
+                            <el-tooltip class="item" effect="dark" content="控制报告阅读权限">
+                                <div>
+                                    <span>关联品种</span>
+                                    <i class="el-icon-info"></i>
+                                </div>
+                            </el-tooltip>
+                        </template>
+                        <el-cascader
+                            :options="reportVarietyList" 
+                            v-model="classifyForm.variety" 
+                            placeholder="请选择"
+                            collapse-tags
+                            :props="{value:'PermissionId',label:'PermissionName',children:'Child',multiple: true,emitPath:false}" 
+                            style="min-width:400px;"
+                        ></el-cascader>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div slot="footer" style="margin-top: 20px;">
+                <el-button
+                @click="cancelClassify"
+                style="width: 132px; height: 40px"
+                >取消</el-button>
+                <el-button
+                @click="setClassifyHandle"
+                type="primary"
+                style="width: 132px; height: 40px"
+                >保存</el-button>
+            </div>
+        </m-dialog>
+    </div>
+</template>
+
+<script>
+import mDialog from '@/components/mDialog.vue';
+import { classifylist,classifyparent,classifyadd,classifyedit } from 'api/api.js';
+import {reportVarietyInterence} from '@/api/modules/reportVariety'
+import {classifyPermissionInterface} from '@/api/modules/classifyApi.js'
+export default {
+    components:{mDialog},
+    data() {
+        return {
+            typeVal:1,
+            searchVal:'',
+            list:[],
+
+            classifyForm:{
+                show:false,
+                classify_id:0,
+                classify_name:"",
+                parent_id: 0,
+                variety:'',//关联的品种
+            },
+            formRules: {
+                classify_name: [{ required:true,message:'请输入分类名称',trigger:'blur'}]
+            },
+            classifyparentArr:[],
+
+            reportVarietyList:[],//中文品种列表
+        }
+    },
+    mounted(){
+        this.getList()
+        this.getReportVarietyList()
+    },
+    methods: {
+        async getList(type){
+            const res=await classifylist({
+                KeyWord:this.searchVal,
+            })
+            if(res.Ret===200){
+                this.list=res.Data.List||[]
+            }
+        },
+
+        // 晨报周报 去设置章节
+		chapterSetting(row){
+			let reportType;
+			if(row.ClassifyName=='周报'){
+				reportType='week'
+			}else{
+				reportType='day'
+			}
+			this.$router.push({path:'chapterSetting',query:{reportType}})
+		},
+
+        async addClassify(){
+            this.classifyparentArr=[];
+            const res=await classifyparent()
+            if(res.Ret===200){
+                this.classifyparentArr=res.Data||[]
+            }
+            this.classifyForm={
+                show:true,
+                classify_id:0,
+                classify_name:"",
+                parent_id: 0,
+                variety:'',//关联的品种
+            }
+        },
+        async handleEdit(item){
+            this.classifyparentArr=[];
+            const res=await classifyparent()
+            if(res.Ret===200){
+                // 编辑的是子分类或者没有子分类的才能选择上级分类
+                if(!item.Child){
+                    this.classifyparentArr=res.Data||[]
+                }
+            }
+            
+            this.classifyForm={
+                show:true,
+                classify_id:item.Id,
+                classify_name:item.ClassifyName,
+                parent_id: item.ParentId,
+                variety:item.ChartPermissionIdList||'',//关联的品种
+            }
+        },
+        async setClassifyHandle(){
+            await this.$refs.formRef.validate();
+            const { classify_name,parent_id,classify_id } = this.classifyForm;
+            let params = {
+                ClassifyName: classify_name,
+                ParentId: parent_id,
+                ChartPermissionIdList:this.classifyForm.variety||[]
+            }
+
+            const { Ret,Msg } = classify_id 
+                ? await classifyedit({...params,ClassifyId: classify_id}) 
+                : await classifyadd(params)
+
+            if(Ret !== 200) return
+            this.$message.success(Msg)
+            this.cancelClassify();
+            this.getList();
+        },
+        /* 取消 */
+        cancelClassify() {
+            this.$refs.formRef.resetFields();
+            this.classifyForm.show = false;
+        },
+
+        // 获取品种数据
+        getReportVarietyList(){
+            reportVarietyInterence.filterVarietyOpts().then(res=>{
+                console.log(res);
+                this.reportVarietyList=res.Data||[]
+            })
+        },
+
+        //启用\禁用设置
+        handleEnableSet(item){
+            // 判断权限
+            const {classifyBtn,checkPermissionBtn} = this.permissionBtn
+            if(!checkPermissionBtn(classifyBtn.classifyList_cnClassify_enable)) return
+            
+            classifyPermissionInterface.enableSet({
+                ClassifyId:item.Id,
+                Enabled:item.Enabled==1?0:1
+            }).then(res=>{
+                if(res.Ret===200){
+                    this.$message.success('设置成功')
+                    this.getList()
+                }
+            })
+        },
+
+        //控制只能同级拖动
+        canDropHandle(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
+        },
+
+        //拖动结束
+        dropOverHandle(b,a,i,e) {
+            // 被拖拽节点对应的 Node、结束拖拽时最后进入的节点、被拖拽节点的放置位置
+            const classifyId=b.data.Id
+            let list=a.parent.childNodes;
+            let PrevClassifyId=0,NextClassifyId=0,targetIndex=0;
+            list.forEach((item,index) => {
+                if(item.data.Id===classifyId){
+                    targetIndex=index
+                }
+            });
+            if(targetIndex===0){
+                NextClassifyId=list[1].data.Id
+            }else if(targetIndex===list.length-1){
+                PrevClassifyId=list[list.length-1].data.Id
+            }else{
+                PrevClassifyId=list[targetIndex-1].data.Id
+                NextClassifyId=list[targetIndex+1].data.Id
+            }
+
+            const params={
+                ClassifyId:classifyId,
+                PrevClassifyId,
+                NextClassifyId
+            }
+            console.log(params);
+            classifyPermissionInterface.moveSort(params).then(res=>{
+                if(res.Ret===200){
+                    this.$message.success('移动成功')
+                }else{
+                    this.getList()
+                }
+            })
+        },
+        
+    },
+}
+</script>
+
+<style lang="scss">
+.el-cascader .el-input{
+  width: 100%;
+}
+.classify-page{
+    .content-box{
+        .el-tree-node__content{
+            padding-top: 10px;
+            padding-bottom: 10px;
+            border-bottom: 1px solid #C8CDD9;
+        }
+    }
+}
+
+</style>
+<style lang="scss" scoped>
+.top-wrap{
+    display: flex;
+    justify-content: space-between;
+    background: #FFFFFF;
+    border-radius: 4px;
+    .type-box{
+        display: flex;
+        .item{
+            position: relative;
+            cursor: pointer;
+            color: #666;
+            min-width: 88px;
+            line-height: 60px;
+            text-align: center;
+        }
+        .active{
+            color: #0052D9;
+            &::after{
+                content: '';
+                display: block;
+                width: 100%;
+                height: 2px;
+                position: absolute;
+                bottom: 0px;
+                left: 0;
+                background-color: #0052D9;
+            }
+        }
+    }
+}
+.content-box{
+    padding: 20px;
+    margin-top: 20px;
+    height: calc(100vh - 230px);
+    overflow-y: auto;
+    background-color: #FFFFFF;
+    .classify-item-wrap{
+        flex: 1;
+        padding-right: 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        .tag{
+            display: inline-block;
+            min-width: 76px;
+            line-height: 30px;
+            text-align: center;
+            &.open{
+                background-color: #ECF2FE;
+                color: #0052D9;
+            }
+            &.close{
+                background-color: #0052D9;
+                color: #fff;
+            }
+        }
+        .opt-box{
+            .icon-drag,.icon-set{
+                width: 16px;
+                height: 16px;
+                margin-left: 10px;
+            }
+        }
+    } 
+}
+</style>

src/views/classify_manage/indexList.vue

@@ -6,8 +6,8 @@
 </template>
 
 <script>
-import classifyZH from './classifylist.vue'
-import classifyEN from './classifyEnlist.vue'
+import classifyZH from './classifylistV2.vue'
+import classifyEN from './classifyEnlistV2.vue'
 export default {
     components:{
         classifyZH,
@@ -15,7 +15,7 @@ export default {
     },
     data() {
         return {
-            type:'1',//1 中文研报分类 2英文研报分类
+            type:'1',//1 中文研报分类 2英文研报分类 
         }
     },
     methods:{

src/views/datasheet_manage/common/customTable.js

@@ -46,6 +46,16 @@ export function findCellByFactor (str) {
   return el ? (el.innerText||el.value||'') : null;
 }
 
+//根据因数找元素值 混合表版 显示值不能作为数据值了
+export function findCellByFactorMixed(arr,str) {
+  //先找key 根据key找到数据单元格的数据值
+  let cellKey = findCellKeyByFactor(str)
+  if(!cellKey) return null
+
+  let cellData = findCellByKey(arr,cellKey)
+  return cellData.ShowValue
+}
+
 //转大写
 export function toUpperCase(str) {
   let uppercaseStr = str.toUpperCase();

src/views/datasheet_manage/components/MixedTable.vue

@@ -247,7 +247,7 @@ import {
   resetRelationStyle,
   resetDialogCellStyle,
   extractFactorsFromFormula,
-  findCellByFactor,
+  findCellByFactorMixed,
   splitString,
   toUpperCase,
   findCellKeyByFactor,
@@ -690,7 +690,7 @@ export default {
       console.log(factors)
       
       //根据因数找单元格
-      let isAllCell = factors.some(_ => findCellByFactor(_)===null||isNaN(findCellByFactor(_)))
+      let isAllCell = factors.some(_ => findCellByFactorMixed(this.config.data,_)===null||isNaN(findCellByFactorMixed(this.config.data,_)))
       if(isAllCell) {
         this.$message.warning(this.$t('OnlineExcelPage.formula_val_error_msg') )
         return '';
@@ -699,7 +699,7 @@ export default {
       let TagMap = {};
       factors.forEach(_ => {
         if(!TagMap[_]) {
-          TagMap[_] = Number(findCellByFactor(_))
+          TagMap[_] = Number(findCellByFactorMixed(this.config.data,_))
         }
       });
 

src/views/positionAnalysis_manage/list.vue

@@ -58,7 +58,7 @@ export default {
   },
 
   mounted() {
-    this.getList()
+    this.getList() 
   }
 }
 

src/views/ppt_manage/newVersion/components/formatEl/SheetEl.vue

@@ -93,6 +93,7 @@ export default {
     td{
         width: auto;
         height: auto;
+        padding: 0.4em 0;
 			/* 	min-width: 35px; */
 				border: 1px solid #747474;
         word-break: break-all;

src/views/report_manage/addreportNew.vue

@@ -875,7 +875,7 @@ export default {
 		},100),
 		getclassifylist() {
 			//获取分类列表
-			let params = { CurrentIndex: 0, PageSize: 1000, KeyWord: '',HideDayWeek:1,/*不显示晨报/周报*/ };
+			let params = { Enabled:1, KeyWord: '',HideDayWeek:1,/*不显示晨报/周报*/ };
 			classifylist(params).then((res) => {
 				if (res.Ret == 200 && Array.isArray(res.Data.List)) {
 					this.optionsArr = [];

src/views/report_manage/editreportNew.vue

@@ -882,7 +882,7 @@ export default {
 		},100),
 		getclassifylist() {
 			//获取分类列表
-			let params = { CurrentIndex: 0, PageSize: 1000, KeyWord: '' ,HideDayWeek:1,/*不显示晨报/周报*/ };
+			let params = { Enabled:1, KeyWord: '' ,HideDayWeek:1,/*不显示晨报/周报*/ };
 			classifylist(params).then((res) => {
 				if (res.Ret == 200 && Array.isArray(res.Data.List)) {
 					this.optionsArr = [];

src/views/report_manage/reportEn/reportEditor.vue

@@ -919,7 +919,7 @@ export default {
 
 		getclassifylist() {
 			//获取分类列表
-			let params = { CurrentIndex: 1, PageSize: 1000, KeyWord: '' };
+			let params = { Enabled:1, KeyWord: '' };
 			reportEnInterface.classifyList(params).then((res) => {
 				if (res.Ret == 200 && Array.isArray(res.Data.List)) {
 					this.optionsArr = res.Data.List|| []

src/views/report_manage/reportVariety.vue

@@ -1,219 +0,0 @@
-<template>
-    <div class="report-variety-page">
-        <div class="top-wrap">
-            <el-button type="primary" v-permission="permissionBtn.enChartPermission.enChartPermission_save"
-                @click="showEditBreed=true;getParentVarietyList()">{{$t('ReportManage.CommodityConfiguration.add_product_btn')}}</el-button>
-            <el-input :placeholder="$t('ReportManage.CommodityConfiguration.add_product_input')" v-model="searchVal" style="max-width: 262px; float: right" @change="handleSearch" clearable>
-                <i slot="prefix" class="el-input__icon el-icon-search"></i>
-            </el-input>
-        </div>
-        <div class="main-wrap">
-            <el-table 
-                style="border:1px solid #eaeaea;" 
-                :data="tableData" 
-                v-loading="listLoading"
-                :element-loading-text="$t('Table.data_loading')" 
-                row-key="EnPermissionId" 
-                :tree-props="{children:'Child',hasChildren:'hasChildren'}"
-            >
-                <el-table-column prop="EnPermissionName" :label="$t('ReportManage.CommodityConfiguration.column_top')">
-                    <template slot-scope="scope">
-                        <span>{{scope.row.ParentId==0?scope.row.EnPermissionName:''}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="EnPermissionName" :label="$t('ReportManage.CommodityConfiguration.column_second')">
-                    <template slot-scope="scope">
-                        <span>{{scope.row.ParentId!=0?scope.row.EnPermissionName:''}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column :label="$t('Table.column_operations')" align="center">
-                    <template slot-scope="scope">
-                        <span class="editsty" v-permission="permissionBtn.enChartPermission.enChartPermission_save"
-                            style="margin-right:20px;display:inline-block" @click="handleEditBreedItem(scope.row)">{{$t('Table.edit_btn')}}</span>
-                        <span v-permission="permissionBtn.enChartPermission.enChartPermission_del"
-                            class="deletesty" @click="handleDelBreedItem(scope.row)">{{$t('Table.delete_btn')}}</span>
-                    </template>
-                </el-table-column>
-            </el-table>
-        </div>
-
-        <!-- 品种编辑弹窗 -->
-        <el-dialog 
-            :modal-append-to-body='false' 
-            :title="!editBreedData.id?$t('ReportManage.CommodityConfiguration.add_product_btn'):$t('ReportManage.CommodityConfiguration.edit_variety_title')" 
-            :visible.sync="showEditBreed" 
-            :close-on-click-modal="false"
-            :center="true" 
-            v-dialogDrag
-            width="600px"
-        >
-            <div class="edit-variety-wrap" style="padding-bottom:30px">
-                <el-form label-width="113px">
-                    <el-form-item :label="$t('ReportManage.CommodityConfiguration.product_type')">
-                        <el-input :placeholder="$t('ReportManage.CommodityConfiguration.add_product_input')" v-model="editBreedData.name" style="width:400px"></el-input>
-                    </el-form-item>
-                    <el-form-item :label="$t('ReportManage.CommodityConfiguration.add_product_select')">
-                        <el-select v-model="editBreedData.parentId" :placeholder="$t('ETable.Msg.please_select')" style="width:400px">
-                            <el-option
-                                v-for="item in parentVarietyOpts"
-                                :key="item.EnPermissionId"
-                                :label="item.EnPermissionName"
-                                :value="item.EnPermissionId">
-                            </el-option>
-                        </el-select>
-                    </el-form-item>
-                    <el-form-item :label="$t('ReportManage.CommodityConfiguration.add_backend_sorting')">
-                        <el-input :placeholder="$t('ReportManage.CommodityConfiguration.add_backend_sorting')" min="0" v-model="editBreedData.sort" type="number" style="width:400px"></el-input>
-                    </el-form-item>
-                </el-form>
-                <div style="text-align: center;margin-top:40px">
-                    <el-button type="primary" plain @click="showEditBreed=false">{{$t('Dialog.cancel_btn')}}</el-button>
-                    <el-button type="primary" @click="handleConfirmEidtBreed">{{$t('Dialog.confirm_btn')}}</el-button>
-                </div>
-            </div>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import {reportVarietyENInterence} from '@/api/api'
-export default {
-    watch: {
-        showEditBreed(n){
-            if(!n){
-                this.editBreedData={
-                    id:0,
-                    name:'',
-                    sort:0,
-                    parentId:0,
-                }
-            }
-        }
-    },
-    data() {
-        return {
-            searchVal:'',
-            tableData:[],
-            listLoading:false,
-
-            parentVarietyOpts:[],
-            showEditBreed:false,
-            editBreedData:{
-                id:0,
-                name:'',
-                sort:0,
-                parentId:0,
-            },
-            
-        }
-    },
-    created(){
-        this.getList()
-        this.getParentVarietyList()
-    },
-    methods: {
-        async getList(){
-            this.listLoading=true
-            const res=await reportVarietyENInterence.varietyList({Keyword:this.searchVal})
-            this.listLoading=false
-            if(res.Ret===200){
-                this.tableData=res.Data||[]
-            }
-        },
-
-        getParentVarietyList(isEidtLevelOne){
-            reportVarietyENInterence.parentVarietyList({}).then(res=>{
-                if(res.Ret===200){
-                    const arr=res.Data||[]
-                    if(isEidtLevelOne){
-                        this.parentVarietyOpts=[
-                            {
-                                EnPermissionName:'无',
-                                EnPermissionId:0,
-                            }
-                        ]
-                    }else{
-                        this.parentVarietyOpts=[
-                            {
-                                EnPermissionName:'无',
-                                EnPermissionId:0,
-                            },
-                            ...arr
-                        ]
-                    }
-                }
-            })
-        },
-
-        handleSearch(){
-            this.getList()
-        },
-
-        async handleConfirmEidtBreed(){
-            if(!this.editBreedData.name){
-                this.$message.warning(this.$t('ReportManage.CommodityConfiguration.add_product_error_msg'))
-                return
-            }
-            let params={
-                EnPermissionName:this.editBreedData.name,
-                ParentId:this.editBreedData.parentId,
-                Sort:Number(this.editBreedData.sort)
-            }
-            if(this.editBreedData.id){
-                params.EnPermissionId=this.editBreedData.id
-            }
-            const res=this.editBreedData.id?await reportVarietyENInterence.editVariety(params):await reportVarietyENInterence.addVariety(params)
-            if(res.Ret===200){
-                this.$message.success(`${this.editBreedData.id?this.$t('MsgPrompt.edit_msg') :this.$t('MsgPrompt.add_msg')}`)
-                this.getList()
-                this.showEditBreed=false
-                this.getParentVarietyList()
-            }
-        },
-
-        handleEditBreedItem(item){
-            this.editBreedData={
-                id:item.EnPermissionId,
-                name:item.EnPermissionName,
-                sort:item.Sort,
-                parentId:item.ParentId||0
-            }
-            this.getParentVarietyList(item.ParentId?false:true)
-            this.showEditBreed=true
-        },
-
-        // 删除品种
-        handleDelBreedItem(item){
-            this.$confirm(this.$t('MsgPrompt.delete_info_msg') , this.$t('Confirm.prompt') ,{
-                confirmButtonText: this.$t('Dialog.confirm_btn'),
-                cancelButtonText: this.$t('Dialog.cancel_btn'),
-                type: 'warning'
-            }).then(()=>{
-                reportVarietyENInterence.delVariety({
-                    EnPermissionId:item.EnPermissionId
-                }).then(res=>{
-                    if(res.Ret===200){
-                        this.$message.success(this.$t('ReportManage.CommodityConfiguration.delete_success_msg'))
-                        this.getList()
-                        this.getParentVarietyList()
-                    }
-                })
-            })
-        }
-    },
-}
-</script>
-
-<style lang="scss" scoped>
-.top-wrap{
-    background: #FFFFFF;
-    border-radius: 4px;
-    padding: 20px 30px;
-}
-.main-wrap{
-    margin-top: 30px;
-    background: #FFFFFF;
-    border-radius: 4px;
-    padding: 20px 30px;
-}
-</style>

src/views/report_manage/reportVarietyV2.vue

@@ -0,0 +1,587 @@
+<template>
+    <div class="report-variety-page">
+        <div class="top-wrap">
+            <div class="type-box">
+                <div :class="['item',typeVal==1?'active':'']" @click="handleTypeChange(1)" v-permission="permissionBtn.reportVariety.zhVarietyHas">中文品种</div>
+                <div :class="['item',typeVal==2?'active':'']" @click="handleTypeChange(2)" v-permission="permissionBtn.reportVariety.enVarietyHas">英文品种</div>
+            </div>
+        </div>
+        <div class="main-wrap">
+            <div class="left-wrap">
+                <div class="add-btn-box">
+                    <el-button type="primary" @click="handleAddVariety" v-if="isShowAddBtn">添加品种</el-button>
+                </div>
+                <div class="first-variety-wrap">
+                    <draggable
+                        v-model="tableData"
+                        class="f-list-wrap"
+                        animation="300"
+                        tag="ul"
+                        handle=".icon-drag"
+                        @end="handleSortEnd($event,1)"
+                    >
+                        <li 
+                            :class="['item',selectFirstId==item.PermissionId?'active':'']" 
+                            v-for="item in tableData" 
+                            :key="item.PermissionId"
+                            @click="handleSelectFirstVariety(item)"
+                        >
+                            <div class="name">{{item.PermissionName}}</div>
+                            <div class="menu-box">
+                                <img class="icon-drag" src="~@/assets/img/data_m/move_ico2.png" alt="">
+                                <img class="icon-set" src="~@/assets/img/icons/variety_set.png" alt="" @click="handleShowEdit(item)" v-if="isShowEdit">
+                                <span @click="handleQuickSet(item,'enable')" v-if="isShowEdit">
+                                    <el-switch
+                                        :value="item.Enabled==1"
+                                        active-color="#0052D9"
+                                    />
+                                </span>
+                            </div>
+                        </li> 
+                    </draggable>
+                </div>
+            </div>
+            <div>
+            <draggable
+                v-model="secondVarietyList"
+                class="list-wrap"
+                animation="300"
+                tag="ul"
+                handle=".icon-drag"
+                :move="onMove"
+                @end="handleSortEnd($event,2)"
+            >
+                <li class="item" v-for="item in secondVarietyList" :key="item.PermissionId">
+                    <div class="top-icons">
+                        <img class="icon-drag" src="~@/assets/img/data_m/move_ico2.png" alt="">
+                        <span @click="handleQuickSet(item,'enable')" v-if="isShowEdit">
+                            <el-switch
+                                :value="item.Enabled==1"
+                                active-color="#0052D9"
+                            />
+                        </span>
+                    </div>
+                    <div class="name-box">
+                        <div class="name">{{item.PermissionName}}</div>
+                        <img v-if="isShowEdit" @click="handleShowEdit(item)" class="icon-edit" src="~@/assets/img/icons/variety_name_edit.png" alt="">
+                    </div>
+                    <template v-if="typeVal==1&&permissionBtn.isShowBtn('reportVariety','zhPublicSet')">
+                    <div class="tag-box open" v-if="item.IsPublic==1" @click="handleQuickSet(item,'ispublic')">
+                        <span class="tag">公有</span>
+                        <img class="icon" src="~@/assets/img/icons/changeLang01.png" alt="">
+                    </div>
+                    <div class="tag-box close" v-else @click="handleQuickSet(item,'ispublic')">
+                        <span class="tag">私有</span>
+                        <img class="icon" src="~@/assets/img/icons/edit_icon01.png" alt="">
+                    </div>
+                    </template>
+                </li> 
+            </draggable>
+            <ul class="list-wrap" style="float:left;margin-top:20px" v-if="isShowAddBtn">
+                <li class="item add-btn" v-if="selectFirstId" @click="handleAddVariety(2)">
+                    <img class="icon" src="~@/assets/img/icons/variety_add.png" alt="">
+                </li>
+            </ul>
+            </div>
+        </div>
+
+        <!-- 品种编辑弹窗 -->
+        <el-dialog 
+            :modal-append-to-body='false' 
+            :title="!editBreedData.id?'添加品种':'品种设置'" 
+            :visible.sync="showEditBreed" 
+            :close-on-click-modal="false"
+            :center="true" 
+            v-dialogDrag
+            width="600px"
+        >
+            <div class="edit-variety-wrap" style="padding-bottom:30px">
+                <el-form>
+                    <el-form-item label="上级品种" v-if="editBreedData.parentId">
+                        <el-select v-model="editBreedData.parentId" style="width:400px">
+                            <el-option 
+                                v-for="item in tableData" 
+                                :key="item.PermissionId"
+                                :label="item.PermissionName"
+                                :value="item.PermissionId"
+                            />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="品种名称">
+                        <el-input placeholder="请输入品种名称" v-model.trim="editBreedData.name" style="width:400px"></el-input>
+                    </el-form-item>
+                    <el-form-item label="启用状态" v-if="!editBreedData.id">
+                        <el-switch
+                            v-model="editBreedData.status"
+                            active-color="#0052D9">
+                        </el-switch>
+                    </el-form-item>
+                    <!-- 中文品种特有的设置公有权限 -->
+                    <div class="public-auth-box" v-if="typeVal==1&&checkOpts.length>0&&editBreedData.parentId==0&&permissionBtn.isShowBtn('reportVariety','zhPublicSet')">
+                        <el-tooltip effect="dark" content="默认为私有，勾选并保存设置为公有">
+                            <div style="display:inline-block">
+                                <span>公有权限设置</span>
+                                <i class="el-icon-info"></i>
+                            </div>
+                        </el-tooltip>
+                        <div class="auth-list-box">
+                            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+                            <el-checkbox-group style="padding:20px" v-model="checkedList" @change="handleCheckedAuthChange">
+                                <el-checkbox style="display:block;margin-bottom:10px" v-for="item in checkOpts" :label="item.PermissionId" :key="item.PermissionId">{{item.PermissionName}}</el-checkbox>
+                            </el-checkbox-group>   
+                        </div>
+                    </div>
+                </el-form>
+                <div style="text-align: center;margin-top:40px">
+                    <el-button type="primary" plain @click="showEditBreed=false">取消</el-button>
+                    <el-button type="primary" @click="handleConfirmEidtBreed">确定</el-button>
+                </div>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import draggable from 'vuedraggable';
+import {reportVarietyENInterence,reportVarietyInterence} from '@/api/modules/reportVariety'
+export default {
+    components:{draggable},
+    computed:{
+        // 添加品种按钮
+        isShowAddBtn(){
+            if(this.typeVal==1){
+                return this.permissionBtn.isShowBtn('reportVariety','zhVarietyAdd')
+            }else{
+                return this.permissionBtn.isShowBtn('reportVariety','enVarietyAdd')
+            }
+        },
+        // 品种编辑
+        isShowEdit(){
+            if(this.typeVal==1){
+                return this.permissionBtn.isShowBtn('reportVariety','zhVarietyEdit')
+            }else{
+                return this.permissionBtn.isShowBtn('reportVariety','enVarietyEdit')
+            }
+        },
+
+    },
+    watch: {
+        showEditBreed(n){
+            if(!n){
+                this.editBreedData={
+                    id:0,
+                    name:'',
+                    parentId:0,
+                    status:true,//启用状态
+                    IsPublic:0,//1公有，0私有
+                }
+                this.isIndeterminate=false
+                this.checkAll=false
+                this.checkedList=[]
+                this.checkOpts=[]
+            }
+        }
+    },
+    data() {
+        return {
+            typeVal:1,//1中文品种 2英文品种
+
+            tableData:[],
+            listLoading:false,
+
+            selectFirstId:0,//当前选中的一级品种Id
+            secondVarietyList:[],//当前选中的一级品种下的二级品种数据
+
+            showEditBreed:false,
+            editBreedData:{
+                id:0,
+                name:'',
+                parentId:0,
+                status:true,//启用状态
+                IsPublic:0,//1公有，0私有
+            },
+
+            isIndeterminate:false,
+            checkAll:false,
+            checkedList:[],
+            checkOpts:[],
+        }
+    },
+    created(){
+        this.getList()
+    },
+    mounted(){
+        const {reportVariety,checkPermissionBtn} = this.permissionBtn
+        if(checkPermissionBtn(reportVariety.zhVarietyHas)){
+            this.type = 1
+        }else if(checkPermissionBtn(reportVariety.enVarietyHas)){
+            this.type = 2
+        }
+    },
+    methods: {
+        async getList(){
+            this.listLoading=true
+            const res=this.typeVal==1?await reportVarietyInterence.varietyList({Keyword:this.searchVal}) : await reportVarietyENInterence.varietyList({Keyword:this.searchVal})
+            this.listLoading=false
+            if(res.Ret===200){
+                this.tableData=res.Data||[]
+                if(this.tableData.length>0){
+                    if(this.selectFirstId==0){
+                        this.handleSelectFirstVariety(this.tableData[0])
+                    }else{
+                        let index=this.tableData.findIndex(e=>e.PermissionId==this.selectFirstId)
+                        this.handleSelectFirstVariety(this.tableData[index])
+                    }
+                    
+                }
+            }
+        },
+
+        // 点击一级分类
+        handleSelectFirstVariety(item){
+            this.selectFirstId=item.PermissionId
+            const arr=item.Child?JSON.parse(JSON.stringify(item.Child)):[]
+            this.secondVarietyList=arr
+        },
+
+        // 快捷设置是否禁用\公有私有
+        async handleQuickSet(item,type){
+            let params={
+                PermissionId:item.PermissionId,
+                PermissionName:item.PermissionName,
+                ParentId:item.ParentId
+            }
+            if(type==='enable'){
+                params.enabled=item.Enabled==1?0:1
+                this.handleSetEnable(params)
+                return
+            }else if(type==='ispublic'){
+                params.IsPublic=item.IsPublic==1?0:1
+            }
+            const res=this.typeVal==1?await reportVarietyInterence.editVariety(params):await reportVarietyENInterence.editVariety(params)
+            if(res.Ret===200){
+                this.$message.success(`编辑成功`)
+                this.getList()
+            }
+        },
+
+        //设置启用禁用
+        async handleSetEnable(data){
+            const params={
+                PermissionId:data.PermissionId,
+                Enabled:data.enabled
+            }
+            const res=this.typeVal==1?await reportVarietyInterence.setEnable(params):await reportVarietyENInterence.setEnable(params)
+            if(res.Ret===200){
+                this.$message.success(`设置成功`)
+                this.getList()
+            }
+        },
+    
+        //显示添加品种
+        handleAddVariety(level){
+            if(level==2){
+                this.editBreedData.parentId=this.selectFirstId
+            }
+            this.checkOpts=[]
+            this.showEditBreed=true
+        },
+
+        //点击显示编辑品种
+        handleShowEdit(item){
+            if(item.ParentId){//编辑子分类
+                this.editBreedData={
+                    id:item.PermissionId,
+                    name:item.PermissionName,
+                    parentId:item.ParentId,
+                    status:item.Enabled===1?true:false,
+                    isPublic:item.IsPublic
+                }
+                this.showEditBreed=true
+                return
+            }
+            this.selectFirstId=item.PermissionId
+            const arr=item.Child?JSON.parse(JSON.stringify(item.Child)):[]
+            this.checkOpts=arr
+
+            this.checkOpts.forEach(item=>{
+                if(item.IsPublic==1){
+                    this.checkedList.push(item.PermissionId)
+                }
+            })
+            this.checkAll = this.checkedList.length === this.checkOpts.length;
+            this.isIndeterminate = this.checkedList.length > 0 && this.checkedList.length < this.checkOpts.length;
+            
+            this.editBreedData={
+                id:item.PermissionId,
+                name:item.PermissionName,
+                parentId:item.ParentId,
+                status:item.Enabled===1?true:false
+            }
+
+            console.log(this.isIndeterminate,this.checkedList);
+
+            this.showEditBreed=true
+        },
+
+        // 公有权限设置全选按钮
+        handleCheckAllChange(val){
+            let list=[]
+            this.secondVarietyList.forEach(item => {
+                list.push(item.PermissionId)
+            });
+            this.checkedList=val?list:[]
+            this.isIndeterminate=false
+        },
+        handleCheckedAuthChange(value){
+            let checkedCount = value.length;
+            this.checkAll = checkedCount === this.secondVarietyList.length;
+            this.isIndeterminate = checkedCount > 0 && checkedCount < this.secondVarietyList.length;
+        },
+
+        onMove(e){
+           
+            return true
+        },
+
+        // 拖动排序结束
+        async handleSortEnd(e,level){
+            const arr=level==1?this.tableData:this.secondVarietyList
+            if(arr.length===1) return
+
+            const newIndex=level==1?e.newIndex:e.newIndex//因为子组件前面有个固定的添加项 所以实际index要-1
+            const PermissionId=arr[newIndex].PermissionId
+            let PrevPermissionId=0,NextPermissionId=0;
+
+            if(newIndex==0){//移动到最前面
+                NextPermissionId=arr[newIndex+1].PermissionId
+            }else if(newIndex===arr.length-1){//移动到最后面
+                PrevPermissionId=arr[newIndex-1].PermissionId
+            }else{
+                PrevPermissionId=arr[newIndex-1].PermissionId
+                NextPermissionId=arr[newIndex+1].PermissionId
+            }
+            const params={
+                PermissionId,
+                PrevPermissionId,
+                NextPermissionId
+            }
+            const res=this.typeVal==1?await reportVarietyInterence.sortVariety(params):await reportVarietyENInterence.sortVariety(params)
+            if(res.Ret===200){
+                this.$message.success('移动成功')
+            }
+            this.getList()
+        },
+
+        // 中英文品种切换
+        handleTypeChange(type){
+            this.typeVal=type
+            this.tableData=[]
+            this.selectFirstId=0
+            this.secondVarietyList=[]
+            this.getList()
+        },
+
+        async handleConfirmEidtBreed(){
+            if(!this.editBreedData.name){
+                this.$message.warning('请填写品种名称')
+                return
+            }
+            let params={
+                PermissionName:this.editBreedData.name,
+                ParentId:this.editBreedData.parentId,
+                Enabled:this.editBreedData.status?1:0
+            }
+            if(this.editBreedData.id){
+                params.PermissionId=this.editBreedData.id
+                if(params.ParentId){
+                    params.IsPublic=this.editBreedData.isPublic
+                }
+            }
+            let res
+            // 中文
+            if(this.typeVal===1){
+                if(this.editBreedData.id>0&&params.ParentId==0){//编辑一级品种时批量设置公有权限
+                    params.PublicPermissionIds=this.checkedList||[]
+                }
+                res=this.editBreedData.id?await reportVarietyInterence.editVariety(params):await reportVarietyInterence.addVariety(params)
+            }else{//英文
+                res=this.editBreedData.id?await reportVarietyENInterence.editVariety(params):await reportVarietyENInterence.addVariety(params)
+            }
+            if(res.Ret===200){
+                this.$message.success(`${this.editBreedData.id?'编辑':"新增"}成功`)
+                this.getList()
+                this.showEditBreed=false
+            }
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped>
+.top-wrap{
+    background: #FFFFFF;
+    border-radius: 4px;
+    .type-box{
+        display: flex;
+        .item{
+            position: relative;
+            cursor: pointer;
+            color: #666;
+            min-width: 88px;
+            line-height: 44px;
+            text-align: center;
+        }
+        .active{
+            color: #0052D9;
+            &::after{
+                content: '';
+                display: block;
+                width: 100%;
+                height: 2px;
+                position: absolute;
+                bottom: 0px;
+                left: 0;
+                background-color: #0052D9;
+            }
+        }
+    }
+}
+.main-wrap{
+    margin-top: 20px;
+    height: calc(100vh - 220px);
+    display: flex;
+    .left-wrap{
+        border: 1px solid #DCDFE6;
+        background-color: #fff;
+        height: 100%;
+        width: 400px;
+        flex-shrink: 0;
+        margin-right: 20px;
+        display: flex;
+        flex-direction: column;
+        .add-btn-box{
+            padding: 20px;
+            box-shadow: 0px 2px 12px 0px #00000014;
+            flex-shrink: 0;
+        }
+        .first-variety-wrap{
+            padding: 20px;
+            flex: 1;
+            overflow: auto;
+            .f-list-wrap{
+                .item{
+                    display: flex;
+                    align-items: center;
+                    justify-content: space-between;
+                    padding: 10px 20px 10px 10px;
+                    &.active{
+                        background-color: #ECF2FE;
+                    }
+                    .name{
+                        flex: 1;
+                        overflow: hidden;
+                        white-space: nowrap;
+                        text-overflow: ellipsis;
+                    }
+                    .menu-box{
+                        display: flex;
+                        gap: 0 10px;
+                        align-items: center;
+                    }
+                    .icon-drag,.icon-set{
+                        width: 16px;
+                        height: 16px;
+                    }
+                }
+            }
+        }
+    }
+    .list-wrap{
+        flex: 1;
+        display: flex;
+        flex-wrap: wrap;
+        align-content: start;
+        gap: 20px;
+        .item{
+            cursor: pointer;
+            background-color: #fff;
+            width: 186px;
+            height: 128px;
+            display: block;
+            box-sizing: border-box;
+            padding: 10px;
+            display: flex;
+            flex-direction: column;
+            .top-icons{
+                display: flex;
+                justify-content: space-between;
+                .icon-drag{
+                    width: 16px;
+                    height: 16px;
+                }
+            }
+            .name-box{
+                flex: 1;
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                .name{
+                    font-size: 18px;
+                    flex: 1;
+                    text-align: center;
+                    display: -webkit-box;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    -webkit-line-clamp: 2;
+                    line-break: anywhere;
+                    -webkit-box-orient: vertical;
+                }
+                .icon-edit{
+                    width: 16px;
+                    height: 16px;
+                }
+            }
+            .tag-box{
+                width: 100%;
+                height: 30px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                .icon{
+                    width: 16px;
+                    height: 16px;
+                    margin-left: 10px;
+                }
+                &.open{
+                    color: #0052D9;
+                    background-color: #ECF2FE;
+                }
+                &.close{
+                    color: #fff;
+                    background-color: #0052D9;
+                }
+            }
+        }
+        .add-btn{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            .icon{
+                width: 32px;
+                height: 32px;
+            }
+        }
+    }
+}
+.edit-variety-wrap{
+    .public-auth-box{
+        .auth-list-box{
+            margin-top: 20px;
+            padding: 20px;
+            background-color: #F8F8F8;
+        }
+        
+    }
+}
+</style>

src/views/sandbox_manage/index_new_version.vue

@@ -193,6 +193,7 @@ import { svgToBase64 } from '@/utils/svgToblob'
 import mindmap from "./common/mindmap"
 
 import { myGraph } from './common/gragh';
+import {reportVarietyInterence} from '@/api/modules/reportVariety'
 
   export default {
     name:"sandbox_manage_index",
@@ -305,9 +306,9 @@ import { myGraph } from './common/gragh';
           ChartPermissionId:{required: true, message:this.$t('SandboxManage.SandList.catalog_variety_placeholder')||'请选择对应品种', trigger: 'change'}
         },
         classifyProps: {
-          children: 'Items',
-          label: 'ClassifyName',
-          value: 'ChartPermissionId',
+          children: 'Child',
+          label: 'PermissionName',
+          value: 'PermissionId',
           emitPath:false
 			  },
         classifyArr:[],
@@ -356,11 +357,14 @@ import { myGraph } from './common/gragh';
     methods:{
       /* 获取品种 */
       getClassify() {
-        customInterence.getvariety({
-          CompanyType: 'ficc'
-        }).then(res => {
-          if(res.Ret !== 200)  return
-            this.classifyArr = res.Data.List||[ ]
+        // customInterence.getvariety({
+        //   CompanyType: 'ficc'
+        // }).then(res => {
+        //   if(res.Ret !== 200)  return
+        //     this.classifyArr = res.Data.List||[ ]
+        // })
+        reportVarietyInterence.filterVarietyOpts().then(res=>{
+          this.classifyArr=res.Data||[]
         })
       },
       // 获取沙盘图分类

src/views/semantics_manage/asr/ASR.vue

@@ -0,0 +1,2013 @@
+<template>
+  <div id="asr-container">
+    <div class="asr-main">
+      <div class="asr-main-left">
+        <div class="add-zone" >
+          <el-button @click="addAsr" type="primary" style="min-width: 100px;"
+          v-permission="permissionBtn.semanticPermission.ASR_addArticles">新建</el-button>
+        </div>
+        <div class="catalogue-zone" v-loading="detailLoadig" element-loading-text="加载中······">
+          <div class="search-box">
+            <el-select v-model="search_txt" v-loadMore="searchLoad" :filterable="!search_txt" remote clearable
+              placeholder="请输入文件名称" class="select-com" :remote-method="searchHandle" @click.native="inputFocusHandle">
+              <i slot="prefix" class="el-input__icon el-icon-search"></i>
+              <el-option v-for="item in searchOptions" :key="item.SpeechRecognitionId" :label="item.FileName"
+                :value="item.SpeechRecognitionId">
+              </el-option>
+            </el-select>
+            <el-popover placement="bottom-end" :offset="10" width="334" v-model="showFilterPopopver"
+              trigger="click" @hide="resetFilterOption" @show="getTagsList">
+                <div class="filter-poopver">
+                  <div class="filter-poopver-header">
+                    <span>筛选项</span>
+                    <span style="cursor: pointer;color: #0052D9;" @click="resetFilterOption('clear')">清空</span>
+                  </div>
+                  <el-form :model="filterForm" ref="filterForm" class="filter-poopver-form">
+                    <el-form-item prop="createtimeRange">
+                      <el-date-picker v-model="filterForm.createtimeRange" start-placeholder="开始" end-placeholder="结束"
+                      type="daterange" style="width: 100%;" value-format="yyyy-MM-dd"></el-date-picker>
+                    </el-form-item>
+                    <el-form-item prop="author" >
+                      <el-cascader v-model="filterForm.author" placeholder="创建人" ref="authorsCascader" clearable 
+                      id="authors-cascader" style="width: 100%" :options="authorsList" collapse-tags :show-all-levels="false"
+                      :props="{value:'ItemId',label:'ItemName',children:'Children',multiple:true,emitPath:false}"></el-cascader>
+                      <!-- <el-select v-model="filterForm.author" placeholder="创建人" style="width: 100%;" multiple
+                      collapse-tags filterable>
+                        <el-option :label="item.authorName" :value="item.authorId"
+                        v-for="item in authorsList" :key="item.authorId" ></el-option>
+                      </el-select> -->
+                    </el-form-item>
+                    <el-form-item prop="tags" v-if="leftShowLabel !== '标签'">
+                      <el-select v-model="filterForm.tags" placeholder="标签" style="width: 100%;" multiple
+                      collapse-tags filterable>
+                        <el-option :label="item.TagName" :value="item.TagId" 
+                        v-for="item in tagsList" :key="item.TagId"></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-form>
+                  <div class="filter-poopver-footer">
+                    <el-button type="primary" plain style="width: 140px;"  @click="showFilterPopopver=false">取消</el-button>
+                    <el-button type="primary" style="width: 140px;" @click="filterArticle">确认</el-button>
+                  </div>
+                </div>
+              <div class="filter-box" slot="reference">
+                <img src="~@/assets/img/filter.png" />
+                <span>筛选</span>
+              </div>
+            </el-popover>
+          </div>
+          <div class="catalogue-head">
+            <ul class="left-tab">
+              <li :class="['tab', { 'act': leftShowLabel === tab }]" v-for="tab in ['目录', '标签']" :key="tab"
+                @click="tabChange(tab)">{{ tab }}</li>
+            </ul>
+          </div>
+          <div v-show="leftShowLabel=='目录'" class="tree-container">
+            <div class="tree-cont">
+              <el-tree ref="treeRef" class="target_tree" :data="treeData" node-key="UniqueCode" :props="defaultProp"
+                :allow-drag="canDragHandle" :allow-drop="canDropHandle" :current-node-key="select_node_key"
+                :default-expanded-keys="defaultShowNodes" draggable :expand-on-click-node="false" check-strictly
+                empty-text="暂无分类" lazy :load="getLazyTreeData" @node-expand="handleNodeExpand"
+                @node-collapse="handleNodeCollapse" @current-change="nodeChange" @node-drop="dropOverHandle"
+                @node-drag-end="dropMouseLeave" @node-drag-leave="dropMouseLeave" @node-drag-enter="dropMouseOver">
+                <span class="custom-tree-node" slot-scope="{ node, data }">
+                  <span class="text-span">{{ data.NodeType==0?data.MenuName:data.SpeechRecognitionName }}</span>
+                  <span v-if="select_node_key === data.UniqueCode" class="operation-span">
+                    <img src="~@/assets/img/sand_new/move.png"/>
+                    <!-- 添加子项 -->
+                    <img src="~@/assets/img/sand_new/add_outline.png" @click.stop="addNode(node, data)" 
+                    v-if="data.Level<3 && data.NodeType==0 && permissionBtn.isShowBtn('semanticPermission', 'ASR_classify_catalogue_add')"/>
+                    <!-- 编辑子项 -->
+                    <img src="~@/assets/img/sand_new/edit_outline.png" @click.stop="editNode(node, data)"
+                    v-if="data.NodeType==0 && permissionBtn.isShowBtn('semanticPermission', 'ASR_classify_catalogue_edit')"/>
+                    <!-- 删除子项 -->
+                    <img slot="reference" src="~@/assets/img/sand_new/delete_outline.png" @click.stop="removeNode(node, data)" 
+                    v-if="data.NodeType==0 && permissionBtn.isShowBtn('semanticPermission', 'ASR_classify_catalogue_del')" style="margin-right: 0;"/>
+                  </span>
+                </span>
+              </el-tree>
+            </div>
+            <div class="bottom-operation" v-permission="permissionBtn.semanticPermission.ASR_classify_catalogue_add">
+              <div class="bottom-add" @click="editCatalogue(1)">
+                <img src="~@/assets/img/add-quadrate-blue.png" />
+                <span>添加目录分类</span>
+              </div>
+            </div>
+          </div>
+          <div v-show="leftShowLabel=='标签'" class="tree-container">
+            <div class="tree-cont">
+              <el-tree ref="tagTreeRef" class="target_tree" :data="tagTreeData" node-key="UniqueCode" :props="defaultProp"
+                :allow-drag="canDragHandle" :allow-drop="canDropHandle" :current-node-key="tag_select_node_key"
+                :default-expanded-keys="tagDefaultShowNodes" draggable :expand-on-click-node="false" check-strictly
+                empty-text="暂无分类" lazy :load="getLazyTreeTagData" @node-expand="handleNodeExpand"
+                @node-collapse="handleNodeCollapse" @current-change="nodeChange" @node-drop="dropOverHandle"
+                @node-drag-end="dropMouseLeave" @node-drag-leave="dropMouseLeave" @node-drag-enter="dropMouseOver">
+                <span class="custom-tree-node" slot-scope="{ node, data }">
+                  <span class="text-span">{{ data.NodeType==0?data.MenuName:data.TagName }}</span>
+                  <span v-if="tag_select_node_key === data.UniqueCode" class="operation-span">
+                    <img src="~@/assets/img/sand_new/move.png"/>
+                    <!-- 添加子项 -->
+                    <img src="~@/assets/img/sand_new/add_outline.png" @click.stop="addNode(node, data)"
+                    v-if="data.Level<3 && data.NodeType==0 && permissionBtn.isShowBtn('semanticPermission', 'ASR_classify_tag_add')"/>
+                    <!-- 编辑子项 -->
+                    <img src="~@/assets/img/sand_new/edit_outline.png" @click.stop="editNode(node, data)"
+                    v-if="data.TagId ? 
+                          permissionBtn.isShowBtn('semanticPermission', 'ASR_tagOperation_editTag'):
+                          permissionBtn.isShowBtn('semanticPermission', 'ASR_classify_tag_edit')"/>
+                    <!-- 删除子项 -->
+                    <img slot="reference" src="~@/assets/img/sand_new/delete_outline.png" @click.stop="removeNode(node, data)" style="margin-right: 0;"
+                    v-if="data.TagId ? 
+                    permissionBtn.isShowBtn('semanticPermission', 'ASR_tagOperation_deleteTag'):
+                    permissionBtn.isShowBtn('semanticPermission', 'ASR_classify_tag_del')"/>
+                  </span>
+                </span>
+              </el-tree>
+            </div>
+            <div class="bottom-operation">
+              <div class="bottom-add" @click="editCatalogue(1)" style="margin-right: 20px;" 
+              v-permission="permissionBtn.semanticPermission.ASR_classify_tag_add">
+                <img src="~@/assets/img/add-quadrate-blue.png" />
+                <span>添加标签分类</span>
+              </div>
+              <div class="bottom-add" @click="editTag" v-permission="permissionBtn.semanticPermission.ASR_tagOperation_addTag">
+                <img src="~@/assets/img/add-quadrate-blue.png" />
+                <span>添加标签</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 详情 -->
+      <div class="asr-main-right detail" v-loading="detailLoadig" v-permission="permissionBtn.semanticPermission.ASR_view"
+      v-if="articleDetail && articleDetail.SpeechRecognitionId">
+        <div class="detail-top">
+          <div class="detail-top-search">
+            <el-input v-model="articleDetail.FileName" placeholder="请输入文件名称" style="width: 240px;margin-right: 30px;"
+            :disabled="!permissionBtn.isShowBtn('semanticPermission', 'ASR_renameArticles')"></el-input>
+            <div class="tag-button" @click="makeTagsDiaOpen(null)" style="margin-right: 30px;cursor: pointer;"
+            v-permission="permissionBtn.semanticPermission.ASR_tagMark_view">
+              <img src="~@/assets/img/tag.png" />
+              <span style="color: #0052D9;">打标签</span>
+            </div>
+            <el-input v-model="keyWord" placeholder="请输入关键词" prefix-icon="el-icon-search" clearable
+            style="width: 360px;margin-right: 30px;" @input="searchKeyword">
+              <template slot="append">
+                <div class="toggle-keywords-box" v-if="keyWord">
+                  <img src="~@/assets/img/icons/arrow_left_black.png" @click="last"/>
+                  <span>{{ num }}/{{ wordList?wordList.length:0 }}</span>
+                  <img src="~@/assets/img/icons/arrow_left_black.png" style="transform: rotate(180deg);" 
+                  @click="next"/>
+                </div>
+              </template>
+            </el-input>
+          </div>
+          <el-button type="primary" style="width: 120px;" @click="save" :loading="saveLoading" 
+          v-permission="permissionBtn.semanticPermission.ASR_saveArticles">保存</el-button>
+        </div>
+        <div class="detail-tag-area">
+          <div class="tag-button" v-for="(item,index) in articleDetail.Tags" :key="item.TagId" >
+            <img src="~@/assets/img/tag-gray.png" />
+            <span>{{ item.TagName }}</span>
+            <img src="~@/assets/img/icons/close.png" class="tag-close-icon" @click="deleleTag(item,index)"/>
+          </div>
+        </div>
+        <!-- 视频 -->
+        <div class="detail-video-area" v-if="articleDetail && articleDetail.type==2 && articleDetail.ResourceUrl"
+        v-show="!videoHidden">
+          <media-com :ResourceUrl="articleDetail.ResourceUrl" :type="articleDetail.type" ref="mediaRef" />
+        </div>
+        <div class="detail-content">
+          <div v-if="articleDetail && articleDetail.type==2" class="deail-top-operation">
+            <div class="content-row-operation active" @click="videoHidden=!videoHidden" style="margin-right: 0;" v-if="articleDetail.ResourceUrl">
+              <img :src="videoHidden?require('@/assets/img/icons/eyes-show-active.png'):require('@/assets/img/icons/eyes-hide-active.png')" />
+              <span>{{ videoHidden?"显示":"隐藏" }}</span>
+            </div>
+            <div class="content-row-operation drange" @click="deleteMedia" style="margin-right: 0;" v-if="articleDetail.ResourceUrl"
+            v-permission="permissionBtn.semanticPermission.ASR_deleteVideo">
+              <img src="~@/assets/img/icons/delete-red.png" />
+              <span>删除</span>
+            </div>
+          </div>
+          <div class="content-mutil-operation">
+            <el-checkbox label="全选" style="margin-right: 30px;" @change="checkAll"
+            v-model="isCheckAll" :indeterminate="isIndeterminate"></el-checkbox>
+            <div class="content-row-operation active" @click="copyText(null)" v-show="checkList && checkList.length>0"
+              v-permission="permissionBtn.semanticPermission.ASR_copyText">
+              <img src="~@/assets/img/icons/copy-active.png" />
+              <span>复制</span>
+            </div>
+            <div class="content-row-operation active" v-show="checkList && checkList.length>0"
+              v-permission="permissionBtn.semanticPermission.ASR_toggleTimestampShow" 
+              @click="toggleTimestampShow(null)">
+              <img :src="hideTimestampAll?require('@/assets/img/icons/eyes-show-active.png'):require('@/assets/img/icons/eyes-hide-active.png')" />
+              <span>{{ hideTimestampAll?"展示时间戳":"隐藏时间戳" }}</span>
+            </div>
+          </div>
+          <div class="content-title">原文</div>
+          <div class="content-main" :style="{minHeight:articleDetail.ResourceUrl?'490px':'560px'}" ref="contentMain">
+            <div class="content-row" v-for="(item,index) in articleDetail.Contents" :key="item.SpeechRecognitionContentId"
+            @mouseover="item.IsHover=true" @mouseout="item.IsHover=false" :id="'paragraph_'+(index+1)">
+              <div class="content-row-info">
+                <div class="content-row-time" :style="{visibility:item.HideTimestamp?'hidden':'visible'}">
+                  <img src="~@/assets/img/asr.png" class="content-info-speaker"/>
+                  <div class="content-info-start">{{ item.StartTime }}</div>
+                </div>
+                <div class="content-row-operation" :class="{'active':item.IsHover}" @click="copyText(item)"
+                v-permission="permissionBtn.semanticPermission.ASR_copyText">
+                  <img :src="item.IsHover?require('@/assets/img/icons/copy-active.png'):require('@/assets/img/icons/copy.png')" />
+                  <span>复制</span>
+                </div>
+                <div class="content-row-operation" :class="{'active':item.IsHover}" @click="toggleTimestampShow(item)"
+                v-permission="permissionBtn.semanticPermission.ASR_toggleTimestampShow" >
+                  <img :src="item.HideTimestamp?require('@/assets/img/icons/eyes-show.png'):require('@/assets/img/icons/eyes-hide.png')" 
+                  v-show="!item.IsHover"/>
+                  <img :src="item.HideTimestamp?require('@/assets/img/icons/eyes-show-active.png'):require('@/assets/img/icons/eyes-hide-active.png')" 
+                  v-show="item.IsHover"/>
+                  <span>{{ item.HideTimestamp?"展示时间戳":"隐藏时间戳" }}</span>
+                </div>
+              </div>
+              <div class="content-row-content" >
+                <el-checkbox :label="item.SpeechRecognitionContentId" v-model="checkList" @change="checkSingle">{{ '' }}</el-checkbox>
+                <div class="content-row-text"  contenteditable @blur="(e)=> updateData(e,item,index)"
+                :style="{backgroundColor:paragraphIndex==(index+1)?'#ECF2FE':'unset'}"
+                >{{ item.Content }}</div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- 音频 -->
+        <div class="detail-audio-area" v-if="articleDetail && articleDetail.type==1 && articleDetail.ResourceUrl">
+          <media-com :ResourceUrl="articleDetail.ResourceUrl" :type="articleDetail.type" ref="mediaRef" />
+          <img src="~@/assets/img/icons/delete-red.png" @click="deleteMedia" v-permission="permissionBtn.semanticPermission.ASR_deleteVoice" />
+        </div>
+      </div>
+      <!-- 列表 -->
+      <div class="asr-main-right" v-else v-permission="permissionBtn.semanticPermission.ASR_view" 
+      v-infinite-scroll="handleLoadMore" :infinite-scroll-immediate="true" :infinite-scroll-disabled="articleListRequest.finished">
+        <template v-if="articleList && articleList.length>0">
+          <div class="file-count">共{{ total }}个文件</div>
+          <div class="file-container">
+            <div class="file-item" v-for="item in articleList" :key="item.SpeechRecognitionId" @click="switchDetail(item)">
+              <div class="file-main">
+                <el-tooltip :content="item.FileName" placement="top" v-tooltipHidable>
+                  <div class="file-name">
+                    {{ item.FileName }}
+                  </div>
+                </el-tooltip>
+                <div class="file-tag-list">
+                  <div class="file-tag" v-for="tag in item.Tags" 
+                  :key="tag.TagId">{{ tag.TagName }}</div>
+                </div>
+                <div class="file-content">
+                  {{ item.Abstract }}
+                </div>
+              </div>
+              <div class="file-footer">
+                <div class="file-time">
+                  <span >{{ item.CreateTime }}</span>
+                  <span class="split-element">{{ item.FileSecond }}</span>
+                  <span class="split-element">{{ item.FileSize }}</span>
+                </div>
+                <div class="file-author">{{ item.SysUserName }}</div>
+                <div class="file-operation">
+                  <el-dropdown @command="(e)=>handleCommandMore(e,item)">
+                    <img src="~@/assets/img/more.png" />
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item command="rename" v-permission="permissionBtn.semanticPermission.ASR_renameArticles">重命名</el-dropdown-item>
+                      <el-dropdown-item command="tag" v-permission="permissionBtn.semanticPermission.ASR_tagMark_view">打标签</el-dropdown-item>
+                      <el-dropdown-item command="export" v-permission="permissionBtn.semanticPermission.ASR_exportArticles">导出</el-dropdown-item>
+                      <el-dropdown-item command="del" v-permission="permissionBtn.semanticPermission.ASR_deleteArticles">删除</el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                </div>
+              </div>
+            </div>
+          </div>
+        </template>
+        <div v-else class="nodata">
+          <tableNoData text="暂无记录"/>
+        </div>
+      </div>
+    </div>
+
+    <!-- 上传音视频弹窗 -->
+    <media-upload :dia-show.sync="mediaUploadDiaShow"  @uploadSuccess="uploadSuccess" :articleCatalogue="articleCatalogue"/>
+    <!-- 目录弹窗 -->
+    <catalogue-dia :dia-show.sync="catalogueDiaShow" :form-data="catalogueData" @catalogueSuccess="catalogueSuccess"/>
+    <!-- 编辑标签 -->
+    <edit-tag :dia-show.sync="tagDiaShow" :form-data="tagData" @tagSuccess="tagSuccess" :tagCatalogue="tagCatalogue"/>
+    <!-- 重命名 -->
+    <file-rename :dia-show.sync="renameDiaShow" :form-data="renameData" @renameSuccess="rename"/>
+    <!-- 导出 -->
+    <export-dia :dia-show.sync="exportDiaShow" :form-data="exportData"/>
+    <!-- 打标签 -->
+    <make-tags :dia-show.sync="makeTagsDiaShow" :form-data="makeTagsData" @makeTagsSuccess="makeTagsSuccess"
+      :tagsList="tagsList" :tagCatalogueList="tagCatalogue" ref="makeTagsRef"
+      @addTagSuccess="addTagSuccess" @updateTagsTree="updateTagsTree" />
+    <!-- 转写状态浮窗 -->
+    <transfer-status :windowShow.sync="transferStatusShow" :transferStatus="transferStatus"
+     class="status-window" @deleteRow="deleteRow"/>
+  </div>
+</template>
+
+<script>
+import mediaCom from "./components/mediaCom.vue"
+import catalogueDia from './components/catalogueDia.vue'
+import editTag from './components/editTag.vue'
+import tooltipHidable from "@/directives/tooltip-hidable.js"
+import fileRename from "./components/fileRename.vue"
+import exportDia from "./components/exportDia.vue"
+import makeTags from "./components/makeTags.vue"
+import mediaUpload from './components/mediaUpload.vue';
+import transferStatus from './components/transferStatus.vue';
+
+import {asrInterface} from '@/api/modules/semanticsApi.js';
+import { dataAuthInterface } from "@/api/api.js";
+
+export default {
+  name: "ASR",
+  components:{mediaCom,catalogueDia,editTag,fileRename,exportDia,makeTags,mediaUpload,transferStatus},
+  directives:{
+    tooltipHidable
+  },
+  data() {
+    return {
+      search_txt: '',
+      current_search:'',
+      searchOptions: [],
+      searchHaveMore:false,
+      leftShowLabel: "目录",
+      onlyMe: false,
+      treeData: [],
+      articleCatalogue:[],
+      tagTreeData:[],
+      tagCatalogue:[],
+      tagOnlyMe: false,
+      defaultShowNodes: [], //展开节点
+      tagDefaultShowNodes: [], //标签树展开节点
+      defaultProp: {
+        // label: 'MenuName',
+        children: 'Children',
+        isLeaf:'isLeaf'
+      }, //树结构配置项
+      select_node_key: '', //当前选中的节点
+      tag_select_node_key:'',
+      select_node_data: '', //当前选中的节点数据
+      articleDetail:{},
+      detailLoadig:false,
+      saveLoading:false,
+      // 段落文字内容备份
+      paragraphs:[],
+      articleList:[],
+      page:1,
+      pageSize:20,
+      total:0,
+      searchPage:1,
+      searchPageSize:20,
+      articleParams:{
+        createtimeRange:[],
+        author:[],
+        tags:[]
+      },
+      showFilterPopopver:false,
+      filterForm:{
+        createtimeRange:[],
+        author:[],
+        tags:[]
+      },
+      // 搜索高亮
+      keyWord:"",
+      num:0,
+      wordList:[],
+      authorsList:[],
+      tagsList:[],
+      articleListRequest:{
+        finished:true,
+        loading:false
+      },
+      result:[],
+      currentRow:{},
+      mediaUploadDiaShow:false,
+      // 目录
+      catalogueDiaShow:false,
+      catalogueData:{},
+      // 标签弹窗
+      tagDiaShow:false,
+      tagData:{},
+      // 重命名弹窗
+      renameDiaShow:false,
+      renameData:{},
+      // 导出弹窗
+      exportDiaShow:false,
+      exportData:{},
+      // 打标签弹窗
+      makeTagsDiaShow:false,
+      makeTagsData:{},
+      transferStatus:{},
+      transferStatusShow:false,
+      // 复选操作
+      hideTimestampAll:false,
+      isCheckAll:false,
+      isIndeterminate:false,
+      checkList:[],
+      videoHidden:false,
+      mediaTimer:null,
+      paragraphIndex:0,
+      highlightDom:null
+    }
+  },
+  watch:{
+    paragraphIndex(value){
+      if(value){
+        let showDom=document.getElementById(`paragraph_${value}`)
+        if(showDom){
+          // showDom.scrollIntoView({block:'center',behavior:'smooth'})
+          $(showDom.parentElement).animate({
+            scrollTop:showDom.offsetTop-showDom.parentElement.clientHeight/2+showDom.clientHeight
+          },500)
+        }
+      }
+    },
+    num(value){
+      if(value){
+        this.paragraphIndex=this.wordList[value-1].index+1
+        this.$refs.mediaRef && this.$refs.mediaRef.updateCurrentTime(this.wordList[value-1].startMs/1000)
+      }
+    },
+    select_node_data(value){
+      if((!value) || value.TagId || value.MenuId){ 
+        // 列表
+        this.page=1
+        this.getArticleList()
+      }
+    },
+    /* 选中搜索指标 展开目录 选中指标 展示数据 */
+		search_txt(newval) {
+			if (newval) {
+				let [search_obj] = this.searchOptions.filter(
+					(item) => item.SpeechRecognitionId === newval
+				);
+        this.switchDetail(search_obj)
+			}
+		},
+  },
+  created() {
+    this.getTreeData()
+    this.getAdminList()
+    this.getTransferStatus()
+    this.getArticleList()
+  },
+  methods: {
+    tabChange(tab){
+      this.leftShowLabel = tab
+      this.clearFilterOption()
+      this.search_txt=""
+      if(this.leftShowLabel=="目录"){
+        this.treeData=[]
+        this.getTreeData(true)
+      }else{
+        this.tagTreeData=[]
+        this.getTagTreeData()
+      }
+    },
+    // 获取目录-目录列表
+    getTreeData(getDetail) {
+      asrInterface.getCatalogueList({ParentId:0}).then(res=>{
+        if(res.Ret == 200){
+          this.treeData=res.Data || []
+          this.$nextTick(()=>{
+            this.$refs.treeRef.setCurrentKey(this.select_node_key);
+            this.select_node_data = this.$refs.treeRef.getCurrentNode()
+            // 详情没有通过监听 select_node_data 发请求
+            if(getDetail && this.select_node_data && this.select_node_data.SpeechRecognitionId){
+              this.switchDetail(this.select_node_data)
+            }
+          })
+        }
+      })
+    },
+    // 获取标签-目录列表
+    getTagTreeData(){
+      asrInterface.getTagCatalogueList({ParentId:0}).then(res=>{
+        if(res.Ret == 200){
+          this.tagTreeData=res.Data || []
+          this.$nextTick(()=>{
+            this.$refs.tagTreeRef.setCurrentKey(this.tag_select_node_key);
+            this.select_node_data = this.$refs.tagTreeRef.getCurrentNode()
+          })
+        }
+      })
+    },
+    // 获取目录-目录树
+    getArticleCatalogue(){
+      asrInterface.getCatalogueTree().then(res=>{
+        if(res.Ret == 200){
+          this.articleCatalogue=res.Data || []
+        }
+      })
+    },
+    // 获取标签-目录树
+    getTagCatalogue(){
+      asrInterface.getTagTree().then(res=>{
+        if(res.Ret == 200){
+          this.tagCatalogue=res.Data || []
+        }
+      })
+    },
+    getTagsList(){
+      if(!this.permissionBtn.isShowBtn('semanticPermission','ASR_tagMark_view')) return 
+      asrInterface.getTagsList().then(res=>{
+        if(res.Ret == 200){
+          this.tagsList=res.Data || []
+          if(this.makeTagsDiaShow){
+            setTimeout(()=>{
+              this.$refs.makeTagsRef.updateTagsList()
+              this.$refs.makeTagsRef.tagsCheckedChange()
+            },0)
+          }
+        }
+      })
+    },
+    // 递归节点
+		getNodeParentData(data,arr){
+			if(data.level===0) return
+			arr.unshift(data.data.MenuName)
+			this.getNodeParentData(data.parent,arr)
+		},
+    getAdminList(){
+      dataAuthInterface.userSearch().then(res=>{
+        if(res.Ret == 200){
+          this.authorsList = res.Data||[];
+        }
+      })
+
+    },
+    /**
+     * 添加节点
+     * @param {*} node 
+     * @param {*} data 
+     */
+    addNode(node, data){
+      let arr=[]
+      this.getNodeParentData(node,arr)
+      this.editCatalogue(data.Level+1,{
+        pId:data.MenuId,
+        mId:0,
+        code:data.UniqueCode,
+        first:arr[0]||'',
+        second:arr[1]||'',
+        third:arr[2]||'',
+      })
+    },
+    /**
+     * 编辑节点
+     * @param {*} node 
+     * @param {*} data 
+     */
+    editNode(node, data){
+      if(data.NodeType==1 && this.leftShowLabel=="标签"){
+        // 编辑标签
+        this.editTag({
+          tId:data.TagId,
+          mId:data.ParentId,
+          tName:data.TagName
+        })
+      }else{
+        // 添加/编辑目录
+        let arr=[]
+        this.getNodeParentData(node,arr)
+        this.editCatalogue(data.Level,{
+          pId:data.ParentId,
+          mId:data.MenuId,
+          code:data.UniqueCode,
+          first:arr[0]||'',
+          second:arr[1]||'',
+          third:arr[2]||'',
+        })
+      }
+    },
+    /**
+     * 添加/编辑目录
+     * @param {*} level 第几级目录
+     * @param {*} row 
+     */
+     editCatalogue(level,row){
+      this.catalogueData={
+        level,
+        type:this.leftShowLabel,
+        pId:row?row.pId:0,
+        mId:row?row.mId:0,
+        code:row?row.code:0,
+        first:row?row.first:'',
+        second:row?row.second:'',
+        third:row?row.third:'',
+      }
+      this.catalogueDiaShow=true
+    },
+    catalogueSuccess({type,code}){
+      if(this.leftShowLabel=="目录"){
+        this.getTreeData();
+        if(type == 'add'){
+          if(code && (!this.defaultShowNodes.some(item => item === code))){
+            this.defaultShowNodes.push(code)
+          }
+        }
+      }else{
+        this.getTagTreeData();
+        if(type == 'add'){
+          if(code && (!this.tagDefaultShowNodes.some(item => item === code))){
+            this.tagDefaultShowNodes.push(code)
+          }
+        }
+      }
+
+    },
+    // 删除节点
+    removeNode(node, data){
+      let params={}
+      let apiName=''
+
+      /**
+       * 0 可删除
+       * 1 关联指标
+       * 2 有子目录无指标
+      */
+      let deleteLabelMap={}
+      if(data.TagId){
+        // 标签
+        params={TagId:data.TagId}
+        apiName='removeTagCheck'
+        deleteLabelMap = {
+          0: '确定删除该标签吗？',
+          1: '标签关联转写文件，删除失败！'
+        }
+      }else{
+        // 目录
+        params={MenuId:data.MenuId}
+        apiName=this.leftShowLabel=="目录"?'removeCatalogueCheck':'removeTagCatalogueCheck'
+        deleteLabelMap = {
+						0: '确定删除当前分类吗？',
+						1: `该分类关联${this.leftShowLabel=='目录'?'转写文件':'标签'}，删除失败！`,
+						2: '确定删除当前分类及包含的子分类吗？'
+					}
+      }
+      asrInterface[apiName](params).then(res => {
+				if(res.Ret === 200) {
+					if([1].includes(res.Data.CheckResult)) this.$confirm(
+            deleteLabelMap[res.Data.CheckResult],
+            '删除失败',
+            {
+            confirmButtonText: '知道了',
+            showCancelButton:false,
+            type: 'error'
+          })
+					else if([0,2].includes(res.Data.CheckResult)) this.$confirm(
+              deleteLabelMap[res.Data.CheckResult]
+							|| '确定删除吗？', 
+							'提示',
+							{
+							confirmButtonText: '确定',
+							cancelButtonText: '取消',
+							type: 'warning'
+						}).then(() => {
+							this.delHandle(data.MenuId,data.TagId);
+						}).catch(() => {})
+				}
+			})
+    },
+    delHandle(mId,tid){
+      let params={}
+      let apiName=''
+      if(tid){
+        //标签
+        params={TagId:tid}
+        apiName='removeTag'
+      }else if(mId){
+        // 目录
+        params={MenuId:mId}
+        apiName=this.leftShowLabel=='目录'?'removeCatalogue':'removeTagCatalogue'
+      }
+      asrInterface[apiName](params).then(res=>{
+        if(res.Ret == 200){
+          this.leftShowLabel=='目录'?this.getTreeData():this.getTagTreeData()
+          this.$message.success("删除成功")
+        }
+      })
+    },
+    editTag(row){
+      this.getTagCatalogue()
+      this.tagData={
+        tId:row?row.tId:0,
+        mId:row?row.mId:0,
+        tName:row?row.tName:''
+      }
+      this.tagDiaShow=true
+    },
+    tagSuccess({type,menuIds}){
+      if(type == 'add' && menuIds && menuIds.length>0){
+        menuIds.map(code =>{
+          if (!this.tagDefaultShowNodes.some((item) => item === code)) {
+            this.tagDefaultShowNodes.push(code)
+          }
+        })
+      }
+      this.getTagTreeData()
+    },
+    searchLoad() {
+      if(!this.searchHaveMore) return;
+      this.searchPage++
+			this.searchApi(this.current_search);
+    },
+    searchHandle(query) {
+      this.searchPage = 1;
+			this.current_search = query;
+			this.searchApi(this.current_search)
+    },
+    inputFocusHandle(e) {
+      this.searchPage = 1;
+			this.current_search = e.target.value;
+			this.searchApi(this.current_search);
+    },
+		searchApi(query) {
+      let params={
+        CurrentIndex:this.searchPage,
+        PageSize:this.searchPageSize,
+        FileName:query
+      }
+      asrInterface.getSpeechList(params).then(res=>{
+        if(res.Ret == 200){
+          let arr = res.Data.List||[]
+          let paging = res.Data.Paging || {}
+          this.searchHaveMore = this.searchPage < paging.Pages;
+          this.searchOptions = this.searchPage==1?arr:[...this.searchOptions,...arr]
+        }
+      })
+		},
+    /* 判断节点是否能被拖拽 */
+		canDragHandle({data}) {
+      return (this.leftShowLabel=="目录" && this.permissionBtn.isShowBtn('semanticPermission','ASR_classify_catalogue_move'))
+            || (this.leftShowLabel=="标签" && this.permissionBtn.isShowBtn('semanticPermission','ASR_classify_tag_move'))
+		},
+    /* 判断节点是否能被拖入 */
+		canDropHandle(draggingNode, dropNode, type) {
+			let canDrop=false
+			let elementKey = this.leftShowLabel=="目录"?"SpeechRecognitionId":"TagId"
+			// 如果拖动的是元素（文件、标签）
+			if(draggingNode.data[elementKey]){
+				if(!(dropNode.level===1&&type!=='inner')){
+					canDrop=true
+				}
+			}else{//拖动的是目录
+				// console.log(dropNode.level,draggingNode.level);
+				//目录层级不能改变
+				if((dropNode.level+1==draggingNode.level&&type==='inner'&&!dropNode.data[elementKey])||(dropNode.level===draggingNode.level&&type!=='inner')){
+					canDrop=true
+				}
+			}
+			return canDrop
+		},
+    async getLazyTreeData(node, resolve) {
+      if(node.level===0){
+				resolve(this.treeData)
+			}else{
+				let arr=[]
+				const res=await asrInterface.getCatalogueList({ParentId:node.data.MenuId})
+				if (res.Ret === 200) {
+					const temarr = res.Data || [];
+					arr=temarr.map(item=>{
+						return {
+							...item,
+							isLeaf:item.SpeechRecognitionId?true:false
+						}
+					})
+          this.$nextTick(()=>{
+            this.$refs.treeRef.setCurrentKey(this.select_node_key);
+            this.select_node_data = this.$refs.treeRef.getCurrentNode()
+          })
+				}
+				resolve(arr)
+			}
+    },
+    async getLazyTreeTagData(node,resolve){
+      if(node.level===0){
+				resolve(this.tagTreeData)
+			}else{
+				let arr=[]
+				const res=await asrInterface.getTagCatalogueList({ParentId:node.data.MenuId})
+				if (res.Ret === 200) {
+					const temarr = res.Data || [];
+					arr=temarr.map(item=>{
+						return {
+							...item,
+							isLeaf:item.TagId?true:false
+						}
+					})
+          this.$nextTick(()=>{
+            this.$refs.tagTreeRef.setCurrentKey(this.tag_select_node_key);
+            this.select_node_data = this.$refs.tagTreeRef.getCurrentNode()
+          })
+				}
+				resolve(arr)
+			}
+    },
+    // 树节点展开
+    handleNodeExpand(data) {
+      // 保存当前展开的节点
+      let showNodes=[]
+      if(this.leftShowLabel=="目录"){
+        showNodes = this.defaultShowNodes
+      }else{
+        showNodes = this.tagDefaultShowNodes
+      }
+
+      let flag = showNodes.some((item) => item === data.UniqueCode);
+      if (!flag) { // 不存在则存到数组里
+        showNodes.push(data.UniqueCode)
+      }
+    },
+    // 树节点关闭
+    handleNodeCollapse(data) {
+      let showNodes=[]
+      if(this.leftShowLabel=="目录"){
+        showNodes = this.defaultShowNodes
+      }else{
+        showNodes = this.tagDefaultShowNodes
+      }
+      showNodes.some((item, index) => {
+        if (item === data.UniqueCode) {
+          // 删除关闭节点
+          showNodes.length = index;
+        }
+      });
+    },
+    /* 节点变化时 */
+    nodeChange(data, node) {
+      this.select_node_data=data
+      this.search_txt=""
+      if(data.SpeechRecognitionId){
+        // 详情
+        this.switchDetail(data)
+      }else{
+        this.clearFilterOption()
+        if(this.leftShowLabel=="目录"){
+          this.select_node_key = data.UniqueCode;
+        }else{
+          this.tag_select_node_key = data.UniqueCode;
+        }
+      }
+ 
+    },
+    /* 拖拽完成 */
+    dropOverHandle(b, a, i, e) {
+      // 被拖拽节点对应的 Node、结束拖拽时最后进入的节点、被拖拽节点的放置位置
+      // console.log(b,a,i);
+			let elementKey = this.leftShowLabel=="目录"?"SpeechRecognitionId":"TagId"
+
+			const isEDB=b.data[elementKey]?true:false
+			let list=a.parent.childNodes;
+			let targetIndex=0,PrevMenuId=0,NextMenuId=0,ParentMenuId=0;
+			let MenuId=0,ElementId=0,PrevElementId=0,NextElementId=0;
+
+			MenuId=isEDB?0:b.data.MenuId
+			ElementId=isEDB?b.data[elementKey]:0
+			
+
+			if(i!=='inner'){
+				ParentMenuId=a.parent.data.MenuId||0
+				list.forEach((item,index)=>{
+					if(isEDB){
+						if(item.data[elementKey]===b.data[elementKey]){
+							targetIndex=index
+						}
+					}else{
+						if(item.data.MenuId===b.data.MenuId){
+							targetIndex=index
+						}
+					}
+				})
+				
+				
+				if(targetIndex===0){
+					const data=list[targetIndex+1].data
+					NextMenuId=data[elementKey]?0:data.MenuId
+					NextElementId=data[elementKey]?data[elementKey]:0
+				}else if(targetIndex===list.length-1){
+					const data=list[targetIndex-1].data
+					PrevMenuId=data[elementKey]?0:data.MenuId
+					PrevElementId=data[elementKey]?data[elementKey]:0
+				}else{
+					const pData=list[targetIndex-1].data
+					PrevMenuId=pData[elementKey]?0:pData.MenuId
+
+					PrevElementId=pData[elementKey]?pData[elementKey]:0
+
+					const nData=list[targetIndex+1].data
+					NextMenuId=nData[elementKey]?0:nData.MenuId
+					NextElementId=nData[elementKey]?nData[elementKey]:0
+				}
+			}else{
+				ParentMenuId=a.data.MenuId||0
+			}
+
+      let apiName=""
+      let params=""
+      if(this.leftShowLabel=="目录"){
+        apiName="moveCatalogueEle"
+        params={
+          MenuId,
+          ParentMenuId,
+          PrevMenuId,
+          NextMenuId,
+          SpeechId:ElementId,
+          PrevSpeechId:PrevElementId,
+          NextSpeechId:NextElementId
+        }
+      }else{
+        apiName="moveTagCatalogueEle"
+        params={
+          MenuId,
+          ParentMenuId,
+          PrevMenuId,
+          NextMenuId,
+          TagId:ElementId,
+          PrevTagId:PrevElementId,
+          NextTagId:NextElementId
+        }
+      }
+			asrInterface[apiName](params).then(res=>{
+				if(res.Ret===200){
+					this.$message.success('移动成功!')
+				}
+				this.leftShowLabel=="目录"?this.getTreeData():this.getTagTreeData()
+			})
+    },
+    /* 拖拽覆盖添加背景色 */
+    dropMouseOver(node1, node2, e) {
+			// 被拖拽节点对应的 Node、所进入节点对应的 Node、event
+			if(!node2.data.EdbInfoId&&(node1.level>node2.level||(node1.data.EdbInfoId>0&&!node2.data.EdbInfoId)) && (e.target.childNodes[0].className.includes('el-tree-node__content') 
+			|| e.target.className.includes('el-tree-node__content'))) {
+				// console.log(e.target.childNodes[0])
+				e.target.childNodes[0].className.includes('el-tree-node__content') 
+				? e.target.childNodes[0].style.backgroundColor = '#409eff' 
+				: e.target.style.backgroundColor = '#409eff';
+			}
+    },
+    /* 拖拽离开/拖拽完成重置背景色 */
+    dropMouseLeave(node1, node2, e) {
+      let arrs = $('.el-tree-node__content');
+      for (let a of arrs) {
+        a.style.backgroundColor = 'transparent';
+      }
+    },
+    addAsr() {
+      this.getArticleCatalogue()
+      this.mediaUploadDiaShow=true
+    },
+    uploadSuccess(){
+      localStorage.setItem("transferStatusShow",true)
+      this.getTransferStatus()
+    },
+    getTransferStatus(){
+      let transferStatusShow = localStorage.getItem("transferStatusShow")
+      if(!!transferStatusShow){
+        asrInterface.getConvertList().then(res=>{
+          if(res.Ret == 200){
+            this.transferStatus={
+              transferingNumber:res.Data?res.Data.filter(dat => dat.State==1).length:0,
+              list:res.Data || []
+            }
+            if(this.transferStatus && this.transferStatus.transferingNumber){
+              this.transferStatusShow=true
+            }
+          }
+        })
+      }
+
+    },
+    deleteRow({item,index}){
+      this.transferStatus.list.splice(index,1)
+    },
+    handleLoadMore(){
+      if(this.articleListRequest.finished || this.articleListRequest.loading) return
+      this.page++
+      this.getArticleList()
+    },
+    resetFilterOption(type){
+      this.filterForm.author=type=='clear'?[]:this.articleParams.author
+      this.filterForm.createtimeRange=type=='clear'?[]:this.articleParams.createtimeRange
+      this.filterForm.tags=type=='clear'?[]:this.articleParams.tags
+    },
+    clearFilterOption(){
+      this.articleParams={
+        createtimeRange:[],
+        author:[],
+        tags:[]
+      }
+      this.filterForm={
+        createtimeRange:[],
+        author:[],
+        tags:[]
+      }
+    },
+    filterArticle(){
+      this.articleParams.author=this.filterForm.author
+      this.articleParams.createtimeRange=this.filterForm.createtimeRange
+      this.articleParams.tags=this.filterForm.tags
+      this.search_txt=""
+      if(this.leftShowLabel=="目录"){
+        this.select_node_key=""
+        this.$nextTick(()=>{
+          this.$refs.treeRef.setCurrentKey(null);
+        })
+      }else{
+        this.tag_select_node_key=""
+        this.$nextTick(()=>{
+          this.$refs.tagTreeRef.setCurrentKey(null);
+        })
+      }
+      this.select_node_data=""
+      this.getArticleList()
+      this.showFilterPopopver=false
+    },
+    getArticleList(){
+      if( !this.permissionBtn.isShowBtn('semanticPermission', 'ASR_view')) return 
+
+      let params={
+        CurrentIndex:this.page,
+        PageSize:this.pageSize,
+        StartTime:this.articleParams.createtimeRange?this.articleParams.createtimeRange[0]:'',
+        EndTime:this.articleParams.createtimeRange?this.articleParams.createtimeRange[1]:'',
+        CreateUserId:this.articleParams.author.join(','),
+        TagId:(this.select_node_data && this.select_node_data.TagId) ? (this.select_node_data.TagId+'') : '',
+        TagIds:this.articleParams.tags.join(','),
+        MenuId:(this.select_node_data && (!this.select_node_data.TagId)) ? this.select_node_data.MenuId : 0,
+        IsTagMenu:this.leftShowLabel=="标签"
+      }
+      asrInterface.getSpeechList(params).then(res=>{
+        if(res.Ret == 200){
+          let arr = res.Data.List||[]
+          let paging = res.Data.Paging || {}
+          this.articleList=this.page==1?arr:[...this.articleList,...arr]
+          this.total = paging.Totals || 0 
+          this.articleListRequest.finished = !(this.page < paging.Pages)
+          this.articleDetail={}
+        }
+      })
+    },
+    deleleTag(item,index){
+      this.articleDetail.Tags.splice(index,1)
+    },
+    deleteMedia(){
+      this.$confirm(`确定删除该${this.articleDetail.type==1?'音频':'视频'}吗？<span style="color:#999999;">（删除后不影响原文显示）</span>`, '提示',
+      {
+        dangerouslyUseHTMLString: true,
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        asrInterface.speechMediaRemove({SpeechRecognitionId:this.articleDetail.SpeechRecognitionId}).then(res=>{
+          if(res.Ret == 200){
+            this.articleDetail.ResourceUrl=""
+            this.$message.success("删除成功")
+          }
+        })
+      }).catch(() => {})
+    },
+    handleCommandMore(e,row){
+      if(e=='del'){
+        this.articleDel(row)
+      }else if(e=='rename'){
+        this.renameDiaOpen(row)
+      }else if(e=='export'){
+        this.exportDiaOpen(row)
+      }else if(e=='tag'){
+        this.makeTagsDiaOpen(row)
+      }
+    },
+    articleDel(row){
+      this.$confirm('确定删除选中的记录吗？', '提示',
+        {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        asrInterface.speechRemove({SpeechRecognitionId:row.SpeechRecognitionId}).then(res=>{
+          if(res.Ret == 200){
+            this.$message.success("删除成功")
+            this.page=1
+            this.getArticleList()
+            this.leftShowLabel=="目录" && this.getTreeData()
+          }
+        })
+      }).catch(() => {})
+    },
+    renameDiaOpen(row){
+      this.currentRow=row
+      this.renameData={
+        id:row.SpeechRecognitionId,
+        name:row.FileName
+      }
+      this.renameDiaShow=true
+    },
+    rename(){
+      this.currentRow.FileName = this.renameData.name
+      this.leftShowLabel=="目录" && this.getTreeData()
+    },
+    exportDiaOpen(row){
+      this.exportData={
+        id:row.SpeechRecognitionId,
+        type:2,
+        shows:'timestamp'
+      }
+      this.exportDiaShow=true
+    },
+    makeTagsDiaOpen(row){
+      this.currentRow=row || this.articleDetail
+      // console.log(this.currentRow,'this.currentRow');
+      this.getTagsList()
+      this.getTagCatalogue()
+      this.makeTagsData={
+        id:this.currentRow.SpeechRecognitionId,
+        tagsArr:this.currentRow.Tags?this.currentRow.Tags.map(item => item.TagId):[],
+      }
+      this.makeTagsDiaShow=true
+    },
+    makeTagsSuccess(data){
+      this.currentRow.Tags= data || []
+    },
+    addTagSuccess(){
+      this.getTagsList()
+    },
+    updateTagsTree(codeSet){
+      let arr = [...codeSet]
+      arr.map(code =>{
+        if(code && (!this.tagDefaultShowNodes.some(item => item === code))){
+          this.tagDefaultShowNodes.push(code)
+        }
+      })
+      this.leftShowLabel == "标签" && this.getTagTreeData() 
+    },
+    switchDetail(item){
+      if(this.detailLoadig || (!this.permissionBtn.isShowBtn('semanticPermission', 'ASR_view')) ) return 
+      this.detailLoadig=true
+      asrInterface.getSpeechDetail({SpeechRecognitionId:item.SpeechRecognitionId}).then(res=>{
+        if(res.Ret == 200){
+          this.resetDetailVariate()
+          this.articleDetail=res.Data || {}
+          this.articleDetail.type = ['mp4','flv','3gp'].includes(this.articleDetail.FileExt.toLocaleLowerCase())?2:1
+
+          this.locationDetail(this.articleDetail.MenuPath)
+          this.paragraphs=this.articleDetail.Contents.map(cont => {
+            return {
+              SpeechRecognitionContentId:cont.SpeechRecognitionContentId,
+              Content:cont.Content
+            }
+          })
+          if(this.articleDetail.ResourceUrl){
+            this.$refs.mediaRef && this.$refs.mediaRef.resetPlayerParams()
+            clearInterval(this.mediaTimer)
+            let paragraphInfoLength = this.articleDetail.Contents.length
+            this.mediaTimer= setInterval(() => {
+              if(this.$refs.mediaRef && this.$refs.mediaRef.currentTime!=0){
+                // 最后一个
+                if(!( (this.articleDetail.Contents[paragraphInfoLength-1].StartMs / 1000) > this.$refs.mediaRef.currentTime)){
+                  return this.paragraphIndex=paragraphInfoLength
+                }
+
+                let i = this.articleDetail.Contents.findIndex(pa => (pa.EndMs/1000) > this.$refs.mediaRef.currentTime)
+                let it = this.articleDetail.Contents.find(pa => (pa.EndMs/1000) > this.$refs.mediaRef.currentTime)
+                this.paragraphIndex=i+1
+              }else{
+                this.paragraphIndex=0
+              }
+            }, 300);
+          }
+        }
+      }).finally(()=>{
+        this.detailLoadig=false
+      })
+    },
+    resetDetailVariate(){
+      this.keyWord=""
+      this.isCheckAll=false
+      this.isIndeterminate=false
+      this.checkList=[]
+      this.paragraphIndex=0
+      this.$refs.contentMain && $(this.$refs.contentMain).animate({
+        scrollTop:0
+      },0)
+    },
+    locationDetail(menuPath=[]){
+      this.clearFilterOption()
+      if(this.leftShowLabel=="目录"){
+        this.select_node_key = this.articleDetail.UniqueCode
+        this.$nextTick(()=>{
+          this.$refs.treeRef.setCurrentKey(this.select_node_key);
+        })
+        menuPath.map(mp =>{
+          if(mp.UniqueCode && (!this.defaultShowNodes.some(item => item === mp.UniqueCode))){
+              this.defaultShowNodes.push(mp.UniqueCode)
+            }
+        })
+      }else{
+        this.tag_select_node_key=""
+        this.$nextTick(()=>{
+          this.$refs.tagTreeRef.setCurrentKey(null);
+        })
+      }
+    },
+    checkAll(value){
+      this.isIndeterminate=false
+      if(value){
+        this.checkList=this.articleDetail.Contents.map(it => it.SpeechRecognitionContentId)
+      }else{
+        this.checkList=[]
+      }
+    },
+    checkSingle(value){
+      if(!(this.checkList && this.checkList.length)){
+        this.isCheckAll=false
+        this.isIndeterminate=false
+      }else if(this.checkList.length < this.articleDetail.Contents.length){
+        this.isCheckAll=false
+        this.isIndeterminate=true
+      }else{
+        this.isCheckAll=true
+        this.isIndeterminate=true  
+      }
+    },
+    async copyText(item){
+      let text = ''
+      if(item){
+        text=item.Content
+      }else{
+        // 复制勾选的所有复选框文本
+        let cloneList = this.checkList.map(i => i)
+        for (let i = 0; i < this.articleDetail.Contents.length; i++) {
+          const element = this.articleDetail.Contents[i];
+          for (let j = 0; j < cloneList.length; j++) {
+            const check = cloneList[j];
+            if(check == element.SpeechRecognitionContentId){
+              text+='\n'+element.Content
+              cloneList.splice(j,1)
+              break
+            }
+          }
+        }
+        text=text.substring(2)
+      }
+      if(window.ClipboardItem) {
+        await navigator.clipboard.writeText(text).then(
+        () => {
+            this.$message.success('复制成功！')
+        },
+        (err) => {
+            console.error(err);
+            this.$message.warning('浏览器不支持')
+        })
+      }else {
+        this.$message.warning('当前协议暂不支持，仅支持https协议')
+      }	
+    },
+    toggleTimestampShow(item){
+      if(item){
+        item.HideTimestamp=!item.HideTimestamp
+      }else{
+        this.hideTimestampAll=!this.hideTimestampAll
+        let cloneList = this.checkList.map(i => i)
+        for (let i = 0; i < this.articleDetail.Contents.length; i++) {
+          const element = this.articleDetail.Contents[i];
+          for (let j = 0; j < cloneList.length; j++) {
+            const check = cloneList[j];
+            if(check == element.SpeechRecognitionContentId){
+              element.HideTimestamp=this.hideTimestampAll
+              cloneList.splice(j,1)
+              break
+            }
+          }
+        }
+      }
+    },
+    searchKeyword:_.debounce(function(value){
+      this.num=0
+      this.paragraphIndex=0
+      this.wordList=[]
+      document.querySelectorAll('.search-active').forEach(item=>{
+        item.parentNode && (item.parentNode.innerHTML = item.parentNode.innerText)
+      })
+
+      if(!value) return 
+
+      this.setHighlight()
+    },300),
+    setHighlight(){
+        //高亮
+        const blockContent = document.querySelectorAll('.content-row-text')
+        let allTextNodes = []
+        blockContent.forEach((item,index)=>{
+          allTextNodes = allTextNodes.concat(this.getTextNodes(item,index))
+        })
+
+        this.getHighlightWordRange(allTextNodes,this.keyWord)
+
+        if(this.wordList.length==0){
+          return 
+        }
+        this.wordList.forEach((item,index) =>{
+          let n = document.createElement("SPAN");
+          n.className="search-active"
+          if(index==0){
+            n.style.backgroundColor="#CFC2FE"
+            n.style.borderBottom="none"
+          }else{
+            n.style.backgroundColor="unset"
+            n.style.borderBottom="1px solid #666666"
+          }
+          item.range.surroundContents(n);
+        })
+        this.highlightDom=$(".search-active")
+    },
+    getTextNodes (dom,i){
+      let subIndex = 0
+      const treeWalker = document.createTreeWalker(dom, NodeFilter.SHOW_TEXT);
+      const allTextNodes = [];
+      let currentNode = treeWalker.nextNode();
+      while (currentNode) {
+        allTextNodes.push({f:i,s:subIndex,node:currentNode});
+
+        if(currentNode.parentElement.className == "result-content-word"){
+          subIndex++
+        }
+        currentNode = treeWalker.nextNode();
+      }
+      return allTextNodes
+    },
+    // 高亮
+    getHighlightWordRange(allTextNodes, searchText){
+      let textLength = searchText.length
+      const str = searchText.toLowerCase()
+      for (let i = 0; i < allTextNodes.length;i++) {
+        let searchPosition=0
+        const element = allTextNodes[i].node
+        let text = element.textContent.toLowerCase()
+        let sIndex,eIndex;
+        while(true){
+            sIndex= text.indexOf(str,searchPosition)
+            if(sIndex==-1){
+              break;
+            }
+            eIndex=sIndex+textLength
+            const range = new Range();
+            range.setStart(element, sIndex);
+            range.setEnd(element, eIndex);
+            this.wordList.push({
+              index:i,
+              range,
+              startMs:this.articleDetail.Contents[i].StartMs,
+            })
+            searchPosition=eIndex
+          }
+      }
+      setTimeout(()=>{
+        this.num=this.wordList.length>0?1:0
+      })
+    },
+    last(){
+      this.highlightDom[this.num-1].style.backgroundColor="unset"
+      this.highlightDom[this.num-1].style.borderBottom="1px solid #666666"
+      if(this.num<2){
+        this.num=this.wordList.length
+      }else{
+        this.num--
+      }
+      this.highlightDom[this.num-1].style.backgroundColor="#CFC2FE"
+      this.highlightDom[this.num-1].style.borderBottom="none"
+    },
+    next(){
+      this.highlightDom[this.num-1].style.backgroundColor="unset"
+      this.highlightDom[this.num-1].style.borderBottom="1px solid #666666"
+      if(this.num==this.wordList.length){
+        this.num=1
+      }else{
+        this.num++
+      }
+      this.highlightDom[this.num-1].style.backgroundColor="#CFC2FE"
+      this.highlightDom[this.num-1].style.borderBottom="none"
+    },
+    updateData(e,row,index){
+      // 这种方法在有关键词高亮的段落会出问题，因高亮改变了html结构 有解决方案请替换
+      // row.Content=e.target.textContent
+
+      this.paragraphs[index].Content=e.target.textContent
+    },
+    save(){this.articleDetail.Tags
+      if(this.saveLoading) return 
+      let params={
+        SpeechRecognitionId:this.articleDetail.SpeechRecognitionId,
+        FileName:this.articleDetail.FileName,
+        TagIds:this.articleDetail.Tags?this.articleDetail.Tags.map(tag => tag.TagId):[],
+        Contents:this.paragraphs
+      }
+      setTimeout(()=>{
+        this.saveLoading=true
+        asrInterface.speechSave(params).then(res=>{
+          if(res.Ret == 200){
+            this.$message.success("保存成功")
+            // this.searchKeyword("")
+            // setTimeout(()=>{
+            //   this.switchDetail(this.select_node_data)
+            // },300)
+            this.leftShowLabel=="目录" && this.getTreeData()
+          }
+        }).finally(()=>{
+          this.saveLoading=false
+        })
+      },10)
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+#asr-container {
+
+  .content-row-operation{
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    color: #999999;
+    margin-right: 20px;
+    img{
+      height: 16px;
+      width: 16px;
+    }
+    span{
+      margin-left: 4px;
+      white-space: nowrap;
+    }
+  }
+  .content-row-operation.active{
+    span{
+      color: #0052D9;
+    }
+  }
+  .content-row-operation.drange{
+    span{
+      color: #AD352F;
+    }
+  }
+  
+  .asr-main {
+    display: flex;
+
+    .asr-main-left {
+      width: 390px;
+      min-width: 340px;
+      background: #fff;
+      margin-right: 20px;
+      border: 1px solid #ececec;
+      border-radius: 4px;
+      height: calc(100vh - 112px);
+      box-sizing: border-box;
+
+      .add-zone {
+        padding: 15px 20px;
+        border: 1px solid #ECECEC;
+        box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.08);
+        border-radius: 4px 4px 0 0;
+      }
+
+      .catalogue-zone {
+        height: calc(100% - 106px);
+        padding: 15px 20px 20px;
+        position: relative;
+
+        .search-box {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          flex-wrap: nowrap;
+          margin-bottom: 20px;
+
+          .select-com {
+            flex-grow: 1;
+            margin-right: 20px;
+          }
+
+          .filter-box {
+            display: flex;
+            align-items: center;
+            white-space: nowrap;
+            cursor: pointer;
+
+            img {
+              height: 16px;
+              width: 16px;
+              margin-right: 4px;
+            }
+
+            span {
+              font-size: 14px;
+              line-height: 22px;
+              font-weight: 400;
+              color: #0052D9;
+            }
+          }
+        }
+
+        .catalogue-head {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          margin-bottom: 15px;
+
+          .left-tab {
+            display: flex;
+            align-items: center;
+
+            .tab {
+              cursor: pointer;
+              font-size: 14px;
+              border-bottom: 2px solid transparent;
+              margin-right: 30px;
+              padding-bottom: 5px;
+
+              &.act {
+                color: #0052D9;
+                border-color: #0052D9;
+              }
+
+              &:hover {
+                color: #0052D9;
+              }
+            }
+          }
+        }
+        .tree-container{
+          height:calc(100% - 100px);
+          .tree-cont {
+            overflow: auto;
+            height:calc(100% - 30px);
+            .target_tree {
+              font-size: 14px;
+              color: #333;
+
+              .custom-tree-node {
+                display: flex;
+                justify-content: space-between;
+                align-items: center;
+                flex: 1;
+                max-width: 100%;
+                overflow: hidden;
+                .text-span{
+                  overflow: hidden;
+                  white-space: nowrap;
+                  text-overflow: ellipsis;
+                }
+                .operation-span{
+                  display: flex; 
+                  align-items: center;
+                  img{
+                    height: 16px;
+                    width: 16px;
+                    margin-right: 8px;
+                  }
+                }
+              }
+            }
+          }
+          .bottom-operation{
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            position: absolute;
+            bottom: 20px;
+            left: 20px;
+            right: 20px;
+          }
+          .bottom-add {
+            display: flex;
+            align-items: center;
+            white-space: nowrap;
+            cursor: pointer;
+            img {
+              height: 14px;
+              width: 14px;
+              margin-right: 8px;
+            }
+
+            span {
+              font-size: 14px;
+              line-height: 22px;
+              font-weight: 400;
+              color: #0052D9;
+            }
+          }
+        }
+
+
+
+      }
+    }
+    .asr-main-right{
+      flex: 1;
+      background-color: white;
+      height: calc(100vh - 112px);
+      min-height: calc(100vh - 112px);
+      box-sizing: border-box;
+      padding: 25px 0 0;
+      border: 1px solid #DCDFE6;
+      border-radius: 4px;
+      min-width: 845px;
+      overflow-x: hidden;
+      .file-count{
+        font-size: 14px;
+        font-weight: 400;
+        margin-bottom: 16px;
+        padding: 0 25px;
+      }
+      .file-container{
+        padding: 0 25px;
+        // height: calc(100% - 35px);
+        overflow: auto;
+        box-sizing: border-box;
+        padding-bottom: 25px;
+        display: flex;
+        flex-wrap: wrap;
+        // justify-content: space-between;
+        // align-items: flex-start;
+        gap: 25px;
+        .file-item{
+          width: calc(33% - 15px);
+          min-width: 378px;
+          min-height: 300px;
+          box-sizing: border-box;
+          background-color:#ECF2FE ;
+          border: 1px solid #C8CDD9;
+          border-radius: 4px;
+          // margin-bottom: 25px;
+          padding-bottom: 50px;
+          position: relative;
+          cursor: pointer;
+          .file-main{
+            padding: 14px 20px;
+            .file-name{
+              font-size: 18px;
+              color: #333333;
+              font-weight: bold;
+              white-space: nowrap;
+              overflow: hidden;
+              text-overflow: ellipsis;
+            }
+            .file-tag-list{
+              display: flex;
+              align-items: center;
+              overflow: hidden;
+              margin-top: 10px;
+              white-space: nowrap;
+              min-height: 24px;
+              .file-tag{
+                // min-width: 0;
+                white-space: nowrap;
+                background-color: #FFFFFF;
+                border-radius: 4px;
+                padding: 0 12px;
+                font-size: 14px;
+                line-height: 24px;
+                font-weight: 400;
+                color: #999999;
+                margin-right: 10px;
+                &:last-child{
+                  margin-top: 0;
+                }
+              }
+            }
+            .file-content{
+              margin-top: 10px;
+              font-size: 14px;
+              font-weight: 400;
+              line-height: 22px;
+              color: #666666;
+              display: -webkit-box;
+              -webkit-line-clamp: 7;
+              -webkit-box-orient: vertical;
+              overflow: hidden;
+            }
+          }
+          .file-footer{
+            position: absolute;
+            bottom: 0;
+            width: 100%;
+            border-top: 1px solid #C8CDD9;
+            padding: 10px 20px 10px 10px;
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+            font-size: 14px;
+            font-weight: 400;
+            white-space: nowrap;
+            box-sizing: border-box;
+            flex-wrap: wrap;
+            gap: 0 10px;
+            .file-time{
+              display: flex;
+              align-items: center;
+              .split-element{
+                padding-left: 5px;
+                border-left: solid 1px #333333;
+                margin-left: 10px;
+              }
+            }
+            // .file-author{
+            //   margin-left: 10px;
+            // }
+            .file-operation{
+              margin-left: 10px;
+              display: none;
+              img{
+                height: 16px;
+                width: 16px;
+              }
+            }
+          }
+          &:hover{
+            border: 1px solid #0052D9;
+            box-shadow: 0 0 0 1px #0052d9 inset;
+            // margin: 0 -1px 24px -1px;
+            .file-time{
+              visibility: hidden;
+            }
+            .file-author{
+              display: none;
+            }
+            .file-operation{
+              display: block;
+            }
+          }
+        }
+      }
+      .tag-button{
+        display: flex;
+        align-items: center;
+        white-space: nowrap;
+        // margin-right: 20px;
+        background-color: #ECF2FE;
+        padding: 4px 8px;
+        img{
+          height: 16px;
+          width: 16px;
+          margin-right: 4px;
+        }
+        .tag-close-icon{
+          margin: 0 0 0 8px;
+          cursor: pointer;
+        }
+        span{
+          font-size: 14px;
+          line-height: 22px;
+          font-weight: 400;
+          color: #333333;
+        }
+      }
+      // 详情
+      .detail-top{
+        padding: 0 25px;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 20px;
+        .detail-top-search{
+          display: flex;
+          align-items: center;
+          .toggle-keywords-box{
+            display: flex;
+            align-items: center;
+            img{
+              cursor: pointer;
+              height: 16px;
+              width: 16px;
+            }
+            span{
+              font-size: 14px;
+              line-height: 22px;
+              color: #333333;
+              margin: 0 4px;
+            }
+          }
+        }
+      }
+      .detail-tag-area{
+        margin: 0 25px 10px;
+        display: flex;
+        align-items: center;
+        justify-content: flex-start;
+        flex-wrap: wrap;
+        // margin-bottom: 10px;
+        gap: 10px 20px;
+        max-height: 80px;
+        overflow: auto;
+      }
+      .detail-video-area{
+        height: 390px;
+        margin: 0 25px;
+        background-color: black;  
+        text-align: center;
+      }
+      .detail-content{
+        padding: 0 25px;
+        .deail-top-operation{
+          display: flex;
+          align-items: center;
+          justify-content: flex-end;
+          flex-wrap: wrap;
+          gap:0 20px;
+          margin: 10px 0;
+        }
+        .content-mutil-operation{
+          display: flex;
+          align-items: center;
+          margin: 20px 0;
+        }
+        .content-title{
+          font-size: 16px;
+          font-weight: 400;
+          position: relative;
+          padding-left: 10px;
+          line-height: 24px;
+          margin-bottom: 10px;
+          &::before{
+            content: '';
+            height: 16px;
+            width: 2px;
+            background-color: #0052D9;
+            position: absolute;
+            left: 0;
+            top: 4px;
+          }
+        }
+        .content-main{
+          position: relative;
+          height: calc(100vh - 425px);
+          min-height: 490px;
+          overflow-y: auto;
+          padding-top: 15px;
+          box-sizing: border-box;
+          .content-row{
+            margin-bottom: 25px;
+            font-size: 14px;
+            line-height: 22px;
+            font-weight: 400;
+            &:last-child{
+              margin-bottom: 0;
+            }
+            .content-row-info{
+              display: flex;
+              align-items: center;
+              .content-row-time{
+                display: flex;
+                align-items: center;
+                color: #333333;
+                margin-right: 20px;
+                .content-info-speaker{
+                  height: 16px;
+                  width: 16px;
+                }
+                .content-info-start{
+                  margin-left: 8px;
+                }
+              }
+ 
+            }
+            .content-row-content{
+              display: flex;
+              align-items: flex-start;
+              margin-top: 10px;
+              .content-row-text{
+                color: #666666;
+              }
+            }
+
+          }
+        }
+      }
+      .detail-audio-area{
+        padding: 15px 80px 0;
+        // margin-top: 15px;
+        height: 74px;
+        position: relative;
+        img{
+          display: none;
+          height: 24px;
+          width: 24px;
+          cursor: pointer;
+          position: absolute;
+          right: 30px;
+          top: 50%;
+          transform: translateY(-50%);
+        }
+        &:hover{
+          img{
+            display:inline-block;
+          }
+        }
+      }
+    }
+    .asr-main-right.detail{
+      min-width: 945px;
+      padding-bottom: 25px;
+      overflow-y: auto;
+    }
+  }
+  .status-window{
+    position: fixed;
+  }
+}
+
+.filter-poopver{
+  padding: 18px;
+  box-sizing: border-box;
+  .filter-poopver-header{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    span{
+      font-size: 16px;
+      font-weight: 400;
+      line-height: 22px;
+      color: #333333;
+    }
+  }
+  .filter-poopver-form{
+    margin-top: 40px;
+  }
+  .filter-poopver-footer{
+    margin-top: 40px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+}
+</style>
+<style lang="scss">
+.target_tree {
+  .el-tree__drop-indicator {
+    height: 3px;
+    background-color: #409eff;
+  }
+
+  .el-tree-node__content {
+    margin-bottom: 14px !important;
+  }
+
+  .el-tree-node__children {
+    .el-tree-node {
+      margin-bottom: 0px !important;
+      padding-left: 18px;
+    }
+
+    .el-tree-node__content {
+      margin-bottom: 5px !important;
+      padding-left: 0 !important;
+    }
+  }
+
+  .expanded.el-icon-caret-right:before {
+    content: url('../../../assets/img/set_m/down_black.png') !important;
+  }
+
+  .el-icon-caret-right:before {
+    content: url('../../../assets/img/set_m/slide_black.png') !important;
+  }
+  .el-tree-node__expand-icon{
+    padding-top: 10px;
+  }
+
+  .el-tree-node__expand-icon.is-leaf.el-icon-caret-right:before {
+    content: '' !important;
+  }
+
+  .el-tree-node__expand-icon.expanded {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+
+  .el-tree-node.is-current>.el-tree-node__content {
+    background-color: #f0f4ff !important;
+  }
+
+  .el-tree-node__content {
+    padding-right: 10px !important;
+  }
+}
+.nodata{
+  margin-top: 100px;
+  span{
+    color: #999999;
+    font-size: 14px;
+    font-weight: 400;
+  }
+}
+.el-input-group__append{
+  padding: 0 10px;
+}
+</style>

src/views/semantics_manage/asr/components/catalogueDia.vue

@@ -0,0 +1,139 @@
+<template>
+	<el-dialog
+		:visible.sync="diaShow"
+		:close-on-click-modal="false"
+		:modal-append-to-body='false'
+    :title="diaTitle"
+		@close="closeHandle"
+		center
+		width="480px">
+			<div class="dialog-main">
+				<el-form
+				ref="diaForm"
+				label-position="top"
+				hide-required-asterisk
+				:model="formData">
+          <el-form-item :label="(index+1)==formData.level?'目录名称':getFormLabel(index,formData.level)" 
+          :rules="{required:true,message:'目录名称必填',trigger:'blur'}" :prop="formProps[index]" 
+          v-for="(item,index) in new Array(formData.level)" :key="index">
+            <el-input v-model="formData.first" style="width: 100%" placeholder="必填项" v-if="index==0" :disabled="formData.level!=1"></el-input>
+            <el-input v-model="formData.second" style="width: 100%" placeholder="必填项" v-else-if="index==1" :disabled="formData.level!=2"></el-input>
+            <el-input v-model="formData.third" style="width: 100%" placeholder="必填项" v-else></el-input>
+          </el-form-item>
+				</el-form>
+        <div class="dia-bot">
+          <el-button type="primary" plain style="margin-right:20px;min-width:120px ;" @click="cancelHandle">取消</el-button>
+          <el-button type="primary" @click="saveHandle" style="min-width:120px;">保存</el-button>
+        </div>
+			</div>
+		</el-dialog>
+</template>
+
+<script>
+
+import {asrInterface} from '@/api/modules/semanticsApi.js';
+
+  export default {
+    name:"catalogueDia",
+    props:{
+      formData:{
+        type:Object,
+        default:()=>{
+          return {}
+        }
+      },
+      diaShow:{
+        type:Boolean,
+        default:false
+      }
+    },
+    watch:{
+      diaShow(value){
+        if(value){
+          this.diaTitle = this.formData.code?"编辑":"添加"
+          this.$refs.diaForm && this.$nextTick(()=>{
+            this.$refs.diaForm.clearValidate()
+          })
+        }
+      }
+    },
+    data() {
+      return {
+        diaTitle:'',
+        formProps:['first','second','third']
+      }
+    },
+    methods: {
+      cancelHandle(){
+        this.$emit("update:diaShow",false)
+      },
+      saveHandle(){
+        this.$refs.diaForm.validate(valid=>{
+          if(valid){
+            // console.log(this.formData,'formData');
+            let apiName = ""
+            if(this.formData.mId){
+              if(this.formData.type == "目录"){
+                apiName="editCatalogue"
+              }else if(this.formData.type == "标签"){
+                apiName="editTagCatalogue"
+              }
+              // 编辑
+              let keyI = this.formProps[this.formData.level-1]
+
+              asrInterface[apiName]({
+                MenuId:this.formData.mId,
+                MenuName:this.formData[keyI]
+              }).then(res=>{
+                if(res.Ret == 200){
+                  this.$message.success(this.diaTitle+"成功")
+                  this.$emit("catalogueSuccess",{type:'edit',code:''})
+                  this.$emit("update:diaShow",false)
+                }
+              })
+            }else{
+
+              if(this.formData.type == "目录"){
+                apiName="addCatalogue"
+              }else if(this.formData.type == "标签"){
+                apiName="addTagCatalogue"
+              }
+              let keyI = this.formProps[this.formData.level-1]
+
+              asrInterface[apiName]({
+                ParentId:this.formData.pId,
+                MenuName:this.formData[keyI]
+              }).then(res=>{
+                if(res.Ret == 200){
+                  this.$message.success(this.diaTitle+"成功")
+                  this.$emit("catalogueSuccess",{type:'add',code:this.formData.code})
+                  this.$emit("update:diaShow",false)
+                }
+              })
+            }
+          }
+        })
+      },
+      getFormLabel(index,level){
+        if(level==2){
+          return "上级目录"
+        }
+        let levelLabel=['一级目录','二级目录']
+        return levelLabel[index]
+      },
+      closeHandle(){
+        this.$emit("update:diaShow",false)
+      }
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+.dialog-main{
+  padding: 5px 35px 35px;
+  .dia-bot{
+    text-align: center;
+    margin-top: 60px;
+  }
+}
+</style>

src/views/semantics_manage/asr/components/editTag.vue

@@ -0,0 +1,130 @@
+<template>
+	<el-dialog
+		:visible.sync="diaShow"
+		:close-on-click-modal="false"
+		:modal-append-to-body='false'
+    :title="diaTitle"
+		@close="closeHandle"
+		center
+		width="480px">
+			<div class="dialog-main">
+				<el-form
+				ref="diaForm"
+				label-position="top"
+				hide-required-asterisk
+				:model="formData">
+          <el-form-item label="标签名称" :rules="{required:true,message:'标签名称必填',trigger:'blur'}" prop="tName">
+            <el-input v-model="formData.tName" style="width: 100%" placeholder="请输入标签名称"></el-input>
+          </el-form-item>
+          <el-form-item label="所属目录" :rules="{required:true,message:'所属目录必填',trigger:'change'}" prop="mId"
+          v-if="!formData.tId">
+            <el-cascader v-model="formData.mId" ref="editTagCascader" placeholder="请选择标签目录" clearable id="edit-tag-cascader"
+              :options="tagCatalogue" :props="{value:'MenuId',label:'MenuName',children:'Children',checkStrictly:true,emitPath:false}"
+              style="width: 100%;" :clearable="false" ></el-cascader>
+          </el-form-item>
+				</el-form>
+        <div class="dia-bot">
+          <el-button type="primary" plain style="margin-right:20px;min-width:120px ;" @click="cancelHandle">取消</el-button>
+          <el-button type="primary" @click="saveHandle" style="min-width:120px;">保存</el-button>
+        </div>
+			</div>
+		</el-dialog>
+</template>
+
+<script>
+import {asrInterface} from '@/api/modules/semanticsApi.js';
+
+  export default {
+    name:"editTag",
+    props:{
+      formData:{
+        type:Object,
+        default:()=>{
+          return {}
+        }
+      },
+      diaShow:{
+        type:Boolean,
+        default:false
+      },
+      tagCatalogue:{
+        type:Array,
+        required:true
+      }
+    },
+    watch:{
+      diaShow(value){
+        if(value){
+          this.diaTitle = this.formData.tId?"编辑标签":"添加标签"
+          this.$refs.diaForm && this.$nextTick(()=>{
+            this.$refs.diaForm.clearValidate()
+          })
+        }
+      }
+    },
+    data() {
+      return {
+        diaTitle:'',
+      }
+    },
+    methods: {
+      cancelHandle(){
+        this.$emit("update:diaShow",false)
+      },
+      saveHandle(){
+        this.$refs.diaForm.validate(valid=>{
+          if(valid){
+            if(this.formData.tId){
+              // 编辑
+              asrInterface.editTag({
+                TagId:this.formData.tId,
+                TagName:this.formData.tName
+              }).then(res=>{
+                if(res.Ret == 200){
+                  this.$message.success(this.diaTitle+"成功")
+                  this.$emit("tagSuccess",{type:"edit"})
+                  this.$emit("update:diaShow",false)
+                }
+              })
+            }else{
+              asrInterface.addTag({
+                MenuId:this.formData.mId,
+                TagName:this.formData.tName
+              }).then(res=>{
+                if(res.Ret == 200){
+                  this.$message.success(this.diaTitle+"成功")
+                  let menuIds = this.$refs.editTagCascader.getCheckedNodes()[0] && this.$refs.editTagCascader.getCheckedNodes()[0].pathNodes.map(node=> node.data.UniqueCode)
+                  this.$emit("tagSuccess",{type:"add",menuIds})
+                  this.$emit("update:diaShow",false)
+                }
+              })
+            }
+          }
+        })
+      },
+      closeHandle(){
+        this.$emit("update:diaShow",false)
+      }
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+.dialog-main{
+  padding: 5px 35px 35px;
+  .dia-bot{
+    text-align: center;
+    margin-top: 60px;
+  }
+}
+</style>
+<style lang="scss">
+  .el-cascader-node{
+    max-width: 200px;
+  }
+#edit-tag-cascader{
+  .el-input{
+    width: 100%;
+  }
+}
+</style>

src/views/semantics_manage/asr/components/exportDia.vue

@@ -0,0 +1,117 @@
+<template>
+	<el-dialog
+		:visible.sync="diaShow"
+		:close-on-click-modal="false"
+		:modal-append-to-body='false'
+    :title="diaTitle"
+		@close="closeHandle"
+		center
+		width="480px">
+			<div class="dialog-main">
+				<el-form
+				ref="diaForm"
+				label-position="top"
+				hide-required-asterisk
+				:model="formData">
+          <el-form-item label="文件格式" :rules="{required:true,message:'文件格式必填',trigger:'change'}" prop="type">
+            <el-select v-model="formData.type" placeholder="请选择文件格式" style="width: 100%">
+              <el-option :label="item.label" :value="item.value" v-for="item in exportType" :key="item.value"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="显示信息" prop="shows">
+            <el-select v-model="formData.shows" placeholder="请选择显示信息" style="width: 100%" clearable >
+              <el-option :label="item.label" :value="item.value" v-for="item in showsList" :key="item.value"></el-option>
+            </el-select>
+          </el-form-item>
+				</el-form>
+        <div class="dia-bot">
+          <el-button type="primary" plain style="margin-right:20px;min-width:120px ;" @click="cancelHandle" >取消</el-button>
+          <el-button type="primary" @click="saveHandle" style="min-width:120px;" >保存</el-button>
+        </div>
+			</div>
+		</el-dialog>
+</template>
+
+<script>
+
+  export default {
+    name:"exportDia",
+    props:{
+      formData:{
+        type:Object,
+        default:()=>{
+          return {}
+        }
+      },
+      diaShow:{
+        type:Boolean,
+        default:false
+      }
+    },
+    data() {
+      return {
+        diaTitle:'导出内容',
+        exportType:[{value:1,label:".txt"},{value:2,label:".doc"},{value:3,label:".pdf"}],
+        showsList:[{value:"timestamp",label:"时间戳"}],
+        exportBase: process.env.VUE_APP_API_ROOT + "/speech_recognition/export", //数据导出接口
+      }
+    },
+    watch:{
+      diaShow(value){
+        if(value){
+          this.$refs.diaForm && this.$nextTick(()=>{
+            this.$refs.diaForm.clearValidate()
+          })
+        }
+      }
+    },
+    computed: {
+      exportApi() {
+        // 数据导出接口
+        let urlStr = this.exportBase;
+        // token
+        urlStr += `?${localStorage.getItem("auth") || ""}`;
+        // 语音识别Id
+        urlStr += `&SpeechRecognitionId=${this.formData.id}`;
+        // 导出类型
+        urlStr += `&ExportType=${this.formData.type}`;
+        // 显示信息
+        urlStr += `&Timestamp=${!!this.formData.shows}`;
+        return this.escapeStr(urlStr);
+      },
+    },
+    methods: {
+      cancelHandle(){
+        this.$emit("update:diaShow",false)
+      },
+      saveHandle(){
+        this.$refs.diaForm.validate(valid=>{
+          if(valid){
+            const link = document.createElement("a");
+            link.href = this.exportApi;
+            link.download = "";
+            link.click();
+            this.$emit("update:diaShow",false)
+          }
+        })
+      },
+      // 对[#,;]转义
+      escapeStr(str) {
+        return str.replace(/#/g, escape("#")).replace(/;/g, escape(";"));
+      },
+      closeHandle(){
+        this.$emit("update:diaShow",false)
+      }
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+.dialog-main{
+  padding: 5px 35px 35px;
+  .dia-bot{
+    text-align: center;
+    margin-top: 60px;
+  }
+}
+</style>

src/views/semantics_manage/asr/components/fileRename.vue

@@ -0,0 +1,91 @@
+<template>
+	<el-dialog
+		:visible.sync="diaShow"
+		:close-on-click-modal="false"
+		:modal-append-to-body='false'
+    :title="diaTitle"
+		@close="closeHandle"
+		center
+		width="480px">
+			<div class="dialog-main">
+				<el-form
+				ref="diaForm"
+				label-position="top"
+				hide-required-asterisk
+				:model="formData">
+          <el-form-item label="文件名称" :rules="{required:true,message:'文件名称必填',trigger:'blur'}" prop="name">
+            <el-input v-model="formData.name" style="width: 100%" placeholder="请输入文件名称"></el-input>
+          </el-form-item>
+				</el-form>
+        <div class="dia-bot">
+          <el-button type="primary" plain style="margin-right:20px;min-width:120px ;" @click="cancelHandle">取消</el-button>
+          <el-button type="primary" @click="saveHandle" style="min-width:120px;">保存</el-button>
+        </div>
+			</div>
+		</el-dialog>
+</template>
+
+<script>
+import { asrInterface } from '../../../../api/modules/semanticsApi'
+
+  export default {
+    name:"fileRename",
+    props:{
+      formData:{
+        type:Object,
+        default:()=>{
+          return {}
+        }
+      },
+      diaShow:{
+        type:Boolean,
+        default:false
+      }
+    },
+    watch:{
+      diaShow(value){
+        if(value){
+          this.$refs.diaForm && this.$nextTick(()=>{
+            this.$refs.diaForm.clearValidate()
+          })
+        }
+      }
+    },
+    data() {
+      return {
+        diaTitle:'重命名',
+      }
+    },
+    methods: {
+      cancelHandle(){
+        this.$emit("update:diaShow",false)
+      },
+      saveHandle(){
+        this.$refs.diaForm.validate(valid=>{
+          if(valid){
+            asrInterface.speechRename({SpeechRecognitionId:this.formData.id,FileName:this.formData.name}).then(res=>{
+              if(res.Ret == 200){
+                this.$message.success(this.diaTitle+"成功")
+                this.$emit("renameSuccess")
+                this.$emit("update:diaShow",false)
+              }
+            })
+          }
+        })
+      },
+      closeHandle(){
+        this.$emit("update:diaShow",false)
+      }
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+.dialog-main{
+  padding: 5px 35px 35px;
+  .dia-bot{
+    text-align: center;
+    margin-top: 60px;
+  }
+}
+</style>

src/views/semantics_manage/asr/components/makeTags.vue

@@ -0,0 +1,249 @@
+<template>
+	<el-dialog
+		:visible.sync="diaShow"
+		:close-on-click-modal="false"
+		:modal-append-to-body='false'
+    :title="diaTitle"
+		@close="closeHandle"
+		center
+		width="800px"
+    top="5vh">
+			<div class="dialog-main">
+        <div class="make-tags-header">
+          <el-checkbox :indeterminate="isIndeterminate" v-model="isCheckAll" @change="checkAllTags">全选</el-checkbox>
+          <el-input v-model="tagSeachWord" placeholder="请输入标签名称" prefix-icon="el-icon-search" clearable
+              style="width: 360px;" @input="searchTags"></el-input>
+        </div>
+        <div class="make-tags-list">
+          <el-checkbox-group v-model="formData.tagsArr" class="make-tags-group" ref="tagsGroupRef" 
+          v-if="tagsListAfterFilter && tagsListAfterFilter.length>0" @change="tagsCheckedChange">
+            <el-checkbox :label="item.TagId" v-for="item in tagsListAfterFilter" :key="item.TagId" style="margin-right: 0;"> {{ item.TagName }}</el-checkbox>
+          </el-checkbox-group>
+          <tableNoData text="暂无数据" v-else />
+        </div>
+        <div class="make-tags-add" v-permission="permissionBtn.semanticPermission.ASR_tagMark_add">
+          <div class="make-tags-add-title">添加标签</div>
+          <el-form
+          ref="tagsForm" class="tags-form"
+          label-position="top" inline
+          hide-required-asterisk
+          :model="addTagsForm">
+            <el-form-item :rules="{required:true,message:'标签名称必填',trigger:'blur'}" prop="TagName">
+              <el-input v-model="addTagsForm.TagName" placeholder="请输入标签名称" style="width: 260px"></el-input>
+            </el-form-item>
+            <el-form-item prop="MenuId"  :rules="{required:true,message:'标签目录必填',trigger:'change'}">
+              <el-cascader v-model="addTagsForm.MenuId" placeholder="请选择标签目录" ref="makeTagsCascader" id="make-tags-cascader" style="width: 260px"
+              :options="tagCatalogueList" :props="{value:'MenuId',label:'MenuName',children:'Children',checkStrictly:true,emitPath:false}"></el-cascader>
+            </el-form-item>
+            <el-button type="primary" style="width: 100px;" @click="addTag">添加</el-button>
+          </el-form>
+        </div>
+        <div class="dia-bot">
+          <el-button type="primary" plain style="margin-right:20px;min-width:120px ;" @click="cancelHandle">取消</el-button>
+          <el-button type="primary" @click="saveHandle" style="min-width:120px;">保存</el-button>
+        </div>
+			</div>
+		</el-dialog>
+</template>
+
+<script>
+import {asrInterface} from '@/api/modules/semanticsApi.js';
+  export default {
+    name:"makeTags",
+    props:{
+      formData:{
+        type:Object,
+        default:()=>{
+          return {}
+        }
+      },
+      diaShow:{
+        type:Boolean,
+        default:false
+      },
+      tagsList:{
+        type:Array,
+        required:true
+      },
+      tagCatalogueList:{
+        type:Array,
+        required:true
+      }
+    },
+    data() {
+      return {
+        diaTitle:'打标签',
+        tagSeachWord:"",
+        isIndeterminate:false,
+        isCheckAll:false,
+        tagsListAfterFilter:[],
+        addTagsForm:{
+          TagName:'',
+          MenuId:''
+        },
+        shouldExpandCode:new Set(),
+        hasAddTag:false
+      }
+    },
+    methods: {
+      checkAllTags(){
+        this.isIndeterminate=false
+        if(this.isCheckAll){
+          this.formData.tagsArr=this.tagsList.map(item => item.TagId)
+        }else{
+          this.formData.tagsArr=[]
+        }
+      },
+      cancelHandle(){
+        this.$emit("update:diaShow",false)
+      },
+      closeHandle(){
+        if(this.hasAddTag){
+          this.$emit("updateTagsTree",this.shouldExpandCode)
+        }
+        this.addTagsForm={
+          TagName:'',
+          MenuId:''
+        }
+        this.hasAddTag=false
+        this.tagSeachWord=""
+        this.$refs.tagsForm && this.$nextTick(()=>{
+          this.$refs.tagsForm.clearValidate()
+        })
+        this.$emit("update:diaShow",false)
+      },
+      searchTags(){
+        this.updateTagsList()
+      },
+      tagsCheckedChange(value){
+        if(!( (this.formData.tagsArr && this.formData.tagsArr.length>0) && (this.tagsList && this.tagsList.length>0) )){
+          this.isIndeterminate=false
+          this.isCheckAll=false
+        }else if(this.formData.tagsArr.length<this.tagsList.length){
+          this.isIndeterminate=true
+          this.isCheckAll=false
+        }else{
+          this.isIndeterminate=false
+          this.isCheckAll=true
+        }
+      },
+      updateTagsList(scrollType){
+        this.tagsListAfterFilter=this.tagsList.filter(tag => tag.TagName.indexOf(this.tagSeachWord)!=-1)
+        // switch (scrollType) {
+        //   case "top":
+            this.$nextTick(()=>{
+              this.$refs.tagsGroupRef && this.$refs.tagsGroupRef.$el.scrollTo(0,0)
+            })
+            // break;
+          // case "bottom":
+          //   this.$nextTick(()=>{
+          //     this.$refs.tagsGroupRef && this.$refs.tagsGroupRef.$el.scrollTo(0,this.$refs.tagsGroupRef.$el.scrollHeight)
+          //   })
+          //   break;
+        // }
+      },
+      addTag(){
+        this.$refs.tagsForm.validate(valid=>{
+          if(valid){
+            asrInterface.addTag(this.addTagsForm).then(res=>{
+              if(res.Ret == 200){
+                res.Data && this.formData.tagsArr.push(res.Data)
+                // 设置展开
+                this.$refs.makeTagsCascader.getCheckedNodes()[0] && 
+                this.$refs.makeTagsCascader.getCheckedNodes()[0].pathNodes.map(pNode=>{
+                  this.shouldExpandCode.add(pNode.data.UniqueCode)
+                })
+                this.hasAddTag=true
+                this.addTagsForm={
+                  TagName:'',
+                  MenuId:''
+                }
+                this.$message.success("新增标签成功")
+                this.$emit("addTagSuccess")
+              }
+            })
+          }
+        })
+      },
+      saveHandle(){
+        asrInterface.speechSaveTag({
+          SpeechRecognitionId:this.formData.id,
+          TagIds:this.formData.tagsArr
+        }).then(res=>{
+          if(res.Ret == 200){
+            this.$message.success("打标签成功")
+            let tagsData=this.tagsList.filter(tag => this.formData.tagsArr.includes(tag.TagId))
+            this.$emit("makeTagsSuccess",tagsData)
+            this.$emit("update:diaShow",false)
+          }
+        })
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+.dialog-main{
+  padding: 5px 35px 35px;
+  .make-tags-header{
+    display: flex;
+    align-items: flex-end;
+    justify-content: space-between;
+  }
+  .make-tags-list{
+    margin-top: 20px;
+    padding: 20px;
+    box-sizing: border-box;
+    background-color: #ECF2FE;
+    border: solid 1px #C8CDD9;
+    border-radius: 4px;
+    .make-tags-group{
+      display: flex;
+      flex-direction: column;
+      gap: 20px;
+      max-height: 360px;
+      overflow: auto;
+    }
+  }
+  .make-tags-add{
+    margin-top: 30px;
+    .make-tags-add-title{
+      font-size: 14px;
+      line-height: 22px;
+      font-family: 400;
+      color: #333333;
+    }
+    .tags-form{
+      margin-top: 10px;
+      display: flex;
+      align-items: flex-start;
+      justify-content: space-between;
+    }
+  }
+  .dia-bot{
+    text-align: center;
+    margin-top: 60px;
+  }
+}
+</style>
+<style lang="scss">
+  .el-cascader-node{
+    max-width: 200px;
+  }
+#make-tags-cascader{
+  .el-input{
+    width: 100%;
+  }
+}
+
+.make-tags-group{
+  .el-checkbox{
+    margin-right: 0;
+    // display: flex;
+    .el-checkbox__label{
+      word-break: break-all;
+      white-space: normal;
+    }
+  }
+}
+</style>

src/views/semantics_manage/asr/components/mediaCom.vue

@@ -0,0 +1,186 @@
+<template>
+  <div :class="type==1?'audio-container':'video-container'">
+    <template v-if="type==1">
+      <audio :src="ResourceUrl" ref="audioUrlRef" @timeupdate="updateProgress" @ended="audioEnded"
+      @loadedmetadata="setDuration">
+        Your browser does not support the audio element.
+      </audio>
+      <img src="~@/assets/img/document_m/audio-backward.png" @click="skipTime(-15)" />
+      <img :src="isPlaying?require('@/assets/img/document_m/audio-start.png'):require('@/assets/img/document_m/audio-stop.png')" style="height: 30px;width: 30px;"
+      @click="togglePlay"/>
+
+      <img src="~@/assets/img/document_m/audio-forward.png"  @click="skipTime(15)"/>
+      <el-slider v-model="currentTime" :show-tooltip="false" class="progress-line"
+      @input="handleDragTime" :max="duration"/>
+      <div class="played-time">{{ formatTime(currentTime) }}</div>
+      <el-dropdown @command="setSpeed" class="dropdown-speed">
+        <span>倍速 {{ speed }}x</span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item :command="0.5" :class="speed==0.5?'current-speed':''">0.5</el-dropdown-item>
+          <el-dropdown-item :command="1" :class="speed==1?'current-speed':''">1</el-dropdown-item>
+          <el-dropdown-item :command="1.5" :class="speed==1.5?'current-speed':''">1.5</el-dropdown-item>
+          <el-dropdown-item :command="2" :class="speed==2?'current-speed':''">2</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </template>
+    <template v-if="type==2">
+      <video :src="ResourceUrl" controls class="detail-video" @timeupdate="updateProgress" ref="videoRef">
+        Your browser does not support the video element.
+      </video>
+    </template>
+  </div>
+</template>
+
+<script>
+  export default {
+    name:"mediaCom",
+    props:{
+      ResourceUrl:{
+        type:String,
+        required:true
+      },
+      type:{
+        type:Number,
+        required:true
+      }
+    },
+    data() {
+      return {
+        isPlaying:false,
+        speed:1,// 倍速率，默认为1
+        currentTime: 0,
+        duration: 0,
+        showHours:true
+      }
+    },
+    methods: {
+      togglePlay(){
+        const audio = this.$refs.audioUrlRef;
+        if(this.isPlaying){
+          audio.pause()
+        }else{
+          audio.play()
+        }
+        this.isPlaying=!this.isPlaying
+      },
+      updateProgress(event) {
+        const { currentTime } = event.target;
+        this.currentTime = +currentTime.toFixed(3)
+      },
+      skipTime(seconds) {
+        const audio = this.$refs.audioUrlRef;
+
+        audio.currentTime += seconds;
+        if(audio.currentTime < 0) audio.currentTime = 0;
+        if(audio.currentTime > audio.duration) audio.currentTime = audio.duration;
+      },
+      setDuration(event){
+        this.duration = event.target.duration;
+        this.showHours = Math.floor(this.duration / 3600) > 0
+      },
+      audioEnded() {
+        this.isPlaying = false; // 音频结束时更新播放状态
+      },
+      setSpeed(s){
+        const audio = this.$refs.audioUrlRef;
+        this.speed=s
+
+        audio.playbackRate = this.speed;
+      },
+      handleDragTime(e){
+        const audio = this.$refs.audioUrlRef;
+        audio.currentTime = e
+      },
+      formatTime(timeInSeconds) {
+        
+        const hours = Math.floor(timeInSeconds / 3600);
+        const minutes = Math.floor((timeInSeconds % 3600) / 60);
+        const seconds = Math.floor(timeInSeconds % 60);
+        const result =
+        this.showHours
+        ? `${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`
+        : `${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`;
+
+        return result;
+      },
+      // 重置音频的播放器状态参数
+      resetPlayerParams(){
+        this.speed=1
+        this.isPlaying=false
+      },
+      updateCurrentTime(time){
+        this.currentTime = time
+        this.$refs.videoRef && (this.$refs.videoRef.currentTime=this.currentTime)
+      }
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+.audio-container{
+  height: 100%;
+  width: 100%;
+  background-color:#ECF2FE;
+  border: 1px solid #0052D9;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  padding: 0 30px;
+  img{
+    height: 20px;
+    width: 20px;
+    margin-right: 20px;
+    cursor: pointer;
+  }
+  .progress-line{
+    flex-grow: 1;
+    margin-right: 20px;
+  }
+  .played-time{
+    margin-right: 40px;
+    font-size: 14px;
+    color: #333333;
+    font-weight: 400;
+    line-height: 22px;
+  }
+  .dropdown-speed{
+    span{
+      font-size: 14px;
+      color: #0052D9;
+      font-weight: 400;
+      line-height: 22px;
+      cursor: pointer;
+    }
+  }
+
+}
+.video-container{
+  height: 100%;
+  border-radius: 4px;
+  .detail-video{
+    height: 100%;
+  }
+}
+</style>
+<style lang="scss">
+  .current-speed{
+    color: #0052D9;
+    background-color: #e6eefb;
+  }
+  .el-slider__runway{
+    background-color: white;
+    height: 3px;
+    .el-slider__bar{
+      height: 3px;
+    }
+    .el-slider__button-wrapper{
+      height: 18px;
+      width: 18px;
+      transform: translate(-50%,calc(50% - 2px));
+      .el-slider__button{
+        height: 8px;
+        width: 8px;
+      }
+    }
+  }
+</style>

src/views/semantics_manage/asr/components/mediaUpload.vue

@@ -0,0 +1,438 @@
+<template>
+  <div>
+	<el-dialog
+		:visible.sync="diaShow"
+		:close-on-click-modal="false"
+		:modal-append-to-body='false'
+    :title="diaTitle"
+		@close="closeHandle"
+		center top="10vh"
+		width="800px">
+			<div class="dialog-main">
+				<el-form
+				ref="diaForm"
+				label-position="left"
+				hide-required-asterisk
+				:model="formData">
+          <el-form-item label="所属目录" :rules="{required:true,message:'所属目录必填',trigger:'change'}" 
+          prop="catalogue" label-width="76px">
+            <el-cascader v-model="formData.catalogue" placeholder="请选择所属目录" clearable id="media-upload-cascader"
+              :options="articleCatalogue" :props="{value:'MenuId',label:'MenuName',children:'Children',checkStrictly:true,emitPath:false}"
+              style="width: 604px;"></el-cascader>
+          </el-form-item>
+				</el-form>
+        <div class="file-upload-zone">
+          <div class="file-upload-title">
+            <span>文件数量：{{ fileList.length }} / {{ this.fileLimit }}</span>
+            <span v-if="fileList.length>0" class="file-readdition" 
+              :class="{'disable-readdition':!( (this.fileList.length+this.uploadingFileNames.length) <fileLimit)}" @click="uploadClick">继续添加</span>
+          </div>
+          <div class="file-upload-main" id="drop-upload-zone" @dragover="uploadDragover" @drop="uploadDrop">
+            <el-table :data="fileList" id="file-list-table">
+              <el-table-column label="文件名" prop="name" show-overflow-tooltip >
+                <template slot-scope="{row}">
+                  <span class="table-span">{{ row.name }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="大小" prop="sizeText" width="120">
+                <template slot-scope="{row}" >
+                  <span class="table-span">{{ row.sizeText }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="音/视频" prop="type" width="100">
+                <template slot-scope="{row}">
+                  <span class="table-span">{{ row.type }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" prop="operation" width="60">
+                <template slot-scope="{row,$index}">
+                  <span class="table-button" @click="deleteFile($index)">删除</span>
+                </template>
+              </el-table-column>
+                  <div slot="empty" class="no-file-show" @click="uploadClick">
+                    <div class="upload-text"><span style="color:#0052D9 ;">点击/拖拽</span>本地音视频文件</div>
+                    <div class="upload-message-box">
+                      <div class="upload-message-row">支持音频格式：mp3、wav、m4a、amr、wma、aac、ogg-opus、flac</div>
+                      <div class="upload-message-row">支持视频格式：mp4、flv、3gp</div>
+                      <div class="upload-message-row">单个文件最长5小时、最大1GB,单次支持上传50个</div>
+                    </div>
+                  </div>
+            </el-table>
+          </div>
+        </div>
+        <div class="dia-bot">
+          <el-button type="primary" plain style="margin-right:20px;min-width:120px ;" @click="cancelHandle">取消</el-button>
+          <el-button type="primary" @click="saveHandle" style="min-width:120px;" :disabled="fileList.length==0">开始转写</el-button>
+        </div>
+        <!-- :http-request="handleUpload"
+          :before-upload="handleBeforeUpload" -->
+        <el-upload 
+          ref="uploadRef" id="upload-media" style="display: none;"
+          accept=".mp3,.wav,.m4a,.amr,.wma,.aac,.opus,.ogg,.flac,.mp4,.flv,.3gp"
+          action="#" multiple :limit="fileLimit"
+          :on-change="uploadMedia"
+          :show-file-list="false"
+          :auto-upload="false"
+          :disabled="!((this.fileList.length+this.uploadingFileNames.length)<fileLimit)">
+        </el-upload>
+			</div>
+		</el-dialog>
+</div>
+</template>
+
+<script>
+import {uploadFileDirect} from "@/utils/common.js"
+import {asrInterface} from '@/api/modules/semanticsApi.js';
+import MD5 from "js-md5";
+  export default {
+    name:"editTag",
+    props:{
+      diaShow:{
+        type:Boolean,
+        default:false
+      },
+      articleCatalogue:{
+        type:Array,
+        required:true
+      }
+    },
+    watch:{
+      uploadingFileNames(value){
+        if(!(value && value.length>0)){
+          if(this.uploadHint){
+            this.uploadHint.close()
+            this.uploadHint=null
+          }
+          if(this.closeDia) return 
+          this.$message.success("上传完成，请检查转写列表")
+        }
+      },
+      diaShow(value){
+        if(value){
+          this.current++
+        }
+      }
+    },
+    data() {
+      return {
+        current:0,
+        diaTitle:'上传本地音视频文件',
+        formData:{
+          catalogue:''
+        },
+        fileLimit:50,
+        fileExp:new RegExp(/\.(mp3|wav|m4a|amr|wma|aac|opus|ogg|flac|mp4|flv|3gp)$/,'i'),
+        videoExp:new RegExp(/\.(mp4|flv|3gp)$/,'i'),
+        fileList:[],
+        uploadingFileNames:[],
+        uploadHint:null,
+        closeDia:false
+      }
+    },
+    methods: {
+      uploadClick(){
+        if(!( (this.fileList.length+this.uploadingFileNames.length) < this.fileLimit)) return 
+        $('#upload-media input').trigger('click')
+      },
+      uploadDragover(event){
+        event.preventDefault(); //阻止默认行为，允许放置
+      },
+      uploadDrop(event){
+        event.preventDefault(); //阻止浏览器默认行为
+        // 获取文件的数据
+        const DataTransferItemList = event.dataTransfer.files
+        DataTransferItemList.forEach(file =>{
+          file.raw=file
+          setTimeout(()=>{
+            this.uploadMedia(file)
+          })
+        })
+      },
+      async uploadMedia(file){
+        // console.log(file,this.uploadingFileNames,'this.uploadingFileNames');
+        let fileFront=file.name.split('.')[0]
+  
+        if(this.uploadingFileNames.some(item=> item == fileFront)){
+          return this.$message.error(file.name+'同名文件正在上传，请稍后重试')
+        }
+        if(!(this.fileExp.test(file.name))){
+          return this.$message.error(file.name+'格式不受支持')
+        }
+        if(!(file.size/1024/1024 < 1024.1)){
+          return this.$message.error(file.name+'大小已超限')
+        }
+
+        let res = await this.checkDuration(file)
+        if(!res.flag){
+          return this.$message.error(res.msg);
+        }
+        
+        let audioDuration = res.duration
+
+        if(!( (this.fileList.length+this.uploadingFileNames.length) < this.fileLimit)){
+          return this.$message.error(`上传文件已超过${this.fileLimit}个,${file.name}上传失败`)
+        } 
+        // 判断于 在库的文件名是否重名
+        let flag=true
+        let checkRes = await asrInterface.speechFlieRepetitionCheck({FileName:fileFront})
+        if(checkRes.Ret == 200) flag=false
+        if(flag) return 
+
+        if(!this.uploadHint){
+          this.uploadHint = this.$message({
+            type:"info",
+            message:'上传中，请勿关闭弹窗',
+            duration:0,
+            iconClass:'el-icon-loading'
+          })
+        }
+        // 上传
+        this.uploadingFileNames.push(fileFront)
+
+        const t = new Date().getTime().toString();
+        const temName = `asr/media/${process.env.NODE_ENV}/${MD5(t)}.${
+          file.raw.type.split("/")[1]
+        }`;
+        let clientType = this.$setting.dynamicOutLinks.ObjectStorageClient ||
+                  this.$store.state.dynamicOutLinks.ObjectStorageClient ||
+                  JSON.parse(localStorage.getItem('dynamicOutLinks')).ObjectStorageClient
+        let options={}
+        if((file.size/1024/1024 > 100)){
+          // 大于100MB，分片上传
+          console.log("切片上传");
+          // 上传的配置
+          options={
+            // 阿里云
+            OSS:{
+              // 设置并发上传的分片数量。
+              parallel: 10,
+              // 设置分片大小。默认值为1 MB，最小值为100 KB。
+              partSize: 1024 * 1024 * 10, // 10MB
+            },
+            /**
+             * minIO的上传方法自动将较大的文件进行分片，不需要特殊配置
+             * 官网文档翻译文：单个对象的最大大小限制为5TB。putObject透明地将大于64MiB的对象分成多个部分上传。使用MD5SUM签名仔细验证上传的数据。
+             */
+            //S3
+            S3:{
+              partSize: 10 * 1024 * 1024, // 设置每个分片大小为10MB，默认为8MB。
+              queueSize: 10, // 并发数，默认为4。
+            }
+          }
+        }
+        let windowNum=this.current
+        uploadFileDirect(clientType,file.raw,temName,options).then(res=>{
+          if(!this.diaShow || (this.current!=windowNum)) return 
+          let item = {
+            name:fileFront,
+            fileUrl:res,
+            sizeText:this.sizeFormat(file.size),
+            size:file.size,
+            type:this.videoExp.test(res)?"视频":"音频",
+            duration:audioDuration || 0
+          }
+          this.fileList.push(item)
+        }).finally(()=>{
+          this.deleteUploadItem(fileFront)
+        })
+      },
+      sizeFormat(s){
+        let size = Number(s)
+        if(size<1024){
+          return size+'B'
+        }else if(size<(1024*1024)){
+          return Math.floor((size/1024)*100)/100 +'KB'
+        }else{
+          return Math.floor((size/1024/1024)*100)/100 +'MB'
+        }
+      },
+      deleteUploadItem(name){
+        let index = this.uploadingFileNames.findIndex(fileName=> fileName==name)
+        if(index!=-1){
+          this.uploadingFileNames.splice(index,1)
+        }
+      },
+      checkDuration(file){
+        return new Promise((resolve,reject)=>{
+          try {
+            let url = URL.createObjectURL(file.raw);
+            
+            let audioElement = new Audio(url);
+            audioElement.addEventListener('loadeddata', () => {
+              if(audioElement.duration>(60*60*5+1)){
+                resolve({flag:false,msg:file.name+'时长已超限',duration:audioElement.duration})
+              }else{
+                resolve({flag:true,msg:'',duration:audioElement.duration})
+              }
+              URL.revokeObjectURL(url);
+            });
+            setTimeout(()=>{
+              resolve({flag:false,msg:file.name+"获取不到时长，请重试"})
+            },5000)
+          } catch (error) {
+            this.$message.error(error.msg)
+            console.error(error.msg);
+            reject(error)
+          }
+        })
+      },
+      deleteFile(index){
+        this.fileList.splice(index,1)
+      },
+      cancelHandle(){
+        this.$emit("update:diaShow",false)
+      },
+      saveHandle(){
+        if(this.uploadingFileNames && this.uploadingFileNames.length>0){
+          return this.$message.error("还有音/视频未上传完成，请等待上传成功后再转写！") 
+        } 
+        let params={
+          MenuId:this.formData.catalogue,
+          Files:this.fileList.map(f =>{
+            return {
+              FileName:f.name,
+              ResourceUrl:f.fileUrl,
+              FileSecond:Math.round(f.duration),
+              FileSize:f.size
+            }
+          })
+        }
+        this.$refs.diaForm.validate(valid=>{
+          if(valid){
+            asrInterface.speechTransfer(params).then(res=>{
+              if(res.Ret == 200){
+                this.$message.success("提交转写成功")
+                this.$emit("uploadSuccess")
+                this.$emit("update:diaShow",false)
+              }
+            })
+          }
+        })
+      },
+      closeHandle(){
+        this.formData={}
+        this.closeDia=true
+        this.uploadingFileNames=[]
+        this.fileList=[]
+        this.$emit("update:diaShow",false)
+        this.$nextTick(()=>{
+          this.$refs.diaForm.clearValidate()
+          this.closeDia=false
+        })
+      }
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+  @mixin font-type {
+    font-size: 14px;
+    line-height: 22px;
+    font-weight: 400;
+    color: #333333;
+  }
+.dialog-main{
+  padding: 5px 35px 35px;
+  .file-upload-zone{
+    .file-upload-title{
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      span{
+        @include font-type
+      }
+      .file-readdition{
+        color: #0052D9;
+        cursor: pointer;
+      }
+      .disable-readdition{
+        color: #999999;
+        cursor:not-allowed;
+      }
+    }
+    .file-upload-main{
+      width: 100%;
+      height: 380px;
+      box-sizing: border-box;
+      // border: 1px solid #C8CDD9;
+      background-color: #ECF2FE;
+      border-radius: 4px;
+      margin-top: 10px;
+      .table-span{
+        @include font-type;
+      }
+      .table-button{
+        @include font-type;
+        color: #C54322;
+        cursor: pointer;
+      }
+      .no-file-show{
+        height: 332px;
+        width: 100%;
+        box-sizing: border-box;
+        padding: 130px 0 30px;
+        cursor: pointer;
+        .upload-text{
+          margin-bottom:80px;
+          @include font-type
+        }
+        .upload-message-box{
+          text-align: left;
+          padding-left: 30px;
+          .upload-message-row{
+            @include font-type;
+            color: #666666;
+          }
+        }
+      }
+    }
+  }
+  .dia-bot{
+    text-align: center;
+    margin-top: 60px;
+  }
+}
+</style>
+<style lang="scss">
+  @mixin font-type {
+    font-size: 14px;
+    line-height: 22px;
+    font-weight: 400;
+    color: #333333;
+  }
+.el-cascader-node{
+  max-width: 200px;
+}
+#media-upload-cascader{
+  .el-input{
+    width: 100%;
+  }
+}
+#file-list-table{
+  background-color: #ECF2FE;
+  border: 1px solid #C8CDD9;
+  border-radius: 4px;
+  th{
+    background-color: #ECF2FE!important;
+    border-color: #C8CDD9!important;
+    @include font-type;
+    color: #999999;
+  }
+  td{
+    border: none;
+    background-color: #ECF2FE!important;
+    padding: 10px 0;
+  }
+  .el-table__body-wrapper{
+    height: 332px;
+    overflow-y: auto;
+  }
+  .el-table__empty-block{
+    .el-table__empty-text{
+      width: 100%;
+      color: unset;
+      line-height: unset;
+    }
+  }
+}
+</style>

src/views/semantics_manage/asr/components/transferStatus.vue

@@ -0,0 +1,170 @@
+<template>
+  <div v-if="windowShow" class="transfer-status-box" id="transfer-status-box" draggable @dragstart="dragStart"
+    :style="{'height':isFold?'40px':'unset','width':isFold?'210px':'340px',right:x+'px', bottom:y+'px'}">
+    <div class="transfer-status-header">
+      <div class="status-header-left">
+        <img src="~@/assets/img/smartReport/icon02.png" :draggable="false" />
+        <span>转写中({{ transferStatus.transferingNumber || 0 }})</span>
+      </div>
+      <div class="status-header-right">
+        <img src="~@/assets/img/icons/arrow_black_up.png" style="margin-right: 12px;" @click="isFold=!isFold"
+        :style="{'transform':isFold?'rotate(0)':'rotate(180deg)'}"  :draggable="false"/>
+        <img src="~@/assets/img/icons/close.png" @click="closeWindow"  :draggable="false"/>
+      </div>
+    </div>
+    <div class="transfer-status-body" >
+      <div class="transfer-status-row" v-for="(item,index) in transferStatus.list" :key="item.SpeechRecognitionId">
+        <div class="status-body-name">
+          <span>{{ item.FileName }}</span>
+          <span v-if="item.State==3" style="color: #AD352F;">（{{ stateTextArr[item.State] }}：{{ item.ConvertRemark }}）</span>
+        </div>
+        <div class="status-body-right">
+          <img v-if="item.State==3" src="~@/assets/img/icons/delete-red.png" style="cursor: pointer;" 
+          @click="deleteRow(item,index)" :draggable="false" v-permission="permissionBtn.semanticPermission.ASR_deleteArticles"/>
+          <span v-else :style="{'color':item.State==0?'#999999':'#333333'}">{{ stateTextArr[item.State] }}</span>
+        </div>
+      </div>
+    </div>
+    <img id="emptyImage" src="data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs=" style="display: none;">
+  </div>
+</template>
+
+<script>
+import { asrInterface } from '../../../../api/modules/semanticsApi'
+
+  export default {
+    name:"transferStatus",
+    props:{
+      windowShow:{
+        type:Boolean,
+        default:false
+      },
+      transferStatus:{
+        type:Object,
+        required:true
+      },
+    },
+    data() {
+      return {
+        isFold:true,
+        // 拖拽相关
+        x: 20,
+        y: 20,
+        dragOffsetX: null,
+        dragOffsetY: null,
+        dragDocument:null,
+        stateTextArr:['','转写中','转写完成','转写失败']
+      }
+    },
+    mounted(){
+      this.$nextTick(()=>{
+        this.dragDocument = $('#transfer-status-box')[0]
+      })
+    },
+    methods: {
+      deleteRow(item,index){
+        asrInterface.speechRemove({SpeechRecognitionId:item.SpeechRecognitionId}).then(res=>{
+          if(res.Ret == 200){
+            this.$message.success("删除成功")
+            this.$emit("deleteRow",{item,index})
+          }
+        })
+      },
+      closeWindow(){
+        localStorage.removeItem("transferStatusShow")
+        this.$emit("update:windowShow",false)
+      },
+      dragStart(event) {
+        // 计算鼠标位置偏移量
+        this.dragOffsetX = event.clientX - event.target.getBoundingClientRect().left;
+        this.dragOffsetY = event.clientY - event.target.getBoundingClientRect().top;
+        
+        event.dataTransfer.effectAllowed='move'
+        // 去掉虚影
+        event.dataTransfer.setDragImage(emptyImage, 0, 0);
+
+        document.addEventListener('dragover',this.dragover)
+        document.addEventListener('dragend',this.dragend)
+      },
+      dragover(event){
+        // 防止默认处理
+        event.preventDefault();
+
+        // 计算新位置，并更新组件的 x 和 y 数据属性
+
+        this.x = window.innerWidth-(event.clientX - this.dragOffsetX) - this.dragDocument.clientWidth
+        this.y = window.innerHeight-(event.clientY - this.dragOffsetY) - this.dragDocument.clientHeight
+
+      },
+      dragend(event) {
+        // 防止默认处理
+        event.preventDefault();
+
+        document.removeEventListener('dragover',this.dragover)
+        document.removeEventListener('dragend',this.dragend)
+      }
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+
+@mixin font-type{
+  font-size: 14px;
+  font-weight: 400;
+  line-height: 20px;
+  color:#333333;
+}
+
+.transfer-status-box{
+  width: 340px;
+  padding: 10px 20px;
+  box-sizing: border-box;
+  background-color: white;
+  overflow: hidden;
+  border-radius: 4px;
+  border: 1px solid #C8CDD9;
+  z-index: 1000;
+  img{
+    height: 16px;
+    width: 16px;
+  }
+  span{
+    @include font-type;
+  }
+  .transfer-status-header{
+    padding-bottom: 10px;
+    border-bottom: 1px solid #C8CDD9;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .status-header-left{
+      display: flex;
+      align-items: center;
+      img{
+        margin-right: 4px;
+      }
+    }
+    .status-header-right{
+      img{
+        cursor: pointer;
+      }
+    }
+  }
+  .transfer-status-body{
+    margin-top: 10px;
+    max-height: 90px;
+    overflow-y: auto;
+    box-sizing: border-box;
+    .transfer-status-row{
+      margin-top: 10px;
+      display: flex;
+      align-items: flex-start;
+      justify-content: space-between;
+      // .status-body-name{
+      // }
+    }
+  }
+
+}
+</style>

src/views/smartReport/components/BaseInfo.vue

@@ -262,7 +262,7 @@ export default {
 
         // 获取分类
         getclassifylist() {
-            let params = { CurrentIndex: 0, PageSize: 1000, KeyWord: "",HideDayWeek:1,/*不显示晨报/周报*/ };
+            let params = { Enabled:1, KeyWord: "",HideDayWeek:1,/*不显示晨报/周报*/ };
             apiSmartReport.classifyList(params).then((res) => {
                 if (res.Ret == 200 && Array.isArray(res.Data.List)) {
                     this.classifyArr = [];

src/views/smartReport/reportList.vue

@@ -786,7 +786,7 @@ export default {
         //报告类型
         getclassifylist() {
             //获取分类列表
-            let params = { CurrentIndex: 0, PageSize: 1000, KeyWord: "",HideDayWeek:1,/*不显示晨报/周报*/ };
+            let params = { KeyWord: "",HideDayWeek:1,/*不显示晨报/周报*/ };
             apiSmartReport.classifyList(params).then((res) => {
                 if (res.Ret == 200 && Array.isArray(res.Data.List)) {
                     this.optionsArr = [];

src/views/system_manage/components/addUserDialog.vue

@@ -163,19 +163,19 @@ import {patternEmail,isMobileNo,checkPassWord} from '@/utils/commonOptions';
                         }
                     }, trigger: 'blur'}],
                     depart:[{ required: true, message: this.$t('SystemManage.DepartManage.use_add_valid_msg08'), trigger: 'change' }],
-                    employeeNumber:[{validator:(rule,value,callback)=>{
-                        if(!value){
-                            callback()
-                            return 
-                        }
-                        // 取消空格
-                        let tempValue = parseInt(value.replaceAll(' ',''))
-                        if(!tempValue || value.replaceAll(' ','').length!=4){
-                            callback(new Error(this.$t('SystemManage.DepartManage.use_add_valid_msg09')))
-                        }else{
-                            callback()
-                        }
-                    },trigger:'blur'}],
+                    // employeeNumber:[{validator:(rule,value,callback)=>{
+                    //     if(!value){
+                    //         callback()
+                    //         return 
+                    //     }
+                    //     // 取消空格
+                    //     let tempValue = parseInt(value.replaceAll(' ',''))
+                    //     if(!tempValue || value.replaceAll(' ','').length!=4){
+                    //         callback(new Error(this.$t('SystemManage.DepartManage.use_add_valid_msg09')))
+                    //     }else{
+                    //         callback()
+                    //     }
+                    // },trigger:'blur'}],
                     role:[{ required: true, message: this.$t('SystemManage.DepartManage.use_add_valid_msg10'), trigger: 'change' }],
                 }
                 },

src/views/system_manage/departManage.vue

@@ -970,7 +970,7 @@ export default {
 		/* 新建用户 */
 		addUser() {
 			this.isAddUser = true;
-			this.hasEmployeeNo=false
+			// this.hasEmployeeNo=false
 			this.userForm = {
 				title:this.$t('SystemManage.DepartManage.user_add_btn'),
 				account:'',
@@ -1265,7 +1265,7 @@ export default {
 				areacode:item.TelAreaCode,
 				IsLdap:item.IsLdap||0
 			}
-			this.hasEmployeeNo=!!item.EmployeeId
+			// this.hasEmployeeNo=!!item.EmployeeId
 			this.isAddUser = true;
 		},
 		/* 删除用户 */

src/views/system_manage/etaBaseConfig.vue

@@ -452,9 +452,9 @@ export default {
                 WxAppSecret:'',
                 WxId:'',
                 H5ReportShareImg:'',
-                SmartReportSheetSize: '9',//智能研报表格字号
-                ReportSheetSize: '9',//研报表格字号
-                EnReportSheetSize: '9',//英文研报表格字号
+                SmartReportSheetSize: '12',//智能研报表格字号
+                ReportSheetSize: '12',//研报表格字号
+                EnReportSheetSize: '12',//英文研报表格字号
 
                 UseXf:0,//是否启用科大讯飞服务 0否 1是
                 XfAppid:'',
@@ -468,8 +468,8 @@ export default {
                 EnPptCoverImgs:[],//英文ppt封面列表
                 EnPptBackgroundImg:'',//英文ppt背景图
                 EnPptBottomImg:'',//英文ppt封底图
-                CnPptSheetSize: '9',//中文ppt表格字号
-                EnPptSheetSize: '9',//英文ppt表格字号
+                CnPptSheetSize: '12',//中文ppt表格字号
+                EnPptSheetSize: '12',//英文ppt表格字号
 
                 WatermarkReport:false,//研报分享水印