merge master

src/api/modules/contractApi.js

@@ -224,10 +224,29 @@ const contractInterface={
 	//获取历史合同
 	getHistoryContract:params=>{
 		return http.get('/custom/company/last_contract/detail/withoutDate',params)
-	}
-
-
+	},
+	// 合同列表接口
+	getAllocationContract:params=>{
+		return http.get('/cygx/allocation/company_contract_list',params)
+	},
+	// 申请服务更新-签约历史(单个详情)
+	getHistoryDetail:params=>{
+		return http.get('/custom/apply/contract/history/detail',params)
+	},
+	// 派点详情
+	getAllocationDetail:params=>{
+		return http.get('/cygx/allocation/detail',params)
+	},
+	// 更新派点接口
+	getAllocationDetailUpdate:params=>{
+		return http.post('/cygx/allocation/update',params)
+	},
+	// 派点统计
+	getAllocationStatistic:params=>{
+		return http.get('/cygx/allocation/statistics',params)
+	},
 
+	
 }
 
 export {

src/api/modules/rai/YanXuanApi.js

@@ -0,0 +1,26 @@
+import http from "@/api/http.js";
+/* 权益小程序管理 报告模块*/
+const YanXuanApi = {
+  // 作者列表
+  yanxuan_specialAuthorList: (params) => {
+    return http.get("/cygx/yanxuan_special/author/list", params);
+  },
+  // 新增研选专栏作者
+  yanxuan_specialAuthorAdd: (params) => {
+    return http.post("/cygx/yanxuan_special/author/add", params);
+  },
+  // 禁用/启用研选专栏作者
+  yanxuan_specialAuthorEnable: (params) => {
+    return http.post("/cygx/yanxuan_special/author/enable", params);
+  },
+  // 审核列表
+  yanxuan_specialList: (params) => {
+    return http.get("/cygx/yanxuan_special/list", params);
+  },
+  // 审批研选专栏
+  yanxuan_specialEnable: (params) => {
+    return http.post("/cygx/yanxuan_special/enable", params);
+  },
+};
+
+export default YanXuanApi;

src/api/modules/rai/raiApi.js

@@ -6,6 +6,7 @@ import internalInterface from "./internalApi.js";
 import lableApi from "./lableApi.js";
 import raiPoints from "./pointsApi.js";
 import voteApi from "./voteApi.js";
+import YanXuanApi from "./YanXuanApi.js";
 /* 权益小程序管理 */
 const raiInterface = {
   ...raiReport,
@@ -15,6 +16,7 @@ const raiInterface = {
   ...lableApi,
   ...raiPoints,
   ...voteApi,
+  ...YanXuanApi,
   /* 
 		优化建议列表
 		PageSize CurrentIndex KeyWord  

src/api/modules/trainingApi.js

@@ -0,0 +1,162 @@
+import http from "@/api/http.js"
+
+/* 培训管理模块 */
+
+
+//标签管理
+export const TagInterface = {
+    /**
+     * 获取标签列表
+     * @param {Object} params 
+     * @param {Number} params.PageSize 
+     * @param {Number} params.CurrentIndex
+     * @param {String} params.Keyword
+     * @returns 
+     */
+    getTagList:(params)=>{
+        return http.get('/eta_training_video/tag/page_list',params)
+    },
+    /**
+     * 新增标签
+     * @param {Object} params 
+     * @param {String} params.TagName
+     * @returns 
+     */
+    addTag:(params)=>{
+        return http.post('/eta_training_video/tag/add',params)
+    },
+    /**
+     * 编辑标签
+     * @param {Object} params 
+     * @param {Number} params.TagId
+     * @param {String} params.TagName
+     * @returns 
+     */
+    editTag:(params)=>{
+        return http.post('/eta_training_video/tag/edit',params)
+    },
+    /**
+     * 删除标签
+     * @param {Object} params 
+     * @param {Number} params.TagId
+     * @returns 
+     */
+    deleteTag:(params)=>{
+        return http.post('/eta_training_video/tag/remove',params)
+    }
+}
+
+//分类管理
+export const ClassifyInterface = {
+    /**
+     * 获取分类列表
+     * @param {Object} params 
+     * @param {Number} params.Keyword 
+     * @returns 
+     */
+     getClassifyList:(params)=>{
+        return http.get('/eta_training_video/classify/tree',params)
+    },
+    /**
+     * 新增分类
+     * @param {Object} params 
+     * @param {Number} params.ParentId
+     * @param {String} params.ClassifyName
+     * @returns 
+     */
+    addClassify:(params)=>{
+        return http.post('/eta_training_video/classify/add',params)
+    },
+    /**
+     * 编辑分类
+     * @param {Object} params 
+     * @param {Number} params.ParentId
+     * @param {Number} params.ClassifyId
+     * @param {String} params.ClassifyName
+     * @returns 
+     */
+    editClassify:(params)=>{
+        return http.post('/eta_training_video/classify/edit',params)
+    },
+    /**
+     * 删除分类
+     * @param {Object} params 
+     * @param {Number} params.ClassifyId
+     * @returns 
+     */
+    deleteClassify:(params)=>{
+        return http.post('/eta_training_video/classify/remove',params)
+    }
+}
+
+//视频管理
+export const VideoInterface = {
+    /**
+     * 获取视频列表
+     * @param {Object} params 
+     * @param {Number} params.PageSize
+     * @param {Number} params.CurrentIndex 
+     * @param {String} params.Keyword
+     * @param {String} params.StartTime
+     * @param {String} params.EndTime
+     * @param {Number} params.ClassifyId
+     * @param {String} params.TagIds 标签IDs, 英文逗号拼接
+     * @param {Number} params.PublishState 发布状态：1-未发布；2-已发布
+     * @returns 
+     */
+    getVideoList:(params)=>{
+        return http.get('/eta_training_video/page_list',params)
+    },
+    /**
+     * 新增视频
+     * @param {Object} params 
+     * @param {String} params.Title
+     * @param {String} params.Introduce
+     * @param {String} params.CoverImg
+     * @param {String} params.VideoUrl
+     * @param {Number} params.ClassifyId
+     * @param {Array} params.TagIds
+     * @returns 
+     */
+    addVideo:(params)=>{
+        return http.post('/eta_training_video/add',params)
+    },
+    /**
+     * 编辑视频
+     * @param {Object} params 
+     * @param {Number} params.VideoId
+     * 其他同上
+     * @returns 
+     */
+    editVideo:(params)=>{
+        return http.post('/eta_training_video/edit',params)
+    },
+    /**
+     * 发布/取消发布视频
+     * @param {Object} params
+     * @param {Number} params.VideoId
+     * @param {Number} params.PublishState 发布状态：0-取消发布；1-发布
+     * @returns 
+     */
+    publishVideo:(params)=>{
+        return http.post('/eta_training_video/publish',params)
+    },
+    /**
+     * 删除视频
+     * @param {Object} params
+     * @param {Number} params.VideoId
+     * @returns 
+     */
+    deleteVideo:(params)=>{
+        return http.post('/eta_training_video/remove',params)
+    },
+    /**
+     * 获取视频详情
+     * @param {Object} params 
+     * @param {Number} params.VideoId
+     * @returns 
+     */
+    getVideoDetail:(params)=>{
+        return http.get('/eta_training_video/detail',params)
+    }
+}

src/routes/modules/contractRoutes.js

@@ -150,15 +150,24 @@ export default [
 					keepAlive: false
 				}
 			},
-			// {
-			// 	path:"contractapprovallist",
-			// 	component:()=>import("@/views/contract_manage/approvalList.vue"),
-			// 	name:"合同审批",
-			// 	hidden:false,
-			// 	meta: {
-			// 		keepAlive: false
-			// 	}
-			// }
+			{
+				path:"raiAllocationPage",
+				component:()=>import("@/views/contract_manage/raiAllocationPage.vue"),
+				name:"合同派点",
+				hidden:false,
+				meta: {
+					keepAlive: false
+				}
+			},
+			{
+				path:"researcherStatistics",
+				component:()=>import("@/views/contract_manage/researcherStatistics.vue"),
+				name:"研究员派点统计",
+				hidden:false,
+				meta: {
+					keepAlive: false
+				}
+			}
 		]
 	},
 ]

src/routes/modules/cygxRoutes.js

@@ -289,6 +289,12 @@ export default [
           keepAlive: false,
         },
       },
+      {
+        path: "yanXuanSpecial",
+        component: () => import("@/views/rai_manage/reportManage/yanXuanSpecial.vue"),
+        name: "研选专栏",
+        hidden: false,
+      },
     ],
   },
 

src/routes/modules/trainingRoutes.js

@@ -0,0 +1,33 @@
+//培训管理路由模块
+const home = r => require.ensure([], () => r(require('@/views/Home.vue')), 'Home'); //主页
+export default[
+    {
+        path:'/',
+        component:home,
+        name:'培训管理',
+        hidden:false,
+        icon_path:require('@/assets/img/home/training_icon.png'),
+        children:[
+            {
+                path: "trainingVideo",
+                name: "视频管理",
+                component: () => import('@/views/training_manage/videoManage.vue')
+            },
+            {
+                path: "trainingLabel",
+                name: "标签管理",
+                component: () => import('@/views/training_manage/labelManage.vue')
+            },
+            {
+                path: "trainingClassify",
+                name: "分类管理",
+                component: () => import('@/views/training_manage/classifyManage.vue')
+            },
+            {
+                path:'modifyVideo',
+                name:'编辑视频',
+                component:()=> import('@/views/training_manage/modifyVideoPage.vue')
+            }
+        ]
+    }
+]

src/styles/vars.scss

@@ -46,7 +46,9 @@ a[href="https://froala.com/wysiwyg-editor"], a[href="https://www.froala.com/wysi
 @charset "utf-8";
 body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,button,input,textarea,th,td { margin:0; padding:0; }
 body{ font-size:12px; font-style:normal; font-family:"\5FAE\8F6F\96C5\9ED1", Helvetica, sans-serif,; }
-html{ overflow:auto; min-width:1000px; }
+html{ overflow:auto; 
+  // min-width:1000px;
+ }
 small{ font-size:12px; }
 h1{ font-size:18px; }
 h2{ font-size:16px; }

src/views/Home.vue

@@ -998,6 +998,7 @@ export default {
   }
 }
 #containercon {
+  min-width: 1000px;
   width: 100%;
   position: absolute;
   top: 0px;

src/views/Login.vue

@@ -1,6 +1,6 @@
 <template>
 	<div id="login">
-		<div id="login_wrapper">
+		<div id="login_wrapper" v-if="!isMobile">
 			<img class="login-bg" src="https://hzstatic.hzinsights.com/static/hz_crm_web/imgs/login_bg.png" alt />
 			<img class="login-icon" src="https://hzstatic.hzinsights.com/static/hz_crm_web/imgs/login_logo.png" alt />
 			<!-- <el-form
@@ -109,6 +109,58 @@
 					@changeModel="changeModel('ordinaryModel')"/>
 			</div>
 		</div>
+
+		<!-- 移动端的登录页面跟移动ETA的一模一样 单独整一份 -->
+		<div id="login_wrapper_mobile" v-else>
+			<template v-if="activeModel!=='forgetPassModel'">
+				<div class="login-logo">
+					<img src="https://hzstatic.hzinsights.com/static/hz_crm_web/imgs/login_logo.png" >
+				</div>
+				<div class="login-title">sign in to continue</div>
+				<OrdinaryModel ref="ordinaryModelMobile"
+					:loginCheck="loginCheck"
+					:accountCheck="accountCheck"
+					:isMobile="isMobile"
+					@clearnHint="clearnHint"
+					@changeModel="changeModel('forgetPassModel')"
+					v-show="activeModel=='ordinaryModel'"
+				/>
+				<MobileModel ref="mobileModelMobile"
+					:areaCode="areaCode" :isMobile="isMobile" 
+					v-show="activeModel=='mobileModel'"
+				/>
+				<EmailModel ref="emailModelMobile" :isMobile="isMobile" v-show="activeModel=='emailModel'" />
+
+				<el-button type="primary" @click.native="handleLogin" 
+				:loading="logining" class="submit_btn_mobile">登录</el-button>
+				<div class="login-type-box">
+					<div class="login-type-item" @click="activeModel='ordinaryModel';handleClick({name:'ordinaryModelMobile'})"
+					v-show="activeModel!=='ordinaryModel'">
+						<img src="~@/assets/img/icons/account-login-type.png">
+						<span>账号密码登录</span>
+					</div>
+					<div class="login-type-item" @click="activeModel='mobileModel';handleClick({name:'mobileModelMobile'})"
+					v-show="activeModel!=='mobileModel'">
+						<img src="~@/assets/img/icons/phone-login-type.png">
+						<span>手机号登录</span>
+					</div>
+					<div class="login-type-item" v-show="activeModel!=='emailModel'" 
+					@click="activeModel='emailModel';handleClick({name:'emailModelMobile'})">
+						<img src="~@/assets/img/icons/email-login-type.png">
+						<span>邮箱登录</span>
+					</div>
+				</div>
+			</template>
+			<div class="login-box" v-else>
+				<!-- 忘记密码就不重新搞了，太麻烦了，就写一起吧 -->
+				<ForgetPassModel 
+					ref="forgetPassModelMobile"
+					:isMobile="isMobile" 
+					:autoAccount="$refs.ordinaryModelMobile?$refs.ordinaryModelMobile.form.account:''"
+					@changeModel="changeModel('ordinaryModel')"/>
+			</div>
+		</div>
+
 		<!-- 验证弹窗 -->
 		<el-dialog
 			class="check-dialog"
@@ -185,7 +237,34 @@ export default {
 			areaCode:[],
 
 			isCheckDialogShow:false,
-			checkActiveModel:'checkMobileModel'
+			checkActiveModel:'checkMobileModel',
+			isMobile:false
+		}
+	},
+	computed:{
+		activeModelForm(){
+			return this.isMobile?this.activeModel+'Mobile':this.activeModel
+		},
+		ordinaryModelForm(){
+			return this.isMobile?'ordinaryModelMobile':'ordinaryModel'
+		},
+		mobileModelForm(){
+			return this.isMobile?'mobileModelMobile':'mobileModel'
+		},
+		emailModelForm(){
+			return this.isMobile?'emailModelMobile':'emailModel'
+		}
+	},
+	watch:{
+		isMobile(value){
+			// 移动端变PC或相反的情况监听
+			// 重新获取验证码
+			this.$nextTick(()=>{
+				// console.log(this.activeModelForm);
+				if((this.activeModel=="mobileModel" || this.activeModel=="emailModel")&&
+				(!this.$refs[this.activeModelForm].picSrc))
+				this.$refs[this.activeModelForm].getCodePic()
+			})
 		}
 	},
 	created() {
@@ -201,8 +280,16 @@ export default {
 	},
 	mounted(){
 		this.getRememberedInfo()
+		this.isMobile=!(window.innerWidth>650)
+		window.addEventListener('resize',this.setIsMobile)
+	},
+	beforeDestroy() {
+		window.removeEventListener('resize',this.setIsMobile)
 	},
 	methods: {
+		setIsMobile(){
+			this.isMobile=!(window.innerWidth>650)
+		},
 		keyupSubmit() {
 			//回车登录
 			document.onkeydown = e => {
@@ -332,7 +419,7 @@ export default {
 		},
 		handleLogin(){
 			//先进行判空的表单验证
-			this.$refs[this.activeModel].$refs.modelForm.validate((valid)=>{
+			this.$refs[this.activeModelForm].$refs.modelForm.validate((valid)=>{
 				if(valid){
 					this.logining = true
 					//根据activeName 调用不同的登陆接口
@@ -364,7 +451,7 @@ export default {
 			})
 		},
 		ordinaryModelLogin(){
-			const {account,checkPass,checked} = this.$refs.ordinaryModel.form
+			const {account,checkPass,checked} = this.$refs[this.ordinaryModelForm].form
 			departInterence.userLogin({
 				LoginType:1,
 				Username:account,
@@ -401,7 +488,7 @@ export default {
 				this.loginSys(res)
 			})
 		},
-		mobileModelLogin(model='mobileModel'){
+		mobileModelLogin(model=this.mobileModelForm){
 			const {mobile,checkCode} = this.$refs[model].form
 			departInterence.userLogin({
 				LoginType:2,
@@ -412,15 +499,15 @@ export default {
 					//刷新图形验证码
 					this.$refs[model].getCodePic()
 					this.$refs[model].form.picCode = ''
-					model==='mobileModel'&&(this.logining = false)
-					model!=='mobileModel'&&(this.checkLogining = false)
+					model===this.mobileModelForm&&(this.logining = false)
+					model!==this.mobileModelForm&&(this.checkLogining = false)
 					return
 				}
 				this.setLoginInfo(res)
 				this.loginSys(res)
 			})
 		},
-		emailModelLogin(model='emailModel'){
+		emailModelLogin(model=this.emailModelForm){
 			const {email,checkCode} = this.$refs[model].form
 			departInterence.userLogin({
 				LoginType:3,
@@ -431,8 +518,8 @@ export default {
 					//刷新图形验证码
 					this.$refs[model].getCodePic()
 					this.$refs[model].form.picCode = ''
-					model==='emailModel'&&(this.logining = false)
-					model!=='emailModel'&&(this.checkLogining = false)
+					model===this.emailModelForm&&(this.logining = false)
+					model!==this.emailModelForm&&(this.checkLogining = false)
 					return
 				}
 				this.setLoginInfo(res)
@@ -515,6 +602,7 @@ export default {
 	background: #fff;
 	position: relative;
 	overflow: hidden;
+	overflow-y: auto;
 	#login_wrapper {
 		width: 100%;
 		height: 100%;
@@ -609,20 +697,65 @@ export default {
 			}
 		}
 	}
-	.remember-cont {
-		position: relative;
-		margin-bottom: 20px;
-		.warn-check-tip {
-			position: absolute;
-			min-width: 300px;
-			left: 130px;
-			top: 0;
-			padding: 2px 10px;
-			border: 1px solid #D1433A;
-			background: #FFEAE9;
-			color: #B72E18;
-			font-size: 14px;
+	@media screen and (max-width:650px) {
+		#login_wrapper_mobile{
+			// display: block;
+			padding: 15% 40px 20px;
+			.login-logo{
+				margin-bottom: 30px;
+				img{
+					width: 250px;
+				}
+			}
+			.login-title{
+				font-size: 14px;
+				color: #999999;
+			}
+			.submit_btn_mobile{
+				height: 44px;
+				width: 100%;
+				border-radius: 44px;
+			}
+			.login-type-box{
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				width: 54%;
+				margin: 0 auto;
+				.login-type-item{
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					margin-top: 50px;
+					img{
+						height: 40px;
+						width: 40px;
+						margin-bottom: 4px;
+					}
+					span{
+						font-size: 12px;
+						color: #666666;
+					}
+				}
+			}
 		}
 	}
+	// .remember-cont {
+	// 	position: relative;
+	// 	margin-bottom: 20px;
+	// 	.warn-check-tip {
+	// 		position: absolute;
+	// 		min-width: 300px;
+	// 		left: 130px;
+	// 		top: 0;
+	// 		padding: 2px 10px;
+	// 		border: 1px solid #D1433A;
+	// 		background: #FFEAE9;
+	// 		color: #B72E18;
+	// 		font-size: 14px;
+	// 	}
+	// }
 }
 </style>
+

src/views/business_ETA_manage/addBusiness.vue

@@ -225,8 +225,8 @@ export default {
                 teamSize:[{required: true, message: '请选择研究团队规模', trigger: 'change' },],
                 industry:[{required: true, message: '请选择所属行业', trigger: 'change' },],
                 userMax:[{required: true, message: '请输入用户上限', trigger: 'blur' },],
-                signDate:[{required: true, message: '请选择签署日期', trigger: 'change' },],
-                expirationDate:[{required: true, message: '请选择签署日期', trigger: 'change' },],
+                /* signDate:[{required: true, message: '请选择签署日期', trigger: 'change' },],
+                expirationDate:[{required: true, message: '请选择签署日期', trigger: 'change' },], */
                 saller:[{required: true, message: '请选择所属销售', trigger: 'change' },],
             },
 

src/views/business_ETA_manage/businessAuth.vue

@@ -62,7 +62,7 @@ export default {
                 const {List,ChoiceList=[],HalfChoiceList=[]} = res.Data
                 this.authList = List||[]
                 this.defaultCheckedKeys = ChoiceList.filter((item)=>!HalfChoiceList.some((halfItem)=>item===halfItem))
-                this.handleCheckChange(ChoiceList,HalfChoiceList)
+                this.handleCheckChange(this.defaultCheckedKeys,HalfChoiceList)
             })
         },
         async handleBtnClik(type){
@@ -90,7 +90,7 @@ export default {
         handleCheckChange(choiceList,HalfChoiceList){
             const keys = choiceList||this.$refs.checkboxTree.getCheckedKeys()
             const halfKeys = HalfChoiceList||this.$refs.checkboxTree.getHalfCheckedKeys()
-            const ChoiceList = Array.from(new Set([...keys,...halfKeys]))
+            const ChoiceList = Array.from(new Set([...keys]))
             const topLevelNodes = this.authList.map(i=>i.MenuId)
             let nodeLength = 0
             topLevelNodes.forEach(i=>{

src/views/business_ETA_manage/businessList.vue

@@ -213,6 +213,10 @@ export default {
                 {
                     label:'已终止',
                     val:3
+                },
+                {
+                    label:'待签约',
+                    val:4
                 }
             ],
             /* sort options */

src/views/contract_manage/components/allocationDetail.vue

@@ -0,0 +1,158 @@
+<template>
+  <el-dialog
+    :title="allocationDetailForm.isDlgType == '关联合同' ? '打分详情' : '派点详情'"
+    width="1200px"
+    :visible.sync="allocationDetailVisible"
+    v-dialogDrag
+    :close-on-click-modal="false"
+    :modal-append-to-body="false"
+    center
+    @close="handleClose"
+    :append-to-body="true"
+    custom-class="allocation-detail-content_rai"
+  >
+    <p>总点数：{{ allNum }}</p>
+    <div class="content-box-table-detail">
+      <div class="table-cont table-cont-top">
+        <div style="display: flex" v-for="item in datalist" :key="item.ChartPermissionName">
+          <div :class="['head-column', 'head-column-item']" style="font-weight: 800;font-size:16px">
+            {{ item.ChartPermissionName }}
+          </div>
+          <div :class="['head-column', 'head-column-item-Proportion']">
+            {{ item.Money }}
+          </div>
+        </div>
+      </div>
+      <div class="table-cont">
+        <div v-for="(item, index) in datalist" :key="index">
+          <div style="display: flex" v-for="rs in item.List" :key="rs.RealName" class="content-ul">
+            <div style="background-color: #fff" :class="['head-column', 'head-column-item']">{{ rs.name }}</div>
+            <div style="background-color: #fff" :class="['head-column', 'head-column-item-Proportion']">{{ rs.val }}</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="handleClose">取 消</el-button>
+      <el-button v-if="allocationDetailForm.isDlgType != '关联合同'" :disabled="IsGray" type="primary" @click="addAllocationHandler">修 改</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { contractInterface } from "@/api/api.js";
+
+export default {
+  name: "",
+  components: {},
+  props: {
+    allocationDetailVisible: {
+      type: Boolean,
+      default: true,
+    },
+    allocationDetailForm: {
+      type: Object,
+      default: {},
+    },
+  },
+  data() {
+    return {
+      datalist: [],
+      IsGray: false,
+      allNum: "",
+    };
+  },
+  computed: {},
+  watch: {
+    allocationDetailVisible: {
+      handler(newVal) {
+        newVal && this.getList();
+      },
+      immediate: true,
+      deep: true,
+    },
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    // 关闭弹框
+    handleClose() {
+      this.datalist = [];
+   
+      this.$emit("update:allocationDetailForm", {});
+      this.$emit("update:allocationDetailVisible", false);
+    },
+    // 点击修改的事件
+    addAllocationHandler() {
+      if (this.IsGray) return;
+      this.handleClose();
+      this.$emit("allocationDetailList", this.allocationDetailForm);
+    },
+    processingData() {
+      for (let index = 0; index < this.datalist.length; index++) {}
+    },
+    // 获取数据
+    async getList() {
+      const res = await contractInterface.getAllocationDetail({
+        CompanyContractId: this.allocationDetailForm.CompanyContractId,
+        ShowDetail: true,
+      });
+      if (res.Ret === 200) {
+        this.IsGray = res.Data.IsGray;
+        let maxLength = 0;
+        res.Data.List &&
+          res.Data.List.forEach((item) => {
+            if (maxLength < item.List.length) {
+              maxLength = item.List.length;
+            }
+          });
+        res.Data.List &&
+          res.Data.List.forEach((item) => {
+            for (let index = 0; index < maxLength; index++) {
+              item.List[index] = {
+                name: item.List[index] ? item.List[index].RealName : "",
+                val: item.List[index] ? item.List[index].Money : "",
+              };
+            }
+          });
+        this.datalist = res.Data.List;
+        this.allNum = res.Data.TotalPointsContent;
+      }
+    },
+  },
+};
+</script>
+<style lang="scss">
+.allocation-detail-content_rai {
+  .content-box-table-detail {
+    position: relative;
+    margin-top: 20px;
+    .table-cont-top {
+      position: sticky;
+      top: 0;
+      left: 0;
+    }
+    .table-cont {
+      display: flex;
+    }
+    .head-column {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border: 1px solid #dcdfe6;
+      background-color: #ebeef5;
+      color: #333333;
+      margin-top: -1px;
+      margin-left: -0.5px;
+    }
+    .head-column-item {
+      width: 107px;
+      height: 48px;
+    }
+    .head-column-item-Proportion {
+      width: 73px;
+      height: 48px;
+    }
+  }
+}
+</style>

src/views/contract_manage/components/allocationLable.vue

@@ -0,0 +1,119 @@
+<template>
+  <div>
+    <el-table border :data="tableList">
+      <el-table-column align="center" prop="ContractCode" label="合同编号" width="160">
+        <template slot-scope="{ row }">
+          <span class="editsty" @click="lookContractHandler(row)">{{ row.ContractCode }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="FormalType" label="转正类型" width="90"> </el-table-column>
+      <el-table-column align="center" prop="ContractType" label="合同类型" width="100"></el-table-column>
+      <el-table-column align="center" prop="CompanyName" label="公司名称">
+        <template slot-scope="{ row }">
+          <span class="editsty" @click="lookCompanyNameHandler(row)">{{ row.CompanyName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="SellerName" label="所属销售" width="90"> </el-table-column>
+      <el-table-column align="center" prop="Money" label="合同金额" width="130"> </el-table-column>
+      <el-table-column align="center" prop="StartDate" label="合同期限" width="200">
+        <template slot-scope="{ row }">
+          <span>{{ `${row.StartDate} - ${row.EndDate}` }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="PermissionName" label="签约套餐" width="200">
+        <template slot-scope="{ row }">
+          <el-tag style="margin: 0 10px 5px 0" v-for="item in row.PermissionName.split(',')" :key="item" size="mini">{{ item }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="IsAllocation" label="状态" width="90" v-if="!typeLable">
+        <template slot-scope="{ row }">
+          <span :style="{ color: row.IsAllocation == 0 ? '#FF8A00' : row.IsAllocation == 1 ? '#67C23A' : '' }">{{ row.IsAllocation == 0 ? "未派点" : row.IsAllocation == 1 ? "已派点" : "" }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="MoneyPoint" label="获得派点" width="90" v-if="typeLable"> </el-table-column>
+      <el-table-column align="center" prop="ContractCode" label="操作" v-if="!typeLable">
+        <template slot-scope="{ row }">
+          <span v-if="row.IsAllocation == 0" :class="row.IsGray ? '' : 'editsty'" @click="allocationDetail(row)">派点</span>
+          <span v-if="row.IsAllocation == 1" class="editsty" @click="detailsHandler(row)">派点详情</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="ContractCode" width="110" label="派点详情" v-if="typeLable">
+        <template slot-scope="{ row }">
+          <span class="editsty" @click="detailsHandler(row)">查看</span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { dataMainInterface, customInterence, contractInterface } from "@/api/api.js";
+export default {
+  name: "",
+  components: {},
+  props: {
+    tableList: {
+      type: Array,
+      default: [],
+    },
+    typeLable: {
+      type: String,
+      default: "",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    // 查看合同
+    async lookContractHandler(item) {
+      if (item.FormalType == "非标") {
+        const loading = this.$loading({
+          lock: true,
+          text: "Loading",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)",
+        });
+        const res = await contractInterface.getHistoryDetail({
+          ContractCode: item.ContractCode,
+        });
+        if (res.Ret === 200) {
+          this.$emit("isPreviewHistoryDetail", res);
+          loading.close();
+        }
+      } else {
+        let { href } = this.$router.resolve({
+          path: "/contractdtl",
+          query: { contractid: item.ContractId },
+        });
+        window.open(href, "_blank");
+      }
+    },
+
+    // 查看公司详情
+    lookCompanyNameHandler(item) {
+      const { href } = this.$router.resolve({
+        path: "/customDetail",
+        query: {
+          id: item.CompanyId,
+        },
+      });
+      window.open(href, "_blank");
+    },
+    // 派点详情
+    detailsHandler(item) {
+      this.$emit("allocationDetail", item);
+    },
+    // 派点
+    allocationDetail(item) {
+      if (item.IsGray) return;
+      this.$emit("allocationDetailList", item);
+    },
+  },
+};
+</script>
+<style scoped lang=""></style>

src/views/contract_manage/components/allocationNumber.vue

@@ -0,0 +1,229 @@
+<template>
+  <div class="container-allocation-number-rai">
+    <el-dialog title="派点" width="1300px" :visible.sync="allocationVisible" v-dialogDrag :close-on-click-modal="false" :modal-append-to-body="false" center @close="handleClose">
+      <div class="top-content">
+        <div>
+          <h5>总点数：{{ TotalPointsContent }}</h5>
+          <el-button style="margin-top: 20px" type="primary" size="mini" @click="averageaAllocation">平均分配</el-button>
+        </div>
+
+        <p>
+          1）单行业套餐只能在对应行业内部分配研究员贡献百分比<br />
+          2）多行业套餐先在行业间分配百分比（最低不低于平均值的一半），再分配到个人<br />
+          3）允许总额20%以内的负分<br />
+          4）转正后一个季度内可以提交和修改
+          <br />
+        </p>
+      </div>
+      <div class="content-box">
+        <div v-for="item in listArr" :key="item.ChartPermissionName">
+          <div class="industry-ul">
+            <span :class="['industry-name', item.ChartPermissionName == '买方研选' && 'name-yanxuan']">{{ item.ChartPermissionName }}</span>
+            <template v-if="item.ChartPermissionName !== '买方研选'">
+              <el-input :min="-100" :max="100" type="number" v-model="item.Proportion" size="small" @input="restrictInput(item)" style="width: 76px; margin: 0 5px 0 8px">
+                <div class="per_cent_" slot="suffix">%</div>
+              </el-input>
+              <p style="width: 38px">{{ roundedResult(item) }}</p>
+            </template>
+            <p style="width: 38px; height: 32px; line-height: 32px; text-align: center" v-else>{{ item.Money }}</p>
+          </div>
+          <div v-for="study in item.List" :key="study.RealName" class="industry-ul">
+            <span :class="['study-name', item.ChartPermissionName == '买方研选' && 'name-yanxuan']">{{ study.RealName }}</span>
+            <template v-if="study.RealName !== '买方研选'">
+              <el-input :min="-100" :max="100" type="number" v-model="study.Proportion" size="small" style="width: 76px; margin: 0 5px 0 8px">
+                <div class="per_cent_" slot="suffix">%</div>
+              </el-input>
+              <p style="width: 38px">{{ roundedResult(study) }}</p>
+            </template>
+            <p style="width: 38px; height: 32px; line-height: 32px; text-align: center" v-else>{{ study.Money }}</p>
+          </div>
+          <div class="all-item" v-if="item.ChartPermissionName != '买方研选'">
+            <span> {{ allPerCentHandler(item) == 0 ? "" : `总占比：` }}</span>
+            <span> {{ allPerCentHandler(item) == 0 ? "" : `${allPerCentHandler(item)}` }}</span>
+          </div>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleClose">取 消</el-button>
+        <el-button type="primary" @click="addAllocationHandler">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { contractInterface } from "@/api/api.js";
+
+export default {
+  name: "",
+  components: {},
+  props: {
+    allocationVisible: {
+      default: false,
+      type: Boolean,
+    },
+    allocationForm: {
+      type: Object,
+      default: {},
+    },
+  },
+  data() {
+    return {
+      listArr: [],
+      allNum: 0,
+      TotalPointsContent: "",
+    };
+  },
+  computed: {},
+  watch: {
+    allocationVisible: {
+      handler(newVal) {
+        newVal && this.getList();
+      },
+      immediate: true,
+    },
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    // 取消弹框
+    handleClose() {
+      this.listArr = [];
+      this.$emit("update:allocationForm", {});
+      this.$emit("update:allocationVisible", false);
+    },
+    // 提交弹框
+    async addAllocationHandler() {
+      this.listArr.forEach((item) => {
+        item.Money = Number(item.Money) || 0;
+        item.Proportion = Number(item.Proportion) || 0;
+        item.List.forEach((_) => {
+          _.Money = Number(_.Money) || 0;
+          _.Proportion = Number(_.Proportion) || 0;
+        });
+      });
+      let arrList = this.listArr;
+      const res = await contractInterface.getAllocationDetailUpdate({
+        CompanyContractId: this.allocationForm.CompanyContractId,
+        List: arrList,
+      });
+      if (res.Ret === 200) {
+        this.$message.success("操作成功");
+        this.$parent.getTableData();
+        this.handleClose();
+      }
+    },
+    // 处理百分比
+    roundedResult(row) {
+      let num = row.Proportion >= 0 ? (row.Proportion * 100) / 100 / 100 : row.Proportion / 100;
+      row.Money = row.Proportion ? (this.allNum * num).toFixed(2) : "";
+      return row.Money;
+    },
+    // 输入框的限制
+    restrictInput(item) {
+      if (item.Proportion > 100) return (item.Proportion = 100);
+      if (item.Proportion < -100) return (item.Proportion = -100);
+    },
+    // 数量的总和
+    allPerCentHandler(item) {
+      let num = 0;
+      item && item.List.forEach((key) => (num = num + +key.Proportion));
+      return num.toFixed(2);
+    },
+    // 获取数据
+    async getList() {
+      const res = await contractInterface.getAllocationDetail({
+        CompanyContractId: this.allocationForm.CompanyContractId,
+      });
+      if (res.Ret === 200) {
+        this.allNum = res.Data.Money;
+        this.listArr = res.Data.List;
+        this.TotalPointsContent = res.Data.TotalPointsContent;
+      }
+    },
+    // 平均分配
+    averageaAllocation() {
+      let isName = this.listArr.some((item) => item.ChartPermissionName == "买方研选");
+      let num = 100 / (isName ? this.listArr.length - 1 : this.listArr.length);
+      this.listArr.forEach((item) => {
+        if (item.ChartPermissionName != "买方研选") {
+          item.Proportion = num;
+        }
+        let childrenNum = num / item.List.length;
+        item.List.forEach((key) => {
+          if (key.RealName != "买方研选") {
+            key.Proportion = childrenNum;
+          }
+        });
+      });
+    },
+  },
+};
+</script>
+<style lang="scss">
+.container-allocation-number-rai {
+  overflow: hidden;
+  .top-content {
+    display: flex;
+    justify-content: space-between;
+  }
+  .content-box {
+    display: flex;
+    .industry-ul {
+      display: flex;
+      align-items: center;
+      margin: 30px 0;
+      width: 180px;
+      color: #333;
+      margin-right: 35px;
+      .per_cent_ {
+        line-height: 32px;
+      }
+      .industry-name {
+        width: 58px;
+        flex-shrink: 0;
+        font-weight: 800;
+        font-size: 16px;
+        line-height: 22px;
+      }
+      .study-name {
+        width: 58px;
+        flex-shrink: 0;
+        font-size: 14px;
+        line-height: 22px;
+      }
+      p {
+        color: #9999;
+        font-size: 14px;
+      }
+    }
+  }
+  .all-item {
+    display: flex;
+    padding-right: 15px;
+    align-items: center;
+    // justify-content: center;
+    color: #999;
+    font-size: 14px;
+    span {
+      display: inline-block;
+      width: 80px;
+    }
+  }
+  .name-yanxuan {
+    width: 65px !important;
+  }
+  /* 取消[type='number']的input的上下箭头 */
+  input::-webkit-inner-spin-button {
+    -webkit-appearance: none !important;
+  }
+
+  input::-webkit-outer-spin-button {
+    -webkit-appearance: none !important;
+  }
+
+  input[type="number"] {
+    -moz-appearance: textfield;
+  }
+}
+</style>

src/views/contract_manage/components/raiHistoryContract.vue

@@ -0,0 +1,319 @@
+<template>
+  <!-- 历史签约弹窗 -->
+  <div>
+    <el-dialog
+      :visible.sync="isPreview"
+      custom-class="history-contract-wrap-content_rai"
+      append-to-body="true"
+      :modal-append-to-body="false"
+      @close="closePreview"
+      title="历史签约"
+      center
+      top="7vh"
+      v-dialogDrag
+      width="1200px"
+    >
+      <div class="dialog-wrap">
+        <div class="contract-list">
+          <div class="contract-item" v-for="(item, index) in contractList" :key="item.ContractCode">
+            <div class="contract-tag">
+              <el-tag>
+                {{ item.ContractType }}
+                <el-tooltip class="item" effect="dark" v-if="item.ContractType != '补充协议'" placement="top-start">
+                  <div slot="content" v-if="item.ContractType == '新签合同'">没有正式转试用记录的客户，在申请转正时提交的合同</div>
+                  <div slot="content" v-if="item.ContractType == '续约合同'">
+                    1、有正式转试用记录的客户，在申请转正时提交的合同<br />
+                    2、所有客户在续约申请时提交的合同
+                  </div>
+                  <i class="el-icon-info"></i>
+                </el-tooltip>
+              </el-tag>
+              <span :style="{ 'text-decoration-line': item.ContractId ? 'underline' : 'none' }" @click="toContractDetail(item)">合同编号：{{ item.ContractCode }}</span>
+            </div>
+            <div class="line"></div>
+            <!-- 合同基本信息 -->
+            <div class="contract-base">
+              <ul class="base-lise">
+                <li>
+                  <p>合同期限：{{ item.StartDate + "~" + item.EndDate }}</p>
+                  <p>合同金额：{{ item.Money }}</p>
+                </li>
+                <li>
+                  <p>付款方式：{{ item.PayMethod }}</p>
+                  <p>付款渠道：{{ item.PayChannel }}</p>
+                </li>
+                <li>
+                  <p>审批时间：{{ item.ModifyTimeStr | formatTime }}</p>
+                  <p></p>
+                </li>
+              </ul>
+            </div>
+            <!-- 权限设置和查看附件 -->
+            <div class="contract-info">
+              <div @click="showExpand(index, 'root')">
+                权限设置 <span><i :class="item.extend ? 'el-icon-arrow-down' : 'el-icon-arrow-right'"></i></span>
+              </div>
+            </div>
+            <div class="contract-root" v-show="item.extend">
+              <ul class="menu_lists">
+                <li v-for="auth in item.PermissionList" :key="auth.ClassifyName" class="menu_item">
+                  <el-checkbox :indeterminate="auth.CheckList.length > 0 && auth.CheckList.length < auth.Items.length" v-model="auth.CheckAll" disabled style="marginright: 30px; fontweight: bold">{{
+                    auth.ClassifyName + ":"
+                  }}</el-checkbox>
+                  <el-checkbox-group v-model="auth.CheckList" disabled>
+                    <el-checkbox v-for="list in auth.Items" :label="list.ChartPermissionId" :key="list.ChartPermissionId" class="list_item">{{ list.PermissionName }}</el-checkbox>
+                  </el-checkbox-group>
+                </li>
+              </ul>
+            </div>
+            <div class="contract-info">
+              <div @click="showExpand(index, 'files')">
+                合同附件 <span><i :class="item.filesExtend ? 'el-icon-arrow-down' : 'el-icon-arrow-right'"></i></span>
+              </div>
+            </div>
+            <div class="contract-files" v-show="item.filesExtend">
+              <ul class="file-list">
+                <li v-for="img in item.constractFiles" :key="img">
+                  <img :src="require('@/assets/img/constract/word-icon.png')" v-if="img.type == 'word'" @click="preViewConstractFile(img)" />
+                  <img :src="require('@/assets/img/constract/pdf.png')" v-else-if="img.type == 'pdf'" @click="preViewConstractFile(img)" />
+                  <img :src="img.url" v-else-if="img.type == 'img'" @click="preViewConstractFile(img, item.constractFiles)" />
+                </li>
+              </ul>
+            </div>
+          </div>
+          <span v-if="!contractList.length" style="font-size: 16px; color: #999">暂无历史合同</span>
+        </div>
+      </div>
+      <el-image-viewer
+        v-if="showViewer"
+        :on-close="
+          () => {
+            this.showViewer = false;
+          }
+        "
+        :url-list="constractFileImgList"
+      />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+export default {
+  props: {
+    isPreview: {
+      type: Boolean,
+      default: false,
+    },
+    dealList: {
+      type: Array,
+      default: () => {
+        return [];
+      },
+    },
+  },
+  components: { ElImageViewer },
+  watch: {
+    isPreview(val) {
+      if (val) {
+        this.getContractList();
+      }
+    },
+  },
+  data() {
+    return {
+      ficcContractList: [],
+      raiContractList: [],
+      contractList: [],
+      contractType: "",
+      showViewer: false,
+      constractFileImgList: [],
+    };
+  },
+  methods: {
+    getContractList() {
+      this.ficcContractList = this.dealList.filter((i) => i.ProductId === 1);
+      this.raiContractList = this.dealList.filter((i) => i.ProductId === 2);
+      this.changeContractType("ficc");
+      if (!this.ficcContractList.length && this.raiContractList.length) {
+        this.changeContractType("rai");
+      }
+    },
+    changeContractType(type) {
+      if (this.contractType === type) return;
+      this.contractType = type;
+      type === "ficc" && (this.contractList = this.ficcContractList);
+      type === "rai" && (this.contractList = this.raiContractList);
+    },
+    showContractFiles(data) {
+      this.constractFileImgList = [];
+      const { constractFiles } = data;
+      const imageList = constractFiles.filter((i) => i.type === "img");
+      const wordList = constractFiles.filter((i) => i.type === "word");
+      const pdfList = constractFiles.filter((i) => i.type === "pdf");
+      imageList.forEach((i) => {
+        this.constractFileImgList.push(i.url);
+      });
+      if (this.constractFileImgList.length) {
+        this.showViewer = true;
+      }
+    },
+    preViewConstractFile(data, list = []) {
+      this.constractFileImgList = [];
+      if (data.type === "word") {
+        window.open("https://view.officeapps.live.com/op/view.aspx?src=" + data.url, "_blank");
+      }
+      if (data.type === "pdf") {
+        window.open(data.url);
+      }
+      if (data.type === "img") {
+        //改变list的顺序,当前点击的为第一个
+        list
+          .filter((i) => i.type === "img")
+          .map((i) => {
+            this.constractFileImgList.push(i.url);
+          });
+        const index = this.constractFileImgList.findIndex((url) => url === data.url);
+        this.constractFileImgList = [...this.constractFileImgList.slice(index), ...this.constractFileImgList.slice(0, index)];
+        if (this.constractFileImgList.length) {
+          this.showViewer = true;
+        }
+      }
+    },
+    showExpand(index, type = "root") {
+      type === "root" && (this.contractList[index].extend = !this.contractList[index].extend);
+      type === "files" && (this.contractList[index].filesExtend = !this.contractList[index].filesExtend);
+      this.contractList.splice(index, 1, this.contractList[index]);
+    },
+    toContractDetail(item) {
+      if (!item.ContractId) return;
+      const { href } = this.$router.resolve({ path: "/contractdetail", query: { contractId: item.ContractId } }) || { href: "" };
+      href && window.open(href, "_blank");
+    },
+    closePreview() {
+      this.$emit("update:isPreview", false);
+      this.$emit("update:dealList", []);
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.history-contract-wrap-content_rai {
+  .dialog-wrap {
+    padding: 5px 60px 30px 60px;
+    .contract-tab {
+      display: flex;
+      margin-bottom: 30px;
+      span {
+        flex: 1;
+        text-align: center;
+        font-size: 16px;
+        padding-bottom: 5px;
+        cursor: pointer;
+        &.active {
+          color: #0052d9;
+          border-bottom: 2px solid #0052d9;
+        }
+      }
+    }
+    .contract-list {
+      max-height: 600px;
+      min-height: 200px;
+      overflow-y: auto;
+      padding-right: 6px;
+      .contract-item {
+        padding: 20px;
+        border: 1px solid #dcdfe6;
+        border-radius: 4px;
+        margin-bottom: 30px;
+        display: flex;
+        flex-direction: column;
+        gap: 20px 0;
+        .contract-tag {
+          span {
+            cursor: pointer;
+            &:last-child {
+              margin-left: 12px;
+            }
+            font-size: 16px;
+            color: #409eff;
+          }
+        }
+        .line {
+          height: 1px;
+          background-color: #dcdfe6;
+          margin: 0 -20px;
+        }
+        .contract-base {
+          li {
+            display: flex;
+            border: 1px solid #dcdfe6;
+            border-bottom: none;
+            &:last-child {
+              border-bottom: 1px solid #dcdfe6;
+            }
+            p {
+              font-size: 16px;
+              flex: 1;
+              min-height: 48px;
+              display: flex;
+              align-items: center;
+              margin-left: 20px;
+              &:first-child {
+                border-right: 1px solid #dcdfe6;
+              }
+            }
+          }
+        }
+        .contract-info {
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          div,
+          i::before {
+            font-size: 14px;
+            font-weight: bold;
+            color: #333333;
+            cursor: pointer;
+          }
+        }
+        .contract-root {
+          border: 2px dashed #dcdfe6;
+          border-radius: 4px;
+          padding: 20px;
+          .menu_lists {
+            li {
+              display: flex;
+              margin-bottom: 20px;
+              &:last-child {
+                margin-bottom: 0;
+              }
+            }
+          }
+        }
+        .contract-files {
+          .file-list {
+            display: flex;
+            gap: 10px;
+            flex-wrap: wrap;
+            li {
+              width: 240px;
+              height: 180px;
+              padding: 10px;
+              box-sizing: border-box;
+              cursor: pointer;
+              border-radius: 4px;
+              background-color: rgb(170, 170, 170);
+              img {
+                width: 100%;
+                height: 100%;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>

src/views/contract_manage/components/relatedContract.vue

@@ -0,0 +1,130 @@
+<template>
+  <el-dialog title="关联合同" width="90%" :append-to-body="true" :visible.sync="isShowDlg" v-dialogDrag :close-on-click-modal="false" :modal-append-to-body="false" center @close="handleClose">
+    <allocation-lable :tableList="datalist" typeLable="关联合同" @isPreviewHistoryDetail="isPreviewHistoryDetail" @allocationDetail="allocationDetail" />
+    <el-col :span="24" class="toolbar">
+      <m-page :total="total" :page_no="page_no" :pageSize="10" @handleCurrentChange="handleCurrentChange" />
+    </el-col>
+    <rai-history-contract :isPreview.sync="isPreview" :dealList.sync="dealList" />
+    <allocation-detail :allocationDetailVisible.sync="allocationDetailVisible" :allocationDetailForm.sync="allocationDetailForm" />
+  </el-dialog>
+</template>
+
+<script>
+import { contractInterface } from "@/api/api.js";
+import AllocationLable from "./allocationLable.vue";
+import mPage from "@/components/mPage.vue";
+import RaiHistoryContract from "./raiHistoryContract.vue";
+import AllocationDetail from "./allocationDetail.vue";
+export default {
+  name: "",
+  components: { AllocationLable, RaiHistoryContract, mPage, AllocationDetail },
+  props: {
+    isShowDlg: {
+      type: Boolean,
+      default: false,
+    },
+    listDlg: {
+      type: Object,
+      default: {},
+    },
+  },
+  data() {
+    return {
+      datalist: [],
+      page_no: 1,
+      total: 0, //条数
+      PageSize: 10, //每页显示几条
+      dealList: [],
+      isPreview: false,
+      allocationDetailVisible: false,
+      allocationDetailForm: {},
+    };
+  },
+  computed: {},
+  watch: {
+    isShowDlg: {
+      handler(newVal) {
+        newVal && this.getList();
+      },
+    },
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    // 关闭弹框
+    handleClose() {
+      this.$emit("update:isShowDlg", false);
+      this.$emit("update:listDlg", false);
+    },
+
+    // 获取数据
+    async getList() {
+      console.log(this.listDlg);
+      const res = await contractInterface.getAllocationContract({
+        ResearcherRealName: this.listDlg.RealName,
+        Keyword: this.listDlg.searchVal,
+        StartDate: this.listDlg.date[0] ? this.listDlg.date[0] : "",
+        EndDate: this.listDlg.date[1] ? this.listDlg.date[1] : "",
+        PageSize: this.PageSize,
+        CurrentIndex: this.page_no,
+      });
+      if (res.Ret === 200) {
+        this.datalist = res.Data.List;
+        this.total = res.Data.Paging.Totals;
+      }
+    },
+    // 非标准预览
+    isPreviewHistoryDetail(res) {
+      this.isPreview = true;
+      this.dealList = res.Data.List;
+    },
+    //分页
+    handleCurrentChange(page) {
+      this.page_no = page;
+      this.getList();
+    },
+    // 派点详情
+    allocationDetail(item) {
+      this.allocationDetailVisible = true;
+      this.allocationDetailForm = item;
+      this.allocationDetailForm.isDlgType = "关联合同";
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.content-box-table-detail {
+  height: 400px;
+  overflow: hidden;
+  overflow-y: auto;
+  position: relative;
+  margin-top: 20px;
+  .table-cont-top {
+    position: sticky;
+    top: 0;
+    left: 0;
+  }
+  .table-cont {
+    display: flex;
+  }
+  .head-column {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border: 1px solid #dcdfe6;
+    background-color: #ebeef5;
+    color: #333333;
+    font-weight: 500;
+    margin-top: -1px;
+    margin-left: -0.5px;
+  }
+  .head-column-item {
+    width: 107px;
+    height: 48px;
+  }
+  .head-column-item-Proportion {
+    width: 73px;
+    height: 48px;
+  }
+}
+</style>

src/views/contract_manage/raiAllocationPage.vue

@@ -0,0 +1,291 @@
+<template>
+  <div class="container rai-allocation-page">
+    <div class="dataReport-top">
+      <a :href="exportExcel" download>
+        <button class="button-sty act">导出EXCEL</button>
+      </a>
+      <button :class="['button-sty', { act: filterObj.month === item.label }]" v-for="item in monthLabel" @click="toggleMonth(item.label)" :key="item.label">
+        {{ item.label }}
+      </button>
+      <date-picker v-model="filterObj.date" type="date" range value-type="format" placeholder="自定义时间段" clearable :editable="false" :disabled-date="disabledBeforeToday" @change="dateChange" />
+      <el-input placeholder="请输入客户名称" v-model.trim="searchVal" style="width: 400px; margin-left: auto" @input="handleSearch" clearable>
+        <i slot="prefix" class="el-input__icon el-icon-search"></i>
+      </el-input>
+    </div>
+    <el-card style="margin-top: 20px">
+      <div style="margin-bottom: 30px">
+        <el-select v-model="filterObj.type" placeholder="转正类型" style="width: 230px; margin-right: 20px" clearable @change="changeFilter">
+          <el-option v-for="item in typeArr" :key="item" :label="item.label" :value="item.value"> </el-option>
+        </el-select>
+
+        <el-select v-model="filterObj.contractType" placeholder="合同类型" style="width: 230px; margin-right: 20px" clearable @change="changeFilter">
+          <el-option v-for="item in contractTypeArr" :key="item" :label="item.label" :value="item.value"> </el-option>
+        </el-select>
+        <el-cascader
+          v-model="filterObj.sale"
+          placeholder="请选择销售"
+          style="width: 230px; margin-right: 20px"
+          :options="salesArr"
+          :props="defaultSalesProps"
+          :show-all-levels="false"
+          collapse-tags
+          clearable
+          filterable
+          @change="changeFilter"
+        >
+        </el-cascader>
+        <el-select v-model="filterObj.status" placeholder="派点状态" style="width: 230px; margin-right: 20px" clearable @change="changeFilter">
+          <el-option v-for="item in typeArrStatus" :key="item" :label="item.label" :value="item.value"> </el-option>
+        </el-select>
+      </div>
+      <allocation-lable :tableList="tableList" @isPreviewHistoryDetail="isPreviewHistoryDetail" @allocationDetailList="allocationDetailList" @allocationDetail="allocationDetail" />
+      <el-col :span="24" class="toolbar">
+        <m-page :total="total" :page_no="page_no" :pageSize="10" @handleCurrentChange="handleCurrentChange" />
+      </el-col>
+    </el-card>
+    <allocation-number :allocationVisible.sync="allocationVisible" :allocationForm.sync="allocationForm" />
+    <allocation-detail @allocationDetailList="allocationDetailList" :allocationDetailVisible.sync="allocationDetailVisible" :allocationDetailForm.sync="allocationDetailForm" />
+    <rai-history-contract :isPreview.sync="isPreview" :dealList.sync="dealList" />
+  </div>
+</template>
+
+<script>
+import { dataMainInterface, customInterence, contractInterface } from "@/api/api.js";
+import AllocationLable from "./components/allocationLable.vue";
+import AllocationNumber from "./components/allocationNumber.vue";
+import AllocationDetail from "./components/allocationDetail.vue";
+import mPage from "@/components/mPage.vue";
+import RaiHistoryContract from "./components/raiHistoryContract.vue";
+
+var moment = require("moment");
+moment().format();
+export default {
+  name: "",
+  components: { AllocationLable, AllocationNumber, AllocationDetail, mPage, RaiHistoryContract },
+  props: {},
+  data() {
+    return {
+      /* 筛选条件 */
+      filterObj: {
+        month: "",
+        date: [],
+        type: "",
+        sale: "",
+        area: "",
+        status: "",
+        contractType: "",
+      },
+      monthLabel: [
+        {
+          label: "近1个月",
+        },
+        {
+          label: "近2个月",
+        },
+        {
+          label: "近3个月",
+        },
+      ],
+      searchVal: "",
+      typeArr: [
+        {
+          value: "非标",
+          label: "非标合同",
+        },
+        {
+          value: "标准",
+          label: "标准合同",
+        },
+      ],
+      typeArrStatus: [
+        {
+          value: "0",
+          label: "未派点",
+        },
+        {
+          value: "1",
+          label: "已派点",
+        },
+      ],
+      salesArr: [], //销售列表
+      contractTypeArr: [
+        {
+          value: "新签合同",
+          label: "新签合同",
+        },
+        {
+          value: "续约合同",
+          label: "续约合同",
+        },
+        {
+          value: "补充协议",
+          label: "补充协议",
+        },
+      ], // 合同类型
+      statusArr: [], // 派点状态
+      defaultSalesProps: {
+        multiple: true,
+        label: "RealName",
+        children: "ChildrenList",
+        value: "AdminId",
+      }, //销售级联配置
+      tableList: [],
+      allocationVisible: false, // 派点
+      allocationForm: {}, // 派点
+      allocationDetailVisible: false, // 派点详情
+      allocationDetailForm: {}, // 派点详情
+      page_no: 1,
+      total: 0, //条数
+      PageSize: 10, //每页显示几条
+      isPreview: false,
+      dealList: [],
+    };
+  },
+  computed: {
+    exportExcel() {
+      let baseUrl = process.env.API_ROOT + "/cygx/allocation/company_contract_list";
+      let token = localStorage.getItem("auth") || "";
+      let paramStr = "";
+      let salesArr = [];
+      if (this.filterObj.sale.length) {
+        salesArr = this.filterObj.sale.map((item) => {
+          return item[item.length - 1];
+        });
+      }
+      let obj = {
+        IsExport: true,
+        FormalType: this.filterObj.type,
+        ContractType: this.filterObj.contractType,
+        PageSize: this.PageSize,
+        CurrentIndex: this.page_no,
+        Keyword: this.searchVal,
+        AdminId: salesArr.join(","),
+        IsAllocation: this.filterObj.status,
+        StartDate: this.filterObj.date[0] ? this.filterObj.date[0] : "",
+        EndDate: this.filterObj.date[1] ? this.filterObj.date[1] : "",
+      };
+      for (let key in obj) {
+        paramStr = `${paramStr}&${key}=${obj[key]}`;
+      }
+      return `${baseUrl}?${token}${paramStr}`;
+    },
+  },
+  watch: {},
+  created() {},
+  mounted() {
+    this.getSale();
+    this.getTableData();
+  },
+  methods: {
+    /* 切换月份 */
+    toggleMonth(label) {
+      this.filterObj.month = label;
+      let days = label == "近1个月" ? 1 : label == "近2个月" ? 2 : label == "近3个月" ? 3 : 0;
+      this.filterDate(days);
+    },
+    /* 获取近几个月的日期范围 */
+    filterDate(month) {
+      if (month) {
+        let date_now = moment().format("YYYY-MM-DD");
+        let date_after = moment().add(-month, "M").format("YYYY-MM-DD");
+        let date = [date_after, date_now];
+        this.start_date = date_now;
+        this.end_date = date_after;
+        this.filterObj.date = date;
+        this.page_no = 1;
+        this.searchVal = "";
+        this.getTableData();
+      }
+    },
+    /* 获取销售 */
+    getSale() {
+      customInterence.getSale().then((res) => {
+        if (res.Ret === 200) {
+          this.salesArr = res.Data.List;
+        }
+      });
+    },
+    async getTableData() {
+      let salesArr = [];
+      if (this.filterObj.sale.length) {
+        salesArr = this.filterObj.sale.map((item) => {
+          return item[item.length - 1];
+        });
+      }
+      const res = await contractInterface.getAllocationContract({
+        FormalType: this.filterObj.type,
+        ContractType: this.filterObj.contractType,
+        PageSize: this.PageSize,
+        CurrentIndex: this.page_no,
+        Keyword: this.searchVal,
+        AdminId: salesArr.join(","),
+        IsAllocation: this.filterObj.status,
+        StartDate: this.filterObj.date[0] ? this.filterObj.date[0] : "",
+        EndDate: this.filterObj.date[1] ? this.filterObj.date[1] : "",
+      });
+      if (res.Ret === 200) {
+        this.tableList = res.Data.List;
+        this.total = res.Data.Paging.Totals;
+      }
+    },
+    changeFilter() {
+      this.page_no = 1;
+      this.getTableData();
+    },
+    handleSearch() {
+      this.getTableData();
+    },
+    //分页
+    handleCurrentChange(page) {
+      this.page_no = page;
+      this.getTableData();
+    },
+    // 非标准预览
+    isPreviewHistoryDetail(res) {
+      this.isPreview = true;
+      this.dealList = res.Data.List;
+    },
+    // 派点
+    allocationDetailList(item) {
+      this.allocationForm = item;
+      this.allocationVisible = true;
+    },
+    // 派点详情
+    allocationDetail(item) {
+      this.allocationDetailVisible = true;
+      this.allocationDetailForm = item;
+    },
+    /* 选择日期 */
+    dateChange(e) {
+      this.page_no = 1;
+      this.getTableData();
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.rai-allocation-page {
+  .dataReport-top {
+    display: flex;
+    align-items: center;
+    border: 1px solid #ececec;
+    padding: 20px 30px;
+    background: #fff;
+    border-radius: 4px;
+    box-shadow: 0 3px 6px rgba(0, 0, 0, 0.05);
+    .button-sty {
+      margin-right: 20px;
+      border: none;
+      padding: 6px 12px;
+      background: #e0eefd;
+      color: #2d8cf0;
+      cursor: pointer;
+      border-radius: 4px;
+      &.act {
+        background: #409eff;
+        color: #fff;
+      }
+    }
+  }
+}
+</style>

src/views/contract_manage/researcherStatistics.vue

@@ -0,0 +1,265 @@
+<template>
+  <div class="container researcher-statistics">
+    <div class="dataReport-top">
+      <a :href="exportExcel" download>
+        <button class="button-sty act">导出EXCEL</button>
+      </a>
+      <button :class="['button-sty', { act: filterObj.month === item.label }]" v-for="item in monthLabel" @click="toggleMonth(item.label)" :key="item.label">
+        {{ item.label }}
+      </button>
+      <date-picker v-model="filterObj.date" type="date" range value-type="format" placeholder="自定义时间段" clearable :editable="false" :disabled-date="disabledBeforeToday" @change="dateChange" />
+      <el-input placeholder="合同编号/客户名称/社会信用码" v-model="searchVal" style="width: 400px; margin-left: auto" @input="handleSearch" clearable>
+        <i slot="prefix" class="el-input__icon el-icon-search"></i>
+      </el-input>
+    </div>
+    <el-card style="margin-top: 20px">
+      <div class="table-cont">
+        <table>
+          <thead>
+            <tr>
+              <td v-for="(item, index) in tableTheadColumns" :key="item" :class="['head-column', index > 0 && 'head-column-item']">
+                {{ item }}
+              </td>
+            </tr>
+          </thead>
+        </table>
+
+        <div class="table-body-wrapper">
+          <table>
+            <tbody v-for="(item, index) in datalist" :key="index">
+              <tr>
+                <td :rowspan="item.List.length + 1" class="thead-rs">{{ item.ChartPermissionName }}</td>
+              </tr>
+              <tr v-for="rs in item.List" :key="rs.RealName" class="content-ul">
+                <td>{{ rs.RealName }}</td>
+                <td @click="lookDetailsHadelr(rs)" :class="[rs.RealName == '合计' || rs.RealName == '平均' ? '' : 'association']">{{ rs.TotalRelatedContract }}</td>
+                <td>{{ rs.TotalDispatchPoint }}</td>
+                <td>{{ rs.GroupProportion }}</td>
+                <td>{{ rs.DepartmentProportion }}</td>
+              </tr>
+            </tbody>
+
+            <tfoot>
+              <tr>
+                <td colspan="2">部门合计</td>
+                <td>{{ TotalContract }}</td>
+                <td>{{ TotalMoney }}</td>
+                <td>--</td>
+                <td>100%</td>
+              </tr>
+            </tfoot>
+          </table>
+        </div>
+      </div>
+    </el-card>
+    <related-contract :isShowDlg.sync="isShowDlg" :listDlg.sync="listDlg" />
+  </div>
+</template>
+
+<script>
+import { dataMainInterface, customInterence, contractInterface } from "@/api/api.js";
+import RelatedContract from "./components/relatedContract.vue";
+var moment = require("moment");
+moment().format();
+export default {
+  name: "",
+  components: { RelatedContract },
+  props: {},
+  data() {
+    return {
+      /* 筛选条件 */
+      filterObj: {
+        month: "",
+        date: [],
+        type: "",
+        sale: "",
+        area: "",
+      },
+      searchVal: "",
+      monthLabel: [
+        {
+          label: "近1个月",
+        },
+        {
+          label: "近2个月",
+        },
+        {
+          label: "近3个月",
+        },
+      ],
+      tableTheadColumns: ["组别", "研究员", "关联合同", "总派点", "组内占比", "部门占比"],
+      datalist: [],
+      isShowDlg: false,
+      listDlg: {},
+      TotalMoney: "",
+      TotalContract: "",
+    };
+  },
+  computed: {
+    exportExcel() {
+      let baseUrl = process.env.API_ROOT + "/cygx/allocation/statistics";
+      let token = localStorage.getItem("auth") || "";
+      let paramStr = "";
+      let obj = {
+        StartDate: this.filterObj.date[0] ? this.filterObj.date[0] : "",
+        EndDate: this.filterObj.date[1] ? this.filterObj.date[1] : "",
+        Keyword: this.searchVal,
+        IsExport: true,
+      };
+      for (let key in obj) {
+        paramStr = `${paramStr}&${key}=${obj[key]}`;
+      }
+      return `${baseUrl}?${token}${paramStr}`;
+    },
+  },
+  watch: {},
+  created() {},
+  mounted() {
+    this.getTableData();
+  },
+  methods: {
+    /* 切换月份 */
+    toggleMonth(label) {
+      this.filterObj.month = label;
+      let days = label == "近1个月" ? 1 : label == "近2个月" ? 2 : label == "近3个月" ? 3 : 0;
+      this.filterDate(days);
+    },
+    /* 获取近几个月的日期范围 */
+    filterDate(month) {
+      if (month) {
+        let date_now = moment().format("YYYY-MM-DD");
+        let date_after = moment().add(-month, "M").format("YYYY-MM-DD");
+        let date = [date_after, date_now];
+        this.start_date = date_now;
+        this.end_date = date_after;
+        this.filterObj.date = date;
+        this.page_no = 1;
+        this.searchVal = "";
+        this.getTableData();
+      }
+    },
+    async getTableData() {
+      const res = await contractInterface.getAllocationStatistic({
+        Keyword: this.searchVal,
+        StartDate: this.filterObj.date[0] ? this.filterObj.date[0] : "",
+        EndDate: this.filterObj.date[1] ? this.filterObj.date[1] : "",
+      });
+      if (res.Ret === 200) {
+        this.datalist = res.Data.List;
+        this.TotalContract = res.Data.TotalContract;
+        this.TotalMoney = res.Data.TotalMoney;
+      }
+    },
+    /* 选择日期 */
+    dateChange(e) {
+      this.page_no = 1;
+      this.getTableData();
+    },
+    // 查看关联合同数
+    lookDetailsHadelr(item) {
+      if (item.RealName == "合计" || item.RealName == "平均") return;
+      this.isShowDlg = true;
+      this.listDlg = {
+        ...item,
+        date: this.filterObj.date,
+        searchVal: this.searchVal,
+      };
+    },
+    handleSearch() {
+      this.getTableData();
+    },
+  },
+};
+</script>
+<style scoped lang="scss">
+.researcher-statistics {
+  * {
+    box-sizing: border-box;
+  }
+  .dataReport-top {
+    display: flex;
+    align-items: center;
+    border: 1px solid #ececec;
+    padding: 20px 30px;
+    background: #fff;
+    border-radius: 4px;
+    box-shadow: 0 3px 6px rgba(0, 0, 0, 0.05);
+    .button-sty {
+      margin-right: 20px;
+      border: none;
+      padding: 6px 12px;
+      background: #e0eefd;
+      color: #2d8cf0;
+      cursor: pointer;
+      border-radius: 4px;
+      &.act {
+        background: #409eff;
+        color: #fff;
+      }
+    }
+  }
+  .table-cont {
+    .table-body-wrapper {
+      max-height: calc(100vh - 340px);
+      margin-right: -6px;
+      overflow-y: scroll;
+      overflow-x: auto;
+      border-bottom: 1px solid #dcdfe6;
+      border-top: 1px solid #dcdfe6;
+    }
+    .head-column-item {
+      width: 15%;
+    }
+    table {
+      width: 100%;
+      font-size: 14px;
+      color: #666;
+      thead {
+        position: sticky;
+        top: 0;
+        left: 0;
+        border-left: 1px solid #dcdfe6;
+        border-right: 1px solid #dcdfe6;
+        td {
+          border: none;
+          outline-color: #dcdfe6;
+          outline-style: solid;
+          outline-width: 0.5px;
+        }
+      }
+      td,
+      th {
+        min-width: 35px;
+        // word-break: break-all;
+        border: 1px solid #dcdfe6;
+        height: 45px;
+        text-align: center;
+        background-color: #fff;
+      }
+
+      .head-column {
+        background-color: #f0f2f5;
+      }
+
+      .data-cell {
+        color: #409eff;
+        cursor: pointer;
+      }
+
+      .thead-sticky {
+        position: sticky;
+        top: 0;
+      }
+    }
+    .content-ul {
+      td {
+        width: 15%;
+      }
+      .association {
+        color: #409eff;
+        cursor: pointer;
+      }
+    }
+  }
+}
+</style>

src/views/custom_manage/compontents/ReadDialog.vue

@@ -20,7 +20,7 @@
 			</el-select>
 		</div>
 		<p style="margin:15px 0;">共有{{total}}条阅读记录</p>
-		<el-table :data="newList" border style="marginBottom:40px;" height="350">
+		<el-table :data="newList" border style="marginBottom:40px;" height="350" ref="reportTableRef">
 			<el-table-column align="center" label="标题">
 				<template slot-scope="scope">{{scope.row.ResearchReportName}}</template>
 			</el-table-column>
@@ -78,6 +78,10 @@ export default {
 			this.getReportList();
 		},
 		valueType(){
+			this.newList = [];
+			if(this.$refs.reportTableRef.bodyWrapper) {
+				this.$refs.reportTableRef.bodyWrapper.scrollTop = 0;
+			}
 			this.getReportList()
 		}
 	},
@@ -116,25 +120,31 @@ export default {
 				label: 'ficc'
 				}, 
 			],
-			total:0
+			total:0,
+
+			haveMore: false,
+			page_no: 1,
 		};
 	},
 	methods: {
 		cancelHandle() {
 			this.valueType=''
 			this.type = '';
-			this.newList = this.readList;
+			this.newList = [];
 			this.$emit('cancelRead');
 		},
 		getReportList() {
 			customInterence.readList({
 				UserId:Number(this.readId),
 				TxtType:this.valueType?Number(this.valueType):0,
+				LastViewTime: this.newList.length?this.newList[this.newList.length-1].CreatedTime:''
 			}).then(res => {
 				if(res.Ret === 200) {
 					this.total=res.Data.Total
-					this.readList = res.Data.List?res.Data.List:[];
-					this.newList = res.Data.List?res.Data.List:[];
+					this.haveMore = res.Data.List.length ? true : false;
+					this.newList = [...this.newList,...res.Data.List]
+
+					if(this.page_no===1) this.$refs.reportTableRef.bodyWrapper.addEventListener('scroll',this.loadMoreList);
 				}
 			})
 		},
@@ -146,7 +156,15 @@ export default {
 			}else {
 				this.newList = this.readList;
 			}
-		}
+		},
+
+		loadMoreList:_.throttle(function(){
+			const {scrollTop,clientHeight,scrollHeight} = this.$refs.reportTableRef.bodyWrapper
+      if(scrollTop + clientHeight >= scrollHeight-10 && this.haveMore){
+					this.page_no++;
+					this.getReportList();
+			} 
+		},300)
 	},
 	created() {},
 	mounted() {},

src/views/custom_manage/contractStatistics.vue

@@ -231,6 +231,10 @@ import {customInterence} from '@/api/api.js'
         customInterence.getSimpleServiceList().then(res=>{
           if(res.Ret!=200) return
           this.serviceList = res.Data || []
+          // 后端最外层的数据没有给 service_template_id 删除tag时会报错，手动加
+          this.serviceList.map((item,index) =>{
+            item.service_template_id = 500+index
+          })
         })
       },
       getList(){

src/views/interaction_manage/videoManage.vue

@@ -978,6 +978,7 @@ export default {
                 this.imgPopData.name=item.CoverName
                 this.imgPopData.imgUrl=item.CoverUrl
                 this.imgPopData.coverId=item.CommunityVideoCoverId
+                this.imgPopData.videoType=item.Type.toString()
             }
             this.showImgPop=true
             this.$nextTick(()=>{

src/views/login_manage/EmailModel.vue

@@ -63,7 +63,11 @@ export default {
         Source:{//请求验证码来源：1登陆
             type:Number,
             default:1
-        }
+        },
+        isMobile:{
+            type:Boolean,
+            default:false
+        },
     },
     data() {
         return {

src/views/login_manage/ForgetPassModel.vue

@@ -2,7 +2,8 @@
     <div class="forget-pass-model">
         <div class="header-nav" @click="changeModel">
             <span><i class="el-icon-back"></i></span>
-            <span>忘记密码</span>
+            <span v-if="!isMobile">忘记密码</span>
+            <span v-else>{{ forgetPassTextMobile }}</span>
         </div>
         <div class="step-container model-wrap" v-show="currentStep===0">
             <el-form 
@@ -40,7 +41,7 @@
                 <p>您正在找回账号{{form.account}}的密码</p>
                 <ModelSteps :active-step="currentStep"/>
             </div>
-            <div class="container-inner model-wrap" v-show="currentStep===1">
+            <div class="container-inner model-wrap" v-show="currentStep===1 && (!isMobile)">
                 <VerificationBox
                     verifies-type="mobile"
                     :info-text="userMobile||'暂未绑定'"
@@ -54,6 +55,24 @@
                     @goNext="getCode"
                 />
             </div>
+            <div v-show="currentStep===1 && isMobile">
+                <div class="verification-item" 
+                    :class="{'active':choosedWay==='mobile','disabled':!userMobile.length}" @click="choosedWay = 'mobile'">
+                    <!-- <div class="icon"> -->
+                        <img src="~@/assets/img/icons/phone-login-type.png" />
+                    <!-- </div> -->
+                    <div class="text">{{userMobile||'暂未绑定'}}</div>
+                </div>
+                <div class="verification-item"
+                    :class="{'active':choosedWay==='email','disabled':!userEmail.length}" @click="choosedWay = 'email'">
+                    <!-- <div class="icon"> -->
+                        <img src="~@/assets/img/icons/email-login-type.png" />
+                    <!-- </div> -->
+                    <div class="text">{{userEmail||'暂未绑定'}}</div>
+                </div>
+                <el-button class="verification-button" type="primary" round @click="getCode(choosedWay)"
+                v-show="userMobile.length || userEmail.length">获取验证码</el-button>
+            </div>
             <div class="container-inner" v-show="currentStep===2">
                 <CaptchaInput 
                     ref="captInput"
@@ -62,7 +81,6 @@
                     <el-button type="primary" plain @click="changeModel">上一步</el-button>
                     <el-button type="primary" @click="checkInput">下一步</el-button>
                 </div>
-                
             </div>
             <div class="container-inner model-wrap" v-show="currentStep===3">
                 <el-form 
@@ -114,6 +132,10 @@ export default {
         autoAccount:{//自动填写的账号,如果有,作为form.accout的初始值
             type:String,
             default:''
+        },
+        isMobile:{
+            type:Boolean,
+            default:false
         }
     },
     components: { VerificationBox, ModelSteps, CaptchaInput },
@@ -171,8 +193,25 @@ export default {
             checkPassStr:'确定',//重置密码按钮
             countDownNum:5,
             resetPassTimer:0,
+            choosedWay:'mobile',
         };
     },
+    computed:{
+        forgetPassTextMobile(){
+            switch (this.currentStep) {
+                case 0:
+                    return "忘记密码"
+                case 1:
+                    return "安全验证"
+                case 2:
+                    return "请输入验证码"
+                case 3:
+                    return "设置密码"
+                default:
+                    break;
+            }
+        }
+    },
     created(){
         this.getCodePic()
     },
@@ -335,5 +374,57 @@ export default {
             }
         }
     }
+    .verification-item{
+        display: flex;
+        align-items: center;
+        width:100%;
+        box-sizing: border-box;
+        padding:10px 15px;
+        margin-bottom: 30px;
+        border: 1px solid #DCDFE6;
+        border-radius: 8px;
+        background-color: #fff;
+        &.active{
+            border: 1px solid #0052D9;
+            background-color: #F2F3FF;
+        }
+        &.disabled{
+            user-select: none;
+            pointer-events: none;
+        }
+        img{
+            width: 40px;
+            margin-right: 10px;
+        }
+    }
+    .verification-button{
+        width: 100%;
+        margin-top: 20px;
+    }
+    @media screen and (max-width:650px) {
+        .header-nav{
+            font-size: 24px;
+        }
+        .submit_btn{
+            border-radius: 50px;
+        }
+        .step-container{
+            .container-header{
+                display: none;
+            }
+            .container-inner{
+                .btn-wrap{
+                    .el-button{
+                        width:100%;
+                        margin-left: 0;
+                        border-radius: 42px;
+                        &:first-child{
+                            margin-bottom: 30px;
+                        }
+                    }
+                }
+            }
+        }
+    }
 }
 </style>

src/views/login_manage/MobileModel.vue

@@ -72,7 +72,11 @@ export default {
         Source:{//请求验证码来源：1登陆
             type:Number,
             default:1
-        }
+        },
+        isMobile:{
+            type:Boolean,
+            default:false
+        },
     },
     data() {
         return {

src/views/login_manage/OrdinaryModel.vue

@@ -20,14 +20,16 @@
             </el-form-item>
             <el-form-item prop="checkPass">
                 <el-input
-                    type="password" show-password
+                    type="password" :show-password="isMobile?false:true"
                     v-model="form.checkPass"
                     auto-complete="off"
                     placeholder="请输入密码"
                     @copy.native.capture.prevent="()=>{return false}"
                     @cut.native.capture.prevent="()=>{return false}"
                     @paste.native.capture.prevent="()=>{return false}"
-                />
+                >
+                    <span slot="append" @click="changeModel" v-if="isMobile">忘记密码？</span>
+                </el-input>
                 <span class="inline-message el-form-item__error" 
                     v-show="(loginCheck||accountCheck)&&form.checkPass.length">
                     {{hintMessage}}</span>
@@ -59,7 +61,11 @@ export default {
         accountCheck:{
             type:Boolean,
             default:false
-        }
+        },
+        isMobile:{
+            type:Boolean,
+            default:false
+        },
     },
     data() {
         const validateClearn = (rule,value,callBack)=>{

src/views/login_manage/components/CaptchaInput.vue

@@ -105,4 +105,13 @@ export default {
 .active {
     border: 1px solid #3654C1 !important;
 }
+
+@media screen and (max-width:650px) {
+  .row-center {
+    gap:10px;
+  }
+  .captcha_input_box{
+    box-sizing: border-box;
+  }
+}
 </style>

src/views/login_manage/css/formStyle.scss

@@ -108,4 +108,48 @@
             font-size: 16px;
         }
     }
+}
+
+@media screen and (max-width:650px) {
+    .model-wrap{
+        margin-top: 60px;
+        .el-form-item{
+            margin-bottom: 40px;
+            .el-input{
+                .el-input-group__prepend{
+                    border: none;
+                    border-radius: 0;
+                    border-bottom:solid 1px #DCDFE6;
+                    width: 70px;
+                    .el-input--suffix{
+                        width: 40px;
+                        .el-input__suffix{
+                            display: none;
+                        }
+                    }
+                }
+                .el-input__inner{
+                    border-radius: 0;
+                    border: none;
+                    border-bottom:solid 1px #DCDFE6;
+                    padding-left: 0;
+                }
+                .el-input-group__append{
+                    background-color: transparent;
+                    border: none;
+                    border-radius: 0;
+                    border-bottom:solid 1px #DCDFE6;
+                    padding: 0;
+                    span{
+                        color:#257EFF ;
+                        font-size: 14px;
+                    }
+                }
+            }
+
+        }
+        .remember-cont{
+            display: none;
+        }
+    }
 }

src/views/rai_manage/reportManage/components/specialDlg.vue

@@ -0,0 +1,140 @@
+<template>
+  <div class="container special-dlg-container">
+    <el-dialog title="新建专栏作者" :visible.sync="addAuthorDlgVisible" width="500px" v-dialogDrag :close-on-click-modal="false" :modal-append-to-body="false" center @close="handleCloseAuthor">
+      <el-autocomplete
+        class="inline-input"
+        style="width: 100%; margin-bottom: 20px"
+        v-model="keyAuthor"
+        :fetch-suggestions="querySearchHandler"
+        @blur="changeHandler"
+        @select="selectCompany"
+        placeholder="请输入客户姓名"
+        :trigger-on-focus="false"
+      ></el-autocomplete>
+      <p v-show="!isShowKey" style="color: #f00">系统中无此人，请先将其添加到对应公司的联系人列表下</p>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleCloseAuthor">取 消</el-button>
+        <el-button type="primary" @click="addAuthorHandler">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog title="驳回" :visible.sync="submitRejectDlgVisible" width="500px" v-dialogDrag :close-on-click-modal="false" :modal-append-to-body="false" center @close="handleCloseReject">
+      <el-input type="textarea" :rows="4" style="margin-bottom: 20px" v-model.trim="textReject" placeholder="请输入驳回原因"></el-input>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="handleCloseReject">取 消</el-button>
+        <el-button type="primary" @click="submitRejectHandler">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { raiInterface } from "@/api/api.js";
+export default {
+  name: "",
+  components: {},
+  props: {
+    addAuthorDlgVisible: {
+      default: false,
+      type: Boolean,
+    },
+    submitRejectDlgVisible: {
+      default: false,
+      type: Boolean,
+    },
+    submitRejectId: {
+      default: 0,
+      type: Number,
+    },
+  },
+  data() {
+    return {
+      keyAuthor: "",
+      companyList: [],
+      textReject: "",
+      isShowKey: true,
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    // 关闭添加作者的弹框
+    handleCloseAuthor() {
+      this.keyAuthor = "";
+      this.$emit("update:addAuthorDlgVisible", false);
+    },
+    // 作者弹框的搜索事件
+    async querySearchHandler(query, cb) {
+      cb([]);
+      if (!query) return;
+      const res = await raiInterface.activitySignupUserList({ KeyWord: query });
+      if (res.Ret === 200) {
+        console.log(res);
+        let arr =
+          res.Data.List && res.Data.List.length
+            ? res.Data.List.map((item) => {
+                return {
+                  ...item,
+                  value: item.RealName + " - " + item.Mobile + " - " + item.CompanyName,
+                };
+              })
+            : [];
+        this.companyList = arr;
+        cb(arr);
+      }
+    },
+    // 作者添加的事件
+    async addAuthorHandler() {
+      const isKey = this.companyList.some((item) => item.value === this.keyAuthor);
+      if (!isKey) return this.$message.error("请输入客户姓名!");
+      let params = this.companyList.filter((item) => item.value === this.keyAuthor);
+      const res = await raiInterface.yanxuan_specialAuthorAdd({
+        UserId: params[0].UserId,
+        RealName: params[0].RealName,
+        Mobile: params[0].Mobile,
+      });
+      if (res.Ret === 200) {
+        this.handleCloseAuthor();
+        this.$message.success("添加成功！");
+        this.$parent.getAuthorList();
+      }
+    },
+    /* **************************************************** */
+    // 驳回的弹框关闭事件
+    handleCloseReject() {
+      this.textReject = "";
+      this.$emit("update:submitRejectDlgVisible", false);
+    },
+    // 驳回的弹框确定事件
+    async submitRejectHandler() {
+      if (!this.textReject) return this.$message.error("请输入驳回原因");
+      // 提交成功后刷新页面
+      const res = await raiInterface.yanxuan_specialEnable({
+        Id: this.submitRejectId,
+        Status: 2,
+        Reason: this.textReject,
+      });
+      if (res.Ret === 200) {
+        this.handleCloseReject();
+        this.$message.success("操作成功！");
+        this.$parent.getSpecialList();
+      }
+    },
+    changeHandler() {
+      if (!this.keyAuthor) return;
+      this.isShowKey = this.companyList.some((item) => item.value === this.keyAuthor);
+    },
+    selectCompany() {
+      this.isShowKey = this.companyList.some((item) => item.value === this.keyAuthor);
+    },
+  },
+};
+</script>
+<style lang="scss">
+.special-dlg-container {
+  .el-dialog .el-input {
+    width: 100%;
+  }
+}
+</style>

src/views/rai_manage/reportManage/yanXuanSpecial.vue

@@ -0,0 +1,356 @@
+<template>
+  <div class="container yanxuan-special_container">
+    <div class="author-content">
+      <div class="top">
+        <div>专栏作者</div>
+        <el-button type="primary" @click="addAuthorDlgVisible = true">新建作者</el-button>
+      </div>
+      <div class="author-ul">
+        <div class="author-li" v-for="item in authorInfoData" :key="item.Id">
+          <div class="avatar">
+            <img :src="item.HeadImg" alt="" />
+          </div>
+          <div class="info-content">
+            <p class="info-name">{{ item.RealName }} - {{ item.Mobile }}</p>
+            <p>昵称：{{ item.NickName }}</p>
+            <p>{{ item.CompanyName }}</p>
+          </div>
+          <div class="switch-box">
+            <el-switch style="display: block" @change="switchAuthorChange(item)" v-model="item.Status" :active-value="1" :inactive-value="2" active-color="#13ce66" inactive-color="#ff4949">
+            </el-switch>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="examine-content">
+      <p>待审核内容</p>
+      <template v-if="specialListData.length > 0">
+        <div class="content-box-examine" v-for="item in specialListData" :key="item.Id">
+          <div class="info-box" style="margin-bottom: 20px">
+            <div class="avatar">
+              <img :src="item.HeadImg" alt="" />
+            </div>
+            <div class="info-content">
+              <p class="info-name">{{ item.NickName || item.RealName }}</p>
+              <p>{{ item.PublishTime }}</p>
+            </div>
+          </div>
+          <div class="content-detial" v-html="item.Content"></div>
+          <div class="look-all-txt" v-if="item.ContentHasImg || item.isShowBtn" @click="lookAllDetails(item)">查看全文</div>
+          <div class="file-box" v-for="(key, indexs) in item.Docs" :key="indexs" @click="handleOperation(key)">
+            <img :src="key.DocIcon" alt="" />
+            {{ key.DocName }}.{{ key.DocSuffix }}
+          </div>
+          <div class="img-box">
+            <template v-if="item.ImgUrl">
+              <!-- <el-image style="width: 112px; height: 112px" fit="fill" v-for="(key, index) in item.ImgUrl.split(',')" :key="index" :src="key" :preview-src-list="item.ImgUrl.split(',')"> </el-image> -->
+              <img style="width: 112px; height: 112px" v-for="(key, index) in item.ImgUrl.split(',')" :key="index" :src="key" @click="showPreviewHandles(key)" />
+            </template>
+          </div>
+          <div>
+            <template v-if="item.Tags">
+              <div class="lable-li" v-for="(key, index) in item.Tags.split(',')" :key="index">{{ key }}</div>
+            </template>
+          </div>
+          <div class="bottom-button">
+            <div @click="submitRejectDlgHandler(item)">驳回</div>
+            <div @click="openMessage(item)">通过</div>
+          </div>
+        </div>
+      </template>
+      <div class="no-data" v-else>
+        <div style="text-align: center">
+          <img src="~@/assets/img/data_m/table_no.png" alt="" style="display: block; width: 135px; height: 112px; margin: 0 auto" />
+          <span>暂无数据</span>
+        </div>
+      </div>
+    </div>
+    <special-dlg :addAuthorDlgVisible.sync="addAuthorDlgVisible" :submitRejectDlgVisible.sync="submitRejectDlgVisible" :submitRejectId="submitRejectId" />
+    <el-image-viewer v-if="showPreview" :urlList="previewImages" :on-close="closeViewer" :zIndex="99999"></el-image-viewer>
+  </div>
+</template>
+
+<script>
+import ElImageViewer from "element-ui/packages/image/src/image-viewer";
+import SpecialDlg from "./components/specialDlg.vue";
+import { raiInterface } from "@/api/api.js";
+import { async } from "@antv/x6/lib/registry/marker/async";
+export default {
+  name: "",
+  components: { SpecialDlg, ElImageViewer },
+  props: {},
+  data() {
+    return {
+      addAuthorDlgVisible: false,
+      submitRejectDlgVisible: false, // 驳回的显示
+      submitRejectId: 0, // 驳回的ID
+      authorInfoData: [], // 作者信息列表
+      specialListData: [], // 审核列表
+      showPreview: false, //
+      previewImages: [],
+    };
+  },
+  watch: {},
+  created() {},
+  mounted() {
+    this.getAuthorList();
+    this.getSpecialList();
+    this.$nextTick(() => {});
+    // let rowNum = Math.round($(".content-detial").height() / parseFloat($(".content-detial").css("line-height")));
+  },
+  methods: {
+    showPreviewHandles(item) {
+      console.log(123);
+      this.showPreview = true;
+      this.previewImages = [item];
+    },
+    closeViewer() {
+      this.showPreview = false;
+      document.querySelector("body").classList.remove("el-popup-imageView--hidden");
+    },
+    // 审核通过的确认按钮
+    openMessage(item) {
+      this.$confirm("确定通过此内容在小程序展示吗？", "审核通过", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(async () => {
+          const res = await raiInterface.yanxuan_specialEnable({
+            Id: item.Id,
+            Status: 1,
+          });
+          if (res.Ret === 200) {
+            this.$message.success("审核成功!");
+            this.getSpecialList();
+          }
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消",
+          });
+        });
+    },
+    // 获取作者列表
+    async getAuthorList() {
+      const res = await raiInterface.yanxuan_specialAuthorList();
+      if (res.Ret === 200) {
+        this.authorInfoData = res.Data || [];
+      }
+    },
+    // 作者的关闭或者打开
+    async switchAuthorChange(item) {
+      const res = await raiInterface.yanxuan_specialAuthorEnable({
+        UserId: item.UserId,
+        Status: item.Status,
+      });
+      if (res.Ret === 200) {
+        this.$message.success("操作成功!");
+      }
+    },
+    // 审核列表
+    async getSpecialList() {
+      const res = await raiInterface.yanxuan_specialList();
+      if (res.Ret === 200) {
+        this.specialListData = res.Data || [];
+
+        this.$nextTick(() => {
+          this.specialListData.forEach((item, index) => {
+            let h = document.getElementsByClassName("content-detial")[index].clientHeight;
+            this.$set(item, "isShowBtn", h >= 134 ? true : false);
+          });
+        });
+      }
+    },
+    // 驳回的弹框显示
+    submitRejectDlgHandler(item) {
+      this.submitRejectId = item.Id;
+      this.submitRejectDlgVisible = true;
+    },
+    handleOperation: _.debounce(function (item) {
+      const url = item.DocUrl;
+      if (!url) {
+        this.$message.warning("文件错误");
+        return;
+      }
+      const reg = /\.(pdf)$/;
+      // pdf
+      if (reg.test(url)) {
+        window.open(url, "_blank");
+      } else {
+        window.open("https://view.officeapps.live.com/op/view.aspx?src=" + url, "_blank");
+      }
+    }, 200),
+    lookAllDetails(item) {
+      let url =
+        process.env.NODE_ENV === "production"
+          ? `https://web.hzinsights.com/column/detail/${item.Id}`
+          : process.env.NODE_ENV === `test`
+          ? `https://clpttest.hzinsights.com/column/detail/${item.Id}`
+          : `https://clpttest.hzinsights.com/column/detail/${item.Id}`;
+      window.open(url, "_blank");
+    },
+  },
+};
+</script>
+<style lang="scss">
+div {
+  box-sizing: border-box;
+}
+.yanxuan-special_container {
+  display: flex;
+  justify-content: space-between;
+  .author-content {
+    width: 400px;
+    height: calc(100vh - 118px);
+    border-radius: 4px;
+    background-color: #fff;
+    padding: 20px;
+    box-sizing: border-box;
+    flex-shrink: 0;
+    .top {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+    .author-ul {
+      padding-bottom: 10px;
+      height: 100%;
+      overflow: hidden;
+      overflow-y: auto;
+      .author-li {
+        flex: 1;
+        height: 116px;
+        padding: 20px;
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 1px solid #dcdfe6;
+        margin: 10px 0;
+        .switch-box {
+          width: 30px;
+          flex-shrink: 0;
+        }
+      }
+    }
+  }
+  .info-content {
+    flex: 1;
+    padding-left: 16px;
+    color: #999999;
+    p:nth-child(2) {
+      margin: 8px 0;
+    }
+  }
+  .avatar {
+    width: 48px;
+    height: 48px;
+    border-radius: 50%;
+    overflow: hidden;
+    background: #d9d9d9;
+    flex-shrink: 0;
+    img {
+      width: 48px;
+      height: 48px;
+    }
+  }
+  .info-name {
+    font-size: 16px;
+    color: #333;
+    font-weight: 500;
+  }
+  .examine-content {
+    margin-left: 20px;
+    padding: 20px;
+    flex: 1;
+    background: #fff;
+    flex-direction: 0;
+    overflow: hidden;
+    .no-data {
+      width: 100%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    .content-box-examine {
+      padding: 30px 0;
+      border-bottom: 1px solid #dcdfe6;
+    }
+    .info-box {
+      display: flex;
+    }
+    .content-detial {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 8;
+      img {
+        width: 100%;
+        max-height: 300px;
+      }
+    }
+    .look-all-txt {
+      color: #409eff;
+      font-size: 16px;
+      margin-top: 20px;
+      cursor: pointer;
+    }
+    .file-box {
+      display: flex;
+      align-items: center;
+      margin-top: 20px;
+      height: 64px;
+      cursor: pointer;
+      img {
+        width: 27px;
+        height: 27px;
+        margin-right: 15px;
+      }
+    }
+    .img-box {
+      margin: 20px 0;
+      height: 112px;
+      img {
+        object-fit: fill !important;
+        cursor: pointer;
+        margin-right: 20px;
+      }
+    }
+    .lable-li {
+      display: inline-block;
+      padding: 4px 20px;
+      height: 28px;
+      border-radius: 48px;
+      margin: 0 15px 15px 0;
+      border: 1px solid #409eff;
+      background-color: #eaf3fe;
+      color: #409eff;
+    }
+    .bottom-button {
+      margin: 50px;
+      display: flex;
+      justify-content: center;
+      color: #fff;
+      div {
+        cursor: pointer;
+        width: 120px;
+        height: 40px;
+        padding: 10px 46px 10px 46px;
+        border-radius: 4px;
+        background: #c54322;
+      }
+      div:nth-child(2) {
+        margin-left: 20px;
+        background: #67c23a;
+      }
+    }
+  }
+}
+/deep/.el-image {
+  img {
+    object-fit: fill !important;
+  }
+}
+</style>

src/views/report_manage/dayilyNews.vue

@@ -14,10 +14,17 @@
       <div class="list-item" v-for="(item,index) in newsList" :key="item.MsgId">
         <div class="item-cont">
           <p class="news">
-            <span style="font-weight: bold;margin-right: 10px;" v-if="item.MsgTime">{{item.MsgTime.substr(10)}}</span>
+            <span style="font-weight: bold;margin-right: 10px;" v-if="item.MsgTime">
+              {{transformTimeType(item.MsgTime)}}
+            </span>
             {{item.Content}} 
           </p>
-          <p class="news-en" :style="item.showEn ? 'display:block' : 'display:none'">{{item.ContentEn}}</p>
+          <p class="news-en" :style="item.showEn ? 'display:block' : 'display:none'">
+            <span style="font-weight: bold;margin-right: 10px;" v-if="item.MsgTime">
+              {{transformTimeType(item.MsgTime)}}
+            </span>
+            {{item.ContentEn}}
+          </p>
         </div>
 
         <div class="item-bot">
@@ -389,7 +396,10 @@ export default {
         this.page_no++;
         this.getList()
       }
-    },300)
+    },300),
+    transformTimeType(date){
+      return date.replaceAll('-','/').substr(0,16)
+    }
   },
 
   mounted() {

src/views/system_manage/etaMenu_manage/components/ModifyMenuDialog.vue

@@ -23,7 +23,7 @@
                         <el-cascader v-model="form.ParentId"
                             :options="menuList"
                             :props="menuProps"
-                            :disabled="openType!=='add'"
+                            :disabled="openType==='add'?false:!(openType!=='add'&&form.MenuType===0&&form.treeLevel===1)"
                         >
                         </el-cascader>
                     </el-form-item>

src/views/system_manage/etaMenu_manage/etaMenuConfig.vue

@@ -158,7 +158,7 @@ export default {
                     ParentId:ParentId===-1?0:ParentId,
                     MenuType,
                     Name,
-                    Sort,
+                    Sort:Number(Sort),
                     Hidden,
                     ButtonCode
                 }

src/views/training_manage/classifyManage.vue

@@ -0,0 +1,173 @@
+<template>
+    <div class="classify-manage-wrap traing-manage">
+        <div class="top-wrap">
+            <el-button type="primary" @click="handleModifyClassify({})">添加分类</el-button>
+            <el-input v-model="searchText" clearable prefix-icon="el-icon-search" placeholder="请输入分类名称"
+                @input="getTableData" style="width:240px;"></el-input>
+        </div>
+        <div class="table-wrap">
+            <el-table :data="tableData" v-loading="tableLoading" row-key="ClassifyId"
+                :tree-props="{children:'Children',hasChildren:'hasChildren'}">
+                <el-table-column prop="ClassifyName" label="一级分类" align="center">
+                    <template slot-scope="{row}">
+                        <span>{{row.ParentId?'':row.ClassifyName}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="ClassifyName" label="二级分类" align="center">
+                    <template slot-scope="{row}">
+                        <span>{{row.ParentId?row.ClassifyName:''}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center" width="400px">
+                    <template slot-scope="{row}">
+                        <el-button type="text" @click="handleModifyClassify(row)">编辑</el-button>
+                        <el-button type="text" @click="deleteClassify(row)">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <!-- 添加分类弹窗 -->
+        <el-dialog :title="currentClassify.ClassifyId?'编辑分类':'添加分类'" :visible.sync="isModifyDialogShow"
+            :close-on-click-modal="false" :modal-append-to-body="false" @close="isModifyDialogShow=false" width="589px"
+            v-dialogDrag center>
+            <div class="dialog-container">
+                <el-form :model="currentClassify" :rules="rules" ref="form" label-position="top">
+                    <el-form-item label="上级分类" prop="ParentId">
+                        <el-select v-model="currentClassify.ParentId" placeholder="请选择上级分类" style="width:100%;">
+                            <el-option v-for="item in currentClassify.ClassifyId
+                                ?(currentClassify.ParentId<=0?defaultList:optionList)
+                                :[...defaultList,...optionList]" 
+                            :key="item.ClassifyId"
+                            :label="item.ClassifyName"
+                            :value="item.ClassifyId"/>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="分类名称" prop="ClassifyName">
+                        <el-input v-model="currentClassify.ClassifyName" placeholder="请输入分类名称" style="width:100%;"></el-input>
+                    </el-form-item>
+                </el-form>
+            </div>
+            <div class="foot-container">
+                <el-button @click="isModifyDialogShow=false">取 消</el-button>
+                <el-button type="primary" @click="modifyClassify">确认</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {ClassifyInterface} from '@/api/modules/trainingApi'
+export default {
+    data() {
+        return {
+            searchText: '',
+            tableData: [],
+            tableLoading: false,
+            currentClassify: {},
+            defaultList:[{ClassifyId:-1,ClassifyName:'无'}],
+            isModifyDialogShow: false,
+            rules:{
+                ParentId:[{required:true,message:'请选择上级分类'}],
+                ClassifyName:[{required:true,message:'请输入分类名称'}]
+            }
+        };
+    },
+    watch:{
+        isModifyDialogShow(newVal){
+            if(newVal){
+                this.$nextTick(()=>{
+                    this.$refs.form&&this.$refs.form.clearValidate();
+                })
+            }
+        }
+    },
+    computed:{
+        optionList(){
+            const list = this.tableData.map(i=>{
+                return {
+                    ClassifyId:i.ClassifyId,
+                    ClassifyName:i.ClassifyName
+                }
+            })
+            return list
+        },
+    },
+    methods: {
+        handleModifyClassify(data) {
+            this.currentClassify = _.cloneDeep(data)
+            if(data.ParentId===0){
+                this.currentClassify.ParentId = -1
+            }
+            this.isModifyDialogShow = true
+        },
+        async modifyClassify() {
+            //params对ParentId为-1的数据做处理,转为0
+            await this.$refs.form.validate()
+            let res = null
+            if(this.currentClassify.ClassifyId){
+                res = await ClassifyInterface.editClassify({
+                    ClassifyId:this.currentClassify.ClassifyId,
+                    ParentId:this.currentClassify.ParentId===-1?0:this.currentClassify.ParentId,
+                    ClassifyName:this.currentClassify.ClassifyName
+                })
+            }else{
+                res = await ClassifyInterface.addClassify({
+                    ParentId:this.currentClassify.ParentId===-1?0:this.currentClassify.ParentId,
+                    ClassifyName:this.currentClassify.ClassifyName
+                })
+            }
+            if(res.Ret!==200) return 
+            this.$message.success(`${this.currentClassify.ClassifyId?'编辑':'添加'}成功`)
+            this.getTableData()
+            this.isModifyDialogShow = false
+        },
+        deleteClassify(data) {
+            if(data.Children&&data.Children.length){
+                this.$confirm(
+                    '该分类下已关联内容，不可删除！',
+                    '提示',
+                    {
+                        confirmButtonText: '知道了',
+                        showCancelButton:false,
+                        type: 'error',
+                    }
+                ).then(()=>{})
+            }else{
+                this.$confirm(
+                    '删除后不可恢复，是否确认删除？',
+                    '提示',
+                    {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning',
+                    }
+                ).then(()=>{
+                    ClassifyInterface.deleteClassify({
+                        ClassifyId:data.ClassifyId
+                    }).then(res=>{
+                        if(res.Ret!==200) return 
+                        this.$message.success('删除成功')
+                        this.getTableData()
+                    })
+                    
+                })
+            }
+        },
+        getTableData(){
+            ClassifyInterface.getClassifyList({
+                Keyword:this.searchText
+            }).then(res=>{
+                if(res.Ret!==200) return
+                this.tableData = res.Data&&res.Data.List||[]
+            })
+        },
+    },
+    mounted(){
+        this.getTableData()
+    }
+};
+</script>
+
+<style scoped lang="scss">
+@import "./css/manage.scss";
+</style>

src/views/training_manage/components/addTags.vue

@@ -0,0 +1,162 @@
+<template>
+    <el-dialog
+        title="选择标签"
+        :visible.sync="isModifyDialogShow"
+        :close-on-click-modal="false"
+        :modal-append-to-body="false"
+        @close="$emit('close')"
+        width="589px"
+        v-dialogDrag
+        center
+        class="add-Tags-wrap"
+    >
+        <div class="dialog-container">
+            <el-input  placeholder="请输入标签名称"  prefix-icon="el-icon-search"
+                v-model.trim="searchText" clearable @input="getTagList(searchText)"></el-input>
+            <el-button type="text" @click="getTagList(searchText)">搜索</el-button>
+            <div class="tag-list-box">
+                <el-tag v-for="item in tagList"
+                    :class="['tag-item',{ choosed: choosedTags.findIndex(i=>i.TagId===item.TagId)!==-1 }]"
+                    :key="item.TagId"
+                    type="info"
+                    effect="plain"
+                    @click="chooseTag(item)"
+                >
+                    {{ item.TagName }}
+                </el-tag>
+            </div>
+            <div class="add-tag-box">
+                <el-input  placeholder="请输入标签名称" v-model.trim="addText"></el-input>
+                <el-button type="text" @click="addTag">添加</el-button>
+                <el-button type="text" @click="toTagPage">标签管理</el-button>
+                <p style="color:#999999;font-size: 12px;">注：名称不得超过5个字</p>
+            </div>
+        </div>
+        <div class="foot-container">
+            <el-button @click="$emit('close')">取 消</el-button>
+            <el-button type="primary" @click="modifyTags">确认</el-button>
+        </div>
+    </el-dialog>
+</template>
+
+<script>
+import {TagInterface} from '@/api/modules/trainingApi'
+export default {
+    props:{
+        isModifyDialogShow:{
+            type:Boolean,
+            default:false
+        },
+        Tags:{
+            type:Array,
+            default:[]
+        },
+        getTagList:{
+            type:Function,
+            default:null
+        },
+        tagList:{
+            type:Array,
+            default:[]
+        }
+    },
+    data() {
+        return {
+            searchText:'',
+            addText:'',
+            choosedTags:[],
+        };
+    },
+    watch:{
+        isModifyDialogShow(newVal){
+            if(newVal){
+                this.searchText=''
+                this.addText=''
+                this.choosedTags = _.cloneDeep(this.Tags)
+                this.getTagList()
+            }
+        }
+    },
+    methods: {
+        //选择标签
+        chooseTag(tag){
+            const {TagId} = tag
+            const index = this.choosedTags.findIndex(i=>i.TagId===TagId)
+            if(index!==-1){
+                this.choosedTags.splice(index,1)
+            }else{
+                if(this.choosedTags.length===3){
+                    this.$message.warning("最多选择3个标签")
+                    return
+                }
+                this.choosedTags.push(tag)
+            }
+        },
+        //添加标签
+        addTag(){
+            if(!this.addText){
+                this.$message.warning("请输入标签名称")
+                return
+            }
+            if(this.addText>5){
+                this.$message.warning("标签名称过长,请重新编辑")
+                return
+            }
+            TagInterface.addTag({
+                TagName:this.addText
+            }).then(res=>{
+                if(res.Ret!==200) return 
+                this.getTagList()
+                this.addText = ''
+            })
+        },
+        modifyTags(){
+            this.$emit('modify',this.choosedTags)
+        },
+        toTagPage(){
+            window.open('/trainingLabel')
+        }
+    },
+};
+</script>
+
+<style scoped lang="scss">
+.add-Tags-wrap{
+    .el-dialog{
+        .dialog-container{
+            .tag-list-box{
+                margin-top:20px;
+                padding:10px;
+                box-sizing: border-box;
+                border: 1px dashed #DCDFE6;
+                border-radius: 4px;
+                max-height: 200px;
+                overflow-y: auto;
+                display: flex;
+                flex-wrap: wrap;
+                gap:10px;
+                .tag-item{
+                    cursor: pointer;
+                    box-sizing: border-box;
+                    text-align: center;
+                    min-width:78px;
+                    /* border:1px solid black; */
+                    border-radius: 2px;
+                    &:hover,&.choosed{
+                        background-color: #EAF3FE;
+                        border-color: #409EFF;
+                        color: #409EFF;
+                    }
+                }
+            }
+            .add-tag-box{
+                margin-top:20px;
+            }
+        }
+        .foot-container{
+            text-align: center;
+            padding:20px 0;
+        }
+    }
+}
+</style>

src/views/training_manage/config/tableColumn.js

@@ -0,0 +1,42 @@
+export const labelTableColumn = [
+    {
+        label:'标签名称',
+        key:'TagName',
+        minWidth:'200px',
+    },{
+        label:'视频数',
+        key:'VideoTotal',
+    },{
+        label:'创建时间',
+        key:'CreateTime',
+        minWidth:'200px',
+    }
+]
+
+
+export const videoTableColumn = [
+    {
+        label:'视频封面',
+        key:'CoverImg',
+        Width:'300px',
+    },{
+        label:'视频名称',
+        key:'Title',
+        minWidth:'200px'
+    },{
+        label:'分类',
+        key:'Classify',
+        Width:'200px',
+    },{
+        label:'标签',
+        key:'Tags',
+        minWidth:'200px',
+    },{
+        label:'状态',
+        key:'PublishState',
+    },{
+        label:'创建时间',
+        key:'CreateTime',
+        Width:'200px',
+    }
+]

src/views/training_manage/css/manage.scss

@@ -0,0 +1,30 @@
+.traing-manage{
+    .top-wrap,.table-wrap{
+        padding:20px;
+        background-color:#fff;
+        border-radius: 4px;
+    }
+    .top-wrap{
+        display: flex;
+        justify-content: space-between;
+    }
+    .table-wrap{
+        margin-top: 20px;
+    }
+    .el-dialog{
+        .dialog-container{
+          padding-bottom: 20px;
+          .input-item{
+            margin-bottom:10px;
+          }
+          .form-hint{
+            color:#999999;
+            font-size: 12px;
+          }
+        }
+        .foot-container{
+            text-align: center;
+            padding-bottom: 20px;
+        }
+      }
+}

src/views/training_manage/labelManage.vue

@@ -0,0 +1,168 @@
+<template>
+    <!-- 培训管理-标签管理 -->
+    <div class="label-manage-wrap traing-manage">
+        <div class="top-wrap">
+            <el-button type="primary" @click="handleModifyLabel({})">新增标签</el-button>
+            <el-input v-model="searchText" clearable 
+                prefix-icon="el-icon-search" placeholder="请输入标签名称" @input="handleCurrentChange(1)" 
+                style="width:240px;"></el-input>
+        </div>
+        <div class="table-wrap">
+            <el-table :data="tableData" border v-loading="tableLoading">
+                <el-table-column v-for="column in tableColumn" :key="column.key" 
+                    :label="column.label" align="center"
+                    :prop="column.key"
+                    :min-width="column.minWidth">
+                </el-table-column>
+                <el-table-column label="操作" align="center">
+                    <template slot-scope="{row}">
+                        <el-button type="text" @click="handleModifyLabel(row)">编辑</el-button>
+                        <el-button type="text" @click="deleteLabel(row)" style="color:red;">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                layout="total,prev,pager,next,jumper" 
+                background
+                :current-page="currentPage"
+                @current-change="handleCurrentChange"
+                :page-size="pageSize" 
+                :total="total"
+                style="text-align:right;margin-top:30px;">
+            </el-pagination>
+        </div>
+        <!-- 添加标签弹窗 -->
+        <el-dialog
+            :title="currentLabel.TagId?'编辑标签':'添加标签'"
+            :visible.sync="isModifyDialogShow"
+            :close-on-click-modal="false"
+            :modal-append-to-body="false"
+            @close="isModifyDialogShow=false"
+            width="589px"
+            v-dialogDrag
+            center
+            >
+            <div class="dialog-container">
+                <div class="input-item">
+                <el-input  placeholder="请输入标签名称" v-model.trim="currentLabel.TagName" required ></el-input>
+                </div>
+                <p class="form-hint">注：名称不得超过5个字</p>
+            </div>
+            <div class="foot-container">
+                <el-button @click="isModifyDialogShow=false">取 消</el-button>
+                <el-button type="primary" @click="modifyLabel">确认</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {labelTableColumn} from './config/tableColumn'
+import {TagInterface} from '@/api/modules/trainingApi'
+export default {
+    data() {
+        return {
+            /* table */
+            tableLoading:false,
+            tableData:[],
+            tableColumn:labelTableColumn,
+            searchText:'',
+            /* table-page */
+            currentPage:1,
+            pageSize:10,
+            total:0,
+            /* modify label */
+            currentLabel:{},
+            isModifyDialogShow:false,
+        };
+    },
+    methods: {
+        handleModifyLabel(data){
+            this.currentLabel = _.cloneDeep(data)
+            this.isModifyDialogShow = true
+        },
+        async modifyLabel(){
+            if(!this.currentLabel.TagName){
+                this.$message.warning("请输入标签名称")
+                return
+            }
+            if(this.currentLabel.TagName.length>5){
+                this.$message.warning("标签名称过长,请重新编辑")
+                return
+            }
+            let res = null
+            if(this.currentLabel.TagId){
+                //edit
+                res = await TagInterface.editTag({
+                    TagId:this.currentLabel.TagId,
+                    TagName:this.currentLabel.TagName
+                })
+            }else{
+                //add
+                res = await TagInterface.addTag({
+                    TagName:this.currentLabel.TagName
+                })
+            }
+            if(res.Ret!==200) return 
+            //添加/编辑成功
+            this.$message.success(`${this.currentLabel.TagId?'编辑':'添加'}成功`)
+            this.currentPage = 1
+            this.getTableData()
+            this.isModifyDialogShow = false
+        },
+        deleteLabel(label){
+            if(label.VideoTotal!==0){
+                this.$confirm('该标签已关联视频，删除失败','提示',{confirmButtonText:'知道了',showCancelButton:false,type:'error'})
+                return
+            }
+            this.$confirm(
+                '删除后不可恢复，是否确认删除该标签？',
+                '提示',
+                {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+                }
+            ).then(()=>{
+                TagInterface.deleteTag({
+                    TagId:label.TagId
+                }).then(res=>{
+                    if(res.Ret!==200) return 
+                    this.$message.success('删除成功')
+                    this.currentPage=1
+                    this.getTableData()
+                })
+            }).catch(()=>{}).finally(()=>{})
+        },
+        getTableData(){
+            this.tableLoading = true
+            TagInterface.getTagList({
+                PageSize:this.pageSize,
+                CurrentIndex:this.currentPage,
+                Keyword:this.searchText
+            }).then(res=>{
+                this.tableLoading = false
+                if(res.Ret!==200) return
+                if(!res.Data){
+                    this.tableData = []
+                    this.total = 0
+                    return
+                } 
+                this.tableData = res.Data.List||[]
+                this.total = res.Data.Paging.Totals
+            })
+        },
+        handleCurrentChange(page){
+            this.currentPage = page
+            this.getTableData()
+        }
+    },
+    mounted(){
+        this.getTableData()
+    }
+};
+</script>
+
+<style scoped lang="scss">
+@import "./css/manage.scss";
+</style>

src/views/training_manage/mixins/videoMixins.js

@@ -0,0 +1,44 @@
+import {TagInterface,ClassifyInterface} from '@/api/modules/trainingApi'
+export default{
+    data() {
+        return {
+            tagList:[],
+            classifyList:[],
+        }
+    },
+    methods: {
+        //获取分类列表
+        getClassifyList(type=''){
+            ClassifyInterface.getClassifyList({}).then(res=>{
+                if(res.Ret!==200) return 
+                this.classifyList = res.Data&&res.Data.List||[]
+                this.filterNodes(this.classifyList)
+                this.classifyList = this.classifyList.map(item=>{
+                    if(!item.Children){
+                        item.disabled = true
+                    }
+                    return item
+                })
+            })
+        },
+        filterNodes(arr) {
+            arr.length && arr.forEach(item => {
+                item.Children && item.Children.length && this.filterNodes(item.Children)
+                if(item.Children && !item.Children.length) {
+                    delete item.Children
+                }
+            })
+        },
+        //获取标签列表
+        getTagList(keyword=''){
+            TagInterface.getTagList({
+                Keyword:keyword,
+                PageSize:1000,
+                CurrentIndex:1
+            }).then(res=>{
+                if(res.Ret!==200) return 
+                this.tagList = res.Data&&res.Data.List||[]
+            })
+        }
+    }
+}

src/views/training_manage/modifyVideoPage.vue

@@ -0,0 +1,419 @@
+<template>
+    <!-- 新增编辑视频 -->
+    <div class="modify-video-page-wrap">
+        <el-form :model="form" :rules="rules" ref="form">
+            <el-form-item label="所属分类" prop="ClassifyId">
+                <el-cascader placeholder="选择所属分类" 
+                    v-model="form.ClassifyId"
+                    :options="classifyList"
+                    clearable
+                    :show-all-levels="false"
+                    :props="{emitPath:false,
+                            label:'ClassifyName',
+                            value:'ClassifyId',
+                            children:'Children'}">
+                </el-cascader>
+            </el-form-item>
+            <el-form-item label="视频名称" prop="Title">
+                <el-input v-model="form.Title" placeholder="请输入视频名称"></el-input>
+            </el-form-item>
+            <el-form-item label="视频简介" prop="Introduce">
+                <el-input v-model="form.Introduce" 
+                placeholder="请输入视频简介"
+                type="textarea" maxlength="50" show-word-limit :rows="5"></el-input>
+            </el-form-item>
+            <el-form-item label="上传封面" prop="CoverImg">
+                <el-upload action="" accept="image/*" 
+                    :http-request="handleUploadImg" :show-file-list="false" :disabled="isImageUploading">
+                    <el-button type="primary" :loading="isImageUploading">点击上传</el-button>
+                    <span style="color:#999999;margin-left: 5px;" @click.stop>建议尺寸比例3:2，支持png、jpg、gif、jpeg格式</span>
+                </el-upload>
+                <div class="img-box">
+                    <img :src="form.CoverImg" v-if="form.CoverImg">
+                    <span v-else style="color:#999999;line-height: 100px;">请上传封面图</span>
+                </div>
+            </el-form-item>
+            <el-form-item label="上传视频" prop="VideoUrl">
+                <el-upload action="" accept=".mp4" 
+                    :http-request="handleUploadVideo" :show-file-list="false" :disabled="isVideoUploading">
+                    <el-button type="primary" :loading="isVideoUploading">点击上传</el-button>
+                    <span style="color:#999999;margin-left: 5px;" @click.stop>仅支持mp4格式</span>
+                </el-upload>
+                
+                <div class="img-box">
+                    <el-progress type="circle" :percentage="percentage" width="40" v-if="isVideoUploading"></el-progress>
+                    <span v-if="form.VideoUrl&&!form.VideoId" class="duration">{{timeDuration}}</span>
+                    <img :src="form.CoverImg" v-if="form.VideoUrl" @click="handlePreviewVideo">
+                    <span v-else style="color:#999999;line-height: 100px;">请上传视频</span>
+                </div>
+            </el-form-item>
+            <el-form-item label="视频标签" prop="TagIds">
+                <el-button type="text" @click="isModifyDialogShow = true">选择标签</el-button>
+                <div class="tag-list" :key="tagIdKey">
+                    <span class="tag-item" v-for="tag in form.TagIds" :key="tag.TagId">
+                        <span>{{tag.TagName}}</span>
+                        <span @click.stop="removeTag(tag)"><i class="el-icon-close"></i></span>
+                    </span>
+                </div>
+            </el-form-item>
+        </el-form>
+        <div class="btn-box">
+            <el-button type="primary" plain @click="changeRoute">取消</el-button>
+            <el-button type="primary" @click="modifyVideo" :loading="isImageUploading||isVideoUploading">保存</el-button>
+            <el-button type="primary" @click="publishVideo" :loading="isImageUploading||isVideoUploading">发布</el-button>
+        </div>
+        <!-- 选择标签弹窗 -->
+        <AddTags 
+            :isModifyDialogShow="isModifyDialogShow"
+            :Tags="form.TagIds"
+            :tagList="tagList"
+            :getTagList="getTagList"
+            @modify="modifyTags"
+            @close="isModifyDialogShow=false"
+        />
+        <!-- 预览视频弹窗 -->
+        <el-dialog
+            :visible.sync="previewPop"
+            :modal-append-to-body='false'
+            v-dialogDrag
+            width="60vw"
+            :title="previewPopTitle"
+            @close="endingPreview"
+        >
+         <video style="width: 100%;height: 100%;max-height: 70vh;outline: none;" 
+         controls :src="previewVideoUrl" autoplay ref="previewVideo">
+            您的浏览器暂不支持,请更换浏览器
+         </video>   
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import MD5 from 'js-md5'
+import {getOSSSign} from '@/api/api.js'
+import {bannerupload} from '@/api/api.js'
+import {VideoInterface} from '@/api/modules/trainingApi'
+import AddTags from './components/addTags.vue'
+import mixin from './mixins/videoMixins'
+let ALOSSINS=null //阿里云上传实例
+let ALOSSAbortCheckpoint=null //阿里云上传实例中断点
+export default {
+    mixins: [mixin],
+    data() {
+        return {
+            form: {
+                Title: '',
+                Introduce: '',
+                ClassifyId: '',
+                TagIds: [],
+                CoverImg: '',
+                VideoUrl: ''
+            },
+            rules:{
+                ClassifyId:[{required:true,message:'请选择所属分类'}],
+                Title:[{required:true,message:'请输入视频名称'}],
+                CoverImg:[{required:true,message:'请选择视频封面'}],
+                VideoUrl:[{required:true,message:'请上传视频'}],
+                TagIds:[{required:true,validator:(rule,value,callback)=>{
+                    if(!value.length){
+                        return callback(new Error("请至少选择一个标签"))
+                    }else{
+                        return callback()
+                    }
+                }}]
+            },
+            tagIdKey: 0,
+            isModifyDialogShow: false,
+
+            isImageUploading: false,
+
+            isVideoUploading: false,
+            percentage:0,
+            timeDuration:'',
+            previewVideoUrl:'',
+            previewPop:false,
+            previewPopTitle:''
+            
+        };
+    },
+    methods: {
+        //检查图片是否合法
+        handleUploadImg(file) {
+            this.isImageUploading = true;
+            //图片格式限制
+            const { type } = file.file;
+            if (!['image/png', 'image/jpeg'].includes(type)) {
+                this.$message.warning('仅支持png、jpg格式的图片');
+                this.isImageUploading = false;
+                return;
+            }
+            this.uploadImg(file);
+        },
+        //上传图片
+        uploadImg(file) {
+            let form = new FormData();
+            form.append('file', file.file);
+            bannerupload(form).then(res => {
+                this.isImageUploading = false;
+                if (res.Ret !== 200)
+                    return;
+                this.form.CoverImg = res.Data.ResourceUrl;
+            });
+        },
+        //检查视频是否合法,并获取视频时长
+        async handleUploadVideo(file) {
+            if(file.file.type!='video/mp4'){
+                this.$message.warning('上传失败，上传视频格式不正确');
+                return
+            }
+            const duration=await this.handleGetDuration(file.file);
+            this.timeDuration = `${String(parseInt(duration/60)).padStart(2,'0')}:${String(parseInt(duration%60)).padStart(2,'0')}`;
+            this.uploadVideo(file.file);
+            this.isVideoUploading = true;
+        },
+        //获取视频时长的promise
+        async handleGetDuration(file){
+            return new Promise((resolve,reject)=>{
+                const fileUrl=URL.createObjectURL(file);
+                const audioEl=new Audio(fileUrl);
+                audioEl.addEventListener('loadedmetadata',(e)=>{
+                    const t=e.composedPath()[0].duration;
+                    resolve(t);
+                })
+            })
+        },
+        //上传视频
+        async uploadVideo(file) {
+            const res = await getOSSSign();
+            if(res.Ret===200){
+                this.handleUploadToOSS(file,res.Data);
+            }
+        },
+        //上传到阿里云
+        async handleUploadToOSS(file,{AccessKeyId,AccessKeySecret,SecurityToken}){
+            ALOSSINS=new OSS({
+                // yourRegion填写Bucket所在地域。以华东1（杭州）为例，Region填写为oss-cn-hangzhou。
+                region: "oss-cn-shanghai",
+                // 从STS服务获取的临时访问密钥（AccessKey ID和AccessKey Secret）。
+                accessKeyId: AccessKeyId,
+                accessKeySecret: AccessKeySecret,
+                // 从STS服务获取的安全令牌（SecurityToken）。
+                stsToken: SecurityToken,
+                // 填写Bucket名称，例如examplebucket。
+                bucket: "hzchart",
+                endpoint:'hzstatic.hzinsights.com',
+                cname:true,
+                timeout:600000000000
+            });
+            // 生成文件名
+            const t=new Date().getTime().toString();
+            const temName=`static/yb/video/${MD5(t)}.${file.type.split('/')[1]}`;
+            const options = {
+                // 获取分片上传进度、断点和返回值。
+                progress: (p, cpt, res) => {
+                    ALOSSAbortCheckpoint=cpt;
+                    this.percentage=parseInt(p*100);
+                },
+                // 设置并发上传的分片数量。
+                parallel: 10,
+                // 设置分片大小。默认值为1 MB，最小值为100 KB。
+                partSize: 1024 * 1024 * 10, // 10MB
+            };
+            try {
+                const res=await ALOSSINS.multipartUpload(temName,file,{...options});
+                console.log('上传结果',res);
+                if(res.res.status===200){
+                    this.form.VideoUrl='https://hzstatic.hzinsights.com/'+res.name;
+                    this.percentage=0;
+                    ALOSSAbortCheckpoint=null;
+                    this.isVideoUploading = false;
+                }
+            } catch (error) {
+                console.log('上传到阿里云失败',error);
+                if(error.name!=="cancel"){//不是取消上传的则给错误提示
+                    this.$message.warning('上传失败，请刷新重试');
+                }
+                this.percentage=0;
+                ALOSSAbortCheckpoint=null;
+                this.isVideoUploading = false;
+            }
+        },
+        //删除所选标签
+        removeTag(tag) {
+            const index = this.form.TagIds.findIndex(i => i.TagId === tag.TagId);
+            index !== -1 && (this.form.TagIds.splice(index, 1));
+            this.tagIdKey++;
+        },
+        //改变所选标签
+        modifyTags(tags) {
+            this.form.TagIds = _.cloneDeep(tags);
+            this.isModifyDialogShow = false;
+        },
+        //获取视频信息
+        getVideoDetail() {
+            const { VideoId } = this.$route.query;
+            if (!VideoId)
+                return;
+            VideoInterface.getVideoDetail({
+                VideoId: Number(VideoId)
+            }).then(res => {
+                if (res.Ret !== 200)
+                    return;
+                this.form = res.Data || {};
+                if (this.form.Classify) {
+                    const { Classify } = this.form;
+                    const classifyArr = this.getDataClassify(Classify);
+                    this.form.ClassifyId = classifyArr[classifyArr.length - 1];
+                    delete this.form.Classify;
+                }
+                if (this.form.Tags) {
+                    this.form.TagIds = this.form.Tags;
+                    delete this.form.Tags;
+                }
+            });
+        },
+        //获取视频分类路径
+        getDataClassify(classify, classifyArr = []) {
+            classifyArr.push(classify.ClassifyId);
+            if (classify.Children && classify.Children.length) {
+                return this.getDataClassify(classify.Children[0], classifyArr);
+            }
+            return classifyArr;
+        },
+        //添加/编辑视频
+        async modifyVideo(type='modify') {
+            await this.$refs.form.validate()
+            let res = null;
+            let params = { ...this.form, ...{ TagIds: this.form.TagIds.map(t => t.TagId) } };
+            if (!this.form.VideoId) {
+                res = await VideoInterface.addVideo(params);
+            }
+            else {
+                res = await VideoInterface.editVideo(params);
+            }
+            if (res.Ret !== 200)
+                return;
+            type!=='publish'&&this.$message.success(`${this.form.VideoId ? '编辑' : '添加'}成功`);
+            type!=='publish'&&this.changeRoute();
+            !this.form.VideoId&&(this.form.VideoId = res.Data?res.Data:'');
+        },
+        //发布视频
+        async publishVideo(){
+            let res = {}
+            await this.modifyVideo('publish');
+            if(this.form.VideoId){
+                res = await VideoInterface.publishVideo({VideoId:Number(this.form.VideoId),PublishState:1})
+                if(res.Ret!==200) return;
+                this.$message.success("发布成功");
+            }
+            this.changeRoute();
+        },
+        changeRoute(){
+            if(ALOSSAbortCheckpoint){
+                console.log('终止上传');
+                ALOSSINS.abortMultipartUpload(ALOSSAbortCheckpoint.name,ALOSSAbortCheckpoint.uploadId)
+            }
+            this.$router.push('/trainingVideo');
+        },
+        // 预览视频
+        handlePreviewVideo(){
+            if(this.isVideoUploading||!this.form.VideoUrl) return
+            this.$refs.previewVideo && this.$refs.previewVideo.play()
+            this.previewPopTitle = this.form.Title||'暂无标题'
+            this.previewVideoUrl = this.form.VideoUrl
+            this.previewPop = true
+        },
+        // 结束预览弹窗关闭回调 -- 暂停视频
+        endingPreview(){
+            this.$refs.previewVideo && this.$refs.previewVideo.pause()
+        },
+    },
+    mounted() {
+        this.getClassifyList('leaf');
+        //this.getTagList();
+        this.getVideoDetail();
+    },
+    components: { AddTags }
+};
+</script>
+<style lang="scss">
+.modify-video-page-wrap{
+    .el-textarea__inner{
+        resize: none;
+    }
+    .el-form-item{
+            .el-form-item__content{
+                display: flex;
+                flex-direction: column;
+                align-items:flex-start;
+            }
+        }
+}
+</style>
+<style scoped lang="scss">
+.modify-video-page-wrap{
+    box-sizing: border-box;
+    padding:40px;
+    background-color: #fff;
+    border-radius: 4px;
+    .el-form{
+        .el-input,.el-select,.el-textarea{
+            width:500px;
+        }
+        .img-box{
+            /* background-color: #D9D9D9; */
+            border:1px dashed #d9d9d9;
+            width:150px;
+            height:100px;
+            text-align: center;
+            margin-top: 10px;
+            position: relative;
+            line-height: normal;
+            img{
+                width:100%;
+                height:100%;
+            }
+            .duration{
+                position:absolute;
+                right:0;
+                bottom:0;
+                background-color: black;
+                color:#fff;
+                padding:4px;
+            }
+            .el-progress{
+                position: absolute;
+                left:50%;
+                top:50%;
+                transform: translate(-50%,-50%);
+                background-color: white;
+                border-radius: 50%;
+            }
+        }
+        .tag-list{
+            display: flex;
+            gap:10px;
+            line-height:0;
+            .tag-item{
+                cursor: pointer;
+                text-align: center;
+                box-sizing: border-box;
+                padding:12px;
+                min-width:78px;
+                color: #409EFF;
+                background-color: #EAF3FE;
+                border:1px solid #409EFF;
+                border-radius: 2px;
+            }
+        }
+    }
+    .btn-box{
+        text-align: center;
+        .el-button{
+            margin-right: 50px;
+            width:120px;
+            text-align: center;
+        }
+    }
+}
+</style>

src/views/training_manage/videoManage.vue

@@ -0,0 +1,265 @@
+<template>
+    <div class="video-manage-wrap traing-manage">
+        <div class="top-wrap">
+            <div class="select-box">
+                <el-date-picker
+                    v-model="datePick"
+                    type="daterange"
+                    value-format="yyyy-MM-dd"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    clearable
+                    @change="handleCurrentChange(1)">
+                </el-date-picker>
+                <el-cascader placeholder="选择分类" 
+                    v-model="ClassifyId"
+                    :options="classifyList"
+                    clearable
+                    :show-all-levels="false"
+                    :props="{emitPath:false,
+                            checkStrictly:true,
+                            label:'ClassifyName',
+                            value:'ClassifyId',
+                            children:'Children'}"
+                    @change="handleCurrentChange(1)">
+                </el-cascader>
+                <el-select placeholder="选择标签" 
+                    v-model="TagIds" multiple clearable
+                    @change="handleCurrentChange(1)">
+                    <el-option
+                        v-for="item in tagList"
+                        :key="item.TagId"
+                        :label="item.TagName"
+                        :value="item.TagId">
+                    </el-option>
+                </el-select>
+                <el-select placeholder="选择状态" 
+                    v-model="PublishState" clearable
+                    @change="handleCurrentChange(1)">
+                    <el-option label="未发布" :value="1"/>
+                    <el-option label="已发布" :value="2"/>
+                </el-select>
+            </div>
+            <el-input v-model="searchText" clearable 
+                prefix-icon="el-icon-search" placeholder="请输入视频名称" @input="handleCurrentChange(1)" 
+                style="width:240px;"></el-input>
+        </div>
+        <div class="table-wrap">
+            <el-button type="primary" @click="handleModifyVideo(0)">新增视频</el-button>
+            <el-table border :data="tableData">
+                <el-table-column v-for="column in tableColumn" :key="column.key" 
+                    :label="column.label" align="center"
+                    :prop="column.key"
+                    :width="column.Width"
+                    :min-width="column.minWidth">
+                    <template slot-scope="{row}">
+                        <!-- 视频封面 -->
+                        <div class="img-box" v-if="column.key==='CoverImg'">
+                            <img :src="row.CoverImg" @click="handlePreviewVideo(row)">
+                        </div>
+                        <!-- 分类 -->
+                        <span v-else-if="column.key==='Classify'">
+                            {{getDataClassify(row.Classify).join('/')}}
+                        </span>
+                        <!-- 标签 -->
+                        <div class="label-box" v-else-if="column.key==='Tags'">
+                            <span class="label-item" v-for="tag in row.Tags" :key="tag.TagId">{{tag.TagName}}</span>
+                        </div>
+                        <!-- 发布状态 -->
+                        <span v-else-if="column.key==='PublishState'">{{row.PublishState===0?'未发布':'已发布'}}</span>
+                        <span v-else>{{row[column.key]}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" align="center" width="150">
+                    <template slot-scope="{row}">
+                        <el-button type="text" @click="handleModifyVideo(row.VideoId)" v-show="row.PublishState===0">编辑</el-button>
+                        <el-button type="text" @click="publishVideo(row)">{{row.PublishState===0?'发布':'取消发布'}}</el-button>
+                        <el-button type="text" @click="deleteVideo(row)" style="color:red;">删除</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <el-pagination
+                layout="total,prev,pager,next,jumper" 
+                background
+                :current-page="currentPage"
+                @current-change="handleCurrentChange"
+                :page-size="pageSize" 
+                :total="total"
+                style="text-align:right;margin-top:30px;">
+            </el-pagination>
+        </div>
+        <!-- 预览视频弹窗 -->
+        <el-dialog
+            :visible.sync="previewPop"
+            :modal-append-to-body='false'
+            v-dialogDrag
+            width="60vw"
+            :title="previewPopTitle"
+            @close="endingPreview"
+        >
+            <video style="width: 100%;height: 100%;max-height: 70vh;outline: none;" 
+            controls :src="previewVideoUrl" autoplay ref="previewVideo">
+            您的浏览器暂不支持,请更换浏览器
+            </video>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+import {videoTableColumn} from './config/tableColumn'
+import {VideoInterface} from '@/api/modules/trainingApi'
+import mixin from './mixins/videoMixins'
+export default {
+    mixins:[mixin],
+    data() {
+        return {
+            /* search options */
+            searchText:'',
+            datePick:[],
+            ClassifyId:'',
+            TagIds:[],
+            PublishState:'',
+
+            tableData: [],
+            tableColumn:videoTableColumn,
+            tableLoading: false,
+
+            currentPage: 1,
+            pageSize: 10,
+            total: 0,
+
+            previewPop:false,
+            previewVideoUrl:'',
+            previewPopTitle:''
+
+
+        };
+    },
+    methods: {
+        //获取视频分类路径
+        getDataClassify(classify,classifyArr=[]){
+            classifyArr.push(classify.ClassifyName)
+            if(classify.Children&&classify.Children.length){
+                return this.getDataClassify(classify.Children[0],classifyArr)
+            }
+            return classifyArr
+        },
+        //获取视频列表
+        getTableData(){
+            VideoInterface.getVideoList({
+                PageSize:this.pageSize,
+                CurrentIndex:this.currentPage,
+                Keyword:this.searchText,
+                StartTime:this.datePick[0],
+                EndTime:this.datePick[1],
+                ClassifyId:Number(this.ClassifyId),
+                TagIds:this.TagIds.join(','),
+                PublishState:Number(this.PublishState)
+            }).then(res=>{
+                if(res.Ret!==200) return 
+                if(!res.Data){
+                    this.tableData = []
+                    this.total = 0
+                    return
+                } 
+                this.tableData = res.Data.List||[]
+                this.total = res.Data.Paging.Totals
+            })
+        },
+        handleModifyVideo(VideoId){
+            this.$router.push({path:'/modifyVideo',query:{VideoId}})
+        },
+        deleteVideo(data){
+            const hint = data.PublishState===0?'删除后不可恢复,是否确认删除?':'该视频已发布,删除后取消发布并删除,是否确认删除?'
+            this.$confirm(
+                    hint,'提示',
+                    {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning',  
+                    }
+            ).then(()=>{
+                VideoInterface.deleteVideo({
+                    VideoId:data.VideoId,
+                }).then(res=>{
+                    if(res.Ret!==200) return 
+                    this.$message.success("删除成功")
+                    this.getTableData()
+                })
+            })
+        },
+        publishVideo(data){
+            const hint = data.PublishState===0?'是否确认发布':'是否取消发布'
+            this.$confirm(
+                    hint,'提示',
+                    {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning',  
+                    }
+            ).then(()=>{
+                VideoInterface.publishVideo({
+                    VideoId:data.VideoId,
+                    PublishState:data.PublishState===0?1:0
+                }).then(res=>{
+                    if(res.Ret!==200) return 
+                    this.$message.success(`${data.PublishState?'取消发布':'发布'}成功`)
+                    this.getTableData()
+                })
+            })
+        },
+        handleCurrentChange(page){
+            this.currentPage = page
+            this.getTableData()
+        },
+        handlePreviewVideo(data){
+            if(!data.VideoUrl) return
+            this.$refs.previewVideo && this.$refs.previewVideo.play()
+            this.previewPopTitle = data.Title||'暂无标题'
+            this.previewVideoUrl = data.VideoUrl
+            this.previewPop = true
+        },
+        // 结束预览弹窗关闭回调 -- 暂停视频
+        endingPreview(){
+            this.$refs.previewVideo && this.$refs.previewVideo.pause()
+        },
+    },
+    mounted(){
+        this.getClassifyList()
+        this.getTagList()
+        this.getTableData()
+    }
+};
+</script>
+
+<style scoped lang="scss">
+@import "./css/manage.scss";
+.video-manage-wrap{
+    .table-wrap{
+        .el-table{
+            margin-top:20px;
+            .img-box{
+                text-align: center;
+                img{
+                    width:150px;
+                    height:100px;
+                }
+            }
+            .label-box{
+                display: flex;
+                justify-content: center;
+                gap:8px;
+                .label-item{
+                    padding:6px 12px;
+                    border: 1px solid #409EFF;
+                    color: #409EFF;
+                    background-color: #EAF3FE;
+                    box-sizing: border-box;
+                    border-radius: 4px;
+                }
+            }
+        }
+    }
+}
+</style>