diff --git a/src/api/modules/active-manage.js b/src/api/modules/active-manage.js
deleted file mode 100644
index f8f32e5..0000000
--- a/src/api/modules/active-manage.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * @author: ym
- * @Date: 2021-10-31 13:01:13
- * @LastEditTime: 2021-10-31 13:38:31
- * @LastEditors: ym
- * @Description: 
- * @FilePath: \background-front-end\src\api\modules\active-manage.js
- */
-//===================== 活动 =============================
-import $http from '../../utils/httpRequest'
-
-// 资讯管理=================================================
-// 增
-export const saveActivityInfo=(content)=>{
-    return $http.post('/activity/redactivityinfo/save',JSON.stringify(content))
-}
-// 删
-export const deleteRedActivityInfo=(idList)=>{
-    return $http.post('/activity/redactivityinfo/delete',JSON.stringify(idList));
-}
-// 改
-export const updateRedActivityInfo=(ids)=>{
-    return $http.post('/activity/redactivityinfo/update',JSON.stringify(ids))
-}
-// 查
-export const getActivityInfoListByParams=(obj)=>{
-    return $http({
-        url:'/activity/redactivityinfo/getActivityInfoListByParams',
-        method: 'get',
-        params: $http.adornParams(obj)
-    })
-}
-
-// 轮播图管理=================================================
-// 增
-export const saveActivityImage=(content)=>{
-    return $http.post('/activity/redactivityimage/save',JSON.stringify(content))
-}
-// 删
-export const deleteRedActivityImage=(idList)=>{
-    return $http.post('/activity/redactivityimage/delete',JSON.stringify(idList));
-}
-// 改
-export const updateRedActivityImage=(ids)=>{
-    return $http.post('/activity/redactivityimage/update',JSON.stringify(ids))
-}
-// 查
-export const getRedActivityImage=(obj)=>{
-    return $http({
-        url:'/activity/redactivityimage/list',
-        method: 'get',
-        params: $http.adornParams(obj)
-    })
-}
\ No newline at end of file
diff --git a/src/api/modules/active-match.js b/src/api/modules/active-match.js
deleted file mode 100644
index 31f0040..0000000
--- a/src/api/modules/active-match.js
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * @Author: cwl
- * @Date: 2021-12-23 14:12:02
- * @LastEditTime: 2022-01-01 20:48:32
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\api\modules\active-match.js
- */
-import $http from '../../utils/httpRequest'
-
-//===================== 活动/赛事管理 =============================
-export function addActiveMatch(data){
-    return $http({
-        url:'/activity/redactivitymatch/save',
-        method:'post',
-        data
-    })
-}
-export function getActiveMatch(params){
-    return $http({
-        url:'/activity/redactivitymatch/getListDetails',
-        params
-    })
-}
-export function delActiveMatch(data){
-    return $http({
-        url:'/activity/redactivitymatch/delete',
-        method:'post',
-        data
-    })
-}
-export function updateActiveMatch(data){
-    return $http({
-        url:'/activity/redactivitymatch/update',
-        method:'post',
-        data
-    })
-}
-//===================== 报名信息=============================
-export function getActiveSignUp(params){
-    return $http({
-        url:'/activity/redactivitysignup/list',
-        params
-    })
-}
-//===================== 作品审核=============================
-export function getWorksExamine(params){
-    return $http({
-        url:'/activity/redactivityworks/list',
-        params
-    })
-}
-
-export function setWorksExamine(data){
-    return $http({
-        url:'/activity/redactivityworks/setWorks',
-        method:'post',
-        data
-    })
-}
-
-export function getWorksAwardList(id){
-    return $http({
-        url:'/activity/reduseraward/list/'+id,
-        id
-    })
-}
-export function delelteWorksAward(data){
-    return $http({
-        url:'/activity/reduseraward/delete',
-        method:'post',
-        data
-    })
-}
-export function addWorksAward(data){
-    return $http({
-        url:'/activity/reduseraward/save',
-        method:'post',
-        data
-    })
-}
-export function updateWorksAward(data){
-    return $http({
-        url:'/activity/reduseraward/update',
-        method:'post',
-        data
-    })
-}
\ No newline at end of file
diff --git a/src/api/modules/app-operate.js b/src/api/modules/app-operate.js
deleted file mode 100644
index 0e5abc4..0000000
--- a/src/api/modules/app-operate.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import $http from '../../utils/httpRequest'
-export const appOperate={
-    updateTheme(currentTheme){
-        return $http.post(`/sys/config/update`,{
-            id:2,
-            paramKey:"THEME",
-            paramValue:currentTheme
-        })
-    },
-    //检查主题
-    getTheme(){
-        return $http.get("/sys/config/info/2");
-    }
-
-}
\ No newline at end of file
diff --git a/src/api/modules/approval.js b/src/api/modules/approval.js
deleted file mode 100644
index ec6b57f..0000000
--- a/src/api/modules/approval.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * @Author: chenkangxu
- * @Date: 2022-06-19 00:07:43
- * @LastEditTime: 2022-06-20 17:43:17
- * @LastEditors: 陈伟亮 1186723967@qq.com
- * @Description:
- * @Github:
- */
-import $http from "../../utils/httpRequest";
-export const approval = {
-  content: (obj) => {
-    return $http({
-      url: "/content/redcontentinfo/examine",
-      method: "get",
-      params: $http.adornParams(obj)
-    });
-   
-  },
-  poetry: obj => {
-    return $http({
-      url: "/localService/redpoetry/examine",
-      method: "get",
-      params: $http.adornParams(obj)
-    });
-  },
-  course: obj => {
-    return $http({
-      url: "/localService/redstudycourse/examine",
-      method: "get",
-      params: $http.adornParams(obj)
-    });
-  }
-};
diff --git a/src/api/modules/content-manage.js b/src/api/modules/content-manage.js
deleted file mode 100644
index b91bac3..0000000
--- a/src/api/modules/content-manage.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * @Author: ym
- * @Date: 2021-10-09 10:15:18
- * @LastEditTime: 2022-06-18 18:47:19
- * @LastEditors: 陈伟亮 1186723967@qq.com
- * @Description: In User Settings Edit
- * @FilePath: \background-front-end\src\api\modules\content-manage.js
- */
-//===================== 内容 =============================
-import $http from '../../utils/httpRequest'
-import $httpComment from '../../utils/httpRequestComment'
-// 资讯管理=================================================
-// 增
-export const saveNewContent=(content)=>{
-    return $http.post('/content/redcontentinfo/saveNewContent',JSON.stringify(content))
-}
-// 删
-export const deleteRedContentInfo=(idList)=>{
-    return $http.post('/content/redcontentinfo/delete',JSON.stringify(idList));
-}
-// 改
-export const updateRedContentInfo=(ids)=>{
-    return $http.post('/content/redcontentinfo/update',JSON.stringify(ids))
-}
-// 查
-export const getContentInfoListByParams=(obj)=>{
-    return $http({
-        url:'/content/redcontentinfo/getContentInfoListByParams',
-        method: 'get',
-        params: $http.adornParams(obj)
-    })
-}
-
-// 查分类
-export const getContentTypeListNoPage=()=>{
-    return $http.get('/management/reddatacontentmaintype/getContentTypeListNoPage');
-}
-
-// 轮播图管理
-// 增
-export const saveContentImage=(content)=>{
-    return $http.post('/content/redcontentimage/save',JSON.stringify(content))
-}
-// 删
-export const deleteContentImage=(idList)=>{
-    return $http.post('/content/redcontentimage/delete',JSON.stringify(idList));
-}
-// 改
-export const updateContentImage=(ids)=>{
-    return $http.post('/content/redcontentimage/update',JSON.stringify(ids))
-}
-// 查
-export const getContentImage=(obj)=>{
-    return $http({
-        url:'/content/redcontentimage/getListByParams',
-        method: 'get',
-        params: $http.adornParams(obj)
-    })
-}
-// 查询评论
-export const getCommentList=(obj)=>{
-    let url='';
-    switch(obj.type){
-        case 'CONTENTIMG': url='/content/redcontentimage'; break;
-        case 'CONTENTINFO': url='/content/redcontentinfo'; break;
-        case 'CONTENTLOCALINFO': url='/content/redcontentlocalinfo'; break;
-        case 'STUDYIMG': url='/study/redstudyimage'; break;
-        case 'STUDYINFO': url='/study/redstudyinfo'; break;
-        case 'ACTIVITY' :url="/activity/redactivitymatch";break;
-    }
-    delete obj.type
-    return $httpComment({
-        url:url+'/listComment',
-        method: 'post',
-        params:obj
-    })
-}
-// 地方后台查
-export const getLocalContentInfoListByParams=(obj)=>{
-    return $http({
-        url:'/content/redcontentlocalinfo/getContentLocalInfoListByParams',
-        method: 'post',
-        data: $http.adornParams(obj)
-    })
-}
\ No newline at end of file
diff --git a/src/api/modules/data-dictionary.js b/src/api/modules/data-dictionary.js
deleted file mode 100644
index 2e71125..0000000
--- a/src/api/modules/data-dictionary.js
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * @Author: ym
- * @Date: 2021-09-28 16:17:10
- * @LastEditTime: 2022-09-02 23:04:36
- * @LastEditors: chenkangxu
- * @Description: In User Settings Edit
- * @FilePath: \background-front-end\src\api\modules\data-dictionary.js
- */
-import $http from '../../utils/httpRequest'
-
-//===================== 内容分类 =============================
-// 新增分类
-export const saveNewContentType=(mainTypeName)=>{
-    return $http.post('/management/reddatacontentmaintype/saveNewContentType',JSON.stringify(mainTypeName))
-}
-// 新增子分类
-export const saveNewContentSecondType=(secondTypeName,mainTypeId)=>{
-    return $http.post('/management/reddatacontentsecondtype/saveNewSecondType',{
-        secondTypeName:secondTypeName,
-        mainTypeId:mainTypeId
-    })
-}
-// 修改子类
-export const updateContentSecType=(obj)=>{
-    return $http.post('/management/reddatacontentsecondtype/update',JSON.stringify(obj))
-}
-//修改父类
-export const updateContentMainType=(obj)=>{
-    return $http.post(`/management/reddatacontentmaintype/update`,JSON.stringify(obj))
-}
-// 批量修改子排序
-export const updateContentSecSort=(list)=>{
-    return $http.post('/management/reddatacontentsecondtype/updateSort',JSON.stringify(list))
-}
-// 批量修改排序
-export const updateTypeSort=(list)=>{
-    return $http.post('/management/reddatacontentmaintype/updateSort',JSON.stringify(list))
-}
-// 根据id批量删除部门
-export const deleteType=(idList)=>{
-    return $http.post('/management/reddatacontentmaintype/delete',JSON.stringify(idList));
-}
-// 根据id批量删除子部门
-export const deleteContentSecType=(idList)=>{
-    return $http.post('/management/reddatacontentsecondtype/delete',JSON.stringify(idList));
-}
-// 查询分类
-export const getContentTypeList=()=>{
-    return $http.get('/management/reddatacontentmaintype/getMainSecondTypeList');
-}
-
-//===================== 古诗词分类 =============================
-// 新增主分类
-export const saveNewMainType=(mainTypeName)=>{
-    return $http.post('/management/reddatapoetrymaintype/saveNewMainType',{
-        mainTypeName:mainTypeName
-    })
-}
-// 新增子分类
-export const saveNewSecondType=(secondTypeName,mainTypeId)=>{
-    return $http.post('/management/reddatapoetrysecondtype/saveNewSecondType',{
-        secondTypeName:secondTypeName,
-        mainTypeId:mainTypeId
-    })
-}
-// 修改主类
-export const updateMainType=(obj)=>{
-    return $http.post('/management/reddatapoetrymaintype/update',JSON.stringify(obj))
-}
-// 修改子类
-export const updateSecType=(obj)=>{
-    return $http.post('/management/reddatapoetrysecondtype/update',JSON.stringify(obj))
-}
-// 批量修改主排序
-export const updatePSort=(list)=>{
-    return $http.post('/management/reddatapoetrymaintype/updateSort',JSON.stringify(list))
-}
-// 批量修改子排序
-export const updateSPSort=(list)=>{
-    return $http.post('/management/reddatapoetrysecondtype/updateSort',JSON.stringify(list))
-}
-// 根据id批量删除主部门
-export const deleteMainType=(idList)=>{
-    return $http.post('/management/reddatapoetrymaintype/delete',JSON.stringify(idList));
-}
-// 根据id批量删除子部门
-export const deleteSecType=(idList)=>{
-    return $http.post('/management/reddatapoetrysecondtype/delete',JSON.stringify(idList));
-}
-// 查询分类
-export const getMainSecondTypeList=()=>{
-    return $http.get('/management/reddatapoetrymaintype/getMainSecondTypeList');
-}
-
-//===================== 打卡地 =============================
-// 新增分类
-export const saveNewFootprintType=(footprintTypeName)=>{
-    return $http.post('/management/reddatafootprinttype/saveNewFootprintType',JSON.stringify(footprintTypeName))
-}
-// 批量修改排序
-export const updateFootprintTypeSort=(list)=>{
-    return $http.post('/management/reddatafootprinttype/updateFootprintTypeSort',JSON.stringify(list))
-}
-// 根据id批量删除
-export const deleteFootprint=(idList)=>{
-    return $http.post('/management/reddatafootprinttype/delete',JSON.stringify(idList));
-}
-// 查询分类
-export const getListByParams=()=>{
-    return $http.get('/management/reddatafootprinttype/getList');
-}
-
-
-//==================== 手抄报分类 =============================
-export function getHandCopyTypeList(){
-    return $http({
-        url:'/management/reddatahandcopytype/getList',
-        method:'get',
-    })
-}
-export function saveHandCopyType(data){
-    return $http({
-        url:'/management/reddatahandcopytype/save',
-        method:'post',
-        data
-    })
-}
-export function updateHandCopySort(data){
-    return $http({
-        url:'/management/reddatahandcopytype/updateHandCopySort ',
-        method:'post',
-        data
-    })
-}
-export function deleteHandCopySort(data){
-    return $http({
-        url:'/management/reddatahandcopytype/delete ',
-        method:'post',
-        data
-    })
-}
-
-//==================== 活动/赛事分类 =============================
-//活动分类
-export function getActivityTypeList(){
-    return $http({
-        url:'/management/reddataactivitytype/getList',
-        method:'get',
-    })
-}
-export function saveActivityType(data){
-    return $http({
-        url:'/management/reddataactivitytype/save',
-        method:'post',
-        data
-    })
-}
-export function updateActivitySort(data){
-    return $http({
-        url:'/management/reddataactivitytype/updateActivitySort ',
-        method:'post',
-        data
-    })
-}
-export function deleteActivitySort(data){
-    return $http({
-        url:'/management/reddataactivitytype/delete ',
-        method:'post',
-        data
-    })
-}
-//赛事分类
-export function getMatchTypeList(){
-    return $http({
-        url:'/management/reddatamatchtype/getList',
-        method:'get',
-    })
-}
-export function saveMatchType(data){
-    return $http({
-        url:'/management/reddatamatchtype/save',
-        method:'post',
-        data
-    })
-}
-export function updateMatchSort(data){
-    return $http({
-        url:'/management/reddatamatchtype/updateMatchSort ',
-        method:'post',
-        data
-    })
-}
-export function deleteMatchSort(data){
-    return $http({
-        url:'/management/reddatamatchtype/delete ',
-        method:'post',
-        data
-    })
-}
-//专题分类增删改查
-export function courseThemeSave(data){
-    return $http({
-        url:'/localService/redcoursetheme/save',
-        method:'post',
-        data
-    })
-}
-export function courseThemeDelete(data){
-    return $http({
-        url:'/localService/redcoursetheme/delete',
-        method:'post',
-        data
-    })
-}
-export function courseThemeUpdate(data){
-    return $http({
-        url:'/localService/redcoursetheme/update',
-        method:'post',
-        data
-    })
-}
-export function courseThemeList(params){
-    return $http({
-        url:'/localService/redcoursetheme/list',
-        method:'get',
-        params
-    })
-}
-export function courseThemeSort(data){
-    return $http({
-        url:'/localService/redcoursetheme/updateSort',
-        method:'post',
-        data
-    })
-}
-export function courseThemeAll(params){
-    return $http({
-        url:'/localService/redcoursetheme/getListNoPage',
-        method:'get',
-        params
-    })
-}
\ No newline at end of file
diff --git a/src/api/modules/department-management.js b/src/api/modules/department-management.js
deleted file mode 100644
index 6fa15f6..0000000
--- a/src/api/modules/department-management.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import $http from '../../utils/httpRequest'
-
-// 新增部门√
-export const addDepartment=(departmentName,parentId,parentName,responseUser,departmentRemark,departmentNumber)=>{
-    return $http.post('/sys/sysdepartment/save',{
-        departmentName,parentId,parentName,responseUser,departmentRemark,departmentNumber
-    })
-}
-// 修改部门√
-export const updateDepartment=(departmentId,departmentName,parentId,parentName,responseUser,departmentRemark,departmentNumber)=>{
-    return $http.post('/sys/sysdepartment/update',{
-        departmentId,departmentName,parentId,parentName,responseUser,departmentRemark,departmentNumber
-    })
-}
-// 根据id批量删除部门√
-export const deleteDepartmentsByIdArray=(departmentIdArray)=>{
-    return $http.post('/sys/sysdepartment/delete',JSON.stringify(departmentIdArray));
-}
-// 查询部门√
-export const queryDepartmentById=(departmentId)=>{
-    return $http.get('/sys/sysdepartment/info/'+departmentId);
-}
-
-// 查询全部部门√
-export const queryAllDepartments=()=>{
-    return $http.get('/sys/sysdepartment/list');
-}
\ No newline at end of file
diff --git a/src/api/modules/file.js b/src/api/modules/file.js
deleted file mode 100644
index ca06fcb..0000000
--- a/src/api/modules/file.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import axios from 'axios'
-let request=axios.create({
-    baseURL:'http://123.57.0.201:8080'
-})
-export function UploadFile (data) {
-    //   console.log(111)
-    return request({
-      url: '/csc/oss/upload',
-      headers: {
-        'Content-Type': 'multipart/form-data'
-      },
-      method: 'post',
-      data
-    })
-  }
\ No newline at end of file
diff --git a/src/api/modules/footprint.js b/src/api/modules/footprint.js
deleted file mode 100644
index 8f4baf7..0000000
--- a/src/api/modules/footprint.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * @Author: ym
- * @Date: 2021-09-28 16:17:10
- * @LastEditTime: 2022-01-20 15:42:09
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \background-front-end\src\api\modules\footprint.js
- */
-import $http from '../../utils/httpRequest'
-
-/**
- * 系统管理 意见反馈  查询删除
- * @param {*} mainTypeName 
- * @returns 
- */
-
-// 查询景点所属分类列表
-export const getFootprintTypeList=()=>{
-    return $http.post('/management/reddatafootprinttype/getFootprintTypeListNoPage');
-}
-// 查询景点列表
-export const getFootPrintByParams=(data)=>{
-    return $http({
-        url:'/footprint/redfootprint/getFootPrintByParams',
-        method: 'get',
-        params: $http.adornParams(data)
-    })
-}
-//根据id获取景点/打卡地详情
-export const getFootprintInfo=(url)=>{
-    return $http({
-        url: '/footprint/redfootprint/info/' + url,
-        method: 'get',
-    })
-}
-//添加一个景点  /  打卡地
-export const saveNewFootprint=(data)=>{
-    return $http({
-        url:'/footprint/redfootprint/saveNewFootprint',
-        method: 'post',
-        data: $http.adornData(data)
-    })
-}
-//编辑修改打卡地  修改景点
-export const editFootprint=(data)=>{
-    return $http({
-        url:'/footprint/redfootprint/update',
-        method: 'post',
-        data: $http.adornData(data)
-    })
-}
-//编辑批量删除打卡地  修改景点
-export const deleteFootprintList=(data)=>{
-    return $http({
-        url:'/footprint/redfootprint/delete',
-        method: 'post',
-        data
-    })
-}
-// 查询景点路线列表
-export const getFootprintLineList=(params)=>{
-    return $http({
-        url:"/footprint/redfootprintline/list",
-        method:'post',
-        params
-    })
-}
-// 添加景点路线
-export const saveFootprintLine=(data)=>{
-    return $http({
-        url:"/footprint/redfootprintline/save",
-        method:'post',
-        data
-    })
-}
-// 编辑景点路线
-export const updateFootprintLine=(data)=>{
-    return $http({
-        url:"/footprint/redfootprintline/update",
-        method:'post',
-        data
-    })
-}
-// 删除景点路线
-export const deleteFootprintLine=(data)=>{
-    return $http({
-        url:"/footprint/redfootprintline/delete",
-        method:'post',
-        data
-    })
-}
-// 获取景点路线详情
-export const getFootprintLineDetail=(id)=>{
-    return $http({
-        url:"/footprint/redfootprintline/info/"+id,
-        method:'get',
-    })
-}
\ No newline at end of file
diff --git a/src/api/modules/integral-statistics.js b/src/api/modules/integral-statistics.js
deleted file mode 100644
index 9c4689d..0000000
--- a/src/api/modules/integral-statistics.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * @Author: your name
- * @Date: 2021-12-20 16:29:03
- * @LastEditTime: 2021-12-20 16:31:37
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\api\modules\integral-statistics.js
- */
-import $http from '../../utils/httpRequest'
-
-// 查询积分详情
-export const getIntegralDetail=(params)=>{
-    return $http({
-        url:'/score/detail',
-        params
-    })
-}
-// 查询积分概览
-export const getIntegralOverview=()=>{
-    return $http({
-        url:'/score/count/table'
-    })
-}
\ No newline at end of file
diff --git a/src/api/modules/intetral.js b/src/api/modules/intetral.js
deleted file mode 100644
index 4383ea8..0000000
--- a/src/api/modules/intetral.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * @author: ym
- * @Date: 2021-10-10 13:45:17
- * @LastEditTime: 2021-10-10 14:46:44
- * @LastEditors: ym
- * @Description: 
- * @FilePath: \background-front-end\src\api\modules\intetral.js
- */
-import $http from '../../utils/httpRequest'
-import dayjs from 'dayjs'
-//**********未严格命名 */
-
-
-
-
-//查询升级所需积分
-export function findUploadIntegral(data){
-    return $http({
-        url:'/integral/redintegralupgrade/info/1'
-    })
-}
-//保存升级所需积分
-export function saveUploadIntegral(upgradeId,integral){
-    return $http({
-        url:'/integral/redintegralupgrade/update',
-        method:'post',
-        data:{
-            integral,
-            upgradeId
-        }
-    })
-}
-//查看段位列表
-export function findLevelType(){
-    return $http({
-        url:'/integral/redintegrallevel/list',
-    })
-}
-export function savelevelType(data){
-    
-    return $http({
-        url:'/integral/redintegrallevel/update',
-        method:'post',
-        data
-    })
-}
-//**********未严格命名（结尾） */
-
-
-//查询所有红星币规则
-export function getRedCoinRule(params){
-    return $http({
-        url:'/integral/redstarcoinrule/getRedCoinRuleByParams',
-        params
-    })
-}
-//添加红星币规则
-export function addRedCoinRule(data){
-    console.log(data)
-    return $http({
-        url:'/integral/redstarcoinrule/saveNewRule',
-        method:'post',
-        data
-    })
-}
-//删除红星币规则
-export function deleteRedCoinRule(data){
-    return $http({
-        url:'/integral/redstarcoinrule/delete',
-        method:'post',
-        data
-    })
-}
-//更新红星币规则
-export function updateRedCoinRule(data){
-    return $http({
-        url:'/integral/redstarcoinrule/update',
-        method:'post',
-        data
-    })
-}
-
-//查询所有积分规则
-export function getIntegralRule(params){
-    return $http({
-        url:'/integral/redintegralrule/getRuleListByParams',
-        params
-    })
-}
-//添加积分规则
-export function addIntegralRule(data){
-    return $http({
-        url:'/integral/redintegralrule/saveNewRule',
-        method:'post',
-        data
-    })
-}
-//更新所有积分规则
-export function updateIntegralRule(data){
-    return $http({
-        url:'/integral/redintegralrule/update',
-        method:'post',
-        data
-    })
-}
-//删除所有积分规则
-export function deleteIntegralRule(data){
-    return $http({
-        url:'/integral/redintegralrule/delete',
-        method:'post',
-        data
-    })
-}
-
-//查询积分协议
-export function getInteralAgreement(data){
-    return $http({
-        url:'/integral/redintegralruleinfo/getInfoByContentType/'+data
-    })
-}
-//保存积分协议
-export function saveInteralAgreement(ruleInfoId,ruleInfoContent,contentType){
-    return $http({
-        url:'/integral/redintegralruleinfo/update',
-        method:'post',
-        data:{
-            ruleInfoId,
-            ruleInfoContent,
-            contentType
-        }
-    })
-}
\ No newline at end of file
diff --git a/src/api/modules/local-admin.js b/src/api/modules/local-admin.js
deleted file mode 100644
index f002214..0000000
--- a/src/api/modules/local-admin.js
+++ /dev/null
@@ -1,101 +0,0 @@
-import $http from '@/utils/httpRequest.js'
-
-export const local_admin = {
-    /** 
- * 登录
- * @param {object} params LoginParam
- * @param {number} params.type 
- * @param {string} params.role 
- * @param {string} params.username 
- * @param {string} params.password 
- * @param {string} params.mobile 
- * @param {string} params.code 
- * @returns
- */
-    loginByAccount: (params) => {
-        return $http.post(`/auth/login`, {
-            ...params,
-            type: 1
-        })
-    },
-    loginByMobile: (params) => {
-        return $http.post(`/merchant-api/auth/sms/login`, {
-            ...params,
-            type: 2
-        })
-    },
-    getYZM(mobile) {
-        return $http.get(`/merchant-api/auth/login/code?mobile=${mobile}`);
-    },
-    getInfo() {
-        return $http.get(`/merchant-api/auth/info`);
-    },
-    //获取教育局列表
-    getEducationBureauList() {
-        return $http.get(`/org/area_edu`);
-    },
-    //获取学校分页
-    getSchoolPage: (data) => {
-        return $http.request({
-            url: `/school/page`,
-            method: 'get',
-            params: data
-        })
-    },
-    //添加学校
-    addSchool: (data) => {
-        return $http.post(`/school/add`, data);
-    },
-    //获取数据字典
-    getDictionary: (categoryId) => {
-        return $http.get(`/common/dict?categoryId=${categoryId}`);
-    },
-    //获取省市区
-    getArea: () => {
-        return $http.get(`/common/pca`);
-    },
-    //更新年级
-    updateGrade: (gradeId,data) => {
-        return $http.put(`/grade/update?gradeId=${gradeId}`, data);
-    },
-    //添加年级
-    addGrade: (data) => {
-        return $http.post(`/grade/add`, data);
-    },
-    //获取年级列表
-    getGradeList: () => {
-        return $http.get(`/grade/list`);
-    },
-    //删除年级
-    removeGrade: (gradeId) => {
-        return $http.delete(`/grade/delete?gradeId=${gradeId}`)
-    },
-    //添加班级
-    addClass:(data)=>{
-        return $http.post(`/clazz/add`,data);
-    },
-    //编辑班级
-    updateClass:(data)=>{
-        return $http.post(`/clazz/update?clazzId=${data.clazzId}`,data)
-    },
-    //获取班级列表
-    getClassList:()=>{
-        return $http.get(`/clazz/list`);
-    },
-    //删除班级
-    removeClass:(clazzId)=>{
-        return $http.delete(`/clazz/delete?clazzId=${clazzId}`)
-    },
-    //添加教师
-    addTeacher:(data)=>{
-        return $http.post(`/teacher/add`,data);
-    },
-    //获取教师分页
-    getTeacherPage:(data)=>{
-        return $http.request({
-            url:'/teacher/page',
-            method:'get',
-            params:data
-        })
-    }
-}
\ No newline at end of file
diff --git a/src/api/modules/login.js b/src/api/modules/login.js
deleted file mode 100644
index 7938e87..0000000
--- a/src/api/modules/login.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import $http from "@/utils/httpRequest.js"
-
-export const login={
-
-}
\ No newline at end of file
diff --git a/src/api/modules/mer_admin.js b/src/api/modules/mer_admin.js
new file mode 100644
index 0000000..22f5672
--- /dev/null
+++ b/src/api/modules/mer_admin.js
@@ -0,0 +1,54 @@
+import $http from '@/utils/httpRequest.js'
+
+export const mer_admin = {
+    /** 
+ * 登录
+ * @param {object} params LoginParam
+ * @param {number} params.type 
+ * @param {string} params.role 
+ * @param {string} params.username 
+ * @param {string} params.password 
+ * @param {string} params.mobile 
+ * @param {string} params.code 
+ * @returns
+ */
+    loginByAccount: (params) => {
+        return $http.post(`/auth/login`, {
+            ...params,
+            type: 1
+        })
+    },
+    loginByMobile: (params) => {
+        return $http.post(`/merchant-api/auth/sms/login`, {
+            ...params,
+            type: 2
+        })
+    },
+    getYZM(mobile) {
+        return $http.get(`/merchant-api/auth/login/code?mobile=${mobile}`);
+    },
+    getInfo() {
+        return $http.get(`/merchant-api/auth/info`);
+    },
+    //商品管理
+    //保存商品信息
+    saveProduct:(data)=>{
+        return $http.post(`/merchant-api/product/save`,data);
+    },
+    //保存商品基本信息
+    saveProductBase:(data)=>{
+        return $http.post(`/merchant-api/product/save/basic`,data);
+    },
+    //返回商品分类以及列表(聚合)
+    getPolyProduct:(data)=>{
+        return $http.post(`/merchant-api/product/polymerization/list`,data);
+    },
+    //商品分页
+    getProductPage:(data)=>{
+        return $http.post(`/merchant-api/product/page`,data);
+    },
+    //商户商品分类
+    getProductCategory:()=>{
+        return $http.get(`/merchant-api/product/category/list?shopId=${JSON.parse(sessionStorage.getItem('userInfo')).shopId}`);
+    }
+}
\ No newline at end of file
diff --git a/src/api/modules/my.js b/src/api/modules/my.js
deleted file mode 100644
index 5d19bfc..0000000
--- a/src/api/modules/my.js
+++ /dev/null
@@ -1,140 +0,0 @@
-import $http from '../../utils/httpRequestUser'
-// 个人中心接口
-export const my={
-	// 认证
-	identifyCode(inviteCode){
-		return $http.post(`/user/redstudent/identifyCode`,inviteCode);
-	},
-	// 意见反馈
-	feedback(form){
-		return $http.post(`/user/redsystemfeedback/save`,form);
-	},
-	// ==================最近/学习记录 start==========================//
-	//获取历史记录
-	getStudyRecords(){
-		return $http.post(`/talk/userrecent/list`);
-	},
-	//清空历史记录
-	cleanRecently(){
-		return $http.get('talk/userrecent/delete');
-	},
-	// ==================最近/学习记录 end==========================//
-	//===================我的 start================================//
-	//获取用户信息
-	getUserInfo(){
-		return $http.get(`/user/reduser/getUserInfo`);
-	},
-	//=================积分 start================================//
-	//获取积分任务完成信息
-	getPointsTaskInfo(){
-		return $http.get(`/score/list`);
-	},
-	//获取最近7天积分明细
-	getPointsTask7Detail(){
-		return $http.get(`/score/weekList`)
-	},
-	// 获取特定日期的积分明细
-	getPointTaskDateDeatil(date){
-		return $http.post(`/score/getListByDay`,{
-			date
-		})
-	},
-	//获取积分说明
-	getPointExplain(contentType=1){
-		return $http.get(`/score/redintegralruleinfo/getInfo/${contentType}`);
-	},
-	//=================积分 end=================================//
-	// ================个人信息 start==========================//
-	// 更新用户信息
-	updateUserInfo(role,redPassportNumber,ids,data){
-		return $http.post(`/user/reduser/updateUserInfo`,{...data,role,...ids,redPassportNumber})
-	},
-	//=================个人信息 end===========================//
-	// ================红星榜 start==========================//
-	//获取顶部通用数据
-	getRedStarBoardData(){
-		return $http.get(`/score/getRedStarData`);
-	},
-	//获取足迹打卡榜单
-	getFootmarkRank(){
-		return $http.get(`/score/getFootprintRank`);
-	},
-	// 获取积分榜单
-	getPointRank(){
-		return $http.get(`/score/getRedStarRank`);
-	},
-	//=================红星榜 end=============================//
-	//================红色生涯 start=========================//
-	//获取红色生涯(获取时间轴)
-	getMyRedCareer(page=1,limit=20){
-		return $http.get(`/user/reduser/getRedCareer?page=${page}&limit=${limit}`)
-	},
-	//获取证书
-	getMyReward(){
-		return $http.get(`/activity/reduseraward/getAwardByUser`)
-	},
-	//================红色生涯 end==========================//
-	//================红星小铺 start============================//
-	// 获取分类列表
-	getGoodsTypeList(){
-		return $http.get(`/shop/dataproducttype/list`)
-	},
-	// 根据分类获取商品
-	getGoodsByType(productTypeName="",page=1,limit=20){
-		return $http.get(`/shop/shopproduct/list?productTypeName=${productTypeName}&page=${page}&limit=${limit}`)
-	},
-	//兑换记录
-	getExchangeRecord(page=1,limit=10){
-		return $http.get(`/shop/shoporder/list?page=${page}&limit=${limit}`)
-	},
-	//兑换详情
-	getExchangeRecordInfo(orderId){
-		return $http.get(`/shop/shoporder/info/${orderId}`)
-	},
-	//兑换/下单
-	buyGood(data){
-		return $http.post(`/shop/shoporder/save`,data)
-	},
-	//获取最近一周的红星币
-	geRedCointWeekList(){
-		return $http.get(`/shop/coinrecord/getWeekList`);
-	},
-	//根据日期查看获取的红星币明细
-	getRedCoinListByDay(date){
-		return $http.post(`/shop/coinrecord/getListByDay`,{
-			date
-		})
-	},
-	//================红星小铺 end============================//
-	//===============红色护照  start==========================//
-	getRedPassport(){
-		return $http.get(`/user/reduser/getRedPassport`)
-	},
-	//上传照片
-	uploadPhoto(redUserId,userPhoto){
-		return $http.post(`/user/reduser/update`,{
-			redUserId,userPhoto
-		})
-	},
-	//===============红色护照  end=============================//
-	
-	//===============消息 start===========================//
-	//获取消息列表 总列表
-	getReportList(page,limit){
-		return $http.get(`/report/list`)
-	},
-	// 获取消息列表详情
-	getReportInfoList(type,page=1,limit=10){
-		return $http.get(`/report/listInfo?type=${type}&page=${page}&limit=${limit}`)
-	},
-	//==============消息 end==============================//
-	//==============咨询 start==============================//
-	getProblemResovleList(page=1,limit=10){
-		return $http.get(`/system/redsystemproblemsolve/list?page=${page}&limit=${limit}`);
-	},
-	// =============咨询 end ================================//
-	//通过第一次的欢迎仪式,通过后，isFirst变为1；
-	doneWelcomeCeremony(){
-		return $http.get(`/user/reduser/updateFirst`);
-	}
-} 
\ No newline at end of file
diff --git a/src/api/modules/notice-management.js b/src/api/modules/notice-management.js
deleted file mode 100644
index aa947fd..0000000
--- a/src/api/modules/notice-management.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * @Author: ym
- * @Date: 2021-09-25 16:08:51
- * @LastEditTime: 2021-09-25 16:20:08
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \piecework-treasure\src\api\modules\notice-management.js
- */
-import $http from '../../utils/httpRequest'
-
-// 添加新公告
-export const addReport=(reportTitle,reportContent)=>{
-    return $http.post('/sys/report/save',{
-        reportTitle,reportContent
-    })
-}
-
-// 修改通知
-export const updateReport=(reportId,reportTitle,reportContent)=>{
-    return $http.post('/sys/report/update',{
-        reportId,reportTitle,reportContent
-    })
-}
-
-// 删除通知
-export const deleteReportsByIds=(reportIdsArray)=>{
-    return $http.post('/sys/report/delete',JSON.stringify(reportIdsArray))
-}
-
-// 日期条件都不传就查询全部 ， 支持1.只传日期 2.传日期加条件
-export const getReportsList=(condition,beginDay,endDay,page=1,limit=10)=>{
-    // 2010-08-29 00:00:00             2022-08-29 00:00:00
-    return $http.get(`/sys/report/list?page=${page}&limit=${limit}&beginDay=${beginDay}&endDay=${endDay}&condition=${condition}`)
-}
-
-// 通知详情
-export const getReportInfo=(reportId)=>{
-    return $http.get(`/sys/report/info/${id}`)
-}
\ No newline at end of file
diff --git a/src/api/modules/org.js b/src/api/modules/org.js
deleted file mode 100644
index c24ff09..0000000
--- a/src/api/modules/org.js
+++ /dev/null
@@ -1,39 +0,0 @@
-//管理下属机构，总后台管理地方后台
-import $http from '../../utils/httpRequest'
-
-export const org={
-    //获取组织列表
-    getOrgList(){
-        return $http.get('/organization/list')
-    },
-    //创建机构
-    createOrg(data){
-        return $http.post('/organization/add',data)
-    },
-    //删除机构
-    deleteOrg(orgId){
-        return $http.put(`/organization/delete?orgId=${orgId}`)
-    },
-    //编辑机构
-    editOrg(orgId,data){
-        return $http.put(`/organization/update?orgId=${orgId}`,data)
-    },
-    //修改机构地方管理后台管理账号密码
-    //支持jsdoc
-    /**
-     * @param {Object} data
-     * @param {String} data.id
-     * @param {String} data.password
-     */
-    changeAccountPassword(data){
-        return $http.put('/organization/update_local_password',data)
-    },
-    //分配地方后台管理账号
-    assignAccount(data){
-        return $http.post('/organization/assign_local_account',data)
-    },
-    //重新分配地方后台管理账号
-    reassignAccount(data){
-        return $http.post('/organization/reassign_local_account',data)
-    }
-}
\ No newline at end of file
diff --git a/src/api/modules/produce-management.js b/src/api/modules/produce-management.js
deleted file mode 100644
index 0187e26..0000000
--- a/src/api/modules/produce-management.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * @Author: chenkangxu
- * @Date: 2021-09-26 12:46:12
- * @LastEditTime: 2021-09-26 22:15:17
- * @LastEditors: chenkangxu
- * @Description: 生产管理模块api
- * @Github: 
- */
-import $http from '../../utils/httpRequest'
-
-// #region 款式生产
-/**
- * @description: 新增款式
- * @param {Object} data
- * @return {*}
- */
-export const addPattern=(data)=>{
-    /**
-     * {
-        createNumber: (...)
-        deliveryDay: (...)
-        orderNumber: (...)
-        patternCreateTime: (...)
-        patternName: (...)
-        patternNumber: (...)
-        patternRemark: (...)
-     * }
-     */    
-    return $http.post('/create/pattern/save',data)
-}
-
-/**
- * @description: 查看款式
- * @param {*}
- * @return {*}
- */
-export const getPatternInfo=(pattekrnId)=>{
-    return $http.get('/create/pattern/info/'+pattekrnId)
-}
-/**
- * @description: 删除款式
- * @param {*}
- * @return {*}
- */
-export const deletePatternsByIdsArray=(IdsArray)=>{
-    return $http.post('/create/pattern/delete',JSON.stringify(IdsArray))
-}
-
-/**
- * @description: 修改款式和款式状态修改
- * @param {*}
- * @return {*}
- */
-export const updatePattern=(patternId,patternName,workStatus)=>{
-    return $http.post('/create/pattern/update',{
-        patternId,patternName,workStatus
-    })
-}
-/**
- * @description: 查看全部款式
- * @param {*}
- * @return {*}
- */
-export const getPatternList=(data,page=1,limit=10)=>{
-    return $http.get(`/create/pattern/list?page=${page}&limit=${limit}&${data.timeType=='创建时间'?'':'D'}beginDay=${data.startDate}&${data.timeType=='创建时间'?'':'D'}endDay=${data.endDate}&workStatus=${data.status=='所有状态'?'':data.status}&isExistProcess=${data.onlyNoProcess}&condition=${data.filter}`);
-}
-/**
- * @description: 查询对应款式得全部工序
- * @param {*}
- * @return {*}
- */
-export const getProcessOfPattern=(patternId)=>{
-    return $http.get(`/create/process/listByPattern/${patternId}`)
-}
-// #endregion
\ No newline at end of file
diff --git a/src/api/modules/service.js b/src/api/modules/service.js
deleted file mode 100644
index e52603d..0000000
--- a/src/api/modules/service.js
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * @author: ym
- * @Date: 2021-10-11 19:24:45
- * @LastEditTime: 2022-08-03 17:38:13
- * @LastEditors: 陈伟亮 1186723967@qq.com
- * @Description: 
- * @FilePath: \background-front-end\src\api\modules\service.js
- */
-//===================== 服务 =============================
-import $http from '../../utils/httpRequest'
-
-// 轮播图管理
-// 增
-export const saveLocalServiceImage=(content)=>{
-    return $http.post('/localService/redstudyimage/save',JSON.stringify(content))
-}
-// 删
-export const deleteLocalServiceImage=(idList)=>{
-    return $http.post('/localService/redstudyimage/delete',JSON.stringify(idList));
-}
-// 改
-export const updateLocalServiceImage=(ids)=>{
-    return $http.post('/localService/redstudyimage/update',JSON.stringify(ids))
-}
-// 查
-export const getLocalServiceImage=(obj)=>{
-    return $http({
-        url:'/localService/redstudyimage/getListByParams',
-        method: 'get',
-        params: $http.adornParams(obj)
-    })
-}
-
-// 课程
-// 增
-export const saveNewCourse=(content)=>{
-    return $http.post('/localService/redstudycourse/saveNewCourse',JSON.stringify(content))
-}
-// 删
-export const deleteRedCourse=(ids)=>{
-    return $http.post('/localService/redstudycourse/delete',ids);
-}
-// 改
-export const updateRedCourse=(content)=>{
-    return $http.post('/localService/redstudycourse/updateCourse',JSON.stringify(content))
-}
-// 查
-export const getCourseListByParams=(obj)=>{
-    return $http({
-        url:'/localService/redstudycourse/getCourseListByParams',
-        method: 'get',
-        params: $http.adornParams(obj)
-    })
-}
-// 修改课程排序号
-export const updateCourseListSort=(data)=>{
-    console.log(data)
-    return $http({
-        url:'/localService/redstudycourse/updateBatchSort',
-        method: 'post',
-        data
-    })
-}
-
-// 古诗词
-// 增
-export const saveRedPoetry=(content)=>{
-    return $http.post('/localService/redpoetry/save',JSON.stringify(content))
-}
-// 删
-export const deleteRedPoetry=(ids)=>{
-    return $http.post('/localService/redpoetry/delete',JSON.stringify(ids));
-}
-// 改
-export const updateRedPoetry=(content)=>{
-    return $http.post('/localService/redpoetry/update',JSON.stringify(content))
-}
-// 查
-export const getPoetryByParams=(obj)=>{
-    return $http({
-        url:'/localService/redpoetry/getPoetryByParams',
-        method: 'get',
-        params: $http.adornParams(obj)
-    })
-}
-
-
-//教育局学校管理
-// 增 教育局超管
-export const saveNewEducation=(content)=>{
-    return $http.post('/localService/rededucation/saveNewEducation',JSON.stringify(content))
-}
-// 增 学校超管
-export const saveNewSchool=(content)=>{
-    return $http.post('/localService/redschool/saveNewSchool',JSON.stringify(content))
-}
-// // 删
-// export const deleteRedPoetry=(ids)=>{
-//     return $http.post('/localService/redpoetry/delete',JSON.stringify(ids));
-// }
-// 改
-// 修改教育局
-export function updateEducation (content) {
-    return $http.post('/localService/rededucation/updateEducation',JSON.stringify(content))
-}
-// 修改角色
-export function updateSchool (content) {
-    return $http.post('/localService/redschool/updateSchool',JSON.stringify(content))
-}
-
-// 查 教育局
-export const getEducationByParams=(obj)=>{
-    return $http({
-        url:'/localService/rededucation/getList',
-        method: 'get',
-        params: $http.adornParams(obj)
-    })
-}
-// 查 学校
-export const getSchoolByParams=(obj)=>{
-    return $http({
-        url:'/localService/redschool/getList',
-        method: 'get',
-        params: $http.adornParams(obj)
-    })
-}
-
-// 获取角色列表, 根据当前用户 
-export const selectRoles=()=>{
-    return $http({
-        url:'/sys/role/select'
-    })
-  }
-
-// 查 详情
-export const getEducationInfo=(id)=>{
-    return $http({
-        url:'/localService/rededucation/info/'+id,
-        method: 'get'
-    })
-}
-
-//=================手抄报管理==================
-//查询
-export function getHandlCopyManagementList(params){
-    return $http({
-        url:'/localService/redhandcopy/getListByParams',
-        method:'get',
-        params
-    })
-}
-//修改
-export function updateHandlCopyManagement(data){
-    return $http({
-        url:'/localService/redhandcopy/update',
-        method:'post',
-        data
-    })
-}
-//删除
-export function deleteHandlCopyManagementList(data){
-    return $http({
-        url:'/localService/redhandcopy/delete',
-        method:'post',
-        data
-    })
-}
-//添加
-export function saveHandlCopyManagement(data){
-    return $http({
-        url:'/localService/redhandcopy/save',
-        method:'post',
-        data
-    })
-}
-//=================资讯管理==================
-// 增
-export const saveServiceNewInfo=(content)=>{
-    return $http.post('/localService/redstudyinfo/save',JSON.stringify(content))
-}
-// 删
-export const deleteServiceNewInfo=(idList)=>{
-    return $http.post('/localService/redstudyinfo/delete',JSON.stringify(idList));
-}
-// 改
-export const updateServiceNewInfo=(ids)=>{
-    return $http.post('/localService/redstudyinfo/update',JSON.stringify(ids))
-}
-// 查
-export const geServiceNewInfoListByParams=(obj)=>{
-    return $http({
-        url:'/localService/redstudyinfo/getStudyInfoListByParams',
-        method: 'get',
-        params: $http.adornParams(obj)
-    })
-}
-
-export const service={
-    //添加题库
-    addQuestionBatch(data){
-        return $http.post(`/project/pruserprojectitem/saveBatch`,JSON.stringify(data))
-    },
-    //删除某个题目
-    deleteQuestion(questionIdsArray){
-        return $http.post(`/project/pruserprojectitem/delete`,JSON.stringify(questionIdsArray));
-    },
-    //修改某个题目
-    editQuestion(data){
-        data.expand=JSON.stringify(data.expand)
-        data.regList=JSON.stringify(data.regList)
-        return $http.post(`/project/pruserprojectitem/update`,data)
-    },
-    //获取题库列表
-    getQuestionList(params){
-        return $http.get(`/project/pruserprojectitem/list`,{params});
-    }
-}
\ No newline at end of file
diff --git a/src/api/modules/shop-system.js b/src/api/modules/shop-system.js
deleted file mode 100644
index b843215..0000000
--- a/src/api/modules/shop-system.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * @author: ym
- * @Date: 2021-11-02 13:39:40
- * @LastEditTime: 2021-11-02 13:43:07
- * @LastEditors: ym
- * @Description: 
- * @FilePath: \background-front-end\src\api\modules\shop-system.js
- */
-import $http from '../../utils/httpRequest'
-//===================== 商品分类 =============================
-// 新增分类
-export const saveDataProductType=(typeName)=>{
-    return $http.post('/management/reddataproducttype/save',JSON.stringify(typeName))
-}
-// 批量修改
-export const updateProductTypeSort=(list)=>{
-    return $http.post('/management/reddataproducttype/updateProductTypeSort',JSON.stringify(list))
-}
-// // 根据id批量删除
-export const deleteProductType=(idList)=>{
-    return $http.post('/management/reddataproducttype/delete',JSON.stringify(idList));
-}
-// 查询分类
-export const getProductTypeListByParams=()=>{
-    return $http.get('/management/reddataproducttype/getList');
-}
-
-//===================== 商品管理 =============================
-// 新增分类
-export const saveProduct=(obj)=>{
-    return $http.post('/shop/redshopproduct/save',JSON.stringify(obj))
-}
-// 批量修改
-export const updateProduct=(obj)=>{
-    return $http.post('/shop/redshopproduct/update',JSON.stringify(obj))
-}
-// // 根据id批量删除
-export const deleteProduct=(idList)=>{
-    return $http.post('/shop/redshopproduct/delete',JSON.stringify(idList));
-}
-// 查询分类
-export const getProductListByParams=(obj)=>{
-    return $http.request({
-        method: 'get',
-        params:obj,
-        url:"/shop/redshopproduct/getListByParams"
-    })
-    // return $http.get('/shop/redshopproduct/getListByParams',JSON.stringify(obj));
-}
\ No newline at end of file
diff --git a/src/api/modules/study.js b/src/api/modules/study.js
deleted file mode 100644
index 4d3613c..0000000
--- a/src/api/modules/study.js
+++ /dev/null
@@ -1,389 +0,0 @@
-import $http from '../../utils/httpRequestUser.js'
-
-// 学习接口
-export const study = {
-	// 获取轮播图列表
-	getStudySwiper() {
-		return $http.get(`/study/redstudyimage/getList`);
-	},
-	// 获取学习资讯列表
-	getStudyNews(page = 1, limit = 20) {
-		return $http.get(`/study/redstudyinfo/list?page=${page}&limit=${limit}`)
-	},
-	// 获取资讯详情
-	getStudyNewsInfo(contentInfoId) {
-		return $http.get(`/study/redstudyinfo/info/${contentInfoId}`)
-	},
-	//获取轮播图资讯
-	getStudySwiperInfo(contentInfoId) {
-		return $http.get(`/study/redstudyimage/info/${contentInfoId}`)
-	},
-	//=============教师观察start==============//
-	//判断是否为老师
-	judgeIsTeacher() {
-		return $http.get(`/user/redteacher/isTeacher`);
-	},
-	// 获取邀请码
-	createInviteCode(teacherId) {
-		return $http.get(`/user/redteacher/createCode/${teacherId}`)
-	},
-	// 获取成员列表和创建的邀请码
-	getClassInfoByTeacherId(teacherId) {
-		return $http.get(`/user/redteacher/getClassInfoByTeacherId/${teacherId}`)
-	},
-	// 获取申请列表
-	getStudentApplyList(teacherId) {
-		return $http.get(`/user/redteacher/getStudentApplyList/${teacherId}`)
-	},
-	// 申请通过
-	getAgreeApply(userId) {
-		return $http.get(`/user/redteacher/getAgreeApply/${userId}`)
-	},
-	// 申请通过
-	deleteStudent(studentId) {
-		return $http.get(`/user/redteacher/deleteStudent/${studentId}`)
-	},
-	//查询爱国主义课程学习情况
-	getStudentStudyStatus(courseId /* 课程id */ , teacherId /* 教师id */ ) {
-		return $http.get(`/user/redteacher/getUserStudyList?courseId=${courseId}&teacherId=${teacherId}`);
-	},
-	//获取当前老师的所有管理的课程(每个老师的课程都是一样的)
-	getAllCourseByTeacherId() {
-		return $http.get(`/user/redteacher/getCourseList`)
-	},
-	// 催学生
-	urgeStudents(userIdsAndCourseIdsArray) {
-		return $http.post(`/report/pushStudent`, JSON.stringify(userIdsAndCourseIdsArray))
-	},
-	//=============教师观察end===================//
-
-	// ============爱国主义教育start================//
-	// 获取爱国主义课程列表
-	getPatriotismCourseList(page = 1, limit = 20) {
-		return $http.get(`/study/redstudycourse/getList?page=${page}&limit=${limit}`);
-	},
-	// 获取爱国主页课程详情
-	getPatriotismCourseInfo(courseId /* 课程id */ ) {
-		return $http.get(`/study/redstudycourse/getCourseInfoById/${courseId}`)
-	},
-	// 完成课程的接口
-	finishCourse(courseId) {
-		return $http.get(`/study/redstudycourse/videoIsOver/${courseId}`);
-	},
-	// 提交试卷 接口文档https://easydoc.net/s/80870525/lFkazUXb/ccBRVOz7
-	submitExam(data) {
-		return $http.post(`/study/redstudycourse/submitPaper`, data)
-	},
-
-
-
-	//=============爱国主义教育end===================//
-
-	//=============古诗词学习start=================//
-	//获取古诗分类
-	getPoetryType() {
-		return $http.get(`/study/reddatapoetrymaintype/list`);
-	},
-	// 获取古诗列表
-	getPoetryList(secondTypeId /* 古诗类型id */ , page, limit) {
-		return $http.get(`/study/redpoetry/list?secondTypeId=${secondTypeId}&page=${page}&limit=${limit}`)
-	},
-	//古诗全文搜索
-	searchPoetryByName(searchName) {
-		return $http.get(`/study/redpoetry/searchPoetry?searchName=${searchName}`)
-	},
-	//获取古诗详情
-	getPoetryInfo(poetryId /* 古诗id */ ) {
-		return $http.post(`/study/redpoetry/info/${poetryId}`)
-	},
-	//=============古诗词学习end==================//
-
-	//============手抄报start===================//
-	// 获取手抄报类型
-	getHandPaperType() {
-		return $http.get(`/study/reddatahandcopytype/list`);
-	},
-	// 获取手抄报列表
-	getHandPaperList(typeId, searchName = '') {
-		return $http.get(`/study/redhandcopy/list?typeId=${typeId}&searchName=${searchName}`);
-	},
-	// 获取手抄报详情
-	getHandPaperInfo(handPaperId) {
-		return $http.post(`/study/redhandcopy/info/${handPaperId}`);
-	},
-	//手抄报点赞
-	likePaper(articleId) {
-		return $http.post(`/study/redhandcopy/up`, {
-			articleId
-		})
-	},
-	//手抄报取消点赞
-	cancelLikePaper(articleId) {
-		return $http.post(`/study/redhandcopy/cancelup`, {
-			articleId
-		})
-	},
-	//===========手抄报end================//
-	//==========立德树人以及家教家风 start============//
-	//获取立德树人列表 废弃
-	getMoralityEducationList(page = 1, limit = 20) {
-		return $http.get(`/study/redstudyinfo/getFamilyList`);
-	},
-	//获取家教家风列表 废弃
-	getFamilyStyleList(page = 1, limit = 20) {
-		return $http.get(`/study/redstudyinfo/getVirtueList`);
-	},
-	//统一获取立德树人、爱国主义、家教家风
-	getRedStudyCourse(courseType, page = 1, limit = 20,searchName='',courseGrade=1,courseThemeId="") {
-		return $http.get(`/study/redstudycourse/getList?courseType=${courseType}&page=${page}&limit=${limit}&title=${searchName}&courseGrade=${courseGrade}&courseThemeId=${courseThemeId}`)
-	},
-	//==========立德树人以及家教家风 end============//
-
-	//==========课堂 start=========================//
-	// 创建课堂
-	/**
-	 * @description 创建课堂
-	 * @param {String} courseName 课程名称
-	 * @param {String} courseUrl 课程图片
-	 */
-	createClassroom(courseName, courseUrl) {
-		return $http.post(`/course/save`, {
-			courseName,
-			courseUrl
-		})
-	},
-	/**
-	 * @description 删除课堂
-	 * @param {Array<String>} courseIdsArray 要删除的课程id数组
-	 */
-	deleteClassroom(courseIdsArray) {
-		return $http.post(`/course/delete`, JSON.stringify(courseIdsArray))
-	},
-	/**
-	 * @description 修改课堂信息
-	 * @param {String} courseId 要更改的课堂id
-	 * @param {String} courseName 要更改的名字
-	 * @param {String} courseUrl 要更改的课堂图片OSS地址
-	 */
-	updateClassroom(courseId, courseName, courseUrl) {
-		return $http.post(`/course/update`, {
-			courseId,
-			courseName,
-			courseUrl
-		})
-	},
-	/**
-	 * @description 查看对应的课堂详情
-	 * @param {String} courseId 要查看的课堂id
-	 */
-	getClassroomInfo(courseId) {
-		return $http.get(`/course/info/${courseId}`);
-	},
-	/**
-	 * @description 查询课堂列表
-	 */
-	getClassroomsList(page = 1, litmit = 10) {
-		return $http.get(`/course/list?page=${page}&litmit=${litmit}`);
-	},
-	/**
-	 * @description 批量拉学生进课堂
-	 * @param {String[]} userIds 课堂id
-	 *  * @param {String} courseId 课堂id
-	 */
-	saveStudents(userIds,courseId){
-		return $http.post(`/course/saveStudents`,{
-			userIds,
-			courseId
-		})
-	},
-	/**
-	 * @description 获取课堂邀请码
-	 * @param {String} courseId 课堂id
-	 */
-	getInviteCode(courseId) {
-		return $http.get(`/course/createCode/${courseId}`);
-	},
-	/**
-	 * @description 根据邀请码加入课堂
-	 * @param {String} inviteCode 邀请码
-	 */
-	joinInClassroomByInviteCode(inviteCode) {
-		return $http.get(`/course/saveUserByCode/${inviteCode}`)
-	},
-	/**
-	 * @description 发布讨论
-	 * @param {String} talkTitle 讨论标题
-	 * @param {String} talkContent 讨论内容
-	 * @param {String} courseId 要发布到的课堂id
-	 */
-	createTalk(talkTitle, talkContent, courseId) {
-		return $http.post(`/talk/talk/save`, {
-			talkTitle,
-			talkContent,
-			courseId
-		})
-	},
-	/**
-	 * @description 获取对应的课堂里的讨论列表
-	 * @param {String} courseId 对应的课堂id
-	 */
-	getTalkList(courseId,page=1,limit=10) {
-		return $http.get(`/talk/talk/list?courseId=${courseId}&page=${page}&limit=${limit}`);
-	},
-	/**
-	 * @description 删除讨论
-	 * @param {Array<String>} talkIdsArray 对应的讨论id数组
-	 */
-	deleteTalk(talkIdsArray) {
-		return $http.post(`/talk/talk/delete`, JSON.stringify(talkIdsArray));
-	},
-	/**
-	 * @description 更新讨论
-	 * @param {String} talkId 讨论id
-	 * @param {String} talkTitle 讨论标题
-	 * @param {String} talkContent 话题内容
-	 */
-	updateTalk(talkId,talkTitle,talkContent) {
-		return $http.post(`/talk/talk/update`, {
-			talkId,talkTitle,talkContent
-		})
-	},
-	/**
-	 * @description 获取讨论详情
-	 * @param {String} talkId 讨论id
-	 */
-	getTalkInfo(talkId){
-		return $http.post(`/talk/talk/info/${talkId}`);
-	},
-	/**
-	 * @description 回复讨论
-	 * @param {String} parentId 回复的talkId
-	 * @param {String} commentContent 回复内容
-	 * @param {String} commentImg 回复的图片
-	 */
-	replyTalk(talkId,commentContent,commentImg){
-		return $http.post(`/talk/talk/saveComment`,{
-			parentId:talkId,commentContent,commentImg
-		})
-	},
-	/**
-	 * @description 删除回复的讨论
-	 * @param {Array<String>} commentIdsArray 要删除的回复id的数组
-	 */
-	deleteReplyTalk(commentIdsArray){
-		return $http.post(`/talk/comment/delete`,JSON.stringify(commentIdsArray));
-	},
-	/**
-	 * @description 查询课堂的所有学生
-	 */
-	classroomStudentList(courseId,name='',page=1,limit=10){
-		return $http.get(`/course/usercourse/list?courseId=${courseId}&name=${name}&page=${page}&limit=${limit}`);
-	},
-	/**
-	 * @description 移除学生
-	 */
-	removeStudent(ucIdsArray){
-		return $http.post(`/course/usercourse/delete`,JSON.stringify(ucIdsArray));
-	},
-	//==========课堂 end===========================//
-	//==========动态 分享 start======================//
-	/**
-	 * @description 获取该课堂的所有动态与分享 目前就两种：成绩分享和文章分享
-	 * @param {String} 要分享到的课堂id 
-	 * @param {String} page limit
-	 */
-	getShareList(courseId,page,limit){
-		return $http.get(`/user/share/list?courseId=${courseId}&page=${page}&limit=${limit}`)
-	},
-	/**
-	 * @description 分享到课堂
-	 * @param {Object} data {articleType,articleId,comment,courseId,score}
-	 **/
-	shareToClassroom(data){
-		return $http.post(`/user/share/save`,data)
-	},
-	/**
-	 * @description 删除我的分享
-	 * @param {Array<String>} shareIdsArray 分享id字符串数组
-	 **/
-	 deleteMyShare(shareIdsArray){
-		 return $http.post(`/user/share/delete`,JSON.stringify(shareIdsArray));
-	 },
-	//==========动态 分享 end========================//
-	//===============提升练习 start==================//
-	/**
-	 * @description 根据练习类型获取提升练习列表
-	 * @param {String} practiceType 练习类型
-	 * @param {String} searchName 模糊搜索 
-	 **/
-	getPracticesListByType(practiceType,page,limit,searchName='',courseThemeId){
-		return $http.get(`/study/redteacherpractice/getListByType?page=${page}&limit=${limit}&practiceType=${practiceType}&practiceName=${searchName}&courseThemeId=${courseThemeId}`);
-	},
-	/**
-	 * @description 根据练习id获取练习详情
-	 * @param {String} practiceId 练习id
-	 **/
-	getPracticeInfoById(practiceId){
-		return $http.get(`/study/redteacherpractice/getPracticeInfoById/${practiceId}`)
-	},
-	/**
-	 * @description 提交练习
-	 * @param {Object} data 对应的数据
-	 **/
-	submitPractice(data){
-		return $http.post(`/study/redteacherpractice/submitPractice`,data)
-	},
-	//===============提升练习 end====================//
-	//===============教师发布提升练习 题库 start================//
-	/**
-	 * @description 获取对应专题的题库数据
-	 */
-	getPracticeList(itemType,page=1,limit=10,courseThemeId=''){
-		return $http.get(`/project/pruserprojectitem/list?page=${page}&limit=${limit}&itemType=${itemType}&courseThemeId=${courseThemeId}`)
-	},
-	/**
-	 * @description 根据勾选的题库进行发布随堂练习
-	 */
-	sendNewPractice(data){
-		return $http.post(`/study/redteacherpractice/saveNewPractice`,data)
-	},
-	/**
-	 * @description 查询我发布的练习
-	 */
-	getMyPublishedPractice(practiceType,page=1,limit=10,searchName='',courseThemeId){
-		return $http.request({
-			url:"/study/redteacherpractice/getPracticeByTeacher",
-			method:"get",
-			data:{
-				page,limit,searchName,practiceType,courseThemeId
-			}
-		})
-	},
-	/**
-	 * @description 查看当前练习的详情以及完成情况
-	 * @param {String} practiceId 
-	 */
-	getMyPublishedPracticeInfo(practiceId){
-		return $http.get(`/study/redteacherpractice/getPracticeDetailsById/${practiceId}`)
-	},
-	/**
-	 * @description 移除我发布的随堂练习
-	 * @param {Array<String>} practiceIdsArray 随堂练习id数组
-	 */
-	removeMyPublishedPractice(practiceIdsArray){
-		return $http.post(`/study/redteacherpractice/deletePractice`,JSON.stringify(practiceIdsArray))
-	},
-	//===============教师发布提升练习 end================//
-	/**
-	 * @description 获取学习模块下的分类 如点击思想教育，获取下列的伟大领袖、红色印记、英烈人物、爱国情怀
-	 */
-	getStudySecondModule(courseType){
-		return $http.get(`/study/redcoursetheme/getListByType?courseType=${courseType}`)
-	},
-	/**
-	 * @@description 获取待学习的课程列表
-	 */
-	getStudyingCourseList(courseGrade=1,courseType='',courseThemeId=''){
-		return $http.get(`/study/redstudycourse/getNotStudyCourse?courseGrade=${courseGrade}&courseType=${courseType}&courseThemeId=${courseThemeId}`)
-	}
-}
diff --git a/src/api/modules/sys.js b/src/api/modules/sys.js
deleted file mode 100644
index b089647..0000000
--- a/src/api/modules/sys.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * @Author: ym
- * @Date: 2021-09-28 16:17:10
- * @LastEditTime: 2022-08-11 18:37:54
- * @LastEditors: 陈伟亮 1186723967@qq.com
- * @Description: In User Settings Edit
- * @FilePath: \piecework-treasure\src\api\modules\content-type.js
- */
-import $http from '../../utils/httpRequest'
-
-/**
- * 系统管理 意见反馈  查询删除
- * @param {*} mainTypeName 
- * @returns 
- */
-
-// 根据id批量删除意见反馈
-export const deleteFeedback=(idList)=>{
-    return $http.post('/management/redsystemfeedback/delete',JSON.stringify(idList));
-}
-// 查询意见反馈列表
-export const getFeedbackByParams=()=>{
-    return $http.get('/management/redsystemfeedback/getFeedbackByParams');
-}
-//保存公告
-export const addReport=(reportTitle,reportContent,reportType='system')=>{
-    return $http.post(`/report/save`,{
-        reportType,reportTitle,reportContent
-    });
-}
-//查看全部公告
-export const getReportsList=(page=1,limit=10)=>{
-    return $http.get(`/report/list?page=${page}&limit=${limit}`)
-}
-// 查看公告
-export const getReportInfo=(reportId)=>{
-    return $http.get(`/report/info/${reportId}`)
-}
-// 删除公告
-export const deleteReportsByIds=(ids)=>{
-    return $http.post(`/report/delete`,JSON.stringify(ids))
-}
-//修改公告
-export const updateReport=(reportId,reportTitle,reportContent)=>{
-    return $http.post(`/report/update`,{
-        reportId,reportTitle,reportContent
-    })
-}
-//修改公告
-export const savePreviewRichText=(data)=>{
-    return $http.post(`/text/redtext/save`,data)
-}
-/**
- * 系统管理  常见问题  增删改查
- * @param {*} mainTypeName 
- * @returns 
- */
-//上传富文本图片
-export const richTextImgUpload=(url)=>{
-    return $http({
-        url: '/sys/oss/upload',
-        method: 'post',
-        data: {text:url}
-      })
-}
\ No newline at end of file
diff --git a/src/api/modules/user.js b/src/api/modules/user.js
deleted file mode 100644
index e511bc8..0000000
--- a/src/api/modules/user.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * @Author: your name
- * @Date: 2021-10-08 17:39:17
- * @LastEditTime: 2022-01-02 15:07:46
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\api\modules\user.js
- */
-import $http from '../../utils/httpRequest'
-
-//查询会员列表
-export function getUserList(params){
-    return $http({
-        url:'/redMember/reduser/getUserListByParams',
-        params
-    })
-}
-//查询会员详情
-export function getUserDetail(id){
-    return $http({
-        url:'/redMember/reduser/info/'+id,
-        
-    })
-}
-//更新会员信息
-export function updateUserList(data){
-    return $http({
-        url:'redMember/reduser/update',
-        method:'post',
-        data
-    })
-}
-//查询用户协议
-export function getUserAgreement(){
-    return $http({
-        url:'/redMember/redpublishagreement/info/1',
-
-    })
-}
-//保存用户协议
-export function saveUserAgreement(data){
-    return $http({
-        url:'/redMember/redpublishagreement/update',
-        method:'post',
-        data
-    })
-}
-// 查询红色护照
-export function getUserRedPassport(){
-    return $http({
-        url:'/redMember/redpassport/info/1',
-    })
-}
-// 保存红色护照
-export function saveUserRedPassport(data){
-    return $http({
-        url:'/redMember/redpassport/update',
-        method:'post',
-        data
-    })
-}
\ No newline at end of file
diff --git a/src/api/modules/userManage.js b/src/api/modules/userManage.js
deleted file mode 100644
index 95df740..0000000
--- a/src/api/modules/userManage.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * @Author: ym
- * @Date: 2021-09-23 20:34:59
- * @LastEditTime: 2021-09-27 22:01:58
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: \piecework-treasure\src\api\modules\userManage.js
- */
-import $http from '../../utils/httpRequest'
-
-// 批量查询人员
-export const queryUser=(obj)=>{
-    return $http.get(`/sys/user/list?page=${obj.page}&limit=${obj.limit}&departmentName=${obj.departmentName}&userTypeName=${obj.userTypeName}&wokerTypeName=${obj.workerTypeName}&userStatus=${obj.userStatus}&condition=${obj.condition}`);
-}
-// 添加人员
-export const saveUser=(obj)=>{
-    return $http.post('/sys/user/save',JSON.stringify(obj));
-}
-// 查询人员
-export const selectUser=(id)=>{
-    return $http.get('/sys/user/info/'+id);
-}
-// 修改人员
-export const editUser=(obj)=>{
-    return $http.post('/sys/user/update',JSON.stringify(obj));
-}
-// 删除人员
-export const deleteUser=(obj)=>{
-    return $http.post('/sys/user/delete',JSON.stringify(obj));
-}
-// 批量修改
-// [{"userId":3,"userStatus":"测试1"},{"userId":4,"userStatus":"测试2"}]
-export const updateBatch=(obj)=>{
-    return $http.post('/sys/user/updateBatch',JSON.stringify(obj));
-}
\ No newline at end of file
diff --git a/src/api/modules/version.js b/src/api/modules/version.js
deleted file mode 100644
index 18408aa..0000000
--- a/src/api/modules/version.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * @Author: chenkangxu
- * @Date: 2022-08-26 16:59:26
- * @LastEditTime: 2022-08-26 17:00:07
- * @LastEditors: chenkangxu
- * @Description: 
- * @Github: 
- */
-import $http from '@/utils/httpRequest'
-export const version={
-    addAppVersion:(data)=>{
-        return $http({
-          url: '/sys/version/save',
-          method:'post',
-          data
-        })
-    },
-    delAppVersion:(data)=>{
-        return $http({
-            url: '/sys/version/delete',
-          method:'post',
-          data
-        })
-    },
-    updateAppVersion:(data)=>{
-        return $http({
-            url: '/sys/version/update',
-          method:'post',
-          data
-        })
-    },
-    getAppVersion:(params)=>{
-        return $http({
-            url: '/sys/version/list',
-          method:'post',
-          params
-        })
-    }
-}
diff --git a/src/filters/accounts.js b/src/filters/accounts.js
new file mode 100644
index 0000000..3181137
--- /dev/null
+++ b/src/filters/accounts.js
@@ -0,0 +1,33 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2024 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+//财务过滤器
+/**
+ * 资金流水 交易类型
+ */
+export function transactionTypeFilter(status) {
+  const statusMap = {
+    pay_order: '订单支付',
+    refund_order: '订单退款',
+  };
+  return statusMap[status];
+}
+
+/**
+ * 转账类型
+ */
+export function transferTypeFilter(status) {
+  const statusMap = {
+    bank: '银行卡',
+    alipay: '支付宝',
+    wechat: '微信',
+  };
+  return statusMap[status];
+}
diff --git a/src/filters/commFilter.js b/src/filters/commFilter.js
new file mode 100644
index 0000000..410f3dd
--- /dev/null
+++ b/src/filters/commFilter.js
@@ -0,0 +1,294 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2024 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+import * as constants from '@/utils/constants.js';
+import { formatDates } from '@/utils/index';
+
+// 公共过滤器
+export function filterEmpty(val) {
+  let _result = '-';
+  if (!val) {
+    return _result;
+  }
+  _result = val;
+  return _result;
+}
+
+// 时间过滤器
+export function formatDate(time) {
+  if (time !== 0) {
+    const date = new Date(time * 1000);
+    return formatDates(date, 'yyyy-MM-dd hh:mm');
+  }
+}
+
+export function filterYesOrNo(value) {
+  return value ? '是' : '否';
+}
+
+export function filterShowOrHide(value) {
+  return value ? '显示' : '不显示';
+}
+
+export function filterShowOrHideForFormConfig(value) {
+  return value === '‘0’' ? '显示' : '不显示';
+}
+
+export function filterYesOrNoIs(value) {
+  return value ? '否' : '是';
+}
+
+export function filterCategroyType(value) {
+  return constants.categoryType.filter((item) => value === item.value)[0].name;
+}
+
+export function filterConfigCategory(value) {
+  return constants.configCategory.filter((item) => value === item.value)[0].label;
+}
+
+/**
+ * @description 公众号回复类型
+ */
+export function keywordStatusFilter(status) {
+  const statusMap = {
+    text: '文字消息',
+    image: '图片消息',
+    news: '图文消息',
+    voice: '声音消息',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 优惠券类别
+ */
+export function couponCategoryFilter(status) {
+  const statusMap = {
+    1: '店铺',
+    2: '商品',
+    3: '通用',
+    4: '品类',
+    5: '品牌',
+    6: '跨店',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 优惠券类型
+ */
+export function couponTypeFilter(status) {
+  const statusMap = {
+    1: '商家券',
+    2: '商品券',
+    3: '平台券',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 优惠券领取方式
+ */
+export function couponUserTypeFilter(status) {
+  const statusMap = {
+    1: '手动领取',
+    2: '赠送券',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 文章分类
+ */
+export function articleTypeFilter(status) {
+  if (!status) {
+    return '';
+  }
+  let arrayList = JSON.parse(localStorage.getItem('articleClass'));
+  if (arrayList.filter((item) => Number(status) === Number(item.id)).length < 1) {
+    return '';
+  }
+  return arrayList.filter((item) => Number(status) === Number(item.id))[0].name;
+}
+
+/**
+ * @description 支付状态
+ */
+export function payStatusFilter(status) {
+  const statusMap = {
+    false: '未支付',
+    true: '已支付',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 提现方式
+ */
+export function extractTypeFilter(status) {
+  const statusMap = {
+    bank: '银行卡',
+    alipay: '支付宝',
+    weixin: '微信',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 充值类型
+ */
+export function rechargeTypeFilter(status) {
+  const statusMap = {
+    public: '微信公众号',
+    weixinh5: '微信H5支付',
+    routine: '小程序',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 财务审核状态
+ */
+export function extractStatusFilter(status) {
+  const statusMap = {
+    '-1': '已拒绝',
+    0: '审核中',
+    1: '已提现',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 砍价状态
+ */
+export function bargainStatusFilter(status) {
+  const statusMap = {
+    1: '进行中',
+    2: '未完成',
+    3: '已成功',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 砍价状态
+ */
+export function bargainColorFilter(status) {
+  const statusMap = {
+    1: '',
+    2: 'danger',
+    3: 'success',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 拼团状态
+ */
+export function groupStatusFilter(status) {
+  const statusMap = {
+    1: '进行中',
+    2: '已成功',
+    3: '未完成',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 拼团状态
+ */
+export function groupColorFilter(status) {
+  const statusMap = {
+    1: '',
+    2: 'success',
+    3: 'danger',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 一号通tab值
+ */
+export function onePassTypeFilter(status) {
+  const statusMap = {
+    sms: '短信',
+    copy: '商品采集',
+    expr_query: '物流查询',
+    expr_dump: '电子面单打印',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 视频号草稿商品微信审核状态
+ */
+export function editStatusFilter(status) {
+  const statusMap = {
+    '-1': '违规/风控系统下',
+    '-2': '平台下架',
+    '-3': '商家下架',
+    1: '未审核',
+    2: '审核中',
+    3: '审核失败',
+    4: '审核成功',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 视频号草稿商品平台审核状态
+ */
+export function platformStatusFilter(status) {
+  const statusMap = {
+    1: '未审核',
+    2: '审核中',
+    3: '审核失败',
+    4: '审核成功',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 视频号正式商品状态
+ */
+export function videoStatusFilter(status) {
+  const statusMap = {
+    0: '初始值',
+    5: '上架',
+    11: '自主下架',
+    13: '违规下架/风控系统下架',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 角色类型
+ */
+export function roleTypeFilter(status) {
+  const statusMap = {
+    platform: '平台',
+    merchant: '商户',
+    system: '系统',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 秒杀商品活动状态
+ *
+ */
+export function activityStatusFilter(status) {
+  const statusMap = {
+    0: '未开始',
+    1: '进行中',
+    2: '已结束',
+  };
+  return statusMap[status];
+}
diff --git a/src/filters/index.js b/src/filters/index.js
new file mode 100644
index 0000000..43d3e8d
--- /dev/null
+++ b/src/filters/index.js
@@ -0,0 +1,86 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2024 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+// import parseTime, formatTime and set to filter
+export { parseTime, formatTime } from '@/utils';
+
+export * from '../filters/commFilter';
+export * from '../filters/user';
+export * from '../filters/order';
+export * from '../filters/wx';
+export * from '../filters/merchant';
+export * from '../filters/accounts';
+export * from '../filters/product';
+
+/**
+ * Show plural label if time is plural number
+ * @param {number} time
+ * @param {string} label
+ * @return {string}
+ */
+function pluralize(time, label) {
+  if (time === 1) {
+    return time + label;
+  }
+  return time + label + 's';
+}
+
+/**
+ * @param {number} time
+ */
+export function timeAgo(time) {
+  const between = Date.now() / 1000 - Number(time);
+  if (between < 3600) {
+    return pluralize(~~(between / 60), ' minute');
+  } else if (between < 86400) {
+    return pluralize(~~(between / 3600), ' hour');
+  } else {
+    return pluralize(~~(between / 86400), ' day');
+  }
+}
+
+/**
+ * Number formatting
+ * like 10000 => 10k
+ * @param {number} num
+ * @param {number} digits
+ */
+export function numberFormatter(num, digits) {
+  const si = [
+    { value: 1e18, symbol: 'E' },
+    { value: 1e15, symbol: 'P' },
+    { value: 1e12, symbol: 'T' },
+    { value: 1e9, symbol: 'G' },
+    { value: 1e6, symbol: 'M' },
+    { value: 1e3, symbol: 'k' },
+  ];
+  for (let i = 0; i < si.length; i++) {
+    if (num >= si[i].value) {
+      return (num / si[i].value).toFixed(digits).replace(/\.0+$|(\.[0-9]*[1-9])0+$/, '$1') + si[i].symbol;
+    }
+  }
+  return num.toString();
+}
+
+/**
+ * 10000 => "10,000"
+ * @param {number} num
+ */
+export function toThousandFilter(num) {
+  return (+num || 0).toString().replace(/^-?\d+/g, (m) => m.replace(/(?=(?!\b)(\d{3})+$)/g, ','));
+}
+
+/**
+ * Upper case first char
+ * @param {String} string
+ */
+export function uppercaseFirst(string) {
+  return string.charAt(0).toUpperCase() + string.slice(1);
+}
diff --git a/src/filters/merchant.js b/src/filters/merchant.js
new file mode 100644
index 0000000..5fec8ca
--- /dev/null
+++ b/src/filters/merchant.js
@@ -0,0 +1,33 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2024 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+//商户过滤器
+
+/**
+ * 商户创建类型
+ */
+export function merCreateTypeFilter(status) {
+  const statusMap = {
+    admin: '管理员创建',
+    apply: '商户入驻申请',
+  };
+  return statusMap[status];
+}
+
+/**
+ * 商户类别
+ */
+export function selfTypeFilter(status) {
+  const statusMap = {
+    true: '自营',
+    false: '非自营',
+  };
+  return statusMap[status];
+}
diff --git a/src/filters/order.js b/src/filters/order.js
new file mode 100644
index 0000000..5217a51
--- /dev/null
+++ b/src/filters/order.js
@@ -0,0 +1,96 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2024 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+//订单过滤器
+
+/**
+ * @description 支付状态
+ */
+export function paidFilter(status) {
+  const statusMap = {
+    true: '已支付',
+    false: '未支付',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 订单状态
+ * 2,已收货，待评价
+ */
+export function orderStatusFilter(status) {
+  const statusMap = {
+    0: '待付款',
+    1: '待发货',
+    2: '部分发货',
+    3: '待核销',
+    4: '待收货',
+    5: '已收货',
+    6: '已完成',
+    9: '已取消',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 订单中的退款状态
+ */
+export function orderRefundStatusFilter(status) {
+  const statusMap = {
+    0: '未退款',
+    1: '申请退款中',
+    2: '部分退款',
+    3: '已退款',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 退款单退款状态
+ *
+ */
+export function refundStatusFilter(status) {
+  const statusMap = {
+    0: '待审核',
+    1: '商家拒绝',
+    2: '退款中',
+    3: '退款成功',
+    4: '用户退货',
+    5: '商家待收货',
+    6: '已撤销',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 支付方式
+ */
+export function payTypeFilter(status) {
+  const statusMap = {
+    weixin: '微信',
+    alipay: '支付宝',
+    yue: '余额',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 订单类型
+ */
+export function orderTypeFilter(status) {
+  const statusMap = {
+    0: '普通订单',
+    1: '视频号订单',
+    2: '秒杀订单',
+    5: '云盘订单',
+    6: '卡密订单',
+  };
+  return statusMap[status];
+}
diff --git a/src/filters/product.js b/src/filters/product.js
new file mode 100644
index 0000000..f15763f
--- /dev/null
+++ b/src/filters/product.js
@@ -0,0 +1,88 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2024 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+/**
+ * @description 直播商品审核状态
+ */
+export function liveReviewStatusFilter(status) {
+  const statusMap = {
+    0: '商户创建/撤回',
+    1: '平台待审核/商户重新提交审核',
+    2: '平台审核通过/微信审核中',
+    3: '平台审核失败',
+    4: '微信审核成功',
+    5: '微信审核失败',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 直播状态
+ */
+export function broadcastStatusFilter(status) {
+  const statusMap = {
+    101: '直播中',
+    102: '未开始',
+    103: '已结束',
+    104: '禁播',
+    105: '暂停',
+    106: '异常',
+    107: '已过期',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 直播间审核状态
+ */
+export function roomReviewStatusFilter(status) {
+  const statusMap = {
+    0: '平台待审核',
+    1: '平台审核失败',
+    2: '微信审核失败',
+    3: '微信审核成功',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 直播间开启关闭状态
+ */
+export function roomShowFilter(status) {
+  const statusMap = {
+    0: '开启',
+    1: '关闭',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 直播商品价格类型
+ */
+export function priceTypeFilter(status) {
+  const statusMap = {
+    1: '一口价',
+    2: '价格区间',
+    3: '折扣价',
+  };
+  return statusMap[status];
+}
+
+/**
+ * @description 商品类型
+ */
+export function productTpyeFilter(status) {
+  const statusMap = {
+    0: '普通商品',
+    5: '云盘商品',
+    6: '卡密商品',
+  };
+  return statusMap[status];
+}
diff --git a/src/filters/user.js b/src/filters/user.js
new file mode 100644
index 0000000..ce7bd8b
--- /dev/null
+++ b/src/filters/user.js
@@ -0,0 +1,53 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2024 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+//会员过滤器
+
+/**
+ * 等级
+ */
+export function levelFilter(status) {
+  if (!status) {
+    return '';
+  }
+  let arrayList = JSON.parse(localStorage.getItem('levelKey'));
+  let array = arrayList.filter((item) => status === item.id);
+  if (array.length) {
+    return array[0].name;
+  } else {
+    return '';
+  }
+}
+
+/**
+ * 用户注册类型
+ */
+export function registerTypeFilter(status) {
+  const statusMap = {
+    wechat: '公众号',
+    routine: '小程序',
+    h5: 'H5',
+    iosWx: '微信ios',
+    androidWx: '微信安卓',
+    ios: 'ios',
+  };
+  return statusMap[status];
+}
+
+/**
+ * 用户类型
+ */
+export function filterIsPromoter(status) {
+  const statusMap = {
+    true: '推广员',
+    false: '普通用户',
+  };
+  return statusMap[status];
+}
diff --git a/src/filters/wx.js b/src/filters/wx.js
new file mode 100644
index 0000000..87392ac
--- /dev/null
+++ b/src/filters/wx.js
@@ -0,0 +1,39 @@
+// +----------------------------------------------------------------------
+// | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
+// +----------------------------------------------------------------------
+// | Copyright (c) 2016~2024 https://www.crmeb.com All rights reserved.
+// +----------------------------------------------------------------------
+// | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
+// +----------------------------------------------------------------------
+// | Author: CRMEB Team <admin@crmeb.com>
+// +----------------------------------------------------------------------
+
+//小程序 微信过滤器
+import Cookies from 'js-cookie';
+/**
+ * @description 小程序所属类目
+ */
+export function wxCategoryFilter(status) {
+  if (!status) {
+    return '';
+  }
+  if (!Cookies.get('WxCategory')) {
+    return;
+  }
+  let arrayList = JSON.parse(Cookies.get('WxCategory'));
+  if (arrayList.filter((item) => Number(status) === Number(item.id)).length < 1) {
+    return '';
+  }
+  return arrayList.filter((item) => Number(status) === Number(item.id))[0].name;
+}
+
+/**
+ * @description 小程序模板类型
+ */
+export function wxTypeFilter(status) {
+  const statusMap = {
+    2: '一次性订阅',
+    3: '长期订阅',
+  };
+  return statusMap[status];
+}
diff --git a/src/router/full-routers.js b/src/router/full-routers.js
index 357f8fe..b0f88a3 100644
--- a/src/router/full-routers.js
+++ b/src/router/full-routers.js
@@ -30,494 +30,93 @@ export default {
             "menuId": getUUID(),
             "parentId": 0,
             "parentName": null,
-            "name": "课程管理",
+            "name": "商品",
             "url": "local-course/resources",
             "perms": "",
             "type": 1,
             "elIcon": "el-icon-menu",
             "orderNum": 0,
             "open": null,
-            list: []
-        },
-        {
-            "menuId": getUUID(),
-            "parentId": 0,
-            "parentName": null,
-            "name": "教务管理",
-            "url": "local-affairs",
-            "perms": "",
-            "type": 0,
-            "elIcon": "el-icon-office-building",
-            "orderNum": 0,
-            "open": null,
-            list: [
-                {
-                    "menuId": getUUID(),
-                    "parentId": 2,
-                    "parentName": null,
-                    "name": "年级管理",
-                    "url": "local-affairs/grade",
-                    "perms": "",
-                    "type": 1,
-                    "icon": "log",
-                    "orderNum": 0,
-                    "open": null,
-                    "list": []
-                },
-                {
-                    "menuId": getUUID(),
-                    "parentId": 2,
-                    "parentName": null,
-                    "name": "班级管理",
-                    "url": "local-affairs/class",
-                    "perms": "",
-                    "type": 1,
-                    "icon": "log",
-                    "orderNum": 0,
-                    "open": null,
-                    "list": []
-                },
-                {
-                    "menuId": getUUID(),
-                    "parentId": 2,
-                    "parentName": null,
-                    "name": "教师管理",
-                    "url": "local-teacher/teacher",
-                    "perms": "",
-                    "type": 1,
-                    "icon": "log",
-                    "orderNum": 0,
-                    "open": null,
-                    "list": []
-                },
-                {
-                    "menuId": getUUID(),
-                    "parentId": 0,
-                    "parentName": null,
-                    "name": "学校管理",
-                    "url": "local-school/school",
-                    "perms": "",
-                    "type": 1,
-                    "elIcon": "el-icon-school",
-                    "orderNum": 0,
-                    "open": null,
-                    list: []
-                },
-            ]
-        },
-        {
-            "menuId": getUUID(),
-            "parentId": 0,
-            "parentName": null,
-            "name": "活动管理",
-            "url": "",
-            "perms": "",
-            "type": 0,
-            "elIcon": "el-icon-star-off",
-            "orderNum": 0,
-            "open": null,
-            "list": [
-                {
-                    "menuId": getUUID(),
-                    "parentId": 127,
-                    "parentName": null,
-                    "name": "活动管理",
-                    "url": "active-match/active-match-management",
-                    "perms": "",
-                    "type": 1,
-                    "icon": "log",
-                    "orderNum": 0,
-                    "open": null,
-                    "list": []
-                },
-                {
-                    "menuId": getUUID(),
-                    "parentId": 127,
-                    "parentName": null,
-                    "name": "报名信息",
-                    "url": "active-match/active-sign-up",
-                    "perms": "",
-                    "type": 1,
-                    "icon": "tubiao",
-                    "orderNum": 0,
-                    "open": null,
-                    "list": []
-                },
-                // {
-                //     "menuId": getUUID(),
-                //     "parentId": 127,
-                //     "parentName": null,
-                //     "name": "赛事管理",
-                //     "url": "active-match/match-management",
-                //     "perms": "matchManagement",
-                //     "type": 1,
-                //     "icon": "shoucangfill",
-                //     "orderNum": 0,
-                //     "open": null,
-                //     "list": []
-                // },
-                {
-                    "menuId": getUUID(),
-                    "parentId": 127,
-                    "parentName": null,
-                    "name": "作品审核",
-                    "url": "active-match/works-examine",
-                    "perms": "",
-                    "type": 1,
-                    "icon": "zhedie",
-                    "orderNum": 0,
-                    "open": null,
-                    "list": []
-                }
-            ]
-        },
-        {
-            "menuId": getUUID(),
-            "parentId": 0,
-            "parentName": null,
-            "name": "教学管理",
-            "url": "local-teach-manage",
-            "perms": "",
-            "type": 0,
-            "elIcon": "el-icon-notebook-2",
-            "orderNum": 0,
-            "open": null,
             list: [{
                 "menuId": getUUID(),
-                "parentId": 2,
+                "parentId": 0,
                 "parentName": null,
-                "name": "课程教学",
-                "url": "course-teach",
+                "name": "商品管理",
+                "url": "product/index",
                 "perms": "",
                 "type": 1,
-                "icon": "log",
+                "elIcon": "el-icon-menu",
                 "orderNum": 0,
                 "open": null,
-                "list": []
-            }, {
-                "menuId": getUUID(),
-                "parentId": 2,
-                "parentName": null,
-                "name": "课程评价",
-                "url": "course-evaluation",
-                "perms": "",
-                "type": 1,
-                "icon": "log",
-                "orderNum": 0,
-                "open": null,
-                "list": []
-            },
-            {
-                "menuId": getUUID(),
-                "parentId": 2,
-                "parentName": null,
-                "name": "期末综评",
-                "url": "final-evaluation",
-                "perms": "",
-                "type": 1,
-                "icon": "log",
-                "orderNum": 0,
-                "open": null,
-                "list": []
-            },
-            ]
-        },
-        {
-            "menuId": 45,
-            "parentId": 0,
-            "parentName": null,
-            "name": "足迹管理",
-            "url": "",
-            "perms": "",
-            "type": 0,
-            "icon": "dangdifill",
-            "orderNum": 5,
-            "open": null,
-            "list": [
-                {
-                    "menuId": 135,
-                    "parentId": 45,
-                    "parentName": null,
-                    "name": "路线管理",
-                    "url": "/footprint-management/footprint-line",
-                    "perms": "",
-                    "type": 1,
-                    "icon": "dangdifill",
-                    "orderNum": 0,
-                    "open": null,
-                    "list": []
-                },
-                {
-                    "menuId": 133,
-                    "parentId": 45,
-                    "parentName": null,
-                    "name": "打卡规则",
-                    "url": "/footprint-management/footprint-rule",
-                    "perms": "",
-                    "type": 1,
-                    "icon": "log",
-                    "orderNum": 0,
-                    "open": null,
-                    "list": []
-                },
-                {
-                    "menuId": 46,
-                    "parentId": 45,
-                    "parentName": null,
-                    "name": "打卡地管理",
-                    "url": "/footprint-management/punch-in-management",
-                    "perms": "",
-                    "type": 1,
-                    "icon": "daohang",
-                    "orderNum": 0,
-                    "open": null,
-                    "list": []
-                }
-            ]
-        },
-        {
-            "menuId": getUUID(),
-            "parentId": 45,
-            "parentName": null,
-            "name": "作业管理",
-            "url": "/local-homework/teacher",
-            "perms": "",
-            "type": 1,
-            // "icon": "daohang",
-            "elIcon":"el-icon-notebook-2",
-            "orderNum": 0,
-            "open": null,
-            "list": []
-        },
-        {
-            "menuId": getUUID(),
-            "parentName": null,
-            "name": "教师优秀示范课",
-            "url": "/local-excellent-teacher-course",
-            "perms": "",
-            "type": 1,
-            "elIcon": "el-icon-medal",
-            "orderNum": 0,
-            "open": null,
-            "list": []
-        },
-        {
-            "menuId": getUUID(),
-            "parentName": null,
-            "name": "学生优秀作品展",
-            "url": "/local-excellent-student-work",
-            "perms": "",
-            "type": 1,
-            "elIcon": "el-icon-medal",
-            "orderNum": 0,
-            "open": null,
-            "list": []
-        },
-        {
-            "menuId": getUUID(),
-            "parentName": null,
-            "name": "系统管理",
-            "url": "sys",
-            "perms": null,
-            "type": 0,
-            "icon": "system",
-            "orderNum": 0,
-            "open": null,
-            "list": [
-                // {
-                //     "menuId": 132,
-                //     "parentId": 1,
-                //     "parentName": null,
-                //     "name": "公告管理",
-                //     "url": "/sys/report-management",
-                //     "perms": "",
-                //     "type": 1,
-                //     "icon": "log",
-                //     "orderNum": 0,
-                //     "open": null,
-                //     "list": []
-                // },
-                // {
-                //     "menuId": 2,
-                //     "parentId": 1,
-                //     "parentName": null,
-                //     "name": "管理员列表",
-                //     "url": "sys/user",
-                //     "perms": null,
-                //     "type": 1,
-                //     "icon": "admin",
-                //     "orderNum": 1,
-                //     "open": null,
-                //     "list": []
-                // },
-                {
-                    "menuId": getUUID(),
-                    "parentId": 1,
-                    "parentName": null,
-                    "name": "角色管理",
-                    "url": "sys/role",
-                    "perms": null,
-                    "type": 1,
-                    "icon": "role",
-                    "orderNum": 2,
-                    "open": null,
-                    "list": []
-                },
-                {
-                    "menuId": getUUID(),
-                    "parentId": 1,
-                    "parentName": null,
-                    "name": "资源管理",
-                    "url": "sys/menu",
-                    "perms": null,
-                    "type": 1,
-                    "icon": "menu",
-                    "orderNum": 3,
-                    "open": null,
-                    "list": []
-                },
-                // {
-                //     "menuId": 37,
-                //     "parentId": 1,
-                //     "parentName": null,
-                //     "name": "意见反馈",
-                //     "url": "sys/feedback",
-                //     "perms": "",
-                //     "type": 1,
-                //     "icon": "bianji",
-                //     "orderNum": 5,
-                //     "open": null,
-                //     "list": []
-                // },
-                // {
-                //     "menuId": 29,
-                //     "parentId": 1,
-                //     "parentName": null,
-                //     "name": "系统日志",
-                //     "url": "sys/log",
-                //     "perms": "sys:log:list",
-                //     "type": 1,
-                //     "icon": "log",
-                //     "orderNum": 7,
-                //     "open": null,
-                //     "list": []
-                // },
-                // {
-                //     "menuId": 40,
-                //     "parentId": 1,
-                //     "parentName": null,
-                //     "name": "常见问题及解答",
-                //     "url": "sys/common-problem",
-                //     "perms": "",
-                //     "type": 1,
-                //     "icon": "bianji",
-                //     "orderNum": 9,
-                //     "open": null,
-                //     "list": []
-                // },
-                {
-                    "menuId": getUUID(),
-                    "parentId": 1,
-                    "parentName": null,
-                    "name": "组织机构管理",
-                    "url": "sys/org",
-                    "perms": "",
-                    "type": 1,
-                    "icon": "bianji",
-                    "orderNum": 10,
-                    "open": null,
-                    "list": []
-                }
-            ]
-        },
-        {
-            "menuId": getUUID(),
-            "parentName": null,
-            "name": "统计分析",
-            "perms": "",
-            "type": 0,
-            "icon": "bianji",
-            "orderNum": 10,
-            "open": null,
-            "list": [{
-                "menuId": getUUID(),
-                "parentName": null,
-                "name": "区域内学校基本信息统计",
-                "url": "/local-statistics/region-school",
-                "perms": "",
-                "type": 1,
-                "icon": "bianji",
-                "orderNum": 10,
-                "open": null,
-                "list": []
-            }, {
-                "menuId": getUUID(),
-                "parentName": null,
-                "name": "课程开展情况统计",
-                "url": "sys/org",
-                "perms": "",
-                "type": 1,
-                "icon": "bianji",
-                "orderNum": 10,
-                "open": null,
-                "list": []
-            }, {
-                "menuId": getUUID(),
-                "parentName": null,
-                "name": "课程完成明细统计",
-                "url": "sys/org",
-                "perms": "",
-                "type": 1,
-                "icon": "bianji",
-                "orderNum": 10,
-                "open": null,
-                "list": []
-            }, {
-                "menuId": getUUID(),
-                "parentName": null,
-                "name": "作业明细统计",
-                "url": "sys/org",
-                "perms": "",
-                "type": 1,
-                "icon": "bianji",
-                "orderNum": 10,
-                "open": null,
-                "list": []
-            }, {
-                "menuId": getUUID(),
-                "parentName": null,
-                "name": "评价明细统计",
-                "url": "sys/org",
-                "perms": "",
-                "type": 1,
-                "icon": "bianji",
-                "orderNum": 10,
-                "open": null,
-                "list": []
-            }, {
-                "menuId": getUUID(),
-                "parentName": null,
-                "name": "优秀示范课程明细统计",
-                "url": "sys/org",
-                "perms": "",
-                "type": 1,
-                "icon": "bianji",
-                "orderNum": 10,
-                "open": null,
-                "list": []
-            }, {
-                "menuId": getUUID(),
-                "parentName": null,
-                "name": "优秀作品明细统计",
-                "url": "sys/org",
-                "perms": "",
-                "type": 1,
-                "icon": "bianji",
-                "orderNum": 10,
-                "open": null,
-                "list": []
+                list: []
             }]
         },
+        // {
+        //     "menuId": getUUID(),
+        //     "parentId": 0,
+        //     "parentName": null,
+        //     "name": "教务管理",
+        //     "url": "local-affairs",
+        //     "perms": "",
+        //     "type": 0,
+        //     "elIcon": "el-icon-office-building",
+        //     "orderNum": 0,
+        //     "open": null,
+        //     list: [
+        //         {
+        //             "menuId": getUUID(),
+        //             "parentId": 2,
+        //             "parentName": null,
+        //             "name": "年级管理",
+        //             "url": "local-affairs/grade",
+        //             "perms": "",
+        //             "type": 1,
+        //             "icon": "log",
+        //             "orderNum": 0,
+        //             "open": null,
+        //             "list": []
+        //         },
+        //         {
+        //             "menuId": getUUID(),
+        //             "parentId": 2,
+        //             "parentName": null,
+        //             "name": "班级管理",
+        //             "url": "local-affairs/class",
+        //             "perms": "",
+        //             "type": 1,
+        //             "icon": "log",
+        //             "orderNum": 0,
+        //             "open": null,
+        //             "list": []
+        //         },
+        //         {
+        //             "menuId": getUUID(),
+        //             "parentId": 2,
+        //             "parentName": null,
+        //             "name": "教师管理",
+        //             "url": "local-teacher/teacher",
+        //             "perms": "",
+        //             "type": 1,
+        //             "icon": "log",
+        //             "orderNum": 0,
+        //             "open": null,
+        //             "list": []
+        //         },
+        //         {
+        //             "menuId": getUUID(),
+        //             "parentId": 0,
+        //             "parentName": null,
+        //             "name": "学校管理",
+        //             "url": "local-school/school",
+        //             "perms": "",
+        //             "type": 1,
+        //             "elIcon": "el-icon-school",
+        //             "orderNum": 0,
+        //             "open": null,
+        //             list: []
+        //         },
+        //     ]
+        // },
     ],
     "code": 0,
     "permissions": []
diff --git a/src/views/common/login.vue b/src/views/common/login.vue
index 25d4fc9..9c30723 100644
--- a/src/views/common/login.vue
+++ b/src/views/common/login.vue
@@ -153,7 +153,7 @@ export default {
                 // this.getCaptcha();
               });
           } else {
-            this.$api.local_admin
+            this.$api.mer_admin
               .loginByAccount({
                 role: _loginTypeMapper[this.loginType],
                 username: this.dataForm.userName,
@@ -183,7 +183,7 @@ export default {
       };
       this.$refs["loginByYZMRef"].validate((valid) => {
         console.log("验证码登录");
-        this.$api.local_admin
+        this.$api.mer_admin
           .loginByMobile({
             // role: _loginTypeMapper[this.loginType],
             mobile: this.loginByYZMForm.mobile,
@@ -207,7 +207,7 @@ export default {
         this.$message.error("请输入正确的手机号码");
         return;
       }
-      this.$api.local_admin.getYZM(this.loginByYZMForm.mobile).then((res) => {
+      this.$api.mer_admin.getYZM(this.loginByYZMForm.mobile).then((res) => {
         this.mobileCodeCountDown = 60;
         this.mobileCodeCountDownTimer = setInterval(() => {
           this.mobileCodeCountDown--;
diff --git a/src/views/modules/active-manage/active-info.vue b/src/views/modules/active-manage/active-info.vue
deleted file mode 100644
index aa97f56..0000000
--- a/src/views/modules/active-manage/active-info.vue
+++ /dev/null
@@ -1,529 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm>
-    <cusTable
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable> 
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  data() {
-    return {
-      //加载动画
-      loading:false,
-      typeList: [],
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          { type: "Input", label: "关键字", prop: "searchName",placeholder:'标题、来源、编辑者名称',width:'230px' },
-          {
-            type: "Select",
-            label: "内容类型",
-            prop: "isVideo",
-            options: [{
-              label:'资讯',value:0
-            },{label:'视频',value:1}],
-          },
-          {
-            type: "DateTimeRange",
-            label: "发布时间范围",
-            prop: "time",
-          },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          contentTypeId: "",
-          time: [],
-          isVideo:0
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            handle: () => this.searchTableList(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-          {
-            label: "批量删除",
-            type: "danger",
-            handle: () => this.deleteBatch(),
-            auth: "reportDatasource_batchDelete",
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "标题", prop: "title", align: "center" },
-          { label: "副标题", prop: "subtitle", align: "center" },
-          { label: "资讯来源", prop: "source", align: "center" },
-          { label: "编辑者", prop: "editorName", align: "center" },
-          { label: "作者", prop: "author", align: "center" },
-          { label: "封面", type: "image", prop: "imageUrl", align: "center" },
-          { label: "外链", prop: "contentLink", align: "center" },
-          { label: "阅读数", prop: "readNumber", align: "center" },
-          { label: "喜欢", prop: "likeNumber", align: "center" },
-          { label: "收藏数", prop: "collectNumber", align: "center" },
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            type: "button",
-            width:'180px',
-            fixed: "right",
-            btnList: [
-              {
-                label: "预览",
-                type: "text",
-                auth: "reportDatasource_getDetail",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.detail, row),
-              },
-              {
-                label: "编辑",
-                type: "text",
-                auth: "reportDatasource_update",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.update, row),
-              },
-              {
-                label: "删除",
-                type: "text",
-                auth: "reportDatasource_delete",
-                handle: (row) => this.deleteOne(row.contentInfoId),
-              },
-            ],
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "80vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "标题",
-            prop: "title",
-            rules: { required: true, maxLength: 100 },
-            width: "900px",
-          },
-          {
-            type: "Input",
-            label: "副标题",
-            prop: "subtitle",
-            rules: { maxLength: 100 },
-            width: "900px",
-          },
-          {
-            type: "Input",
-            label: "资讯来源",
-            prop: "source",
-            rules: { required: true, maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "作者",
-            prop: "author",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "编辑者",
-            prop: "editorName",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "外链",
-            prop: "contentLink",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "关键词",
-            prop: "keywords",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          { 
-            type:'Radio',
-            prop:'isVideo',
-            label:'内容类型',
-            radios:[{label:'资讯',value:'0'},{label:'视频',value:'1'}],
-            width: "300px",
-          },
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-          {
-            type: "Tinymce",
-            label: "资讯内容",
-            prop: "content",
-            rules: { required: true },
-            width: "1200px",
-          },
-        ],
-        newModalForm:[
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-          ],//咨询专属内容
-        videoModalForm:[
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-          {
-            type: "Upload",
-            label: "视频",
-            fileUrl: "videoUrl",
-            prop: "fileListVideo",
-            listType:'text',
-            width: "300px",
-            isVideo:true,
-            rules:{required:true},
-            accept:'.mp4,.avi,.mov,.rmvb,.flv,.MP4,.AVI,.MOV,.RMVB,.FLV',
-            tips:'请上传视频文件'
-          },
-        ],//视频专属内容
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          userId: "",
-          content: "",
-          fileUrl: "",
-          fileList: [],
-          isVideo:'0',
-          videoUrl:'',
-          source:'',
-          fileListVideo:[]
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-      },
-    };
-  },
-  watch:{
-    "pageData.modalData.isVideo":{
-      handler:function(val,oldval){
-        // console.log(val)
-        if(val==='1'&&oldval==='0'){
-          this.pageData.modalForm.splice(-1-this.pageData.newModalForm.length,this.pageData.newModalForm.length,...this.pageData.videoModalForm)
-          
-       }
-       else if(val==='0'&&oldval==='1'){
-         this.pageData.modalForm.splice(-1-this.pageData.videoModalForm.length,this.pageData.videoModalForm.length,...this.pageData.newModalForm)
-       }
-      }
-    },
-    "pageData.modalData.fileList":{
-      handler:function(val){
-        if(val&&val.length===0){
-          this.pageData.modalData.imageUrl=''
-        }
-      }
-    },
-    "pageData.modalData.fileListVideo":{
-      handler:function(val){
-        if(val&&val.length===0){
-          this.pageData.modalData.videoUrl=''
-        }
-      }
-    }
-  },
-  activated() {
-    this.searchTableList();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList() {
-      this.loading=true;
-      // 初始化obj
-      var obj = {};
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      obj.page = this.pageData.tablePage.currentPage;
-      obj.limit = this.pageData.tablePage.pageSize;
-      delete obj["pageSizeRange"];
-      if (obj.time.length == 2) {
-        obj.startTime = obj.time[0];
-        obj.endTime = obj.time[1];
-      }
-      delete obj.time
-      // 请求数据
-      this.$api.getActivityInfoListByParams(obj).then((res) => {
-        this.commonUtil.tableAssignment(
-          res.data.page,
-          this.pageData.tablePage,
-          this.pageData.tableData
-        );
-      })
-      .finally(()=>{
-        this.loading=false;
-      })
-    },
-    // 重置
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      this.searchTableList();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-      this.$nextTick(()=>{
-        this.$refs["modalRef"].$refs["modalFormRef"].clearValidate(); //校验重置
-      })
-      this.pageData.modalData.source=this.$newSource//获取默认的资讯来源
-      this.pageData.modalData.isVideo='0'//补充isVideo 不会触发watch
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-     if(row.imageUrl){
-        row.fileList=[{
-        url:row.imageUrl
-      }]
-      }
-      if(row.videoUrl){
-        row.fileListVideo=[{
-          url:row.videoUrl
-          // +'?x-oss-process=video/snapshot,t_10000,m_fast'
-        }]
-      }
-      row.isVideo=row.isVideo+''
-      this.$nextTick(()=>{
-        this.pageData.modalData = JSON.parse(JSON.stringify(row));
-      })
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.pageData.modalConfig.show = false; //关闭modal
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.pageData.modalData.userId = this.$store.state.user.id;
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          if(content.isVideo==0){
-            content.videoUrl=''
-          }
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveActivityInfo(content).then((res) => {
-              this.searchTableList();
-            });
-          } else {
-            this.$api.updateRedActivityInfo(content).then((res) => {
-              this.searchTableList();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteRedActivityInfo(ids).then((res) => {
-            this.searchTableList();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].contentInfoId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteRedActivityInfo(ids).then((res) => {
-              this.searchTableList();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-  .content-dialog ::v-deep .el-dialog__body{
-    padding: 0px;
-  }
-</style>
\ No newline at end of file
diff --git a/src/views/modules/active-manage/swiper-image.vue b/src/views/modules/active-manage/swiper-image.vue
deleted file mode 100644
index 025460b..0000000
--- a/src/views/modules/active-manage/swiper-image.vue
+++ /dev/null
@@ -1,541 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm>
-    <cusTable
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable>
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  data() {
-    return {
-      //加载动画
-      loading:false,
-      typeList: [],
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          { type: "Input", label: "关键字", prop: "searchName",placeholder:'标题、来源、编辑者名称',width:'230px' },
-          {
-            type: "Select",
-            label: "内容类型",
-            prop: "isVideo",
-            options: [{
-              label:'资讯',value:0
-            },{label:'视频',value:1}],
-          },
-          {
-            type: "DateTimeRange",
-            label: "发布时间范围",
-            prop: "time",
-          },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          contentTypeId: "",
-          time: [],
-          isVideo:0
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            handle: () => this.searchTableList(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-          {
-            label: "批量删除",
-            type: "danger",
-            handle: () => this.deleteBatch(),
-            auth: "reportDatasource_batchDelete",
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "标题", prop: "title", align: "center" },
-          { label: "副标题", prop: "subtitle", align: "center" },
-          { label: "资讯来源", prop: "source", align: "center" },
-          { label: "编辑者", prop: "editorName", align: "center" },
-          { label: "作者", prop: "author", align: "center" },
-          { label: "封面", type: "image", prop: "imageUrl", align: "center" },
-          { label: "外链", prop: "contentLink", align: "center" },
-          { label: "阅读数", prop: "readNumber", align: "center" },
-          { label: "喜欢", prop: "likeNumber", align: "center" },
-          { label: "收藏数", prop: "collectNumber", align: "center" },
-           { label: "是否轮播", prop: "status", align: "center",type:'switch' ,
-          values:[1,0],
-          change:(row)=>{
-            this.$api.updateRedActivityImage(row).then((res) => {
-              this.searchTableList();
-            });
-          }},
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            width:'180',
-            type: "button",
-            fixed: "right",
-            btnList: [
-              {
-                label: "预览",
-                type: "text",
-                auth: "reportDatasource_getDetail",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.detail, row),
-              },
-              {
-                label: "编辑",
-                type: "text",
-                auth: "reportDatasource_update",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.update, row),
-              },
-              {
-                label: "删除",
-                type: "text",
-                auth: "reportDatasource_delete",
-                handle: (row) => this.deleteOne(row.contentInfoId),
-              },
-            ],
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "80vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "标题",
-            prop: "title",
-            rules: { required: true, maxLength: 100 },
-            width: "900px",
-          },
-          {
-            type: "Input",
-            label: "副标题",
-            prop: "subtitle",
-            rules: { maxLength: 100 },
-            width: "900px",
-          },
-           {
-            type: "Input",
-            label: "资讯来源",
-            prop: "source",
-            rules: { required: true, maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "作者",
-            prop: "author",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "编辑者",
-            prop: "editorName",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "外链",
-            prop: "contentLink",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "关键词",
-            prop: "keywords",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          { 
-            type:'Radio',
-            prop:'isVideo',
-            label:'内容类型',
-            radios:[{label:'资讯',value:'0'},{label:'视频',value:'1'}],
-            width: "300px",
-          },
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            rules:{required:true},
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-          {
-            type: "Tinymce",
-            label: "资讯内容",
-            prop: "content",
-            rules: { required: true },
-            width: "1200px",
-          },
-        ],
-        //modal表单 end
-        //modal表单 end
-        newModalForm:[
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-            rules:{required:true}
-          },
-          ],//咨询专属内容
-        videoModalForm:[
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-          {
-            type: "Upload",
-            label: "视频",
-            fileUrl: "videoUrl",
-            prop: "fileListVideo",
-            listType:'text',
-            rules:{required:true},
-            width: "300px",
-            isVideo:true,
-            accept:'.mp4,.avi,.mov,.rmvb,.flv,.MP4,.AVI,.MOV,.RMVB,.FLV',
-            tips:'请上传视频文件'
-          },
-        ],//视频专属内容
-        //modal 数据 start
-        modalData: {
-          userId: "",
-          content: "",
-          fileUrl: "",
-          source:'',
-           isVideo:'0',
-           mainTypeId:'',
-          fileList: [],
-          status:0,
-          videoUrl:'',
-          fileListVideo:[]
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-      },
-    };
-  },
-  watch:{
-    "pageData.modalData.isVideo":{
-      handler:function(val,oldval){
-        // console.log(val)
-        if(val==='1'&&oldval==='0'){
-          this.pageData.modalForm.splice(-1-this.pageData.newModalForm.length,this.pageData.newModalForm.length,...this.pageData.videoModalForm)
-          
-       }
-       else if(val==='0'&&oldval==='1'){
-         this.pageData.modalForm.splice(-1-this.pageData.videoModalForm.length,this.pageData.videoModalForm.length,...this.pageData.newModalForm)
-       }
-      }
-    },
-    "pageData.modalData.fileList":{
-      handler:function(val){
-        if(val&&val.length===0){
-          this.pageData.modalData.imageUrl=''
-        }
-      }
-    },
-    "pageData.modalData.fileListVideo":{
-      handler:function(val){
-        if(val&&val.length===0){
-          this.pageData.modalData.videoUrl=''
-        }
-      }
-    }
-  },
-  activated() {
-    this.searchTableList();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList() {
-      this.loading=true;
-      // 初始化obj
-      var obj = {};
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      obj.page = this.pageData.tablePage.currentPage;
-      obj.limit = this.pageData.tablePage.pageSize;
-      delete obj["pageSizeRange"];
-      if (obj.time.length == 2) {
-        obj.startTime = obj.time[0];
-        obj.endTime = obj.time[1];
-      }
-      delete obj.time
-      // 请求数据
-      this.$api.getRedActivityImage(obj).then((res) => {
-        this.commonUtil.tableAssignment(
-          res.data.page,
-          this.pageData.tablePage,
-          this.pageData.tableData
-        );
-      })
-      .finally(()=>{
-        this.loading=false
-      })
-    },
-    // 重置
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      this.searchTableList();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-      this.$nextTick(()=>{
-        this.$refs["modalRef"].$refs["modalFormRef"].clearValidate(); //校验重置
-      })
-      this.pageData.modalData.isVideo='0'//补充isVideo 不会触发watch
-      this.pageData.modalData.source=this.$newSource//获取默认的资讯来源
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-     if(row.imageUrl){
-        row.fileList=[{
-        url:row.imageUrl
-      }]
-      }
-      if(row.videoUrl){
-        row.fileListVideo=[{
-          url:row.videoUrl
-          // +'?x-oss-process=video/snapshot,t_10000,m_fast'
-        }]
-      }
-      row.isVideo=row.isVideo+''
-      this.$nextTick(()=>{
-        this.pageData.modalData = JSON.parse(JSON.stringify(row));
-      })
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.pageData.modalConfig.show = false; //关闭modal
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.pageData.modalData.userId = this.$store.state.user.id;
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          if(content.isVideo==0){
-            content.videoUrl=''
-          }
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveActivityImage(content).then((res) => {
-              this.searchTableList();
-            });
-          } else {
-            this.$api.updateRedActivityImage(content).then((res) => {
-              this.searchTableList();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteRedActivityImage(ids).then((res) => {
-            this.searchTableList();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].contentInfoId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteRedActivityImage(ids).then((res) => {
-              this.searchTableList();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-  .content-dialog ::v-deep .el-dialog__body{
-    padding: 0px;
-  }
-</style>
\ No newline at end of file
diff --git a/src/views/modules/active-match/active-match-management.vue b/src/views/modules/active-match/active-match-management.vue
deleted file mode 100644
index 8865a78..0000000
--- a/src/views/modules/active-match/active-match-management.vue
+++ /dev/null
@@ -1,1261 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-12-23 14:12:41
- * @LastEditTime: 2022-09-03 11:37:14
- * @LastEditors: chenkangxu
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\active-match\active-match-management.vue
--->
-<template>
-  <div>
-    <searchForm
-      :searchForm="searchSetting.searchForm"
-      :searchData="searchSetting.searchData"
-    />
-
-    <cesTable
-      :loading="loading"
-      :isIndex="true"
-      :tableCols="pageData.tableCols"
-      :tableData="pageData.tableData"
-      :tableHandles="pageData.tableHandles"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="findAll"
-      @handleSizeChange="findAll"
-    />
-    <modal
-      ref="modal"
-      :modalConfig="modalSetting.modalConfig"
-      :modalData="modalSetting.modalData"
-      :modalForm="modalSetting.modalForm"
-      :modalHandles="modalSetting.modalHandles"
-      labelWidth="140px"
-    />
-    <comment ref="comment" :parentId="parentId" type="ACTIVITY" />
-  </div>
-</template>
-<script>
-import comment from '../../../components/comment/comment.vue'
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import modal from "../../../components/common/modal/modal.vue";
-import cesTable from "../../../components/common/table/custable.vue";
-export default {
-  components: {
-    cesTable,
-    modal,
-    comment,
-    searchForm,
-  },
-  watch: {
-    "modalSetting.modalData.fileList": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.modalSetting.modalData.imageUrl = "";
-        }
-      },
-    },
-  },
-  activated() {
-    this.findAll();
-    this.$api.getActivityTypeList().then((res) => {
-      let options = res.data.list.map((item) => {
-        return { label: item.activityTypeName, value: item.activityTypeId };
-      });
-      this.options = options;
-      this.searchSetting.searchForm[1].options = options;
-    });
-  },
-  data() {
-    return {
-      //加载动画
-      loading:false,
-      modalSetting: {
-        modalConfig: {
-          show: false,
-          width: "1200px",
-          title: "添加活动/赛事",
-          key: false,
-          fullscreen:true
-        },
-        baseForm: [
-          {
-            label: "活动详情",
-            prop: "activityExplain",
-            type: "Input",
-            placeholder:'请输入活动外链',
-             rules:{required:true},
-            width: "600px",
-          },
-          {
-            label: "活动详情",
-            prop: "activityExplain",
-            type: "Tinymce",
-             rules:{required:true},
-            width: "600px",
-          },
-          //时间线备份
-          {
-            label: "时间线",
-            width: "900px",
-            prop: "timeEntityList",
-            type: "Table",
-            
-            isPagination: false,
-            tableCols: [
-              {
-                label: "时间节点名称",
-                prop: "content",
-                type: "formInput",
-                validate: true,
-                rules: {
-                  content: { required: true, message: "时间节点名称不能为空" },
-                },
-                isDisabled: (row, index) => {
-                  if (
-                    index === 0 ||
-                    index ===
-                      this.modalSetting.modalData.timeEntityList.length - 1
-                  ) {
-                    return true;
-                  } else {
-                    return false;
-                  }
-                },
-              },
-              {
-                label: "开始时间",
-                prop: "startTime",
-                validate: true,
-                type: "formDate",
-                pickerOptions: (row, index) => {
-                  return {
-                    disabledDate: (time) =>
-                      // console.log(index)
-                      this.disabledDate("开始时间", time, index),
-                  };
-                },
-                rules: {
-                  startTime: { required: true, message: "开始时间不能为空" },
-                },
-                disabled: (row, index) => {
-                  if (
-                    index ===
-                    this.modalSetting.modalData.timeEntityList.length - 1
-                  ) {
-                    return true;
-                  } else {
-                    return false;
-                  }
-                },
-              },
-              {
-                label: "结束时间",
-                prop: "endTime",
-                validate: true,
-                type: "formDate",
-                pickerOptions: (row, index) => {
-                  return {
-                    disabledDate: (time) =>
-                      this.disabledDate("结束时间", time, index),
-                  };
-                },
-                defaultTime: "23:59:59",
-                rules: {
-                  endTime: { required: true, message: "结束时间不能为空" },
-                },
-                disabled: (row, index) => {
-                  if (index === 0) {
-                    return true;
-                  } else {
-                    return false;
-                  }
-                },
-              },
-              {
-                label: "操作",
-                width: "60px",
-                type: "button",
-                btnList: [
-                  {
-                    label: "删除",
-                    type: "text",
-                    disabled: (row, index) => {
-                      if (
-                        index === 0 ||
-                        index ===
-                          this.modalSetting.modalData.timeEntityList.length - 1
-                      ) {
-                        return true;
-                      } else {
-                        return false;
-                      }
-                    },
-                    handle: (row, index) => {
-                      this.$confirm("确认删除该时间节点?", "提示", {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning",
-                      })
-                        .then(() => {
-                          this.modalSetting.modalData.timeEntityList.splice(
-                            index,
-                            1
-                          );
-                          let ref =
-                            "cesForm" +
-                            (this.modalSetting.modalData.timeEntityList.length -
-                              1);
-                          this.$nextTick(() => {
-                            // console.log(ref)
-                            // console.log(this.$refs.modal.$refs.modalFormTable[0].$refs)
-                            this.$refs.modal.$refs.modalFormTable[0].$refs[
-                              ref
-                            ][1].clearValidate();
-                          });
-                          this.$message({
-                            type: "success",
-                            message: "删除成功!",
-                          });
-                        })
-                        .catch(() => {
-                          this.$message({
-                            type: "info",
-                            message: "已取消删除",
-                          });
-                        });
-                    },
-                  },
-                ],
-              },
-            ],
-            tableHandles: [
-              {
-                label: "添加",
-                type: "primary",
-                disabled:()=>{
-                    if(this.modalSetting.modalData.timeEntityList.length<5) return false
-                    else return true
-                  },
-                handle: () => {
-                  this.modalSetting.modalData.timeEntityList.splice(
-                    this.modalSetting.modalData.timeEntityList.length - 1,
-                    0,
-                    {}
-                  );
-                },
-              },
-            ],
-          },
-          {
-            label: "起始时间",
-            prop: "time",
-             rules:{required:true},
-            type: "DateTimeRange",
-            pickerOptions: {
-              disabledDate: (time) => {
-                var nowDate = new Date();
-                //当前时间减去1天
-                var aimDate = new Date(nowDate.setDate(nowDate.getDate() - 1));
-                return time.getTime() < aimDate;
-              },
-            },
-            defaultTime: ["00:00:00", "23:59:59"],
-          },
-          {
-            label: "活动地址",
-            prop: "address",
-             rules:{required:true},
-            type: "Input",
-            width: "600px",
-          },
-        ],
-        modalForm: [],
-        modalHandles: [
-          {
-            label: "确认",
-            type: "primary",
-            handle: () => {
-              // console.log(this.$refs.modal.$refs.modalFormTable[0].$refs.cesForm0)
-              this.save();
-            },
-          },
-        ],
-        modalData: {
-          title: "",
-          imageUrl: "",
-          isVideo: 0,
-          isWebExplain: 1,
-          activityExplain: "",
-          fileList: [],
-          startTime: "",
-          endTime: "",
-          time: [],
-          activityTypeId: "",
-          activityOrMatch: "活动",
-          status: "未开始",
-          isOnline: "线上活动",
-          signUpMoney: "",
-          sponsor: this.$newSource,
-          timeEntityList: [
-            { content: "开始时间", startTime: "", endTime: "" },
-            { content: "结束时间", startTime: "", endTime: "" },
-          ],
-          noticeEntityList: [],
-        },
-      },
-      pageData: {
-        tableData: [],
-        tableCols: [
-          { label: "标题", prop: "title" },
-          { label: "背景图", prop: "imageUrl", type: "image" },
-        
-          { label: "所属分类", prop: "activityTypeName" },
-           { label: "主办方", prop: "sponsor" },
-            {
-            label: "活动时间",
-            width: "300px",
-            formatter: (prop, row) => {
-              return row.startTime + " - " + row.endTime;
-            },
-          },
-           { label: "线上/线下", prop: "isOnline" },
-            { label: "报名所需红星币", prop: "signUpMoney" },
-             { label: "报名人数", prop: "signUpPeople" },
-              
-          { label: "阅读量", prop: "readNumber" },
-         
-          {label:'评论数',prop:'commentNumber'},
-          { label: "类型", prop: "activityOrMatch" },
-            { label: "状态", prop: "status" },
-          {
-            label: "操作",
-            width: "170px",
-            type: "button",
-            btnList: [
-              {
-                label:'查看评论',
-                type:'text',
-                handle:(row)=>{
-                  this.parentId=row.activityId
-                  this.$refs.comment.modalConfig.show=true
-                }
-              },
-              {
-                label: "编辑",
-                type: "text",
-                handle: (row) => {
-                  let data = JSON.parse(JSON.stringify(row));
-                  if (data.activityOrMatch === "活动") {
-                    this.modalSetting.modalConfig.title = "编辑活动";
-                  } else {
-                    this.modalSetting.modalConfig.title = "编辑赛事";
-                  }
-                  if (data.imageUrl) {
-                    data.fileList = [{ url: data.imageUrl }];
-                  }
-                  // console.log(data)
-                  this.changeForm(
-                    data.activityOrMatch,
-                    data.isWebExplain,
-                    data.isOnline
-                  );
-                  if (data.isOnline === "线上活动") {
-                    data.timeEntityList[
-                      data.timeEntityList.length - 1
-                    ].endTime =
-                      data.timeEntityList[
-                        data.timeEntityList.length - 1
-                      ].startTime;
-                    data.timeEntityList[
-                      data.timeEntityList.length - 1
-                    ].startTime = "";
-                    console.log(data.timeEntityList)
-                    data.timeEntityList.forEach(item=>{
-                      if(item.startTime){
-                        item.startTime=item.startTime.slice(0,11)+'00:00:00'
-                      }
-                      if(item.endTime){
-                         item.endTime=item.endTime.slice(0,11)+'00:00:00'
-                      }
-                    })
-                     console.log(data.timeEntityList)
-                  } else {
-                    data.time = [data.startTime, data.endTime];
-                  }
-
-                  data.signUpMoney = data.signUpMoney + "";
-                  this.modalSetting.modalData = data;
-                  this.modalSetting.modalConfig.show = true;
-                  this.clearValidate();
-                },
-              },
-              {
-                label: "删除",
-                type: "text",
-                handle: (row) => this.del(row.activityId),
-              },
-            ],
-          },
-        ],
-        tableHandles: [
-          {
-            label: "新增活动",
-            type: "primary",
-            handle: () => {
-              this.changeForm("活动", 1, "线下活动");
-              this.resetModalForm("活动");
-              this.modalSetting.modalData.activityOrMatch = "活动";
-              this.modalSetting.modalConfig.title = "添加活动";
-
-              this.modalSetting.modalConfig.show = true;
-            },
-          },
-          // {
-          //   label: "新增赛事",
-          //   type: "primary",
-          //   handle: () => {
-          //     this.changeForm("赛事", 1, "线上活动");
-          //     this.resetModalForm("赛事");
-          //     this.modalSetting.modalData.activityOrMatch = "赛事";
-          //     this.modalSetting.modalConfig.title = "添加赛事";
-          //     this.modalSetting.modalConfig.show = true;
-          //   },
-          // },
-        ],
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-      },
-      searchSetting: {
-        searchForm: [
-          { label: "标题", prop: "searchName", type: "Input",size:"mini" },
-          {
-            label: "分类",
-            prop: "activityTypeId",
-            default: true,
-            type: "Select",
-            size:"mini",
-            options: [],
-          },
-          // {
-          //   label: "类型",
-          //   prop: "activityOrMatch",
-          //   type: "Select",size:"mini",
-          //   options: [
-          //     { label: "活动", value: "活动" },
-          //     { label: "赛事", value: "赛事" },
-          //   ],
-          // },
-          {
-            label: "状态",
-            prop: "status",size:"mini",
-            default: true,
-            type: "Select",
-            options: [
-              { label: "未开始", value: "未开始" },
-              { label: "进行中", value: "进行中" },
-              { label: "已结束", value: "已结束" },
-            ],
-          },
-          {
-            label: "线上/线下",
-            prop: "isOnline",
-            default: true,
-            type: "Select",size:"mini",
-            options: [
-              { label: "线上", value: "线上活动" },
-              { label: "线下", value: "线下活动" },
-            ],
-          },
-          {
-            name: "查询",
-            type: "Button",
-            style: "primary",size:"mini",
-            handle: () => this.findAll(),
-          },
-          {
-            name: "重置",
-            type: "Button",
-            style:'warning',size:"mini",
-            handle: () => this.resetSearchForm(),
-          },
-        ],
-        searchData: {
-          searchName: "",
-          activityTypeId: "",
-          activityOrMatch: "活动",
-          status: "",
-          isOnline: "",
-        },
-      },
-      options: [],
-      parentId:''
-    };
-  },
-  methods: {
-    save() {
-      this.$refs.modal.$refs.modalFormRef.validate((valid) => {
-        if (valid) {
-          // console.log(1)
-          let flag = true;
-          // 验证时间线表格与公告栏必填
-          if (this.modalSetting.modalData.isOnline === "线上活动") {
-            this.modalSetting.modalData.timeEntityList.forEach(
-              (item, index) => {
-                let ref = "cesForm" + index;
-                if (index === 0) {
-                  this.$refs.modal.$refs.modalFormTable[0].$refs[
-                    ref
-                  ][1].validate((valid) => {
-                    if (!valid) {
-                      // console.log(2)
-                      flag = false;
-                    }
-                  });
-                } else if (
-                  index ===
-                  this.modalSetting.modalData.timeEntityList.length - 1
-                ) {
-                  this.$refs.modal.$refs.modalFormTable[0].$refs[
-                    ref
-                  ][2].validate((valid) => {
-                    if (!valid) {
-                      // console.log(2)
-                      flag = false;
-                    }
-                  });
-                } else {
-                  for (let i = 0; i < 3; i++) {
-                    this.$refs.modal.$refs.modalFormTable[0].$refs[ref][
-                      i
-                    ].validate((valid) => {
-                      if (!valid) {
-                        // console.log(2)
-                        flag = false;
-                      }
-                    });
-                  }
-                }
-              }
-            );
-          }
-          this.modalSetting.modalData.noticeEntityList.forEach(
-            (item, index) => {
-              let ref = "NoticeForm" + index;
-              // console.log(this.$refs.modal.$refs[ref])
-              this.$refs.modal.$refs[ref][0].validate((valid) => {
-                if (!valid) {
-                  flag = false;
-                }
-              });
-            }
-          );
-          if (flag) {
-            let obj = JSON.parse(JSON.stringify(this.modalSetting.modalData));
-            if (this.modalSetting.modalData.isOnline === "线下活动") {
-              console.log(obj.time);
-              obj.startTime = obj.time[0];
-              obj.endTime = obj.time[1];
-              obj.timeEntityList = [
-                { content: "开始时间", startTime: obj.startTime, endTime: "" },
-                { content: "结束时间", startTime: obj.endTime, endTime: "" },
-              ];
-            } else {
-              console.log(obj.isVideo)
-              // 循环时间线赋予时分秒
-              for(let i=0;i<obj.timeEntityList.length;i++){
-                if(i!==obj.timeEntityList.length-1){
-                 obj.timeEntityList[i].startTime= obj.timeEntityList[i].startTime.slice(0,-4)+i+':00';
-                  if(i!==0 ){
-                    let str1=obj.timeEntityList[i].startTime.slice(11,-2)+'30'
-                    obj.timeEntityList[i].endTime=obj.timeEntityList[i].endTime.slice(0,11)+str1
-
-                    
-                  }
-                  
-                }
-                else{
-                  obj.timeEntityList[i].endTime=obj.timeEntityList[i].endTime.slice(0,11)+'00:10:00'
-                }
-                //  console.log(obj.timeEntityList[i].startTime)
-                //    console.log(obj.timeEntityList[i].endTime)
-                
-              }
-              obj.startTime = obj.timeEntityList[0].startTime;
-              obj.endTime =
-                obj.timeEntityList[obj.timeEntityList.length - 1].endTime;
-              obj.timeEntityList[obj.timeEntityList.length - 1].endTime = "";
-              obj.timeEntityList[obj.timeEntityList.length - 1].startTime =
-                obj.endTime;
-            }
-
-            if (
-              this.modalSetting.modalConfig.title === "添加活动" ||
-              this.modalSetting.modalConfig.title === "添加赛事"
-            ) {
-              this.$api.addActiveMatch(obj).then((res) => {
-                this.modalSetting.modalConfig.show = false;
-                this.findAll();
-              });
-            } else {
-              this.$api.updateActiveMatch(obj).then((res) => {
-                this.modalSetting.modalConfig.show = false;
-                this.findAll();
-              });
-            }
-          }
-        }
-      });
-    },
-    changeForm(activityOrMatch, isWebExplain, isOnline) {
-      // console.log(1);
-
-      if (activityOrMatch) {
-        if (activityOrMatch === "活动") {
-          this.modalSetting.modalForm = [
-            {
-              label: "线上/线下",
-              prop: "isOnline",
-              type: "Radio",
-              rules:{required:true},
-              radios: [
-                { label: "线上活动", value: "线上活动" },
-                { label: "线下活动", value: "线下活动" },
-              ],
-              change: (val) => {
-                this.changeForm(null, null, val);
-              },
-            },
-            { label: "标题", rules:{required:true}, prop: "title", type: "Input", width: "600px" },
-            {
-              label: "背景图",
-               rules:{required:true},
-              prop: "fileList",
-              fileUrl: "imageUrl",
-              type: "Upload",
-              drag:true
-            },
-            {
-              label: "分类",
-              prop: "activityTypeId",
-              type: "Select",
-               rules:{required:true},
-              options: this.options,
-            },
-
-            {
-              label: "报名所需红星币",
-              prop: "signUpMoney",
-              width: "600px",
-               rules:{required:true},
-              type: "Input",
-              rules: { type: "positiveInt" },
-            },
-            { label: "主办方",  rules:{required:true},prop: "sponsor", type: "Input", width: "600px" },
-            {
-              label: "作品类型",
-               rules:{required:true},
-              prop: "isVideo",
-              type: "Radio",
-              radios: [
-                { label: "图文", value: 0 },
-                { label: "视频", value: 1 },
-              ],
-            },
-            {
-              label: "活动详情是否外链",
-               rules:{required:true},
-              prop: "isWebExplain",
-              type: "Radio",
-              radios: [
-                { label: "是", value: 1 },
-                { label: "否", value: 0 },
-              ],
-              change: (val) => {
-                this.changeForm(null, val);
-              },
-            },
-            {
-              label: "活动详情",
-              prop: "activityExplain",
-              placeholder:'请输入活动外链',
-               rules:{required:true},
-              type: "Input",
-              width: "600px",
-            },
-            {
-              label: "起始时间",
-              prop: "time",
-              type: "DateTimeRange",
-               rules:{required:true},
-              pickerOptions: {
-                disabledDate: (time) => {
-                  var nowDate = new Date();
-                  //当前时间减去1天
-                  var aimDate = new Date(
-                    nowDate.setDate(nowDate.getDate() - 1)
-                  );
-                  return time.getTime() < aimDate;
-                },
-              },
-              defaultTime: ["00:00:00", "23:59:59"],
-            },
-            {
-              label: "公告",
-              prop: "noticeEntityList",
-              content: "添加",
-              width: "600px",
-              type: "Notice",
-              style: "primary",
-              rules: {
-                content: { required: true, message: "请输入公告内容！" },
-              },
-              childProp: "content",
-              handle: () => {
-                this.modalSetting.modalData.noticeEntityList.push({
-                  content: "",
-                });
-              },
-              del: (index) => {
-                this.$confirm("是否确认删除该公告?", "提示", {
-                  confirmButtonText: "确定",
-                  cancelButtonText: "取消",
-                  type: "warning",
-                })
-                  .then(() => {
-                    this.modalSetting.modalData.noticeEntityList.splice(
-                      index,
-                      1
-                    );
-
-                    this.$message({
-                      type: "success",
-                      message: "删除成功!",
-                    });
-                  })
-                  .catch(() => {
-                    this.$message({
-                      type: "info",
-                      message: "已取消删除",
-                    });
-                  });
-              },
-            },
-          ];
-        } else {
-          this.modalSetting.modalForm = [
-            {
-              label: "线上/线下",
-              prop: "isOnline",
-              type: "Radio",
-              rules:{required:true},
-              radios: [
-                { label: "线上赛事", value: "线上活动" },
-                { label: "线下赛事", value: "线下活动" },
-              ],
-              change: (val) => {
-                this.changeForm(null, null, val);
-              },
-            },
-            { label: "标题",rules:{required:true}, prop: "title", type: "Input", width: "600px" },
-            {
-              label: "背景图",
-              prop: "fileList",
-              rules:{required:true},
-              fileUrl: "imageUrl",
-              type: "Upload",
-              drag:true
-            },
-            {
-              label: "分类",
-              rules:{required:true},
-              prop: "activityTypeId",
-              type: "Select",
-              options: this.options,
-            },
-
-            {
-              label: "报名所需红星币",
-              prop: "signUpMoney",
-              rules:{required:true},
-              width: "600px",
-              type: "Input",
-              rules: { type: "positiveInt" },
-            },
-            { label: "主办方",rules:{required:true}, prop: "sponsor", type: "Input", width: "600px" },
-            {
-              label: "赛事详情是否外链",rules:{required:true},
-              prop: "isWebExplain",
-              type: "Radio",
-              radios: [
-                { label: "是", value: 1 },
-                { label: "否", value: 0 },
-              ],
-              change: (val) => {
-                this.changeForm(null, val);
-              },
-            },
-            {
-              label: "赛事详情",rules:{required:true},
-              prop: "activityExplain",
-              type: "Input",
-              width: "600px",
-            },
-            {
-              label: "时间线",
-              width: "900px",
-              prop: "timeEntityList",
-              type: "Table",
-              isPagination: false,
-              tableCols: [
-                {
-                  label: "时间节点名称",
-                  prop: "content",
-                  type: "formInput",
-                  validate: true,
-                  rules: {
-                    content: {
-                      required: true,
-                      message: "时间节点名称不能为空",
-                    },
-                  },
-                  isDisabled: (row, index) => {
-                    if (
-                      index === 0 ||
-                      index ===
-                        this.modalSetting.modalData.timeEntityList.length - 1
-                    ) {
-                      return true;
-                    } else {
-                      return false;
-                    }
-                  },
-                },
-                {
-                  label: "开始时间",
-                  prop: "startTime",
-                  validate: true,
-                  type: "formDate",
-                  pickerOptions: (row, index) => {
-                    return {
-                      disabledDate: (time) =>
-                        this.disabledDate("开始时间", time, index),
-                    };
-                  },
-                  rules: {
-                    startTime: { required: true, message: "开始时间不能为空" },
-                  },
-                  disabled: (row, index) => {
-                    if (
-                      index ===
-                      this.modalSetting.modalData.timeEntityList.length - 1
-                    ) {
-                      return true;
-                    } else {
-                      return false;
-                    }
-                  },
-                },
-                {
-                  label: "结束时间",
-                  prop: "endTime",
-                  validate: true,
-                  type: "formDate",
-                  pickerOptions: (row, index) => {
-                    return {
-                      disabledDate: (time) =>
-                        this.disabledDate("结束时间", time, index),
-                    };
-                  },
-                  defaultTime: "23:59:59",
-                  rules: {
-                    endTime: { required: true, message: "结束时间不能为空" },
-                  },
-                  disabled: (row, index) => {
-                    if (index === 0) {
-                      return true;
-                    } else {
-                      return false;
-                    }
-                  },
-                },
-                {
-                  label: "操作",
-                  width: "60px",
-                  type: "button",
-                  btnList: [
-                    {
-                      label: "删除",
-                      type: "text",
-                      disabled: (row, index) => {
-                        if (
-                          index === 0 ||
-                          index ===
-                            this.modalSetting.modalData.timeEntityList.length -
-                              1
-                        ) {
-                          return true;
-                        } else {
-                          return false;
-                        }
-                      },
-                      handle: (row, index) => {
-                        this.$confirm("确认删除该时间节点?", "提示", {
-                          confirmButtonText: "确定",
-                          cancelButtonText: "取消",
-                          type: "warning",
-                        })
-                          .then(() => {
-                            this.modalSetting.modalData.timeEntityList.splice(
-                              index,
-                              1
-                            );
-                            let ref =
-                              "cesForm" +
-                              (this.modalSetting.modalData.timeEntityList
-                                .length -
-                                1);
-                            this.$nextTick(() => {
-                              this.$refs.modal.$refs.modalFormTable[0].$refs[
-                                ref
-                              ][1].clearValidate();
-                            });
-                            this.$message({
-                              type: "success",
-                              message: "删除成功!",
-                            });
-                          })
-                          .catch(() => {
-                            this.$message({
-                              type: "info",
-                              message: "已取消删除",
-                            });
-                          });
-                      },
-                    },
-                  ],
-                },
-              ],
-              tableHandles: [
-                {
-                  label: "添加",
-                  type: "primary",
-                  disabled:()=>{
-                    if(this.modalSetting.modalData.timeEntityList.length<10) return false
-                    else return true
-                  },
-                  handle: () => {
-                    this.modalSetting.modalData.timeEntityList.splice(
-                      this.modalSetting.modalData.timeEntityList.length - 1,
-                      0,
-                      {}
-                    );
-                  },
-                },
-              ],
-            },
-            {
-              label: "公告",
-              prop: "noticeEntityList",
-              content: "添加",
-              width: "600px",
-              type: "Notice",
-              style: "primary",
-              rules: {
-                content: { required: true, message: "请输入公告内容！" },
-              },
-              childProp: "content",
-              handle: () => {
-                this.modalSetting.modalData.noticeEntityList.push({
-                  content: "",
-                });
-              },
-              del: (index) => {
-                this.$confirm("是否确认删除该公告?", "提示", {
-                  confirmButtonText: "确定",
-                  cancelButtonText: "取消",
-                  type: "warning",
-                })
-                  .then(() => {
-                    this.modalSetting.modalData.noticeEntityList.splice(
-                      index,
-                      1
-                    );
-
-                    this.$message({
-                      type: "success",
-                      message: "删除成功!",
-                    });
-                  })
-                  .catch(() => {
-                    this.$message({
-                      type: "info",
-                      message: "已取消删除",
-                    });
-                  });
-              },
-            },
-          ];
-        }
-      }
-      let form = this.modalSetting.modalForm;
-      // 外链切换
-      if (isWebExplain !== null && isWebExplain !== undefined) {
-        for (let i = 0; i < this.modalSetting.modalForm.length; i++) {
-          if (this.modalSetting.modalForm[i].label === "活动详情"||this.modalSetting.modalForm[i].label === "赛事详情") {
-            let label=this.modalSetting.modalForm[i].label
-            if (isWebExplain == 1) {
-              
-              this.modalSetting.modalForm.splice(
-                i,
-                1,
-                this.modalSetting.baseForm[0]
-              );
-              if(label==='活动详情'){
-                this.modalSetting.modalForm[i].placeholder='请输入活动外链'
-              }else{
-                 this.modalSetting.modalForm[i].placeholder='请输入赛事外链'
-              }
-            } else {
-              this.modalSetting.modalForm.splice(
-                i,
-                1,
-                this.modalSetting.baseForm[1]
-              );
-            }
-             this.modalSetting.modalForm[i].label=label
-            
-           
-            break;
-          }
-        }
-        // console.log(this.modalSetting.modalForm[8]);
-        this.modalSetting.modalConfig.key = !this.modalSetting.modalConfig.key;
-      }
-
-      //线上线下切换
-      if (isOnline !== null && isOnline !== undefined) {
-        for (let i = 0; i < form.length; i++) {
-          if (form[i].label === "作品类型" && isOnline === "线下活动") {
-            form.splice(i, 1);
-          }
-          if (form[i].label === "主办方" && isOnline === "线上活动") {
-            form.splice(i + 1, 0, {
-              label: "作品类型",
-              prop: "isVideo",
-              type: "Radio",
-               rules:{required:true},
-              radios: [
-                { label: "图文", value: 0 },
-                { label: "视频", value: 1 },
-              ],
-            });
-          }
-          if (
-            form[i].label === "时间线" ||
-            form[i].label === "起始时间"
-          ) {
-            if (this.modalSetting.modalData.activityOrMatch === "活动") {
-              this.modalSetting.baseForm[4].label = "活动地址";
-            } else {
-              this.modalSetting.baseForm[4].label = "赛事地址";
-            }
-            if (isOnline === "线下活动") {
-              form.splice(
-                i,
-                1,
-                this.modalSetting.baseForm[3],
-                this.modalSetting.baseForm[4]
-              );
-            } else {
-              for (let j = 0; j < form.length; j++) {
-                if (
-                  form[j].label === "活动地址" ||
-                  form[j].label === "赛事地址"
-                ) {
-                  form.splice(j, 1);
-                }
-              }
-              form.splice(i, 1, this.modalSetting.baseForm[2]);
-            }
-
-            break;
-          }
-        }
-      }
-    },
-    findAll() {
-      this.loading=true;
-      let obj = this.searchSetting.searchData;
-      obj.page = this.pageData.tablePage.currentPage;
-      obj.limit = this.pageData.tablePage.pageSize;
-      this.$api.getActiveMatch(obj).then((res) => {
-        this.pageData.tableData = res.data.page.list;
-        this.pageData.tablePage.pageTotal = res.data.page.totalCount;
-      })
-      .finally(()=>{
-        this.loading=false;
-      })
-    },
-    resetModalForm(type) {
-      for (let item in this.modalSetting.modalData) {
-        if (item === "activityOrMatch") {
-          this.modalSetting.modalData[item] = "活动";
-        } else if (item === "isWebExplain") {
-          this.modalSetting.modalData[item] = 1;
-        } else if (item === "isVideo") {
-          this.modalSetting.modalData[item] = 0;
-        } else if (item === "time") {
-          this.modalSetting.modalData[item] = [];
-        } else if (item === "fileList") {
-          this.modalSetting.modalData[item] = [];
-        } else if (item === "status") {
-          this.modalSetting.modalData[item] = "未开始";
-        } else if (item === "isOnline") {
-          if (type === "活动") this.modalSetting.modalData[item] = "线下活动";
-          else this.modalSetting.modalData[item] = "线上活动";
-        } else if (item === "timeEntityList") {
-          this.modalSetting.modalData[item] = [
-            { content: "开始时间", startTime: "", endTime: "" },
-            { content: "结束时间", startTime: "", endTime: "" },
-          ];
-        } else if (item === "noticeEntityList") {
-          this.modalSetting.modalData[item] = [];
-        } else if (item === "sponsor") {
-          this.modalSetting.modalData[item] = this.$newSource;
-        }else if (item === "signUpMoney") {
-          this.modalSetting.modalData[item] = '0';
-        } else {
-          this.modalSetting.modalData[item] = "";
-        }
-      }
-      // this.modalSetting.modalConfig.key=!this.modalSetting.modalConfig.key
-    },
-    clearValidate() {
-      this.$nextTick(() => {
-        //时间线区域
-        if (this.modalSetting.modalData.isOnline === "线上活动") {
-          this.modalSetting.modalData.timeEntityList.forEach((item, index) => {
-            let ref = "cesForm" + index;
-
-            for (let i = 0; i < 3; i++) {
-              this.$refs.modal.$refs.modalFormTable[0].$refs[ref][
-                i
-              ].clearValidate();
-            }
-          });
-        }
-
-        this.$refs.modal.$refs.modalFormRef.clearValidate();
-      });
-    },
-    resetSearchForm() {
-      // console.log(1)
-      for (let item in this.searchSetting.searchData) {
-        if (item === "activityOrMatch") {
-          this.searchSetting.searchData[item] = "活动";
-        } else {
-          this.searchSetting.searchData[item] = "";
-        }
-      }
-    },
-    del(id) {
-      this.$confirm("此操作将永久删除该活动, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$api.delActiveMatch([id]).then((res) => {
-            this.findAll();
-          });
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-    disabledDate(type, time, index) {
-      // console.log(time)
-      // console.log(index)
-      var nowDate = new Date();
-      //当前时间减去1天
-      var aimDate = new Date(nowDate.setDate(nowDate.getDate() - 1));
-      let list = this.modalSetting.modalData.timeEntityList;
-      
-      if(index<list.length){
-        if (type === "开始时间") {
-        if (index === 0) {
-          if (list.length === 2) {
-            let date = new Date(list[1].endTime);
-            return time.getTime() > date.getTime() || time.getTime() < aimDate;
-          } else {
-            let date = new Date(list[1].startTime);
-            return time.getTime() > date.getTime() || time.getTime() < aimDate;
-          }
-        } else {
-          if (index === 1) {
-            let date1 = new Date(list[0].startTime);
-            let date2 = new Date(list[index].endTime);
-            return (
-              time.getTime() < date1.getTime() ||
-              time.getTime() > date2.getTime() ||
-              time.getTime() < aimDate
-            );
-          } else {
-            let date1 = new Date(list[index - 1].endTime);
-            let date2 = new Date(list[index].endTime);
-            return (
-              time.getTime() < date1.getTime() ||
-              time.getTime() > date2.getTime() ||
-              time.getTime() < aimDate
-            );
-          }
-        }
-      } else {
-        if (index === list.length - 1) {
-          if (list.length === 2) {
-            let date = new Date(list[0].startTime);
-            date=new Date(date.setDate(date.getDate()+1))
-            return time.getTime() < date.getTime() || time.getTime() < aimDate;
-          } else {
-            let date = new Date(list[index - 1].endTime);
-            return time.getTime() < date.getTime() || time.getTime() < aimDate;
-          }
-        } else {
-          if (index === list.length - 2) {
-            let date1 = new Date(list[index].startTime);
-             date1=new Date(date1.setDate(date1.getDate()+1))
-            let date2 = new Date(list[index + 1].endTime);
-            return (
-              time.getTime() < date1.getTime() ||
-              time.getTime() > date2.getTime() ||
-              time.getTime() < aimDate
-            );
-          } else {
-            let date1 = new Date(list[index].startTime);
-             date1=new Date(date1.setDate(date1.getDate()+1))
-            let date2 = new Date(list[index + 1].startTime);
-            return (
-              time.getTime() < date1.getTime() ||
-              time.getTime() > date2.getTime() ||
-              time.getTime() < aimDate
-            );
-          }
-        }
-      }
-      }
-      
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/active-match/active-sign-up.vue b/src/views/modules/active-match/active-sign-up.vue
deleted file mode 100644
index a50292a..0000000
--- a/src/views/modules/active-match/active-sign-up.vue
+++ /dev/null
@@ -1,134 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-12-25 14:30:37
- * @LastEditTime: 2022-04-16 19:52:46
- * @LastEditors: chenkangxu
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\active-match\active-sign-up.vue
--->
-<template>
-    <div>
-        <searchForm
-        :searchForm="searchSetting.searchForm"
-        :searchData="searchSetting.searchData"
-        />
-        <cesTable
-        :loading="loading"
-        :tableCols="pageData.tableCols"
-        :tableData="pageData.tableData"
-        :tablePage="pageData.tablePage"
-        :tableHandles="pageData.tableHandles"
-        @handleCurrentChange="findAll"
-        @handleSizeChange="findAll"
-        />
-        <activeMatchModal ref="activeMatchModal" :form="searchSetting.searchData" />
-    </div>
-</template>
-<script>
-import searchForm from '../../../components/common/searchform/searchForm.vue'
-import cesTable from '../../../components/common/table/custable.vue'
-import activeMatchModal from './components/active-match-modal.vue'
-export default {
-    components:{
-        searchForm,
-        cesTable,
-        activeMatchModal
-    },
-    data(){
-        return{
-            //加载动画
-            loading:false,
-            pageData:{
-                tableCols:[
-                    {label:"姓名",prop:'name'},
-                    {label:"学校",prop:'schoolName'},
-                    {label:"年级",prop:'studentGrade'},
-                    {label:"班级",prop:'studentClass'},
-                    {label:"分组",prop:'studentGroup'},
-                    {label:"手机号",prop:'cellphone'}
-                ],
-                tableData:[],
-                tablePage:{
-                    currentPage: 1,
-                    pageSize: 5,
-                    pageTotal: 0,
-                    pageSizeRange: [5, 10, 20, 50],
-                },
-                tableHandles:[
-                    // {label:'选择活动/赛事',type:'primary',handle:()=>{
-                    //     this.$refs.activeMatchModal.modalConfig.show=true
-                    // }}
-                ]
-            },
-            searchSetting:{
-                searchForm:[
-                    {label:'活动名称',prop:'activityName',readonly:true,size:"mini",type:'Input',focus:()=>{this.$refs.activeMatchModal.modalConfig.show=true}},
-                    {label:'姓名',prop:'name',type:'Input',size:"mini"},
-                    {label:'电话',prop:'cellphone',type:'Input',size:"mini"},
-                    {label:'分组',prop:'studentGroup',type:'Select',size:"mini",options:[
-                        {label:'小学组',value:'小学组'},
-                        {label:'初中组',value:'初中组'},
-                        {label:'高中组',value:'高中组'}
-                    ]},
-                    {name:'查询',type:'Button',style:'primary',size:"mini",
-                    // disabled:()=>{
-                    //     if(this.searchSetting.searchData.activityId===''){
-                    //         return true
-                    //     }else{
-                    //         return false
-                    //     }
-                    //     // return true
-                    // },
-                    handle:()=>{
-                        if(this.searchSetting.searchData.activityId===''){
-                            this.$message({
-                                type:'warning',
-                                message:"请先选择活动/赛事！"
-                            })
-                            setTimeout(()=>{
-                                //帮忙打开活动赛事
-                                this.$refs.activeMatchModal.modalConfig.show=true
-                            },800)
-
-                        }
-                        else
-                        this.findAll()
-                    }},
-                    {name:'重置',type:'Button',size:"mini",style:'warning',handle:()=>{
-                        this.resetSearchForm()
-                    }}
-                ],
-                searchData:{
-                    name:'',
-                    activityName:'',
-                    activityId:'',
-                    cellphone:'',
-                    studentGroup:''
-                }
-            }
-        }
-    },
-    methods:{
-        findAll(){
-            this.loading=true;
-            let data=JSON.parse(JSON.stringify(this.searchSetting.searchData))
-            data.timeEntityList=''
-            this.$api.getActiveSignUp(data).then(res=>{
-                this.pageData.tableData=res.data.page.list;
-                this.pageData.tablePage.pageTotal=res.data.page.totalCount
-            })
-            .finally(()=>{
-                this.loading=false;
-            })
-        },
-        resetSearchForm(){
-            for(let item in this.searchSetting.searchData){
-                this.searchSetting.searchData[item]=''
-            }
-        }
-    }
-}
-</script>
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/modules/active-match/components/active-match-management.vue b/src/views/modules/active-match/components/active-match-management.vue
deleted file mode 100644
index 272c43b..0000000
--- a/src/views/modules/active-match/components/active-match-management.vue
+++ /dev/null
@@ -1,535 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-12-23 14:12:41
- * @LastEditTime: 2022-04-16 19:49:58
- * @LastEditors: chenkangxu
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\active-match\active-match-management.vue
--->
-<template>
-  <div>
-    <searchForm
-      :searchForm="searchSetting.searchForm"
-      :searchData="searchSetting.searchData"
-    />
-
-    <cesTable
-      :loading="loading"
-      ref="table"
-      :highlight-current-row="true"
-      :tableCols="pageData.tableCols"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @currentChange="currentChange"
-      @handleCurrentChange="findAll"
-      @handleSizeChange="findAll"
-    />
-  </div>
-</template>
-<script>
-import searchForm from "../../../../components/common/searchform/searchForm.vue";
-import cesTable from "../../../../components/common/table/custable.vue";
-export default {
-  components: {
-    cesTable,
-    searchForm,
-  },
-  watch: {
-    "modalSetting.modalData.fileList": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.modalSetting.modalData.imageUrl = "";
-        }
-      },
-    },
-  },
-  data() {
-    return {
-      //加载动画
-      loading:false,
-      modalSetting: {
-        modalConfig: {
-          show: false,
-          width: "1200px",
-          title: "添加活动/赛事",
-          key: false,
-        },
-        baseForm: [
-          {
-            label: "活动详情",
-            prop: "activityExplain",
-            type: "Input",
-            width: "600px",
-          },
-          {
-            label: "活动详情",
-            prop: "activityExplain",
-            type: "Tinymce",
-            width: "600px",
-          },
-          //时间线备份
-          {
-            label: "时间线",
-            width: "900px",
-            prop: "timeEntityList",
-            type: "Table",
-            isPagination: false,
-            tableCols: [
-              {
-                label: "时间节点名称",
-                prop: "content",
-                type: "formInput",
-                validate: true,
-                rules: {
-                  content: { required: true, message: "时间节点名称不能为空" },
-                },
-                isDisabled: (row, index) => {
-                  if (
-                    index === 0 ||
-                    index ===
-                      this.modalSetting.modalData.timeEntityList.length - 1
-                  ) {
-                    return true;
-                  } else {
-                    return false;
-                  }
-                },
-              },
-              {
-                label: "开始时间",
-                prop: "startTime",
-                validate: true,
-                type: "formDate",
-                pickerOptions: (row, index) => {
-                  return {
-                    disabledDate: (time) => {
-                      // console.log(index)
-                      if (index === 0) {
-                        if (
-                          this.modalSetting.modalData.timeEntityList.length ===
-                          2
-                        ) {
-                          let date = new Date(
-                            this.modalSetting.modalData.timeEntityList[1].endTime
-                          );
-                          return (
-                            time.getTime() > date.getTime() ||
-                            time.getTime() < Date.now()
-                          );
-                        } else {
-                          let date = new Date(
-                            this.modalSetting.modalData.timeEntityList[1].startTime
-                          );
-                          return (
-                            time.getTime() > date.getTime() ||
-                            time.getTime() < Date.now()
-                          );
-                        }
-                      } else {
-                        if (index === 1) {
-                          let date1 = new Date(
-                            this.modalSetting.modalData.timeEntityList[0].startTime
-                          );
-                          let date2 = new Date(row.endTime);
-                          return (
-                            time.getTime() < date1.getTime() ||
-                            time.getTime() > date2.getTime() ||
-                            time.getTime() < Date.now()
-                          );
-                        } else {
-                          let date1 = new Date(
-                            this.modalSetting.modalData.timeEntityList[
-                              index - 1
-                            ].endTime
-                          );
-                          let date2 = new Date(row.endTime);
-                          return (
-                            time.getTime() < date1.getTime() ||
-                            time.getTime() > date2.getTime() ||
-                            time.getTime() < Date.now()
-                          );
-                        }
-                      }
-                    },
-                  };
-                },
-                rules: {
-                  startTime: { required: true, message: "开始时间不能为空" },
-                },
-                disabled: (row, index) => {
-                  if (
-                    index ===
-                    this.modalSetting.modalData.timeEntityList.length - 1
-                  ) {
-                    return true;
-                  } else {
-                    return false;
-                  }
-                },
-              },
-              {
-                label: "结束时间",
-                prop: "endTime",
-                validate: true,
-                type: "formDate",
-                pickerOptions: (row, index) => {
-                  return {
-                    disabledDate: (time) => {
-                      if (
-                        index ===
-                        this.modalSetting.modalData.timeEntityList.length - 1
-                      ) {
-                        if (
-                          this.modalSetting.modalData.timeEntityList.length ===
-                          2
-                        ) {
-                          let date = new Date(
-                            this.modalSetting.modalData.timeEntityList[0].startTime
-                          );
-                          return (
-                            time.getTime() < date.getTime() ||
-                            time.getTime < Date.now()
-                          );
-                        } else {
-                          let date = new Date(
-                            this.modalSetting.modalData.timeEntityList[
-                              index - 1
-                            ].endTime
-                          );
-                          return (
-                            time.getTime() < date.getTime() ||
-                            time.getTime < Date.now()
-                          );
-                        }
-                      } else {
-                        if (
-                          index ===
-                          this.modalSetting.modalData.timeEntityList.length - 2
-                        ) {
-                          let date1 = new Date(row.startTime);
-                          let date2 = new Date(
-                            this.modalSetting.modalData.timeEntityList[
-                              index + 1
-                            ].endTime
-                          );
-                          return (
-                            time.getTime() < date1.getTime() ||
-                            time.getTime() > date2.getTime() ||
-                            time.getTime < Date.now()
-                          );
-                        } else {
-                          let date1 = new Date(row.startTime);
-                          let date2 = new Date(
-                            this.modalSetting.modalData.timeEntityList[
-                              index + 1
-                            ].startTime
-                          );
-                          return (
-                            time.getTime() < date1.getTime() ||
-                            time.getTime() > date2.getTime() ||
-                            time.getTime < Date.now()
-                          );
-                        }
-                      }
-                    },
-                  };
-                },
-                defaultTime: "23:59:59",
-                rules: {
-                  endTime: { required: true, message: "结束时间不能为空" },
-                },
-                disabled: (row, index) => {
-                  if (index === 0) {
-                    return true;
-                  } else {
-                    return false;
-                  }
-                },
-              },
-              {
-                label: "操作",
-                width: "60px",
-                type: "button",
-                btnList: [
-                  {
-                    label: "删除",
-                    type: "text",
-                    disabled: (row, index) => {
-                      if (
-                        index === 0 ||
-                        index ===
-                          this.modalSetting.modalData.timeEntityList.length - 1
-                      ) {
-                        return true;
-                      } else {
-                        return false;
-                      }
-                    },
-                    handle: (row, index) => {
-                      this.$confirm("确认删除该时间节点?", "提示", {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning",
-                      })
-                        .then(() => {
-                          this.modalSetting.modalData.timeEntityList.splice(
-                            index,
-                            1
-                          );
-                          let ref =
-                            "cesForm" +
-                            (this.modalSetting.modalData.timeEntityList.length -
-                              1);
-                          this.$nextTick(() => {
-                            // console.log(ref)
-                            // console.log(this.$refs.modal.$refs.modalFormTable[0].$refs)
-                            this.$refs.modal.$refs.modalFormTable[0].$refs[
-                              ref
-                            ][1].clearValidate();
-                          });
-                          this.$message({
-                            type: "success",
-                            message: "删除成功!",
-                          });
-                        })
-                        .catch(() => {
-                          this.$message({
-                            type: "info",
-                            message: "已取消删除",
-                          });
-                        });
-                    },
-                  },
-                ],
-              },
-            ],
-            tableHandles: [
-              {
-                label: "添加",
-                type: "primary",
-                handle: () => {
-                  this.modalSetting.modalData.timeEntityList.splice(
-                    this.modalSetting.modalData.timeEntityList.length - 1,
-                    0,
-                    {}
-                  );
-                },
-              },
-            ],
-          },
-          {
-            label: "开始时间/结束时间",
-            prop: "time",
-            type: "DateTimeRange",
-            pickerOptions: {
-              disabledDate: (time) => {
-                return time.getTime() < Date.now();
-              },
-            },
-            defaultTime: ["00:00:00", "23:59:59"],
-          },
-          {
-            label:'活动地址',
-            prop:'address',
-            type:'Input',
-            width:'600px'
-          }
-        ],
-        modalForm: [],
-        modalHandles: [
-          {
-            label: "确认",
-            type: "primary",
-            handle: () => {
-              // console.log(this.$refs.modal.$refs.modalFormTable[0].$refs.cesForm0)
-              this.save();
-            },
-          },
-        ],
-        modalData: {
-          title: "",
-          imageUrl: "",
-          isWebExplain: 1,
-          activityExplain: "",
-          fileList: [],
-          startTime: "",
-          endTime: "",
-          time: [],
-          activityTypeId: "",
-          activityOrMatch: "活动",
-          status: "未开始",
-          isOnline: "线上活动",
-          signUpMoney: "",
-          sponsor: this.$newSource,
-          timeEntityList: [
-            { content: "开始时间", startTime: "", endTime: "" },
-            { content: "结束时间", startTime: "", endTime: "" },
-          ],
-          noticeEntityList: [],
-        },
-      },
-      pageData: {
-        tableData: [],
-        tableCols: [
-          { label: "标题", prop: "title" },
-          { label: "背景图", prop: "imageUrl", type: "image" },
-          { label: "活动状态", prop: "status" },
-          { label: "活动分类", prop: "title" },
-          { label: "活动类型", prop: "activityOrMatch" },
-          { label: "线上/线下", prop: "isOnline" },
-          { label: "报名所需红星币", prop: "signUpMoney" },
-          { label: "报名人数", prop: "signUpPeople" },
-          { label: "阅读量", prop: "readNumber" },
-          { label: "主办方", prop: "sponsor" },
-          {
-            label: "活动时间",
-            width: "300px",
-            formatter: (prop, row) => {
-              return row.startTime + " - " + row.endTime;
-            },
-          },
-          
-        ],
-        tableHandles: [
-          {
-            label: "新增活动",
-            type: "primary",
-            handle: () => {
-              this.resetModalForm('活动');
-              this.modalSetting.modalData.activityOrMatch='活动'
-              this.modalSetting.modalConfig.title = "添加活动";
-              this.modalSetting.modalConfig.show = true;
-              this.changeForm('活动',1,'线下活动')
-            },
-          },
-          {
-            label: "新增赛事",
-            type: "primary",
-            handle: () => {
-              this.resetModalForm('赛事');
-              this.modalSetting.modalData.activityOrMatch='赛事'
-              this.modalSetting.modalConfig.title = "添加赛事";
-              this.modalSetting.modalConfig.show = true;
-              this.changeForm("赛事", 1,'线上活动');
-            },
-          },
-        ],
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-      },
-      searchSetting: {
-        searchForm: [
-          { label: "标题", prop: "searchName", type: "Input",size:"mini" },
-          {
-            label: "分类",
-            prop: "activityTypeId",
-            default: true,
-            type: "Select",
-            options: [],size:"mini",
-          },
-          {
-            label: "类型",
-            prop: "activityOrMatch",
-            type: "Select",size:"mini",
-            options: [
-              { label: "活动", value: "活动" },
-              { label: "赛事", value: "赛事" },
-            ],
-          },
-          {
-            label: "状态",
-            prop: "status",
-            default: true,
-            type: "Select",size:"mini",
-            options: [
-              { label: "未开始", value: "未开始" },
-              { label: "进行中", value: "进行中" },
-              { label: "已结束", value: "已结束" },
-            ],
-          },
-          {
-            label: "线上/线下",
-            prop: "isOnline",
-            default: true,
-            type: "Select",size:"mini",
-            options: [
-              { label: "线上", value: "线上活动" },
-              { label: "线下", value: "线下活动" },
-            ],
-          },
-          {
-            name: "查询",
-            type: "Button",
-            style: "primary",size:"mini",
-            handle: () => {
-              
-              this.$nextTick(()=>{
-                 this.$refs.table.$refs.cesTable.setCurrentRow()
-              })
-             
-              this.findAll()},
-          },
-          {
-            name: "重置",
-            type: "Button",size:"mini",
-            handle: () => this.resetSearchForm(),
-          },
-        ],
-        searchData: {
-          searchName: "",
-          activityTypeId: "",
-          activityOrMatch: "赛事",
-          status: "",
-          isOnline: "",
-        },
-      },
-      options:[]
-    };
-  },
-  methods: {
-    findAll() {
-      this.loading=true;
-      this.$nextTick(()=>{
-        // console.log(this.$refs.table)
-        this.$refs.table.$refs.cesTable.setCurrentRow()
-      })
-      let obj = this.searchSetting.searchData;
-      obj.page = this.pageData.tablePage.currentPage;
-      obj.limit = this.pageData.tablePage.pageSize;
-      this.$api.getActiveMatch(obj).then((res) => {
-        this.pageData.tableData = res.data.page.list;
-        this.pageData.tablePage.pageTotal = res.data.page.totalCount;
-      })
-      .finally(()=>{
-        this.loading=false;
-      })
-    },
-    resetSearchForm() {
-        // console.log(1)
-        for (let item in this.searchSetting.searchData) {
-          if (item === "activityOrMatch") {
-            this.searchSetting.searchData[item] = "赛事";
-          } else {
-            this.searchSetting.searchData[item] = "";
-          }
-        }
-      },
-    getType(){
-       this.$api.getActivityTypeList().then((res) => {
-        let options = res.data.list.map((item) => {
-          return { label: item.activityTypeName, value: item.activityTypeId };
-        });
-        this.options=options
-        this.searchSetting.searchForm[1].options = options;
-      });
-      },
-      currentChange(row){
-        this.$emit('getActivity',row)
-      }
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/active-match/components/active-match-modal.vue b/src/views/modules/active-match/components/active-match-modal.vue
deleted file mode 100644
index d0ee7a4..0000000
--- a/src/views/modules/active-match/components/active-match-modal.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-12-25 15:12:53
- * @LastEditTime: 2022-01-02 20:30:20
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\active-match\components\active-match-modal.vue
--->
-<template>
-    <div>
-        <modal :modalConfig="modalConfig" :modalHandles="modalHandles">
-            <activeTable @getActivity="getActivity" ref="activeTable" slot="dialog__content"/>
-        </modal>
-    </div>
-</template>
-<script>
-import activeTable from './active-match-management.vue'
-import modal from '../../../../components/common/modal/modal.vue'
-export default {
-  components: { modal,activeTable },
-  watch:{
-      'modalConfig.show':{
-          handler:function(val){
-              if(val){
-                  this.flag=false
-                  this.$nextTick(()=>{
-                      if(this.isOnline!==''){
-                          let form= this.$refs.activeTable.searchSetting.searchForm
-                          this.$refs.activeTable.searchSetting.searchData.isOnline=this.isOnline
-                         for(let i=0;i<this.$refs.activeTable.searchSetting.searchForm.length;i++){
-                             if(this.$refs.activeTable.searchSetting.searchForm[i].label==='线上/线下'){
-                                 this.$refs.activeTable.searchSetting.searchForm.splice(i,1);
-                                 break
-                             }
-                         }
-                         
-                      }
-                    this.$refs.activeTable.findAll()
-                     this.$refs.activeTable.getType()
-                  })
-              }
-            //   else{
-            //       this.$nextTick(()=>{
-            //         //   this.$refs.activeTable.$refs.table.$refs.cesTable.setCurrentRow()
-            //       })
-            //   }
-          }
-      }
-  },
-  data(){
-      return{
-          modalConfig:{
-              title:'选择活动/赛事',
-              show:false,
-              width:'80vw'
-          },
-          modalHandles:[{
-              label:'确认',
-              type:'primary',
-              disabled:()=>{
-                  if(this.flag) return false
-                  else return true
-              },
-              handle:()=>{
-                  this.modalConfig.show=false
-                  this.form.activityName=this.row.title
-                  this.form.timeEntityList=this.row.timeEntityList
-                    this.form.activityId=this.row.activityId
-              }
-          }],
-          flag:false,
-          row:{}
-      }
-  },
-  methods:{
-      getActivity(row){
-          this.flag=true
-          this.row=row
-      }
-  },
-  props:{
-      form:{type:Object,default:()=>{}},
-      isOnline:{type:String,default:''}
-  }
-    
-}
-</script>
-
diff --git a/src/views/modules/active-match/components/award-modal.vue b/src/views/modules/active-match/components/award-modal.vue
deleted file mode 100644
index 7d319f3..0000000
--- a/src/views/modules/active-match/components/award-modal.vue
+++ /dev/null
@@ -1,191 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2022-01-01 20:17:56
- * @LastEditTime: 2022-01-02 14:37:26
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\active-match\components\award-modal.vue
--->
-<template>
-  <div>
-    <modal :modalConfig="modalConfig">
-      <cesTable
-        :isIndex="true"
-        :tableCols="pageData.tableCols"
-        :tableData="pageData.tableData"
-        :tableHandles="pageData.tableHandles"
-        :isPagination="false"
-        slot="dialog__content"
-      />
-    </modal>
-    <!-- 表格添加的弹窗 -->
-    <modal
-      ref="modal"
-      :modalConfig="modalSetting.modalConfig"
-      :modalForm="modalSetting.modalForm"
-      :modalData="modalSetting.modalData"
-      :modalHandles="modalSetting.modalHandles"
-    />
-  </div>
-</template>
-<script>
-import cesTable from "../../../../components/common/table/custable.vue";
-import modal from "../../../../components/common/modal/modal.vue";
-export default {
-  components: {
-    modal,
-    cesTable,
-  },
-  watch: {
-    "modalConfig.show": {
-      handler: function (val) {
-        if (val) {
-          this.$nextTick(() => {
-            this.findAll();
-          });
-        }
-      },
-    },
-    "modalSetting.modalData.fileList": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.modalSetting.modalData.imageUrl = "";
-        }
-      },
-    },
-  },
-  data() {
-    return {
-      pageData: {
-        tableCols: [
-          {
-            label: "奖状图片",
-            type: "elImage",
-            prop: "imageUrl",
-            // width: "200px",
-          },
-          { label: "颁奖时间", prop: "createTime" },
-          {
-            label: "操作",
-            type: "button",
-            btnList: [
-              {
-                label: "编辑",
-                type: "text",
-                handle: (row) => {
-                  this.modalSetting.modalData = JSON.parse(JSON.stringify(row));
-                  this.modalSetting.modalData.fileList = [
-                    { url: row.imageUrl },
-                  ];
-                  this.modalSetting.modalConfig.title = "编辑";
-                  this.modalSetting.modalConfig.show = true;
-                },
-              },
-              {
-                label: "删除",
-                type: "text",
-                handle: (row) => {
-                  this.$confirm("是否确认删除该奖状?", "提示", {
-                    confirmButtonText: "确定",
-                    cancelButtonText: "取消",
-                    type: "warning",
-                  })
-                    .then(() => {
-                      this.$api.delelteWorksAward([row.awardId]).then((res) => {
-                        this.findAll();
-                      });
-                    })
-                    .catch(() => {});
-                },
-              },
-            ],
-          },
-        ],
-        tableData: [],
-        tableHandles: [
-          {
-            label: "颁奖",
-            type: "primary",
-            handle: () => {
-              this.clearModal();
-              this.modalSetting.modalConfig.title = "颁奖";
-              this.modalSetting.modalConfig.show = true;
-            },
-          },
-        ],
-      },
-      modalConfig: {
-        show: false,
-        title: "颁奖信息",
-        width: "900px",
-      },
-      // 表格的添加弹窗
-      modalSetting: {
-        modalConfig: {
-          show: false,
-          title: "颁奖",
-        },
-        modalData: {
-          fileList: [],
-          imageUrl: "",
-        },
-        modalHandles: [
-          {
-            label: "确认",
-            type: "primary",
-            handle: () => {
-              let data = {};
-              data.imageUrl = this.modalSetting.modalData.imageUrl;
-              data.userId = this.form.userId;
-              data.workId = this.form.workId;
-              data.activityId = this.form.activityId;
-              if (this.modalSetting.modalConfig.title === "编辑") {
-                data.awardId = this.modalSetting.modalData.awardId;
-                this.$api.updateWorksAward(data).then((res) => {
-                  this.modalSetting.modalConfig.show = false;
-                  this.findAll();
-                });
-              } else {
-                this.$api.addWorksAward(data).then((res) => {
-                  this.modalSetting.modalConfig.show = false;
-                  this.findAll();
-                });
-              }
-            },
-          },
-        ],
-        modalForm: [
-          {
-            label: "奖状图片",
-            type: "Upload",
-            prop: "fileList",
-            fileUrl: "imageUrl",
-            rules: { required: true },
-          },
-        ],
-      },
-    };
-  },
-  methods: {
-    findAll() {
-      // console.log(this.form)
-      this.$api.getWorksAwardList(this.form.workId).then((res) => {
-        this.pageData.tableData = res.data.list;
-      });
-    },
-    clearModal() {
-      for (let item in this.modalSetting.modalData) {
-        if (item === "fileList") this.modalSetting.modalData[item] = [];
-        else this.modalSetting.modalData[item] = "";
-      }
-      this.$nextTick(() => {
-        // console.log(this.$refs.modal)
-        this.$refs.modal.$refs.modalFormRef.clearValidate();
-      });
-    },
-  },
-  props: {
-    form: { tyep: Object, default: () => {} },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/active-match/components/works-modal.vue b/src/views/modules/active-match/components/works-modal.vue
deleted file mode 100644
index 1921628..0000000
--- a/src/views/modules/active-match/components/works-modal.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-12-30 16:39:54
- * @LastEditTime: 2022-03-27 15:26:48
- * @LastEditors: chenkangxu
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\active-match\components\works-modal.vue
--->
-<template>
-  <div>
-    <modal :modalConfig="modalConfig">
-      <div slot="dialog__content">
-        <modelType style="margin-top: 0px" class="title" content="作品展示" />
-        <video
-          v-if="form.isVideo === 1"
-          style="display: block; margin: auto; width: 60%"
-          :src="form.videoUrl"
-          controls
-        ></video>
-
-        <div class="content" v-if="form.isVideo === 0">
-          <el-image
-            :preview-src-list="
-              item ? [item] : [require('@/assets/images/noimg.svg')]
-            "
-            style="height: 300px; margin-right: 20px"
-            v-for="item in form.imageUrls"
-            :key="item"
-            :src="item ? item : require('@/assets/images/noimg.svg')"
-            alt=""
-          ></el-image>
-        </div>
-        <modelType class="title" content="作品标题" />
-        <div class="content" style="font-size: 18px">{{ form.workTitle }}</div>
-        <modelType class="title" content="作者" />
-        <div class="content" style="font-size: 14px; color: rgb(120, 120, 120)">
-          {{ form.name }}
-        </div>
-        <modelType class="title" content="作品详情" />
-        <div
-          class="content"
-          style="font-size: 20px"
-          v-html="form.introduce"
-        ></div>
-        <modelType class="title" content="获奖情况" />
-        <div class="content">
-          <el-image
-            :preview-src-list="
-              item.imageUrl
-                ? [item.imageUrl]
-                : [require('@/assets/images/noimg.svg')]
-            "
-            style="height: 300px; margin-right: 20px"
-            v-for="item in awardList"
-            :key="item.imageUrl"
-            :src="
-              item.imageUrl
-                ? item.imageUrl
-                : require('@/assets/images/noimg.svg')
-            "
-            alt=""
-          ></el-image>
-        </div>
-      </div>
-    </modal>
-  </div>
-</template>
-<script>
-import modelType from "@/components/modelType/modelType.vue";
-import modal from "../../../../components/common/modal/modal.vue";
-export default {
-  components: {
-    modal,
-    modelType,
-  },
-  watch: {
-    "modalConfig.show": {
-      handler: function (val) {
-        if (val) {
-          this.$api.getWorksAwardList(this.form.workId).then((res) => {
-            this.awardList = res.data.list;
-          });
-        }
-      },
-    },
-  },
-  data() {
-    return {
-      modalConfig: {
-        title: "查看作品",
-        show: false,
-        width: "60vw",
-      },
-      awardList: [],
-    };
-  },
-  props: {
-    form: { type: Object, default: () => {} },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.title {
-  font-size: 20px;
-  margin-bottom: 30px;
-  font-weight: 600;
-  margin-top: 30px;
-}
-.content {
-  margin: auto;
-  width: calc(100% - 40px);
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/active-match/match-management.vue b/src/views/modules/active-match/match-management.vue
deleted file mode 100644
index acd42ea..0000000
--- a/src/views/modules/active-match/match-management.vue
+++ /dev/null
@@ -1,1260 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-12-23 14:12:41
- * @LastEditTime: 2022-09-03 11:36:24
- * @LastEditors: chenkangxu
- * @Description: 赛事管理
--->
-<template>
-  <div>
-    <searchForm
-      :searchForm="searchSetting.searchForm"
-      :searchData="searchSetting.searchData"
-    />
-
-    <cesTable
-      :loading="loading"
-      :isIndex="true"
-      :tableCols="pageData.tableCols"
-      :tableData="pageData.tableData"
-      :tableHandles="pageData.tableHandles"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="findAll"
-      @handleSizeChange="findAll"
-    />
-    <modal
-      ref="modal"
-      :modalConfig="modalSetting.modalConfig"
-      :modalData="modalSetting.modalData"
-      :modalForm="modalSetting.modalForm"
-      :modalHandles="modalSetting.modalHandles"
-      labelWidth="140px"
-    />
-    <comment ref="comment" :parentId="parentId" type="ACTIVITY" />
-  </div>
-</template>
-<script>
-import comment from '../../../components/comment/comment.vue'
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import modal from "../../../components/common/modal/modal.vue";
-import cesTable from "../../../components/common/table/custable.vue";
-export default {
-  components: {
-    cesTable,
-    modal,
-    comment,
-    searchForm,
-  },
-  watch: {
-    "modalSetting.modalData.fileList": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.modalSetting.modalData.imageUrl = "";
-        }
-      },
-    },
-  },
-  activated() {
-    this.findAll();
-    this.$api.getMatchTypeList().then((res) => {
-      let options = res.data.list.map((item) => {
-        return { label: item.activityTypeName, value: item.activityTypeId };
-      });
-      this.options = options;
-      this.searchSetting.searchForm[1].options = options;
-    });
-  },
-  data() {
-    return {
-      //加载动画
-      loading:false,
-      modalSetting: {
-        modalConfig: {
-          show: false,
-          width: "1200px",
-          title: "添加活动/赛事",
-          key: false,
-          fullscreen:true
-        },
-        baseForm: [
-          {
-            label: "活动详情",
-            prop: "activityExplain",
-            type: "Input",
-            placeholder:'请输入活动外链',
-             rules:{required:true},
-            width: "600px",
-          },
-          {
-            label: "活动详情",
-            prop: "activityExplain",
-            type: "Tinymce",
-             rules:{required:true},
-            width: "600px",
-          },
-          //时间线备份
-          {
-            label: "时间线",
-            width: "900px",
-            prop: "timeEntityList",
-            type: "Table",
-            
-            isPagination: false,
-            tableCols: [
-              {
-                label: "时间节点名称",
-                prop: "content",
-                type: "formInput",
-                validate: true,
-                rules: {
-                  content: { required: true, message: "时间节点名称不能为空" },
-                },
-                isDisabled: (row, index) => {
-                  if (
-                    index === 0 ||
-                    index ===
-                      this.modalSetting.modalData.timeEntityList.length - 1
-                  ) {
-                    return true;
-                  } else {
-                    return false;
-                  }
-                },
-              },
-              {
-                label: "开始时间",
-                prop: "startTime",
-                validate: true,
-                type: "formDate",
-                pickerOptions: (row, index) => {
-                  return {
-                    disabledDate: (time) =>
-                      // console.log(index)
-                      this.disabledDate("开始时间", time, index),
-                  };
-                },
-                rules: {
-                  startTime: { required: true, message: "开始时间不能为空" },
-                },
-                disabled: (row, index) => {
-                  if (
-                    index ===
-                    this.modalSetting.modalData.timeEntityList.length - 1
-                  ) {
-                    return true;
-                  } else {
-                    return false;
-                  }
-                },
-              },
-              {
-                label: "结束时间",
-                prop: "endTime",
-                validate: true,
-                type: "formDate",
-                pickerOptions: (row, index) => {
-                  return {
-                    disabledDate: (time) =>
-                      this.disabledDate("结束时间", time, index),
-                  };
-                },
-                defaultTime: "23:59:59",
-                rules: {
-                  endTime: { required: true, message: "结束时间不能为空" },
-                },
-                disabled: (row, index) => {
-                  if (index === 0) {
-                    return true;
-                  } else {
-                    return false;
-                  }
-                },
-              },
-              {
-                label: "操作",
-                width: "60px",
-                type: "button",
-                btnList: [
-                  {
-                    label: "删除",
-                    type: "text",
-                    disabled: (row, index) => {
-                      if (
-                        index === 0 ||
-                        index ===
-                          this.modalSetting.modalData.timeEntityList.length - 1
-                      ) {
-                        return true;
-                      } else {
-                        return false;
-                      }
-                    },
-                    handle: (row, index) => {
-                      this.$confirm("确认删除该时间节点?", "提示", {
-                        confirmButtonText: "确定",
-                        cancelButtonText: "取消",
-                        type: "warning",
-                      })
-                        .then(() => {
-                          this.modalSetting.modalData.timeEntityList.splice(
-                            index,
-                            1
-                          );
-                          let ref =
-                            "cesForm" +
-                            (this.modalSetting.modalData.timeEntityList.length -
-                              1);
-                          this.$nextTick(() => {
-                            // console.log(ref)
-                            // console.log(this.$refs.modal.$refs.modalFormTable[0].$refs)
-                            this.$refs.modal.$refs.modalFormTable[0].$refs[
-                              ref
-                            ][1].clearValidate();
-                          });
-                          this.$message({
-                            type: "success",
-                            message: "删除成功!",
-                          });
-                        })
-                        .catch(() => {
-                          this.$message({
-                            type: "info",
-                            message: "已取消删除",
-                          });
-                        });
-                    },
-                  },
-                ],
-              },
-            ],
-            tableHandles: [
-              {
-                label: "添加",
-                type: "primary",
-                disabled:()=>{
-                    if(this.modalSetting.modalData.timeEntityList.length<5) return false
-                    else return true
-                  },
-                handle: () => {
-                  this.modalSetting.modalData.timeEntityList.splice(
-                    this.modalSetting.modalData.timeEntityList.length - 1,
-                    0,
-                    {}
-                  );
-                },
-              },
-            ],
-          },
-          {
-            label: "起始时间",
-            prop: "time",
-             rules:{required:true},
-            type: "DateTimeRange",
-            pickerOptions: {
-              disabledDate: (time) => {
-                var nowDate = new Date();
-                //当前时间减去1天
-                var aimDate = new Date(nowDate.setDate(nowDate.getDate() - 1));
-                return time.getTime() < aimDate;
-              },
-            },
-            defaultTime: ["00:00:00", "23:59:59"],
-          },
-          {
-            label: "活动地址",
-            prop: "address",
-             rules:{required:true},
-            type: "Input",
-            width: "600px",
-          },
-        ],
-        modalForm: [],
-        modalHandles: [
-          {
-            label: "确认",
-            type: "primary",
-            handle: () => {
-              // console.log(this.$refs.modal.$refs.modalFormTable[0].$refs.cesForm0)
-              this.save();
-            },
-          },
-        ],
-        modalData: {
-          title: "",
-          imageUrl: "",
-          isVideo: 0,
-          isWebExplain: 1,
-          activityExplain: "",
-          fileList: [],
-          startTime: "",
-          endTime: "",
-          time: [],
-          activityTypeId: "",
-          activityOrMatch: "活动",
-          status: "未开始",
-          isOnline: "线上活动",
-          signUpMoney: "",
-          sponsor: this.$newSource,
-          timeEntityList: [
-            { content: "开始时间", startTime: "", endTime: "" },
-            { content: "结束时间", startTime: "", endTime: "" },
-          ],
-          noticeEntityList: [],
-        },
-      },
-      pageData: {
-        tableData: [],
-        tableCols: [
-          { label: "标题", prop: "title" },
-          { label: "背景图", prop: "imageUrl", type: "image" },
-        
-          { label: "所属分类", prop: "activityTypeName" },
-           { label: "主办方", prop: "sponsor" },
-            {
-            label: "活动时间",
-            width: "300px",
-            formatter: (prop, row) => {
-              return row.startTime + " - " + row.endTime;
-            },
-          },
-           { label: "线上/线下", prop: "isOnline" },
-            { label: "报名所需红星币", prop: "signUpMoney" },
-             { label: "报名人数", prop: "signUpPeople" },
-              
-          { label: "阅读量", prop: "readNumber" },
-         
-          {label:'评论数',prop:'commentNumber'},
-          { label: "类型", prop: "activityOrMatch" },
-            { label: "状态", prop: "status" },
-          {
-            label: "操作",
-            width: "170px",
-            type: "button",
-            btnList: [
-              {
-                label:'查看评论',
-                type:'text',
-                handle:(row)=>{
-                  this.parentId=row.activityId
-                  this.$refs.comment.modalConfig.show=true
-                }
-              },
-              {
-                label: "编辑",
-                type: "text",
-                handle: (row) => {
-                  let data = JSON.parse(JSON.stringify(row));
-                  if (data.activityOrMatch === "活动") {
-                    this.modalSetting.modalConfig.title = "编辑活动";
-                  } else {
-                    this.modalSetting.modalConfig.title = "编辑赛事";
-                  }
-                  if (data.imageUrl) {
-                    data.fileList = [{ url: data.imageUrl }];
-                  }
-                  // console.log(data)
-                  this.changeForm(
-                    data.activityOrMatch,
-                    data.isWebExplain,
-                    data.isOnline
-                  );
-                  if (data.isOnline === "线上活动") {
-                    data.timeEntityList[
-                      data.timeEntityList.length - 1
-                    ].endTime =
-                      data.timeEntityList[
-                        data.timeEntityList.length - 1
-                      ].startTime;
-                    data.timeEntityList[
-                      data.timeEntityList.length - 1
-                    ].startTime = "";
-                    console.log(data.timeEntityList)
-                    data.timeEntityList.forEach(item=>{
-                      if(item.startTime){
-                        item.startTime=item.startTime.slice(0,11)+'00:00:00'
-                      }
-                      if(item.endTime){
-                         item.endTime=item.endTime.slice(0,11)+'00:00:00'
-                      }
-                    })
-                     console.log(data.timeEntityList)
-                  } else {
-                    data.time = [data.startTime, data.endTime];
-                  }
-
-                  data.signUpMoney = data.signUpMoney + "";
-                  this.modalSetting.modalData = data;
-                  this.modalSetting.modalConfig.show = true;
-                  this.clearValidate();
-                },
-              },
-              {
-                label: "删除",
-                type: "text",
-                handle: (row) => this.del(row.activityId),
-              },
-            ],
-          },
-        ],
-        tableHandles: [
-          // {
-          //   label: "新增活动",
-          //   type: "primary",
-          //   handle: () => {
-          //     this.changeForm("活动", 1, "线下活动");
-          //     this.resetModalForm("活动");
-          //     this.modalSetting.modalData.activityOrMatch = "活动";
-          //     this.modalSetting.modalConfig.title = "添加活动";
-
-          //     this.modalSetting.modalConfig.show = true;
-          //   },
-          // },
-          {
-            label: "新增赛事",
-            type: "primary",
-            handle: () => {
-              this.changeForm("赛事", 1, "线上活动");
-              this.resetModalForm("赛事");
-              this.modalSetting.modalData.activityOrMatch = "赛事";
-              this.modalSetting.modalConfig.title = "添加赛事";
-              this.modalSetting.modalConfig.show = true;
-            },
-          },
-        ],
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-      },
-      searchSetting: {
-        searchForm: [
-          { label: "标题", prop: "searchName", type: "Input",size:"mini" },
-          {
-            label: "分类",
-            prop: "activityTypeId",
-            default: true,
-            type: "Select",
-            size:"mini",
-            options: [],
-          },
-          // {
-          //   label: "类型",
-          //   prop: "activityOrMatch",
-          //   type: "Select",size:"mini",
-          //   options: [
-          //     { label: "活动", value: "活动" },
-          //     { label: "赛事", value: "赛事" },
-          //   ],
-          // },
-          {
-            label: "状态",
-            prop: "status",size:"mini",
-            default: true,
-            type: "Select",
-            options: [
-              { label: "未开始", value: "未开始" },
-              { label: "进行中", value: "进行中" },
-              { label: "已结束", value: "已结束" },
-            ],
-          },
-          {
-            label: "线上/线下",
-            prop: "isOnline",
-            default: true,
-            type: "Select",size:"mini",
-            options: [
-              { label: "线上", value: "线上活动" },
-              { label: "线下", value: "线下活动" },
-            ],
-          },
-          {
-            name: "查询",
-            type: "Button",
-            style: "primary",size:"mini",
-            handle: () => this.findAll(),
-          },
-          {
-            name: "重置",
-            type: "Button",
-            style:'warning',size:"mini",
-            handle: () => this.resetSearchForm(),
-          },
-        ],
-        searchData: {
-          searchName: "",
-          activityTypeId: "",
-          activityOrMatch: "赛事",
-          status: "",
-          isOnline: "",
-        },
-      },
-      options: [],
-      parentId:''
-    };
-  },
-  methods: {
-    save() {
-      this.$refs.modal.$refs.modalFormRef.validate((valid) => {
-        if (valid) {
-          // console.log(1)
-          let flag = true;
-          // 验证时间线表格与公告栏必填
-          if (this.modalSetting.modalData.isOnline === "线上活动") {
-            this.modalSetting.modalData.timeEntityList.forEach(
-              (item, index) => {
-                let ref = "cesForm" + index;
-                if (index === 0) {
-                  this.$refs.modal.$refs.modalFormTable[0].$refs[
-                    ref
-                  ][1].validate((valid) => {
-                    if (!valid) {
-                      // console.log(2)
-                      flag = false;
-                    }
-                  });
-                } else if (
-                  index ===
-                  this.modalSetting.modalData.timeEntityList.length - 1
-                ) {
-                  this.$refs.modal.$refs.modalFormTable[0].$refs[
-                    ref
-                  ][2].validate((valid) => {
-                    if (!valid) {
-                      // console.log(2)
-                      flag = false;
-                    }
-                  });
-                } else {
-                  for (let i = 0; i < 3; i++) {
-                    this.$refs.modal.$refs.modalFormTable[0].$refs[ref][
-                      i
-                    ].validate((valid) => {
-                      if (!valid) {
-                        // console.log(2)
-                        flag = false;
-                      }
-                    });
-                  }
-                }
-              }
-            );
-          }
-          this.modalSetting.modalData.noticeEntityList.forEach(
-            (item, index) => {
-              let ref = "NoticeForm" + index;
-              // console.log(this.$refs.modal.$refs[ref])
-              this.$refs.modal.$refs[ref][0].validate((valid) => {
-                if (!valid) {
-                  flag = false;
-                }
-              });
-            }
-          );
-          if (flag) {
-            let obj = JSON.parse(JSON.stringify(this.modalSetting.modalData));
-            if (this.modalSetting.modalData.isOnline === "线下活动") {
-              console.log(obj.time);
-              obj.startTime = obj.time[0];
-              obj.endTime = obj.time[1];
-              obj.timeEntityList = [
-                { content: "开始时间", startTime: obj.startTime, endTime: "" },
-                { content: "结束时间", startTime: obj.endTime, endTime: "" },
-              ];
-            } else {
-              console.log(obj.isVideo)
-              // 循环时间线赋予时分秒
-              for(let i=0;i<obj.timeEntityList.length;i++){
-                if(i!==obj.timeEntityList.length-1){
-                 obj.timeEntityList[i].startTime= obj.timeEntityList[i].startTime.slice(0,-4)+i+':00';
-                  if(i!==0 ){
-                    let str1=obj.timeEntityList[i].startTime.slice(11,-2)+'30'
-                    obj.timeEntityList[i].endTime=obj.timeEntityList[i].endTime.slice(0,11)+str1
-
-                    
-                  }
-                  
-                }
-                else{
-                  obj.timeEntityList[i].endTime=obj.timeEntityList[i].endTime.slice(0,11)+'00:10:00'
-                }
-                //  console.log(obj.timeEntityList[i].startTime)
-                //    console.log(obj.timeEntityList[i].endTime)
-                
-              }
-              obj.startTime = obj.timeEntityList[0].startTime;
-              obj.endTime =
-                obj.timeEntityList[obj.timeEntityList.length - 1].endTime;
-              obj.timeEntityList[obj.timeEntityList.length - 1].endTime = "";
-              obj.timeEntityList[obj.timeEntityList.length - 1].startTime =
-                obj.endTime;
-            }
-
-            if (
-              this.modalSetting.modalConfig.title === "添加活动" ||
-              this.modalSetting.modalConfig.title === "添加赛事"
-            ) {
-              this.$api.addActiveMatch(obj).then((res) => {
-                this.modalSetting.modalConfig.show = false;
-                this.findAll();
-              });
-            } else {
-              this.$api.updateActiveMatch(obj).then((res) => {
-                this.modalSetting.modalConfig.show = false;
-                this.findAll();
-              });
-            }
-          }
-        }
-      });
-    },
-    changeForm(activityOrMatch, isWebExplain, isOnline) {
-      // console.log(1);
-
-      if (activityOrMatch) {
-        if (activityOrMatch === "活动") {
-          this.modalSetting.modalForm = [
-            {
-              label: "线上/线下",
-              prop: "isOnline",
-              type: "Radio",
-              rules:{required:true},
-              radios: [
-                { label: "线上活动", value: "线上活动" },
-                { label: "线下活动", value: "线下活动" },
-              ],
-              change: (val) => {
-                this.changeForm(null, null, val);
-              },
-            },
-            { label: "标题", rules:{required:true}, prop: "title", type: "Input", width: "600px" },
-            {
-              label: "背景图",
-               rules:{required:true},
-              prop: "fileList",
-              fileUrl: "imageUrl",
-              type: "Upload",
-              drag:true
-            },
-            {
-              label: "分类",
-              prop: "activityTypeId",
-              type: "Select",
-               rules:{required:true},
-              options: this.options,
-            },
-
-            {
-              label: "报名所需红星币",
-              prop: "signUpMoney",
-              width: "600px",
-               rules:{required:true},
-              type: "Input",
-              rules: { type: "positiveInt" },
-            },
-            { label: "主办方",  rules:{required:true},prop: "sponsor", type: "Input", width: "600px" },
-            {
-              label: "作品类型",
-               rules:{required:true},
-              prop: "isVideo",
-              type: "Radio",
-              radios: [
-                { label: "图文", value: 0 },
-                { label: "视频", value: 1 },
-              ],
-            },
-            {
-              label: "活动详情是否外链",
-               rules:{required:true},
-              prop: "isWebExplain",
-              type: "Radio",
-              radios: [
-                { label: "是", value: 1 },
-                { label: "否", value: 0 },
-              ],
-              change: (val) => {
-                this.changeForm(null, val);
-              },
-            },
-            {
-              label: "活动详情",
-              prop: "activityExplain",
-              placeholder:'请输入活动外链',
-               rules:{required:true},
-              type: "Input",
-              width: "600px",
-            },
-            {
-              label: "起始时间",
-              prop: "time",
-              type: "DateTimeRange",
-               rules:{required:true},
-              pickerOptions: {
-                disabledDate: (time) => {
-                  var nowDate = new Date();
-                  //当前时间减去1天
-                  var aimDate = new Date(
-                    nowDate.setDate(nowDate.getDate() - 1)
-                  );
-                  return time.getTime() < aimDate;
-                },
-              },
-              defaultTime: ["00:00:00", "23:59:59"],
-            },
-            {
-              label: "公告",
-              prop: "noticeEntityList",
-              content: "添加",
-              width: "600px",
-              type: "Notice",
-              style: "primary",
-              rules: {
-                content: { required: true, message: "请输入公告内容！" },
-              },
-              childProp: "content",
-              handle: () => {
-                this.modalSetting.modalData.noticeEntityList.push({
-                  content: "",
-                });
-              },
-              del: (index) => {
-                this.$confirm("是否确认删除该公告?", "提示", {
-                  confirmButtonText: "确定",
-                  cancelButtonText: "取消",
-                  type: "warning",
-                })
-                  .then(() => {
-                    this.modalSetting.modalData.noticeEntityList.splice(
-                      index,
-                      1
-                    );
-
-                    this.$message({
-                      type: "success",
-                      message: "删除成功!",
-                    });
-                  })
-                  .catch(() => {
-                    this.$message({
-                      type: "info",
-                      message: "已取消删除",
-                    });
-                  });
-              },
-            },
-          ];
-        } else {
-          this.modalSetting.modalForm = [
-            {
-              label: "线上/线下",
-              prop: "isOnline",
-              type: "Radio",
-              rules:{required:true},
-              radios: [
-                { label: "线上赛事", value: "线上活动" },
-                { label: "线下赛事", value: "线下活动" },
-              ],
-              change: (val) => {
-                this.changeForm(null, null, val);
-              },
-            },
-            { label: "标题",rules:{required:true}, prop: "title", type: "Input", width: "600px" },
-            {
-              label: "背景图",
-              prop: "fileList",
-              rules:{required:true},
-              fileUrl: "imageUrl",
-              type: "Upload",
-              drag:true
-            },
-            {
-              label: "分类",
-              rules:{required:true},
-              prop: "activityTypeId",
-              type: "Select",
-              options: this.options,
-            },
-
-            {
-              label: "报名所需红星币",
-              prop: "signUpMoney",
-              rules:{required:true},
-              width: "600px",
-              type: "Input",
-              rules: { type: "positiveInt" },
-            },
-            { label: "主办方",rules:{required:true}, prop: "sponsor", type: "Input", width: "600px" },
-            {
-              label: "赛事详情是否外链",rules:{required:true},
-              prop: "isWebExplain",
-              type: "Radio",
-              radios: [
-                { label: "是", value: 1 },
-                { label: "否", value: 0 },
-              ],
-              change: (val) => {
-                this.changeForm(null, val);
-              },
-            },
-            {
-              label: "赛事详情",rules:{required:true},
-              prop: "activityExplain",
-              type: "Input",
-              width: "600px",
-            },
-            {
-              label: "时间线",
-              width: "900px",
-              prop: "timeEntityList",
-              type: "Table",
-              isPagination: false,
-              tableCols: [
-                {
-                  label: "时间节点名称",
-                  prop: "content",
-                  type: "formInput",
-                  validate: true,
-                  rules: {
-                    content: {
-                      required: true,
-                      message: "时间节点名称不能为空",
-                    },
-                  },
-                  isDisabled: (row, index) => {
-                    if (
-                      index === 0 ||
-                      index ===
-                        this.modalSetting.modalData.timeEntityList.length - 1
-                    ) {
-                      return true;
-                    } else {
-                      return false;
-                    }
-                  },
-                },
-                {
-                  label: "开始时间",
-                  prop: "startTime",
-                  validate: true,
-                  type: "formDate",
-                  pickerOptions: (row, index) => {
-                    return {
-                      disabledDate: (time) =>
-                        this.disabledDate("开始时间", time, index),
-                    };
-                  },
-                  rules: {
-                    startTime: { required: true, message: "开始时间不能为空" },
-                  },
-                  disabled: (row, index) => {
-                    if (
-                      index ===
-                      this.modalSetting.modalData.timeEntityList.length - 1
-                    ) {
-                      return true;
-                    } else {
-                      return false;
-                    }
-                  },
-                },
-                {
-                  label: "结束时间",
-                  prop: "endTime",
-                  validate: true,
-                  type: "formDate",
-                  pickerOptions: (row, index) => {
-                    return {
-                      disabledDate: (time) =>
-                        this.disabledDate("结束时间", time, index),
-                    };
-                  },
-                  defaultTime: "23:59:59",
-                  rules: {
-                    endTime: { required: true, message: "结束时间不能为空" },
-                  },
-                  disabled: (row, index) => {
-                    if (index === 0) {
-                      return true;
-                    } else {
-                      return false;
-                    }
-                  },
-                },
-                {
-                  label: "操作",
-                  width: "60px",
-                  type: "button",
-                  btnList: [
-                    {
-                      label: "删除",
-                      type: "text",
-                      disabled: (row, index) => {
-                        if (
-                          index === 0 ||
-                          index ===
-                            this.modalSetting.modalData.timeEntityList.length -
-                              1
-                        ) {
-                          return true;
-                        } else {
-                          return false;
-                        }
-                      },
-                      handle: (row, index) => {
-                        this.$confirm("确认删除该时间节点?", "提示", {
-                          confirmButtonText: "确定",
-                          cancelButtonText: "取消",
-                          type: "warning",
-                        })
-                          .then(() => {
-                            this.modalSetting.modalData.timeEntityList.splice(
-                              index,
-                              1
-                            );
-                            let ref =
-                              "cesForm" +
-                              (this.modalSetting.modalData.timeEntityList
-                                .length -
-                                1);
-                            this.$nextTick(() => {
-                              this.$refs.modal.$refs.modalFormTable[0].$refs[
-                                ref
-                              ][1].clearValidate();
-                            });
-                            this.$message({
-                              type: "success",
-                              message: "删除成功!",
-                            });
-                          })
-                          .catch(() => {
-                            this.$message({
-                              type: "info",
-                              message: "已取消删除",
-                            });
-                          });
-                      },
-                    },
-                  ],
-                },
-              ],
-              tableHandles: [
-                {
-                  label: "添加",
-                  type: "primary",
-                  disabled:()=>{
-                    if(this.modalSetting.modalData.timeEntityList.length<10) return false
-                    else return true
-                  },
-                  handle: () => {
-                    this.modalSetting.modalData.timeEntityList.splice(
-                      this.modalSetting.modalData.timeEntityList.length - 1,
-                      0,
-                      {}
-                    );
-                  },
-                },
-              ],
-            },
-            {
-              label: "公告",
-              prop: "noticeEntityList",
-              content: "添加",
-              width: "600px",
-              type: "Notice",
-              style: "primary",
-              rules: {
-                content: { required: true, message: "请输入公告内容！" },
-              },
-              childProp: "content",
-              handle: () => {
-                this.modalSetting.modalData.noticeEntityList.push({
-                  content: "",
-                });
-              },
-              del: (index) => {
-                this.$confirm("是否确认删除该公告?", "提示", {
-                  confirmButtonText: "确定",
-                  cancelButtonText: "取消",
-                  type: "warning",
-                })
-                  .then(() => {
-                    this.modalSetting.modalData.noticeEntityList.splice(
-                      index,
-                      1
-                    );
-
-                    this.$message({
-                      type: "success",
-                      message: "删除成功!",
-                    });
-                  })
-                  .catch(() => {
-                    this.$message({
-                      type: "info",
-                      message: "已取消删除",
-                    });
-                  });
-              },
-            },
-          ];
-        }
-      }
-      let form = this.modalSetting.modalForm;
-      // 外链切换
-      if (isWebExplain !== null && isWebExplain !== undefined) {
-        for (let i = 0; i < this.modalSetting.modalForm.length; i++) {
-          if (this.modalSetting.modalForm[i].label === "活动详情"||this.modalSetting.modalForm[i].label === "赛事详情") {
-            let label=this.modalSetting.modalForm[i].label
-            if (isWebExplain == 1) {
-              
-              this.modalSetting.modalForm.splice(
-                i,
-                1,
-                this.modalSetting.baseForm[0]
-              );
-              if(label==='活动详情'){
-                this.modalSetting.modalForm[i].placeholder='请输入活动外链'
-              }else{
-                 this.modalSetting.modalForm[i].placeholder='请输入赛事外链'
-              }
-            } else {
-              this.modalSetting.modalForm.splice(
-                i,
-                1,
-                this.modalSetting.baseForm[1]
-              );
-            }
-             this.modalSetting.modalForm[i].label=label
-            
-           
-            break;
-          }
-        }
-        // console.log(this.modalSetting.modalForm[8]);
-        this.modalSetting.modalConfig.key = !this.modalSetting.modalConfig.key;
-      }
-
-      //线上线下切换
-      if (isOnline !== null && isOnline !== undefined) {
-        for (let i = 0; i < form.length; i++) {
-          if (form[i].label === "作品类型" && isOnline === "线下活动") {
-            form.splice(i, 1);
-          }
-          if (form[i].label === "主办方" && isOnline === "线上活动") {
-            form.splice(i + 1, 0, {
-              label: "作品类型",
-              prop: "isVideo",
-              type: "Radio",
-               rules:{required:true},
-              radios: [
-                { label: "图文", value: 0 },
-                { label: "视频", value: 1 },
-              ],
-            });
-          }
-          if (
-            form[i].label === "时间线" ||
-            form[i].label === "起始时间"
-          ) {
-            if (this.modalSetting.modalData.activityOrMatch === "活动") {
-              this.modalSetting.baseForm[4].label = "活动地址";
-            } else {
-              this.modalSetting.baseForm[4].label = "赛事地址";
-            }
-            if (isOnline === "线下活动") {
-              form.splice(
-                i,
-                1,
-                this.modalSetting.baseForm[3],
-                this.modalSetting.baseForm[4]
-              );
-            } else {
-              for (let j = 0; j < form.length; j++) {
-                if (
-                  form[j].label === "活动地址" ||
-                  form[j].label === "赛事地址"
-                ) {
-                  form.splice(j, 1);
-                }
-              }
-              form.splice(i, 1, this.modalSetting.baseForm[2]);
-            }
-
-            break;
-          }
-        }
-      }
-    },
-    findAll() {
-      this.loading=true;
-      let obj = this.searchSetting.searchData;
-      obj.page = this.pageData.tablePage.currentPage;
-      obj.limit = this.pageData.tablePage.pageSize;
-      this.$api.getActiveMatch(obj).then((res) => {
-        this.pageData.tableData = res.data.page.list;
-        this.pageData.tablePage.pageTotal = res.data.page.totalCount;
-      })
-      .finally(()=>{
-        this.loading=false;
-      })
-    },
-    resetModalForm(type) {
-      for (let item in this.modalSetting.modalData) {
-        if (item === "activityOrMatch") {
-          this.modalSetting.modalData[item] = "活动";
-        } else if (item === "isWebExplain") {
-          this.modalSetting.modalData[item] = 1;
-        } else if (item === "isVideo") {
-          this.modalSetting.modalData[item] = 0;
-        } else if (item === "time") {
-          this.modalSetting.modalData[item] = [];
-        } else if (item === "fileList") {
-          this.modalSetting.modalData[item] = [];
-        } else if (item === "status") {
-          this.modalSetting.modalData[item] = "未开始";
-        } else if (item === "isOnline") {
-          if (type === "活动") this.modalSetting.modalData[item] = "线下活动";
-          else this.modalSetting.modalData[item] = "线上活动";
-        } else if (item === "timeEntityList") {
-          this.modalSetting.modalData[item] = [
-            { content: "开始时间", startTime: "", endTime: "" },
-            { content: "结束时间", startTime: "", endTime: "" },
-          ];
-        } else if (item === "noticeEntityList") {
-          this.modalSetting.modalData[item] = [];
-        } else if (item === "sponsor") {
-          this.modalSetting.modalData[item] = this.$newSource;
-        }else if (item === "signUpMoney") {
-          this.modalSetting.modalData[item] = '0';
-        } else {
-          this.modalSetting.modalData[item] = "";
-        }
-      }
-      // this.modalSetting.modalConfig.key=!this.modalSetting.modalConfig.key
-    },
-    clearValidate() {
-      this.$nextTick(() => {
-        //时间线区域
-        if (this.modalSetting.modalData.isOnline === "线上活动") {
-          this.modalSetting.modalData.timeEntityList.forEach((item, index) => {
-            let ref = "cesForm" + index;
-
-            for (let i = 0; i < 3; i++) {
-              this.$refs.modal.$refs.modalFormTable[0].$refs[ref][
-                i
-              ].clearValidate();
-            }
-          });
-        }
-
-        this.$refs.modal.$refs.modalFormRef.clearValidate();
-      });
-    },
-    resetSearchForm() {
-      // console.log(1)
-      for (let item in this.searchSetting.searchData) {
-        if (item === "activityOrMatch") {
-          this.searchSetting.searchData[item] = "活动";
-        } else {
-          this.searchSetting.searchData[item] = "";
-        }
-      }
-    },
-    del(id) {
-      this.$confirm("此操作将永久删除该活动, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$api.delActiveMatch([id]).then((res) => {
-            this.findAll();
-          });
-          this.$message({
-            type: "success",
-            message: "删除成功!",
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-    disabledDate(type, time, index) {
-      // console.log(time)
-      // console.log(index)
-      var nowDate = new Date();
-      //当前时间减去1天
-      var aimDate = new Date(nowDate.setDate(nowDate.getDate() - 1));
-      let list = this.modalSetting.modalData.timeEntityList;
-      
-      if(index<list.length){
-        if (type === "开始时间") {
-        if (index === 0) {
-          if (list.length === 2) {
-            let date = new Date(list[1].endTime);
-            return time.getTime() > date.getTime() || time.getTime() < aimDate;
-          } else {
-            let date = new Date(list[1].startTime);
-            return time.getTime() > date.getTime() || time.getTime() < aimDate;
-          }
-        } else {
-          if (index === 1) {
-            let date1 = new Date(list[0].startTime);
-            let date2 = new Date(list[index].endTime);
-            return (
-              time.getTime() < date1.getTime() ||
-              time.getTime() > date2.getTime() ||
-              time.getTime() < aimDate
-            );
-          } else {
-            let date1 = new Date(list[index - 1].endTime);
-            let date2 = new Date(list[index].endTime);
-            return (
-              time.getTime() < date1.getTime() ||
-              time.getTime() > date2.getTime() ||
-              time.getTime() < aimDate
-            );
-          }
-        }
-      } else {
-        if (index === list.length - 1) {
-          if (list.length === 2) {
-            let date = new Date(list[0].startTime);
-            date=new Date(date.setDate(date.getDate()+1))
-            return time.getTime() < date.getTime() || time.getTime() < aimDate;
-          } else {
-            let date = new Date(list[index - 1].endTime);
-            return time.getTime() < date.getTime() || time.getTime() < aimDate;
-          }
-        } else {
-          if (index === list.length - 2) {
-            let date1 = new Date(list[index].startTime);
-             date1=new Date(date1.setDate(date1.getDate()+1))
-            let date2 = new Date(list[index + 1].endTime);
-            return (
-              time.getTime() < date1.getTime() ||
-              time.getTime() > date2.getTime() ||
-              time.getTime() < aimDate
-            );
-          } else {
-            let date1 = new Date(list[index].startTime);
-             date1=new Date(date1.setDate(date1.getDate()+1))
-            let date2 = new Date(list[index + 1].startTime);
-            return (
-              time.getTime() < date1.getTime() ||
-              time.getTime() > date2.getTime() ||
-              time.getTime() < aimDate
-            );
-          }
-        }
-      }
-      }
-      
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/active-match/works-examine.vue b/src/views/modules/active-match/works-examine.vue
deleted file mode 100644
index 5567eb0..0000000
--- a/src/views/modules/active-match/works-examine.vue
+++ /dev/null
@@ -1,301 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-12-25 14:30:37
- * @LastEditTime: 2022-04-16 19:57:10
- * @LastEditors: chenkangxu
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\active-match\active-sign-up.vue
--->
-<template>
-    <div>
-        <searchForm
-        labelWidth="70px"
-        :searchForm="searchForm"
-        :searchData="searchSetting.searchData"
-        />
-        <cesTable
-        :loading="loading"
-        :isIndex="true"
-        :tableCols="pageData.tableCols"
-        :tableData="pageData.tableData"
-        :tablePage="pageData.tablePage"
-        :tableHandles="pageData.tableHandles"
-        @handleCurrentChange="findAll"
-        @handleSizeChange="findAll"
-        />
-        <activeMatchModal ref="activeMatchModal" isOnline="线上活动" :form="searchSetting.searchData" />
-        <!-- 审核modal -->
-        <modal 
-        :modalConfig="modalSetting.modalConfig"
-        :modalForm="modalSetting.modalForm"
-        :modalData="modalSetting.modalData"
-        :modalHandles="modalSetting.modalHandles"
-        />
-        <worksModal ref="worksModal" :form="row" />
-        <awardModal ref="awardModal" :form="row"/>
-    </div>
-</template>
-<script>
-import worksModal from './components/works-modal.vue'
-import modal from '../../../components/common/modal/modal.vue'
-import searchForm from '../../../components/common/searchform/searchForm.vue'
-import cesTable from '../../../components/common/table/custable.vue'
-import activeMatchModal from './components/active-match-modal.vue'
-import awardModal from './components/award-modal.vue'
-export default {
-    components:{
-        searchForm,
-        cesTable,
-        awardModal,
-        modal,
-        worksModal,
-        activeMatchModal
-    },
-    data(){
-        return{
-            //加载动画
-            loading:false,
-            pageData:{
-                tableCols:[
-                    {label:"姓名",prop:'name'},
-                    {label:"学校",prop:'schoolName'},
-                    {label:"类型",prop:'isVideo',formatter:(prop,row)=>{
-                        return row[prop]==0?'图文':'视频'
-                    }},
-                    {label:"分组",prop:'studentGroup'},
-                    {label:"手机号",prop:'cellphone'},
-                    {label:'得票数',prop:'votes'},
-                    {label:'轮次',formatter:(prop,row)=>{
-                        let str='已通过所有轮次'
-                        // console.log(this.options.length)
-                        if(this.options.length===0) return str
-                        if(this.options.length===1){
-                            if(row.firstRise===0) return this.options[0].content
-                            else return str
-                        }
-                        if(this.options.length===2){
-                            if(row.firstRise===0) return this.options[0].content
-                            else if(row.secondRise===0) return this.options[1].content
-                            else return str
-                        }
-                        if(this.options.length===3){
-                            if(row.firstRise===0) return this.options[0].content
-                            else if(row.secondRise===0) return this.options[1].content
-                            else if(row.thirdRise===0) return this.options[2].content
-                            else return str
-                        }
-                    }},
-                    {label:'审核情况',prop:'status',formatter:(prop,row)=>{
-                        return row[prop]==0?'未审核':row[prop]==1?'审核通过':'审核未通过'
-                    },
-                    },
-                    {
-                        label:'操作', width:'210px',type:'button',btnList:[
-                            {
-                                label:'查看作品',
-                                type:'text',
-                                handle:(row)=>{
-                                    this.row=JSON.parse(JSON.stringify(row))
-                                    this.row.introduce=this.row.introduce.replace(/\n/g,"<br>")
-                                    if(row.isVideo===0){
-                                         this.row.imageUrl=this.row.imageUrl.split(',')
-                                    }
-                                    this.$refs.worksModal.modalConfig.show=true
-                                }
-                            },
-                            
-                            {
-                                label:'审核',
-                                type:'text',
-                                handle:(row)=>{
-                                    this.modalSetting.modalData=JSON.parse(JSON.stringify(row))
-                                    this.modalSetting.modalConfig.show=true
-                                }
-                            },
-                            {
-                                label:'晋级',
-                                type:'text',
-                                handle:(row)=>{
-                                      if(row.status!=1){
-                                        this.$message({
-                                            type:'warning',
-                                            message:'请审核通过后再执行晋级操作！'
-                                        })
-                                    }else{
-                                        this.$confirm('是否确定晋级该作品?', '提示', {
-                                            confirmButtonText: '确定',
-                                            cancelButtonText: '取消',
-                                            }).then(() => {
-                                                let data=JSON.parse(JSON.stringify(row));
-                                                if(data.firstRise===0) data.firstRise=1;
-                                                else if(data.secondRise===0) data.secondRise=1;
-                                                else if(data.thirdRise===0) data.thirdRise=1;
-                                                this.$api.setWorksExamine(data).then(res=>{
-                                                    this.findAll()
-                                                })
-                                            }).catch(() => {
-                                                 
-                                            });
-                                    }
-                                },
-                                disabled:(row)=>{
-                                  
-                                    if(this.options.length===0||(this.options.length===1&&row.firstRise===1))return true;
-                                    else if(this.options.length===2&&row.secondRise===1)return true;
-                                    else if(this.options.length===3&&row.thirdRise===1)return true;
-                                    else return false
-                                }
-
-                            },
-                            {
-                                label:'颁奖',
-                                type:'text',
-                                handle:(row)=>{
-                                    this.row=JSON.parse(JSON.stringify(row));
-                                    this.row.introduce=this.row.introduce.replace(/\n/g,"<br>")
-                                    if(row.isVideo===0){
-                                         this.row.imageUrl=this.row.imageUrl.split(',')
-                                    }
-                                    this.$refs.awardModal.modalConfig.show=true
-                                }
-                            }
-                        ]
-                    }
-                ],
-                tableData:[],
-                tablePage:{
-                    currentPage: 1,
-                    pageSize: 5,
-                    pageTotal: 0,
-                    pageSizeRange: [5, 10, 20, 50],
-                },
-                tableHandles:[]
-            },
-            searchSetting:{
-                
-                searchData:{
-                    name:'',
-                    activityName:'',
-                    activityId:'',
-                    cellphone:'',
-                    studentGroup:'小学组',
-                    status:1,
-                    round:'',
-                    timeEntityList:[],
-                }
-            },
-            modalSetting:{
-                modalConfig:{
-                    title:'审核',
-                    show:false
-                },
-                modalForm:[{
-                    label:'审核情况',
-                    type:'Radio',
-                    prop:'status',
-                    radios:[{label:'未审核',value:0},{label:'审核未通过',value:2},{label:'审核通过',value:1}]
-                }],
-                modalData:{},
-                modalHandles:[{
-                    label:'确认',
-                    type:'primary',
-                    handle:()=>{
-                        this.$api.setWorksExamine(this.modalSetting.modalData).then(res=>{
-                            this.modalSetting.modalConfig.show=false
-                            this.findAll()
-                        })
-                    }
-                }]
-            },
-            options:[],//轮次的选择框
-            row:{}
-        }
-    },
-    methods:{
-        findAll(){
-            this.loading=true;
-            let data=JSON.parse(JSON.stringify(this.searchSetting.searchData))
-            data.timeEntityList=''
-            this.$api.getWorksExamine(data).then(res=>{
-                this.pageData.tableData=res.data.page.list;
-                this.pageData.tablePage.pageTotal=res.data.page.totalCount
-            })
-            .finally(()=>{
-                this.loading=false;
-            })
-
-        },
-        resetSearchForm(){
-            for(let item in this.searchSetting.searchData){
-                if(item==='timeEntityList') this.searchSetting.searchData[item]=[]
-                else if(item==='studentGroup') this.searchSetting.searchData[item]='小学组'
-                else if(item==='status') this.searchSetting.searchData[item]=1
-                else this.searchSetting.searchData[item]=''
-            }
-        }
-    },
-    watch:{
-        "searchSetting.searchData.timeEntityList":{
-            handler:function(val){
-                // console.log(11)
-                let arr=JSON.parse(JSON.stringify(val))
-                arr.pop();
-                arr.shift();
-                this.options=arr.map((item,index)=>{
-                    return {label:index+1,value:index+1,content:item.content}
-                })
-                // console.log(arr,this.options)
-                // this.options
-            }
-        }
-    },
-    computed:{
-        searchForm(){
-            return [
-                    {label:'活动名称',prop:'activityName',readonly:true,type:'Input',size:"mini",focus:()=>{this.$refs.activeMatchModal.modalConfig.show=true}},
-                    {label:'姓名',prop:'name',type:'Input',size:"mini"},
-                    {label:'轮次',prop:'round',type:'Select',options:this.options,size:"mini"},
-                    {label:'电话',prop:'cellphone',type:'Input',size:"mini"},
-                    {label:'分组',prop:'studentGroup',type:'Select',options:[
-                        {label:'小学组',value:'小学组'},
-                        {label:'初中组',value:'初中组'},
-                        {label:'高中组',value:'高中组'}
-                    ],size:"mini"},
-                    {label:'审核情况',prop:'status',type:'Select',options:[
-                        {label:'未审核',value:0},
-                        {label:'审核通过',value:1},
-                        {label:'审核未通过',value:2}
-                    ],size:"mini"},
-                    {name:'查询',type:'Button',style:'primary',size:"mini",
-                    // disabled:()=>{
-                    //     if(this.searchSetting.searchData.activityId===''){
-                    //         return true
-                    //     }else{
-                    //         return false
-                    //     }
-                    //     // return true
-                    // },
-                    handle:()=>{
-                        if(this.searchSetting.searchData.activityId===''){
-                            this.$message({
-                                type:'warning',
-                                message:"请先选择活动/赛事！"
-                            })
-                            setTimeout(() => {
-                                this.$refs.activeMatchModal.modalConfig.show=true
-                            }, 800);
-                        }
-                        else
-                        this.findAll()
-                    }},
-                    {name:'重置',type:'Button',style:'warning',handle:()=>{
-                        this.resetSearchForm()
-                    },size:"mini"}
-                ]
-        }
-    }
-}
-</script>
-<style scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/modules/app-operate/theme-manage.vue b/src/views/modules/app-operate/theme-manage.vue
deleted file mode 100644
index 8576319..0000000
--- a/src/views/modules/app-operate/theme-manage.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-  <el-form>
-    <h2>主题设置</h2>
-    <el-form-item label="app、官网主题">
-      <el-radio-group :value="globalTheme" v-loading="themeChangeLoading" @input="change">
-        <el-radio label="default" border>默认主题</el-radio>
-        <el-radio label="mourning" border>哀悼主题</el-radio>
-      </el-radio-group>
-    </el-form-item>
-  </el-form>
-</template>
-
-<script>
-  export default {
-    data(){
-        return {
-            globalTheme:"default",
-            themeChangeLoading:false,
-        }
-    },
-    activated(){
-      this.themeChangeLoading=true;
-      this.$api.appOperate.getTheme()
-      .then(res=>{
-        console.log(res);
-        this.globalTheme=res.data.config.paramValue;
-      })
-      .finally(() => {
-        this.themeChangeLoading=false
-      })
-    },
-    methods:{
-        change(e){
-            this.themeChangeLoading=true;
-            this.$api.appOperate.updateTheme(e)
-            .then(res=>{
-                console.log(e);
-                this.globalTheme=e;
-            })
-            .catch(e=>{
-
-            })
-            .finally(() => {
-                this.themeChangeLoading=false;
-            })
-        }
-    }
-  }
-</script>
-
diff --git a/src/views/modules/approval/content/index.vue b/src/views/modules/approval/content/index.vue
deleted file mode 100644
index 51348dd..0000000
--- a/src/views/modules/approval/content/index.vue
+++ /dev/null
@@ -1,672 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      ref="searchForm"
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm>
-    <obj-table-plus
-      style="height: 60vh"
-      @query="searchTableList"
-      ref="oTable"
-      v-model="pageData.tableData"
-      :isPagination="true"
-      :tableCols="pageData.tableCols"
-      :tableProp="tableProp"
-      :toolbarProp="{}"
-      :tableEvent="{ 'select-change': selectChange }"
-    />
-    <!-- <cusTable
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable> -->
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-     <!-- 审核弹窗 -->
-    <ApprovalModal type="content" ref="ApprovalModal" @refresh="$refs.oTable.refresh()"/>
-  </div>
-</template>
-<script>
-import ApprovalModal from '../popup/approval.vue'
-import modal from "@/components/common/modal/modal.vue";
-import searchForm from "@/components/common/searchform/searchForm.vue";
-import cusTable from "@/components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal,ApprovalModal },
-  data() {
-    return {
-      // 加载动画
-      tableProp: {
-        height: "auto",
-      },
-      typeList: [],
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          {
-            type: "Input",
-            label: "关键字",
-            size: "mini",
-            prop: "searchName",
-            placeholder: "标题、来源、编辑者名称",
-            width: "230px",
-          },
-          //   {
-          //     type: "Cascader",
-          //     label: "资讯分类",
-          //     size:"mini",
-          //     prop: "mainTypeId",//实际传参时进行了处理
-          //     data: [],
-          //   },
-          {
-            type: "Select",
-            label: "内容类型",
-            size: "mini",
-            prop: "searchType",
-            options: [
-              {
-                label: "内容轮播图",
-                value: 3,
-              },
-              {
-                label: "学习轮播图",
-                value: 4,
-              },
-              {
-                label: "地方内容",
-                value: 2,
-              },
-              {
-                label: "红色内容",
-                value: 1,
-              },
-            ],
-          },
-          {
-            type: "Select",
-            prop: "isVideo",
-            label: "信息类型",
-            size: "mini",
-            options: [
-              { label: "资讯", value: 0 },
-              { label: "视频", value: 1 },
-            ],
-            width: "300px",
-          },
-          {
-            size: "mini",
-            type: "DateTimeRange",
-            label: "发布时间范围",
-            prop: "time",
-          },
-          {
-            type: "Select",
-            label: "审核状态",
-            prop: "examineStatus",
-            default:true,
-            size: "mini",
-            options: [
-               { label: "未审核", value: 0 },
-              { label: "审核通过", value: 1 },
-              { label: "审核未通过", value: 2 },
-            ],
-          },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          mainTypeId: "",
-          time: [],
-          searchType: 3,
-          isVideo: 0,
-          examineStatus:'',
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            size: "mini",
-            type: "primary",
-            handle: () => this.$refs.oTable.reload(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            size: "mini",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          //   {
-          //     label: "新增",
-          //     type: "primary",
-          //     handle: () => this.showModal(this.commonConstants.modalType.insert),
-          //     auth: "reportDatasource_insert",
-          //   },
-          //   {
-          //     label: "批量删除",
-          //     type: "danger",
-          //     handle: () => this.deleteBatch(),
-          //     auth: "reportDatasource_batchDelete",
-          //   },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { title: "标题", field: "title", align: "center", fixed: "left" },
-          { title: "副标题", field: "subtitle", align: "center" },
-          { title: "主分类名", field: "mainTypeName", align: "center" },
-          { title: "子分类名", field: "secondTypeName", align: "center" },
-          { title: "资讯来源", field: "source", align: "center" },
-          { title: "编辑者", field: "editorName", align: "center" },
-          { title: "作者", field: "author", align: "center" },
-          {
-            title: "封面",
-            type: "jsx",
-            field: "imageUrl",
-            align: "center",
-            render: ({ row }) => {
-              // @/assets/images/noimg.svg
-              return (
-                <el-image
-                  fit="cover"
-                  src={
-                    row.imageUrl
-                      ? row.imageUrl
-                      : require("@/assets/images/noimg.svg")
-                  }
-                ></el-image>
-              );
-            },
-          },
-          // { title: "外链", field: "contentLink", align: "center" },
-          { title: "阅读数", field: "readNumber", align: "center" },
-          { title: "点赞数", field: "likeNumber", align: "center" },
-          { title: "评论数", field: "commentNumber", align: "center" },
-          { title: "收藏数", field: "collectNumber", align: "center" },
-          {
-            title: "审核状态",
-            field: "createTime",
-            align: "center",
-            // "title-help":{message: '开关开启代表通过审核，关闭代表不通过审核'},
-            type: "jsx",
-            render: ({ row }) => {
-              switch (row.examineStatus) {
-                case 0:
-                  return (
-                    <span>
-                      <span style="color:gray">未审核</span>
-                    </span>
-                  );
-                case 1:
-                  return (
-                    <span>
-                      <span style="color:green">审核通过</span>
-                    </span>
-                  );
-                case 2:
-                  return (
-                    <span>
-                      <span style="color:red">审核未通过</span>
-                    </span>
-                  );
-                default:
-                  return (<span></span>);
-              }
-            },
-          },
-          {
-            title: "操作",
-            field: "operation",
-            align: "center",
-            type: "button",
-            fixed: "right",
-            btnList: [
-              {
-                label: "查看",
-                type: "text",
-                auth: "reportDatasource_getDetail",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.detail, row),
-              },
-              {
-                label: "审核",
-                type: "text",
-                handle: (row) =>
-                  this.$refs.ApprovalModal.show({...row,contentType:this.pageData.queryData.searchType})
-              },
-            ],
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "80vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "标题",
-            prop: "title",
-            // rules: { required: true, maxLength: 100 },
-            width: "900px",
-            placeholder: "",
-            disabled: () => true,
-          },
-
-          {
-            type: "Input",
-            label: "副标题",
-            prop: "subtitle",
-            // rules: { maxLength: 100 },
-            width: "900px",
-            placeholder: "",
-            disabled: () => true,
-          },
-          {
-            type: "Cascader",
-            label: "资讯分类",
-            prop: "mainTypeId", //实际传参时进行了处理
-            data: [],
-            // rules: { required: true },
-            width: "300px",
-            disabled: () => true,
-          },
-          {
-            type: "Input",
-            label: "资讯来源",
-            prop: "source",
-            // rules: { required: true, maxLength: 100 },
-            width: "300px",
-            disabled: () => true,
-            placeholder: "",
-          },
-          {
-            type: "Input",
-            label: "作者",
-            prop: "author",
-            // rules: { maxLength: 100 },
-            width: "300px",
-            disabled: () => true,
-            placeholder: "",
-          },
-          {
-            type: "Input",
-            label: "编辑者",
-            prop: "editorName",
-            // rules: { maxLength: 100 },
-            width: "300px",
-            disabled: () => true,
-            placeholder: "",
-          },
-          // {
-          //   type: "Input",
-          //   label: "外链",
-          //   prop: "contentLink",
-          //   rules: { maxLength: 100 },
-          //   width: "300px",
-          // },
-          {
-            type: "Input",
-            label: "关键词",
-            prop: "keywords",
-            // rules: { maxLength: 100 },
-            width: "300px",
-            disabled: () => true,
-            placeholder: "",
-          },
-          {
-            type: "Radio",
-            prop: "isVideo",
-            label: "内容类型",
-            radios: [
-              { label: "资讯", value: "0" },
-              { label: "视频", value: "1" },
-            ],
-            width: "300px",
-            disabled: () => true,
-          },
-
-          {
-            type: "Img",
-            label: "封面",
-            prop: "imageUrl",
-            // prop: "fileList",
-            // accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-          {
-            type: "ShowTinymce",
-            label: "资讯内容",
-            prop: "content",
-            // rules: { required: true },
-            width: "1000px",
-          },
-        ],
-        newModalForm: [
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-        ], //咨询专属内容
-        videoModalForm: [
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-          {
-            type: "Upload",
-            label: "视频",
-            fileUrl: "videoUrl",
-            prop: "fileListVideo",
-            listType: "text",
-            // rules: { required: true },
-            width: "300px",
-            isVideo: true,
-            accept: ".mp4,.avi,.mov,.rmvb,.flv,.MP4,.AVI,.MOV,.RMVB,.FLV",
-            tips: "请上传视频文件",
-          },
-        ], //视频专属内容
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          userId: "",
-          content: "",
-          fileUrl: "",
-          fileList: [],
-          isVideo: "0",
-          videoUrl: "",
-          source: "",
-          fileListVideo: [],
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-      },
-      parentId: "",
-    };
-  },
-  activated() {
-    this.$refs.oTable.refresh();
-    this.searchContentType();
-  },
-  watch: {
-    "pageData.modalData.isVideo": {
-      handler: function (val, oldval) {
-        if (val === "1" && oldval === "0") {
-          this.pageData.modalForm.splice(
-            -1 - this.pageData.newModalForm.length,
-            this.pageData.newModalForm.length,
-            ...this.pageData.videoModalForm
-          );
-        } else if (val === "0" && oldval === "1") {
-          this.pageData.modalForm.splice(
-            -1 - this.pageData.videoModalForm.length,
-            this.pageData.videoModalForm.length,
-            ...this.pageData.newModalForm
-          );
-        }
-      },
-    },
-    "pageData.modalData.fileList": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.pageData.modalData.imageUrl = "";
-        }
-      },
-    },
-    "pageData.modalData.fileListVideo": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.pageData.modalData.videoUrl = "";
-        }
-      },
-    },
-    "pageData.queryData.searchType": {
-      handler: function (val) {
-        this.$refs.oTable.reload();
-      },
-    },
-  },
-
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList(pageNo, pageSize) {
-      // 初始化obj
-      var obj = {};
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      obj.page = this.pageData.tablePage.currentPage;
-      obj.limit = this.pageData.tablePage.pageSize;
-      let data = obj.mainTypeId;
-      obj.mainTypeId = data[0] ? data[0] : "";
-      obj.secondTypeId = data[1] ? data[1] : "";
-      delete obj["pageSizeRange"];
-      if (obj.time.length == 2) {
-        obj.startTime = obj.time[0];
-        obj.endTime = obj.time[1];
-      }
-      delete obj.time;
-      // 请求数据
-      let searchType = this.pageData.queryData.searchType;
-      if (searchType == 3) {
-        this.$api
-          .getContentImage({ ...obj, page: pageNo, limit: pageSize })
-          .then((res) => {
-            this.$refs.oTable.complete(
-              res.data.page.list,
-              res.data.page.totalCount
-            );
-          });
-      } else if (searchType == 4) {
-        this.$api
-          .getLocalServiceImage({ ...obj, page: pageNo, limit: pageSize })
-          .then((res) => {
-            this.$refs.oTable.complete(
-              res.data.page.list,
-              res.data.page.totalCount
-            );
-          });
-      } else if (searchType == 2) {
-        this.$api
-          .getLocalContentInfoListByParams({
-            ...obj,
-            page: pageNo,
-            limit: pageSize,
-          })
-          .then((res) => {
-            this.$refs.oTable.complete(
-              res.data.page.list,
-              res.data.page.totalCount
-            );
-          });
-      } else if (searchType == 1) {
-        this.$api
-          .getContentInfoListByParams({ ...obj, page: pageNo, limit: pageSize })
-          .then((res) => {
-            this.$refs.oTable.complete(
-              res.data.page.list,
-              res.data.page.totalCount
-            );
-          });
-      }
-      // this.$api.getContentInfoListByParams({...obj,page:pageNo,limit:pageSize}).then((res) => {
-      //   this.$refs.oTable.complete(
-      //     res.data.page.list,
-      //     res.data.page.totalCount
-      //   );
-      // });
-    },
-    // 查询分类
-    searchContentType() {
-      this.$api.getContentTypeList().then((res) => {
-        let data = res.data.list.map((item) => {
-          if (item.mainTypeName === "##") {
-            item.label = "地方";
-          } else {
-            item.label = item.mainTypeName;
-          }
-          item.value = item.mainTypeId;
-          item.children = item.children.map((item1) => {
-            item1.label = item1.secondTypeName;
-            item1.value = item1.secondTypeId;
-            return item1;
-          });
-          if (item.children.length === 0) {
-            delete item.children;
-          }
-          return item;
-        });
-        this.pageData.searchForm[1].data = data;
-        this.pageData.modalForm[2].data = data;
-      });
-    },
-    // 重置
-    resetSearch() {
-      // this.commonUtil.clearObj(this.pageData.queryData);
-      this.$refs.searchForm.$refs.searchFormRef.resetFields();
-      // this.searchTableList();
-      this.$refs.oTable.reload();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-      this.$nextTick(() => {
-        this.$refs["modalRef"].$refs["modalFormRef"].clearValidate(); //校验重置
-      });
-      this.pageData.modalData.source = this.$newSource; //获取默认的资讯来源
-      this.pageData.modalData.isVideo = "0"; //补充isVideo 不会触发watch
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      if (row.imageUrl) {
-        row.fileList = [
-          {
-            url: row.imageUrl,
-          },
-        ];
-      }
-      if (row.videoUrl) {
-        row.fileListVideo = [
-          {
-            url: row.videoUrl,
-            // +'?x-oss-process=video/snapshot,t_10000,m_fast'
-          },
-        ];
-      }
-      if (row.secondTypeId && typeof row.mainTypeId === "string") {
-        row.mainTypeId = [row.mainTypeId, row.secondTypeId];
-      }
-      row.isVideo = row.isVideo + "";
-      this.$nextTick(() => {
-        this.pageData.modalData = JSON.parse(JSON.stringify(row));
-      });
-      // console.log(this.pageData.modalData)
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.pageData.modalConfig.show = false; //关闭modal
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.content-dialog ::v-deep .el-dialog__body {
-  padding: 0px;
-}
-
->>> .el-input.is-disabled .el-input__inner {
-  background-color: #fff;
-  color: rgb(100, 100, 100);
-  cursor: default;
-}
->>> .el-cascader .el-input .el-icon-arrow-down::before {
-  content: "";
-  /* cursor:default; */
-}
->>> .el-input.is-disabled .el-input__icon {
-  cursor: default;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/approval/course/index.vue b/src/views/modules/approval/course/index.vue
deleted file mode 100644
index 762fb1b..0000000
--- a/src/views/modules/approval/course/index.vue
+++ /dev/null
@@ -1,409 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      ref="searchForm"
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-      labelWidth="120px"
-    >
-    </searchForm>
-    <obj-table-plus
-      style="height: 60vh"
-      @query="searchTableList"
-      ref="oTable"
-      v-model="pageData.tableData"
-      :isPagination="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableProp="tableProp"
-      :toolbarProp="{}"
-      :tableEvent="{ 'select-change': selectChange }"
-    />
-   
-   <DetailModal  ref="DetailModal" />
-    <!-- 发布时间modal -->
-    <modal
-      ref="modal"
-      :modalConfig="modalSetting.modalConfig"
-      :modalForm="modalSetting.modalForm"
-      :modalData="modalSetting.modalData"
-      :modalHandles="modalSetting.modalHandles"
-    />
-    <!-- 审核弹窗 -->
-    <ApprovalModal type="course" ref="ApprovalModal" @refresh="$refs.oTable.refresh()"/>
-  </div>
-</template>
-<script>
-import ApprovalModal from '../popup/approval.vue'
-import DetailModal from './popup/detail.vue'
-import Modal from "../../../../components/common/modal/modal.vue";
-import Custable from "../../../../components/common/table/custable.vue";
-import SearchForm from "../../../../components/common/searchform/searchForm.vue";
-export default {
-  components: { Modal, Custable, SearchForm,DetailModal ,ApprovalModal},
-  data() {
-    return {
-      typeList: [],
-      tableProp: {
-        height: "auto",
-      },
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          { type: "Input", label: "标题/课程简介", prop: "searchName" },
-          {
-            type: "Cascader",
-            label: "课程类型",
-            prop: "courseType",
-            rules: {
-              required: true,
-              message: "请选择课程类型",
-              trigger: "blur",
-            },
-            props: {
-              lazy: true,
-              lazyLoad: (node, reslove) => {
-                if (node.data.leaf) {
-                  reslove();
-                } else {
-                  this.$api
-                    .courseThemeAll({ courseType: node.value })
-                    .then((res) => {
-                      reslove(
-                        res.data.list.map((item) => {
-                          return {
-                            label: item.themeName,
-                            value: item.courseThemeId,
-                            leaf: true,
-                          };
-                        })
-                      );
-                    });
-                }
-              },
-              checkStrictly: true,
-            },
-            data: this.commonConstants.courseType,
-          },
-          {
-            type: "Select",
-            label: "审核状态",
-            prop: "examineStatus",
-            default:true,
-            options: [
-              { label: "未审核", value: 0 },
-              { label: "审核通过", value: 1 },
-              { label: "审核未通过", value: 2 },
-            ],
-          },
-          {
-            type: "Select",
-            label: "年级",
-            prop: "courseGrade",
-            default:true,
-            options: [
-              { label: "低年级", value: 2 },
-              { label: "中年级", value: 3 },
-              // { label: "四年级", value: 4 },
-              { label: "高年级", value: 5 },
-            ],
-          },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          courseType: "红心向党",
-          examineStatus:'',
-          courseGrade:''
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            submit: true,
-            handle: () => this.$refs.oTable.reload(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          // {
-          //   label: "新增",
-          //   type: "primary",
-          //   handle: () => this.showModal(this.commonConstants.modalType.insert),
-          //   auth: "reportDatasource_insert",
-          // },
-          // {
-          //   label: "批量删除",
-          //   type: "danger",
-          //   handle: () => this.deleteBatch(),
-          //   auth: "reportDatasource_batchDelete",
-          // },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { title: "标题", field: "title", align: "center" },
-          { title: "封面", field: "image",type:'image', align: "center" },
-          { title: "试卷名称", field: "paperName", align: "center" },
-
-          {
-            title: "发布时间",
-            field: "releaseTime",
-            align: "center",
-            type: "jsx",
-            render: ({ row }) => {
-              let publish = () => {
-                if (!row.releaseTime) {
-                  this.modalSetting.modalConfig.show = true;
-                  this.modalSetting.row = row;
-                  // console.log(row)
-                }
-              };
-
-              if (row.releaseTime) {
-                return <span>{row.releaseTime}</span>;
-              } else {
-                return (
-                  <el-button type="text" on-click={publish}>
-                    发布
-                  </el-button>
-                );
-              }
-            },
-            // formatter: (prop, row) => {
-            //   if (!row[prop]) {
-            //     return "发布";
-            //   }
-            // },
-            // itemClass: (row) => {
-            //   if (!row.releaseTime) {
-            //     return "el-button el-button--text el-button--medium";
-            //   }
-            // },
-            // click: (row) => {
-            //   if (!row.releaseTime) {
-            //     this.modalSetting.modalConfig.show = true;
-            //     this.modalSetting.row = row;
-            //     // console.log(row)
-            //   }
-            // },
-          },
-          { title: "课程分类", field: "courseType", align: "center" },
-         {
-            title: "审核状态",
-            field: "createTime",
-            align: "center",
-            // "title-help":{message: '开关开启代表通过审核，关闭代表不通过审核'},
-            type: "jsx",
-            render: ({ row }) => {
-              switch (row.examineStatus) {
-                case 0:
-                  return (
-                    <span>
-                      <span style="color:gray">未审核</span>
-                    </span>
-                  );
-                case 1:
-                  return (
-                    <span>
-                      <span style="color:green">审核通过</span>
-                    </span>
-                  );
-                case 2:
-                  return (
-                    <span>
-                      <span style="color:red">审核未通过</span>
-                    </span>
-                  );
-                default:
-                  return (<span></span>);
-              }
-            },
-          },
-          {
-            title: "操作",
-            align: "center",
-            type: "button",
-            fixed: "right",
-            btnList: [
-              {
-                label: "查看",
-                type: "text",
-                auth: "reportDatasource_update",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.update, row),
-              },
-              {
-                label: "审核",
-                type: "text",
-                handle: (row) =>
-                  this.$refs.ApprovalModal.show(row)
-              },
-            ],
-          },
-        ],
-      },
-      modalSetting: {
-        modalConfig: {
-          show: false,
-          title: "发布",
-        },
-        modalForm: [
-          {
-            label: "发布时间",
-            prop: "releaseTime",
-            type: "DateTime",
-            rules: { required: true },
-          },
-        ],
-        modalData: {
-          releaseTime: "",
-        },
-        row: {},
-        modalHandles: [
-          {
-            label: "确认",
-            type: "primary",
-            handle: () => {
-              this.updateReleaseTime();
-            },
-          },
-        ],
-      },
-      // 修改数据
-      isUpdate: false,
-      updateData: {},
-    };
-  },
-  activated() {
-    this.$refs.oTable.refresh();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList(pageNo,pageSize) {
-      // 初始化obj
-      var obj = {};
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      // obj.page = this.pageData.tablePage.currentPage;
-      // obj.limit = this.pageData.tablePage.pageSize;
-      delete obj["pageSizeRange"];
-       if (obj.courseType.length == 0) {
-        obj.courseType = "";
-        obj.courseThemeId = "";
-      } else if (obj.courseType.length == 1) {
-        obj.courseType = obj.courseType[0];
-        obj.courseThemeId = "";
-      } else if (obj.courseType.length == 2) {
-        obj.courseThemeId = obj.courseType[1];
-        obj.courseType = obj.courseType[0];
-        
-      }
-      // 请求数据
-      this.$api
-        .getCourseListByParams({...obj,page:pageNo,limit:pageSize})
-        .then((res) => {
-          this.$refs.oTable.complete(res.data.page.list,res.data.page.totalCount)
-        
-        })
-    },
-    // 重置
-    resetSearch() {
-      this.$refs.searchForm.$refs.searchFormRef.resetFields();
-      this.$refs.oTable.reload()
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      // console.log(type, row);
-      if (row && row.releaseTime) {
-        row.isSubmit = true;
-      } else if (row) {
-        row.isSubmit = false;
-      }
-      if (type != this.commonConstants.modalType.insert) {
-        this.isUpdate = true;
-        this.updateData = JSON.parse(JSON.stringify(row));
-      } else {
-        this.isUpdate = false;
-        this.updateData = {};
-      }
-
-      this.$refs.DetailModal.modalConfig.show = true;
-      this.$refs.DetailModal.modalData=this.updateData
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      // this.$refs["modalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      // this.pageData.modalConfig.show = false; //关闭modal
-      // this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-    },
-    updateReleaseTime() {
-      this.$refs.modal.$refs.modalFormRef.validate((valid) => {
-        if (valid) {
-          let data = Object.assign({}, this.modalSetting.row);
-          data.releaseTime = this.modalSetting.modalData.releaseTime;
-
-          this.$api.updateRedCourse(data).then((res) => {
-            this.modalSetting.modalData.releaseTime = "";
-            this.$nextTick(() => {
-              this.$refs.modal.$refs.modalFormRef.clearValidate();
-            });
-            this.modalSetting.modalConfig.show = false;
-            this.$refs.oTable.reload();
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-    
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.content-dialog ::v-deep .el-dialog__body {
-  padding: 0px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/approval/course/popup/detail.vue b/src/views/modules/approval/course/popup/detail.vue
deleted file mode 100644
index 763c8ee..0000000
--- a/src/views/modules/approval/course/popup/detail.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<!--
- * @Author: 陈伟亮 1186723967@qq.com
- * @Date: 2022-06-18 21:28:41
- * @LastEditors: 陈伟亮 1186723967@qq.com
- * @LastEditTime: 2022-06-18 22:14:16
- * @FilePath: \background-front-end\src\views\modules\approval\course\popup\detail.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
-<template>
-  <div>
-    <modal
-      :modalConfig="modalConfig"
-      :modalForm="modalForm"
-      :modalData="modalData"
-    />
-  </div>
-</template>
-<script>
-import modal from "@/components/common/modal/modal.vue";
-export default {
-  components: {
-    modal,
-  },
-  data() {
-    return {
-      modalConfig: {
-        title: "查看",
-        show: false,
-        width: "70vw",
-      },
-      modalForm: [
-        {
-          type: "Input",
-          label: "课程标题",
-          prop: "title",
-        //   rules: { required: true, maxLength: 100 },
-          width: "900px",
-          disabled: () => true,
-        },
-        {
-          type: "Textarea",
-          label: "课程描述",
-          prop: "content",
-          //   rules: { required: true, maxLength: 500 },
-          width: "900px",
-          disabled: () => true,
-        },
-        {
-          type: "Select",
-          label: "课程分类",
-          prop: "courseType",
-          //   rules: { required: true },
-          default: false,
-          options: [
-            { label: "爱国主义", value: "爱国主义" },
-            { label: "立德树人", value: "立德树人" },
-            { label: "家教家风", value: "家教家风" },
-          ],
-          width: "900px",
-          disabled: () => true,
-        },
-        {
-          //是否立即发布
-          label: "立即发布",
-          type: "Switch",
-          prop: "isSubmit",
-          disabled: () => {
-            return true;
-          },
-        },
-        // {
-        //   type: "Input",
-        //   label: "试卷名称",
-        //   prop: "paperName",
-        //   rules: { required: true, maxLength: 100 },
-        // },
-        {
-          type: "Img",
-          label: "课程封面",
-          prop:'image',
-        //   fileUrl: "image",
-        //   prop: "fileList",
-        //   accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-          width: "300px",
-          //   rules: { required: true },
-        },
-        {
-          type: "Video",
-          label: "视频",
-          prop:'videoUrl',
-        //   fileUrl: "videoUrl",
-        //   prop: "fileListVideo",
-        //   listType: "text",
-          //   rules: { required: true },
-          width: "900px",
-        //   isVideo: true,
-        //   accept: ".mp4,.avi,.mov,.rmvb,.flv,.MP4,.AVI,.MOV,.RMVB,.FLV",
-        //   tips: "请上传视频文件",
-        },
-        {
-            type:'Paper',
-            label:'试卷',
-            prop:'projectDTO',
-            width:'900px'
-        }
-      ],
-      modalData: {},
-    };
-  },
-};
-</script>
-<style scoped>
->>> .el-input.is-disabled .el-input__inner {
-  background-color: #fff;
-  color: rgb(100, 100, 100);
-  cursor: default;
-}
->>> .el-textarea.is-disabled .el-textarea__inner {
-  background-color: #fff;
-  color: rgb(100, 100, 100);
-  cursor: default;
-}
->>> .el-cascader .el-input .el-icon-arrow-down::before {
-  content: "";
-  /* cursor:default; */
-}
->>> .el-input.is-disabled .el-input__icon {
-  cursor: default;
-}
->>> .el-switch.is-disabled .el-switch__core, .el-switch.is-disabled .el-switch__label{
-    cursor:default
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/approval/poetry/index.vue b/src/views/modules/approval/poetry/index.vue
deleted file mode 100644
index 10efc09..0000000
--- a/src/views/modules/approval/poetry/index.vue
+++ /dev/null
@@ -1,497 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-      labelWidth="120px"
-    >
-    </searchForm>
-    <obj-table-plus
-      style="height: 60vh"
-      @query="searchTableList"
-      ref="oTable"
-      v-model="pageData.tableData"
-      :isPagination="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableProp="tableProp"
-      :tableEvent="{ 'select-change': selectChange }"
-      :toolbarProp="{}"
-    >
-    </obj-table-plus>
-
-    <modal
-      class="modal"
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-    <!-- 审核弹窗 -->
-    <ApprovalModal type="poetry" ref="ApprovalModal" @refresh="$refs.oTable.refresh()"/>
-  </div>
-</template>
-<script>
-import ApprovalModal from '../popup/approval.vue'
-import Modal from "@/components/common/modal/modal.vue";
-import SearchForm from "@/components/common/searchform/searchForm.vue";
-export default {
-  components: { Modal, SearchForm ,ApprovalModal},
-  watch: {
-    "pageData.modalData.fileListVideo": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.pageData.modalData.videoUrl = "";
-        }
-      },
-    },
-    "pageData.modalData.fileListAudio": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.pageData.modalData.audioUrl = "";
-        }
-      },
-    },
-  },
-  data() {
-    return {
-      //加载动画
-      loading: false,
-      typeList: [],
-      tableProp: {
-        height: "auto",
-      },
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          {
-            type: "Cascader",
-            label: "古诗词分类",
-            prop: "typeId",
-            props: { checkStrictly: true },
-            data: [],
-          },
-          { type: "Input", label: "标题/作者/朝代", prop: "searchName" },
-          {
-            type: "Select",
-            label: "审核状态",
-            prop: "examineStatus",
-            default:true,
-            options: [
-              { label: "未审核", value: 0 },
-              { label: "审核通过", value: 1 },
-              { label: "审核未通过", value: 2 },
-            ],
-          },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          typeId: [],
-          examineStatus:'',
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            handle: () => {
-              this.$refs.oTable.reload();
-            },
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => {
-              this.pageData.queryData = {
-                searchName: "",
-                typeId: [],
-                examineStatus: "",
-              };
-
-              this.$refs.oTable.reload();
-            },
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        // tableHandles: [
-        //   {
-        //     label: "新增",
-        //     type: "primary",
-        //     handle: () => this.showModal(this.commonConstants.modalType.insert),
-        //     auth: "reportDatasource_insert",
-        //   },
-        //   {
-        //     label: "批量删除",
-        //     type: "danger",
-        //     handle: () => this.deleteBatch(),
-        //     auth: "reportDatasource_batchDelete",
-        //   },
-        // ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格列表头start
-        tableCols: [
-          { title: "标题", field: "title", align: "center" },
-          { title: "副标题", field: "subtitle", align: "center" },
-          { title: "作者", field: "author", align: "center" },
-          { title: "朝代", field: "dynasty", align: "center" },
-          { title: "修改时间", field: "createTime", align: "center" },
-          {
-            title: "审核状态",
-            field: "createTime",
-            align: "center",
-            // "title-help":{message: '开关开启代表通过审核，关闭代表不通过审核'},
-            type: "jsx",
-            render: ({ row }) => {
-              switch (row.examineStatus) {
-                case 0:
-                  return (
-                    <span>
-                      <span style="color:gray">未审核</span>
-                    </span>
-                  );
-                case 1:
-                  return (
-                    <span>
-                      <span style="color:green">审核通过</span>
-                    </span>
-                  );
-                case 2:
-                  return (
-                    <span>
-                      <span style="color:red">审核未通过</span>
-                    </span>
-                  );
-                default:
-                  return (<span></span>);
-              }
-            },
-          },
-          {
-            title: "操作",
-            field: "operation",
-            align: "center",
-            type: "button",
-            fixed: "right",
-            btnList: [
-              {
-                label: "查看",
-                type: "text",
-                auth: "reportDatasource_update",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.update, row),
-              },
-              {
-                label: "审核",
-                type: "text",
-                handle: (row) =>
-                  this.$refs.ApprovalModal.show(row)
-              },
-            ],
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "查看", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "1200px", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "标题",
-            prop: "title",
-            // rules: { required: true, maxLength: 100 },
-            width: "900px",
-            disabled: () => true,
-          },
-          {
-            type: "Input",
-            label: "副标题",
-            prop: "subtitle",
-            // rules: { maxLength: 100 },
-            width: "900px",
-            disabled: () => true,
-          },
-          {
-            type: "Cascader",
-            label: "古诗词分类",
-            prop: "typeId",
-            data: [],
-            // rules: { required: true },
-            props: { multiple: true, checkStrictly: true },
-            disabled: () => true,
-          },
-          {
-            type: "Input",
-            label: "作者",
-            prop: "author",
-            // rules: { maxLength: 100 ,required: true},
-            width: "300px",
-            disabled: () => true,
-          },
-          {
-            type: "Input",
-            label: "朝代",
-            prop: "dynasty",
-            // rules: { maxLength: 100, required: true },
-            width: "300px",
-            disabled: () => true,
-          },
-          {
-            type: "ShowTinymce",
-            label: "注释",
-            prop: "notes",
-            width: "1000px",
-          },
-          {
-            type: "ShowTinymce",
-            label: "翻译",
-            prop: "translate",
-            // rules: { required: true },
-            width: "1000px",
-          },
-          {
-            type: "ShowTinymce",
-            label: "古诗词正文",
-            prop: "content",
-            // rules: { required: true },
-            width: "1000px",
-          },
-          {
-            type: "Video",
-            label: "视频",
-            prop: "videoUrl",
-            // fileUrl: "videoUrl",
-            // prop: "fileListVideo",
-            // listType: "text",
-            width: "800px",
-            // isVideo: true,
-            // accept: ".mp4,.avi,.mov,.rmvb,.flv,.MP4,.AVI,.MOV,.RMVB,.FLV",
-            // tips: "请上传视频文件",
-          },
-          {
-            type: "Audio",
-            label: "音频",
-            prop: "audioUrl",
-            // prop: "fileListAudio",
-            // width: "300px",
-            // listType: "text",
-            // accept: ".cda,.wav,.mp3,.wma,.CDA,.WAV,.MP3,.WMA",
-            // tips: "请上传音频文件",
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          title: "",
-          fileListVideo: [],
-          fileListAudio: [],
-          videoUrl: "",
-          audioUrl: "",
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          // { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-      },
-    };
-  },
-  created() {
-    console.log(123);
-  },
-  activated() {
-    this.$refs.oTable.refresh();
-    this.searchContentType();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList(pageNo, pageSize) {
-      this.loading = true;
-      // 初始化obj
-      var obj = {};
-      console.log(this.pageData.queryData);
-      this.pageData.queryData.typeId[0]
-        ? (this.pageData.queryData.mainTypeId =
-            this.pageData.queryData.typeId[0])
-        : delete this.pageData.queryData["mainTypeId"];
-      this.pageData.queryData.typeId[1]
-        ? (this.pageData.queryData.secondTypeId =
-            this.pageData.queryData.typeId[1])
-        : delete this.pageData.queryData["secondTypeId"];
-      Object.assign(obj, this.pageData.queryData);
-      delete obj["typeId"];
-      // 请求数据
-      this.$api
-        .getPoetryByParams({ ...obj, limit: pageSize, page: pageNo })
-        .then((res) => {
-          // this.commonUtil.tableAssignment(
-          //   pageNo,
-          //   pageSize,
-          //   this.pageData.tableData
-          // );
-          console.log("resresres", res);
-          this.$refs.oTable.complete(
-            res.data.page.list,
-            res.data.page.totalCount
-          );
-        })
-        .catch(() => {
-          this.$refs.oTable.complete(false);
-        });
-    },
-    // 查询分类
-    searchContentType() {
-      this.$api.getMainSecondTypeList().then((res) => {
-        this.pageData.searchForm[0].data = this.addChildren(res.data.list);
-        this.pageData.modalForm[2].data = this.pageData.searchForm[0].data;
-        console.log("this.pageData.searchForm", this.pageData.searchForm);
-      });
-    },
-    addChildren(arr) {
-      if (Array.isArray(arr) && arr.length > 0) {
-        let outPut = [];
-        arr.forEach((item, index) => {
-          outPut.push({
-            children: item.children ? this.addChildren(item.children) : "",
-            label: item.secondTypeId ? item.secondTypeName : item.mainTypeName,
-            // value: item.secondTypeId ? item.secondTypeName : item.mainTypeName,
-            value: item.secondTypeId ? item.secondTypeId : item.mainTypeId,
-            id: item.secondTypeId ? item.secondTypeId : item.mainTypeId,
-          });
-        });
-        return outPut;
-      } else {
-        return arr;
-      }
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      console.log(type);
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-      this.$nextTick(() => {
-        this.$refs["modalRef"].$refs["modalFormRef"].clearValidate(); //校验重置
-      });
-      this.pageData.modalConfig.show = true;
-      // this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      if (row.videoUrl) {
-        row.fileListVideo = [
-          {
-            url: row.videoUrl,
-          },
-        ];
-      }
-      if (row.audioUrl) {
-        row.fileListAudio = [
-          {
-            url: row.audioUrl,
-          },
-        ];
-      }
-      this.pageData.modalData = JSON.parse(JSON.stringify(row));
-      let mainTypeIds = this.pageData.modalData.mainTypeIds.split(",");
-      let secondTypeIds = this.pageData.modalData.secondTypeIds.split(",");
-      let data = this.pageData.searchForm[0].data;
-      let typeId = [];
-
-      mainTypeIds.forEach((mainTypeId) => {
-        let mainIndex;
-        data.forEach((item, index) => {
-          if (item.value === mainTypeId) {
-            mainIndex = index;
-            return;
-          }
-        });
-        secondTypeIds.forEach((secondTypeId) => {
-          data[mainIndex].children.forEach((item1) => {
-            if (item1.value === secondTypeId) {
-              typeId.push([mainTypeId, secondTypeId]);
-            }
-          });
-        });
-      });
-      this.pageData.modalData.typeId = typeId;
-      // console.log(mainTypeIds,secondTypeIds);
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.pageData.modalConfig.show = false; //关闭modal
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-    routerTo(row) {
-      this.$store.commit("setParameters", {
-        key: "datasourceId",
-        value: row.id,
-      });
-      this.$router.push({ name: "datesourceDictCode" });
-    },
-    
-  },
-};
-</script>
-<style scoped>
->>> .el-input.is-disabled .el-input__inner {
-  background-color: #fff;
-  color: rgb(100, 100, 100);
-  cursor: default;
-}
->>> .el-cascader .el-input .el-icon-arrow-down::before {
-  content: "";
-  /* cursor:default; */
-}
->>> .el-input.is-disabled .el-input__icon {
-  cursor: default;
-}
-
-/* .modal ::v-deep  */
-</style>
\ No newline at end of file
diff --git a/src/views/modules/approval/popup/approval.vue b/src/views/modules/approval/popup/approval.vue
deleted file mode 100644
index 8bf0526..0000000
--- a/src/views/modules/approval/popup/approval.vue
+++ /dev/null
@@ -1,117 +0,0 @@
-<!--
- * @Author: 陈伟亮 1186723967@qq.com
- * @Date: 2022-06-20 15:44:39
- * @LastEditors: 陈伟亮 1186723967@qq.com
- * @LastEditTime: 2022-06-20 17:52:29
- * @FilePath: \background-front-end\src\views\modules\approval\popup\approval.vue
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
--->
-<template>
-  <Modal
-    :modalConfig="modalConfig"
-    :modalForm="modalForm"
-    :modalData="modalData"
-    :modalHandles="modalHandles"
-  />
-</template>
-<script>
-import Modal from "@/components/common/modal/modal.vue";
-import {mapState} from 'vuex'
-export default {
-  components: {
-    Modal,
-  },
-  props: {
-    //poetry,content,course
-    type: {
-      type: String,
-      default: "",
-    },
-  },
-  data() {
-    return {
-      modalConfig: {
-        title: "审核情况",
-        show: false,
-      },
-      modalData: {
-        examineReason: "",
-        examineStatus: "",
-      },
-      modalForm: [
-        {
-          label: "审核状态",
-          type: "Select",
-          prop: "examineStatus",
-          options: [
-            { label: "未审核", value: 0 },
-            { label: "审核通过", value: 1 },
-            { label: "审核未通过", value: 2 },
-          ],
-          rules: { required: true },
-        },
-        {
-          label: "审核原因",
-          type: "Textarea",
-          prop: "examineReason",
-          width: "400px",
-          rows: 6,
-        },
-      ],
-      modalHandles: [
-        {
-          label: "取消",
-          handle: () => {
-            this.modalConfig.show = false;
-          },
-        },
-        {
-          label: "确认",
-          type: "primary",
-          loading:false,
-          submit:true,
-          handle: () => {
-            this.modalHandles[1].loading=true
-            let { examineReason, examineStatus } = this.modalData;
-            let obj = {
-              examineReason,
-              examineStatus,
-              userId:this.user.id
-            };
-            console.log(this.modalData)
-            switch (this.type) {
-              case "poetry":
-                obj.poetryId = this.modalData.poetryId;
-                break;
-              case "content":
-                obj.contentInfoId = this.modalData.contentInfoId;
-                obj.contentType=this.modalData.contentType;
-                break;
-              case "course":
-                obj.courseId = this.modalData.courseId;
-                break;
-            }
-            this.$api.approval[this.type](obj).then((res) => {
-              this.$emit("refresh");
-              this.modalConfig.show=false
-            }).finally(()=>{
-                 this.modalHandles[1].loading=false;
-            });
-          },
-        },
-      ],
-    };
-  },
-  computed:{
-    ...mapState(['user'])
-  },
-  methods: {
-    show(row) {
-      this.modalData =JSON.parse(JSON.stringify(row));
-      this.modalConfig.show = true;
-    },
-  },
-};
-</script>
-<style lang="">
-</style>
\ No newline at end of file
diff --git a/src/views/modules/content/new-content.vue b/src/views/modules/content/new-content.vue
deleted file mode 100644
index feef788..0000000
--- a/src/views/modules/content/new-content.vue
+++ /dev/null
@@ -1,896 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      ref="searchForm"
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm>
-    <!-- <cusTable
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable> -->
-    <obj-table-plus
-      style="height: 60vh"
-      @query="searchTableList"
-      ref="oTable"
-      v-model="pageData.tableData"
-      :isPagination="true"
-      :tableCols="pageData.tableCols"
-      :tableProp="tableProp"
-      :toolbarProp="toolbarProp"
-      :toolbarEvent="toolbarEvent"
-      :tableEvent="tableEvent"
-      :enableAutoQuery="false"
-    />
-    <modal
-      class="modal"
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-    <comment ref="comment" :parentId="parentId" type="CONTENTINFO" />
-    <see ref="see" />
-  </div>
-</template>
-<script>
-import see from "./popup/new-content-see.vue";
-import comment from "../../../components/comment/comment.vue";
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal, comment, see },
-  data() {
-    return {
-      // 加载动画
-      loading: false,
-      typeList: [],
-      tableProp: {
-        height: "auto",
-      },
-      toolbarProp: {
-        buttons: [
-          {
-            status: "primary",
-            name: "新增",
-            code: "add",
-          },
-          {
-            status: "danger",
-            name: "批量删除",
-            code: "delBatch",
-          },
-        ],
-      },
-      tableEvent: {
-        "checkbox-change": this.selectChange,
-        "checkbox-all": this.selectChange,
-      },
-      toolbarEvent: {
-        "button-click": ({ code }) => {
-          if (code == "add") {
-            this.showModal(this.commonConstants.modalType.insert);
-          } else if (code == "delBatch") {
-            this.deleteBatch();
-          }
-        },
-      },
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          {
-            type: "Input",
-            label: "关键字",
-            size: "mini",
-            prop: "searchName",
-            placeholder: "标题、来源、编辑者名称",
-            width: "230px",
-          },
-          {
-            type: "Cascader",
-            label: "资讯分类",
-            size: "mini",
-            prop: "mainTypeId", //实际传参时进行了处理
-            data: [],
-          },
-          {
-            type: "Select",
-            label: "内容类型",
-            size: "mini",
-            prop: "isVideo",
-            options: [
-              {
-                label: "资讯",
-                value: 0,
-              },
-              { label: "视频", value: 1 },
-            ],
-          },
-          {
-            size: "mini",
-            type: "DateTimeRange",
-            label: "发布时间范围",
-            prop: "time",
-          },
-          {
-            type: "Select",
-            label: "审核状态",
-            prop: "examineStatus",
-            default: true,
-            size: "mini",
-            options: [
-              { label: "未审核", value: 0 },
-              { label: "审核通过", value: 1 },
-              { label: "审核未通过", value: 2 },
-            ],
-          },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          mainTypeId: "",
-          time: [],
-          isVideo: 0,
-          examineStatus: "",
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            size: "mini",
-            type: "primary",
-            handle: () => this.$refs.oTable.reload(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            size: "mini",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-          {
-            label: "批量删除",
-            type: "danger",
-            handle: () => this.deleteBatch(),
-            auth: "reportDatasource_batchDelete",
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { type: "checkbox", width: "60px", fixed: "left" },
-          {
-            title: "标题",
-            field: "title",
-            align: "center",
-            "min-width": 160,
-            fixed: "left",
-          },
-          {
-            title: "副标题",
-            field: "subtitle",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "主分类名",
-            field: "mainTypeName",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "子分类名",
-            field: "secondTypeName",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "资讯来源",
-            field: "source",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "编辑者",
-            field: "editorName",
-            align: "center",
-            "min-width": 100,
-          },
-          { title: "作者", field: "author", align: "center", "min-width": 100 },
-          {
-            title: "封面",
-            type: "jsx",
-            field: "imageUrl",
-            align: "center",
-            "min-width": 100,
-
-            render: ({ row }) => {
-              // @/assets/images/noimg.svg
-              return (
-                <el-image
-                  fit="cover"
-                  src={
-                    row.imageUrl
-                      ? row.imageUrl
-                      : require("@/assets/images/noimg.svg")
-                  }
-                ></el-image>
-              );
-            },
-          },
-          // { title: "外链", field: "contentLink", align: "center" },
-          {
-            title: "阅读数",
-            field: "readNumber",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "点赞数",
-            field: "likeNumber",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "评论数",
-            field: "commentNumber",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "收藏数",
-            field: "collectNumber",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "审核状态",
-            field: "createTime",
-            align: "center",
-            // "title-help":{message: '开关开启代表通过审核，关闭代表不通过审核'},
-            type: "jsx",
-            "min-width": 100,
-            render: ({ row }) => {
-              switch (row.examineStatus) {
-                case 0:
-                  return (
-                    <span>
-                      <span style="color:gray">未审核</span>
-                    </span>
-                  );
-                case 1:
-                  return (
-                    <span>
-                      <span style="color:green">审核通过</span>
-                    </span>
-                  );
-                case 2:
-                  return (
-                    <span>
-                      <span style="color:red">审核未通过</span>
-                    </span>
-                  );
-                default:
-                  return <span></span>;
-              }
-            },
-          },
-          {
-            title: "操作",
-            field: "operation",
-            align: "center",
-            type: "jsx",
-            fixed: "right",
-            width: "200px",
-            render: ({ row }) => {
-              const com = () => {
-                if (row.examineStatus == 1) {
-                  return (
-                    <el-button
-                      type="text"
-                      size="mini"
-                      onClick={() => {
-                        this.parentId = row.contentInfoId;
-                        this.$refs.comment.modalConfig.show = true;
-                      }}
-                    >
-                      查看评论
-                    </el-button>
-                  );
-                } else if (row.examineStatus == 2) {
-                  return (
-                    <el-button
-                      type="text"
-                      size="mini"
-                      onClick={() =>
-                        this.$confirm("确认重新提交吗？", "提示").then(
-                          (action) => {
-                            if (action == "confirm") {
-                              this.$api
-                                .updateRedContentInfo({
-                                  ...row,
-                                  examineStatus: 0,
-                                })
-                                .then((res) => {
-                                  this.$refs.oTable.refresh();
-                                });
-                            }
-                          }
-                        )
-                      }
-                    >
-                      重新提交
-                    </el-button>
-                  );
-                }
-              };
-              return (
-                <div>
-                  {com()}
-                  <el-button
-                    type="text"
-                    size="mini"
-                    onClick={
-                      () => this.$refs.see.show(row)
-                      // this.showModal(this.commonConstants.modalType.detail, row)
-                    }
-                  >
-                    查看
-                  </el-button>
-                  <el-button
-                    type="text"
-                    size="mini"
-                    onClick={() =>
-                      this.showModal(this.commonConstants.modalType.update, row)
-                    }
-                  >
-                    编辑
-                  </el-button>
-                  <el-button
-                    type="text"
-                    size="mini"
-                    onClick={() => this.deleteOne(row.contentInfoId)}
-                  >
-                    删除
-                  </el-button>
-                </div>
-              );
-            },
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增资讯", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          // width: "80vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-          fullscreen:true
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "标题",
-            prop: "title",
-            rules: { required: true, maxLength: 64 },
-            width: "796px",
-            showWordLimit:true,
-            maxlength:64,
-            placeholder:"请在这里输入标题"
-          },
-          {
-            type: "Input",
-            label: "副标题",
-            prop: "subtitle",
-            rules: { maxLength: 64 },
-            width: "796px",
-            showWordLimit:true,
-            maxlength:64,
-          },
-          {
-            type: "Input",
-            label: "作者",
-            prop: "author",
-            rules: { maxLength: 10 },
-            width: "796px",
-            maxlength:10,
-            showWordLimit:true,
-          },
-          {
-            type: "Tinymce",
-            label: "资讯内容",
-            prop: "content",
-            rules: { required: true },
-            width: "800px",
-            //tinymce init的config配置
-            config:{
-              toolbar_sticky:true,
-              // fixed_toolbar_container:"#tinymce_fixed_toolbar",
-              max_height:Infinity,
-              min_height:300,
-              skin:"oxide-sticky",
-              placeholder:"从这里开始填写正文",
-              border:"0 0 0 0"
-            },
-            //覆盖原本的工具栏
-            toolbars:['undo redo  fontsizeselect  bold italic underline strikethrough forecolor backcolor   removeformat subscript superscript blockquote alignleft aligncenter alignright alignjustify lineheightcustom indent2em wlindent    hr  bullist numlist link image charmap    insertdatetime media table emoticons preview print tpImportword wlxiumi' ]
-          },
-
-          {
-            type: "Cascader",
-            label: "资讯分类",
-            prop: "mainTypeId", //实际传参时进行了处理
-            data: [],
-            rules: { required: true },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "资讯来源",
-            prop: "source",
-            rules: { required: true, maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "编辑者",
-            prop: "editorName",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          // {
-          //   type: "Input",
-          //   label: "外链",
-          //   prop: "contentLink",
-          //   rules: { maxLength: 100 },
-          //   width: "300px",
-          // },
-          {
-            type: "Input",
-            label: "关键词",
-            prop: "keywords",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Radio",
-            prop: "isVideo",
-            label: "内容类型",
-            border:true,
-            radios: [
-              { label: "资讯", value: "0" },
-              { label: "视频", value: "1" },
-            ],
-            width: "300px",
-          },
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            drag:true,
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          }
-        ],
-        newModalForm: [
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            drag:true,
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-        ], //咨询专属内容
-        videoModalForm: [
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            drag:true,
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-          {
-            type: "Upload",
-            label: "视频",
-            fileUrl: "videoUrl",
-            prop: "fileListVideo",
-            drag:true,
-            listType: "text",
-            rules: { required: true },
-            width: "300px",
-            isVideo: true,
-            accept: ".mp4,.avi,.mov,.rmvb,.flv,.MP4,.AVI,.MOV,.RMVB,.FLV",
-            tips: "请上传视频文件",
-          },
-        ], //视频专属内容
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          userId: "",
-          content: "",
-          fileUrl: "",
-          fileList: [],
-          isVideo: "0",
-          videoUrl: "",
-          source: "",
-          fileListVideo: [],
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default",icon:"el-icon-close",handle: () => this.closeModal() },
-          { label: "提交", type: "primary",loading:false,icon:"el-icon-upload2",handle: (item) => this.save(item) },
-        ],
-        //modal 按钮 end
-      },
-      parentId: "",
-    };
-  },
-  activated() {
-    if(this.pageData.queryData.mainTypeId){
-       this.$refs.oTable.refresh();
-    }
-    this.searchContentType();
-  },
-  watch: {
-    "pageData.modalData.isVideo": {
-      handler: function (val, oldval) {
-        // console.log(val)
-        if (val === "1" && oldval === "0") {
-          this.pageData.modalForm.splice(
-            0 - this.pageData.newModalForm.length,
-            this.pageData.newModalForm.length,
-            ...this.pageData.videoModalForm
-          );
-        } else if (val === "0" && oldval === "1") {
-          this.pageData.modalForm.splice(
-            0 - this.pageData.videoModalForm.length,
-            this.pageData.videoModalForm.length,
-            ...this.pageData.newModalForm
-          );
-        }
-      },
-    },
-    "pageData.modalData.fileList": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.pageData.modalData.imageUrl = "";
-        }
-      },
-    },
-    "pageData.modalData.fileListVideo": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.pageData.modalData.videoUrl = "";
-        }
-      },
-    },
-  },
-
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList(pageNo, pageSize) {
-      // 初始化obj
-      var obj = {};
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      let data = obj.mainTypeId;
-      obj.mainTypeId = data[0] ? data[0] : "";
-      obj.secondTypeId = data[1] ? data[1] : "";
-      delete obj["pageSizeRange"];
-      if (obj.time.length == 2) {
-        obj.startTime = obj.time[0];
-        obj.endTime = obj.time[1];
-      }
-      delete obj.time;
-      // 请求数据
-      this.$api
-        .getContentInfoListByParams({ ...obj, page: pageNo, limit: pageSize })
-        .then((res) => {
-          this.$refs.oTable.complete(
-            res.data.page.list,
-            res.data.page.totalCount
-          );
-          // this.commonUtil.tableAssignment(
-          //   res.data.page,
-          //   this.pageData.tablePage,
-          //   this.pageData.tableData
-          // );
-        });
-    },
-    // 查询分类
-    searchContentType() {
-      this.$api.getContentTypeList().then((res) => {
-        let data = res.data.list.map((item) => {
-          // console.log(item.mainTypeName==='##')
-          if (item.mainTypeName === "##") {
-            item.label = "地方";
-          } else {
-            item.label = item.mainTypeName;
-          }
-          item.value = item.mainTypeId;
-          item.children = item.children.map((item1) => {
-            item1.label = item1.secondTypeName;
-            item1.value = item1.secondTypeId;
-            return item1;
-          });
-          if (item.children.length === 0) {
-            delete item.children;
-          }
-          return item;
-        }).filter(item=>item.label!='地方');
-        
-        // console.log(data)
-        this.pageData.searchForm[1].data = data;
-        //新增、编辑的数据
-        this.pageData.modalForm[4].data = data;
-        //查看时候的数据
-        this.$refs.see.modalForm[2].data = data;
-        // 如果咨询分类没选中就选中第一个并刷新
-        if(!this.pageData.queryData.mainTypeId){
-          if(data[0]&&data[0].children&&data[0].children.length!=0){
-            this.pageData.queryData.mainTypeId=[data[0].value,data[0].children[0].value]
-          }else{
-            this.pageData.queryData.mainTypeId=[data[0].value]
-          }
-          
-          this.$refs.oTable.refresh()
-        }
-      });
-    },
-    // 重置
-    resetSearch() {
-      // this.commonUtil.clearObj(this.pageData.queryData);
-      let mainTypeId=this.pageData.queryData.mainTypeId
-
-      this.$refs.searchForm.$refs.searchFormRef.resetFields();
-      this.pageData.queryData.mainTypeId=mainTypeId
-      this.$refs.oTable.reload();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-      this.$nextTick(() => {
-        this.$refs["modalRef"].$refs["modalFormRef"].clearValidate(); //校验重置
-      });
-      this.pageData.modalData.source = this.$newSource; //获取默认的资讯来源
-      this.pageData.modalData.isVideo = "0"; //补充isVideo 不会触发watch
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      if (row.imageUrl) {
-        row.fileList = [
-          {
-            url: row.imageUrl,
-          },
-        ];
-      }
-      if (row.videoUrl) {
-        row.fileListVideo = [
-          {
-            url: row.videoUrl,
-            // +'?x-oss-process=video/snapshot,t_10000,m_fast'
-          },
-        ];
-      }
-      if (row.secondTypeId && typeof row.mainTypeId === "string") {
-        row.mainTypeId = [row.mainTypeId, row.secondTypeId];
-      }
-      row.isVideo = row.isVideo + "";
-      this.$nextTick(() => {
-        this.pageData.modalData = JSON.parse(JSON.stringify(row));
-      });
-      // console.log(this.pageData.modalData)
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.pageData.modalConfig.show = false; //关闭modal
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save(item) {
-      this.pageData.modalData.userId = this.$store.state.user.id;
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          console.log(content.content);
-          let data = content.mainTypeId;
-          if (typeof data !== "string") {
-            content.mainTypeId = data[0] ? data[0] : "";
-            content.secondTypeId = data[1] ? data[1] : "";
-          }
-          if (content.isVideo == 0) {
-            content.videoUrl = "";
-          }
-          this.$set(item,'loading',true);
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveNewContent(content).then((res) => {
-              this.$refs.oTable.refresh();
-              this.closeModal();
-            }).finally(()=>this.$set(item,'loading',false))
-          } else {
-            // 审核通过的内容再次编辑会变成未审核
-            // if(content.examineStatus==1){
-            //   content.examineStatus=0
-            // }
-            this.$api.updateRedContentInfo(content).then((res) => {
-              this.$refs.oTable.refresh();
-              this.closeModal();
-            }).finally(()=>this.$set(item,'loading',false))
-          }
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteRedContentInfo(ids).then((res) => {
-            this.$refs.oTable.refresh();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].contentInfoId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteRedContentInfo(ids).then((res) => {
-              this.$refs.oTable.refresh();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange({ records, reserves }) {
-      // console.log(val)
-      this.pageData.selectList = [...records, ...reserves];
-      console.log(123);
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.content-dialog ::v-deep .el-dialog__body {
-  padding: 0px;
-}
-.modal ::v-deep .el-dialog-div{
-  padding-top: 40px;
-  .el-form{
-    width: 910px;
-    margin: 0 auto;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/content/popup/new-content-see.vue b/src/views/modules/content/popup/new-content-see.vue
deleted file mode 100644
index 4c4033c..0000000
--- a/src/views/modules/content/popup/new-content-see.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template >
-  <Modal
-    ref="modalRef"
-    :modalConfig="modalConfig"
-    :modalForm="modalForm"
-    :modalData="modalData"
-  >
-    <div slot="dialog__before" class="examine ">
-        <div class="mb-2">
-            审核状态：<span :style="examineStatusStyle" >{{examineStatus}}</span>
-        </div>
-        <div class="mb-2">审核人员：{{modalData.examineName}}</div>
-        <div class="mb-2">审核原因：{{modalData.examineReason}}</div>
-    </div>
-  </Modal>
-</template>
-<script>
-import Modal from "@/components/common/modal/modal.vue";
-export default {
-  components: {
-    Modal,
-  },
-  props:{
-    //咨询分类
-    contentTypeData:{
-        type:Array,
-        default:()=>[]
-    }
-  },
-  computed:{
-    examineStatus(){
-        switch (this.modalData.examineStatus){
-            case 0:
-                return '未审核';
-            case 1:
-                return '审核通过';
-            case 2:
-                return '审核未通过'
-        }
-    },
-    examineStatusStyle(){
-        switch (this.modalData.examineStatus){
-            case 0:
-                return 'color:gray';
-            case 1:
-                return 'color:green';
-            case 2:
-                return 'color:red'
-        }
-    }
-  },
-  data() {
-    return {
-      modalConfig: {
-        title: "查看", //弹窗标题,值为:新增，查看，编辑
-        show: false, //弹框显示
-        formEditDisabled: false, //编辑弹窗是否可编辑
-        width: "80vw", //弹出框宽度
-        modalRef: "modalRef", //modal标识
-        type: "1", //类型 1新增 2编辑 3保存,
-        fullscreen:true
-      },
-      //modal配置 end
-      //modal表单 start
-      modalForm: [
-        {
-          type: "Input",
-          label: "标题",
-          prop: "title",
-        //   rules: { required: true, maxLength: 100 },
-          width: "900px",
-          disabled: () => true,
-        },
-
-        {
-          type: "Input",
-          label: "副标题",
-          prop: "subtitle",
-        //   rules: { maxLength: 100 },
-          width: "900px",
-          disabled: () => true,
-        },
-        {
-          type: "Cascader",
-          label: "资讯分类",
-          prop: "mainTypeId", //实际传参时进行了处理
-          data: [],
-        //   rules: { required: true },
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Input",
-          label: "资讯来源",
-          prop: "source",
-        //   rules: { required: true, maxLength: 100 },
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Input",
-          label: "作者",
-          prop: "author",
-        //   rules: { maxLength: 100 },
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Input",
-          label: "编辑者",
-          prop: "editorName",
-        //   rules: { maxLength: 100 },
-          width: "300px",
-          disabled: () => true,
-        },
-        // {
-        //   type: "Input",
-        //   label: "外链",
-        //   prop: "contentLink",
-        //   rules: { maxLength: 100 },
-        //   width: "300px",
-        // },
-        {
-          type: "Input",
-          label: "关键词",
-          prop: "keywords",
-        //   rules: { maxLength: 100 },
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Radio",
-          prop: "isVideo",
-          label: "内容类型",
-          radios: [
-            { label: "资讯", value: "0" },
-            { label: "视频", value: "1" },
-          ],
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Img",
-          label: "封面",
-          prop: "imageUrl",
-          width: "300px",
-        },
-        {
-          type: "ShowTinymce",
-          label: "资讯内容",
-          prop: "content",
-        //   rules: { required: true },
-          width: "100%",
-        },
-      ],
-      videoModalForm: [
-        {
-          type: "Video",
-          label: "视频",
-          prop: "videoUrl",
-          width: "900px",
-        },
-      ], //视频专属内容
-      modalData: {},
-    };
-  },
-  methods: {
-    show(row) {
-      if (row.secondTypeId && typeof row.mainTypeId === "string") {
-        row.mainTypeId = [row.mainTypeId, row.secondTypeId];
-      }
-      row.isVideo = row.isVideo + "";
-      let haveVideo=this.modalForm.filter(item=>item.label=='视频').length
-        if(row.isVideo=='1'&&!haveVideo){
-            this.modalForm.splice(8,0,...this.videoModalForm)
-        }
-        else if(row.isVideo=='0'&&haveVideo){
-             this.modalForm.splice(8,1)
-        }
-        console.log(this.modalForm)
-      this.modalData = JSON.parse(JSON.stringify(row));
-      this.modalConfig.show = true;
-    },
-  },
-};
-</script>
-<style  scoped>
-.examine{
-    box-shadow: 0px 0px 5px rgb(240,240,240);
-    margin:10px 20px  20px 20px ;
-    padding:10px
-}
-.mb-2{
-    margin-bottom:10px
-}
->>> .el-input.is-disabled .el-input__inner {
-  background-color: #fff;
-  color: rgb(100, 100, 100);
-  cursor: default;
-}
-
->>> .el-cascader .el-input .el-icon-arrow-down::before {
-  content: "";
-  /* cursor:default; */
-}
->>> .el-input.is-disabled .el-input__icon {
-  cursor: default;
-}
-
->>> .el-form{
-    margin: 20px;
-    box-shadow: 0px 0px 5px rgb(240,240,240);
-    padding-top:20px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/content/popup/swiper-image-see.vue b/src/views/modules/content/popup/swiper-image-see.vue
deleted file mode 100644
index 223c756..0000000
--- a/src/views/modules/content/popup/swiper-image-see.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template >
-  <Modal
-    ref="modalRef"
-    :modalConfig="modalConfig"
-    :modalForm="modalForm"
-    :modalData="modalData"
-  >
-    <div slot="dialog__before" class="examine ">
-        <div class="mb-2">
-            审核状态：<span :style="examineStatusStyle" >{{examineStatus}}</span>
-        </div>
-        <div class="mb-2">审核人员：{{modalData.examineName}}</div>
-        <div class="mb-2">审核原因：{{modalData.examineReason}}</div>
-    </div>
-  </Modal>
-</template>
-<script>
-import Modal from "@/components/common/modal/modal.vue";
-export default {
-  components: {
-    Modal,
-  },
-  props:{
-    //咨询分类
-    contentTypeData:{
-        type:Array,
-        default:()=>[]
-    }
-  },
-  computed:{
-    examineStatus(){
-        switch (this.modalData.examineStatus){
-            case 0:
-                return '未审核';
-            case 1:
-                return '审核通过';
-            case 2:
-                return '审核未通过'
-        }
-    },
-  examineStatusStyle(){
-        switch (this.modalData.examineStatus){
-            case 0:
-                return 'color:gray';
-            case 1:
-                return 'color:green';
-            case 2:
-                return 'color:red'
-        }
-    }
-  },
-  data() {
-    return {
-      modalConfig: {
-        title: "查看", //弹窗标题,值为:新增，查看，编辑
-        show: false, //弹框显示
-        formEditDisabled: false, //编辑弹窗是否可编辑
-        width: "80vw", //弹出框宽度
-        modalRef: "modalRef", //modal标识
-        type: "1", //类型 1新增 2编辑 3保存
-        fullscreen:true
-      },
-      //modal配置 end
-      //modal表单 start
-      modalForm: [
-        {
-          type: "Input",
-          label: "标题",
-          prop: "title",
-        //   rules: { required: true, maxLength: 100 },
-          width: "900px",
-          disabled: () => true,
-        },
-
-        {
-          type: "Input",
-          label: "副标题",
-          prop: "subtitle",
-        //   rules: { maxLength: 100 },
-          width: "900px",
-          disabled: () => true,
-        },
-        {
-          type: "Cascader",
-          label: "资讯分类",
-          prop: "mainTypeId", //实际传参时进行了处理
-          data: [],
-        //   rules: { required: true },
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Input",
-          label: "资讯来源",
-          prop: "source",
-        //   rules: { required: true, maxLength: 100 },
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Input",
-          label: "作者",
-          prop: "author",
-        //   rules: { maxLength: 100 },
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Input",
-          label: "编辑者",
-          prop: "editorName",
-        //   rules: { maxLength: 100 },
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-            type: "InputNumber",
-            label: "排序",
-            prop: "imageSort",
-            // rules: { maxLength: 100 },
-            width: "300px",
-            disabled:()=>true
-          },
-        // {
-        //   type: "Input",
-        //   label: "外链",
-        //   prop: "contentLink",
-        //   rules: { maxLength: 100 },
-        //   width: "300px",
-        // },
-        {
-          type: "Input",
-          label: "关键词",
-          prop: "keywords",
-        //   rules: { maxLength: 100 },
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Radio",
-          prop: "isVideo",
-          label: "内容类型",
-          radios: [
-            { label: "资讯", value: "0" },
-            { label: "视频", value: "1" },
-          ],
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Img",
-          label: "封面",
-          prop: "imageUrl",
-          width: "300px",
-        },
-        {
-          type: "ShowTinymce",
-          label: "资讯内容",
-          prop: "content",
-        //   rules: { required: true },
-          width: "100%",
-        },
-      ],
-      videoModalForm: [
-        {
-          type: "Video",
-          label: "视频",
-          prop: "videoUrl",
-          width: "900px",
-        },
-      ], //视频专属内容
-      modalData: {},
-    };
-  },
-  methods: {
-    show(row) {
-      if (row.secondTypeId && typeof row.mainTypeId === "string") {
-        row.mainTypeId = [row.mainTypeId, row.secondTypeId];
-      }
-      row.isVideo = row.isVideo + "";
-      let haveVideo=this.modalForm.filter(item=>item.label=='视频').length
-        if(row.isVideo=='1'&&!haveVideo){
-            this.modalForm.splice(9,0,...this.videoModalForm)
-        }
-        else if(row.isVideo=='0'&&haveVideo){
-             this.modalForm.splice(9,1)
-        }
-        // console.log(this.modalForm)
-      this.modalData = JSON.parse(JSON.stringify(row));
-      this.modalConfig.show = true;
-    },
-  },
-};
-</script>
-<style  scoped>
-.examine{
-    box-shadow: 0px 0px 5px rgb(240,240,240);
-    margin:10px 20px  20px 20px ;
-    padding:10px
-}
-.mb-2{
-    margin-bottom:10px
-}
->>> .el-input.is-disabled .el-input__inner {
-  background-color: #fff;
-  color: rgb(100, 100, 100);
-  cursor: default;
-}
-
->>> .el-cascader .el-input .el-icon-arrow-down::before {
-  content: "";
-  /* cursor:default; */
-}
->>> .el-input.is-disabled .el-input__icon {
-  cursor: default;
-}
-
->>> .el-form{
-    margin: 20px;
-    box-shadow: 0px 0px 5px rgb(240,240,240);
-    padding-top:20px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/content/swiper-image.vue b/src/views/modules/content/swiper-image.vue
deleted file mode 100644
index 8ea8905..0000000
--- a/src/views/modules/content/swiper-image.vue
+++ /dev/null
@@ -1,838 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      ref="searchForm"
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm>
-    <!-- <cusTable
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable> -->
-    <obj-table-plus
-      style="height: 60vh"
-      @query="searchTableList"
-      ref="oTable"
-      v-model="pageData.tableData"
-      :isPagination="true"
-      :tableCols="pageData.tableCols"
-      :tableProp="tableProp"
-      :toolbarProp="toolbarProp"
-      :toolbarEvent="toolbarEvent"
-      :tableEvent="{
-        'checkbox-change': selectChange,
-        'checkbox-all': selectChange,
-      }"
-    />
-    <modal
-      class="modal"
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-    <comment ref="comment" :parentId="parentId" type="CONTENTIMG" />
-    <see ref="see" />
-  </div>
-</template>
-<script>
-import see from "./popup/swiper-image-see.vue";
-import comment from "@/components/comment/comment.vue";
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal, comment, see },
-  data() {
-    return {
-      //加载动画
-      typeList: [],
-      tableProp: {
-        height: "auto",
-      },
-      toolbarProp: {
-        buttons: [
-          {
-            status: "primary",
-            name: "新增",
-            code: "add",
-          },
-          {
-            status: "danger",
-            name: "批量删除",
-            code: "delBatch",
-          },
-        ],
-      },
-      toolbarEvent: {
-        "button-click": ({ code }) => {
-          if (code == "add") {
-            this.showModal(this.commonConstants.modalType.insert);
-          } else if (code == "delBatch") {
-            this.deleteBatch();
-          }
-        },
-      },
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          {
-            type: "Input",
-            size: "mini",
-            label: "关键字",
-            prop: "searchName",
-            placeholder: "标题、来源、编辑者名称",
-            width: "230px",
-          },
-          {
-            type: "Cascader",
-            label: "资讯分类",
-            size: "mini",
-            prop: "mainTypeId", //实际传参时进行了处理
-            data: [],
-          },
-          {
-            type: "Select",
-            label: "内容类型",
-            prop: "isVideo",
-            size: "mini",
-            options: [
-              {
-                label: "资讯",
-                value: 0,
-              },
-              { label: "视频", value: 1 },
-            ],
-          },
-          {
-            type: "DateTimeRange",
-            size: "mini",
-            label: "发布时间范围",
-            prop: "time",
-          },
-          {
-            type: "Select",
-            label: "审核状态",
-            prop: "examineStatus",
-            default: true,
-            size: "mini",
-            options: [
-              { label: "未审核", value: 0 },
-              { label: "审核通过", value: 1 },
-              { label: "审核未通过", value: 2 },
-            ],
-          },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          contentTypeId: "",
-          time: [],
-          mainTypeId: "",
-          isVideo: 0,
-          examineStatus: "",
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            size: "mini",
-            handle: () => this.$refs.oTable.reload(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            size: "mini",
-            handle: () => {
-              this.$refs.searchForm.$refs.searchFormRef.resetFields();
-              this.$refs.oTable.reload();
-            },
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-          {
-            label: "批量删除",
-            type: "danger",
-            handle: () => this.deleteBatch(),
-            auth: "reportDatasource_batchDelete",
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { type: "checkbox", width: "60px", fixed: "left"  },
-          { title: "标题", field: "title", align: "center"  ,'min-width':160,fixed:'left'},
-          { title: "副标题", field: "subtitle", align: "center"  ,'min-width':100,},
-          { title: "主分类名称", field: "mainTypeName", align: "center" ,'min-width':100, },
-          { title: "子分类名称", field: "secondTypeName", align: "center" ,'min-width':100, },
-          { title: "资讯来源", field: "source", align: "center"  ,'min-width':100,},
-          { title: "编辑者", field: "editorName", align: "center"  ,'min-width':100,},
-          { title: "作者", field: "author", align: "center"  ,'min-width':100,},
-          {
-            title: "封面",
-            type: "jsx",
-            field: "imageUrl",
-            align: "center"
-             ,'min-width':100,
-            render: ({ row }) => {
-              // @/assets/images/noimg.svg
-              return (
-                <el-image
-                  fit="cover"
-                  src={
-                    row.imageUrl
-                      ? row.imageUrl
-                      : require("@/assets/images/noimg.svg")
-                  }
-                ></el-image>
-              );
-            },
-          },
-          // { title: "外链", field: "contentLink", align: "center" },
-          // { title: "阅读数", field: "readNumber", align: "center" },
-          // { title: "点赞数", field: "likeNumber", align: "center" },
-          // { title: "评论数", field: "commentNumber", align: "center" },
-          // { title: "收藏数", field: "collectNumber", align: "center" },
-          { title: "排序", field: "imageSort", align: "center" ,'min-width':100, },
-          {
-            title: "审核状态",
-            field: "createTime",
-            align: "center",
-            // "title-help":{message: '开关开启代表通过审核，关闭代表不通过审核'},
-            type: "jsx"
-             ,'min-width':100,
-            render: ({ row }) => {
-              switch (row.examineStatus) {
-                case 0:
-                  return (
-                    <span>
-                      <span style="color:gray">未审核</span>
-                    </span>
-                  );
-                case 1:
-                  return (
-                    <span>
-                      <span style="color:green">审核通过</span>
-                    </span>
-                  );
-                case 2:
-                  return (
-                    <span>
-                      <span style="color:red">审核未通过</span>
-                    </span>
-                  );
-                default:
-                  return <span></span>;
-              }
-            },
-          },
-          {
-            title: "是否轮播",
-            field: "status",
-            align: "center",
-            type: "switch",
-            'min-width':100,
-            values: [1, 0],
-            change: (row) => {
-              this.$api.updateContentImage(row).then((res) => {
-                this.$refs.oTable.refresh();
-              });
-            },
-          },
-          {
-            title: "操作",
-            field: "operation",
-            align: "center",
-            type: "jsx",
-            fixed: "right",
-            width: "200px",
-            render: ({ row }) => {
-              const com = () => {
-                if (row.examineStatus == 1) {
-                  return (
-                    <el-button
-                      type="text"
-                      size="mini"
-                      onClick={() => {
-                        this.parentId = row.contentInfoId;
-                        this.$refs.comment.modalConfig.show = true;
-                      }}
-                    >
-                      查看评论
-                    </el-button>
-                  );
-                } else if (row.examineStatus == 2) {
-                  return (
-                    <el-button
-                      type="text"
-                      size="mini"
-                      onClick={() =>
-                        this.$confirm("确认重新提交吗？", "提示").then(
-                          (action) => {
-                            if (action == "confirm") {
-                              this.$api
-                                .updateContentImage({
-                                  ...row,
-                                  examineStatus: 0,
-                                })
-                                .then((res) => {
-                                  this.$refs.oTable.refresh();
-                                });
-                            }
-                          }
-                        )
-                      }
-                    >
-                      重新提交
-                    </el-button>
-                  );
-                }
-              };
-              return (
-                <div>
-                  {com()}
-                  <el-button
-                    type="text"
-                    size="mini"
-                    onClick={
-                      () => this.$refs.see.show(row)
-                      // this.showModal(this.commonConstants.modalType.detail, row)
-                    }
-                  >
-                    查看
-                  </el-button>
-                  <el-button
-                    type="text"
-                    size="mini"
-                    onClick={() =>
-                      this.showModal(this.commonConstants.modalType.update, row)
-                    }
-                  >
-                    编辑
-                  </el-button>
-                  <el-button
-                    type="text"
-                    size="mini"
-                    onClick={() => this.deleteOne(row.contentInfoId)}
-                  >
-                    删除
-                  </el-button>
-                </div>
-              );
-            },
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "80vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-          fullscreen:true
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "标题",
-            prop: "title",
-            rules: { required: true, maxLength: 100 },
-            width: "796px",
-          },
-          {
-            type: "Input",
-            label: "副标题",
-            prop: "subtitle",
-            rules: { maxLength: 100 },
-            width: "796px",
-          },
-          {
-            type: "Input",
-            label: "作者",
-            prop: "author",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Tinymce",
-            label: "资讯内容",
-            prop: "content",
-            rules: { required: true },
-            width: "800px",
-            config:{
-              toolbar_sticky:true,
-              // fixed_toolbar_container:"#tinymce_fixed_toolbar",
-              max_height:Infinity,
-              min_height:300,
-              skin:"oxide-sticky",
-              placeholder:"从这里开始填写正文",
-              border:"0 0 0 0"
-            },
-            //覆盖原本的工具栏
-            toolbars:['undo redo  fontsizeselect  bold italic underline strikethrough forecolor backcolor   removeformat subscript superscript blockquote alignleft aligncenter alignright alignjustify lineheightcustom indent2em wlindent    hr  bullist numlist link image charmap    insertdatetime media table emoticons preview print tpImportword wlxiumi' ]
-          },
-          {
-            type: "Cascader",
-            label: "资讯分类",
-            prop: "mainTypeId", //实际传参时进行了处理
-            data: [],
-            rules: { required: true },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "资讯来源",
-            prop: "source",
-            // rules: { required: true, maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "编辑者",
-            prop: "editorName",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          // {
-          //   type: "Input",
-          //   label: "外链",
-          //   prop: "contentLink",
-          //   rules: { maxLength: 100 },
-          //   width: "300px",
-          // },
-          {
-            type: "InputNumber",
-            label: "排序",
-            prop: "imageSort",
-            // rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "关键词",
-            prop: "keywords",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Radio",
-            prop: "isVideo",
-            label: "内容类型",
-            border:true,
-            radios: [
-              { label: "资讯", value: "0" },
-              { label: "视频", value: "1" },
-            ],
-            width: "300px",
-          },
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            rules: { required: true },
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-            drag:true
-          },
-        ],
-        //modal表单 end
-        newModalForm: [
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-            rules: { required: true },
-            drag:true
-          },
-        ], //咨询专属内容
-        videoModalForm: [
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-            drag:true
-          },
-          {
-            type: "Upload",
-            label: "视频",
-            fileUrl: "videoUrl",
-            prop: "fileListVideo",
-            listType: "text",
-            rules: { required: true },
-            width: "300px",
-            isVideo: true,
-            drag:true,
-            accept: ".mp4,.avi,.mov,.rmvb,.flv,.MP4,.AVI,.MOV,.RMVB,.FLV",
-            tips: "请上传视频文件",
-          },
-        ], //视频专属内容
-        //modal 数据 start
-        modalData: {
-          userId: "",
-          source: "",
-          content: "",
-          fileUrl: "",
-          isVideo: "0",
-          mainTypeId: "",
-          fileList: [],
-          status: 0,
-          videoUrl: "",
-          fileListVideo: [],
-          imageSort: 0,
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default",icon:"el-icon-close", handle: () => this.closeModal() },
-          { label: "提交", type: "primary",icon:"el-icon-upload2", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-      },
-      parentId: "",
-    };
-  },
-  watch: {
-    "pageData.modalData.isVideo": {
-      handler: function (val, oldval) {
-        // console.log(val)
-        if (val === "1" && oldval === "0") {
-          this.pageData.modalForm.splice(
-            0 - this.pageData.newModalForm.length,
-            this.pageData.newModalForm.length,
-            ...this.pageData.videoModalForm
-          );
-        } else if (val === "0" && oldval === "1") {
-          this.pageData.modalForm.splice(
-            0 - this.pageData.videoModalForm.length,
-            this.pageData.videoModalForm.length,
-            ...this.pageData.newModalForm
-          );
-        }
-      },
-    },
-    "pageData.modalData.fileList": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.pageData.modalData.imageUrl = "";
-        }
-      },
-    },
-    "pageData.modalData.fileListVideo": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.pageData.modalData.videoUrl = "";
-        }
-      },
-    },
-  },
-  activated() {
-    this.$refs.oTable.refresh();
-    this.searchContentType();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList(pageNo, pageSize) {
-      this.loading = true;
-      // 初始化obj
-      var obj = {};
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      let data = obj.mainTypeId;
-      obj.mainTypeId = data[0] ? data[0] : "";
-      obj.secondTypeId = data[1] ? data[1] : "";
-      delete obj["pageSizeRange"];
-      if (obj.time.length == 2) {
-        obj.startTime = obj.time[0];
-        obj.endTime = obj.time[1];
-      }
-      delete obj.time;
-      // 请求数据
-      this.$api
-        .getContentImage({ ...obj, page: pageNo, limit: pageSize })
-        .then((res) => {
-          this.$refs.oTable.complete(
-            res.data.page.list,
-            res.data.page.totalCount
-          );
-          // this.commonUtil.tableAssignment(
-          //   res.data.page,
-          //   this.pageData.tablePage,
-          //   this.pageData.tableData
-          // );
-          // this.loading = false;
-        });
-    },
-    // 重置
-    resetSearch() {
-      // this.commonUtil.clearObj(this.pageData.queryData);
-      this.$refs.searchForm.$refs.searchFormRef.resetFields();
-      this.$refs.oTable.reload();
-    },
-    searchContentType() {
-      this.$api.getContentTypeList().then((res) => {
-        let data = res.data.list.map((item) => {
-          if (item.mainTypeName === "##") {
-            item.label = "地方";
-          } else {
-            item.label = item.mainTypeName;
-          }
-          item.value = item.mainTypeId;
-          item.children = item.children.map((item1) => {
-            item1.label = item1.secondTypeName;
-            item1.value = item1.secondTypeId;
-            return item1;
-          });
-          if (item.children.length === 0) {
-            delete item.children;
-          }
-          return item;
-        }).filter(item=>item.label!="地方");//移除地方
-        // console.log(data)
-        this.pageData.searchForm[1].data = data;
-        this.pageData.modalForm[4].data = data;
-        this.$refs.see.modalForm[2].data = data;
-      });
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-      this.$nextTick(() => {
-        this.$refs["modalRef"].$refs["modalFormRef"].clearValidate(); //校验重置
-      });
-      this.pageData.modalData.source = this.$newSource; //获取默认的资讯来源
-      this.pageData.modalData.isVideo = "0"; //补充isVideo 不会触发watch
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      if (row.imageUrl) {
-        row.fileList = [
-          {
-            url: row.imageUrl,
-          },
-        ];
-      }
-      if (row.videoUrl) {
-        row.fileListVideo = [
-          {
-            url: row.videoUrl,
-            // +'?x-oss-process=video/snapshot,t_10000,m_fast'
-          },
-        ];
-      }
-      if (row.secondTypeId && typeof row.mainTypeId === "string") {
-        row.mainTypeId = [row.mainTypeId, row.secondTypeId];
-      }
-      row.isVideo = row.isVideo + "";
-      this.$nextTick(() => {
-        this.pageData.modalData = JSON.parse(JSON.stringify(row));
-      });
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.pageData.modalConfig.show = false; //关闭modal
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.pageData.modalData.userId = this.$store.state.user.id;
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          let data = content.mainTypeId;
-          if (typeof data !== "string") {
-            content.mainTypeId = data[0] ? data[0] : "";
-            content.secondTypeId = data[1] ? data[1] : "";
-          }
-          if (content.isVideo == 0) {
-            content.videoUrl = "";
-          }
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveContentImage(content).then((res) => {
-              this.$refs.oTable.refresh();
-            });
-          } else {
-            // 审核通过的内容再次编辑会变成未审核
-            // if(content.examineStatus==1){
-            //   content.examineStatus=0
-            // }
-            this.$api.updateContentImage(content).then((res) => {
-              this.$refs.oTable.refresh();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteContentImage(ids).then((res) => {
-            this.$refs.oTable.refresh();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].contentInfoId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteContentImage(ids).then((res) => {
-              this.$refs.oTable.refresh();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange({ records, reserves }) {
-      // console.log(val)
-      this.pageData.selectList = [...records, ...reserves];
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.content-dialog ::v-deep .el-dialog__body {
-  padding: 0px;
-}
-.modal ::v-deep .el-dialog-div{
-  padding-top: 40px;
-  .el-form{
-    width: 910px;
-    margin: 0 auto;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/data-dictionary/activity-type.vue b/src/views/modules/data-dictionary/activity-type.vue
deleted file mode 100644
index 6bab3f0..0000000
--- a/src/views/modules/data-dictionary/activity-type.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-<!--
- * @Author: cwl
- * @Date: 2021-11-10 19:54:12
- * @LastEditTime: 2022-04-07 21:15:43
- * @LastEditors: chenkangxu
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\data-dictionary\handcopy-type.vue
--->
-<template>
-    <div>
-        <cesTable
-        :isPagination="false"
-        :tableData="tableData"
-        :tableCols="tableCols"
-        :tableHandles="tableHandles"
-        :isIndex="true"
-        :isSelection="true"
-        @selectChange="selectChange"
-        />
-        <!-- 添加编辑弹窗 -->
-        <modal
-        ref="modal"
-        labelWidth="140px"
-        :modalConfig="modalSetting.modalConfig"
-        :modalForm="modalSetting.modalForm"
-        :modalData="modalSetting.modalData"
-        :modalHandles="modalSetting.modalHandles"
-        @closeModal="closeModal('modal')"
-        />
-        <modal
-        ref="sortModal"
-        :modalConfig="sortModalSetting.modalConfig"
-        :modalForm="sortModalSetting.modalForm"
-        :modalData="sortModalSetting.modalData"
-        :modalHandles="sortModalSetting.modalHandles"
-        ></modal>
-    </div>
-</template>
-<script>
-import modal from '../../../components/common/modal/modal.vue'
-import cesTable from '../../../components/common/table/custable.vue'
-export default {
-    components:{
-        cesTable,
-        modal
-    },
-    activated(){
-        this.findAll()
-    },
-    data(){
-        return{
-            tableCols:[
-                {label:'分类名',prop:'activityTypeName'},
-                {label:'分类Id',prop:'activityTypeId'},
-                {label:'修改时间',prop:'createTime'},
-                {label:'操作',type:'button',btnList:[
-                    {label:'编辑',type:'text',handle:(row)=>{
-                        this.commonUtil.showModal(this.modalSetting.modalConfig,this.commonConstants.modalType.update)
-                        this.$nextTick(()=>{
-                            this.modalSetting.modalData=JSON.parse(JSON.stringify(row));
-                        })
-                    }},
-                    {label:'删除',type:'text',handle:(row)=>this.del(row.activityTypeId)}
-                ]}
-            ],
-            selectList:[],
-            tableData:[],
-            tableHandles:[
-                {label:'新增',type:'primary',handle:()=>{
-                      this.commonUtil.showModal(this.modalSetting.modalConfig,this.commonConstants.modalType.insert)
-                    }},
-                {label:'排序',type:'success',handle:()=>{
-                    this.sortModalSetting.modalForm[0].data=this.tableData
-                    this.commonUtil.showModal(this.sortModalSetting.modalConfig,this.commonConstants.modalType.update)
-                }},
-                {label:'批量删除',type:'danger',handle:()=>this.del()},
-            ],
-            modalSetting:{
-                modalConfig:{
-                    show:false,
-                    title:this.commonConstants.modalTitle.insert,
-                    
-                },
-                modalForm:[
-                    {label:'活动/比赛分类名',prop:'activityTypeName',type:'Input',rules:{required:true}},
-                    
-                ],
-                modalData:{
-                    activityTypeName:''
-                },
-                modalHandles:[
-                    {label:'确认',type:'primary',handle:()=>{
-                    
-                        this.$refs.modal.$refs.modalFormRef.validate((valid) => {
-                            if (valid) {
-                                this.save()
-                            } else {
-                                
-                                return false;
-                            }
-                        });
-                        
-                    }}
-                ]
-            },
-            sortModalSetting:{
-                 modalConfig:{
-                    show:false,
-                    title:this.commonConstants.modalTitle.insert,
-                    
-                },
-                modalForm:[
-                    {
-                    type: "Draggable",
-                    label: "拖拽排序",
-                    data: [],
-                    prop: "activityTypeName",
-                    key: "activityTypeSort",
-                    },
-                ],
-                modalData:{
-                    sort:[]
-                },
-                modalHandles:[
-                    {label:'确认',type:'primary',handle:()=>{
-                        this.$api.updateActivitySort(this.sortModalSetting.modalForm[0].data).then(res=>{
-                            this.sortModalSetting.modalConfig.show=false
-                            this.findAll()
-                        })                        
-                    }}
-                ]
-            }
-        }
-    },
-    methods:{
-        findAll(){
-            this.$api.getActivityTypeList().then(res=>{
-                this.tableData=res.data.list
-            })
-        },
-        closeModal(ref){
-            this.resetFields(ref);
-        },
-        resetFields(ref){
-            this.$refs[ref].$refs.modalFormRef.resetFields()
-        },
-        selectChange(val){
-            this.selectList=val
-        },
-        save(){
-            let data=this.modalSetting.modalData
-            if(this.modalSetting.modalConfig.title===this.commonConstants.modalTitle.insert)
-            {
-                this.$api.saveActivityType(data).then(res=>{
-                    this.modalSetting.modalConfig.show=false
-                    this.resetFields('modal')
-                    this.findAll()
-                })
-            }
-            else{
-                this.$api.updateActivitySort([data]).then(res=>{
-                     this.modalSetting.modalConfig.show=false
-                    this.findAll()
-                })
-            }
-        },
-        del(val){
-            let data=[]
-            if(val){
-                data.push(val)
-            }
-            else{
-                data=this.selectList.map(item=>item.activityTypeId)
-            }
-            if (data.length == 0) {
-                this.commonUtil.showMessage({
-                message: this.commonUtil.getMessageFromList(
-                    "error.batchdelete.empty",
-                    null
-                ),
-                type: this.commonConstants.messageType.error,
-                });
-            } 
-            else{
-                let obj = {
-                    messageContent: this.commonUtil.getMessageFromList(
-                        "confirm.delete",
-                        null
-                    ),
-                    };
-                    this.commonUtil.showConfirm(obj).then(()=>{
-                        this.$api.deleteActivitySort(data).then(res=>{
-                            this.findAll()
-                        })
-                    }).catch(() => {
-                    this.commonUtil.showMessage({
-                    message: this.commonUtil.getMessageFromList("error.cancel", null),
-                    type: this.commonConstants.messageType.info,
-                    });
-                });
-            }
-            
-           
-        }
-    }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/modules/data-dictionary/components/add-content.vue b/src/views/modules/data-dictionary/components/add-content.vue
deleted file mode 100644
index bb54761..0000000
--- a/src/views/modules/data-dictionary/components/add-content.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
-  <el-dialog
-    :title="!dataForm.id ? '新增' : '修改'"
-    :close-on-click-modal="false"
-    :before-close="close"
-    :visible.sync="visible"
-  >
-    <el-form ref="form" :model="departmentInfo" label-width="100px" :rules="formRules">
-          <el-form-item label="分类名称:" prop="departmentNumber">
-            <el-input style="width:300px;" v-model="departmentInfo.mainTypeName"></el-input>
-          </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="close">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">添加</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { isEmail, isMobile } from "@/utils/validate";
-export default {
-  data() {
-    var validatePassword = (rule, value, callback) => {
-      if (!this.dataForm.id && !/\S/.test(value)) {
-        callback(new Error("密码不能为空"));
-      } else {
-        callback();
-      }
-    };
-    var validateComfirmPassword = (rule, value, callback) => {
-      if (!this.dataForm.id && !/\S/.test(value)) {
-        callback(new Error("确认密码不能为空"));
-      } else if (this.dataForm.password !== value) {
-        callback(new Error("确认密码与密码输入不一致"));
-      } else {
-        callback();
-      }
-    };
-    var validateEmail = (rule, value, callback) => {
-      if (!isEmail(value)) {
-        callback(new Error("邮箱格式错误"));
-      } else {
-        callback();
-      }
-    };
-    var validateMobile = (rule, value, callback) => {
-      if (!isMobile(value)) {
-        callback(new Error("手机号格式错误"));
-      } else {
-        callback();
-      }
-    };
-    return {
-        // 部门信息
-      departmentInfo: {
-        mainTypeName:"",
-      },
-      roleList: [],
-      dataForm: {
-        id: 0,
-        userName: "",
-        password: "",
-        comfirmPassword: "",
-        salt: "",
-        email: "",
-        mobile: "",
-        roleIdList: [],
-        status: 1,
-      },
-    //   表单校验规则
-      formRules: {
-        mainTypeName: [
-            { required: true, message: '请输入分类名称', trigger: 'blur' }
-        ],
-      },
-    };
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false,
-    },
-    companyStructural: {
-      type: [Object, Array],
-      default: () => {
-        return [];
-      },
-    },
-  },
-  methods: {
-    close(){
-        this.$emit('close')
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs["form"].validate(async (valid) => {
-        if (valid) {
-            let {data}=await this.$api.saveNewContentType(
-                this.departmentInfo.mainTypeName
-            )
-            if (data && data.code === 0) {
-              this.$message({
-                message: "添加成功",
-                type: "success",
-                duration: 1500,
-                onClose: () => {
-                //   关闭窗口
-                this.$emit('close')
-                //   刷新父组件列表
-                  this.$emit("refreshDataList");
-                },
-              });
-            } else {
-              this.$message.error(data.msg);
-            }
-        }
-      });
-    },
-  },
-};
-</script>
diff --git a/src/views/modules/data-dictionary/components/add-foot.vue b/src/views/modules/data-dictionary/components/add-foot.vue
deleted file mode 100644
index d311a6c..0000000
--- a/src/views/modules/data-dictionary/components/add-foot.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
-  <el-dialog
-    :title="!dataForm.id ? '新增' : '修改'"
-    :close-on-click-modal="false"
-    :before-close="close"
-    :visible.sync="visible"
-  >
-    <el-form ref="form" :model="departmentInfo" label-width="100px" :rules="formRules">
-          <el-form-item label="分类名称:" prop="departmentNumber">
-            <el-input style="width:300px;" v-model="departmentInfo.footprintTypeName"></el-input>
-          </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="close">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">添加</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { isEmail, isMobile } from "@/utils/validate";
-export default {
-  data() {
-    var validatePassword = (rule, value, callback) => {
-      if (!this.dataForm.id && !/\S/.test(value)) {
-        callback(new Error("密码不能为空"));
-      } else {
-        callback();
-      }
-    };
-    var validateComfirmPassword = (rule, value, callback) => {
-      if (!this.dataForm.id && !/\S/.test(value)) {
-        callback(new Error("确认密码不能为空"));
-      } else if (this.dataForm.password !== value) {
-        callback(new Error("确认密码与密码输入不一致"));
-      } else {
-        callback();
-      }
-    };
-    var validateEmail = (rule, value, callback) => {
-      if (!isEmail(value)) {
-        callback(new Error("邮箱格式错误"));
-      } else {
-        callback();
-      }
-    };
-    var validateMobile = (rule, value, callback) => {
-      if (!isMobile(value)) {
-        callback(new Error("手机号格式错误"));
-      } else {
-        callback();
-      }
-    };
-    return {
-        // 部门信息
-      departmentInfo: {
-        footprintTypeName:"",
-      },
-      roleList: [],
-      dataForm: {
-        id: 0,
-        userName: "",
-        password: "",
-        comfirmPassword: "",
-        salt: "",
-        email: "",
-        mobile: "",
-        roleIdList: [],
-        status: 1,
-      },
-    //   表单校验规则
-      formRules: {
-        footprintTypeName: [
-            { required: true, message: '请输入分类名称', trigger: 'blur' }
-        ],
-      },
-    };
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false,
-    },
-    companyStructural: {
-      type: [Object, Array],
-      default: () => {
-        return [];
-      },
-    },
-  },
-  methods: {
-    close(){
-        this.$emit('close')
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs["form"].validate(async (valid) => {
-        if (valid) {
-            let {data}=await this.$api.saveNewFootprintType(
-                this.departmentInfo.footprintTypeName
-            )
-            if (data && data.code === 0) {
-              this.$message({
-                message: "添加成功",
-                type: "success",
-                duration: 1500,
-                onClose: () => {
-                //   关闭窗口
-                this.$emit('close')
-                //   刷新父组件列表
-                  this.$emit("refreshDataList");
-                },
-              });
-            } else {
-              this.$message.error(data.msg);
-            }
-        }
-      });
-    },
-  },
-};
-</script>
diff --git a/src/views/modules/data-dictionary/components/add-poetry.vue b/src/views/modules/data-dictionary/components/add-poetry.vue
deleted file mode 100644
index bb54761..0000000
--- a/src/views/modules/data-dictionary/components/add-poetry.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<template>
-  <el-dialog
-    :title="!dataForm.id ? '新增' : '修改'"
-    :close-on-click-modal="false"
-    :before-close="close"
-    :visible.sync="visible"
-  >
-    <el-form ref="form" :model="departmentInfo" label-width="100px" :rules="formRules">
-          <el-form-item label="分类名称:" prop="departmentNumber">
-            <el-input style="width:300px;" v-model="departmentInfo.mainTypeName"></el-input>
-          </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="close">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">添加</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { isEmail, isMobile } from "@/utils/validate";
-export default {
-  data() {
-    var validatePassword = (rule, value, callback) => {
-      if (!this.dataForm.id && !/\S/.test(value)) {
-        callback(new Error("密码不能为空"));
-      } else {
-        callback();
-      }
-    };
-    var validateComfirmPassword = (rule, value, callback) => {
-      if (!this.dataForm.id && !/\S/.test(value)) {
-        callback(new Error("确认密码不能为空"));
-      } else if (this.dataForm.password !== value) {
-        callback(new Error("确认密码与密码输入不一致"));
-      } else {
-        callback();
-      }
-    };
-    var validateEmail = (rule, value, callback) => {
-      if (!isEmail(value)) {
-        callback(new Error("邮箱格式错误"));
-      } else {
-        callback();
-      }
-    };
-    var validateMobile = (rule, value, callback) => {
-      if (!isMobile(value)) {
-        callback(new Error("手机号格式错误"));
-      } else {
-        callback();
-      }
-    };
-    return {
-        // 部门信息
-      departmentInfo: {
-        mainTypeName:"",
-      },
-      roleList: [],
-      dataForm: {
-        id: 0,
-        userName: "",
-        password: "",
-        comfirmPassword: "",
-        salt: "",
-        email: "",
-        mobile: "",
-        roleIdList: [],
-        status: 1,
-      },
-    //   表单校验规则
-      formRules: {
-        mainTypeName: [
-            { required: true, message: '请输入分类名称', trigger: 'blur' }
-        ],
-      },
-    };
-  },
-  props: {
-    visible: {
-      type: Boolean,
-      default: false,
-    },
-    companyStructural: {
-      type: [Object, Array],
-      default: () => {
-        return [];
-      },
-    },
-  },
-  methods: {
-    close(){
-        this.$emit('close')
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs["form"].validate(async (valid) => {
-        if (valid) {
-            let {data}=await this.$api.saveNewContentType(
-                this.departmentInfo.mainTypeName
-            )
-            if (data && data.code === 0) {
-              this.$message({
-                message: "添加成功",
-                type: "success",
-                duration: 1500,
-                onClose: () => {
-                //   关闭窗口
-                this.$emit('close')
-                //   刷新父组件列表
-                  this.$emit("refreshDataList");
-                },
-              });
-            } else {
-              this.$message.error(data.msg);
-            }
-        }
-      });
-    },
-  },
-};
-</script>
diff --git a/src/views/modules/data-dictionary/content-type.vue b/src/views/modules/data-dictionary/content-type.vue
deleted file mode 100644
index 66436be..0000000
--- a/src/views/modules/data-dictionary/content-type.vue
+++ /dev/null
@@ -1,610 +0,0 @@
-
-<template>
-  <div class="_tablepage">
-    <!-- <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm> -->
-    <cusTable
-      :isSelection="false"
-      :isIndex="true"
-      :isPagination="false"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @selectChange="selectChange"
-    ></cusTable>
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-    <modal
-      ref="sortModalRef"
-      :modalConfig="pageData.sortModalConfig"
-      :modalForm="pageData.sortModalForm"
-      :modalData="pageData.sortModalData"
-      :modalHandles="pageData.sortModalHandles"
-      @closeModal="closeSortModal()"
-    ></modal>
-    <modal
-      ref="secModalRef"
-      :modalConfig="pageData.secModalConfig"
-      :modalForm="pageData.secModalForm"
-      :modalData="pageData.secModalData"
-      :modalHandles="pageData.secModalHandles"
-      @closeModal="closeSecModal()"
-    ></modal>
-    <modal
-      ref="secSortModalRef"
-      :modalConfig="pageData.secSortModalConfig"
-      :modalForm="pageData.secSortModalForm"
-      :modalData="pageData.secSortModalData"
-      :modalHandles="pageData.secSortModalHandles"
-      @closeModal="closeSecSortModal()"
-    ></modal>
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  data() {
-    return {
-      typeList: [],
-      pageData: {
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增主类",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-          {
-            label: "主类排序",
-            type: "success",
-            handle: () =>
-              this.showSortModal(this.commonConstants.modalType.update),
-            auth: "reportType_insert",
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "分类名", prop: "mainTypeName", align: "center" ,formatter:(prop,row)=>{
-            if(row[prop]==='##'){
-              return '地方'
-            }
-            else return row[prop]
-          }},
-          { label: "子类名称", prop: "secondTypeName", align: "center" },
-          { label: "修改时间", prop: "createTime", align: "center",formatter:(prop,row)=>{return row[prop]}},
-          {label:"是否显示",prop:"isShow",align:'center',type:"switch",width:"100",change:this.showToggle},
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            type: "button",
-            fixed: "right",
-            btnList: [
-              {
-                label: "新增子类",
-                type: "text",
-                auth: "reportType_getDetail",
-                disabled: (row) => {
-                  return row.children ? false : true;
-                },
-                handle: (row) =>
-                  this.showSecModal(this.commonConstants.modalType.insert, row),
-              },
-              {
-                label: "修改",
-                type: "text",
-                auth: "reportDatasource_update",
-                handle:  (row) =>
-                  row.children
-                    ? this.showModal(this.commonConstants.modalType.update, row)
-                    : this.showSecModal(
-                        this.commonConstants.modalType.update,
-                        row
-                      ),
-              },
-              {
-                label: "子类排序",
-                type: "text",
-                auth: "reportType_getDetail",
-                disabled: (row) => {
-                  return row.children && row.children.length > 1 ? false : true;
-                },
-                handle: (row) =>
-                  this.showSecSortModal(
-                    row.children,
-                    this.commonConstants.modalType.update
-                  ),
-              },
-              {
-                label: "删除",
-                type: "text",
-                auth: "reportDatasource_delete",
-                handle: (row) =>
-                  this.deleteOne(row, row.children ? "main" : "sec"),
-              },
-            ],
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "80vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "主类分类名",
-            prop: "mainTypeName",
-            rules: { required: true },
-            width: "300px",
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          mainTypeName: "",
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-        //modal配置 start
-        sortModalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "700px", //弹出框宽度
-          modalRef: "sortModalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        sortModalForm: [
-          {
-            type: "Draggable",
-            label: "拖拽排序",
-            data: [],
-            prop: "mainTypeName",
-            key: "mainTypeSort",
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        secModalData: {
-          //modal页面数据
-          secondTypeName: "", //类型名称
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        secModalHandles: [
-          {
-            label: "取消",
-            type: "default",
-            handle: () => this.closeSecModal(),
-          },
-          { label: "提交", type: "primary", handle: () => this.saveSec() },
-        ],
-        //modal 按钮 end
-        //modal配置 start
-        secModalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "700px", //弹出框宽度
-          modalRef: "secModalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        secModalForm: [
-          {
-            type: "Input",
-            label: "子类名称",
-            prop: "secondTypeName",
-            rules: { required: true, maxLength: 50 },
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        sortModalData: {
-          //modal页面数据
-          sort: [], //类型名称
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        sortModalHandles: [
-          {
-            label: "取消",
-            type: "default",
-            handle: () => this.closeSortModal(),
-          },
-          { label: "提交", type: "primary", handle: () => this.saveSort() },
-        ],
-        //modal配置 start
-        secSortModalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "700px", //弹出框宽度
-          modalRef: "secSortModalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        secSortModalForm: [
-          {
-            type: "Draggable",
-            label: "拖拽排序",
-            data: [],
-            prop: "secondTypeName",
-            key: "secondTypeId",
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        secSortModalData: {
-          //modal页面数据
-          sort: [], //类型名称
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        secSortModalHandles: [
-          {
-            label: "取消",
-            type: "default",
-            handle: () => this.closeSecSortModal(),
-          },
-          { label: "提交", type: "primary", handle: () => this.saveSecSort() },
-        ],
-        //modal 按钮 end
-        //modal 按钮 end
-      },
-    };
-  },
-  activated() {
-    this.searchTableList();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    async searchTableList() {
-      // 请求数据
-      let res = await this.$api.getContentTypeList()
-      // 初始化树形结构
-      for (let i = 0; i < res.data.list.length; i++) {
-        if (res.data.list[i].children.length > 0) {
-          res.data.list[i].id = res.data.list[i].mainTypeId;
-          for (let j = 0; j < res.data.list[i].children.length; j++) {
-            res.data.list[i].children[j].id =
-              res.data.list[i].children[j].secondTypeId;
-          }
-        } else {
-        }
-      }
-      this.commonUtil.tableAssignment(
-        res.data,
-        this.pageData.tablePage,
-        this.pageData.tableData
-      );
-    },
-    // 重置
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      this.searchTableList();
-    },
-    showSecModal(type, row) {
-      // 展示子类
-      this.commonUtil.showModal(this.pageData.secModalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row, "sec");
-      } else {
-        this.pageData.secModalData.mainTypeId = row.mainTypeId;
-      }
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    showSortModal(type) {
-      this.pageData.sortModalForm[0].data = this.pageData.tableData;
-      this.commonUtil.showModal(this.pageData.sortModalConfig, type);
-    },
-    showSecSortModal(list, type) {
-      this.pageData.secSortModalForm[0].data = list;
-      this.commonUtil.showModal(this.pageData.secSortModalConfig, type);
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row,type) {
-      if (type == "sec") {
-        this.pageData.secModalData = JSON.parse(JSON.stringify(row)); //数据赋值
-      } else {
-        this.pageData.modalData = JSON.parse(JSON.stringify(row)); //数据赋值
-      }
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.$refs["modalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.modalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-    },
-    closeSortModal() {
-      this.$refs["sortModalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.sortModalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.sortModalData); //清空modalData
-    },
-    closeSecModal() {
-      this.$refs["secModalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.secModalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.secModalData); //清空modalData
-    },
-    closeSecSortModal() {
-      this.$refs["secSortModalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.secSortModalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.secSortModalData); //清空modalData
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            console.log(content);
-            this.$api.saveNewContentType(content).then((res) => {
-              this.searchTableList();
-            });
-          } else {
-            let list = [content];
-            this.$api.updateContentMainType(content).then((res) => {
-              this.searchTableList();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    async saveSort() {
-      let { data } = await this.$api.updateTypeSort(
-        this.pageData.sortModalForm[0].data
-      );
-      this.closeSortModal();
-      this.searchTableList();
-    },
-    saveSec() {
-      this.$refs["secModalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          if (
-            this.pageData.secModalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api
-              .saveNewContentSecondType(
-                this.pageData.secModalData.secondTypeName,
-                this.pageData.secModalData.mainTypeId
-              )
-              .then((res) => {
-                this.closeSecModal();
-                this.searchTableList();
-              });
-          } else {
-            this.$api.updateContentSecType(this.pageData.secModalData).then((res) => {
-              this.closeSecModal();
-              this.searchTableList();
-            });
-          }
-        } else {
-          return false;
-        }
-      });
-    },
-    async saveSecSort() {
-      let { data } = await this.$api.updateContentSecSort(
-        this.pageData.secSortModalForm[0].data
-      );
-      this.closeSecSortModal();
-      this.searchTableList();
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(row, type) {
-      let array = [];
-      if (type == "main") {
-        array[0] = row.mainTypeId;
-        this.$msgbox({
-          title: `确认删除？`,
-          message: "此操作将永久删除父类以及子类",
-          showCancelButton: true,
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          callback: async (action) => {
-            if (action === "confirm") {
-              this.$api.deleteType(array).then((res) => {
-                if (res.data.code == 0) {
-                  this.commonUtil.showMessage({
-                    message: "删除成功",
-                    type: this.commonConstants.messageType.success,
-                  });
-                  this.searchTableList();
-                } else {
-                  this.commonUtil.showMessage({
-                    message: res.data.msg,
-                    type: this.commonConstants.messageType.error,
-                  });
-                }
-              });
-            } else {
-              this.$message({
-                type: "info",
-                message: "已取消删除",
-              });
-            }
-          },
-        });
-      } else {
-        array[0] = row.secondTypeId;
-        this.$msgbox({
-          title: `确认删除？`,
-          message: "此操作将永久该分类",
-          showCancelButton: true,
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          callback: async (action) => {
-            if (action === "confirm") {
-              this.$api.deleteContentSecType(array).then((res) => {
-                if (res.data.code == 0) {
-                  this.searchTableList();
-                }
-              });
-            } else {
-              this.$message({
-                type: "info",
-                message: "已取消删除",
-              });
-            }
-          },
-        });
-      }
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].mainTypeId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteType(ids).then((res) => {
-              this.searchTableList();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-      rows = []
-    },
-    //是否展示的切换
-    showToggle(row){
-      if(row.secondTypeId){
-        this.$api.updateContentSecType({secondTypeId:row.secondTypeId,isShow:row.isShow})
-        .catch(err=>{
-          row.isShow=!row.isShow;
-        })
-      }else{
-        this.$api.updateContentMainType({mainTypeId:row.mainTypeId,isShow:row.isShow})
-        .catch(err=>{
-          row.isShow=!row.isShow;
-        })
-      }
-    }
-  },
-};
-</script>
-<style lang="scss" scoped>
-.content-dialog ::v-deep .el-dialog__body {
-  padding: 0px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/data-dictionary/course-theme.vue b/src/views/modules/data-dictionary/course-theme.vue
deleted file mode 100644
index 57147be..0000000
--- a/src/views/modules/data-dictionary/course-theme.vue
+++ /dev/null
@@ -1,447 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-      :hasBottomButton="false"
-    >
-    </searchForm>
-    <!-- <cusTable
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="false"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @selectChange="selectChange"
-    ></cusTable> -->
-    <obj-table-plus
-      style="height: 60vh"
-      @query="searchTableList"
-      ref="oTable"
-      v-model="pageData.tableData"
-      :isPagination="true"
-      :tableCols="pageData.tableCols"
-      :toolbarProp="toolbarProp"
-      :toolbarEvent="toolbarEvent"
-      :tableProp="tableProp"
-      :tableEvent="{ 'checkbox-change': selectChange ,'checkbox-all':selectChange}"
-    />
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-    <modal
-      ref="sortModalRef"
-      :modalConfig="pageData.sortModalConfig"
-      :modalForm="pageData.sortModalForm"
-      :modalData="pageData.sortModalData"
-      :modalHandles="pageData.sortModalHandles"
-      @closeModal="closeSortModal()"
-    ></modal>
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  data() {
-    return {
-      typeList: [],
-      tableProp: {
-        height: "auto",
-      },
-      toolbarProp: {
-        buttons: [
-          {
-            name: "新增",
-            status: "primary",
-            code: "新增",
-          },
-          {
-            name: "排序",
-            status: "success",
-            code: "排序",
-          },
-          {
-            name: "批量删除",
-            status: "danger",
-            code: "批量删除",
-          },
-        ],
-      },
-      toolbarEvent: {
-        "button-click": ({ code }) => {
-          if (code == "新增") {
-            this.showModal(this.commonConstants.modalType.insert);
-          } else if (code == "排序") {
-            this.showSortModal(this.commonConstants.modalType.update);
-          } else if (code == "批量删除") {
-            this.deleteBatch();
-          }
-        },
-      },
-      pageData: {
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-          {
-            label: "排序",
-            type: "success",
-            handle: () =>
-              this.showSortModal(this.commonConstants.modalType.update),
-            auth: "reportType_insert",
-          },
-          {
-            label: "批量删除",
-            type: "danger",
-            handle: () => this.deleteBatch(),
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-            {type:'checkbox',width:50},
-          { title: "分类名", field: "themeName", align: "center" },
-          { title: "类型", field: "courseType", align: "center" },
-          { title: "修改时间", field: "createTime", align: "center" },
-          {
-            title: "操作",
-            align: "center",
-            type: "button",
-            fixed: "right",
-            btnList: [
-              {
-                label: "编辑",
-                type: "text",
-                auth: "reportDatasource_update",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.update, row),
-              },
-              {
-                label: "删除",
-                type: "text",
-                auth: "reportDatasource_delete",
-                handle: (row) => this.deleteOne(row.courseThemeId),
-              },
-            ],
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-        //   width: "80vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "分类名称",
-            prop: "themeName",
-            rules: { required: true },
-            width: "300px",
-          },
-          {
-            type:'Select',
-            label:'类型',
-            prop:'courseType',
-            width:'300px',
-            rules: { required: true },
-            options:this.commonConstants.courseType,
-          }
-        ],
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          themeName: "",
-          courseType:''
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-        //modal配置 start
-        sortModalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "700px", //弹出框宽度
-          modalRef: "sortModalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        sortModalForm: [
-          {
-            type: "Draggable",
-            label: "拖拽排序",
-            data: [],
-            prop: "themeName",
-            key: "themeName",
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        sortModalData: {
-          //modal页面数据
-          sort: [], //类型名称
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        sortModalHandles: [
-          {
-            label: "取消",
-            type: "default",
-            handle: () => this.closeSortModal(),
-          },
-          { label: "提交", type: "primary", handle: () => this.saveSort() },
-        ],
-        //modal 按钮 end
-
-        searchForm: [
-          {
-            label: "课程类型",
-            type: "Select",
-            prop: "courseType",
-            options: this.commonConstants.courseType,
-          },
-          {
-            name: "查询",
-            style: "primary",
-            type: "Button",
-            handle: () => {
-              this.$refs.oTable.reload();
-            },
-          },
-        ],
-        queryData: {
-          courseType: "红心向党",
-        },
-      },
-    };
-  },
-  activated() {
-    this.$refs.oTable.refresh();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList(pageNo,pageSize) {
-      // 请求数据
-      this.$api.courseThemeList({courseType:this.pageData.queryData.courseType,page:pageNo,limit:pageSize}).then((res) => {
-        console.log(res.data.list);
-        this.$refs.oTable.complete(res.data.page.list,res.data.page.totalCount)
-      });
-      this.pageData.selectList = new Array();
-    },
-    // 重置
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      this.searchTableList();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    showSortModal(type) {
-      this.pageData.sortModalForm[0].data = this.pageData.tableData;
-      this.commonUtil.showModal(this.pageData.sortModalConfig, type);
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      this.pageData.modalData = JSON.parse(JSON.stringify(row));
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.$refs["modalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.modalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-    },
-    closeSortModal() {
-      this.$refs["sortModalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.sortModalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.sortModalData); //清空modalData
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-        //   console.log(content)
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            console.log(content);
-            this.$api.courseThemeSave(content).then((res) => {
-              this.$refs.oTable.refresh()
-               this.closeModal();
-            });
-          } else {
-            this.$api.courseThemeUpdate(content).then((res) => {
-               this.$refs.oTable.refresh()
-                this.closeModal();
-            });
-          }
-         
-        } else {
-          return false;
-        }
-      });
-    },
-    async saveSort() {
-      let { data } = await this.$api.courseThemeSort(
-        this.pageData.sortModalForm[0].data
-      );
-      this.closeSortModal();
-      this.$refs.oTable.refresh()
-    //   this.searchTableList();
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.courseThemeDelete(ids).then((res) => {
-            this.$refs.oTable.refresh();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        console.log(this.pageData.selectList);
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].courseThemeId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            console.log(ids);
-            this.$api.courseThemeDelete(ids).then((res) => {
-              this.$refs.oTable.refresh();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-     selectChange({records,reserves}) {
-      // console.log(val)
-      this.pageData.selectList = [...records,...reserves];
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.content-dialog ::v-deep .el-dialog__body {
-  padding: 0px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/data-dictionary/footprint-type.vue b/src/views/modules/data-dictionary/footprint-type.vue
deleted file mode 100644
index c165993..0000000
--- a/src/views/modules/data-dictionary/footprint-type.vue
+++ /dev/null
@@ -1,374 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <!-- <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm> -->
-    <cusTable
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="false"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @selectChange="selectChange"
-    ></cusTable>
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-    <modal
-      ref="sortModalRef"
-      :modalConfig="pageData.sortModalConfig"
-      :modalForm="pageData.sortModalForm"
-      :modalData="pageData.sortModalData"
-      :modalHandles="pageData.sortModalHandles"
-      @closeModal="closeSortModal()"
-    ></modal>
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  data() {
-    return {
-      typeList: [],
-      pageData: {
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-          {
-            label: "排序",
-            type: "success",
-            handle: () =>
-              this.showSortModal(this.commonConstants.modalType.update),
-            auth: "reportType_insert",
-          },
-          {
-            label: "批量删除",
-            type: "danger",
-            handle: () => this.deleteBatch(),
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "分类名", prop: "footprintTypeName", align: "center" },
-          { label: "分类ID", prop: "footprintTypeId", align: "center" },
-          { label: "修改时间", prop: "createTime", align: "center" },
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            type: "button",
-            fixed: "right",
-            btnList: [
-              {
-                label: "编辑",
-                type: "text",
-                auth: "reportDatasource_update",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.update, row),
-              },
-              {
-                label: "删除",
-                type: "text",
-                auth: "reportDatasource_delete",
-                handle: (row) => this.deleteOne(row.footprintTypeId),
-              },
-            ],
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "80vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "打卡地分类",
-            prop: "footprintTypeName",
-            rules: { required: true },
-            width: "300px",
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          footprintTypeName: "",
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-        //modal配置 start
-        sortModalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "700px", //弹出框宽度
-          modalRef: "sortModalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        sortModalForm: [
-          {
-            type: "Draggable",
-            label: "拖拽排序",
-            data: [],
-            prop: "footprintTypeName",
-            key: "footprintTypeSort",
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        sortModalData: {
-          //modal页面数据
-          sort: [], //类型名称
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        sortModalHandles: [
-          {
-            label: "取消",
-            type: "default",
-            handle: () => this.closeSortModal(),
-          },
-          { label: "提交", type: "primary", handle: () => this.saveSort() },
-        ],
-        //modal 按钮 end
-      },
-    };
-  },
-  activated() {
-    this.searchTableList();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList() {
-      // 请求数据
-      this.$api.getListByParams().then((res) => {
-        console.log(res.data.list);
-        this.commonUtil.tableAssignment(
-          res.data,
-          this.pageData.tablePage,
-          this.pageData.tableData
-        );
-      });
-      this.pageData.selectList = new Array
-    },
-    // 重置
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      this.searchTableList();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    showSortModal(type) {
-      this.pageData.sortModalForm[0].data = this.pageData.tableData;
-      this.commonUtil.showModal(this.pageData.sortModalConfig, type);
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      this.pageData.modalData = JSON.parse(JSON.stringify(row));
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.$refs["modalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.modalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-    },
-    closeSortModal() {
-      this.$refs["sortModalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.sortModalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.sortModalData); //清空modalData
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            console.log(content);
-            this.$api.saveNewFootprintType(content).then((res) => {
-              this.searchTableList();
-            });
-          } else {
-            let list = [content];
-            this.$api.updateFootprintTypeSort(list).then((res) => {
-              this.searchTableList();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    async saveSort() {
-      let { data } = await this.$api.updateFootprintTypeSort(
-        this.pageData.sortModalForm[0].data
-      );
-      this.closeSortModal();
-      this.searchTableList();
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteFootprint(ids).then((res) => {
-            this.searchTableList();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        console.log(this.pageData.selectList);
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].footprintTypeId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            console.log(ids);
-            this.$api.deleteFootprint(ids).then((res) => {
-              this.searchTableList();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange(rows) {
-      console.log(rows);
-      this.pageData.selectList = rows;
-      rows = []
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.content-dialog ::v-deep .el-dialog__body {
-  padding: 0px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/data-dictionary/handcopy-type.vue b/src/views/modules/data-dictionary/handcopy-type.vue
deleted file mode 100644
index 943a935..0000000
--- a/src/views/modules/data-dictionary/handcopy-type.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-<!--
- * @Author: cwl
- * @Date: 2021-11-10 19:54:12
- * @LastEditTime: 2022-04-07 21:15:29
- * @LastEditors: chenkangxu
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\data-dictionary\handcopy-type.vue
--->
-<template>
-    <div>
-        <cesTable
-        :isPagination="false"
-        :tableData="tableData"
-        :tableCols="tableCols"
-        :tableHandles="tableHandles"
-        :isIndex="true"
-        :isSelection="true"
-        @selectChange="selectChange"
-        />
-        <!-- 添加编辑弹窗 -->
-        <modal
-        ref="modal"
-        labelWidth="120px"
-        :modalConfig="modalSetting.modalConfig"
-        :modalForm="modalSetting.modalForm"
-        :modalData="modalSetting.modalData"
-        :modalHandles="modalSetting.modalHandles"
-        @closeModal="closeModal('modal')"
-        />
-        <modal
-        ref="sortModal"
-        :modalConfig="sortModalSetting.modalConfig"
-        :modalForm="sortModalSetting.modalForm"
-        :modalData="sortModalSetting.modalData"
-        :modalHandles="sortModalSetting.modalHandles"
-        ></modal>
-    </div>
-</template>
-<script>
-import modal from '../../../components/common/modal/modal.vue'
-import cesTable from '../../../components/common/table/custable.vue'
-export default {
-    components:{
-        cesTable,
-        modal
-    },
-    activated(){
-        this.findAll()
-    },
-    data(){
-        return{
-            tableCols:[
-                {label:'分类名',prop:'handCopyTypeName'},
-                {label:'分类Id',prop:'handCopyTypeId'},
-                {label:'修改时间',prop:'createTime'},
-                {label:'操作',type:'button',btnList:[
-                    {label:'编辑',type:'text',handle:(row)=>{
-                        this.commonUtil.showModal(this.modalSetting.modalConfig,this.commonConstants.modalType.update)
-                        this.$nextTick(()=>{
-                            this.modalSetting.modalData=JSON.parse(JSON.stringify(row));
-                        })
-                    }},
-                    {label:'删除',type:'text',handle:(row)=>this.del(row.handCopyTypeId)}
-                ]}
-            ],
-            selectList:[],
-            tableData:[],
-            tableHandles:[
-                {label:'新增',type:'primary',handle:()=>{
-                      this.commonUtil.showModal(this.modalSetting.modalConfig,this.commonConstants.modalType.insert)
-                    }},
-                {label:'排序',type:'success',handle:()=>{
-                    this.sortModalSetting.modalForm[0].data=this.tableData
-                    this.commonUtil.showModal(this.sortModalSetting.modalConfig,this.commonConstants.modalType.update)
-                }},
-                {label:'批量删除',type:'danger',handle:()=>this.del()},
-            ],
-            modalSetting:{
-                modalConfig:{
-                    show:false,
-                    title:this.commonConstants.modalTitle.insert,
-                    
-                },
-                modalForm:[
-                    {label:'手抄报分类名',prop:'handCopyTypeName',type:'Input',rules:{required:true}},
-                    
-                ],
-                modalData:{
-                    handCopyTypeName:''
-                },
-                modalHandles:[
-                    {label:'确认',type:'primary',handle:()=>{
-                    
-                        this.$refs.modal.$refs.modalFormRef.validate((valid) => {
-                            if (valid) {
-                                this.save()
-                            } else {
-                                
-                                return false;
-                            }
-                        });
-                        
-                    }}
-                ]
-            },
-            sortModalSetting:{
-                 modalConfig:{
-                    show:false,
-                    title:this.commonConstants.modalTitle.insert,
-                    
-                },
-                modalForm:[
-                    {
-                    type: "Draggable",
-                    label: "拖拽排序",
-                    data: [],
-                    prop: "handCopyTypeName",
-                    key: "handCopyTypeSort",
-                    },
-                ],
-                modalData:{
-                    sort:[]
-                },
-                modalHandles:[
-                    {label:'确认',type:'primary',handle:()=>{
-                        this.$api.updateHandCopySort(this.sortModalSetting.modalForm[0].data).then(res=>{
-                            this.sortModalSetting.modalConfig.show=false
-                            this.findAll()
-                        })                        
-                    }}
-                ]
-            }
-        }
-    },
-    methods:{
-        findAll(){
-            this.$api.getHandCopyTypeList().then(res=>{
-                this.tableData=res.data.list
-            })
-        },
-        closeModal(ref){
-            this.resetFields(ref);
-        },
-        resetFields(ref){
-            this.$refs[ref].$refs.modalFormRef.resetFields()
-        },
-        selectChange(val){
-            this.selectList=val
-        },
-        save(){
-            let data=this.modalSetting.modalData
-            if(this.modalSetting.modalConfig.title===this.commonConstants.modalTitle.insert)
-            {
-                this.$api.saveHandCopyType(data).then(res=>{
-                    this.modalSetting.modalConfig.show=false
-                    this.resetFields('modal')
-                    this.findAll()
-                })
-            }
-            else{
-                this.$api.updateHandCopySort([data]).then(res=>{
-                     this.modalSetting.modalConfig.show=false
-                    this.findAll()
-                })
-            }
-        },
-        del(val){
-            let data=[]
-            if(val){
-                data.push(val)
-            }
-            else{
-                data=this.selectList.map(item=>item.handCopyTypeId)
-            }
-            if (data.length == 0) {
-                this.commonUtil.showMessage({
-                message: this.commonUtil.getMessageFromList(
-                    "error.batchdelete.empty",
-                    null
-                ),
-                type: this.commonConstants.messageType.error,
-                });
-            } 
-            else{
-                let obj = {
-                    messageContent: this.commonUtil.getMessageFromList(
-                        "confirm.delete",
-                        null
-                    ),
-                    };
-                    this.commonUtil.showConfirm(obj).then(()=>{
-                        this.$api.deleteHandCopySort(data).then(res=>{
-                            this.findAll()
-                        })
-                    }).catch(() => {
-                    this.commonUtil.showMessage({
-                    message: this.commonUtil.getMessageFromList("error.cancel", null),
-                    type: this.commonConstants.messageType.info,
-                    });
-                });
-            }
-            
-           
-        }
-    }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/modules/data-dictionary/match-type.vue b/src/views/modules/data-dictionary/match-type.vue
deleted file mode 100644
index 0c9b3ac..0000000
--- a/src/views/modules/data-dictionary/match-type.vue
+++ /dev/null
@@ -1,197 +0,0 @@
-<template>
-    <div>
-        <cesTable
-        :isPagination="false"
-        :tableData="tableData"
-        :tableCols="tableCols"
-        :tableHandles="tableHandles"
-        :isIndex="true"
-        :isSelection="true"
-        @selectChange="selectChange"
-        />
-        <!-- 添加编辑弹窗 -->
-        <modal
-        ref="modal"
-        labelWidth="140px"
-        :modalConfig="modalSetting.modalConfig"
-        :modalForm="modalSetting.modalForm"
-        :modalData="modalSetting.modalData"
-        :modalHandles="modalSetting.modalHandles"
-        @closeModal="closeModal('modal')"
-        />
-        <modal
-        ref="sortModal"
-        :modalConfig="sortModalSetting.modalConfig"
-        :modalForm="sortModalSetting.modalForm"
-        :modalData="sortModalSetting.modalData"
-        :modalHandles="sortModalSetting.modalHandles"
-        ></modal>
-    </div>
-</template>
-<script>
-import modal from '../../../components/common/modal/modal.vue'
-import cesTable from '../../../components/common/table/custable.vue'
-export default {
-    components:{
-        cesTable,
-        modal
-    },
-    activated(){
-        this.findAll()
-    },
-    data(){
-        return{
-            tableCols:[
-                {label:'分类名',prop:'activityTypeName'},
-                {label:'分类Id',prop:'activityTypeId'},
-                {label:'修改时间',prop:'createTime'},
-                {label:'操作',type:'button',btnList:[
-                    {label:'编辑',type:'text',handle:(row)=>{
-                        this.commonUtil.showModal(this.modalSetting.modalConfig,this.commonConstants.modalType.update)
-                        this.$nextTick(()=>{
-                            this.modalSetting.modalData=JSON.parse(JSON.stringify(row));
-                        })
-                    }},
-                    {label:'删除',type:'text',handle:(row)=>this.del(row.activityTypeId)}
-                ]}
-            ],
-            selectList:[],
-            tableData:[],
-            tableHandles:[
-                {label:'新增',type:'primary',handle:()=>{
-                      this.commonUtil.showModal(this.modalSetting.modalConfig,this.commonConstants.modalType.insert)
-                    }},
-                {label:'排序',type:'success',handle:()=>{
-                    this.sortModalSetting.modalForm[0].data=this.tableData
-                    this.commonUtil.showModal(this.sortModalSetting.modalConfig,this.commonConstants.modalType.update)
-                }},
-                {label:'批量删除',type:'danger',handle:()=>this.del()},
-            ],
-            modalSetting:{
-                modalConfig:{
-                    show:false,
-                    title:this.commonConstants.modalTitle.insert,
-                    
-                },
-                modalForm:[
-                    {label:'活动/比赛分类名',prop:'activityTypeName',type:'Input',rules:{required:true}},
-                    
-                ],
-                modalData:{
-                    activityTypeName:''
-                },
-                modalHandles:[
-                    {label:'确认',type:'primary',handle:()=>{
-                    
-                        this.$refs.modal.$refs.modalFormRef.validate((valid) => {
-                            if (valid) {
-                                this.save()
-                            } else {
-                                
-                                return false;
-                            }
-                        });
-                        
-                    }}
-                ]
-            },
-            sortModalSetting:{
-                 modalConfig:{
-                    show:false,
-                    title:this.commonConstants.modalTitle.insert,
-                    
-                },
-                modalForm:[
-                    {
-                    type: "Draggable",
-                    label: "拖拽排序",
-                    data: [],
-                    prop: "activityTypeName",
-                    key: "activityTypeSort",
-                    },
-                ],
-                modalData:{
-                    sort:[]
-                },
-                modalHandles:[
-                    {label:'确认',type:'primary',handle:()=>{
-                        this.$api.updateMatchSort(this.sortModalSetting.modalForm[0].data).then(res=>{
-                            this.sortModalSetting.modalConfig.show=false
-                            this.findAll()
-                        })                        
-                    }}
-                ]
-            }
-        }
-    },
-    methods:{
-        findAll(){
-            this.$api.getMatchTypeList().then(res=>{
-                this.tableData=res.data.list
-            })
-        },
-        closeModal(ref){
-            this.resetFields(ref);
-        },
-        resetFields(ref){
-            this.$refs[ref].$refs.modalFormRef.resetFields()
-        },
-        selectChange(val){
-            this.selectList=val
-        },
-        save(){
-            let data=this.modalSetting.modalData
-            if(this.modalSetting.modalConfig.title===this.commonConstants.modalTitle.insert)
-            {
-                this.$api.saveMatchType(data).then(res=>{
-                    this.modalSetting.modalConfig.show=false
-                    this.resetFields('modal')
-                    this.findAll()
-                })
-            }
-            else{
-                this.$api.updateMatchSort([data]).then(res=>{
-                     this.modalSetting.modalConfig.show=false
-                    this.findAll()
-                })
-            }
-        },
-        del(val){
-            let data=[]
-            if(val){
-                data.push(val)
-            }
-            else{
-                data=this.selectList.map(item=>item.activityTypeId)
-            }
-            if (data.length == 0) {
-                this.commonUtil.showMessage({
-                message: this.commonUtil.getMessageFromList(
-                    "error.batchdelete.empty",
-                    null
-                ),
-                type: this.commonConstants.messageType.error,
-                });
-            } 
-            else{
-                let obj = {
-                    messageContent: this.commonUtil.getMessageFromList(
-                        "confirm.delete",
-                        null
-                    ),
-                    };
-                    this.commonUtil.showConfirm(obj).then(()=>{
-                        this.$api.deleteMatchSort(data).then(res=>{
-                            this.findAll()
-                        })
-                    }).catch(() => {
-                    this.commonUtil.showMessage({
-                    message: this.commonUtil.getMessageFromList("error.cancel", null),
-                    type: this.commonConstants.messageType.info,
-                    });
-                });
-            }
-        }
-    }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/modules/data-dictionary/poetry-type.vue b/src/views/modules/data-dictionary/poetry-type.vue
deleted file mode 100644
index a77f337..0000000
--- a/src/views/modules/data-dictionary/poetry-type.vue
+++ /dev/null
@@ -1,574 +0,0 @@
-<!--
- * @Author: ym
- * @Date: 2021-09-21 12:30:58
- * @LastEditTime: 2022-04-07 21:10:05
- * @LastEditors: chenkangxu
- * @Description: In User Settings Edit
- * @FilePath: \background-front-end\src\views\modules\data-dictionary\poetry-type.vue
--->
-
-<template>
-  <div class="_tablepage">
-    <!-- <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm> -->
-    <cusTable
-      :isSelection="false"
-      :isIndex="true"
-      :isPagination="false"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-    ></cusTable>
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-    <modal
-      ref="secModalRef"
-      :modalConfig="pageData.secModalConfig"
-      :modalForm="pageData.secModalForm"
-      :modalData="pageData.secModalData"
-      :modalHandles="pageData.secModalHandles"
-      @closeModal="closeSecModal()"
-    ></modal>
-    <modal
-      ref="sortModalRef"
-      :modalConfig="pageData.sortModalConfig"
-      :modalForm="pageData.sortModalForm"
-      :modalData="pageData.sortModalData"
-      :modalHandles="pageData.sortModalHandles"
-      @closeModal="closeSortModal()"
-    ></modal>
-    <modal
-      ref="secSortModalRef"
-      :modalConfig="pageData.secSortModalConfig"
-      :modalForm="pageData.secSortModalForm"
-      :modalData="pageData.secSortModalData"
-      :modalHandles="pageData.secSortModalHandles"
-      @closeModal="closeSecSortModal()"
-    ></modal>
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  data() {
-    return {
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          { type: "Input", label: "类型名称", prop: "reportTypeName" },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          reportTypeName: "", //类型名称
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            handle: () => this.searchTableList(),
-            auth: "reportType_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportType_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增主类",
-            type: "primary",
-            handle: () =>
-              this.showModal(this.commonConstants.modalType.insert, "main"),
-            auth: "reportType_insert",
-          },
-          {
-            label: "主类排序",
-            type: "success",
-            handle: () =>
-              this.showSortModal(this.commonConstants.modalType.update),
-            auth: "reportType_insert",
-          },
-          // {
-          //   label: "批量删除",
-          //   type: "danger",
-          //   handle: () => this.deleteBatch(),
-          //   auth: "reportType_batchDelete",
-          // },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 10,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "主类名称", prop: "mainTypeName", align: "center" },
-          { label: "子类名称", prop: "secondTypeName", align: "center" },
-          { label: "修改时间", prop: "createTime", align: "center",formatter:(prop,row)=>{return row[prop]}},
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            type: "button",
-            btnList: [
-              {
-                label: "新增子类",
-                type: "text",
-                auth: "reportType_getDetail",
-                disabled: (row) => {
-                  return row.children ? false : true;
-                },
-                handle: (row) =>
-                  this.showSecModal(this.commonConstants.modalType.insert, row),
-              },
-              {
-                label: "修改",
-                type: "text",
-                auth: "reportType_update",
-                handle: (row) =>
-                  row.children
-                    ? this.showModal(this.commonConstants.modalType.update, row)
-                    : this.showSecModal(
-                        this.commonConstants.modalType.update,
-                        row
-                      ),
-              },
-              {
-                label: "子类排序",
-                type: "text",
-                auth: "reportType_getDetail",
-                disabled: (row) => {
-                  return row.children && row.children.length > 1 ? false : true;
-                },
-                handle: (row) =>
-                  this.showSecSortModal(
-                    row.children,
-                    this.commonConstants.modalType.update
-                  ),
-              },
-              {
-                label: "删除",
-                type: "text",
-                auth: "reportType_delete",
-                handle: (row) =>
-                  this.deleteOne(row, row.children ? "main" : "sec"),
-              },
-            ],
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "700px", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "主类名称",
-            prop: "mainTypeName",
-            rules: { required: true, maxLength: 50 },
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          //modal页面数据
-          mainTypeName: "", //类型名称
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-        //modal配置 start
-        secModalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "700px", //弹出框宽度
-          modalRef: "secModalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        secModalForm: [
-          {
-            type: "Input",
-            label: "子类名称",
-            prop: "secondTypeName",
-            rules: { required: true, maxLength: 50 },
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        secModalData: {
-          //modal页面数据
-          secondTypeName: "", //类型名称
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        secModalHandles: [
-          {
-            label: "取消",
-            type: "default",
-            handle: () => this.closeSecModal(),
-          },
-          { label: "提交", type: "primary", handle: () => this.saveSec() },
-        ],
-        //modal 按钮 end
-
-        //modal配置 start
-        sortModalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "700px", //弹出框宽度
-          modalRef: "sortModalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        sortModalForm: [
-          {
-            type: "Draggable",
-            label: "拖拽排序",
-            data: [],
-            prop: "mainTypeName",
-            key: "mainTypeId",
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        sortModalData: {
-          //modal页面数据
-          sort: [], //类型名称
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        sortModalHandles: [
-          {
-            label: "取消",
-            type: "default",
-            handle: () => this.closeSortModal(),
-          },
-          { label: "提交", type: "primary", handle: () => this.saveSort() },
-        ],
-        //modal 按钮 end
-
-        //modal配置 start
-        secSortModalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "700px", //弹出框宽度
-          modalRef: "secSortModalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        secSortModalForm: [
-          {
-            type: "Draggable",
-            label: "拖拽排序",
-            data: [],
-            prop: "secondTypeName",
-            key: "secondTypeId",
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        secSortModalData: {
-          //modal页面数据
-          sort: [], //类型名称
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        secSortModalHandles: [
-          {
-            label: "取消",
-            type: "default",
-            handle: () => this.closeSecSortModal(),
-          },
-          { label: "提交", type: "primary", handle: () => this.saveSecSort() },
-        ],
-        //modal 按钮 end
-      },
-    };
-  },
-  activated() {
-    this.searchTableList();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    async searchTableList() {
-      let res = await this.$api.getMainSecondTypeList();
-      // 初始化树形结构
-      for (let i = 0; i < res.data.list.length; i++) {
-        if (res.data.list[i].children.length > 0) {
-          res.data.list[i].id = res.data.list[i].mainTypeId;
-          for (let j = 0; j < res.data.list[i].children.length; j++) {
-            res.data.list[i].children[j].id =
-              res.data.list[i].children[j].secondTypeId;
-          }
-        } else {
-        }
-      }
-      this.commonUtil.tableAssignment(
-        res.data,
-        this.pageData.tablePage,
-        this.pageData.tableData
-      );
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      // 主类
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    showSecModal(type, row) {
-      // 展示子类
-      this.commonUtil.showModal(this.pageData.secModalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row, "sec");
-      } else {
-        this.pageData.secModalData.mainTypeId = row.mainTypeId;
-      }
-    },
-    showSortModal(type) {
-      this.pageData.sortModalForm[0].data = this.pageData.tableData;
-      this.commonUtil.showModal(this.pageData.sortModalConfig, type);
-    },
-    showSecSortModal(list, type) {
-      this.pageData.secSortModalForm[0].data = list;
-      this.commonUtil.showModal(this.pageData.secSortModalConfig, type);
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row, type) {
-      if (type == "sec") {
-        this.pageData.secModalData = JSON.parse(JSON.stringify(row)); //数据赋值
-      } else {
-        this.pageData.modalData = JSON.parse(JSON.stringify(row)); //数据赋值
-      }
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.$refs["modalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.modalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-    },
-    closeSecModal() {
-      this.$refs["secModalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.secModalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.secModalData); //清空modalData
-    },
-    closeSortModal() {
-      this.$refs["sortModalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.sortModalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.sortModalData); //清空modalData
-    },
-    closeSecSortModal() {
-      this.$refs["secSortModalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.secSortModalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.secSortModalData); //清空modalData
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api
-              .saveNewMainType(this.pageData.modalData.mainTypeName)
-              .then((res) => {
-                this.closeModal();
-                this.searchTableList();
-              });
-          } else {
-            this.$api.updateMainType(this.pageData.modalData).then((res) => {
-              this.closeModal();
-              this.searchTableList();
-            });
-          }
-        } else {
-          return false;
-        }
-      });
-    },
-    saveSec() {
-      this.$refs["secModalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          if (
-            this.pageData.secModalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api
-              .saveNewSecondType(
-                this.pageData.secModalData.secondTypeName,
-                this.pageData.secModalData.mainTypeId
-              )
-              .then((res) => {
-                this.closeSecModal();
-                this.searchTableList();
-              });
-          } else {
-            this.$api.updateSecType(this.pageData.secModalData).then((res) => {
-              this.closeSecModal();
-              this.searchTableList();
-            });
-          }
-        } else {
-          return false;
-        }
-      });
-    },
-    async saveSort() {
-      let { data } = await this.$api.updatePSort(
-        this.pageData.sortModalForm[0].data
-      );
-      this.closeSortModal();
-      this.searchTableList();
-    },
-    async saveSecSort() {
-      let { data } = await this.$api.updateSPSort(
-        this.pageData.secSortModalForm[0].data
-      );
-      this.closeSecSortModal();
-      this.searchTableList();
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(row, type) {
-      let array = [];
-      if (type == "main") {
-        array[0] = row.mainTypeId;
-        this.$msgbox({
-          title: `确认删除？`,
-          message: "此操作将永久删除父类以及子类",
-          showCancelButton: true,
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          callback: async (action) => {
-            if (action === "confirm") {
-              this.$api.deleteMainType(array).then((res) => {
-                if (res.data.code == 0) {
-                  this.commonUtil.showMessage({
-                    message: "删除成功",
-                    type: this.commonConstants.messageType.success,
-                  });
-                  this.searchTableList();
-                } else {
-                  this.commonUtil.showMessage({
-                    message: res.data.msg,
-                    type: this.commonConstants.messageType.error,
-                  });
-                }
-              });
-            } else {
-              this.$message({
-                type: "info",
-                message: "已取消删除",
-              });
-            }
-          },
-        });
-      } else {
-        array[0] = row.secondTypeId;
-        this.$msgbox({
-          title: `确认删除？`,
-          message: "此操作将永久该分类",
-          showCancelButton: true,
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          callback: async (action) => {
-            if (action === "confirm") {
-              this.$api.deleteSecType(array).then((res) => {
-                if (res.data.code == 0) {
-                  this.searchTableList();
-                }
-              });
-            } else {
-              this.$message({
-                type: "info",
-                message: "已取消删除",
-              });
-            }
-          },
-        });
-      }
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/footprint-management/components/footprint-line-detail-modal.vue b/src/views/modules/footprint-management/components/footprint-line-detail-modal.vue
deleted file mode 100644
index 2eebaff..0000000
--- a/src/views/modules/footprint-management/components/footprint-line-detail-modal.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2022-01-20 14:59:01
- * @LastEditTime: 2022-01-25 21:51:01
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\footprint-management\components\footprint-line-modal.vue
--->
-<template>
-    <div>
-        <modal :modalConfig="modalConfig">
-            <cesTable slot="dialog__content"
-            :tableCols="tableCols"
-            :tableData="tableData"
-            :isPagination="false"
-            :isIndex="true"
-             />
-        </modal>
-    </div>
-</template>
-<script>
-import modal from '../../../../components/common/modal/modal.vue'
-import cesTable from '../../../../components/common/table/custable.vue'
-export default {
-    components:{
-        modal,cesTable
-    },
-    data(){
-        return{
-            modalConfig:{
-                show:false,
-                title:'详情',
-                width:'1200px'
-            },
-            tableData:[],
-            tableCols:[
-          { label: "景点名称", prop: "footprintName", align: "center" },
-          { label: "景点图片", prop: "images", align: "center", type: "elImage",limit:3 },
-          // {
-          //   label: "景点介绍",
-          //   prop: "footprintContent",
-          //   align: "center",
-          //   width: "280px",
-          // },
-          {
-            label: "详细地址",
-            prop: "address",
-            align: "center",
-            width: "280px",
-          },
-          {
-            label: "联系电话",
-            prop: "cellphone",
-            align: "center",
-            width: "150px",
-          },
-          {
-            label: "参观票价",
-            prop: "ticketPrice",
-            align: "center",
-            width: "100px",
-          },
-          { label: "开放时间", prop: "openTime", align: "center" },
-        //   {
-        //     label: "景点类型",
-        //     prop: "footprintTypeName",
-        //     align: "center",
-        //     width: "120px",
-        //   },
-        //   {
-        //     label: "操作",
-        //     prop: "operation",
-        //     align: "center",
-        //     type: "button",
-        //     width: "210px",
-        //     btnList: [
-        //       {
-        //         label: "详情",
-        //         type: "text",
-        //         handle: (row) => this.showDetail(row.footprintId),
-        //       },
-        //       {
-        //         label: "编辑",
-        //         type: "text",
-        //         handle: (row) => this.addOrUpdateHandle(row.footprintId),
-        //       },
-        //       {
-        //         label: "删除",
-        //         type: "text",
-        //         handle: (row) => this.deleteOne(row),
-        //       },
-        //     ],
-        //   },
-        ],
-        }
-    },
-    methods:{
-        findAll(id){
-            this.$api.getFootprintLineDetail(id).then(res=>{
-                this.tableData=res.data.data.list.map(item=>{
-                    item.images=item.images.split(',');
-                    return item
-                })
-            })
-        }
-    }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/modules/footprint-management/components/footprint-line-modal.vue b/src/views/modules/footprint-management/components/footprint-line-modal.vue
deleted file mode 100644
index 074324d..0000000
--- a/src/views/modules/footprint-management/components/footprint-line-modal.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2022-01-20 14:59:01
- * @LastEditTime: 2022-08-23 15:58:38
- * @LastEditors: chenkangxu
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\footprint-management\components\footprint-line-modal.vue
--->
-<template>
-    <div>
-        <modal :modalConfig="modalConfig" :modalHandles="modalHandles">
-            <footPrintLine ref="footPrintLine" @getFootprintLine="getFootprintLine" slot="dialog__content"
-             />
-        </modal>
-    </div>
-</template>
-<script>
-import modal from '../../../../components/common/modal/modal.vue'
-import footPrintLine from './footprint-line.vue'
-export default {
-    components:{
-        modal,footPrintLine
-    },
-    watch:{
-        "modalConfig.show":{
-            handler:function(val){
-                if(val){
-                    this.$nextTick(()=>{
-                        this.$refs.footPrintLine.findAll()
-                        this.flag=false
-                    })
-                    
-                }
-            }
-        }
-    },
-    data(){
-        return{
-            modalConfig:{
-                show:false,
-                title:'支线列表'
-            },
-            modalHandles:[{label:'确认',type:'primary',disabled:()=>{
-                  if(this.flag) return false
-                  else return true
-              },handle:()=>{
-                this.form.footprintLineId=this.row.footprintLineId
-                this.$set(this.form,'footprintLineName',this.row.lineName)
-                this.modalConfig.show=false
-            }}],
-            row:{},
-            flag:false
-        }
-    },
-    props:{
-        form:{type:Object,default:()=>{}}
-    },
-    methods:{
-        getFootprintLine(row){
-            this.row=row
-            this.flag=true
-        }
-    }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/modules/footprint-management/components/footprint-line.vue b/src/views/modules/footprint-management/components/footprint-line.vue
deleted file mode 100644
index 499f274..0000000
--- a/src/views/modules/footprint-management/components/footprint-line.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2022-01-20 15:17:37
- * @LastEditTime: 2022-08-23 15:59:09
- * @LastEditors: chenkangxu
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\footprint-management\components\footprint-line.vue
--->
-<template>
-  <div style="padding:0 20px;">
-    <cesTable
-    ref="table"
-      :tableCols="pageData.tableCols"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      :tableHandles="pageData.tableHandles"
-      :isSelection="false"
-      :highlightCurrentRow="true"
-      @currentChange="currentChange"
-      @selectChange="handleSelectChange"
-      @handleSizeChange="findAll"
-      @handleCurrentChange="findAll"
-      :isIndex="true"
-    />
-    <modal
-      ref="modal"
-      :modalConfig="modalSetting.modalConfig"
-      :modalForm="modalSetting.modalForm"
-      :modalData="modalSetting.modalData"
-      :modalHandles="modalSetting.modalHandles"
-    />
-    <detailModal ref="detailModal"  />
-  </div>
-</template>
-<script>
-import detailModal from './footprint-line-detail-modal.vue'
-import modal from "../../../../components/common/modal/modal.vue";
-import cesTable from "../../../../components/common/table/custable.vue";
-export default {
-  components: {
-    cesTable,
-    modal,
-    detailModal
-  },
-  data() {
-    return {
-      pageData: {
-        tableCols: [
-          { label: "支线名称", prop: "lineName", align: "center" },
-          { label: "奖励积分数", prop: "score", align: "center" },
-          { label: "创建时间", prop: "createTime", align: "center" },
-        //   {
-        //     label: "操作",
-        //     type: "button",
-        //     align: "center",
-        //     btnList: [
-        //       { label: "详情", type: "text", handle: (row) => {
-        //           this.$refs.detailModal.modalConfig.show=true
-        //           this.$refs.detailModal.findAll(row.footprintLineId)
-        //       } },
-        //       {
-        //         label: "编辑",
-        //         type: "text",
-        //         handle: (row) => {
-        //           this.modalSetting.modalConfig.title = "编辑";
-        //           let data = JSON.parse(JSON.stringify(row));
-        //           data.score = data.score + "";
-        //           this.modalSetting.modalData = data;
-        //           this.modalSetting.modalConfig.show = true;
-        //         },
-        //       },
-        //       {
-        //         label: "删除",
-        //         type: "text",
-        //         handle: (row) => {
-        //           this.del(row.footprintLineId);
-        //         },
-        //       },
-        //     ],
-        //   },
-        ],
-        tableData: [],
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        tableHandles: [
-        //   {
-        //     label: "添加",
-        //     type: "primary",
-        //     handle: () => {
-        //       (this.modalSetting.modalConfig.title = "添加"), this.clearObj();
-
-        //       this.modalSetting.modalConfig.show = true;
-        //       this.clearValidate();
-        //     },
-        //   },
-        //   {
-        //     label: "批量删除",
-        //     type: "danger",
-        //     handle: () => {
-        //       if (this.pageData.selectList.length === 0) {
-        //         this.$message({
-        //           type: "warning",
-        //           message: "请至少选择一条数据",
-        //         });
-        //       } else {
-        //         this.del();
-        //       }
-        //     },
-        //   },
-        ],
-        selectList: [],
-      },
-      modalSetting: {
-        modalConfig: {
-          show: false,
-          title: "添加",
-          width: "1200px",
-        },
-        modalData: {
-          content: "",
-          score: "",
-          lineName: "",
-        },
-        modalForm: [
-          {
-            label: "支线名称",
-            prop: "lineName",
-            type: "Input",
-            width: "300px",
-            rules: { required: true },
-          },
-          {
-            label: "奖励积分数",
-            prop: "score",
-            type: "Input",
-            width: "300px",
-            rules: { required: true, type: "integer" },
-          },
-          {
-            label: "描述",
-            prop: "content",
-            type: "Tinymce",
-            width: "900px",
-            rules: { required: true },
-          },
-        ],
-        modalHandles: [
-          { label: "确认", type: "primary", handle: () => this.submit() },
-        ],
-      },
-    };
-  },
-  activated() {
-    this.findAll();
-  },
-  methods: {
-    findAll() {
-         this.$nextTick(()=>{
-        // console.log(this.$refs.table)
-        this.$refs.table.$refs.cesTable.setCurrentRow()
-      })
-      let data = {};
-      data.page = this.pageData.tablePage.currentPage;
-      data.limit = this.pageData.tablePage.pageSize;
-      this.$api.getFootprintLineList(data).then((res) => {
-        this.pageData.tablePage.pageTotal = res.data.page.totalCount;
-        this.pageData.tableData = res.data.page.list
-        
-      });
-    },
-    clearObj() {
-      for (let item in this.modalSetting.modalData) {
-        this.modalSetting.modalData[item] = "";
-      }
-    },
-    clearValidate() {
-      this.$nextTick(() => {
-        this.$refs.modal.$refs.modalFormRef.clearValidate();
-      });
-    },
-    handleSelectChange(val) {
-      this.pageData.selectList = val;
-    },
-    submit() {
-      let data = JSON.parse(JSON.stringify(this.modalSetting.modalData));
-      data.score = Number(data.score);
-      let type = this.modalSetting.modalConfig.title;
-      if (type === "添加") {
-        this.$api.saveFootprintLine(data).then((res) => {
-          this.modalSetting.modalConfig.show = false;
-          this.findAll();
-        });
-      } else {
-        this.$api.updateFootprintLine(data).then((res) => {
-          this.modalSetting.modalConfig.show = false;
-          this.findAll();
-        });
-      }
-    },
-    currentChange(row){
-        this.$emit('getFootprintLine',row)
-    },
-    del(id) {
-      let data;
-      if (id) {
-        data = [id];
-      } else {
-        data = this.pageData.selectList.map((item) => item.footprintLineId);
-      }
-      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$api.deleteFootprintLine(data).then((res) => {
-            this.findAll();
-          });
-        })
-        .catch(() => {});
-    },
-  },
-};
-</script>
diff --git a/src/views/modules/footprint-management/components/footprint-vr-table.vue b/src/views/modules/footprint-management/components/footprint-vr-table.vue
deleted file mode 100644
index cda6347..0000000
--- a/src/views/modules/footprint-management/components/footprint-vr-table.vue
+++ /dev/null
@@ -1,256 +0,0 @@
-<!--
- * @Author: chenkangxu
- * @Date: 2022-09-01 20:28:53
- * @LastEditTime: 2022-09-20 21:39:14
- * @LastEditors: chenkangxu
- * @Description: VR场景上传表
- * @Github: 
--->
-<template>
-  <obj-table-plus
-    class="vr-table"
-    height="80vh"
-    :enable-auto-query="false"
-    ref="oTable"
-    :isPagination="false"
-    v-model="tableData"
-    :tableProp="tableProp"
-    :tableCols="tableCols"
-    :toolbarProp="{}"
-  >
-  </obj-table-plus>
-</template>
-
-<script>
-import FileUpload from "@/components/common/upload/fileUpload.vue";
-export default {
-  model: {
-    prop: "tableData",
-    event: "updateTableData",
-  },
-  components: {
-    FileUpload,
-  },
-  data() {
-    return {
-      tableProp: {},
-    };
-  },
-  props: {
-    tableData: {
-      type: Array,
-      default: () => [
-        {
-          title: "场景1",
-          isEdit: false,
-          info: "场景1介绍",
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.jj20.com%2Fup%2Fallimg%2F4k%2Fs%2F02%2F2109242332225H9-0-lp.jpg&refer=http%3A%2F%2Fimg.jj20.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1664628119&t=5cb5d6c78e078d4d467fba5bc433c123",
-        },
-        {
-          title: "场景1",
-          isEdit: false,
-          info: "场景1介绍",
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.jj20.com%2Fup%2Fallimg%2F4k%2Fs%2F02%2F2109242332225H9-0-lp.jpg&refer=http%3A%2F%2Fimg.jj20.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1664628119&t=5cb5d6c78e078d4d467fba5bc433c123",
-        },
-        {
-          title: "场景1",
-          isEdit: false,
-          info: "场景1介绍",
-          url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.jj20.com%2Fup%2Fallimg%2F4k%2Fs%2F02%2F2109242332225H9-0-lp.jpg&refer=http%3A%2F%2Fimg.jj20.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1664628119&t=5cb5d6c78e078d4d467fba5bc433c123",
-        },
-      ],
-    },
-  },
-  computed: {
-    tableCols() {
-      return [
-        {
-          title: "场景名称",
-          field: "title",
-          type: "jsx",
-          'min-width':"300px",
-          resizable:false,
-          align:"center",
-          render: (e) => {
-            let { row, rowIndex } = e;
-            const change = (value) => {
-              this.$set(row, "title", value);
-            };
-            return (
-              <el-form-item
-                label-width="0"
-                style="margin-bottom:0 !important;"
-                inline={true}
-                rules={{
-                  required: true,
-                  message: "场景名称不能为空",
-                  trigger: ["blur", "change"],
-                }}
-                prop={"vrList." + rowIndex + ".title"}
-              >
-                <el-input
-                  value={row.title}
-                  onInput={change}
-                  onBlur={blur}
-                ></el-input>
-              </el-form-item>
-            );
-          },
-        },
-        {
-          title: "场景介绍",
-          field: "info",
-          resizable:false,
-          type: "jsx",
-          align:"center",
-          'min-width':"300px",
-          render: (e) => {
-            let { row, rowIndex } = e;
-            const change = (value) => {
-              this.$set(row, "info", value);
-            };
-            return (
-              <el-form-item
-                label-width="0"
-                style="margin-bottom:0 !important;"
-                inline={true}
-                rules={{
-                  required: true,
-                  message: "场景介绍不能为空",
-                  trigger: ["blur", "change"],
-                }}
-                prop={"vrList." + rowIndex + ".info"}
-              >
-                <el-input
-                  value={row.info}
-                  onInput={change}
-                  onBlur={blur}
-                ></el-input>
-              </el-form-item>
-            );
-          },
-        },
-        {
-          title: "场景全景图",
-          field: "url",
-          width:"340px",
-          align:"center",
-          type: "jsx",
-          resizable:false,
-          render: ({ row,rowIndex}) => {
-            const updateFileUrl = (e) => {
-              this.$set(row, "url", e);
-            };
-            const removeFileList=(e)=>{
-              if(e.length<=0) this.$set(row, "url", "");
-            }
-            let fileList=row.url?[{url:row.url}]:[]
-            return (
-              <el-form-item
-                label-width="0"
-                style="margin-bottom:0 !important;height:170px;"
-                inline={true}
-                rules={{
-                  required: true,
-                  message: "场景全景图不能为空",
-                  trigger: ["blur", "change"],
-                }}
-                prop={"vrList." + rowIndex + ".url"}
-              >
-                <file-upload
-                  listType="picture-card"
-                  onUpdateFileUrl={updateFileUrl}
-                  onRemoveFileList={removeFileList}
-                  fileUrl={row.url}
-                  limit={1}
-                  fileList={fileList}
-                  accept=".jpg,.jpeg,.png,.JPG,.JPEG"
-                  drag={false}
-                  showTips={false}
-                  enableImageCompressor={true}
-                >
-                </file-upload>
-              </el-form-item>
-
-            );
-          },
-        },
-        {
-          title: "操作",
-          width:"200px",
-          align:"center",
-          resizable:false,
-          type: "jsx",
-          render: ({ row,rowIndex }) => {
-            const add = () => {
-              this.tableData.splice(rowIndex+1,0,{
-                title:"",info:"",url:""
-              })
-            };
-            const remove = () => {
-              let deleteData=this.tableData.find((item,index)=>index==rowIndex);
-              console.log(deleteData);
-              if(deleteData.info.length>0 || deleteData.title.length>0 || deleteData.url.length>0){
-                this.$confirm(`场景名称:${deleteData.title}，场景介绍:${deleteData.info}`,"确认删除此行？")
-                .then(()=>{
-                  this.$emit("updateTableData",this.tableData.filter((item,index)=>index!=rowIndex))
-                })
-              }else{
-                this.$emit("updateTableData",this.tableData.filter((item,index)=>index!=rowIndex))
-              }
-            };
-            const copy=()=>{
-              this.tableData.splice(rowIndex+1,0,{
-                title:row.title,info:row.info,url:""
-              })
-            }
-            return (
-              <div>
-                <el-tooltip class="item" effect="dark" content="复制一份场景介绍都一样的行(不包含图片)" placement="top">
-                  <el-button
-                    size="middle"
-                    onClick={copy}
-                    plain
-                    circle
-                    icon="el-icon-document-copy"
-                    type="info"
-                  >
-                  </el-button>
-                </el-tooltip>
-                <el-tooltip class="item" effect="dark" content="新增下一行" placement="top">
-                  <el-button
-                    size="middle"
-                    onClick={add}
-                    icon="el-icon-plus"
-                    plain
-                    type="primary"
-                    circle
-                  ></el-button>
-                </el-tooltip>
-                {this.tableData.length>1?
-                <el-tooltip class="item" effect="dark" content="删除本行" placement="top">
-                  <el-button
-                    size="middle"
-                    onClick={remove}
-                    icon="el-icon-minus"
-                    plain
-                    type="danger"
-                    circle
-                  ></el-button>
-                </el-tooltip>
-                :null}
-              </div>
-            );
-          },
-        },
-      ];
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.vr-table{
-  margin-bottom: 40px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/footprint-management/footprint-line.vue b/src/views/modules/footprint-management/footprint-line.vue
deleted file mode 100644
index 6928626..0000000
--- a/src/views/modules/footprint-management/footprint-line.vue
+++ /dev/null
@@ -1,217 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2022-01-20 13:31:53
- * @LastEditTime: 2022-04-07 21:40:29
- * @LastEditors: chenkangxu
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\footprint-management\footpint-line.vue
--->
-<template>
-  <div>
-    <cesTable
-      :tableCols="pageData.tableCols"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      :tableHandles="pageData.tableHandles"
-      :isSelection="true"
-      @selectChange="handleSelectChange"
-      @handleSizeChange="findAll"
-      @handleCurrentChange="findAll"
-      :isIndex="true"
-    />
-    <modal
-      ref="modal"
-      :modalConfig="modalSetting.modalConfig"
-      :modalForm="modalSetting.modalForm"
-      :modalData="modalSetting.modalData"
-      :modalHandles="modalSetting.modalHandles"
-    />
-    <detailModal ref="detailModal"  />
-  </div>
-</template>
-<script>
-import detailModal from './components/footprint-line-detail-modal.vue'
-import modal from "../../../components/common/modal/modal.vue";
-import cesTable from "../../../components/common/table/custable.vue";
-export default {
-  components: {
-    cesTable,
-    modal,
-    detailModal
-  },
-  data() {
-    return {
-      pageData: {
-        tableCols: [
-          { label: "支线名称", prop: "lineName", align: "center" },
-          { label: "奖励积分数", prop: "score", align: "center" },
-          { label: "修改时间", prop: "createTime", align: "center" },
-          {
-            label: "操作",
-            type: "button",
-            align: "center",
-            btnList: [
-              { label: "详情", type: "text", handle: (row) => {
-                  this.$refs.detailModal.modalConfig.show=true
-                  this.$refs.detailModal.findAll(row.footprintLineId)
-              } },
-              {
-                label: "编辑",
-                type: "text",
-                handle: (row) => {
-                  this.modalSetting.modalConfig.title = "编辑";
-                  let data = JSON.parse(JSON.stringify(row));
-                  data.score = data.score + "";
-                  this.modalSetting.modalData = data;
-                  this.modalSetting.modalConfig.show = true;
-                },
-              },
-              {
-                label: "删除",
-                type: "text",
-                handle: (row) => {
-                  this.del(row.footprintLineId);
-                },
-              },
-            ],
-          },
-        ],
-        tableData: [],
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        tableHandles: [
-          {
-            label: "添加",
-            type: "primary",
-            handle: () => {
-              (this.modalSetting.modalConfig.title = "添加"), this.clearObj();
-
-              this.modalSetting.modalConfig.show = true;
-              this.clearValidate();
-            },
-          },
-          {
-            label: "批量删除",
-            type: "danger",
-            handle: () => {
-              if (this.pageData.selectList.length === 0) {
-                this.$message({
-                  type: "warning",
-                  message: "请至少选择一条数据",
-                });
-              } else {
-                this.del();
-              }
-            },
-          },
-        ],
-        selectList: [],
-      },
-      modalSetting: {
-        modalConfig: {
-          show: false,
-          title: "添加",
-          width: "1200px",
-        },
-        modalData: {
-          content: "",
-          score: "",
-          lineName: "",
-        },
-        modalForm: [
-          {
-            label: "支线名称",
-            prop: "lineName",
-            type: "Input",
-            width: "300px",
-            rules: { required: true },
-          },
-          {
-            label: "奖励积分数",
-            prop: "score",
-            type: "Input",
-            width: "300px",
-            rules: { required: true, type: "integer" },
-          },
-          {
-            label: "描述",
-            prop: "content",
-            type: "Tinymce",
-            width: "900px",
-            rules: { required: true },
-          },
-        ],
-        modalHandles: [
-          { label: "确认", type: "primary", handle: () => this.submit() },
-        ],
-      },
-    };
-  },
-  activated() {
-    this.findAll();
-  },
-  methods: {
-    findAll() {
-      let data = {};
-      data.page = this.pageData.tablePage.currentPage;
-      data.limit = this.pageData.tablePage.pageSize;
-      this.$api.getFootprintLineList(data).then((res) => {
-        this.pageData.tablePage.pageTotal = res.data.page.totalCount;
-        this.pageData.tableData = res.data.page.list;
-      });
-    },
-    clearObj() {
-      for (let item in this.modalSetting.modalData) {
-        this.modalSetting.modalData[item] = "";
-      }
-    },
-    clearValidate() {
-      this.$nextTick(() => {
-        this.$refs.modal.$refs.modalFormRef.clearValidate();
-      });
-    },
-    handleSelectChange(val) {
-      this.pageData.selectList = val;
-    },
-    submit() {
-      let data = JSON.parse(JSON.stringify(this.modalSetting.modalData));
-      data.score = Number(data.score);
-      let type = this.modalSetting.modalConfig.title;
-      if (type === "添加") {
-        this.$api.saveFootprintLine(data).then((res) => {
-          this.modalSetting.modalConfig.show = false;
-          this.findAll();
-        });
-      } else {
-        this.$api.updateFootprintLine(data).then((res) => {
-          this.modalSetting.modalConfig.show = false;
-          this.findAll();
-        });
-      }
-    },
-    del(id) {
-      let data;
-      if (id) {
-        data = [id];
-      } else {
-        data = this.pageData.selectList.map((item) => item.footprintLineId);
-      }
-      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$api.deleteFootprintLine(data).then((res) => {
-            this.findAll();
-          });
-        })
-        .catch(() => {});
-    },
-  },
-};
-</script>
diff --git a/src/views/modules/footprint-management/footprint-rule.vue b/src/views/modules/footprint-management/footprint-rule.vue
deleted file mode 100644
index f338861..0000000
--- a/src/views/modules/footprint-management/footprint-rule.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
- * @author: ym
- * @Date: 2021-10-10 13:45:17
- * @LastEditTime: 2022-01-19 14:05:06
- * @LastEditors: Please set LastEditors
- * @Description: 
- * @FilePath: \background-front-end\src\views\modules\integral\agreement\reminder.vue
--->
-<template>
-  <div :key="check">
-    <notice/>
-    <Tinymce
-      v-model="tinymceData.content"
-      placeholder="请输入表单描述"
-    />
-    <div style="padding:20px 0">
-      <el-button type="primary" @click="save">保存</el-button>
-    </div>
-    
-  </div>
-</template>
-<script>
-import notice from '@/components/tinymce/notice.vue'
-import Tinymce from "@/components/tinymce/index.vue";
-export default {
-  components: {
-    Tinymce,
-    notice
-  },
-  activated() {
-    this.check=true;
-    this.find();
-  },
-  deactivated(){
-    this.check=false
-  },
-  data() {
-    return {
-      tinymceData: {
-        content: "",
-      },
-      footprintData: {},
-      check:true
-    };
-  },
-  methods: {
-    find() {
-      this.$api.getInteralAgreement(4).then((res) => {
-        this.footprintData = res.data.obj;
-        this.tinymceData.content = res.data.obj.ruleInfoContent;
-      });
-    },
-    save(){
-          this.$api.saveInteralAgreement(this.footprintData.ruleInfoId,this.tinymceData.content,this.footprintData.contentType)
-            
-      }
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/footprint-management/punch-in-add-or-update.vue b/src/views/modules/footprint-management/punch-in-add-or-update.vue
deleted file mode 100644
index aff6eac..0000000
--- a/src/views/modules/footprint-management/punch-in-add-or-update.vue
+++ /dev/null
@@ -1,413 +0,0 @@
-<template>
-  <div>
-    <el-dialog
-    :title="!!dataForm.footprintTypeId ? '编辑' : '新增'"
-    :close-on-click-modal="false"
-    :visible.sync="visible"
-    width="1000px"
-    fullscreen
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmit()"
-      label-width="120px"
-    >
-      <el-form-item label="景点名称:" prop="footprintName">
-        <el-input
-          v-model="dataForm.footprintName"
-          placeholder="请输入景点名称"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="景点图片:" prop="images">
-        <el-upload
-          class="upload-demo"
-          :action="$uploadUrl"
-          :on-preview="handlePreview"
-          :on-remove="handleRemove"
-          :file-list="fileList"
-          drag
-          :on-success="(res, file) => handleAvatarSuccess(res, file)"
-          list-type="picture"
-        >
-          <i class="el-icon-upload"></i>
-          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-          <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
-        </el-upload>
-      </el-form-item>
-      
-      <!-- <el-form-item label="景点介绍:" prop="footprintContent">
-        <el-input
-          type="textarea"
-          :rows="8"
-          placeholder="请描述景点概况"
-          v-model="dataForm.footprintContent"
-        >
-        </el-input>
-        <span style="float: right;color: #909399;margin-right: 15px;">{{}}字</span>
-      </el-form-item> -->
-      <el-form-item label="景点等级:" prop="footprintGrade">
-        <el-select
-              v-model="dataForm.footprintGrade"
-            >
-              <el-option
-                v-for="op in [{label:'市级景点',value:1},{label:'省级景点',value:2},{label:'国家景点',value:3}]"
-                :label="op.label"
-                :value=" op.value"
-                :key="op.value"
-              ></el-option>
-            </el-select>
-      </el-form-item>
-      <el-form-item label="所在省市:" prop="pos">
-        <el-cascader
-              v-model="dataForm.pos"
-              :options="cc"
-              filterable
-              :props="{
-                  expandTrigger: 'hover',
-                  checkStrictly: false
-                }
-              "
-        ></el-cascader>
-        <!-- <el-input
-          v-model="dataForm.city"
-          placeholder="请输入景点所在城市"
-        ></el-input> -->
-      </el-form-item>
-      <el-form-item label="详细地址:" prop="address">
-        <el-input
-          v-model="dataForm.address"
-          placeholder="请输入景点详细地址"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="联系电话:" prop="cellphone">
-        <el-input
-          v-model="dataForm.cellphone"
-          placeholder="请输入景点联系电话"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="参观价格:" prop="ticketPrice">
-         <!-- <el-input-number placeholder="请输入景点参观票价" v-model="dataForm.ticketPrice"  :controls="false" ></el-input-number> -->
-        <el-input
-          v-model="dataForm.ticketPrice"
-          placeholder="请输入景点参观票价"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="开放时间:" prop="openTime">
-        <el-input
-          v-model="dataForm.openTime"
-          placeholder="请输入景点开放具体时间"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="所属支线:" prop="footprintLineId">
-        <div style="display:flex">
-          <el-input
-          :disabled="true"
-          v-model="dataForm.footprintLineName"
-          placeholder=""
-        ></el-input>
-         <el-button  type="primary" size="small" style="margin-left:35px;height:40px" @click="$refs.footPrintLineModal.modalConfig.show=true">选择支线</el-button>
-         <el-button   size="small" style="margin-left:35px;height:40px" @click="dataForm.footprintLineId=''">清空</el-button>
-        </div>
-        
-      </el-form-item>
-      <el-form-item label="选择类型:" prop="footprintTypeId">
-        <el-select
-          v-model="dataForm.footprintTypeId"
-          placeholder="请选择景点分类"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <div style="display: flex">
-        
-        <el-form-item label="经度:" prop="longitude">
-          <el-input disabled v-model="dataForm.longitude" placeholder=""></el-input>
-        </el-form-item>
-        <el-form-item label="纬度:" prop="latitude">
-          <el-input disabled v-model="dataForm.latitude" placeholder=""></el-input>
-        </el-form-item>
-        <el-button icon="el-icon-position" type="primary" size="small" style="margin-left:35px;height:40px" @click="openMap()">定位</el-button>
-      </div>
-      <el-form-item label="是否有VR打卡:" prop="hasVr">
-        <el-switch v-model="dataForm.hasVr"></el-switch>
-      </el-form-item>
-      <footprint-vr-table v-if="dataForm.hasVr==true" v-model="dataForm.vrList"/>
-      <!-- VR全景图 start-->
-      <!-- VR全景图 end-->
-      <el-form-item label="景点介绍:" prop="footprintContent">
-       <tinymce   v-model="dataForm.footprintContent"></tinymce>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
-
-
-    <!-- 地图组件 -->
-  <punch-in-map  v-if="mapVisible" ref="punchInMap"
-      @refreshMapIp="refreshMapIp" @getPos="getPos"></punch-in-map> 
-
-  </el-dialog>
-  <footPrintLineModal :form="dataForm" ref="footPrintLineModal" />
-  </div>
-  
-</template>
-
-<script>
-import footPrintLineModal from './components/footprint-line-modal.vue'
-import PunchInMap from "./punch-in-map.vue"
-import tinymce from '../../../components/tinymce/index.vue';
-import cc from '../../../utils/country-level2-data'
-import FootprintVrTable from './components/footprint-vr-table.vue';
-export default {
-   components: {
-    PunchInMap,
-    tinymce,
-    footPrintLineModal,
-    FootprintVrTable
-  },
-  data() {
-    return {
-      mapVisible: false,
-      visible: false,
-      //景点类型选择
-      options: [],
-      fileList: [],
-      footprintId: "",
-      dataForm: {
-        footprintName: "",
-        footprintContent: "",
-        address: "",
-        cellphone: "",
-        ticketPrice:'0',
-        openTime: "",
-        longitude: "",
-        latitude: "",
-        footprintLineId:'',
-        images: "",
-        footprintTypeId: "",
-        city: "",
-        userId: "",
-        footprintGrade:'',
-        //是否有VR全景打卡
-        hasVr:false,
-        //全景图数组
-        vrList:[]
-      },
-      dataRule: {
-        footprintName: [
-          { required: true, message: "景点名称不能为空", trigger: "blur" },
-          { max: 30, message: "长度不能超过30", trigger: "blur" },
-        ],
-        ticketPrice:[{required:true,message:'请输入参观价格'},
-        { type: 'string', pattern:/^[+-]?(0|([1-9]\d*))(\.\d+)?$/g,message: '请输入数字类型的数据', trigger: 'change' }
-        ],
-        images:{required:true,message:'景点图片必须上传'},
-        footprintContent: [
-          { required: true, message: "景点介绍不能为空", trigger: "blur" },
-        ],
-        address: [
-          { required: true, message: "地址不能为空", trigger: "blur" },
-          { max: 30, message: "长度不能超过50", trigger: "blur" },
-        ],
-        openTime: [
-          { required: true, message: "开放时间不能为空", trigger: "blur" },
-          { max: 50, message: "字数超过限制", trigger: "blur" },
-        ],
-        footprintTypeId: [
-          { required: true, message: "景点类型不能为空", trigger: "blur" },
-        ],
-        pos: [
-          { required: true, message: "所在省市不能为空", trigger: "blur" },
-        ],
-        footprintGrade:{required:true,message:'景点等级不能为空'},
-        longitude:{required:true,message:'经度不能为空'},
-        latitude:{required:true,message:'纬度不能为空'}
-      },
-      cc:cc,
-      tempKey: -666666, // 临时key, 用于解决tree半选中状态项不能传给后台接口问题. # 待优化
-    };
-  },
-  computed: {
-    userId: {
-      get() {
-        return this.$store.state.user.id;
-      },
-    },
-  },
-  mounted() {
-    // 获取景点分类列表
-    this.getFootprintTypeList();
-    console.log(this.dataForm);
-  },
-  methods: {
-    //获取景点分类
-    async getFootprintTypeList() {
-      let list = await this.$api.getFootprintTypeList();
-      console.log("当前景点分类列表", list.data.list);
-      for (var i = 0; i < list.data.list.length; i++) {
-        var obj = new Object();
-        obj.value = list.data.list[i].footprintTypeId;
-        obj.label = list.data.list[i].footprintTypeName;
-        this.options.push(obj);
-      }
-    },
-    //外部页面打开弹窗的方法
-    async init(id) {
-      this.fileList = [];
-      if (id == null) {
-        this.commonUtil.clearObj(this.dataForm); //清空modalData
-        this.footprintId = "";
-        // console.log("545456565");
-        Object.keys(this.dataForm).forEach((key) => {
-          this.dataForm[key] = "";
-        });
-        this.dataForm.ticketPrice='0'
-        this.dataForm.hasVr=false;
-        this.dataForm.vrList=[{title:"",info:"",url:""}];
-      } else {
-        this.footprintId = id + "";
-        var obj = await this.$api.getFootprintInfo(this.footprintId);
-        this.dataForm.footprintName = obj.data.redFootprint.footprintName;
-        this.dataForm.footprintContent = obj.data.redFootprint.footprintContent;
-        this.dataForm.address = obj.data.redFootprint.address;
-        this.dataForm.cellphone = obj.data.redFootprint.cellphone;
-        this.dataForm.ticketPrice = obj.data.redFootprint.ticketPrice+'';
-        this.dataForm.openTime = obj.data.redFootprint.openTime;
-        this.dataForm.longitude = obj.data.redFootprint.longitude;
-        this.dataForm.latitude = obj.data.redFootprint.latitude;
-        this.dataForm.images = obj.data.redFootprint.images;
-        this.dataForm.footprintGrade=obj.data.redFootprint.footprintGrade
-        // this.dataForm.city = obj.data.redFootprint.city;
-         this.dataForm.pos = [obj.data.redFootprint.province,obj.data.redFootprint.city];
-        this.dataForm.footprintTypeId = obj.data.redFootprint.footprintTypeId;
-        let list = obj.data.redFootprint.images.split(",");
-        //vr图
-        this.dataForm.hasVr=obj.data.redFootprint.hasVr;
-        //如果有vr图就回显，没有起一个默认值
-        if(this.dataForm.hasVr==true){
-          this.dataForm.vrList=obj.data.redFootprint.vrList;
-        }else{
-          this.dataForm.vrList=[{title:"",info:"",url:""}];
-        }
-
-        // [
-        //   {
-        //     title: "场景1",
-        //     isEdit: false,
-        //     info: "场景1介绍",
-        //     url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.jj20.com%2Fup%2Fallimg%2F4k%2Fs%2F02%2F2109242332225H9-0-lp.jpg&refer=http%3A%2F%2Fimg.jj20.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1664628119&t=5cb5d6c78e078d4d467fba5bc433c123",
-        //   },
-        //   {
-        //     title: "场景2",
-        //     isEdit: false,
-        //     info: "场景1介绍",
-        //     url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.jj20.com%2Fup%2Fallimg%2F4k%2Fs%2F02%2F2109242332225H9-0-lp.jpg&refer=http%3A%2F%2Fimg.jj20.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1664628119&t=5cb5d6c78e078d4d467fba5bc433c123",
-        //   },
-        //   {
-        //     title: "场景1",
-        //     isEdit: false,
-        //     info: "场景1介绍",
-        //     url: "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.jj20.com%2Fup%2Fallimg%2F4k%2Fs%2F02%2F2109242332225H9-0-lp.jpg&refer=http%3A%2F%2Fimg.jj20.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=auto?sec=1664628119&t=5cb5d6c78e078d4d467fba5bc433c123",
-        //   },
-        // ];
-        for (let i = 0; i < list.length&&list[i]!==''; i++) {
-          var fileObj = {};
-          fileObj["url"] = list[i];
-          this.fileList.push(fileObj);
-        }
-        
-      }
-      this.$forceUpdate();
-      this.visible = true;
-      this.$nextTick(()=>{
-          this.$refs.dataForm.clearValidate()
-        })
-    },
-    // 表单提交
-    dataFormSubmit() {
-      //处理图片
-      this.dataForm.images = "";
-      for (var i = 0; i < this.fileList.length; i++) {
-        this.dataForm.images = this.dataForm.images + this.fileList[i].url;
-        if (i < this.fileList.length - 1)
-          this.dataForm.images = this.dataForm.images + ",";
-      }
-      this.dataForm.userId = this.userId;
-      this.dataForm.province=this.dataForm.pos&&this.dataForm.pos[0]
-      this.dataForm.city=this.dataForm.pos&&this.dataForm.pos[1]
-      //添加vrJSON给后端
-      this.dataForm.vrJson=JSON.stringify(this.dataForm.vrList);
-      console.log(this.dataForm);
-      this.$refs["dataForm"].validate(async (valid) => {
-        if (valid) {
-          if (this.footprintId === "" || this.footprintId.length <= 0) {
-            this.$api.saveNewFootprint(this.dataForm).then(res=>{
-              this.visible = false;
-              this.$emit('refreshDataList')
-            });
-            
-          } else {
-            this.dataForm['footprintId'] = this.footprintId;
-            this.$api.editFootprint(this.dataForm).then(res=>{
-              this.visible = false;
-              this.$emit('refreshDataList')
-            });
-            
-          }
-        }
-      });
-    },
-    //上传图片模块的两个函数
-    handleRemove(file, fileList) {
-      for (var i = 0; i < this.fileList.length; i++) {
-        if (this.fileList[i].url == file.url) {
-          this.fileList.splice(i, 1);
-        }
-      }
-      console.log(file.url);
-    },
-    handlePreview(file) {
-      console.log(file);
-    },
-    handleAvatarSuccess(res, file) {
-      var imageObj = {};
-      imageObj["url"] = file.response.url;
-      this.fileList.push(imageObj);
-    },
-
-    //打开定位选择地址确定经纬度
-    openMap(){
-      this.mapVisible = true;
-      if(this.dataForm.longitude&&this.dataForm.latitude){
-        this.$refs.punchInMap.center=[this.dataForm.longitude,this.dataForm.latitude]
-      }
-      this.$nextTick(() => {
-        this.$refs.punchInMap.init();
-      });
-      // console.log(3231213)
-    },
-    refreshMapIp(){
-      console.log(3231213)
-    },
-    //获取地图组件传递的经纬度
-    getPos(data){
-      // console.log(data)
-      this.dataForm.longitude=data[0]
-      this.dataForm.latitude=data[1]
-    }
-  },
-};
-</script>
-
-<style lang="scss" scope>
-</style>
diff --git a/src/views/modules/footprint-management/punch-in-management.vue b/src/views/modules/footprint-management/punch-in-management.vue
deleted file mode 100644
index 15c8639..0000000
--- a/src/views/modules/footprint-management/punch-in-management.vue
+++ /dev/null
@@ -1,473 +0,0 @@
-<!--
- * @Author: ym
- * @Date: 2021-09-21 12:30:58
- * @LastEditTime: 2022-04-15 21:50:41
- * @LastEditors: chenkangxu
- * @Description: In User Settings Edit
- * @FilePath: \piecework-treasure\src\views\modules\human-management\person-management\person-management.vue
--->
-
-<template>
-  <div class="mod-role">
-    
-    <el-form
-      :inline="true"
-      :model="dataForm"
-      @keyup.enter.native="searchtablelist()"
-    >
-      <el-form-item
-      label="搜索" label-width="100px">
-        <el-input
-          size="mini"
-          v-model="dataForm.searchName"
-          placeholder="搜索景点名称/城市地址"
-          clearable
-        ></el-input>
-      </el-form-item>
-      <!-- 景点类型筛选 -->
-      <el-form-item label="景点类型" label-width="100px">
-        <el-select
-          clearable
-          size="mini"
-          v-model="dataForm.footprintTypeId"
-          placeholder="请选择景点分类"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <!-- 景点等级筛选 -->
-      <el-form-item label="景点等级" label-width="100px">
-        <el-select
-          clearable
-          size="mini"
-          v-model="dataForm.footprintGrade"
-          placeholder="请选择景点等级"
-        >
-          <el-option
-            v-for="item in [{label:'市级景点',value:1},{label:'省级景点',value:2},{label:'国家景点',value:3}]"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <!-- 日期选择器 -->
-      <el-form-item label="创建日期" label-width="100px">
-        <div class="block">
-          <el-date-picker
-            size="mini"
-            format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            v-model="dataForm.timeValue"
-            type="datetimerange"
-            :picker-options="pickerOptions"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            align="right"
-          >
-          </el-date-picker>
-        </div>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" size="mini" @click="searchtablelist()">查询</el-button>
-        <el-button type="warning" size="mini" @click="clearData()">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-button
-      type="primary"
-      @click="addOrUpdateHandle()"
-      style="marginBottom: 20px"
-      >新增打卡地</el-button
-    >
-    <el-button
-          type="danger"
-          @click="deleteBatch()"
-          :disabled="pageData.selectList.length <= 0"
-          >批量删除</el-button
-        >
-
-    <obj-table
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="false"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchtablelist()"
-      @selectChange="selectChange"
-      @handleSizeChange="searchtablelist()"
-    ></obj-table>
-
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update
-      v-if="addOrUpdateVisible"
-      ref="addOrUpdate"
-      @refreshDataList="searchtablelist"
-    ></add-or-update>
-
-    <!-- 景点详情显示 -->
-    <el-dialog title="打卡地详情" :visible.sync="detailVisible" width="60%">
-      <el-form label-width="120px">
-        <el-form-item label="景点名称:">
-          <el-input
-            v-model="footprintDetail.footprintName"
-            :readonly="true"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="景点图片:">
-          <div style="display: flex">
-            <div
-              v-for="(item, index) in footprintDetail.images"
-              :key="index"
-              :style="{
-                width: '90px',
-                height: '90px',
-                backgroundImage: 'url(' + item + ')',
-                backgroundSize: 'cover',
-                marginLeft: '10px',
-              }"
-              @click="shopPicture(item)"
-            ></div>
-          </div>
-        </el-form-item>
-        <el-form-item label="景点介绍:">
-          <div 
-          class="rich_text_info"
-          v-html="footprintDetail.footprintContent"></div>
-        </el-form-item>
-        <el-form-item label="详细地址:">
-          <el-input
-            v-model="footprintDetail.address"
-            :readonly="true"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="联系电话:">
-          <el-input
-            v-model="footprintDetail.cellphone"
-            :readonly="true"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="参观票价:">
-          <el-input
-            v-model="footprintDetail.ticketPrice"
-            :readonly="true"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="开放时间:">
-          <el-input
-            v-model="footprintDetail.openTime"
-            :readonly="true"
-          ></el-input>
-        </el-form-item>
-        <el-form-item label="上次修改时间:">
-          <el-input
-            v-model="footprintDetail.updateTime"
-            :readonly="true"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import AddOrUpdate from "./punch-in-add-or-update";
-import objTable from "../../../components/common/table/custable.vue";
-export default {
-  components: {
-    AddOrUpdate,
-    objTable,
-  },
-  data() {
-    return {
-      // 加载动画
-      loading:false,
-      dataForm: {
-        footprintTypeId: "",
-        searchName: "",
-        timeValue: "",
-        footprintGrade:''
-      },
-      addOrUpdateVisible: false,
-      detailVisible: false,
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-        ],
-      },
-      options: [],
-      //展示景点的详情数据
-      footprintDetail: {},
-      pageData: {
-        tableData: [],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 10,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50, 100],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "景点名称", prop: "footprintName", align: "center",fixed:"left",width:"200px" },
-          { label: "景点图片", prop: "images", align: "center", type: "elImage",limit:1 },
-          {
-            label: "修改时间",
-            prop: "updateTime",
-            align: "center",
-            width:"160px"
-          },
-          {
-            label: "详细地址",
-            prop: "address",
-            align: "center",
-            width: "280px",
-          },
-          {
-            label: "联系电话",
-            prop: "cellphone",
-            align: "center",
-            width: "150px",
-          },
-          {
-            label: "参观票价",
-            prop: "ticketPrice",
-            align: "center",
-            width: "100px",
-          },
-          { label: "开放时间", prop: "openTime", align: "center" },
-          {
-            label: "景点类型",
-            prop: "footprintTypeName",
-            align: "center",
-            width: "120px",
-          },
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            type: "button",
-            width: "210px",
-            fixed:"right",
-            btnList: [
-              {
-                label: "详情",
-                type: "text",
-                handle: (row) => this.showDetail(row.footprintId),
-              },
-              {
-                label: "编辑",
-                type: "text",
-                handle: (row) => this.addOrUpdateHandle(row.footprintId),
-              },
-              {
-                label: "删除",
-                type: "text",
-                handle: (row) => this.deleteOne(row),
-              },
-            ],
-          },
-        ],
-      },
-    };
-  },
-  activated() {
-    // 获取景点分类列表
-    this.getFootprintTypeList();
-    // 查询数据
-    this.searchtablelist();
-  },
-  computed: {},
-  methods: {
-    //获取景点分类
-    async getFootprintTypeList() {
-      let list = await this.$api.getFootprintTypeList();
-      console.log("当前景点分类列表", list.data.list);
-      let arr=[]
-      for (var i = 0; i < list.data.list.length; i++) {
-        var obj = new Object();
-        obj.value = list.data.list[i].footprintTypeId;
-        obj.label = list.data.list[i].footprintTypeName;
-        arr.push(obj);
-      }
-      this.options=arr
-    },
-    // 新增 / 修改
-    addOrUpdateHandle(id) {
-      this.addOrUpdateVisible = true;
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id);
-      });
-    },
-    //获取表格数据
-    async searchtablelist() {
-      this.loading=true;
-      // get请求参数对象
-      var dataParams = {};
-      dataParams["page"] = this.pageData.tablePage.currentPage;
-      dataParams["limit"] = this.pageData.tablePage.pageSize;
-      dataParams["searchName"] = this.dataForm.searchName;
-      dataParams["footprintTypeId"] = this.dataForm.footprintTypeId;
-      dataParams["startTime"] = this.dataForm.timeValue[0];
-      dataParams["endTime"] = this.dataForm.timeValue[1];
-      dataParams['footprintGrade']=this.dataForm.footprintGrade
-      console.log("123212231231312123", dataParams);
-      let res = await this.$api.getFootPrintByParams(dataParams);
-      
-      this.pageData.tableData = res.data.page.list;
-      this.pageData.tablePage.currentPage = res.data.page.currPage;
-      this.pageData.tablePage.pageTotal = res.data.page.totalCount;
-      //   点击修改详情出看更多图片  和更多的内容
-      for (let i = 0; i < this.pageData.tableData.length; i++) {
-        var list = this.pageData.tableData[i].images.split(",");
-        this.pageData.tableData[i].images = list;
-        this.pageData.tableData[i].ticketPrice =
-          this.pageData.tableData[i].ticketPrice + "元/人";
-        if (this.pageData.tableData[i].footprintContent.length > 40) {
-          this.pageData.tableData[i].footprintContent =
-            this.pageData.tableData[i].footprintContent.substring(0, 40) +
-            " ···";
-        }
-        if (this.pageData.tableData[i].cellphone === "") {
-          this.pageData.tableData[i].cellphone = "暂无";
-        }
-      }
-      this.loading=false;
-    },
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      this.searchtablelist();
-    },
-    //删除单个打卡地
-    deleteOne(row) {
-      this.$msgbox({
-        title: "确认删除该打卡点吗?",
-        message: "此操作将永久删除",
-        showCancelButton: true,
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        callback: async (action) => {
-          if (action === "confirm") {
-            let array = new Array();
-            array.push(row.footprintId);
-            // console.log("111111111111111111111111111111111111111111sadasdasd",array)
-            await this.$api.deleteFootprintList(array);
-            // console.log(res);
-            this.$message({
-              type: "success",
-              message: "删除成功!",
-            });
-            this.searchtablelist();
-          } else {
-            this.$message({
-              type: "info",
-              message: "已取消删除",
-            });
-          }
-        },
-      });
-    },
-    //批量删除函数
-    deleteBatch() {
-      // console.log("删除选中的列表数据",this.pageData.selectList);
-      this.$msgbox({
-        title: "确认删除选中的打卡点吗?",
-        message: "此操作将永久删除",
-        showCancelButton: true,
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        callback: async (action) => {
-          if (action === "confirm") {
-            let array = new Array();
-            for (var i = 0; i < this.pageData.selectList.length; i++) {
-              array.push(this.pageData.selectList[i].footprintId);
-            }
-            // console.log("1232122312313121233232234234234",array)
-            await this.$api.deleteFootprintList(array);
-            // console.log(res);
-            this.$message({
-              type: "success",
-              message: "删除成功!",
-            });
-            this.searchtablelist();
-          } else {
-            this.$message({
-              type: "info",
-              message: "已取消删除",
-            });
-          }
-        },
-      });
-    },
-    //获取选中的列表数据
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-    //获取角色
-    getRoles() {},
-    //重置清空当前的数据
-    clearData() {
-      (this.dataForm.timeValue = ""),
-        (this.dataForm.footprintTypeId = ""),
-        (this.dataForm.searchName = "");
-        this.dataForm.footprintGrade=''
-    },
-    //查看当前景点的详情数据
-    async showDetail(footprintId) {
-      this.detailVisible = true;
-      console.log(footprintId);
-      var obj = await this.$api.getFootprintInfo(footprintId);
-      this.footprintDetail = obj.data.redFootprint;
-      var list = this.footprintDetail.images.split(",");
-      this.footprintDetail.images = list;
-      this.footprintDetail.ticketPrice =
-        this.footprintDetail.ticketPrice + "元/人";
-    },
-  },
-};
-</script>
-<style lang='scss' scoped>
-.rich_text_info{
-  width:100%;height:500px;overflow-y:scroll;margin:20px 0;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/footprint-management/punch-in-map.vue b/src/views/modules/footprint-management/punch-in-map.vue
deleted file mode 100644
index 26dd26f..0000000
--- a/src/views/modules/footprint-management/punch-in-map.vue
+++ /dev/null
@@ -1,208 +0,0 @@
-<template>
-  <el-dialog
-    title="定位"
-    :visible.sync="dialogVisible"
-    width="80%"
-    :close-on-click-modal="false"
-    :modal="false"
-    :before-close="handleClose"
-  >
-    <div>
-      <div class="amap-page-container">
-        <el-amap-search-box
-          ref="searchBox"
-          class="search-box"
-          :search-option="searchOption"
-          :on-search-result="onSearchResult"
-        ></el-amap-search-box>
-        <el-amap
-          class="amap-wrapper"
-          ref="map"
-          vid="amapDemo"
-          :amap-manager="amapManager"
-          :center="center"
-          :zoom="zoom"
-          :plugin="plugin"
-          :events="events"
-        >
-          <el-amap-marker :position="center"></el-amap-marker>
-        </el-amap>
-        <!-- 展示经纬度 -->
-        <div class="pos-contain">
-          <div class="pos longitude">经度:{{ center[0] }}</div>
-          <div class="pos latitude">纬度:{{ center[1] }}</div>
-        </div>
-      </div>
-    </div>
-    <!-- 确定按钮 -->
-    <div style="display: flex; justify-content: end">
-      <el-button type="primary" style="margin-top: 20px" @click="handleClick"
-        >确认</el-button
-      >
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-//引入 获取实例
-import { AMapManager } from "vue-amap";
-let amapManager = new AMapManager();
-let Geocoder; //先声明变量，
-export default {
-  data() {
-    let self = this;
-    return {
-      dialogVisible: false,
-
-      amapManager,
-      zoom: 12,
-      input: "",
-      markers: [],
-      searchOption: {
-        city: "全国",
-      },
-      center: [120.19, 30.26],
-      events: {
-        init: (o) => {
-          // Geocoder=o
-          o.getCity((result) => {
-            // console.log(result);
-          });
-        },
-        moveend: () => {},
-        zoomchange: () => {},
-        click: (e) => {
-          self.center = [e.lnglat.lng, e.lnglat.lat];
-          console.log(self.center)
-          // console.log(Geocoder);
-          Geocoder.getAddress(self.center, function (status, result) {
-            //根据坐标获取位置
-            // console.log(status === "complete" && result.info === "OK")
-            if (status === "complete" && result.info === "OK") {
-              self.input = result.regeocode.formattedAddress;
-
-              self.$refs.searchBox.keyword = self.input;
-            }
-          });
-        },
-      },
-      plugin: [
-        {
-          pName: "Geocoder", //使用AMap.Geocoder插件
-          events: {
-            init(o) {
-              Geocoder = o; // o 则是AMap.Geocoder的实例 对外部的Geocoder变量进行赋值，在任何地方就都可以使用了
-              //self.center 具体坐标 （数组格式） ，function 回调函数
-              o.getAddress(self.center, function (status, result) {
-                if (status === "complete" && result.info === "OK") {
-                  //result.regeocode.formattedAddress就是具体位置
-                  self.input = result.regeocode.formattedAddress;
-                  //对搜索组件的input进行赋值
-                  self.$refs.searchBox.keyword = self.input;
-                }
-              });
-            },
-          },
-        },
-        {
-          showMarker: true, //定位成功后在定位到的位置显示点标记，默认：true
-          pName: "Geolocation", // AMap-Geolocation 定位插件
-          events: {
-            init(o) {
-              //getCurrentPosition 获取当前位置的方法
-              //注意 虽然进页面就会调用这个方法，但是data()中center要有默认值，不然会报错
-              
-              o.getCurrentPosition((status, result) => {
-                // console.log('11111,',result.position)
-                if (result && result.position) {
-                  let lng = result.position.lng;
-                  let lat = result.position.lat;
-                  self.center = [lng, lat];
-                  self.loaded = true;
-                  self.zoom = 14;
-                  Geocoder.getAddress(self.center, function (status, result) {
-                  //根据坐标获取位置
-                  // console.log(status === "complete" && result.info === "OK")
-                  if (status === "complete" && result.info === "OK") {
-                    self.input = result.regeocode.formattedAddress;
-
-                    self.$refs.searchBox.keyword = self.input;
-                  }
-                  });
-                  self.$nextTick();
-                }
-              });
-            },
-          },
-        },
-      ],
-    };
-  },
-
-  methods: {
-    init() {
-      this.dialogVisible = true;
-      // this.$emit("refreshMapIp");
-    },
-    handleClose(done) {
-      this.$confirm("确认关闭？")
-        .then((_) => {
-          done();
-        })
-        .catch((_) => {});
-    },
-    //点击搜索后触发的事件
-    onSearchResult(pois) {
-      // console.log(this.input)
-      console.log(document.querySelector(".search-box-wrapper input").value);
-      // this.input = document.querySelector(".search-box-wrapper input").value;
-      console.log(pois);
-      //这边类似模糊查询 会返回一个数组，我就直接取第一个值了。
-      // console.log(pois)
-      this.center = [pois[0].lng, pois[0].lat];
-    },
-    //向父组件传递经纬度
-    handleClick() {
-      this.$emit("getPos", this.center);
-      this.dialogVisible = false;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.amap-wrapper {
-  width: 100%;
-  height: 900px;
-}
-.amap-page-container {
-  position: relative;
-}
-.search-box {
-  position: absolute;
-  top: 20px;
-  left: 20px;
-}
-.pos-contain {
-  position: absolute;
-  bottom: 21.5px;
-  left: 60px;
-}
-.pos {
-  background: #fff;
-  box-shadow: 0 2px 2px rgba(0, 0, 0, 0.15);
-  border-radius: 2px 3px 3px 2px;
-  // width: 80px;
-  padding: 6px 6px;
-
-  // height: 40px;
-  // line-height: 40px;
-  text-align: center;
-  font-size: 18px;
-  float: left;
-}
-.latitude {
-  // left:120px;
-  margin-left: 20px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/integral-statistics/integral-detail.vue b/src/views/modules/integral-statistics/integral-detail.vue
deleted file mode 100644
index d648626..0000000
--- a/src/views/modules/integral-statistics/integral-detail.vue
+++ /dev/null
@@ -1,400 +0,0 @@
-<!--
- * @Author: cwl
- * @Date: 2021-12-20 16:20:14
- * @LastEditTime: 2022-04-16 19:35:51
- * @LastEditors: chenkangxu
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\integral-statistics\integral-detail.vue
--->
-<template>
-  <div class="_tablepage">
-    <searchForm
-      ref="searchForm"
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm>
-    <cusTable
-      :loading="loading"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable>
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    >
-        <paper slot="dialog__content" :paper="paper" :problemList="problemList" />
-    </modal>
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  data() {
-    return {
-      //加载动画
-      loading:false,
-      typeList: [],
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-            { type: "Input", label: "姓名", prop: "name" },
-            { type: "Input", label: "红色护照号", prop: "redPassportNumber" },
-            { type: "Input", label: "手机号", prop: "cellphone" },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          name: "",
-          redPassportNumber: "",
-          cellphone: '',
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            handle: () => {
-              this.$refs.searchForm.$refs.searchFormRef.validate(valid=>{
-                if (valid) {
-                   this.searchTableList()
-                } else {
-                  // console.log('error submit!!');
-                  return false;
-                }
-              })
-             
-            },
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {label:'导出Excel',type:'primary',handle:()=>{
-            // console.log(document.querySelector("#table1"))
-            // document.querySelector("#cesTable")
-             // 初始化obj
-              var obj = {};
-              Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-              obj.page = 1;
-              obj.limit = 99999;
-               delete obj["pageSizeRange"];
-             this.$api.getIntegralDetail(obj).then((res) => {
-               
-                 this.$exportExcel(res.data.page.list,this.pageData.tableCols);
-              });
-           
-          }}
-          // {
-          //   label: "新增",
-          //   type: "primary",
-          //   handle: () => this.showModal(this.commonConstants.modalType.insert),
-          //   auth: "reportDatasource_insert",
-          // },
-          // {
-          //   label: "批量删除",
-          //   type: "danger",
-          //   handle: () => this.deleteBatch(),
-          //   auth: "reportDatasource_batchDelete",
-          // },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-            { label: "姓名", prop: "name", align: "center" },
-             { label: "红色护照号", prop: "redPassportNumber", align: "center" },
-          { label: "性别", prop: "sex", align: "center" },
-           { label: "联系电话", prop: "cellphone", align: "center" },
-            { label: "地址/所在地", prop: "address", align: "center" },
-          { label: "今日积分", prop: "todayScore", align: "center" },
-          { label: "总积分", prop: "integral", align: "center" },
-          { label: "红星币", prop: "starCoin", align: "center" }, 
-          
-          { label: "等级", prop: "levelType", align: "center",type:'html',html:(row)=>{
-              let i=0;
-              let str='';
-              let url=require('../../../assets/images/badge.png')
-              while(i<row.levelType){   
-                  str+= `<div style="vertical-align:top;display:inline-block;width:20px;height:20px;background:url(${url});background-size:100% 100%"></div>`
-                  i++
-              }
-              return   str;
-          }
-         
-          },
-         
-         
-         
-        //   {
-        //     label: "操作",
-        //     align: "center",
-        //     type: "button",
-        //     fixed: "right",
-        //     btnList: [
-        //       {
-        //         label: "阅卷",
-        //         type: "text",
-        //         auth: "reportDatasource_update",
-        //         handle: (row) =>
-        //           this.showModal(this.commonConstants.modalType.update, row),
-        //       },
-            //   {
-            //     label: "删除",
-            //     type: "text",
-            //     auth: "reportDatasource_delete",
-            //     handle: (row) => this.deleteOne(row.contentInfoId),
-            //   },
-        //     ],
-        //   },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "80vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-        ],
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          userId: "",
-          name: "",
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-
-        GradeList:[],//根据学校查询出来的年级和班级的原始数据
-      },
-      paper:{},
-      problemList:[],//当前学生课程的详细数据
-    };
-  },
-  activated() {
-        this.searchTableList();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList() {
-      this.loading=true;
-      // 初始化obj
-      var obj = {};
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      obj.page = this.pageData.tablePage.currentPage;
-      obj.limit = this.pageData.tablePage.pageSize;
-      delete obj["pageSizeRange"];
-      // 请求数据
-      this.$api.getIntegralDetail(obj).then((res) => {
-        this.paper=res.data.data
-        this.commonUtil.tableAssignment(
-          res.data.page,
-          this.pageData.tablePage,
-          this.pageData.tableData
-        );
-      })
-      .finally(()=>{
-        this.loading=false;
-      })
-    },
-    // 重置
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      
-      this.searchTableList();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.pageData.modalData.fileList = [];
-      this.problemList=row.problemList
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      // if (type != this.commonConstants.modalType.insert) {
-      //   this.pageData.modalForm[0].disabled = true;
-      //   this.getDetail(row);
-      // } else {
-      //   this.pageData.modalForm[0].disabled = false;
-      // }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      this.pageData.modalData = JSON.parse(JSON.stringify(row));
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      // this.$refs["modalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.modalConfig.show = false; //关闭modal
-      // this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.pageData.modalData.userId = this.$store.state.user.id;
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.giveTeacher(content).then((res) => {
-              this.searchTableList();
-            });
-          } else {
-            this.$api.updateRedTeacher(content).then((res) => {
-              this.searchTableList();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteRedContentInfo(ids).then((res) => {
-            this.searchTableList();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].contentInfoId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteRedContentInfo(ids).then((res) => {
-              this.searchTableList();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/integral-statistics/integral-overview.vue b/src/views/modules/integral-statistics/integral-overview.vue
deleted file mode 100644
index 028acfc..0000000
--- a/src/views/modules/integral-statistics/integral-overview.vue
+++ /dev/null
@@ -1,304 +0,0 @@
-<!--
- * @Author: cwl
- * @Date: 2021-12-20 16:20:02
- * @LastEditTime: 2022-04-16 19:33:04
- * @LastEditors: chenkangxu
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\integral-statistics\integral-overview.vue
--->
-<template>
-  <div class="_tablepage">
-    <div class="title">
-      <div style="margin-bottom: 20px">数据说明</div>
-      <div>以下数据统计概览为当前账号所属教育局/学校下的学生积分概况</div>
-    </div>
-    <div class="ImpNumber">
-      <div class="ImpNumber-content">
-        <div style="font-size: 16px; margin-bottom: 5px">总用户数</div>
-        <div style="font-size: 16px; margin-bottom: 12px">
-          {{ statisticsData.userNumber }}
-        </div>
-        <div style="font-size: 14px">
-          用户数比较前一天上涨<span
-            :style="{
-              paddingLeft: '3px',
-              color:
-                Number(statisticsData.upUserPercent * 100).toFixed(2) > 0
-                  ? 'red'
-                  : Number(statisticsData.upUserPercent * 100).toFixed(2) < 0
-                  ? 'green'
-                  : '',
-            }"
-            >{{
-              Number(statisticsData.upUserPercent * 100).toFixed(2) + "%"
-            }}</span
-          >
-        </div>
-        <div
-          class="ImpNumber-content-img"
-          :style="{
-            background:
-              'url(' + require('../../../assets/images/totalUser.svg') + ')',
-            backgroundSize: '100% 100%',
-          }"
-        ></div>
-      </div>
-      <div class="ImpNumber-content">
-        <div style="font-size: 16px; margin-bottom: 5px">今日活跃人数</div>
-        <div style="font-size: 16px; margin-bottom: 12px">
-          {{ statisticsData.todayActive }}
-        </div>
-        <div style="font-size: 14px">
-          活跃人数比较前一天上涨<span
-            :style="{
-              paddingLeft: '3px',
-              color:
-                Number(statisticsData.upActivePercent * 100).toFixed(2) > 0
-                  ? 'red'
-                  : Number(statisticsData.upActivePercent * 100).toFixed(2) < 0
-                  ? 'green'
-                  : '',
-            }"
-            >{{ Number(statisticsData.upActivePercent * 100).toFixed(2) }}</span
-          >
-        </div>
-        <div
-          class="ImpNumber-content-img"
-          :style="{
-            background:
-              'url(' + require('../../../assets/images/activeUser.svg') + ')',
-            backgroundSize: '100% 100%',
-          }"
-        ></div>
-      </div>
-      <div class="ImpNumber-content">
-        <div style="font-size: 16px; margin-bottom: 20px">平均分</div>
-        <div style="font-size: 20px">
-          {{ Number(statisticsData.avgScore).toFixed(2) }}
-        </div>
-
-        <div
-          class="ImpNumber-content-img"
-          :style="{
-            background:
-              'url(' + require('../../../assets/images/average.svg') + ')',
-            backgroundSize: '100% 100%',
-          }"
-        ></div>
-      </div>
-      <div class="ImpNumber-content" style="margin-right: 0px">
-        <div style="font-size: 16px; margin-bottom: 20px">最高分</div>
-        <div style="font-size: 20px">
-          {{ statisticsData.maxScore }}
-        </div>
-        <div
-          class="ImpNumber-content-img"
-          :style="{
-            background:
-              'url(' + require('../../../assets/images/upUser.svg') + ')',
-            backgroundSize: '100% 100%',
-          }"
-        ></div>
-      </div>
-    </div>
-    <div id="chart" style="height: 400px; width: 100%"></div>
-    <div id="chart1" style="height: 400px; width: 100%"></div>
-  </div>
-</template>
-<script>
-import * as echarts from "echarts";
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  data() {
-    return {
-      statisticsData: {},
-    };
-  },
-  activated() {
-    this.findAll();
-  },
-  watch: {},
-  methods: {
-    findAll() {
-      this.$api.getIntegralOverview().then((res) => {
-        this.statisticsData = res.data.data;
-        this.initChart();
-      });
-    },
-    initChart() {
-      var chartDom = document.getElementById("chart");
-      var chartDom1 = document.getElementById("chart1");
-      var myChart = echarts.init(chartDom);
-      var myChart1 = echarts.init(chartDom1);
-      var option;
-      let xAxisData = [];
-      let seriesData = [];
-      let arr = this.statisticsData.activeUserList;
-
-      for (let i = 0; i < arr.length; i++) {
-        xAxisData.push(arr[i].date);
-        seriesData.push(arr[i].number);
-      }
-      let xAxisData1 = [];
-      let seriesData1 = [];
-      let arr1 = this.statisticsData.scoreList;
-
-      for (let i = 0; i < arr1.length; i++) {
-        xAxisData1.push(arr1[i].date);
-        seriesData1.push(arr1[i].score);
-      }
-      // console.log(xAxisData1,seriesData1)
-      option = {
-        xAxis: {
-          type: "category",
-          data: xAxisData,
-        },
-        yAxis: {
-          type: "value",
-          minInterval: 1,
-        },
-        title: [
-          {
-            left: "center",
-            text: "每日活跃人数",
-          },
-        ],
-        tooltip: {
-          trigger: "axis",
-        },
-        grid: {
-          x: 30,
-          y: 40,
-          x2: 30,
-          y2: 45,
-        },
-        series: [
-          {
-            itemStyle: {
-              normal: {
-                color: "#E00000",
-                lineStyle: {
-                  color: "#E00000",
-                },
-              },
-            },
-            data: seriesData,
-            type: "line",
-            smooth: true,
-          },
-        ],
-      };
-      let option1 = {
-        xAxis: {
-          type: "category",
-          data: xAxisData1,
-        },
-        tooltip: {
-          trigger: "axis",
-        },
-        yAxis: {
-          type: "value",
-          minInterval: 1,
-        },
-        title: [
-          {
-            left: "center",
-            text: "每日发放积分",
-          },
-        ],
-        grid: {
-          x: 30,
-          y: 40,
-          x2: 30,
-          y2: 45,
-        },
-        series: [
-          {
-            itemStyle: {
-              normal: {
-                color: "#E00000",
-                lineStyle: {
-                  color: "#E00000",
-                },
-              },
-            },
-            data: seriesData1,
-            type: "line",
-            smooth: true,
-          },
-        ],
-      };
-      option1 && myChart1.setOption(option1);
-      option && myChart.setOption(option);
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.title {
-  // height: 50px;
-  padding: 10px;
-  border: 1px solid #1e90ff;
-  color: rgb(100, 100, 100);
-  background-color: rgba(135, 206, 250, 0.2);
-  margin-bottom: 10px;
-}
-.ImpNumber {
-  width: 100%;
-  display: flex;
-  flex-wrap: wrap;
-  font-size: 0px;
-  margin-bottom: 15px;
-  .ImpNumber-content {
-    display: inline-block;
-    vertical-align: top;
-    padding: 20px;
-    margin: 10px;
-    margin-right: 20px;
-    background: rgb(250, 250, 250);
-    min-width: 250px;
-    position: relative;
-    color: rgb(100, 100, 100);
-    .detail {
-      padding-left: 20px;
-      position: relative;
-      color: #00bfff;
-      cursor: pointer;
-      .detail-table {
-        position: absolute;
-        height: 16px;
-        width: 200px;
-        // background: red;
-        padding-left: 10px;
-        left: 48px;
-        top: 0px;
-        display: none;
-        .detail-table-content {
-          position: relative;
-          z-index: 999;
-          top: -50px;
-          height: 500px;
-          width: 500px;
-        }
-      }
-    }
-    .detail:hover {
-      .detail-table {
-        display: block;
-      }
-    }
-    .ImpNumber-content-img {
-      position: absolute;
-      width: 50px;
-      height: 50px;
-      background: red;
-      right: 20px;
-      top: 18px;
-      // border-radius: 50%;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/integral/agreement/integralDescription.vue b/src/views/modules/integral/agreement/integralDescription.vue
deleted file mode 100644
index 4326cc5..0000000
--- a/src/views/modules/integral/agreement/integralDescription.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<!--
- * @author: ym
- * @Date: 2021-10-10 13:45:17
- * @LastEditTime: 2022-01-02 19:53:23
- * @LastEditors: Please set LastEditors
- * @Description: 
- * @FilePath: \background-front-end\src\views\modules\integral\agreement\integralDescription.vue
--->
-<template>
-  <div :key="check">
-    <notice/>
-    <Tinymce
-      v-model="tinymceData.content"
-      placeholder="请输入表单描述"
-    />
-    <div style="padding:20px 0">
-      <el-button type="primary" @click="save">保存</el-button>
-    </div>
-    
-  </div>
-</template>
-<script>
-import notice from '@/components/tinymce/notice.vue'
-import Tinymce from "@/components/tinymce/index.vue";
-export default {
-  components: {
-    Tinymce,
-    notice
-  },
-  activated() {
-    this.check = true;
-    // console.log(this.check)
-    this.find();
-  },
-  deactivated() {
-    
-    this.check = false;
-    // console.log(this.check)
-  },
-  data() {
-    return {
-      tinymceData: {
-        content: "",
-      },
-      integralData: {},
-      check: true,
-    };
-  },
-  methods: {
-    find() {
-      this.$api.getInteralAgreement(1).then((res) => {
-        this.integralData = res.data.obj;
-        this.tinymceData.content = res.data.obj.ruleInfoContent;
-      });
-    },
-    save() {
-      this.$api
-        .saveInteralAgreement(
-          this.integralData.ruleInfoId,
-          this.tinymceData.content,
-          this.integralData.contentType
-        )
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/integral/agreement/redStarCoinDescription.vue b/src/views/modules/integral/agreement/redStarCoinDescription.vue
deleted file mode 100644
index 9b5bda8..0000000
--- a/src/views/modules/integral/agreement/redStarCoinDescription.vue
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
- * @author: ym
- * @Date: 2021-10-10 13:45:17
- * @LastEditTime: 2022-01-02 19:53:46
- * @LastEditors: Please set LastEditors
- * @Description: 
- * @FilePath: \background-front-end\src\views\modules\integral\agreement\redStarCoinDescription.vue
--->
-<template>
-  <div  :key="check">
-    <notice />
-    <Tinymce
-     
-      v-model="tinymceData.content"
-      placeholder="请输入表单描述"
-    />
-    <div style="padding:20px 0">
-      <el-button type="primary" @click="save">保存</el-button>
-    </div>
-    
-  </div>
-</template>
-<script>
-import notice from '@/components/tinymce/notice.vue'
-import Tinymce from "@/components/tinymce/index.vue";
-export default {
-  components: {
-    Tinymce,
-    notice
-  },
-  activated() {
-    this.check = true;
-    this.find();
-  },
-  deactivated() {
-    this.check = false;
-  },
-  data() {
-    return {
-      tinymceData: {
-        content: "",
-      },
-      integralData: {},
-      check: true,
-    };
-  },
-  methods: {
-    find() {
-      this.$api.getInteralAgreement(3).then((res) => {
-        this.integralData = res.data.obj;
-        this.tinymceData.content = res.data.obj.ruleInfoContent;
-      });
-    },
-    save() {
-      this.$api
-        .saveInteralAgreement(
-          this.integralData.ruleInfoId,
-          this.tinymceData.content,
-          this.integralData.contentType
-        )
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/integral/agreement/reminder.vue b/src/views/modules/integral/agreement/reminder.vue
deleted file mode 100644
index 3ac4d9a..0000000
--- a/src/views/modules/integral/agreement/reminder.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<!--
- * @author: ym
- * @Date: 2021-10-10 13:45:17
- * @LastEditTime: 2022-01-02 19:54:05
- * @LastEditors: Please set LastEditors
- * @Description: 
- * @FilePath: \background-front-end\src\views\modules\integral\agreement\reminder.vue
--->
-<template>
-  <div :key="check">
-    <notice/>
-    <Tinymce
-      v-model="tinymceData.content"
-      placeholder="请输入表单描述"
-    />
-    <div style="padding:20px 0">
-      <el-button type="primary" @click="save">保存</el-button>
-    </div>
-    
-  </div>
-</template>
-<script>
-import notice from '@/components/tinymce/notice.vue'
-import Tinymce from "@/components/tinymce/index.vue";
-export default {
-  components: {
-    Tinymce,
-    notice
-  },
-  activated() {
-    this.check=true;
-    this.find();
-  },
-  deactivated(){
-    this.check=false
-  },
-  data() {
-    return {
-      tinymceData: {
-        content: "",
-      },
-      integralData: {},
-      check:true
-    };
-  },
-  methods: {
-    find() {
-      this.$api.getInteralAgreement(2).then((res) => {
-        this.integralData = res.data.obj;
-        this.tinymceData.content = res.data.obj.ruleInfoContent;
-      });
-    },
-    save(){
-          this.$api.saveInteralAgreement(this.integralData.ruleInfoId,this.tinymceData.content,this.integralData.contentType)
-            
-      }
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/integral/integralRule.vue b/src/views/modules/integral/integralRule.vue
deleted file mode 100644
index 6b957ac..0000000
--- a/src/views/modules/integral/integralRule.vue
+++ /dev/null
@@ -1,417 +0,0 @@
-<template>
-  <div>
-    <!-- 表格 -->
-    <cus-table
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      :tableHandles="pageData.tableHandles"
-      @handleSizeChange="findAll()"
-      @handleCurrentChange="findAll()"
-      @selectChange="selectChange"
-    />
-    <!-- dialog -->
-    <modal
-      :modalConfig="modalSetting.modalConfig"
-      :modalData="modalSetting.modalData"
-      :modalForm="modalSetting.modalForm"
-      :modalHandles="modalSetting.modalHandles"
-      labelWidth="140px"
-      ref="modal"
-    />
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-
-export default {
-  components: {
-    cusTable,
-    modal
-  },
-  activated() {
-    this.findAll();
-  },
-  data() {
-    return {
-      //加载动画
-      loading:false,
-      pageData: {
-        tableData: [], //表格数据
-        tableCols: [
-          //表头
-          // {
-          //   label: "规则类型",
-          //   prop: "ruleType",
-          //   align: "center",
-          //   formatter: (prop, row, codeType) =>
-          //     this.getRuleType(prop, row, codeType),
-          // },
-          {
-            label: "规则详情",
-            prop: "ruleInfo",
-            align: "center",
-          },
-          {
-            label: "单次奖励积分数",
-            prop: "integral",
-            align: "center",
-          },
-          {
-            label: "上限奖励次数",
-            prop: "integralLimit",
-            align: "center",
-          },
-          {
-            label: "每日上限/分数",
-            align: "center",
-            prop:'integralAll'
-          },
-          {
-            label: "修改时间",
-            prop: "createTime",
-            align: "center",
-          },
-          {
-            label: "操作",
-            type: "button",
-            align: "center",
-            width: "150px",
-            btnList: [
-              {
-                label: "编辑",
-                type: "text",
-                size: "small",
-                handle: (row) => this.showDialog("edit", row),
-              },
-              {
-                label: "删除",
-                type: "text",
-                size: "small",
-                handle: (row) => this.deleteStarCoin(row.integralRuleId),
-              },
-            ],
-          },
-        ],
-        tablePage: {
-          currentPage: 1,
-          pageSize: 10,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50, 100],
-        }, //分页初始数据
-        tableHandles:[{
-            label:'添加',
-            type:'primary',
-            handle:()=>this.showDialog('add')
-        },
-        {
-            label:'批量删除',
-            type:'danger',
-            handle:()=>this.deleteStarCoin()
-        }]//按钮
-      },
-      modalSetting: {
-        modalForm: [
-          {
-            label: "规则详情",
-            type: "Textarea",
-            prop: "ruleInfo",
-            rules: { required: true },
-          },
-          {
-            label: "规则类型",
-            type: "Select",
-            prop: "ruleType",
-            options: [
-              {
-                label: "登录",
-                value: 1,
-              },
-              {
-                label: "有效阅读资讯",
-                value: 2,
-              },
-              {
-                label: "有效观看视频",
-                value: 3,
-              },
-              {
-                label: "完成爱国主义学习并交卷",
-                value: 4,
-              },
-              {
-                label: "发表一次观点/评论",
-                value: 5,
-              },
-              {
-                label: "参加一次比赛/活动",
-                value: 6,
-              },
-              {
-                label: "打卡成功一次",
-                value: 7,
-              },
-            ],
-            rules: { required: true },
-          },
-          {
-            label: "单次奖励积分数",
-            type: "Input",
-            prop: "integral",
-            rules: { type: "number" },
-            rules: { required: true },
-          },
-          {
-            label: "上限奖励次数",
-            type: "Input",
-            prop: "integralLimit",
-            rules: { type: "number" },
-            rules: { required: true },
-          },
-        ],
-        baseModalForm1:[
-          {
-            label: "规则详情",
-            type: "Textarea",
-            prop: "ruleInfo",
-            rules: { required: true },
-          },
-          {
-            label: "规则类型",
-            type: "Select",
-            prop: "ruleType",
-            options: [
-              {
-                label: "登录",
-                value: 1,
-              },
-              {
-                label: "有效阅读资讯",
-                value: 2,
-              },
-              {
-                label: "有效观看视频",
-                value: 3,
-              },
-              {
-                label: "完成爱国主义学习并交卷",
-                value: 4,
-              },
-              {
-                label: "发表一次观点/评论",
-                value: 5,
-              },
-              {
-                label: "参加一次比赛/活动",
-                value: 6,
-              },
-              {
-                label: "打卡成功一次",
-                value: 7,
-              },
-            ],
-            rules: { required: true },
-          },
-          {
-            label: "单次奖励积分数",
-            type: "Input",
-            prop: "integral",
-            rules: { type: "number" },
-            rules: { required: true },
-          },
-          {
-            label: "上限奖励次数",
-            type: "Input",
-            prop: "integralLimit",
-            rules: { type: "number" },
-            rules: { required: true },
-          },
-        ],
-        baseModalForm2:[
-          {
-            label: "规则详情",
-            type: "Textarea",
-            prop: "ruleInfo",
-            rules: { required: true },
-          },
-          {
-            label: "规则类型",
-            type: "Select",
-            prop: "ruleType",
-            options: [
-              {
-                label: "登录",
-                value: 1,
-              },
-              {
-                label: "有效阅读资讯",
-                value: 2,
-              },
-              {
-                label: "有效观看视频",
-                value: 3,
-              },
-              {
-                label: "完成爱国主义学习并交卷",
-                value: 4,
-              },
-              {
-                label: "发表一次观点/评论",
-                value: 5,
-              },
-              {
-                label: "参加一次比赛/活动",
-                value: 6,
-              },
-              {
-                label: "打卡成功一次",
-                value: 7,
-              },
-            ],
-            rules: { required: true },
-          },
-          {
-            label: "单次奖励积分数",
-            type: "Input",
-            prop: "integral",
-            rules: { type: "number" },
-            rules: { required: true },
-          }
-        ],
-        modalData: {
-          ruleInfo: "",
-          ruleType: "",
-          integral: "",
-          integralLimit: "",
-        },
-        modalConfig: {
-          show: false,
-          title: "添加积分规则",
-          closeOnClick: true,
-        },
-        modalHandles: [
-          {
-            label: "确认",
-            type: "primary",
-            handle: () => this.onSubmit(),
-          },
-        ],
-      },
-    };
-  },
-  methods: {
-    findAll() {
-      this.loading=true;
-       let params={}
-      params.page=this.pageData.tablePage.currentPage
-      params.limit=this.pageData.tablePage.pageSize
-      this.$api.getIntegralRule(params).then((res) => {
-          this.pageData.tableData=res.data.page.list
-          this.pageData.tablePage.pageTotal = res.data.page.totalCount;
-          this.loading=false;
-      });
-    },
-    //根据ruletype返回ruleTypeName
-    getRuleType(prop, row, codeType) {
-      if (row[prop] == 1) return "登录";
-      else if (row[prop] == 2) return "有效阅读资讯";
-      else if (row[prop] == 3) return "有效观看视频";
-      else if (row[prop] == 4) return "完成爱国主义学习并交卷";
-      else if (row[prop] == 5) return "发表一次观点/评论";
-      else if (row[prop] == 6) return "参加一次比赛/活动";
-      else if (row[prop] == 7) return "打卡成功一次";
-      else return "暂无";
-    },
-    //获取选中数据
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-    showDialog(type, data) {
-      if (type === "add") {
-        this.modalSetting.modalForm=this.modalSetting.baseModalForm1;
-        this.modalSetting.modalConfig.show = true;
-        this.modalSetting.modalConfig.title = "添加积分规则";
-        if(this.$refs["modal"].$refs["modalFormRef"])
-           {
-              this.commonUtil.clearObj(this.modalSetting.modalData)
-              this.$nextTick(()=>{
-                this.$refs["modal"].$refs["modalFormRef"].clearValidate();
-              })
-           }
-      } else if (type === "edit") {
-        if(data.isOnly){
-          this.modalSetting.modalForm=this.modalSetting.baseModalForm2;
-        }
-        else{
-          this.modalSetting.modalForm=this.modalSetting.baseModalForm1;
-        }
-        this.modalSetting.modalConfig.show = true;
-        this.modalSetting.modalConfig.title = "编辑积分规则";
-        this.$nextTick(()=>{
-            this.modalSetting.modalData = JSON.parse(JSON.stringify(data));
-        })
-      }
-    },
-    add() {
-      this.$api.addIntegralRule(this.modalSetting.modalData).then((res) => {
-        
-        this.modalSetting.modalConfig.show = false;
-        this.findAll();
-      });
-    },
-    update() {
-      this.$api
-        .updateIntegralRule(this.modalSetting.modalData)
-        .then((res) => {
-          
-          this.modalSetting.modalConfig.show = false;
-          this.findAll();
-        });
-    },
-    onSubmit() {
-      this.$refs["modal"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          if (this.modalSetting.modalConfig.title === "添加积分规则")
-            this.add();
-          else if (this.modalSetting.modalConfig.title === "编辑积分规则")
-            this.update();
-        } else {
-          
-          return false;
-        }
-      });
-    },
-    deleteStarCoin(id) {
-      let data = [];
-      this.$confirm("此操作将永久删除该规则, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          if (id) {
-            data = [id];
-          } else {
-            data=this.pageData.selectList.map((item)=>{
-                return item.integralRuleId
-            })
-          }
-          this.$api.deleteIntegralRule(data).then((res) => {
-            if (res.data.msg === "success")
-              
-            this.findAll()  
-          });
-        })
-        .catch(() => {
-          
-        });
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/integral/rank.vue b/src/views/modules/integral/rank.vue
deleted file mode 100644
index 479c537..0000000
--- a/src/views/modules/integral/rank.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-    <div>
-        <!-- 表格组件 -->
-        <cus-table 
-        :isPagination="false"
-        :isHandle="true"
-        :tableCols="pageData.tableCols"
-        :tableData="pageData.tableData"
-        :isIndex="true"
-        :loading="loading"
-        />
-        <!-- 编辑dialog -->
-        <el-dialog
-        title="编辑段位名称"
-        :visible.sync="dialogVisible"
-        width="40%"
-        :close-on-click-modal="false"
-        >
-            <el-form ref="form" :model="form" label-width="100px">
-                <el-form-item label="段位名称">
-                    <el-input v-model="form.levelTitle" />
-                </el-form-item>
-                <el-form-item label="段位等级">
-                     <el-input v-model="form.levelType" />
-                </el-form-item>
-                <el-form-item label="段位描述">
-                    <el-input v-model="form.levelDescribe" />
-                </el-form-item>
-                <el-form-item label="段位最低分">
-                    <el-input v-model="form.underScore" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" @click="onSubmit">保存</el-button>
-                    <el-button @click="closeDialog">取消</el-button>
-                </el-form-item>
-            </el-form>
-        </el-dialog>
-    </div>
-</template>
-<script>
-import cusTable from '../../../components/common/table/custable.vue'
-import {findLevelType,savelevelType} from '../../../api/modules/intetral'
-export default {
-    components:{
-        cusTable
-    },
-    activated(){
-        this.findAll()
-    },
-    data(){
-        return{
-            //加载动画
-            loading:false,
-            pageData:{
-                //表头
-                tableCols:[{
-                    label:'段位等级',
-                    prop:'levelType'
-                },
-                {
-                    label:'段位名称',
-                    prop:'levelTitle'
-                },
-                {
-                    label:'创建时间',
-                    prop:'createTime'
-                },
-                {
-                    label:'更新时间',
-                    prop:'updateTime'
-                },
-                {
-                    label:'段位描述',
-                    prop:'levelDescribe'
-                },
-                {
-                    label:'段位最低分',
-                    prop:'underScore'
-                },
-                {
-                    label:'操作',
-                    type:'button',
-                    width:"55px",
-                    btnList:[
-                        {
-                            label: "编辑",
-                            type: "text",
-                            
-                            size: "small",
-                            handle: (row) => this.showDialog(row),
-                        },
-                    ]
-                }],
-                //表数据
-                tableData:[]
-            },
-            dialogVisible:false,
-            form:{//绑定编辑dialog
-                levelId:'',
-                levelTitle:'',
-                levelType:'',
-                levelDescribe:'',
-                underScore:''
-            }
-        }
-    },
-    methods:{
-        findAll(){
-            this.loading=true;
-            findLevelType().then(res=>{
-                this.pageData.tableData=res.data.page.list
-                this.loading=false
-            })
-        },
-        showDialog(data){
-            this.form.levelId=data.levelId
-            this.form.levelTitle=data.levelTitle
-            this.form.levelType=data.levelType
-            this.form.levelDescribe=data.levelDescribe
-            this.form.underScore=data.underScore
-            this.dialogVisible=true
-        },
-        onSubmit(){
-            savelevelType({...this.form}).then(res=>{
-                
-                this.dialogVisible=false
-                this.findAll()
-            })
-        },
-        //关闭编辑弹窗
-        closeDialog() {
-            this.dialogVisible = false
-         }
-    }
-}
-</script>
\ No newline at end of file
diff --git a/src/views/modules/integral/redStarCoin.vue b/src/views/modules/integral/redStarCoin.vue
deleted file mode 100644
index 8ab6df0..0000000
--- a/src/views/modules/integral/redStarCoin.vue
+++ /dev/null
@@ -1,289 +0,0 @@
-<template>
-  <div>
-    <!-- 表格 -->
-    <cus-table
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      :tableHandles="pageData.tableHandles"
-      @handleSizeChange="findAll()"
-      @handleCurrentChange="findAll()"
-      @selectChange="selectChange"
-    />
-    <!-- 弹窗 -->
-    <modal
-      :modalConfig="modalSetting.modalConfig"
-      :modalData="modalSetting.modalData"
-      :modalForm="modalSetting.modalForm"
-      :modalHandles="modalSetting.modalHandles"
-      labelWidth="140px"
-      ref="modal"
-    />
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: {
-    cusTable,
-    modal,
-  },
-  activated() {
-    this.findAll();
-  },
-  data() {
-    return {
-      //加载动画
-      loading:false,
-      pageData: {
-        tableData: [], //表格数据
-        tableCols: [
-          //表头
-          {
-            label: "规则类型",
-            prop: "ruleType",
-            align: "center",
-            formatter: (prop, row, codeType) =>
-              this.getRuleType(prop, row, codeType),
-          },
-          {
-            label: "规则详情",
-            prop: "ruleInfo",
-            align: "center",
-          },
-          {
-            label: "红星币数量",
-            prop: "starCoin",
-            align: "center",
-          },
-          {
-            label: "赠送所需累计观看",
-            prop: "cumulativeTimesLimit",
-            align: "center",
-          },
-          {
-            label: "每日上限次数",
-            prop: "dailyLimitTimes",
-            align: "center",
-          },
-          {
-            label: "修改时间",
-            prop: "createTime",
-            align: "center",
-          },
-          {
-            label: "操作",
-            type: "button",
-            align: "center",
-            width: "150px",
-            btnList: [
-              {
-                label: "编辑",
-                type: "text",
-                size: "small",
-                handle: (row) => this.showDialog("edit", row),
-              },
-              {
-                label: "删除",
-                type: "text",
-                size: "small",
-                handle: (row) => this.deleteStarCoin(row.starCoinRuleId),
-              },
-            ],
-          },
-        ],//表头数据
-        selectList:[],//选中的行
-        tablePage: {
-          currentPage: 1,
-          pageSize: 10,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50, 100],
-        }, //分页初始数据
-        tableHandles:[{
-            label:'添加',
-            type:'primary',
-            handle:()=>this.showDialog('add')
-        },
-        {
-            label:'批量删除',
-            type:'danger',
-            handle:()=>this.deleteStarCoin()
-        }]//按钮
-      },
-      modalSetting: {
-        modalForm: [
-          {
-            label: "规则详情",
-            type: "Input",
-            prop: "ruleInfo",
-            rules: { required: true },
-          },
-          {
-            label: "规则类型",
-            type: "Select",
-            prop: "ruleType",
-            options: [
-              {
-                label: "有效浏览",
-                value: 1,
-              },
-              {
-                label: "有效观看",
-                value: 2,
-              },
-              // {
-              //   label: "学习答题满分",
-              //   value: 3,
-              // },
-            ],
-            rules: { required: true },
-          },
-          {
-            label: "红星币数量",
-            type: "Input",
-            prop: "starCoin",
-            rules: { type: "number" },
-            rules: { required: true },
-          },
-          {
-            label: "赠送所需累计观看",
-            type: "Input",
-            prop: "cumulativeTimesLimit",
-            rules: { type: "number" },
-            rules: { required: true },
-          },
-          {
-            label: "每日上限次数",
-            type: "Input",
-            prop: "dailyLimitTimes",
-            rules: { type: "number" },
-            rules: { required: true },
-          },
-        ],
-        modalData: {
-          ruleInfo: "",
-          ruleType: "",
-          starCoin: "",
-          cumulativeTimesLimit: "",
-          dailyLimitTimes: "",
-        },
-        modalConfig: {
-          show: false,
-          title: "添加红星币规则",
-          closeOnClick: true,
-        },
-        modalHandles: [
-          {
-            label: "确认",
-            type: "primary",
-            handle: () => this.onSubmit(),
-          },
-        ],
-      },
-    };
-  },
-  methods: {
-    findAll() {
-      this.loading=true;
-      let params={}
-      params.page=this.pageData.tablePage.currentPage
-      params.limit=this.pageData.tablePage.pageSize
-      this.$api.getRedCoinRule(params).then((res) => {
-        this.pageData.tableData = res.data.page.list;
-        this.pageData.tablePage.pageTotal = res.data.page.totalCount;
-        this.loading=false;
-      });
-    },
-    //根据ruletype返回ruleTypeName
-    getRuleType(prop, row, codeType) {
-      if (row[prop] == 1) return "有效浏览";
-      else if (row[prop] == 2) return "有效观看";
-      // else if (row[prop] == 3) return "学习答题满分";
-      else return "暂无";
-    },
-    add() {
-      this.$api.addRedCoinRule(this.modalSetting.modalData).then((res) => {
-       
-        this.modalSetting.modalConfig.show = false;
-        this.findAll();
-      });
-    },
-    update() {
-      this.$api
-        .updateRedCoinRule(this.modalSetting.modalData)
-        .then((res) => {
-          
-          this.modalSetting.modalConfig.show = false;
-          this.findAll();
-        });
-    },
-    onSubmit() {
-      this.$refs["modal"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          if (this.modalSetting.modalConfig.title === "添加红星币规则")
-            this.add();
-          else if (this.modalSetting.modalConfig.title === "编辑红星币规则")
-            this.update();
-        } else {
-         
-          return false;
-        }
-      });
-    },
-    showDialog(type, data) {
-      if (type === "add") {
-        this.modalSetting.modalConfig.show = true;
-        this.modalSetting.modalConfig.title = "添加红星币规则";
-        if(this.$refs["modal"].$refs["modalFormRef"]){
-            this.commonUtil.clearObj(this.modalSetting.modalData)
-            this.$nextTick(()=>{
-              this.$refs["modal"].$refs["modalFormRef"].clearValidate();
-            })
-            
-        }
-           
-      } else if (type === "edit") {
-        this.modalSetting.modalConfig.show = true;
-        this.modalSetting.modalConfig.title = "编辑红星币规则";
-        this.$nextTick(()=>{
-            this.modalSetting.modalData = JSON.parse(JSON.stringify(data));
-        })
-      }
-    },
-    deleteStarCoin(id) {
-      let data = [];
-      this.$confirm("此操作将永久删除该规则, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          if (id) {
-            data = [id];
-          } else {
-            data=this.pageData.selectList.map((item)=>{
-                return item.starCoinRuleId
-            })
-          }
-          this.$api.deleteRedCoinRule(data).then((res) => {
-            
-            this.findAll()  
-          });
-        })
-        .catch(() => {
-          
-        });
-    },
-    //获取选中数据
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/integral/upload.vue b/src/views/modules/integral/upload.vue
deleted file mode 100644
index cb43b62..0000000
--- a/src/views/modules/integral/upload.vue
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-10-30 15:54:44
- * @LastEditTime: 2021-12-02 20:05:45
- * @LastEditors: your name
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\integral\upload.vue
--->
-<template>
-    <div >
-        <div class="contain">
-            <div style="font-size:20px;margin-bottom: 10px;">升级所需积分设定:</div>
-            <el-input class="mt-10"  oninput="value=value.replace(/[^\d]/g,'')" v-model="content" />
-            <el-button class="mt-10" @click="save" type="primary">保存</el-button>
-        </div>
-    </div>
-</template>
-<script>
-import {findUploadIntegral,saveUploadIntegral} from '../../../api/modules/intetral'
-export default {
-    data(){
-        return{
-            content:'',
-            id:''
-        }
-    },
-    activated(){
-        this.find()
-    },
-    methods:{
-        find(){
-            findUploadIntegral().then(res=>{
-                this.id=res.data.redIntegralUpgrade.upgradeId
-                this.content=res.data.redIntegralUpgrade.integral
-            })
-        },
-        save(){
-            saveUploadIntegral(this.id,this.content)
-        }
-    }
-}
-</script>
-<style scoped>
-.contain{
-    width: 350px;
-    /* margin: auto; */
-    margin-left: 50px;
-    margin-top: 50px;
-}
-.mt-10{
-    margin-top:10px
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/job/schedule-add-or-update.vue b/src/views/modules/job/schedule-add-or-update.vue
deleted file mode 100644
index f392be6..0000000
--- a/src/views/modules/job/schedule-add-or-update.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<template>
-  <el-dialog
-    :title="!dataForm.id ? '新增' : '修改'"
-    :close-on-click-modal="false"
-    :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="100px">
-      <el-form-item label="bean名称" prop="beanName">
-        <el-input v-model="dataForm.beanName" placeholder="spring bean名称, 如: testTask"></el-input>
-      </el-form-item>
-      <el-form-item label="参数" prop="params">
-        <el-input v-model="dataForm.params" placeholder="参数"></el-input>
-      </el-form-item>
-      <el-form-item label="cron表达式" prop="cronExpression">
-        <el-input v-model="dataForm.cronExpression" placeholder="如: 0 0 12 * * ?"></el-input>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-  export default {
-    data () {
-      return {
-        visible: false,
-        dataForm: {
-          id: 0,
-          beanName: '',
-          params: '',
-          cronExpression: '',
-          remark: '',
-          status: 0
-        },
-        dataRule: {
-          beanName: [
-            { required: true, message: '用户名不能为空', trigger: 'blur' }
-          ],
-          cronExpression: [
-            { required: true, message: 'cron表达式不能为空', trigger: 'blur' }
-          ]
-        }
-      }
-    },
-    methods: {
-      init (id) {
-        this.dataForm.id = id || 0
-        this.visible = true
-        this.$nextTick(() => {
-          this.$refs['dataForm'].resetFields()
-          if (this.dataForm.id) {
-            this.$http({
-              url: `/sys/schedule/info/${this.dataForm.id}`,
-              method: 'get',
-              params: this.$http.adornParams()
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.dataForm.beanName = data.schedule.beanName
-                this.dataForm.params = data.schedule.params
-                this.dataForm.cronExpression = data.schedule.cronExpression
-                this.dataForm.remark = data.schedule.remark
-                this.dataForm.status = data.schedule.status
-              }
-            })
-          }
-        })
-      },
-      // 表单提交
-      dataFormSubmit () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            this.$http({
-              url: `/sys/schedule/${!this.dataForm.id ? 'save' : 'update'}`,
-              method: 'post',
-              data: this.$http.adornData({
-                'jobId': this.dataForm.id || undefined,
-                'beanName': this.dataForm.beanName,
-                'params': this.dataForm.params,
-                'cronExpression': this.dataForm.cronExpression,
-                'remark': this.dataForm.remark,
-                'status': !this.dataForm.id ? undefined : this.dataForm.status
-              })
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                    this.visible = false
-                    this.$emit('refreshDataList')
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
-              }
-            })
-          }
-        })
-      }
-    }
-  }
-</script>
diff --git a/src/views/modules/job/schedule-log.vue b/src/views/modules/job/schedule-log.vue
deleted file mode 100644
index fb4b0b4..0000000
--- a/src/views/modules/job/schedule-log.vue
+++ /dev/null
@@ -1,152 +0,0 @@
-<template>
-  <el-dialog
-    title="日志列表"
-    :close-on-click-modal="false"
-    :visible.sync="visible"
-    width="75%">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item>
-        <el-input v-model="dataForm.id" placeholder="任务ID" clearable></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      height="460"
-      style="width: 100%;">
-      <el-table-column
-        prop="logId"
-        header-align="center"
-        align="center"
-        width="80"
-        label="日志ID">
-      </el-table-column>
-      <el-table-column
-        prop="jobId"
-        header-align="center"
-        align="center"
-        width="80"
-        label="任务ID">
-      </el-table-column>
-      <el-table-column
-        prop="beanName"
-        header-align="center"
-        align="center"
-        label="bean名称">
-      </el-table-column>
-      <el-table-column
-        prop="params"
-        header-align="center"
-        align="center"
-        label="参数">
-      </el-table-column>
-      <el-table-column
-        prop="status"
-        header-align="center"
-        align="center"
-        label="状态">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.status === 0" size="small">成功</el-tag>
-          <el-tag v-else @click.native="showErrorInfo(scope.row.logId)" size="small" type="danger" style="cursor: pointer;">失败</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="times"
-        header-align="center"
-        align="center"
-        label="耗时(单位: 毫秒)">
-      </el-table-column>
-      <el-table-column
-        prop="createTime"
-        header-align="center"
-        align="center"
-        width="180"
-        label="执行时间">
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
-    </el-pagination>
-  </el-dialog>
-</template>
-
-<script>
-  export default {
-    data () {
-      return {
-        visible: false,
-        dataForm: {
-          id: ''
-        },
-        dataList: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
-        dataListLoading: false
-      }
-    },
-    methods: {
-      init () {
-        this.visible = true
-        this.getDataList()
-      },
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
-        this.$http({
-          url: '/sys/scheduleLog/list',
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize,
-            'jobId': this.dataForm.id
-          })
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
-          } else {
-            this.dataList = []
-            this.totalPage = 0
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.getDataList()
-      },
-      // 失败信息
-      showErrorInfo (id) {
-        this.$http({
-          url: `/sys/scheduleLog/info/${id}`,
-          method: 'get',
-          params: this.$http.adornParams()
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.$alert(data.log.error)
-          } else {
-            this.$message.error(data.msg)
-          }
-        })
-      }
-    }
-  }
-</script>
diff --git a/src/views/modules/job/schedule.vue b/src/views/modules/job/schedule.vue
deleted file mode 100644
index fb8f3de..0000000
--- a/src/views/modules/job/schedule.vue
+++ /dev/null
@@ -1,301 +0,0 @@
-<template>
-  <div class="mod-schedule">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item>
-        <el-input v-model="dataForm.beanName" placeholder="bean名称" clearable></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-        <el-button v-if="isAuth('sys:schedule:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-        <el-button v-if="isAuth('sys:schedule:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
-        <el-button v-if="isAuth('sys:schedule:pause')" type="danger" @click="pauseHandle()" :disabled="dataListSelections.length <= 0">批量暂停</el-button>
-        <el-button v-if="isAuth('sys:schedule:resume')" type="danger" @click="resumeHandle()" :disabled="dataListSelections.length <= 0">批量恢复</el-button>
-        <el-button v-if="isAuth('sys:schedule:run')" type="danger" @click="runHandle()" :disabled="dataListSelections.length <= 0">批量立即执行</el-button>
-        <el-button v-if="isAuth('sys:schedule:log')" type="success" @click="logHandle()">日志列表</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      @selection-change="selectionChangeHandle"
-      style="width: 100%;">
-      <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50">
-      </el-table-column>
-      <el-table-column
-        prop="jobId"
-        header-align="center"
-        align="center"
-        width="80"
-        label="ID">
-      </el-table-column>
-      <el-table-column
-        prop="beanName"
-        header-align="center"
-        align="center"
-        label="bean名称">
-      </el-table-column>
-      <el-table-column
-        prop="params"
-        header-align="center"
-        align="center"
-        label="参数">
-      </el-table-column>
-      <el-table-column
-        prop="cronExpression"
-        header-align="center"
-        align="center"
-        label="cron表达式">
-      </el-table-column>
-      <el-table-column
-        prop="remark"
-        header-align="center"
-        align="center"
-        label="备注">
-      </el-table-column>
-      <el-table-column
-        prop="status"
-        header-align="center"
-        align="center"
-        label="状态">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.status === 0" size="small">正常</el-tag>
-          <el-tag v-else size="small" type="danger">暂停</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作">
-        <template slot-scope="scope">
-          <el-button v-if="isAuth('sys:schedule:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.jobId)">修改</el-button>
-          <el-button v-if="isAuth('sys:schedule:delete')" type="text" size="small" @click="deleteHandle(scope.row.jobId)">删除</el-button>
-          <el-button v-if="isAuth('sys:schedule:pause')" type="text" size="small" @click="pauseHandle(scope.row.jobId)">暂停</el-button>
-          <el-button v-if="isAuth('sys:schedule:resume')" type="text" size="small" @click="resumeHandle(scope.row.jobId)">恢复</el-button>
-          <el-button v-if="isAuth('sys:schedule:run')" type="text" size="small" @click="runHandle(scope.row.jobId)">立即执行</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
-    </el-pagination>
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-    <!-- 弹窗, 日志列表 -->
-    <log v-if="logVisible" ref="log"></log>
-  </div>
-</template>
-
-<script>
-  import AddOrUpdate from './schedule-add-or-update'
-  import Log from './schedule-log'
-  export default {
-    data () {
-      return {
-        dataForm: {
-          beanName: ''
-        },
-        dataList: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false,
-        logVisible: false
-      }
-    },
-    components: {
-      AddOrUpdate,
-      Log
-    },
-    activated () {
-      this.getDataList()
-    },
-    methods: {
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
-        this.$http({
-          url: '/sys/schedule/list',
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize,
-            'beanName': this.dataForm.beanName
-          })
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
-          } else {
-            this.dataList = []
-            this.totalPage = 0
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.getDataList()
-      },
-      // 多选
-      selectionChangeHandle (val) {
-        this.dataListSelections = val
-      },
-      // 新增 / 修改
-      addOrUpdateHandle (id) {
-        this.addOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
-        })
-      },
-      // 删除
-      deleteHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
-          return item.jobId
-        })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: '/sys/schedule/delete',
-            method: 'post',
-            data: this.$http.adornData(ids, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {})
-      },
-      // 暂停
-      pauseHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
-          return item.jobId
-        })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '暂停' : '批量暂停'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: '/sys/schedule/pause',
-            method: 'post',
-            data: this.$http.adornData(ids, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {})
-      },
-      // 恢复
-      resumeHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
-          return item.jobId
-        })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '恢复' : '批量恢复'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: '/sys/schedule/resume',
-            method: 'post',
-            data: this.$http.adornData(ids, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {})
-      },
-      // 立即执行
-      runHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
-          return item.jobId
-        })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '立即执行' : '批量立即执行'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: '/sys/schedule/run',
-            method: 'post',
-            data: this.$http.adornData(ids, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {})
-      },
-      // 日志列表
-      logHandle () {
-        this.logVisible = true
-        this.$nextTick(() => {
-          this.$refs.log.init()
-        })
-      }
-    }
-  }
-</script>
diff --git a/src/views/modules/local-affairs/class-popup/add-or-update.vue b/src/views/modules/local-affairs/class-popup/add-or-update.vue
deleted file mode 100644
index aefa5aa..0000000
--- a/src/views/modules/local-affairs/class-popup/add-or-update.vue
+++ /dev/null
@@ -1,212 +0,0 @@
-<template>
-  <div>
-    <obj-modal
-      ref="modal"
-      labelWidth="120px"
-      :modalConfig="modalConfig"
-      :modalCols="modalCols"
-      :modalData="modalData"
-      :modalHandles="modalHandles"
-    >
-    </obj-modal>
-  </div>
-</template>
-<script>
-const BASE_MODAL_DATA = () => {
-  return {
-    name: "",
-    gradeId: "",
-    sortKey: "",
-  };
-};
-const ADD_TITLE = "新增班级";
-const EDIT_TITLE = "编辑班级";
-import { cloneDeep } from "lodash";
-export default {
-  data() {
-    return {
-      isAdd: true,
-      isLoading: false,
-      //监控对象数据
-      tableData: [],
-      //表格属性
-      tableProp: {},
-      modalConfig: {
-        fullscreen: false,
-        title: "添加机构",
-        show: false,
-        width: "500px",
-      },
-      modalData: BASE_MODAL_DATA(),
-    };
-  },
-  methods: {
-    toggle(e) {
-      if (this.modalConfig.show == false) {
-        this.modalConfig.show = true;
-      } else {
-        this.modalConfig.show = false;
-      }
-      if (e) {
-        this.init(cloneDeep(e));
-      }
-      return {
-        add: () => {
-          this.$set(this.modalConfig, "title", ADD_TITLE);
-          this.$nextTick(() => {
-            this.modalData = BASE_MODAL_DATA();
-            this.$refs.modal?.resetFields();
-          });
-          this.isAdd = true;
-        },
-        update: () => {
-          if (this.modalData.provinceCode) {
-            this.modalData.areaArray.push(this.modalData.provinceCode);
-          }
-          if (this.modalData.cityCode) {
-            this.modalData.areaArray.push(this.modalData.cityCode);
-          }
-          if (this.modalData.areaCode) {
-            this.modalData.areaArray.push(this.modalData.areaCode);
-          }
-          this.$set(this.modalConfig, "title", EDIT_TITLE);
-          this.isAdd = false;
-        },
-      };
-    },
-    init(row) {
-      this.modalData = row;
-    },
-  },
-  asyncComputed: {
-    // async orgOptions() {
-    //   let res = await this.$api.local_admin.getEducationBureauList();
-    //   console.log(res.data.data);
-    //   return res.data.data;
-    // },
-    async eduDurationOptions() {
-      let res = await this.$api.local_admin.getDictionary("edu_duration");
-      return res.data.data;
-    },
-    async getAreaOptions() {
-      let res = await this.$api.local_admin.getArea();
-      return res.data.data;
-    },
-    async getGradeOptions() {
-      let res = await this.$api.local_admin.getGradeList();
-      console.log("res", res);
-      return res.data.data;
-    },
-  },
-  computed: {
-    modalCols() {
-      return [
-        {
-          label: "班级名称",
-          prop: "name",
-          type: "Input",
-          labelWidth: "80px",
-          width: "100%",
-          require: true,
-          rules: { required: true, message: "班级名称" },
-        },
-        {
-          label: "所属年级",
-          prop: "gradeId",
-          labelWidth: "80px",
-          width: "100%",
-          require: true,
-          rules: { required: true, message: "所属年级" },
-          type: "jsx",
-          render: () => {
-            return (
-              <el-select
-                style="width:100%;"
-                placeholder="请选择班级所属年级"
-                filterable
-                v-model={this.modalData.gradeId}
-              >
-                {this.getGradeOptions.map((item) => {
-                  return (
-                    <el-option
-                      label={item.name}
-                      value={item.id}
-                      key={item.id}
-                    ></el-option>
-                  );
-                })}
-              </el-select>
-            );
-          },
-        },
-        {
-          label: "排序号",
-          prop: "sortKey",
-          type: "Input",
-          labelWidth: "80px",
-          width: "100%",
-          require: true,
-          rules: { required: true, message: "排序号" },
-          type: "jsx",
-          render: () => {
-            const onChange = () => {};
-            return (
-              <el-input-number
-                style="width:100%;"
-                v-model={this.modalData.sortKey}
-                onChange={onChange}
-                min={0}
-                label=""
-              ></el-input-number>
-            );
-          },
-        },
-      ];
-    },
-    modalHandles() {
-      return [
-        {
-          label: "取消",
-          icon: "el-icon-close",
-          handle: () => {
-            this.toggle();
-          },
-        },
-        {
-          label: this.isAdd ? "确认添加" : "确认修改",
-          type: "primary",
-          icon: "el-icon-check",
-          loading: this.isLoading,
-          submit: true,
-          handle: () => {
-            setTimeout(() => {
-              this.isLoading = false;
-            }, 1000);
-            console.log(this.modalData);
-            if (this.isAdd) {
-              this.$api.local_admin.addClass(this.modalData).then((res) => {
-                this.$emit("refresh");
-                this.toggle();
-              });
-            } else {
-              this.$api.local_admin
-                .updateClass(this.modalData)
-                .then((res) => {
-                  this.$emit("refresh");
-                  this.toggle();
-                });
-            }
-
-            // this.api.common.addDict(this.modalData).then((res) => {
-            //   this.emit("refresh");
-            //   this.toggle();
-            // });
-          },
-        },
-      ];
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/modules/local-affairs/class.vue b/src/views/modules/local-affairs/class.vue
deleted file mode 100644
index 4b4cb91..0000000
--- a/src/views/modules/local-affairs/class.vue
+++ /dev/null
@@ -1,128 +0,0 @@
-<template>
-  <div style="height: calc(100vh - 92px - 40px)">
-    <div style="height: 100%">
-      <obj-table-plus
-        ref="oTable"
-        v-model="dataList"
-        @query="queryList"
-        :tableProp="tableProp"
-        :isPagination="false"
-        :tableCols="tableCols"
-      >
-        <div slot="tableTop" class="mb-2">
-          <el-button type="primary" round @click="add">
-            <i class="el-icon-plus"></i>
-            <span>新增</span>
-          </el-button>
-        </div>
-      </obj-table-plus>
-      <add-or-update ref="addOrUpdate" @refresh="$refs.oTable.reload()" />
-    </div>
-  </div>
-</template>
-
-<script>
-import addOrUpdate from "./class-popup/add-or-update.vue";
-export default {
-  components: { addOrUpdate },
-  data() {
-    return {
-      dataList: [],
-      tableProp: {
-        "row-config": {
-          keyField: "id",
-        },
-        "auto-resize": true,
-        //带多选
-        "checkbox-config": {
-          labelField: "",
-          reserve: true,
-        },
-        "show-overflow": false,
-        "tree-config": {
-          childrenField: "clazzList",
-          expandAll: true,
-          rowField: "id",
-          parentField: "parentId",
-        },
-        height: "auto",
-      },
-    };
-  },
-  computed: {
-    tableCols() {
-      return [
-        {
-          title: "年级",
-          align: "center",
-          "tree-node": true,
-          field: "gradeName",
-        },
-        {
-          title: "班级名称",
-          align: "center",
-          field: "name",
-        },
-        {
-          title: "操作",
-          type: "jsx",
-          align: "center",
-          render: ({ row, ...others }) => {
-            console.log("others", others, row);
-            const edit = () => {
-              this.$refs.addOrUpdate.toggle({
-                ...row,
-                gradeId:others.data[Number(others.seq.slice('.')[0])-1].gradeId
-              }).update();
-            };
-            const remove = () => {
-              this.$api.local_admin.removeClass(row.clazzId).then(() => {
-                this.$refs.oTable.reload();
-              });
-            };
-            if (others.level == 1) {
-              return (
-                <div>
-                  <el-button size="mini" type="primary" onClick={edit}>
-                    编辑
-                  </el-button>
-                  <el-popconfirm
-                    title="确认删除年级?"
-                    onConfirm={remove}
-                    class="ml-2"
-                  >
-                    <el-button slot="reference" size="mini" type="danger">
-                      删除
-                    </el-button>
-                  </el-popconfirm>
-                </div>
-              );
-            } else {
-              return null;
-            }
-          },
-        },
-      ];
-    },
-  },
-  methods: {
-    add() {
-      this.$refs.addOrUpdate.toggle().add();
-    },
-    queryList(pageNo, pageSize) {
-      this.$api.local_admin
-        .getClassList()
-        .then((res) => {
-          console.log(res);
-          this.$refs.oTable.complete(res.data.data);
-        })
-        .catch((err) => {
-          this.$refs.oTable.complete(false);
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/modules/local-affairs/grade-popup/add-or-update.vue b/src/views/modules/local-affairs/grade-popup/add-or-update.vue
deleted file mode 100644
index 0fcd0e1..0000000
--- a/src/views/modules/local-affairs/grade-popup/add-or-update.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-  <div>
-    <obj-modal
-      ref="modal"
-      labelWidth="120px"
-      :modalConfig="modalConfig"
-      :modalCols="modalCols"
-      :modalData="modalData"
-      :modalHandles="modalHandles"
-    >
-    </obj-modal>
-  </div>
-</template>
-<script>
-const BASE_MODAL_DATA = () => {
-  return {
-    name: "",
-    sortKey: "",
-  };
-};
-const ADD_TITLE = "新增年级";
-const EDIT_TITLE = "编辑年级";
-import { cloneDeep } from "lodash";
-export default {
-  data() {
-    return {
-      isAdd: true,
-      isLoading: false,
-      //监控对象数据
-      tableData: [],
-      //表格属性
-      tableProp: {},
-      modalConfig: {
-        fullscreen: false,
-        title: "添加机构",
-        show: false,
-        width: "500px",
-      },
-      modalData: BASE_MODAL_DATA(),
-    };
-  },
-  methods: {
-    toggle(e) {
-      if (this.modalConfig.show == false) {
-        this.modalConfig.show = true;
-      } else {
-        this.modalConfig.show = false;
-      }
-      if (e) {
-        this.init(cloneDeep(e));
-      }
-      return {
-        add: () => {
-          this.$set(this.modalConfig, "title", ADD_TITLE);
-          this.$nextTick(() => {
-            this.modalData = BASE_MODAL_DATA();
-            this.$refs.modal?.resetFields();
-          });
-          this.isAdd = true;
-        },
-        update: () => {
-          if (this.modalData.provinceCode) {
-            this.modalData.areaArray.push(this.modalData.provinceCode);
-          }
-          if (this.modalData.cityCode) {
-            this.modalData.areaArray.push(this.modalData.cityCode);
-          }
-          if (this.modalData.areaCode) {
-            this.modalData.areaArray.push(this.modalData.areaCode);
-          }
-          this.$set(this.modalConfig, "title", EDIT_TITLE);
-          this.isAdd = false;
-        },
-      };
-    },
-    init(row) {
-      this.modalData = row;
-    },
-  },
-  asyncComputed: {
-    // async orgOptions() {
-    //   let res = await this.$api.local_admin.getEducationBureauList();
-    //   console.log(res.data.data);
-    //   return res.data.data;
-    // },
-    async eduDurationOptions() {
-      let res = await this.$api.local_admin.getDictionary("edu_duration");
-      return res.data.data;
-    },
-    async getAreaOptions() {
-      let res = await this.$api.local_admin.getArea();
-      return res.data.data;
-    },
-  },
-  computed: {
-    modalCols() {
-      return [
-        {
-          label: "年级名称",
-          prop: "name",
-          type: "Input",
-          labelWidth: "80px",
-          width: "100%",
-          require: true,
-          rules: { required: true, message: "年级名称" },
-        },
-        {
-          label: "排序号",
-          prop: "sortKey",
-          type: "Input",
-          labelWidth: "80px",
-          width: "100%",
-          require: true,
-          rules: { required: true, message: "排序号" },
-          type: "jsx",
-          render: () => {
-            const onChange = () => {};
-            return (
-              <el-input-number
-                style="width:100%;"
-                v-model={this.modalData.sortKey}
-                onChange={onChange}
-                min={0}
-                label=""
-              ></el-input-number>
-            );
-          },
-        },
-      ];
-    },
-    modalHandles() {
-      return [
-        {
-          label: "取消",
-          icon: "el-icon-close",
-          handle: () => {
-            this.toggle();
-          },
-        },
-        {
-          label: this.isAdd ? "确认添加" : "确认修改",
-          type: "primary",
-          icon: "el-icon-check",
-          loading: this.isLoading,
-          submit: true,
-          handle: () => {
-            setTimeout(() => {
-              this.isLoading = false;
-            }, 1000);
-            console.log(this.modalData);
-            if (this.isAdd) {
-              this.$api.local_admin.addGrade(this.modalData).then((res) => {
-                this.$emit("refresh");
-                this.toggle();
-              });
-            } else {
-              this.$api.local_admin
-                .updateGrade(this.modalData.id, this.modalData)
-                .then((res) => {
-                  this.$emit("refresh");
-                  this.toggle();
-                });
-            }
-
-            // this.api.common.addDict(this.modalData).then((res) => {
-            //   this.emit("refresh");
-            //   this.toggle();
-            // });
-          },
-        },
-      ];
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/modules/local-affairs/grade.vue b/src/views/modules/local-affairs/grade.vue
deleted file mode 100644
index 094e94b..0000000
--- a/src/views/modules/local-affairs/grade.vue
+++ /dev/null
@@ -1,103 +0,0 @@
-<template>
-  <div style="height: calc(100vh - 92px - 40px)">
-    <div style="height: 100%">
-      <obj-table-plus
-        ref="oTable"
-        v-model="dataList"
-        @query="queryList"
-        :isPagination="false"
-        :tableCols="tableCols"
-      >
-        <div slot="tableTop" class="mb-2">
-          <el-button type="primary" round @click="add">
-            <i class="el-icon-plus"></i>
-            <span>新增</span>
-          </el-button>
-        </div>
-      </obj-table-plus>
-      <add-or-update ref="addOrUpdate" @refresh="$refs.oTable.reload()" />
-    </div>
-  </div>
-</template>
-
-<script>
-import addOrUpdate from "./grade-popup/add-or-update.vue";
-export default {
-  components: { addOrUpdate },
-  data() {
-    return {
-      dataList: [],
-    };
-  },
-  computed: {
-    tableCols() {
-      return [
-        {
-          title: "年级名称",
-          align: "center",
-          field: "name",
-        },
-        {
-          title: "排序号",
-          align: "center",
-          field: "sortKey",
-        },
-        {
-          title: "操作",
-          type: "jsx",
-          align: "center",
-          render: ({ row }) => {
-            const edit = () => {
-              this.$refs.addOrUpdate.toggle(row).update();
-            };
-            const remove = () => {
-                this.$api.local_admin.removeGrade(row.id).then(() => {
-                    this.$refs.oTable.reload();
-                })
-            };
-            return (
-              <div>
-                <el-button size="mini" type="primary" onClick={edit}>
-                  编辑
-                </el-button>
-                <el-popconfirm
-                  title="确认删除年级?"
-                  onConfirm={remove}
-                  class="ml-2"
-                >
-                  <el-button
-                    slot="reference"
-                    size="mini"
-                    type="danger"
-                  >
-                    删除
-                  </el-button>
-                </el-popconfirm>
-              </div>
-            );
-          },
-        },
-      ];
-    },
-  },
-  methods: {
-    add() {
-      this.$refs.addOrUpdate.toggle().add();
-    },
-    queryList(pageNo, pageSize) {
-      this.$api.local_admin
-        .getGradeList()
-        .then((res) => {
-          console.log(res);
-          this.$refs.oTable.complete(res.data.data);
-        })
-        .catch((err) => {
-          this.$refs.oTable.complete(false);
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/modules/local-homework/school/index.vue b/src/views/modules/local-homework/school/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/modules/local-homework/teacher/index.vue b/src/views/modules/local-homework/teacher/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/modules/local-school/popup/add-or-update.vue b/src/views/modules/local-school/popup/add-or-update.vue
deleted file mode 100644
index 03d9959..0000000
--- a/src/views/modules/local-school/popup/add-or-update.vue
+++ /dev/null
@@ -1,291 +0,0 @@
-<template>
-  <div>
-    <obj-modal
-      ref="modal"
-      labelWidth="120px"
-      :modalConfig="modalConfig"
-      :modalCols="modalCols"
-      :modalData="modalData"
-      :modalHandles="modalHandles"
-    >
-    </obj-modal>
-  </div>
-</template>
-<script>
-import { cloneDeep } from "lodash";
-export default {
-  data() {
-    return {
-      isAdd: true,
-      isLoading: false,
-      //监控对象数据
-      tableData: [],
-      //表格属性
-      tableProp: {},
-      modalConfig: {
-        fullscreen: false,
-        title: "添加机构",
-        show: false,
-        width: "900px",
-      },
-      modalData: {
-        name: "",
-        eduDuration: '',
-        contactName: "",
-        contactPhone: "",
-        provinceCode: "",
-        cityCode: "",
-        areaCode: "",
-        parentOrgId: '',
-        areaArray: [],
-      },
-    };
-  },
-  methods: {
-    toggle(e) {
-      if (this.modalConfig.show == false) {
-        this.modalConfig.show = true;
-      } else {
-        this.modalConfig.show = false;
-      }
-      if (e) {
-        this.init(cloneDeep(e));
-      }
-      return {
-        add: () => {
-          this.$set(this.modalConfig, "title", "新增学校");
-          this.$nextTick(() => {
-            this.modalData = {
-              name: "",
-              eduDuration: '',
-              contactName: "",
-              contactPhone: "",
-              provinceCode: "",
-              cityCode: "",
-              areaCode: "",
-              parentOrgId: '',
-              areaArray: [],
-            };
-            this.$refs.modal?.resetFields();
-          });
-          this.isAdd = true;
-        },
-        update: () => {
-          if (this.modalData.provinceCode) {
-            this.modalData.areaArray.push(this.modalData.provinceCode);
-          }
-          if (this.modalData.cityCode) {
-            this.modalData.areaArray.push(this.modalData.cityCode);
-          }
-          if (this.modalData.areaCode) {
-            this.modalData.areaArray.push(this.modalData.areaCode);
-          }
-          this.$set(this.modalConfig, "title", "编辑学校");
-          this.isAdd = false;
-        },
-      };
-    },
-    init(row) {
-      this.modalData = {
-        ...row,
-        areaArray: [],
-        contactPhone: row.contactMobile,
-      };
-    },
-  },
-  asyncComputed: {
-    async orgOptions() {
-      let res = await this.$api.local_admin.getEducationBureauList();
-      console.log(res.data.data);
-      return res.data.data;
-    },
-    async eduDurationOptions() {
-      let res = await this.$api.local_admin.getDictionary("edu_duration");
-      return res.data.data;
-    },
-    async getAreaOptions() {
-      let res = await this.$api.local_admin.getArea();
-      return res.data.data;
-    },
-  },
-  computed: {
-    modalCols() {
-      return [
-        {
-          label: "学校名称",
-          prop: "name",
-          type: "Input",
-          labelWidth: "120px",
-          width: "100%",
-          require: true,
-          rules: { required: true, message: "学校名称" },
-        },
-        {
-          label: "学制",
-          prop: "eduDuration",
-          type: "jsx",
-          width: "100%",
-          require: true,
-          rules: { required: true, message: "请选择学制" },
-          render: () => {
-            return (
-              <el-form-item
-                style="width: 100%;"
-                prop="eduDuration"
-                rules={[{ required: true, message: "请选择学制" }]}
-              >
-                <el-select
-                  v-model={this.modalData.eduDuration}
-                  style="width: 100%;"
-                >
-                  {this.eduDurationOptions.map((item) => {
-                    return (
-                      <el-option
-                        label={item.name}
-                        value={item.value}
-                        key={item.value}
-                      ></el-option>
-                    );
-                  })}
-                </el-select>
-              </el-form-item>
-            );
-          },
-        },
-        {
-          label: "所属教育局",
-          prop: "parentOrgId",
-          type: "jsx",
-          width: "100%",
-          require: true,
-          rules: { required: true, message: "所属教育局" },
-          render: () => {
-            return (
-              <el-form-item
-                style="width: 100%;"
-                prop="parentOrgId"
-                rules={[{ required: true, message: "所属教育局" }]}
-              >
-                <el-select
-                  v-model={this.modalData.parentOrgId}
-                  style="width: 100%;"
-                >
-                  {this.orgOptions.map((item) => {
-                    return (
-                      <el-option
-                        label={item.orgName}
-                        value={item.orgId}
-                        key={item.orgId}
-                      ></el-option>
-                    );
-                  })}
-                </el-select>
-              </el-form-item>
-            );
-          },
-        },
-        {
-          label: "联系人",
-          prop: "contactName",
-          labelWidth: "120px",
-          type: "Input",
-          require: true,
-          rules: { required: true, message: "联系人" },
-        },
-        {
-          label: "联系人电话",
-          prop: "contactPhone",
-          labelWidth: "120px",
-          type: "Input",
-          require: true,
-          rules: { required: true, message: "联系人电话" },
-        },
-        {
-          label: "省市区",
-          prop: "provinceCode", //provinceCode,cityCode,areaCode
-          labelWidth: "120px",
-          type: "jsx",
-          require: true,
-          rules: { required: true, message: "省市区" },
-          render: () => {
-            const changeArea = (e) => {
-              console.log(e);
-              this.modalData.provinceCode = e[0] || "";
-              this.modalData.cityCode = e[1] || "";
-              this.modalData.areaCode = e[2] || "";
-            };
-            return (
-              <el-form-item
-                style="width:100%;"
-                prop="provinceCode"
-                rules={[{ required: true, message: "请选择省市区" }]}
-              >
-                <el-cascader
-                  style="width:100%;"
-                  onChange={changeArea}
-                  options={this.getAreaOptions}
-                  v-model={this.modalData.areaArray}
-                  props={{
-                    props: {
-                      checkStrictly: true,
-                      label: "name",
-                      value: "code",
-                      emitPath: true,
-                    },
-                  }}
-                ></el-cascader>
-              </el-form-item>
-            );
-          },
-        },
-      ];
-    },
-    modalHandles() {
-      return [
-        {
-          label: "取消",
-          icon: "el-icon-close",
-          handle: () => {
-            this.toggle();
-          },
-        },
-        {
-          label: this.isAdd ? "确认添加" : "确认修改",
-          type: "primary",
-          icon: "el-icon-check",
-          loading: this.isLoading,
-          submit: true,
-          handle: () => {
-            setTimeout(() => {
-              this.isLoading = false;
-            }, 1000);
-            console.log(this.modalData);
-            this.$api.local_admin
-              .addSchool({
-                name: this.modalData.name,
-                eduDuration: this.modalData.eduDuration,
-                contactName: this.modalData.contactName,
-                contactPhone: this.modalData.contactPhone,
-                provinceCode: this.modalData.provinceCode,
-                cityCode: this.modalData.cityCode,
-                areaCode: this.modalData.areaCode,
-                parentOrgId: this.modalData.parentOrgId,
-              })
-              .then((res) => {
-                this.$emit("refresh");
-                this.toggle();
-              });
-
-            // this.api.common.addDict(this.modalData).then((res) => {
-            //   this.emit("refresh");
-            //   this.toggle();
-            // });
-          },
-        },
-      ];
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/modules/local-school/school.vue b/src/views/modules/local-school/school.vue
deleted file mode 100644
index 0a1ad47..0000000
--- a/src/views/modules/local-school/school.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-<template>
-  <div style="height: calc(100vh - 92px - 40px)">
-    <div style="height: 100%">
-      <obj-table-plus
-        ref="oTable"
-        v-model="dataList"
-        @query="queryList"
-        :tableCols="tableCols"
-      >
-        <div slot="tableTop" class="mb-2">
-          <el-button type="primary" round @click="add">
-            <i class="el-icon-plus"></i>
-            <span>新增</span>
-          </el-button>
-        </div>
-      </obj-table-plus>
-      <add-or-update ref="addOrUpdate" @refresh="$refs.oTable.reload()" />
-    </div>
-  </div>
-</template>
-
-<script>
-import addOrUpdate from "./popup/add-or-update.vue";
-export default {
-  components: { addOrUpdate },
-  data() {
-    return {
-      dataList: [],
-    };
-  },
-  computed: {
-    tableCols() {
-      return [
-        {
-          title: "学校名称",
-          align:"center",
-          field: "name",
-        },
-        {
-          title: "学校地址",
-          type: "jsx",
-          align:"center",
-          render: ({ row }) => {
-            return (
-              <div>
-                <span>{row.provinceName ? row.provinceName + "/" : ""}</span>
-                <span>{row.cityName ? row.cityName + "/" : ""}</span>
-                <span>{row.areaName ? row.areaName : ""}</span>
-              </div>
-            );
-          },
-        },
-        {
-          title: "操作",
-          type: "jsx",
-          align:"center",
-          render: ({ row }) => {
-            const edit=()=>{
-              this.$refs.addOrUpdate.toggle(row).update()
-            }
-            const remove=()=>{}
-            return (
-              <div>
-                <el-button size="mini" type="primary" onClick={edit} disabled>
-                  编辑
-                </el-button>
-                <el-popconfirm title="确认删除学校?" onConfirm={remove} class="ml-2">
-                  <el-button slot="reference" size="mini" type="danger" disabled>
-                    删除
-                  </el-button>
-                </el-popconfirm>
-              </div>
-            );
-          },
-        },
-      ];
-    },
-  },
-  methods: {
-    add() {
-      this.$refs.addOrUpdate.toggle().add();
-    },
-    queryList(pageNo, pageSize) {
-      this.$api.local_admin
-        .getSchoolPage({
-          pageNumber: pageNo,
-          pageSize: pageSize,
-        })
-        .then((res) => {
-          console.log(res);
-          this.$refs.oTable.complete(res.data.data.data,Number(res.data.data.total));
-        })
-        .catch((err) => {
-          this.$refs.oTable.complete(false);
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/modules/local-statistics/region-school/index.vue b/src/views/modules/local-statistics/region-school/index.vue
deleted file mode 100644
index 99c5065..0000000
--- a/src/views/modules/local-statistics/region-school/index.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-<template>
-    <div>
-        区域内学校统计
-    </div>
-</template>
-
-<script>
-
-</script>
-
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/views/modules/local-teacher/popup/add-or-update.vue b/src/views/modules/local-teacher/popup/add-or-update.vue
deleted file mode 100644
index c36c277..0000000
--- a/src/views/modules/local-teacher/popup/add-or-update.vue
+++ /dev/null
@@ -1,223 +0,0 @@
-<template>
-  <div>
-    <obj-modal
-      ref="modal"
-      labelWidth="100px"
-      :modalConfig="modalConfig"
-      :modalCols="modalCols"
-      :modalData="modalData"
-      :modalHandles="modalHandles"
-    >
-    </obj-modal>
-  </div>
-</template>
-<script>
-const BASE_MODAL_DATA = () => {
-  return {
-    name: "",
-    sortKey: "",
-  };
-};
-const ADD_TITLE = "添加教师";
-const EDIT_TITLE = "编辑教师信息";
-import { cloneDeep } from "lodash";
-export default {
-  data() {
-    return {
-      isAdd: true,
-      isLoading: false,
-      //监控对象数据
-      tableData: [],
-      //表格属性
-      tableProp: {},
-      modalConfig: {
-        fullscreen: false,
-        title: "添加机构",
-        show: false,
-        width: "700px",
-      },
-      modalData: BASE_MODAL_DATA(),
-    };
-  },
-  methods: {
-    toggle(e) {
-      if (this.modalConfig.show == false) {
-        this.modalConfig.show = true;
-      } else {
-        this.modalConfig.show = false;
-      }
-      if (e) {
-        this.init(cloneDeep(e));
-      }
-      return {
-        add: () => {
-          this.$set(this.modalConfig, "title", ADD_TITLE);
-          this.$nextTick(() => {
-            this.modalData = BASE_MODAL_DATA();
-            this.$refs.modal?.resetFields();
-          });
-          this.isAdd = true;
-        },
-        update: () => {
-          if (this.modalData.provinceCode) {
-            this.modalData.areaArray.push(this.modalData.provinceCode);
-          }
-          if (this.modalData.cityCode) {
-            this.modalData.areaArray.push(this.modalData.cityCode);
-          }
-          if (this.modalData.areaCode) {
-            this.modalData.areaArray.push(this.modalData.areaCode);
-          }
-          this.$set(this.modalConfig, "title", EDIT_TITLE);
-          this.isAdd = false;
-        },
-      };
-    },
-    init(row) {
-      this.modalData = row;
-    },
-  },
-  asyncComputed: {
-    // async orgOptions() {
-    //   let res = await this.$api.local_admin.getEducationBureauList();
-    //   console.log(res.data.data);
-    //   return res.data.data;
-    // },
-    async classOptions() {
-      let res = await this.$api.local_admin.getClassList();
-      return res.data.data.map(item=>{
-        item.label=item.gradeName;
-        item.value=item.gradeId;
-        item.clazzList=item.clazzList.map(el=>{
-            el.label=el.name;
-            el.value=el.clazzId;
-            return el;
-        })
-        if(item.clazzList.length<=0){
-            item.disabled=true
-        }
-        return item;
-      });
-    },
-    async eduDurationOptions() {
-      let res = await this.$api.local_admin.getDictionary("edu_duration");
-      return res.data.data;
-    },
-    async getAreaOptions() {
-      let res = await this.$api.local_admin.getArea();
-      return res.data.data;
-    },
-  },
-  computed: {
-    modalCols() {
-      return [
-        {
-          label: "教师姓名",
-          prop: "name",
-          type: "Input",
-          width: "100%",
-          require: true,
-          rules: { required: true, message: "年级名称" },
-        },
-        {
-          label: "教师手机号",
-          prop: "mobile",
-          type: "Input",
-          width: "100%",
-          require: true,
-          rules: { required: true, message: "年级名称" },
-        },
-        {
-          label: "登录密码",
-          prop: "password",
-          type: "Input",
-          width: "100%",
-          require: true,
-          rules: { required: true, message: "年级名称" },
-        },
-        {
-          label: "关联班级",
-          type: "jsx",
-          width: "100%",
-          require: true,
-          rules: { required: true, message: "选择教师管理的班级" },
-          render: () => {
-            return (
-              <el-cascader
-                show-all-levels={false}
-                class="w-100"
-                placeholder="请选择教师所管理的班级"
-                filterable={true}
-                v-model={this.modalData.clazzList}
-                options={this.classOptions}
-                props={{
-                  props: {
-                    checkStrictly: false,
-                    multiple:true,
-                    label: "label",
-                    children:'clazzList',
-                    value: "value",
-                    emitPath: false,
-                  },
-                }}
-                clearable={true}
-              ></el-cascader>
-            );
-          },
-        }
-      ];
-    },
-    modalHandles() {
-      return [
-        {
-          label: "取消",
-          icon: "el-icon-close",
-          handle: () => {
-            this.toggle();
-          },
-        },
-        {
-          label: this.isAdd ? "确认添加" : "确认修改",
-          type: "primary",
-          icon: "el-icon-check",
-          loading: this.isLoading,
-          submit: true,
-          handle: () => {
-            setTimeout(() => {
-              this.isLoading = false;
-            }, 1000);
-            console.log(this.modalData);
-            if (this.isAdd) {
-              this.$api.local_admin.addTeacher({
-                ...this.modalData,
-                clazzList:this.modalData.clazzList.map(value=>{
-                    return {
-                        clazzId:value
-                    }
-                }),
-              }).then((res) => {
-                this.$emit("refresh");
-                this.toggle();
-              });
-            } else {
-            //   this.$api.local_admin
-            //     .updateGrade(this.modalData.id, this.modalData)
-            //     .then((res) => {
-            //       this.$emit("refresh");
-            //       this.toggle();
-            //     });
-            }
-
-            // this.api.common.addDict(this.modalData).then((res) => {
-            //   this.emit("refresh");
-            //   this.toggle();
-            // });
-          },
-        },
-      ];
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/modules/local-teacher/teacher.vue b/src/views/modules/local-teacher/teacher.vue
deleted file mode 100644
index 36f977f..0000000
--- a/src/views/modules/local-teacher/teacher.vue
+++ /dev/null
@@ -1,115 +0,0 @@
-<template>
-  <div style="height: calc(100vh - 92px - 40px)">
-    <div style="height: 100%">
-      <obj-table-plus
-        ref="oTable"
-        v-model="dataList"
-        @query="queryList"
-        :tableCols="tableCols"
-      >
-        <div slot="tableTop" class="mb-2">
-          <el-button type="primary" round @click="add">
-            <i class="el-icon-plus"></i>
-            <span>新增</span>
-          </el-button>
-        </div>
-      </obj-table-plus>
-      <add-or-update ref="addOrUpdate" @refresh="$refs.oTable.reload()" />
-    </div>
-  </div>
-</template>
-
-<script>
-import addOrUpdate from "./popup/add-or-update.vue";
-export default {
-  components: { addOrUpdate },
-  data() {
-    return {
-      dataList: [],
-    };
-  },
-  computed: {
-    tableCols() {
-      return [
-        {
-          title: "教师姓名",
-          align: "center",
-          field: "name",
-        },
-        {
-          title: "教师手机号",
-          align: "center",
-          field: "mobile",
-        },
-        {
-          title: "关联年级",
-          align: "center",
-          field: "gradeStr",
-        },
-        {
-          title: "关联班级",
-          align: "center",
-          field: "clazzStr",
-        },
-        {
-          title: "操作",
-          type: "jsx",
-          show:false,
-          align: "center",
-          render: ({ row }) => {
-            const edit = () => {
-              this.$refs.addOrUpdate.toggle(row).update();
-            };
-            const remove = () => {
-              this.$api.local_admin.removeGrade(row.id).then(() => {
-                this.$refs.oTable.reload();
-              });
-            };
-            return (
-              <div>
-                <el-button size="mini" type="primary" onClick={edit}>
-                  编辑
-                </el-button>
-                <el-popconfirm
-                  title="确认删除年级?"
-                  onConfirm={remove}
-                  class="ml-2"
-                >
-                  <el-button slot="reference" size="mini" type="danger">
-                    删除
-                  </el-button>
-                </el-popconfirm>
-              </div>
-            );
-          },
-        },
-      ];
-    },
-  },
-  methods: {
-    add() {
-      this.$refs.addOrUpdate.toggle().add();
-    },
-    queryList(pageNo, pageSize) {
-      this.$api.local_admin
-        .getTeacherPage({
-          pageNumber: pageNo,
-          pageSize: pageSize,
-        })
-        .then((res) => {
-          console.log(res);
-          this.$refs.oTable.complete(
-            res.data.data.data,
-            Number(res.data.data.total)
-          );
-        })
-        .catch((err) => {
-          this.$refs.oTable.complete(false);
-        });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/modules/oss/oss-config.vue b/src/views/modules/oss/oss-config.vue
deleted file mode 100644
index 7220139..0000000
--- a/src/views/modules/oss/oss-config.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<template>
-  <el-dialog
-    title="云存储配置"
-    :close-on-click-modal="false"
-    :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="120px">
-      <el-form-item size="mini" label="存储类型">
-        <el-radio-group v-model="dataForm.type">
-          <el-radio :label="1">七牛</el-radio>
-          <el-radio :label="2">阿里云</el-radio>
-          <el-radio :label="3">腾讯云</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <template v-if="dataForm.type === 1">
-        <el-form-item size="mini">
-          <a href="http://www.renren.io/open/qiniu.html" target="_blank">免费申请(七牛)10GB储存空间</a>
-        </el-form-item>
-        <el-form-item label="域名">
-          <el-input v-model="dataForm.qiniuDomain" placeholder="七牛绑定的域名"></el-input>
-        </el-form-item>
-        <el-form-item label="路径前缀">
-          <el-input v-model="dataForm.qiniuPrefix" placeholder="不设置默认为空"></el-input>
-        </el-form-item>
-        <el-form-item label="AccessKey">
-          <el-input v-model="dataForm.qiniuAccessKey" placeholder="七牛AccessKey"></el-input>
-        </el-form-item>
-        <el-form-item label="SecretKey">
-          <el-input v-model="dataForm.qiniuSecretKey" placeholder="七牛SecretKey"></el-input>
-        </el-form-item>
-        <el-form-item label="空间名">
-          <el-input v-model="dataForm.qiniuBucketName" placeholder="七牛存储空间名"></el-input>
-        </el-form-item>
-      </template>
-      <template v-else-if="dataForm.type === 2">
-        <el-form-item label="域名">
-          <el-input v-model="dataForm.aliyunDomain" placeholder="阿里云绑定的域名"></el-input>
-        </el-form-item>
-        <el-form-item label="路径前缀">
-          <el-input v-model="dataForm.aliyunPrefix" placeholder="不设置默认为空"></el-input>
-        </el-form-item>
-        <el-form-item label="EndPoint">
-          <el-input v-model="dataForm.aliyunEndPoint" placeholder="阿里云EndPoint"></el-input>
-        </el-form-item>
-        <el-form-item label="AccessKeyId">
-          <el-input v-model="dataForm.aliyunAccessKeyId" placeholder="阿里云AccessKeyId"></el-input>
-        </el-form-item>
-        <el-form-item label="AccessKeySecret">
-          <el-input v-model="dataForm.aliyunAccessKeySecret" placeholder="阿里云AccessKeySecret"></el-input>
-        </el-form-item>
-        <el-form-item label="BucketName">
-          <el-input v-model="dataForm.aliyunBucketName" placeholder="阿里云BucketName"></el-input>
-        </el-form-item>
-      </template>
-      <template v-else-if="dataForm.type === 3">
-        <el-form-item label="域名">
-          <el-input v-model="dataForm.qcloudDomain" placeholder="腾讯云绑定的域名"></el-input>
-        </el-form-item>
-        <el-form-item label="路径前缀">
-          <el-input v-model="dataForm.qcloudPrefix" placeholder="不设置默认为空"></el-input>
-        </el-form-item>
-        <el-form-item label="AppId">
-          <el-input v-model="dataForm.qcloudAppId" placeholder="腾讯云AppId"></el-input>
-        </el-form-item>
-        <el-form-item label="SecretId">
-          <el-input v-model="dataForm.qcloudSecretId" placeholder="腾讯云SecretId"></el-input>
-        </el-form-item>
-        <el-form-item label="SecretKey">
-          <el-input v-model="dataForm.qcloudSecretKey" placeholder="腾讯云SecretKey"></el-input>
-        </el-form-item>
-        <el-form-item label="BucketName">
-          <el-input v-model="dataForm.qcloudBucketName" placeholder="腾讯云BucketName"></el-input>
-        </el-form-item>
-        <el-form-item label="Bucket所属地区">
-          <el-input v-model="dataForm.qcloudRegion" placeholder="如：sh（可选值 ，华南：gz 华北：tj 华东：sh）"></el-input>
-        </el-form-item>
-      </template>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-  export default {
-    data () {
-      return {
-        visible: false,
-        dataForm: {},
-        dataRule: {}
-      }
-    },
-    methods: {
-      init (id) {
-        this.visible = true
-        this.$http({
-          url: '/sys/oss/config',
-          method: 'get',
-          params: this.$http.adornParams()
-        }).then(({data}) => {
-          this.dataForm = data && data.code === 0 ? data.config : []
-        })
-      },
-      // 表单提交
-      dataFormSubmit () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            this.$http({
-              url: '/sys/oss/saveConfig',
-              method: 'post',
-              data: this.$http.adornData(this.dataForm)
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                    this.visible = false
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
-              }
-            })
-          }
-        })
-      }
-    }
-  }
-</script>
-
diff --git a/src/views/modules/oss/oss-upload.vue b/src/views/modules/oss/oss-upload.vue
deleted file mode 100644
index 53016da..0000000
--- a/src/views/modules/oss/oss-upload.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-  <el-dialog
-    title="上传文件"
-    :close-on-click-modal="false"
-    @close="closeHandle"
-    :visible.sync="visible">
-    <el-upload
-      drag
-      :action="url"
-      :before-upload="beforeUploadHandle"
-      :on-success="successHandle"
-      multiple
-      :file-list="fileList"
-      style="text-align: center;">
-      <i class="el-icon-upload"></i>
-      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
-      <div class="el-upload__tip" slot="tip">只支持jpg、png、gif格式的图片！</div>
-    </el-upload>
-  </el-dialog>
-</template>
-
-<script>
-  export default {
-    data () {
-      return {
-        visible: false,
-        url: '',
-        num: 0,
-        successNum: 0,
-        fileList: []
-      }
-    },
-    methods: {
-      init (id) {
-        this.url = `/sys/oss/upload?token=${this.$cookie.get('token')}`
-        this.visible = true
-      },
-      // 上传之前
-      beforeUploadHandle (file) {
-        if (file.type !== 'image/jpg' && file.type !== 'image/jpeg' && file.type !== 'image/png' && file.type !== 'image/gif') {
-          this.$message.error('只支持jpg、png、gif格式的图片！')
-          return false
-        }
-        this.num++
-      },
-      // 上传成功
-      successHandle (response, file, fileList) {
-        this.fileList = fileList
-        this.successNum++
-        if (response && response.code === 0) {
-          if (this.num === this.successNum) {
-            this.$confirm('操作成功, 是否继续操作?', '提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
-            }).catch(() => {
-              this.visible = false
-            })
-          }
-        } else {
-          this.$message.error(response.msg)
-        }
-      },
-      // 弹窗关闭时
-      closeHandle () {
-        this.fileList = []
-        this.$emit('refreshDataList')
-      }
-    }
-  }
-</script>
diff --git a/src/views/modules/oss/oss.vue b/src/views/modules/oss/oss.vue
deleted file mode 100644
index 4fb7a6c..0000000
--- a/src/views/modules/oss/oss.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<template>
-  <div class="mod-oss">
-    <el-form :inline="true" :model="dataForm">
-      <el-form-item>
-        <el-button type="primary" @click="configHandle()">云存储配置</el-button>
-        <el-button type="primary" @click="uploadHandle()">上传文件</el-button>
-        <el-button type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      @selection-change="selectionChangeHandle"
-      style="width: 100%;">
-      <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50">
-      </el-table-column>
-      <el-table-column
-        prop="id"
-        header-align="center"
-        align="center"
-        width="80"
-        label="ID">
-      </el-table-column>
-      <el-table-column
-        prop="url"
-        header-align="center"
-        align="center"
-        label="URL地址">
-      </el-table-column>
-      <el-table-column
-        prop="createDate"
-        header-align="center"
-        align="center"
-        width="180"
-        label="创建时间">
-      </el-table-column>
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作">
-        <template slot-scope="scope">
-          <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
-    </el-pagination>
-    <!-- 弹窗, 云存储配置 -->
-    <config v-if="configVisible" ref="config"></config>
-    <!-- 弹窗, 上传文件 -->
-    <upload v-if="uploadVisible" ref="upload" @refreshDataList="getDataList"></upload>
-  </div>
-</template>
-
-<script>
-  import Config from './oss-config'
-  import Upload from './oss-upload'
-  export default {
-    data () {
-      return {
-        dataForm: {},
-        dataList: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
-        dataListLoading: false,
-        dataListSelections: [],
-        configVisible: false,
-        uploadVisible: false
-      }
-    },
-    components: {
-      Config,
-      Upload
-    },
-    activated () {
-      this.getDataList()
-    },
-    methods: {
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
-        this.$http({
-          url: '/sys/oss/list',
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize
-          })
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
-          } else {
-            this.dataList = []
-            this.totalPage = 0
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.getDataList()
-      },
-      // 多选
-      selectionChangeHandle (val) {
-        this.dataListSelections = val
-      },
-      // 云存储配置
-      configHandle () {
-        this.configVisible = true
-        this.$nextTick(() => {
-          this.$refs.config.init()
-        })
-      },
-      // 上传文件
-      uploadHandle () {
-        this.uploadVisible = true
-        this.$nextTick(() => {
-          this.$refs.upload.init()
-        })
-      },
-      // 删除
-      deleteHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
-          return item.id
-        })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: '/sys/oss/delete',
-            method: 'post',
-            data: this.$http.adornData(ids, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {})
-      }
-    }
-  }
-</script>
diff --git a/src/views/modules/product/index.vue b/src/views/modules/product/index.vue
new file mode 100644
index 0000000..80f94a6
--- /dev/null
+++ b/src/views/modules/product/index.vue
@@ -0,0 +1,109 @@
+<template>
+    <div>
+        <obj-table-plus ref="oTable" :tableCols="tableCols" @query="queryList" v-model="dataList">
+            <template slot="tableTop">
+                <el-form :inline="true" :model="formInline" class="demo-form-inline">
+                    <el-form-item label="平台分类">
+                        <el-select v-model="formInline.region" placeholder="活动区域">
+                            <el-option label="区域一" value="shanghai"></el-option>
+                            <el-option label="区域二" value="beijing"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="商户分类">
+                        <el-select v-model="formInline.region" placeholder="活动区域">
+                            <el-option label="区域一" value="shanghai"></el-option>
+                            <el-option label="区域二" value="beijing"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="商品搜索">
+                        <el-input v-model="formInline.user" placeholder="商品搜索"></el-input>
+                    </el-form-item>
+
+                    <el-form-item>
+                        <el-button type="primary" @click="$refs.oTable.reload()">查询</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-tabs v-model="activeName" @tab-click="$refs.oTable.reload()">
+                    <el-tab-pane label="出售中" name="出售中"></el-tab-pane>
+                    <el-tab-pane label="仓库中" name="仓库中"></el-tab-pane>
+                    <el-tab-pane label="已售罄" name="已售罄"></el-tab-pane>
+                    <el-tab-pane label="警戒库存" name="警戒库存"></el-tab-pane>
+                </el-tabs>
+                <div class="mb-2">
+                    <el-button type="primary" size="small" @click="addProduct">添加商品</el-button>
+                </div>
+            </template>
+        </obj-table-plus>
+        <add-or-update ref="addOrUpdate"></add-or-update>
+    </div>
+</template>
+
+<script>
+import AddOrUpdate from "./popup/add-or-update.vue"
+export default {
+    components:{AddOrUpdate},
+    data() {
+        return {
+            activeName: "出售中",
+            dataList: [],
+            formInline: {
+                user: '',
+                region: ''
+            }
+        }
+    },
+    methods: {
+        addProduct(){
+            this.$refs.addOrUpdate.toggle().add()
+        },
+        queryList(pageNo, pageSize) {
+            this.$api.mer_admin.getProductPage({
+                p: {
+                    pageNumber: pageNo,
+                    pageSize: pageSize
+                }
+            })
+                .then(res => {
+                    console.log(res);
+                    this.$refs.oTable.complete(res.data.data.data, Number(res.data.data.total));
+
+                })
+                .catch(err => {
+                    this.$refs.oTable.complete(false);
+                })
+        }
+    },
+    computed: {
+        tableCols() {
+            return [
+                {
+                    title: "ID"
+                },
+                {
+                    title: "商品图",
+                },
+                {
+                    title: "商品名称"
+                },
+                {
+                    title: "商品售价"
+                },
+                {
+                    title: "销量"
+                },
+                {
+                    title: "库存"
+                },
+                {
+                    title: "状态"
+                },
+                {
+                    title: "操作"
+                }
+            ]
+        }
+    },
+}
+</script>
+
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/modules/product/popup/add-or-update.vue b/src/views/modules/product/popup/add-or-update.vue
new file mode 100644
index 0000000..ed744c0
--- /dev/null
+++ b/src/views/modules/product/popup/add-or-update.vue
@@ -0,0 +1,792 @@
+<template>
+    <obj-modal class="obj-modal" ref="modal" labelWidth="150px" :modalConfig="modalConfig" :modalData="modalData"
+        :modalHandles="modalHandles">
+        <div slot="dialog__content">
+            <el-card class="box-card mt14" :body-style="{ padding: '0 20px 20px' }" shadow="never" :bordered="false">
+                <el-tabs class="list-tabs" v-model="currentTab">
+                    <el-tab-pane v-for="(item, index) in headTab" :key="index" :label="item.tit"
+                        :name="item.name"></el-tab-pane>
+                </el-tabs>
+                <el-form ref="formValidate" v-loading="fullscreenLoading" class="formValidate form-boder-padding"
+                    :rules="ruleValidate" :model="formValidate" label-width="108px" @submit.native.prevent>
+                    <el-row v-show="currentTab === '1'" :gutter="24">
+                        <!-- 商品信息-->
+                        <el-col v-bind="grid2">
+                            <el-form-item label="商品名称：" prop="name">
+                                <el-input class="from-ipt-width" v-model.trim="formValidate.name" maxlength="249"
+                                    placeholder="请输入商品名称" :disabled="isDisabled" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col v-bind="grid2">
+                            <el-form-item label="商户商品分类：" prop="cateIds">
+                                <el-cascader class="from-ipt-width" v-model="formValidate.cateIds"
+                                    :options="getProductCategory" :props="props2" clearable :show-all-levels="false"
+                                    :disabled="isDisabled" />
+                                <el-button class="ml15" @click="handleAddMenu({ id: 0, name: '顶层目录' })">添加分类</el-button>
+                            </el-form-item>
+                        </el-col>
+                        <el-col v-bind="grid2">
+                            <el-form-item label="平台商品分类：" prop="categoryId">
+                                <el-cascader class="from-ipt-width" @change="onChangeCategory"
+                                    v-model="formValidate.categoryId" :options="productClassify" :props="props1"
+                                    filterable clearable :show-all-levels="false" :disabled="isDisabled" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col v-bind="grid2">
+                            <el-form-item label="品牌：" prop="brandId">
+                                <el-select class="from-ipt-width" clearable filterable v-model="formValidate.brandId"
+                                    :loading="loading" remote :disabled="isDisabled || !formValidate.categoryId"
+                                    placeholder="请选择品牌">
+                                    <el-option v-for="user in brandList" :key="user.id" :label="user.name"
+                                        :value="user.id"> </el-option>
+                                </el-select>
+                            </el-form-item>
+                        </el-col>
+                        <el-col v-bind="grid2">
+                            <el-form-item label="单位：" prop="unitName">
+                                <el-input v-model.trim="formValidate.unitName" placeholder="请输入单位"
+                                    class="from-ipt-width" :disabled="isDisabled" />
+                            </el-form-item>
+                        </el-col>
+                        <el-col v-if="formValidate.type !== 5 && formValidate.type !== 6" :xs="18" :sm="18" :md="18"
+                            :lg="12" :xl="12">
+                            <!-- <el-form-item label="运费模板：" prop="tempId">
+                                <el-select v-model="formValidate.tempId" placeholder="请选择" :disabled="isDisabled"
+                                    class="from-ipt-width mr20">
+                                    <el-option v-for="item in shippingTemplates" :key="item.id" :label="item.name"
+                                        :value="item.id" />
+                                </el-select>
+                            </el-form-item> -->
+                        </el-col>
+                        <el-col v-bind="grid2">
+                            <el-form-item label="商品关键字：">
+                                <div class="from-tips">用户可以根据关键字进行商品搜索</div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col v-bind="grid2">
+                            <el-form-item label="商品简介：" prop="intro">
+                                <el-input class="from-ipt-width" v-model.trim="formValidate.intro" type="textarea"
+                                    maxlength="250" :rows="3" placeholder="请输入商品简介" :disabled="isDisabled" />
+                                <div class="from-tips">通过公众号分享商品详情，会展示此简介信息</div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col v-bind="grid2">
+                            <el-form-item label="商品封面图：" prop="image">
+                                <div class="upLoadPicBox acea-row" @click="modalPicTap('1')" :disabled="isDisabled">
+                                    <div v-if="formValidate.image" class="pictrue"><img :src="formValidate.image" />
+                                    </div>
+                                    <div v-else class="upLoad">
+                                        <i class="el-icon-camera cameraIconfont" />
+                                    </div>
+                                </div>
+                                <div class="from-tips" v-show="!isDisabled">建议尺寸：800*800px，上传小于500kb的图片</div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :span="24">
+                            <el-form-item label="商品轮播图：" prop="sliderImages">
+                                <div class="acea-row">
+                                    <div v-for="(item, index) in formValidate.sliderImages" :key="index" class="pictrue"
+                                        draggable="true" @dragstart="handleDragStart($event, item)"
+                                        @dragover.prevent="handleDragOver($event, item)"
+                                        @dragenter="handleDragEnter($event, item)"
+                                        @dragend="handleDragEnd($event, item)">
+                                        <img :src="item" />
+                                        <i v-show="!isDisabled" class="el-icon-error btndel"
+                                            @click="handleRemove(index)" />
+                                    </div>
+                                    <div v-if="formValidate.sliderImages.length < 10 && !isDisabled"
+                                        class="upLoadPicBox" @click="modalPicTap('2')">
+                                        <div class="upLoad">
+                                            <i class="el-icon-camera cameraIconfont" />
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="from-tips">建议尺寸：800*800px，上传小于500kb的图片；最多可上传10张图片，拖动可调整顺序</div>
+                            </el-form-item>
+                        </el-col>
+                        <el-col v-bind="grid2">
+                            <el-form-item label="保障服务：">
+                                <div class="acea-row row-middle mb5">
+                                    <el-select class="from-ipt-width" v-model="formValidate.guaranteeIdsList"
+                                        placeholder="请选择保障服务" clearable filterable :multiple="multiples"
+                                        :disabled="isDisabled" @change="changeGuarantee">
+                                        <el-option :value="item.id" v-for="(item, index) in guaranteeNew" :key="index"
+                                            :label="item.name"></el-option>
+                                    </el-select>
+                                    <el-switch :disabled="isDisabled" class="ml10" v-model="isShowGroup"
+                                        :active-value="true" :inactive-value="false" active-text="多选" inactive-text="单选"
+                                        @change="onchangeIsShow" />
+                                </div>
+                                <el-tag v-for="(item, index) in guaranteeName" :key="index" class="mr10">{{ item
+                                    }}</el-tag>
+                            </el-form-item>
+                        </el-col>
+                        <el-col v-bind="grid2">
+                            <el-form-item label="主图视频：" prop="video_link">
+                                <div class="acea-row">
+                                    <el-input v-model="videoLink" :disabled="isDisabled" size="small"
+                                        class="from-ipt-width" placeholder="请输入MP4格式的视频链接">
+                                        <input ref="refid" type="file" style="display: none" />
+                                        <el-upload class="upload-demo" action slot="append"
+                                            :http-request="handleUploadForm" :before-upload="beforeAvatarUpload"
+                                            :headers="myHeaders" :show-file-list="false" :disabled="isDisabled"
+                                            multiple>
+                                            <el-button :disabled="isDisabled" size="small">
+                                                {{ videoLink ? '确认添加' : '上传视频' }}</el-button>
+                                        </el-upload>
+                                    </el-input>
+                                </div>
+                                <div class="from-tips">请上传小于20M的视频</div>
+                                <div v-if="videoLink" class="iview-video-style">
+                                    <video class="from-ipt-width" style="height: 100% !important; border-radius: 10px"
+                                        :src="videoLink" controls="controls">
+                                        您的浏览器不支持 video 标签。
+                                    </video>
+                                    <div class="mark" />
+                                    <i class="el-icon-delete iconv" @click="delVideo" />
+                                </div>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <!-- 商品规格-->
+                    <el-row v-show="currentTab === '2'" :gutter="24">
+                        <el-col :span="24">
+                            <el-form-item label="商品规格：" props="specType">
+                                <el-radio-group v-model="formValidate.specType"
+                                    @change="onChangeSpec(formValidate.specType)" :disabled="isDisabled">
+                                    <el-radio :label="false" class="radio">单规格</el-radio>
+                                    <el-radio :label="true">多规格</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                            <el-form-item label="佣金设置：" props="isSub">
+                                <el-radio-group v-model="formValidate.isSub" @change="onChangetype(formValidate.isSub)"
+                                    :disabled="isDisabled">
+                                    <el-radio :label="true" class="radio">单独设置</el-radio>
+                                    <el-radio :label="false">默认设置</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                            <el-form-item label="会员商品：" required>
+                                <el-radio-group v-model="formValidate.isPaidMember"
+                                    @change="onChangetype(formValidate.isSub)" :disabled="isDisabled">
+                                    <el-radio :label="true" class="radio">是</el-radio>
+                                    <el-radio :label="false">否</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        </el-col>
+                        <!-- 多规格添加-->
+                        <el-col v-if="formValidate.specType && !isDisabled" :span="24" class="noForm">
+                            <el-form-item label="选择规格：" prop="">
+                                <div class="acea-row">
+                                    <el-select v-model="formValidate.selectRule" style="width: 600px">
+                                        <el-option v-for="item in ruleList" :key="item.id" :label="item.ruleName"
+                                            :value="item.id" />
+                                    </el-select>
+                                    <el-button type="primary" class="ml20" @click="confirm">确认</el-button>
+                                    <el-button @click="addRule">添加规格</el-button>
+                                </div>
+                            </el-form-item>
+                            <!-- <el-form-item v-if="formValidate.attr.length">
+                                <div class="from-tips mb5">规格值支持拖拽排序,调整默认选中的规格</div>
+                                <div v-for="(item, index) in formValidate.attr" :key="index">
+                                    <div class="acea-row row-middle">
+                                        <span class="mr5">{{ item.attrName }}</span><i class="el-icon-circle-close"
+                                            @click="handleRemoveAttr(index)" />
+                                    </div>
+                                    <div class="acea-row row-middle">
+                                        <div v-for="(j, indexn) in item.attrValue" :key="indexn" draggable="true"
+                                            @dragstart="handleDragStart($event, j)"
+                                            @dragover.prevent="handleDragOver($event, j)"
+                                            @dragenter="handleDragEnter($event, j, index)"
+                                            @dragend="handleDragEnd($event, j)">
+                                            <el-tag closable size="medium" :disable-transitions="false"
+                                                class="mb5 mr10 pointer" @close="handleClose(item.attrValue, indexn)">
+                                                {{ j }}
+                                            </el-tag>
+                                        </div>
+                                        <el-input v-if="item.inputVisible" ref="saveTagInput" placeholder="按回车键添加"
+                                            v-model.trim="item.attrValue.attrsVal" class="input-new-tag" size="small"
+                                            @keyup.enter.native="createAttr(item.attrValue.attrsVal, index)" />
+                                        <el-button v-else class="button-new-tag" size="small" @click="showInput(item)">+
+                                            添加</el-button>
+                                    </div>
+                                </div>
+                            </el-form-item> -->
+                            <div class="acea-row">
+                                <el-form-item label="规格：">
+                                    <el-input v-model.trim="formDynamic.attrsName" placeholder="请输入规格"
+                                        style="width: 255px" />
+                                </el-form-item>
+                                <el-form-item label="规格值：" label-width="90px">
+                                    <el-input v-model.trim="formDynamic.attrsVal" placeholder="请输入规格值"
+                                        style="width: 254px" />
+                                </el-form-item>
+                                <el-form-item label-width="0px">
+                                    <el-button class="ml20" size="small" type="primary"
+                                        @click="createAttrName">确定</el-button>
+                                    <el-button size="small" @click="offAttrName">取消</el-button>
+                                </el-form-item>
+                            </div>
+                        </el-col>
+                        <!-- 批量设置-->
+                        <el-col v-if="formValidate.attr.length > 0 && formValidate.specType && !isDisabled" :span="24"
+                            class="noForm">
+                            <el-form-item label="批量设置：">
+                                <el-alert title="价格设置范围 0.01~999999.99" type="info"> </el-alert>
+                                <el-table :data="oneFormBatch" border class="tabNumWidth" size="small">
+                                    <el-table-column label="图片" width="80" align="center">
+                                        <template slot-scope="scope">
+                                            <div class="upLoadPicBox" @click="modalPicTap('1', 'pi')">
+                                                <div v-if="scope.row.image" class="pictrue tabPic"><img
+                                                        :src="scope.row.image" /></div>
+                                                <div v-else class="upLoad tabPic">
+                                                    <i class="el-icon-camera cameraIconfont" />
+                                                </div>
+                                            </div>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column v-if="formValidate.isSub" label="一级返佣(%)" min-width="120"
+                                        align="center">
+                                        <template slot-scope="scope">
+                                            <el-input maxlength="6" v-model.trim="scope.row.brokerage" min="0"
+                                                :max="scope.row.price" class="priceBox"
+                                                @keyup.native="keyupEventBrokerage('brokerage', scope.$index, 1)" />
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column v-if="formValidate.isSub" label="二级返佣(%)" min-width="120"
+                                        align="center">
+                                        <template slot-scope="scope">
+                                            <el-input maxlength="6" v-model.trim="scope.row.brokerageTwo" min="0"
+                                                :max="scope.row.price" class="priceBox"
+                                                @keyup.native="keyupEventBrokerage('brokerageTwo', scope.$index, 1)" />
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column v-for="(item, iii) in attrValue" :key="iii"
+                                        :label="formThead[iii].title" min-width="120" align="center">
+                                        <template slot-scope="scope">
+                                            <el-input v-if="iii === 'barCode'" v-model="scope.row[iii]" maxlength="40"
+                                                type="test" class="priceBox" :readonly="false" />
+                                            <el-input-number v-else v-model.trim="scope.row[iii]" :max="999999.99"
+                                                :step="iii === 'stock' ? 1 : 0.01" controls-position="right"
+                                                step-strictly></el-input-number>
+                                        </template>
+                                    </el-table-column>
+                                    <template v-if="formValidate.isSub"> </template>
+                                    <el-table-column label="操作" width="70" align="center">
+                                        <template>
+                                            <a class="submission" @click="batchAdd">批量添加</a>
+                                        </template>
+                                    </el-table-column>
+                                </el-table>
+                            </el-form-item>
+                        </el-col>
+                        <el-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
+                            <!-- 单规格表格-->
+                            <el-form-item v-if="formValidate.specType === false">
+                                <el-alert title="价格设置范围 0.01~999999.99" type="info"> </el-alert>
+                                <el-table :data="OneattrValue" border class="tabNumWidth" size="small">
+                                    <el-table-column label="图片" width="77" align="center">
+                                        <template slot-scope="scope">
+                                            <div class="upLoadPicBox" @click="modalPicTap('1', 'dan', 'pi')">
+                                                <div v-if="scope.row.image" class="pictrue tabPic"><img
+                                                        :src="scope.row.image" /></div>
+                                                <div v-else class="upLoad tabPic">
+                                                    <i class="el-icon-camera cameraIconfont" />
+                                                </div>
+                                            </div>
+                                        </template>
+                                    </el-table-column>
+                                    <template v-if="formValidate.isSub">
+                                        <el-table-column label="一级返佣(%)" min-width="120" align="center">
+                                            <template slot-scope="scope">
+                                                <el-input maxlength="6" :disabled="isDisabled"
+                                                    v-model.trim="scope.row.brokerage" min="0" class="priceBox"
+                                                    @keyup.native="keyupEventBrokerage('brokerage', scope.$index, 2)" />
+                                            </template>
+                                        </el-table-column>
+                                        <el-table-column label="二级返佣(%)" min-width="120" align="center">
+                                            <template slot-scope="scope">
+                                                <el-input maxlength="6" :disabled="isDisabled"
+                                                    v-model.trim="scope.row.brokerageTwo" min="0" class="priceBox"
+                                                    @keyup.native="keyupEventBrokerage('brokerageTwo', scope.$index, 2)" />
+                                            </template>
+                                        </el-table-column>
+                                    </template>
+                                    <el-table-column v-for="(item, iii) in attrValue" :key="iii"
+                                        :label="formThead[iii].title" min-width="120" align="center">
+                                        <template slot-scope="scope">
+                                            <el-input v-if="iii === 'barCode'" :disabled="isDisabled"
+                                                v-model="scope.row[iii]" maxlength="40" type="test" class="priceBox"
+                                                :readonly="false" />
+                                            <el-input-number v-else v-model.trim="scope.row[iii]" :disabled="isDisabled"
+                                                :min="iii === 'stock' ? 1 : 0.01" :max="formValidate.isPaidMember && iii === 'vipPrice' ? Number(scope.row.price) - 0.01 : 999999.99
+                                                    " :step="iii === 'stock' ? 1 : 0.01" controls-position="right"
+                                                step-strictly></el-input-number>
+                                        </template>
+                                    </el-table-column>
+                                    <template v-if="formValidate.type == 5">
+                                        <el-table-column label="云盘设置" min-width="120" align="center">
+                                            <template slot-scope="scope">
+                                                <el-button v-if="!scope.row.expand" size="small"
+                                                    @click="handleAddVirtually(0, 'OneattrValue', 1)">添加链接</el-button>
+                                                <el-button v-else class="seeCatMy pointer" type="text" size="small"
+                                                    @click="seeVirtually(OneattrValue[0], 'OneattrValue', 0, 1)">已设置</el-button>
+                                            </template>
+                                        </el-table-column>
+                                    </template>
+                                    <template v-if="formValidate.type == 6">
+                                        <el-table-column label="卡密设置" min-width="120" align="center">
+                                            <template slot-scope="scope">
+                                                <el-button v-if="!scope.row.cdkeyId" size="small"
+                                                    @click="handleAddVirtually(0, 'OneattrValue', 2)">添加卡密</el-button>
+                                                <el-button v-else type="text" class="seeCatMy pointer"
+                                                    @click="seeVirtually(OneattrValue[0], 'OneattrValue', 0, 2)">{{
+                                                        scope.row.cdkeyLibraryName }}</el-button>
+                                            </template>
+                                        </el-table-column>
+                                    </template>
+                                </el-table>
+                            </el-form-item>
+                            <el-form-item label="全部sku：" v-if="$route.params.id && showAll">
+                                <el-button type="default" @click="showAllSku()" :disabled="isDisabled">展示</el-button>
+                            </el-form-item>
+                            <!-- 多规格表格-->
+                            <el-form-item v-if="formValidate.attr.length > 0 && formValidate.specType" label="商品属性："
+                                class="labeltop" :class="isDisabled ? 'disLabel' : 'disLabelmoren'">
+                                <el-alert title="价格设置范围 0.01~999999.99" type="info"> </el-alert>
+                                <el-table :data="ManyAttrValue" border class="tabNumWidth" size="small">
+                                    <template v-if="manyTabDate">
+                                        <el-table-column v-for="(item, iii) in manyTabDate" :key="iii"
+                                            :label="manyTabTit[iii].title" min-width="80" align="center">
+                                            <template slot-scope="scope">
+                                                <span class="priceBox" v-text="scope.row[iii]" />
+                                            </template>
+                                        </el-table-column>
+                                    </template>
+                                    <el-table-column label="图片" width="80" align="center">
+                                        <template slot-scope="scope">
+                                            <div class="upLoadPicBox" @click="modalPicTap('1', 'duo', scope.$index)">
+                                                <div v-if="scope.row.image" class="pictrue tabPic"><img
+                                                        :src="scope.row.image" /></div>
+                                                <div v-else class="upLoad tabPic">
+                                                    <i class="el-icon-camera cameraIconfont" />
+                                                </div>
+                                            </div>
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column v-if="formValidate.isSub" label="一级返佣(%)" min-width="120"
+                                        align="center">
+                                        <template slot-scope="scope">
+                                            <el-input :disabled="isDisabled" v-model.trim="scope.row.brokerage"
+                                                maxlength="6" min="0" class="priceBox"
+                                                @keyup.native="keyupEventBrokerage('brokerage', scope.$index, 3)" />
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column v-if="formValidate.isSub" label="二级返佣(%)" min-width="120"
+                                        align="center">
+                                        <template slot-scope="scope">
+                                            <el-input maxlength="6" :disabled="isDisabled"
+                                                v-model.trim="scope.row.brokerageTwo" min="0" class="priceBox"
+                                                @keyup.native="keyupEventBrokerage('brokerageTwo', scope.$index, 3)" />
+                                        </template>
+                                    </el-table-column>
+                                    <el-table-column v-for="(item, iii) in attrValue" :key="iii"
+                                        :label="formThead[iii].title" min-width="120" align="center">
+                                        <template slot-scope="scope">
+                                            <el-input v-if="iii === 'barCode'" :disabled="isDisabled"
+                                                v-model="scope.row[iii]" maxlength="40" type="test" class="priceBox"
+                                                :readonly="false" />
+                                            <el-input-number v-else v-model.trim="scope.row[iii]" :disabled="isDisabled"
+                                                :min="iii === 'stock' ? 1 : 0.01" :max="formValidate.isPaidMember && iii === 'vipPrice' ? Number(scope.row.price) - 0.01 : 999999.99
+                                                    " :step="iii === 'stock' ? 1 : 0.01" controls-position="right"
+                                                step-strictly></el-input-number>
+                                        </template>
+                                    </el-table-column>
+                                    <template v-if="formValidate.isSub"></template>
+                                    <template v-if="formValidate.type == 5">
+                                        <el-table-column label="云盘设置" min-width="120" align="center">
+                                            <template slot-scope="scope">
+                                                <el-button v-if="!scope.row.expand" size="small"
+                                                    @click="handleAddVirtually(scope.$index, 'ManyAttrValue', 1)">添加链接</el-button>
+                                                <el-button v-else class="seeCatMy pointer" type="text" size="small"
+                                                    @click="seeVirtually(ManyAttrValue[scope.$index], 'ManyAttrValue', scope.$index, 1)">已设置</el-button>
+                                            </template>
+                                        </el-table-column>
+                                    </template>
+                                    <template v-if="formValidate.type == 6">
+                                        <el-table-column label="卡密设置" min-width="120" align="center">
+                                            <template slot-scope="scope">
+                                                <el-button v-if="!scope.row.cdkeyId" size="small"
+                                                    @click="handleAddVirtually(scope.$index, 'ManyAttrValue', 2)">添加卡密</el-button>
+                                                <el-button v-else type="text" class="seeCatMy pointer"
+                                                    @click="seeVirtually(ManyAttrValue[scope.$index], 'ManyAttrValue', scope.$index, 2)">{{
+                                                        scope.row.cdkeyLibraryName }}</el-button>
+                                            </template>
+                                        </el-table-column>
+                                    </template>
+                                    <el-table-column v-if="!isDisabled" key="3" label="操作" width="70" align="center">
+                                        <template slot-scope="scope">
+                                            <a class="submission" @click="delAttrTable(scope.$index)">删除</a>
+                                        </template>
+                                    </el-table-column>
+                                </el-table>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <!-- 商品详情-->
+                    <el-row v-show="currentTab === '3' && !isDisabled">
+                        <el-col :span="24">
+                            <el-form-item label="商品详情：">
+                                <Tinymce v-model.trim="formValidate.content"></Tinymce>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+
+                    <el-row v-show="currentTab === '3' && isDisabled">
+                        <el-col :span="24">
+                            <el-form-item label="商品详情：">
+                                <span v-html="formValidate.content || '无'"></span>
+                            </el-form-item>
+                        </el-col>
+                    </el-row>
+                    <!-- 其他设置-->
+                    <el-row v-show="currentTab === '4'">
+                        <el-form-item label="排序：">
+                            <el-input-number v-model.trim="formValidate.sort" :min="1" :max="9999" placeholder="请输入排序"
+                                @keyup.native="proving1" :disabled="isDisabled" />
+                        </el-form-item>
+                        <div class="acea-row">
+                            <el-form-item label="赠送优惠券：" class="proCoupon">
+                                <div class="from-tips mb14">用户购买商品后赠送的优惠券</div>
+                                <div class="acea-row">
+                                    <el-tag v-for="(tag, index) in formValidate.coupons" :key="index" class="mr10 mb10"
+                                        :closable="!isDisabled" :disable-transitions="false"
+                                        @close="handleCloseCoupon(tag)">
+                                        {{ tag.name }}
+                                    </el-tag>
+                                    <span class="mr15" v-if="formValidate.couponIds == null">无</span>
+                                    <el-button v-if="!isDisabled" size="small" class="mr15"
+                                        @click="addCoupon">选择优惠券</el-button>
+                                </div>
+                            </el-form-item>
+                        </div>
+                    </el-row>
+                    <el-form-item>
+                        <el-button v-if="Number(currentTab) > 1" class="submission priamry_border"
+                            @click="handleSubmitUp">上一步</el-button>
+                        <el-button v-show="Number(currentTab) < 4" class="priamry_border"
+                            @click="handleSubmitNest('formValidate')">下一步</el-button>
+                        <el-button v-show="(currentTab === '3' || $route.params.id) && !isDisabled" type="primary"
+                            class="submission" @click="handleSubmit('formValidate')"
+                            :loading="loadingBtn">保存</el-button>
+                        <el-button v-show="(currentTab === '3' || $route.params.id) &&
+                            !isDisabled &&
+                            (this.productSwitch || this.formValidate.auditStatus > 0)
+                            " type="primary" class="submission" @click="handleSubmitAndAudit('formValidate')"
+                            :loading="loadingBtn">保存并提审</el-button>
+                    </el-form-item>
+                </el-form>
+            </el-card>
+        </div>
+    </obj-modal>
+</template>
+<script>
+const defaultObj = {
+    image: '',
+    sliderImages: [],
+    sliderImage: '',
+    name: '',
+    intro: '',
+    keyword: '',
+    cateIds: [], // 商品分类id
+    cateId: null, // 商品分类id传值
+    unitName: '',
+    sort: 0,
+    isShow: false,
+    tempId: '',
+    attrValue: [
+        {
+            image: '',
+            price: 0.01,
+            vipPrice: 0.01,
+            cost: 0.01,
+            otPrice: 0.01,
+            stock: 0,
+            barCode: '',
+            weight: 0,
+            volume: 0,
+            brokerage: 0,
+            brokerageTwo: 0,
+            cdkeyId: null,
+            cdkeyLibraryName: '',
+            expand: '',
+        },
+    ],
+    attr: [],
+    selectRule: '',
+    isSub: false,
+    isPaidMember: false,
+    content: '',
+    specType: false,
+    id: undefined,
+    couponIds: [],
+    coupons: [],
+    categoryId: 0,
+    guaranteeIds: '',
+    guaranteeIdsList: [] || null,
+    brandId: '',
+    type: 0, // 商品类型
+    isAutoSubmitAudit: false, //是否自动提审
+    isAutoUp: false, //是否自动上架
+};
+const objTitle = {
+    price: {
+        title: '售价（元）',
+    },
+    vipPrice: {
+        title: '会员价（元）',
+    },
+    cost: {
+        title: '成本价（元）',
+    },
+    otPrice: {
+        title: '原价（元）',
+    },
+    stock: {
+        title: '库存',
+    },
+    barCode: {
+        title: '商品编号',
+    },
+    weight: {
+        title: '重量（KG）',
+    },
+    volume: {
+        title: '体积(m³)',
+    },
+    brokerage: {
+        title: '一级返佣(%)',
+    },
+    brokerageTwo: {
+        title: '二级返佣(%)',
+    },
+};
+import Tinymce from "@/components/tinymce";
+import { debounce, cloneDeep } from "lodash";
+export default {
+    components: { Tinymce },
+    data() {
+        return {
+            modalData: {},
+            modalConfig: {
+                title: "编辑商品",
+                show: false,
+                width: "1300px",
+                fullscreen: true,
+            },
+            //添加商品
+            headTab: [
+                { tit: '商品信息', name: '1' },
+                { tit: '规格库存', name: '2' },
+                { tit: '商品详情', name: '3' },
+                { tit: '其他设置', name: '4' },
+            ],
+            form: 2,
+            url: '',
+            copyConfig: {},
+            labelarr: [],
+            isDisabled: this.$route.params.isDisabled === '1' ? true : false,
+            isCopy: this.$route.params.isCopy === '1' ? true : false, //是否是采集
+            props2: {
+                children: 'childList',
+                label: 'name',
+                value: 'id',
+                multiple: false,
+                emitPath: false,
+                checkStrictly: true,
+            },
+            props1: {
+                children: 'childList',
+                label: 'name',
+                value: 'id',
+                multiple: false,
+                emitPath: false,
+            },
+            tabs: [],
+            fullscreenLoading: false,
+            props: { multiple: true },
+            active: 0,
+            OneattrValue: [Object.assign({}, defaultObj.attrValue[0])], // 单规格
+            ManyAttrValue: [Object.assign({}, defaultObj.attrValue[0])], // 多规格
+            ruleList: [],
+            merCateList: [], // 商户分类筛选
+            shippingList: [], // 运费模板
+            formThead: Object.assign({}, objTitle),
+            formValidate: Object.assign({}, defaultObj),
+            formDynamics: {
+                ruleName: '',
+                ruleValue: [],
+            },
+            tempData: {
+                page: 1,
+                limit: 9999,
+            },
+            manyTabTit: {},
+            manyTabDate: {},
+            grid2: {
+                xl: 24,
+                lg: 24,
+                md: 24,
+                sm: 24,
+                xs: 24,
+            },
+            // 规格数据
+            formDynamic: {
+                attrsName: '',
+                attrsVal: '',
+            },
+            isBtn: false,
+            manyFormValidate: [],
+            currentTab: '1',
+            isChoice: '',
+            grid: {
+                xl: 24,
+                lg: 24,
+                md: 24,
+                sm: 24,
+                xs: 24,
+            },
+            ruleValidate: {
+                name: [{ required: true, message: '请输入商品名称', trigger: 'blur' }],
+                categoryId: [{ required: true, message: '请选择平台商品分类', trigger: 'change' }],
+                cateIds: [{ required: true, message: '请选择商户商品分类', trigger: 'change', min: '1' }],
+                unitName: [{ required: true, message: '请输入单位', trigger: 'blur' }],
+                intro: [{ required: true, message: '请输入商品简介', trigger: 'blur' }],
+                tempId: [{ required: true, message: '请选择运费模板', trigger: 'change' }],
+                image: [{ required: true, message: '请上传商品图', trigger: 'change' }],
+                sliderImages: [{ required: true, message: '请上传商品轮播图', type: 'array', trigger: 'change' }],
+                specType: [{ required: true, message: '请选择商品规格', trigger: 'change' }],
+                brandId: [{ required: true, message: '请选择商品品牌', trigger: 'change' }],
+            },
+            attrInfo: {},
+            tableFrom: {
+                page: 1,
+                limit: 9999,
+                keywords: '',
+            },
+            tempRoute: {},
+            keyNum: 0,
+            isAttr: false,
+            showAll: false,
+            guaranteeList: [],
+            brandList: [],
+            search: {
+                limit: 10,
+                page: 1,
+                cid: '',
+                brandName: '',
+            },
+            totalPage: 0,
+            total: 0,
+            loading: false,
+            loadingBtn: false,
+            isShowGroup: false,
+            guaranteeGroupList: [],
+            guaranteeNew: [],
+            guaranteeName: [],
+            multiples: true,
+            productClassify: [], //平台商品分类
+            productType: [
+                { tit: '普通商品', id: 0, tit2: '实体货物' },
+                { tit: '云盘商品', id: 5, tit2: '同一链接发货' },
+                { tit: '卡密商品', id: 6, tit2: '不同充值码发货' },
+            ],
+
+            carMytabIndex: 0,
+            carMytabName: '',
+            cloudDisk: '', //云盘地址
+            upload: {
+                videoIng: false, // 是否显示进度条；
+            },
+            videoLink: '', //视频地址
+            progress: 10, // 进度条默认0
+            myHeaders: { 'token': this.$cookie.get('token') },
+            cdkeyId: null, //卡密库id
+            cdkeyLibraryInfo: null, //卡密库对象
+            editDialogConfig: {
+                visible: false,
+                isCreate: 0, // 0=创建，1=编辑
+                prent: {}, // 父级对象
+                data: {},
+                biztype: { name: '产品分类', value: 1, shortName: '产品' }, // 统一主业务中的目录类型
+            }, //商品分类
+            isSwitch: false, //商户开关
+            productSwitch: false, //商品是否需要审核 true需要审核，false免审
+        };
+    },
+    mounted() { },
+    methods: {
+        toggle(e) {
+            if (this.modalConfig.show == false) {
+                this.modalConfig.show = true;
+            } else {
+                this.ctxBg.clear();
+                this.modalConfig.show = false;
+            }
+            if (e) {
+                console.log(e);
+                this.init(cloneDeep(e.row));
+            }
+            return {
+                add: (item) => {
+                    console.log(item);
+                    this.isAdd = true;
+                },
+                update: (row) => {
+                    this.modalData = row;
+                    this.isAdd = false;
+                },
+            };
+        },
+        init(row) { },
+        onChangeCategory() { },
+        changeGuarantee() { },
+        onchangeIsShow() { },
+        handleUploadForm() { },
+        beforeAvatarUpload() { },
+        addCoupon() { }
+    },
+    computed: {
+        modalHandles() {
+            return [
+                {
+                    label: "下载平面图",
+                    type: "info",
+                    plain: true,
+                    icon: "el-icon-download",
+                    loading: this.isLoading,
+                    // submit: true,
+                    handle: debounce(() => {
+                        this.download();
+                    }, 300),
+                },
+                {
+                    label: "确定",
+                    type: "primary",
+                    loading: this.isLoading,
+                    // submit: true,
+                    handle: debounce(() => {
+                    }, 300),
+                },
+            ];
+        },
+    },
+    asyncComputed: {
+        async getProductCategory() {
+            let res = await this.$api.mer_admin.getProductCategory();
+            return res.data.data;
+
+        }
+    },
+};
+</script>
+<style lang="scss" scoped></style>
\ No newline at end of file
diff --git a/src/views/modules/service/course-demo-show.vue b/src/views/modules/service/course-demo-show.vue
deleted file mode 100644
index 45d2313..0000000
--- a/src/views/modules/service/course-demo-show.vue
+++ /dev/null
@@ -1,361 +0,0 @@
-<!--
- * @Author: chenkangxu
- * @Date: 2022-09-22 11:05:03
- * @LastEditTime: 2022-09-26 18:21:37
- * @LastEditors: chenkangxu
- * @Description: 
- * @Github: 
--->
-<template>
-  <div>
-    <!-- 展示主题 -->
-    <div v-show="currentTheme==''">
-      <div class="search-course-category">
-        <el-select style="width:300px" v-model="currentCategory" clearable placeholder="请选择课程类型" @change="handleChoseSecondType">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </div>
-      <div class="courseCategoryContainer">
-        <div v-for="item in categoryList" v-if="item.themeName!='伟人足迹'" class="course-category-img" @click="choseCurrentTheme(item)">
-          <img :src="studyCategoryMapper[item.themeName]" alt="" />
-        </div>
-        <div
-          v-for="item in 3 - (categoryList.length % 2)"
-          class="course-category-img"
-        ></div>
-      </div>
-    </div>
-    <!-- 点击展示对应课程 -->
-    <div v-show="currentTheme!=''" class="px-2">
-      <div class="d-flex a-center">
-        <el-button type="primary" icon="el-icon-arrow-left" @click="currentTheme=''">返回</el-button>
-        <el-button type="info" icon="el-icon-refresh" @click="getThemeCourse">刷新</el-button>
-        <el-select style="width:300px" class="ml-1" v-model="currentGradeLevel" clearable placeholder="请选择年级" @change="getThemeCourse">
-          <el-option
-            v-for="item in optionsGrade"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <!-- <el-button type="primary" plain icon="el-icon-upload2" @click="sendPractice">发布随堂练习</el-button> -->
-        <!-- 切换随堂练习和课程 -->
-        <!-- <el-radio-group v-model="switchClassAndExercises" class="ml-2"> -->
-          <!-- <el-radio-button label="课程"></el-radio-button> -->
-          <!-- <el-radio-button label="随堂练习"></el-radio-button> -->
-        <!-- </el-radio-group> -->
-      </div>
-      <!-- 弹窗-查看文章类型 -->
-      <text-content-popup ref="textContentPopup"></text-content-popup>
-      <!-- 弹窗-播放视频 -->
-      <video-popup ref="videoPopup"></video-popup>
-      <!-- 发布随堂练习弹窗 -->
-      <publish-inclass-exercises ref="publishInclassExercises" @refresh="getThemePractices"></publish-inclass-exercises>
-
-      <!-- <div class="courseCategoryContainer">
-        <div v-for="item in categoryList" class="course-category-img" @click="choseCurrentTheme(item)">
-          <img :src="studyCategoryMapper[item]" alt="" />
-        </div>
-      </div> -->
-      <!-- 课程 -->
-      <template v-if="switchClassAndExercises=='课程'">
-        <div class="course w-100 d-flex flex-wrap" v-loading="isLoading">
-          <el-card class="course-card mt-2 mx" v-for="item in courseList" :key="item.courseId">
-            <div slot="header" class="w-100 d-flex j-sa">
-              <el-button plain type="primary" v-if="item.ppt!=''">播放课件</el-button>
-              <el-button plain type="primary" v-if="item.content&&item.content.length>0" @click="openTextContent(item)">课文</el-button>
-              <!-- 需要接口加个字段 -->
-              <el-button plain type="primary" v-if="item.videoUrl&&item.videoUrl.length>0" @click="openVideo(item)">视频播放</el-button>
-              <!-- <el-button plain type="primary" v-if="item.projectDTO&&item.projectDTO.list&&item.projectDTO.list.length>0" @click="goExam(item)">课程练习</el-button> -->
-            </div>
-            <div class="d-flex a-center">
-              <el-image fit="contain" :src="item.image" style="width:100px;height:100px;">
-                <div slot="error" class="d-flex j-center a-center" style="width:100px;height:100px;background-color:#ccc;color:#999;">
-                  <span>大妈集市商户端</span>
-                </div>
-              </el-image>
-              <span class="ml-2 font-plus">{{item.title}}</span>
-            </div>
-          </el-card>
-          <el-empty 
-          style="width:100%;"
-          v-if="courseList.length<=0" description="暂无数据"></el-empty>
-        </div>
-        <el-pagination
-          class="mt-0"
-          layout="total,sizes, prev, pager, next,jumper"
-          @size-change="sizeChange"
-          @current-change="currentChange"
-          :page-size="pageData.limit"
-          :total="pageData.total">
-        </el-pagination>
-      </template>
-      <!-- 随堂练习 -->
-      <template v-if="switchClassAndExercises=='随堂练习'">
-        <div class="course w-100 d-flex flex-wrap" v-loading="exerciseIsLoading">
-          <el-card class="course-card mt-2 mx" v-for="item in exercisesList" :key="item.courseId">
-            <div class="d-flex a-center j-sb">
-              <div class="d-flex flex-column">
-                <span class="my font-plus">{{item.practiceName}}</span>
-                <span class="my text-secondary">{{item.createTime}}布置</span>
-              </div>
-              <el-button :type="item.isFinish==0?'danger':'success'"
-              @click="goExam(item)"
-              >{{item.isFinish==0?"立即学习":"已完成"}}</el-button>
-            </div>
-          </el-card>
-          <el-empty style="margin:0 auto;" v-if="exercisesList.length<=0" description="暂无随堂练习"></el-empty>
-        </div>
-        <el-pagination
-          layout="total,sizes, prev, pager, next,jumper"
-          @size-change="exerciseSizeChange"
-          @current-change="exerciseCurrentChange"
-          :page-size="exercisePageData.limit"
-          :total="exercisePageData.total">
-        </el-pagination>
-      </template>
-    </div>
-    <!-- 随堂小测、练习弹窗 -->
-    <exam-popup ref="examPopup" @refresh="getThemePractices"></exam-popup>
-  </div>
-</template>
-
-<script>
-import studyCategoryMapper from "@/mapper/study-image.js";
-import textContentPopup from './popup/text-content-popup';
-import videoPopup from './popup/video-popup'
-import publishInclassExercises from './popup/publish-inclass-exercises'
-import examPopup from './popup/exam-popup'
-export default {
-  components:{
-    textContentPopup,videoPopup,publishInclassExercises,examPopup
-  },
-  data() {
-    return {
-      studyCategoryMapper,
-      currentCategory:'红心向党',
-      options:[
-        {
-          label:'红心向党',
-          value:'红心向党'
-        },
-        {
-          label:'道德修养',
-          value:'道德修养'
-        },
-        {
-          label:'好好学习',
-          value:'好好学习'
-        },
-        {
-          label:'奋进新时代',
-          value:'奋进新时代'
-        }
-      ],
-      //当前选择的年级
-      currentGradeLevel:2,
-      optionsGrade:[
-        {
-          label:"低年级",
-          value:2
-        },
-        {
-          label:"中年级",
-          value:3
-        },
-        {
-          label:"高年级",
-          value:5
-        },
-      ],
-      categoryList: Object.keys(studyCategoryMapper),
-      //当前选择的主题
-      currentTheme:'',
-      //当前选择的主题id
-      currentThemeId:'',
-      //分页数据
-      pageData:{
-        page:1,
-        limit:10,
-        total:1
-      },
-      //分页数据 - 随堂练习
-      exercisePageData:{
-        page:1,
-        limit:10,
-        total:1
-      },
-      //课程列表
-      courseList:[],
-      //随堂练习列表
-      exercisesList:[],
-      //是否在加载中
-      isLoading:false,
-      //随堂练习是否加载中
-      exerciseIsLoading:false,
-      //切换课程还是对应的随堂练习
-      switchClassAndExercises:"课程"
-    };
-  },
-  watch:{
-    switchClassAndExercises(newVal){
-      if(newVal=='随堂练习'){
-        this.getThemePractices();
-      }
-    }
-  },
-  methods:{
-    handleChoseSecondType(value){
-        if(!value){
-            this.categoryList = Object.keys(studyCategoryMapper);
-            return;
-        }
-        this.$api.study
-        .getStudySecondModule(value)
-        .then(({data:res})=>{
-            let currentArr = [];
-            res.list.forEach(item => {
-              console.log("item",item);
-                currentArr.push({themeName:item.themeName,themeNameId:item.courseThemeId})
-            });
-            this.categoryList = currentArr;
-        })
-    },
-    //选择主题
-    choseCurrentTheme({themeName,themeNameId}){
-      this.currentTheme=themeName;
-      this.currentThemeId=themeNameId
-      console.log("this.currentTheme",this.currentTheme);
-      this.getThemeCourse();
-    },
-    //根据主题查询对应的课程
-    getThemeCourse(){
-      // 手动选择年级
-      this.isLoading=true;
-      // this.$api.my.getUserInfo()
-      // .then((res)=>{
-        let grade=2
-      //   if(res.data.user.studentGrade>=1 && res.data.user.studentGrade<=2){
-      //     grade=2
-      //   }else if(res.data.user.studentGrade>=3 && res.data.user.studentGrade<=4){
-      //     grade=3
-      //   }else{
-      //     grade=5
-      //   }
-        this.$api.study.getRedStudyCourse(this.currentCategory,this.pageData.page,
-        this.pageData.limit,'',this.currentGradeLevel,this.currentThemeId)
-        .then(res=>{
-          console.log(res);
-          this.courseList=res.data.page.list;
-          this.pageData.total=res.data.page.totalCount;
-          
-        })
-        .finally(()=>{
-          this.isLoading=false;
-        })
-      // })
-      
-    },
-    //根据主题查询对应的随堂练习
-    getThemePractices(){
-      this.exerciseIsLoading=true;
-      this.$api.study.getPracticesListByType(this.currentCategory,this.exercisePageData.page,this.exercisePageData.limit,'',this.currentThemeId)
-      .then(res=>{
-        console.log('res',res);
-        this.exercisesList=res.data.page.list;
-        this.exercisePageData.total=res.data.page.totalCount;
-      })
-      .finally(()=>{
-        this.exerciseIsLoading=false;
-      })
-    },
-    currentChange(page){
-        this.pageData.page=page;
-        this.getThemeCourse();
-    },
-    exerciseCurrentChange(page){
-        this.exercisePageData.page=page;
-        this.getThemePractices();
-    },
-    sizeChange(size){
-        this.pageData.limit=size;
-        this.getThemeCourse();
-    },
-    exerciseSizeChange(size){
-        this.exercisePageData.limit=size;
-        this.getThemePractices();
-    },
-    //发布随堂练习
-    sendPractice(){
-      this.$refs.publishInclassExercises.init();
-    },
-    //打开课文
-    openTextContent(item){
-      this.$refs.textContentPopup.init(item);
-    },
-    //open video
-    openVideo(item){
-      this.$refs.videoPopup.init(item);
-    },
-    //前往答题
-    goExam(item){
-      this.$refs.examPopup.init(item);
-    }
-  },
-  mounted() {
-    //初始化
-    this.handleChoseSecondType(this.currentCategory);
-  },
-};
-</script>
-
-<style scoped lang="scss">
-.courseCategoryContainer {
-  display: flex;
-  flex-wrap: wrap;
-  margin: 0 30px 0 20px;
-  justify-content: space-between;
-  .course-category-img {
-    flex: 0 0 30%;
-    margin-bottom: 30px;
-    transition: transform 0.3s;
-    &:last-of-type {
-      justify-self: flex-start;
-    }
-    &:hover{
-      transform: scale(1.05);
-      transition: transform 0.3s;
-    }
-    &:active{
-      transform: scale(1.035);
-      transition: transform 0.3s cubic-bezier(0.68, -0.6, 0.32, 1.6);
-    }
-  }
-
-  img {
-    width: 100%;
-  }
-}
-.search-course-category{
-    margin-left: 20px;
-    margin-bottom: 20px;
-}
-.back{
-  cursor: pointer;
-}
-.course-card{
-  width: 350px;
-  max-height:220px;
-}
-.course{
-  height: calc(100vh - 220px);
-  overflow-y: scroll;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/service/course-manage.vue b/src/views/modules/service/course-manage.vue
deleted file mode 100644
index c6e8d0c..0000000
--- a/src/views/modules/service/course-manage.vue
+++ /dev/null
@@ -1,745 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      :key="searchFormKey"
-      ref="searchForm"
-      :searchForm="searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-      labelWidth="120px"
-    >
-    </searchForm>
-    <obj-table-plus
-      style="height: 60vh"
-      @query="searchTableList"
-      ref="oTable"
-      v-model="pageData.tableData"
-      :isPagination="true"
-      :tableCols="tableCols"
-      :toolbarProp="toolbarProp"
-      :toolbarEvent="toolbarEvent"
-      :tableProp="tableProp"
-      :tableEvent="{
-        'checkbox-change': selectChange,
-        'checkbox-all': selectChange,
-      }"
-      :enableAutoQuery="false"
-      :enablePagerInterceptors="true"
-      @handleSizeChange="handleSizeChange"
-      @handleCurrentChange="handleCurrentChange"
-    />
-    <el-dialog
-      :visible.sync="editorDialogVisible"
-      fullscreen
-      @close="closeDialog"
-      class="content-dialog"
-    >
-      <contentEditor
-        v-if="editorDialogVisible"
-        :isUpdate="isUpdate"
-        :updateData="updateData"
-        @close="editorDialogVisible = false"
-      ></contentEditor>
-    </el-dialog>
-    <!-- 发布时间modal -->
-    <modal
-      ref="modal"
-      :modalConfig="modalSetting.modalConfig"
-      :modalForm="modalSetting.modalForm"
-      :modalData="modalSetting.modalData"
-      :modalHandles="modalSetting.modalHandles"
-    />
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-import contentEditor from "../../../components/common/content-editor/content-editor.vue";
-export default {
-  components: { searchForm, cusTable, contentEditor, modal },
-  data() {
-    return {
-      typeList: [],
-      editorDialogVisible: false,
-      tableProp: {
-        height: "auto",
-      },
-      toolbarEvent: {
-        "button-click": ({ code }) => {
-          if (code == "add")
-            this.showModal(this.commonConstants.modalType.insert);
-          else if (code == "deleteBatch") {
-            this.deleteBatch();
-          } else if (code == "startEdit") {
-            this.editSort = true;
-          } else if (code == "saveEdit") {
-            let data=this.pageData.tableData.map(item=>{return{
-              courseId:item.courseId,
-              courseSort:item.courseCopySort
-            }})
-            this.$api.updateCourseListSort(data).then(res=>{
-              this.$refs.oTable.refresh()
-            }).finally(()=>{
-              this.editSort=false
-            })
-          }else if(code=='cancelEdit'){
-            this.editSort=false
-          }
-        },
-      },
-      pageData: {
-        //查询表单内容 start
-
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          courseType: "红心向党",
-          courseGrade: "",
-          examineStatus: "",
-          courseThemeId: "",
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            submit: true,
-            handle: () => this.$refs.oTable.reload(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        // tableHandles: [
-        //   {
-        //     label: "新增",
-        //     type: "primary",
-        //     handle: () => this.showModal(this.commonConstants.modalType.insert),
-        //     auth: "reportDatasource_insert",
-        //   },
-        //   // {
-        //   //   label: "批量删除",
-        //   //   type: "danger",
-        //   //   handle: () => this.deleteBatch(),
-        //   //   auth: "reportDatasource_batchDelete",
-        //   // },
-        // ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-      },
-      modalSetting: {
-        modalConfig: {
-          show: false,
-          title: "发布",
-        },
-        modalForm: [
-          {
-            label: "发布时间",
-            prop: "releaseTime",
-            type: "DateTime",
-            rules: { required: true },
-          },
-        ],
-        modalData: {
-          releaseTime: "",
-        },
-        row: {},
-        modalHandles: [
-          {
-            label: "确认",
-            type: "primary",
-            handle: () => {
-              this.updateReleaseTime();
-            },
-          },
-        ],
-      },
-      // 修改数据
-      isUpdate: false,
-      updateData: {},
-      searchFormKey: 0,
-      editSort: false,
-    };
-  },
-  activated() {
-    if (typeof this.pageData.queryData.courseType == "string") {
-      this.$api
-        .courseThemeAll({ courseType: this.pageData.queryData.courseType })
-        .then((res) => {
-          this.searchForm[1].data.filter((item) => {
-            return item.value == this.pageData.queryData.courseType;
-          })[0].children = res.data.list.map((item) => {
-            return {
-              label: item.themeName,
-              value: item.courseThemeId,
-              leaf: true,
-            };
-          });
-          this.pageData.queryData.courseType = [
-            this.pageData.queryData.courseType,
-            res.data.list[0].courseThemeId,
-          ];
-          this.searchFormKey++;
-        })
-        .finally(() => {
-          this.$refs.oTable.refresh();
-        });
-    } else {
-      this.$refs.oTable.refresh();
-    }
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList(pageNo, pageSize) {
-      // 初始化obj
-      var obj = {};
-      Object.assign(obj, this.pageData.queryData);
-      obj.page = pageNo;
-      obj.limit = pageSize;
-      delete obj["pageSizeRange"];
-      if (obj.courseType.length == 0) {
-        obj.courseType = "";
-        obj.courseThemeId = "";
-      } else if (obj.courseType.length == 1) {
-        obj.courseType = obj.courseType[0];
-        obj.courseThemeId = "";
-      } else if (obj.courseType.length == 2) {
-        obj.courseThemeId = obj.courseType[1];
-        obj.courseType = obj.courseType[0];
-      }
-      // 请求数据
-      this.$api.getCourseListByParams(obj).then((res) => {
-        this.$refs.oTable.complete(
-          res.data.page.list,
-          res.data.page.totalCount
-        );
-        // this.commonUtil.tableAssignment(
-        //   res.data.page,
-        //   this.pageData.tablePage,
-        //   this.pageData.tableData
-        // );
-      });
-    },
-    // 重置
-    resetSearch() {
-      // this.commonUtil.clearObj(this.pageData.queryData);
-      this.$refs.searchForm.$refs.searchFormRef.resetFields();
-      this.$refs.oTable.reload();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      console.log(type, row);
-      if (row && row.releaseTime) {
-        row.isSubmit = true;
-      } else if (row) {
-        row.isSubmit = false;
-      }
-      if (type != this.commonConstants.modalType.insert) {
-        this.isUpdate = true;
-        console.log(row)
-        this.updateData = JSON.parse(JSON.stringify(row));
-      } else {
-        this.isUpdate = false;
-        this.updateData = {};
-      }
-      this.editorDialogVisible = true;
-    },
-    /**
-     * @description: 重置编辑数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    closeDialog() {
-      this.isUpdate = false;
-      this.updateData = {};
-      this.$refs.oTable.refresh();
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      // this.$refs["modalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      // this.pageData.modalConfig.show = false; //关闭modal
-      // this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.pageData.modalData.userId = this.$store.state.user.id;
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveNewContent(content).then((res) => {
-              this.$refs.oTable.refresh();
-            });
-          } else {
-            // 审核通过的内容再次编辑会变成未审核
-            // if(content.examineStatus==1){
-            //   content.examineStatus=0
-            // }
-            this.$api.updateRedContentInfo(content).then((res) => {
-              this.$refs.oTable.refresh();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    updateReleaseTime() {
-      this.$refs.modal.$refs.modalFormRef.validate((valid) => {
-        if (valid) {
-          let data = Object.assign({}, this.modalSetting.row);
-          data.releaseTime = this.modalSetting.modalData.releaseTime;
-
-          this.$api.updateRedCourse(data).then((res) => {
-            this.modalSetting.modalData.releaseTime = "";
-            this.$nextTick(() => {
-              this.$refs.modal.$refs.modalFormRef.clearValidate();
-            });
-            this.modalSetting.modalConfig.show = false;
-            this.$refs.oTable.refresh();
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteRedContentInfo(ids).then((res) => {
-            this.searchTableList();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch(row) {
-      let data = [];
-      if (row) {
-        console.log(row);
-        data = [row.courseId];
-      } else {
-        data = this.pageData.selectList.map((item) => item.courseId);
-      }
-      this.$confirm("此操作将永久删除该课程, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$api.deleteRedCourse(data).then((res) => {
-            this.$refs.oTable.refresh();
-            this.$message({
-              type: "success",
-              message: "删除成功!",
-            });
-          });
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消删除",
-          });
-        });
-    },
-    selectChange({ records }) {
-      console.log(records);
-      this.pageData.selectList = records;
-    },
-    handleSizeChange(e,next){
-      if(this.editSort){
-
-      }else{
-        next()
-      }
-    },
-    handleCurrentChange(e,next){
-      if(this.editSort){
-
-      }else{
-        next()
-      }
-    }
-  },
-  computed: {
-    searchForm() {
-      return [
-        { type: "Input", label: "标题/课程简介", prop: "searchName" },
-        {
-          type: "Cascader",
-          label: "课程类型",
-          prop: "courseType",
-          rules: {
-            required: true,
-            message: "请选择课程类型",
-            trigger: "blur",
-          },
-          props: {
-            lazy: true,
-            lazyLoad: (node, reslove) => {
-              if (
-                node.data.leaf ||
-                (node.data.children && node.data.children.length != 0)
-              ) {
-                reslove();
-              } else {
-                this.$api
-                  .courseThemeAll({ courseType: node.value })
-                  .then((res) => {
-                    reslove(
-                      res.data.list.map((item) => {
-                        return {
-                          label: item.themeName,
-                          value: item.courseThemeId,
-                          leaf: true,
-                        };
-                      })
-                    );
-                  });
-              }
-            },
-          },
-          data: JSON.parse(JSON.stringify(this.commonConstants.courseType)),
-          event:{
-            change: (val) => {
-              console.log(val);
-              if(val[0]=='我的学习'){
-                this.pageData.queryData.courseGrade='';
-              }
-              // this.$api.courseThemeAll({ courseType: val }).then((res) => {
-              //   this.pageData.searchForm[2].options = res.data.list.map(
-              //     (item) => {
-              //       return {
-              //         label: item.themeName,
-              //         value: item.courseThemeId,
-              //       };
-              //     }
-              //   );
-              // });
-            },
-          },
-
-        },
-        // {
-        //   type: "Select",
-        //   label: "课程类型",
-        //   prop: "courseThemeId",
-        //   rules: {
-        //     required: true,
-        //     message: "请选择课程类型",
-        //     trigger: "blur",
-        //   },
-        //   options: [
-        //   ],
-        // },
-        {
-          type: "Select",
-          label: "年级",
-          prop: "courseGrade",
-          default: true,
-          disabled:()=>{
-            return this.pageData.queryData.courseType[0]=='我的学习'?true:false;
-          },
-          options: [
-              { label: "低年级", value: 2 },
-              { label: "中年级", value: 3 },
-              // { label: "四年级", value: 4 },
-              { label: "高年级", value: 5 },
-          ],
-        },
-        {
-          type: "Select",
-          label: "审核状态",
-          prop: "examineStatus",
-          default: true,
-          options: [
-            { label: "未审核", value: 0 },
-            { label: "审核通过", value: 1 },
-            { label: "审核未通过", value: 2 },
-          ],
-        },
-      ];
-    },
-    tableCols() {
-      return [
-        { type: "checkbox", width: 50 },
-        {
-          title: "排序号",
-          type: "jsx",
-          width: 130,
-          align: "center",
-          render: ({ row }) => {
-            let handleChange=(value)=>{
-              this.$set(row,'courseCopySort',value)
-            }
-            if(!row.courseCopySort) row.courseCopySort=row.courseSort
-            if(this.editSort){
-              return (
-              <el-input-number
-                controls={false}
-                size="mini"
-                value={row.courseCopySort}
-                onInput={handleChange}
-                min={0}
-                style="width:100px"
-              ></el-input-number>
-            );
-            }else{
-              return (<span>{row.courseSort}</span>)
-            }
-            
-          },
-        },
-        { title: "标题", field: "title", align: "center" },
-        { title: "封面", type: "image", field: "image", align: "center" },
-        { title: "试卷名称", field: "paperName", align: "center" },
-
-        {
-          title: "发布时间",
-          field: "releaseTime",
-          align: "center",
-          type: "jsx",
-          render: ({ row }) => {
-            let handle = () => {
-              if (!row.releaseTime) {
-                this.modalSetting.modalConfig.show = true;
-                this.modalSetting.row = row;
-                // console.log(row)
-              }
-            };
-
-            if (!row.releaseTime) {
-              return (
-                <el-button onClick={() => handle()} type="text">
-                  发布
-                </el-button>
-              );
-            } else {
-              return <span>{row.releaseTime}</span>;
-            }
-          },
-          // formatter: (prop, row) => {
-          //   if (!row[prop]) {
-          //     return "发布";
-          //   }
-          // },
-          // itemClass: (row) => {
-          //   if (!row.releaseTime) {
-          //     return "el-button el-button--text el-button--medium";
-          //   }
-          // },
-          // click: (row) => {
-          //   if (!row.releaseTime) {
-          //     this.modalSetting.modalConfig.show = true;
-          //     this.modalSetting.row = row;
-          //     // console.log(row)
-          //   }
-          // },
-        },
-        { title: "课程分类", field: "courseType", align: "center" },
-        { title: "专题分类", field: "themeName", align: "center" },
-        {
-          title: "审核状态",
-          field: "createTime",
-          align: "center",
-          // "title-help":{message: '开关开启代表通过审核，关闭代表不通过审核'},
-          type: "jsx",
-          render: ({ row }) => {
-            switch (row.examineStatus) {
-              case 0:
-                return (
-                  <span>
-                    <span style="color:gray">未审核</span>
-                  </span>
-                );
-              case 1:
-                return (
-                  <span>
-                    <span style="color:green">审核通过</span>
-                  </span>
-                );
-              case 2:
-                return (
-                  <span>
-                    <span style="color:red">审核未通过</span>
-                  </span>
-                );
-              default:
-                return <span></span>;
-            }
-          },
-        },
-        {
-          title: "操作",
-          filed: "operation",
-          align: "center",
-          type: "jsx",
-          fixed: "right",
-          render: ({ row }) => {
-            return (
-              <div>
-                {row.examineStatus === 2 ? (
-                  <el-button
-                    type="text"
-                    size="mini"
-                    on-click={() =>
-                      this.$confirm("确认重新提交吗？", "提示").then(
-                        (action) => {
-                          if (action == "confirm") {
-                            this.$api
-                              .updateRedCourse({
-                                ...row,
-                                examineStatus: 0,
-                              })
-                              .then((res) => {
-                                this.$refs.oTable.reload();
-                              });
-                          }
-                        }
-                      )
-                    }
-                  >
-                    重新提交
-                  </el-button>
-                ) : (
-                  ""
-                )}
-                <el-button
-                  type="text"
-                  size="mini"
-                  on-click={() =>
-                    this.showModal(this.commonConstants.modalType.update, row)
-                  }
-                >
-                  编辑
-                </el-button>
-                <el-button
-                  type="text"
-                  size="mini"
-                  on-click={() => this.deleteBatch(row)}
-                >
-                  删除
-                </el-button>
-              </div>
-            );
-          },
-        },
-      ];
-    },
-    toolbarProp() {
-      let arr =[];
-      if (this.editSort) {
-        arr=[
-          {
-          name: "保存",
-          status: "success",
-          code: "saveEdit",
-        },
-        {
-          name: "取消",
-          code: "cancelEdit",
-        }
-        ]
-      } else {
-        arr = [{
-          name: "排序",
-          status: "success",
-          code: "startEdit",
-        }];
-      }
-      return {
-        buttons: [
-          {
-            name: "新增",
-            status: "primary",
-            code: "add",
-          },
-          {
-            name: "批量删除",
-            status: "danger",
-            code: "deleteBatch",
-          },
-          ...arr,
-        ],
-      };
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.content-dialog ::v-deep .el-dialog__body {
-  padding: 0px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/service/education-manage.vue b/src/views/modules/service/education-manage.vue
deleted file mode 100644
index 4d90521..0000000
--- a/src/views/modules/service/education-manage.vue
+++ /dev/null
@@ -1,474 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <!-- <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm> -->
-    <cusTable
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable>
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-  </div>
-</template>
-<script>
-import cc from '../../../utils/country-level2-data'
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  
-  data() {
-    return {
-      typeList: [],
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          {
-            type: "Cascader",
-            label: "资讯分类",
-            prop: "typeId",
-            props: { checkStrictly: true },
-            data: [],
-          },
-          { type: "Input", label: "关键字", prop: "searchName" },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          typeId: [],
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            handle: () => this.searchTableList(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增教育局",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "教育局名称", prop: "educationName", align: "center" },
-          { label: "用户名", prop: "username", align: "center" },
-          { label: "地址", prop: "address", align: "center" },
-          { label: "头像", prop: "headUrl", align: "center", type: "image" },
-          { label: "电话", prop: "mobile", align: "center" },
-          { label: "邮箱", prop: "email", align: "center" },
-          { label: "状态", align: "center", type: "status" },
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            type: "button",
-            fixed: "right",
-            btnList: [
-              {
-                label: "编辑",
-                type: "text",
-                auth: "reportDatasource_update",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.update, row),
-              },
-            ],
-          },
-          //   { label: "评论数", prop: "commentNumber", align: "center" },
-          //   { label: "来源", prop: "source", align: "center" },
-          //   { label: "创建时间", prop: "createTime", align: "center" },
-          //   { label: "更新时间", prop: "updateTime", align: "center" },
-          //   { label: "用户ID", prop: "userId", align: "center" },
-          //   { label: "用户名", prop: "username", align: "center" },
-          //   { label: "关键词", prop: "keywords", align: "center" },
-          //   { label: "标签名", prop: "labelName", align: "center" },
-          //   { label: "标签ID", prop: "labelId", align: "center" },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "70vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "用户名",
-            prop: "username",
-            rules: { required: true, maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "密码",
-            prop: "password",
-            rules: { required: true, maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "邮箱",
-            prop: "email",
-            width: "300px",
-            rules:{required:true,type:'email'}
-          },
-          {
-            type: "Input",
-            label: "电话",
-            prop: "mobile",
-            width: "300px",
-            rules:{required:true}
-          },
-          {
-            type: "RadioButton",
-            label: "状态",
-            prop: "status",
-            rules: { required: true },
-            width: "300px",
-            radios: [
-              { value: "1", label: "正常" },
-              { value: "0", label: "封禁" },
-            ],
-          },
-          {
-            type: "Checkbox",
-            label: "角色",
-            prop: "roleIdList",
-            rules: { required: true },
-            checkboxs: [],
-          },
-          {
-            type: "Input",
-            label: "教育局名称",
-            prop: "educationName",
-            width: "300px",
-            rules:{required:true}
-          },
-          {
-            type: "Input",
-            label: "地址",
-            prop: "address",
-            width: "300px",
-            rules:{required:true}
-          },
-          {
-            type: "Upload",
-            label: "头像",
-            fileUrl: "headUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-            drag:true
-          },
-          {
-            type: "Cascader",
-            label: "省市",
-            prop: "cityList",
-            data: cc,
-            rules:{required:true}
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          fileList: [],
-          roleIdList: [],
-          username: "",
-          password: "",
-          email: "",
-          mobile: "",
-          status: "",
-          educationName: "",
-          address: "",
-          cityList:[],
-          headUrl:""
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-      },
-    };
-  },
-  activated() {
-    this.searchTableList();
-    this.searchTypeList();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList() {
-      // 初始化obj
-      var obj = {};
-      //   this.pageData.queryData.typeId[0]
-      //     ? (this.pageData.queryData.mainTypeId =
-      //         this.pageData.queryData.typeId[0])
-      //     : delete this.pageData.queryData["mainTypeId"];
-      //   this.pageData.queryData.typeId[1]
-      //     ? (this.pageData.queryData.secondTypeId =
-      //         this.pageData.queryData.typeId[1])
-      //     : delete this.pageData.queryData["secondTypeId"];
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      obj.page = this.pageData.tablePage.currentPage;
-      obj.limit = this.pageData.tablePage.pageSize;
-      delete obj["pageSizeRange"];
-      delete obj["typeId"];
-      delete obj["currentPage"];
-      delete obj["pageSize"];
-      // 请求数据
-      this.$api.getEducationByParams(obj).then((res) => {
-        this.commonUtil.tableAssignment(
-          res.data.page,
-          this.pageData.tablePage,
-          this.pageData.tableData
-        );
-      });
-    },
-    // 查询分类
-    searchTypeList() {
-      this.$api.selectRoles().then((res) => {
-        res.data.list.forEach((item, index) => {
-          item.label = item.roleName;
-          item.value = item.roleId;
-        });
-        this.pageData.modalForm[5].checkboxs = res.data.list;
-        console.log(this.pageData.modalForm[5]);
-      });
-    },
-    // 重置
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      this.searchTableList();
-    },
-    addChildren(arr) {
-      if (Array.isArray(arr) && arr.length > 0) {
-        let outPut = [];
-        arr.forEach((item, index) => {
-          outPut.push({
-            children: item.children ? this.addChildren(item.children) : "",
-            label: item.secondTypeId ? item.secondTypeName : item.mainTypeName,
-            // value: item.secondTypeId ? item.secondTypeName : item.mainTypeName,
-            value: item.secondTypeId ? item.secondTypeId : item.mainTypeId,
-            id: item.secondTypeId ? item.secondTypeId : item.mainTypeId,
-          });
-        });
-        return outPut;
-      } else {
-        return arr;
-      }
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.pageData.modalData.fileList = [];
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      this.pageData.modalData = JSON.parse(JSON.stringify(row));
-      let url = [];
-      if(this.pageData.modalData.headUrl){
-        url[0] = { url: this.pageData.modalData.headUrl };
-      }
-      
-      this.$set(this.pageData.modalData, "fileList", url);
-      console.log(this.pageData.modalData);
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.$refs["modalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.modalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      console.log(this.pageData.modalData);
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveNewEducation(content).then((res) => {
-              this.searchTableList();
-            });
-          } else {
-            this.$api.updateEducation(content).then((res) => {
-              this.searchTableList();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteRedPoetry(ids).then((res) => {
-            this.searchTableList();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].poetryId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteRedPoetry(ids).then((res) => {
-              this.searchTableList();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-    routerTo(row) {
-      this.$store.commit("setParameters", {
-        key: "datasourceId",
-        value: row.id,
-      });
-      this.$router.push({ name: "datesourceDictCode" });
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/service/handcopy-management.vue b/src/views/modules/service/handcopy-management.vue
deleted file mode 100644
index 7e9f088..0000000
--- a/src/views/modules/service/handcopy-management.vue
+++ /dev/null
@@ -1,401 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-      labelWidth="90px"
-    >
-    </searchForm>
-    <cusTable
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable>
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  data() {
-    return {
-      //加载动画
-      loading:false,
-      typeList: [],
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          {
-            type: "Select",
-            label: "手抄报分类",
-            prop: "handCopyTypeId",
-            options:[]
-          },
-          { type: "Input", label: "标题", prop: "searchName" },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          handCopyTypeId: '',
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            handle: () => this.searchTableList(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-          {
-            label: "批量删除",
-            type: "danger",
-            handle: () => this.del(),
-            auth: "reportDatasource_batchDelete",
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "70vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-          fullscreen:true
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "标题",
-            prop: "title",
-            rules: { required: true },
-          },
-          {
-            type: "Upload",
-            label: "封面",
-            limit:1,
-            prop: "img",
-            rules: { required: true },
-            drag:true
-          },
-          {
-            type: "Select",
-            label: "手抄报分类",
-            prop: "handCopyTypeId",
-            options:[],
-            rules:{required:true}
-          },
-          {
-            type: "Select",
-            label: "难度",
-            prop: "difficultLevel",
-            rules:{required:true},
-            options:[
-                {label:1,value:1},{label:2,value:2},{label:3,value:3},{label:4,value:4},{label:5,value:5},
-            ]
-          },
-          {
-            type: "Tinymce",
-            label: "内容",
-            prop: "content",
-            rules: { required: true },
-            width: "796px",
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-            title:'',
-            img:[],
-            handCopyTypeId:'',
-            difficultLevel:'',
-            content:''
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-      },
-    };
-  },
-  activated() {
-    this.searchTableList();
-    this.searchContentType();
-  },
-  computed:{
-      tableCols(){
-          return  [
-          { label: "标题", prop: "title", align: "center" },
-          { label: "图片", prop: "img", type:'image',align: "center" },
-          { label: "类型", prop: "handCopyTypeId", align: "center",formatter:(prop,row)=>{
-              let data=' '
-              this.pageData.searchForm[0].options.forEach(item=>{
-                  if(row[prop]===item.value){
-
-                      data= item.label
-                  }
-              })
-              return data
-          }},
-          { label: "难度", prop: "difficultLevel", align: "center" },
-          { label: "阅读数", prop: "readTimes", align: "center" },
-          { label: "点赞数", prop: "likeNumber", align: "center" },
-          { label: "创建者", prop: "username", align: "center" },
-          { label: "修改时间", prop: "createTime", align: "center" },
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            type: "button",
-            fixed:'right',
-            btnList: [
-                
-              {
-                label: "编辑",
-                type: "text",
-                auth: "reportDatasource_update",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.update, row),
-              },
-              {
-                label: "删除",
-                type: "text",
-                auth: "reportDatasource_delete",
-                handle: (row) => this.del(row.handCopyId),
-              },
-            ],
-          },
-        ]
-      }
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList() {
-      this.loading=true;
-        let data=this.pageData.queryData
-        data.page=this.pageData.tablePage.currentPage
-        data.limit=this.pageData.tablePage.pageSize
-      // 请求数据
-      this.$api.getHandlCopyManagementList(data).then((res) => {
-        res.data.page.list.forEach(item=>{
-
-            item.img=item.img.split(',')
-        })
-        this.commonUtil.tableAssignment(
-          res.data.page,
-          this.pageData.tablePage,
-          this.pageData.tableData
-        );
-      })
-      .finally(()=>{
-        this.loading=false;
-      })
-    },
-    // 查询分类
-    searchContentType() {
-      this.$api.getHandCopyTypeList().then((res) => {
-          let options=res.data.list.map(item=>{return {label:item.handCopyTypeName,value:item.handCopyTypeId}})
-        this.pageData.searchForm[0].options=options
-        this.pageData.modalForm[2].options=options
-      });
-    },
-    // 重置
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      this.searchTableList();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-      this.$nextTick(()=>{
-        this.$refs["modalRef"].$refs["modalFormRef"].clearValidate(); //校验重置
-      })
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      this.pageData.modalData = JSON.parse(JSON.stringify(row));
-      if(this.pageData.modalData.img)
-      this.pageData.modalData.img=this.pageData.modalData.img.filter(item=>{
-                if(!item)return false
-                else return true
-              
-            }).map(item=>{
-              return{
-                    uid:item,
-                    url:item
-                }
-            })
-      console.log(this.pageData.modalData);
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.pageData.modalConfig.show = false; //关闭modal
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      let data=JSON.parse(JSON.stringify(this.pageData.modalData))
-      data.img=data.img.map(item=>item.url).join(',')
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveHandlCopyManagement(data).then((res) => {
-              this.searchTableList();
-            });
-          } else {
-            this.$api.updateHandlCopyManagement(data).then((res) => {
-              this.searchTableList();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    del(val) {
-      let data=[]
-            if(val){
-                data.push(val)
-            }
-            else{
-                data=this.pageData.selectList.map(item=>item.handCopyId)
-            }
-            if (data.length == 0) {
-                this.commonUtil.showMessage({
-                message: this.commonUtil.getMessageFromList(
-                    "error.batchdelete.empty",
-                    null
-                ),
-                type: this.commonConstants.messageType.error,
-                });
-            } 
-            else{
-                let obj = {
-                    messageContent: this.commonUtil.getMessageFromList(
-                        "confirm.delete",
-                        null
-                    ),
-                    };
-                    this.commonUtil.showConfirm(obj).then(()=>{
-                        this.$api.deleteHandlCopyManagementList(data).then(res=>{
-                            this.searchTableList()
-                        })
-                    }).catch(() => {
-                    this.commonUtil.showMessage({
-                    message: this.commonUtil.getMessageFromList("error.cancel", null),
-                    type: this.commonConstants.messageType.info,
-                    });
-                });
-            }
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-    routerTo(row) {
-      this.$store.commit("setParameters", {
-        key: "datasourceId",
-        value: row.id,
-      });
-      this.$router.push({ name: "datesourceDictCode" });
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/service/new-management.vue b/src/views/modules/service/new-management.vue
deleted file mode 100644
index e2cf46a..0000000
--- a/src/views/modules/service/new-management.vue
+++ /dev/null
@@ -1,566 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      ref="searchForm"
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm>
-    <cusTable
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable>
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-    <comment ref="comment" :parentId="parentId" type="STUDYINFO" />
-  </div>
-</template>
-<script>
-import comment from '../../../components/comment/comment.vue'
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal,comment },
-  data() {
-    return {
-      //加载动画
-      loading:false,
-      typeList: [],
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          { type: "Input", label: "关键字", prop: "searchName",placeholder:'标题、来源、编辑者名称',width:'230px' },
-          {
-            type: "Select",
-            label: "内容类型",
-            prop: "isVideo",
-            options: [{
-              label:'资讯',value:0
-            },{label:'视频',value:1}],
-          },
-          {
-            type: "DateTimeRange",
-            label: "发布时间范围",
-            prop: "time",
-          },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          contentTypeId: "",
-          time: [],
-          isVideo:0
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            handle: () => this.searchTableList(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-          {
-            label: "批量删除",
-            type: "danger",
-            handle: () => this.deleteBatch(),
-            auth: "reportDatasource_batchDelete",
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "标题", prop: "title", align: "center",width:"250"},
-          { label: "副标题", prop: "subtitle", align: "center",width:"250"},
-          { label: "资讯来源", prop: "source", align: "center" },
-          { label: "编辑者", prop: "editorName", align: "center" },
-          { label: "作者", prop: "author", align: "center" },
-          { label: "封面", type: "image", prop: "imageUrl", align: "center" },
-          // { label: "外链", prop: "contentLink", align: "center" },
-           { label: "所属分类", prop: "infoType", align: "center" },
-          { label: "阅读数", prop: "readNumber", align: "center" },
-          { label: "点赞数", prop: "likeNumber", align: "center" },
-          { label: "收藏数", prop: "collectNumber", align: "center" },
-           { label: "评论数", prop: "commentNumber", align: "center" },
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            type: "button",
-            fixed: "right",
-            width:'200px',
-            btnList: [
-              {
-                label: "预览",
-                type: "text",
-                auth: "reportDatasource_getDetail",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.detail, row),
-              },
-              {
-                label:'查看评论',
-                type:'text',
-                handle:(row)=>{
-                  this.parentId=row.contentInfoId
-                  this.$refs.comment.modalConfig.show=true
-                }
-              },
-              {
-                label: "编辑",
-                type: "text",
-                auth: "reportDatasource_update",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.update, row),
-              },
-              {
-                label: "删除",
-                type: "text",
-                auth: "reportDatasource_delete",
-                handle: (row) => this.deleteOne(row.contentInfoId),
-              },
-            ],
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "80vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "标题",
-            prop: "title",
-            rules: { required: true, maxLength: 100 },
-            width: "900px",
-          },
-          {
-            type: "Input",
-            label: "副标题",
-            prop: "subtitle",
-            rules: { maxLength: 100 },
-            width: "900px",
-          },
-          {
-            type: "Input",
-            label: "资讯来源",
-            prop: "source",
-            rules: { required: true, maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "作者",
-            prop: "author",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "编辑者",
-            prop: "editorName",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          // {
-          //   type: "Input",
-          //   label: "外链",
-          //   prop: "contentLink",
-          //   rules: { maxLength: 100 },
-          //   width: "300px",
-          // },
-          {
-            type: "Input",
-            label: "关键词",
-            prop: "keywords",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          { 
-            type:'Radio',
-            prop:'infoType',
-            label:'所属分类',
-            radios:[{label:'家教家风',value:'家教家风'},{label:'立德树人',value:'立德树人'}],
-            width: "300px",
-          },
-          { 
-            type:'Radio',
-            prop:'isVideo',
-            label:'内容类型',
-            radios:[{label:'资讯',value:'0'},{label:'视频',value:'1'}],
-            width: "300px",
-          },
-          
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-          {
-            type: "Tinymce",
-            label: "资讯内容",
-            prop: "content",
-            rules: { required: true },
-            width: "1200px",
-          },
-        ],
-        newModalForm:[
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-          ],//咨询专属内容
-        videoModalForm:[
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-          {
-            type: "Upload",
-            label: "视频",
-            fileUrl: "videoUrl",
-            prop: "fileListVideo",
-            listType:'text',
-            rules:{required:true},
-            width: "300px",
-            isVideo:true,
-            accept:'.mp4,.avi,.mov,.rmvb,.flv,.MP4,.AVI,.MOV,.RMVB,.FLV',
-            tips:'请上传视频文件'
-          },
-        ],//视频专属内容
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          userId: "",
-          infoType:"家教家风",
-          content: "",
-          source:'',
-          fileUrl: "",
-          fileList: [],
-          isVideo:'0',
-          videoUrl:'',
-          fileListVideo:[]
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-      },
-      parentId:''
-    };
-  },
-  activated() {
-    this.searchTableList();
-    // this.searchContentType();
-  },
-  watch:{
-    "pageData.modalData.isVideo":{
-      handler:function(val,oldval){
-        // console.log(val)
-        if(val==='1'&&oldval==='0'){
-          this.pageData.modalForm.splice(-1-this.pageData.newModalForm.length,this.pageData.newModalForm.length,...this.pageData.videoModalForm)
-          
-       }
-       else if(val==='0'&&oldval==='1'){
-         this.pageData.modalForm.splice(-1-this.pageData.videoModalForm.length,this.pageData.videoModalForm.length,...this.pageData.newModalForm)
-       }
-      }
-    },
-    "pageData.modalData.fileList":{
-      handler:function(val){
-        if(val&&val.length===0){
-          this.pageData.modalData.imageUrl=''
-        }
-      }
-    },
-    "pageData.modalData.fileListVideo":{
-      handler:function(val){
-        if(val&&val.length===0){
-          this.pageData.modalData.videoUrl=''
-        }
-      }
-    }
-  },
-
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList() {
-      this.loading=true;
-      // 初始化obj
-      var obj = {};
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      obj.page = this.pageData.tablePage.currentPage;
-      obj.limit = this.pageData.tablePage.pageSize;
-      delete obj["pageSizeRange"];
-      if (obj.time.length == 2) {
-        obj.startTime = obj.time[0];
-        obj.endTime = obj.time[1];
-      }
-      delete obj.time
-      // 请求数据
-      this.$api.geServiceNewInfoListByParams(obj).then((res) => {
-        this.commonUtil.tableAssignment(
-          res.data.page,
-          this.pageData.tablePage,
-          this.pageData.tableData
-        );
-      })
-      .finally(()=>{
-        this.loading=false;
-      })
-    },
-    // 查询分类
-    searchContentType() {
-      this.$api.getContentTypeListNoPage().then((res) => {
-        this.pageData.searchForm[1].options = res.data.list;
-        this.pageData.modalForm[2].options = res.data.list;
-      });
-    },
-    // 重置
-    resetSearch() {
-      // this.commonUtil.clearObj(this.pageData.queryData);
-      this.$refs.searchForm.$refs.searchFormRef.resetFields()
-      this.searchTableList();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-      this.$nextTick(()=>{
-        this.$refs["modalRef"].$refs["modalFormRef"].clearValidate(); //校验重置
-      })
-      this.pageData.modalData.isVideo='0'//补充isVideo 不会触发watch
-      this.pageData.modalData.source=this.$newSource//获取默认的资讯来源
-      this.pageData.modalData.infoType="家教家风"
-      // console.log(this.pageData.modalData.infoType)
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      if(row.imageUrl){
-        row.fileList=[{
-        url:row.imageUrl
-      }]
-      }
-      if(row.videoUrl){
-        row.fileListVideo=[{
-          url:row.videoUrl
-          // +'?x-oss-process=video/snapshot,t_10000,m_fast'
-        }]
-      }
-      row.isVideo=row.isVideo+''
-      this.$nextTick(()=>{
-        this.pageData.modalData = JSON.parse(JSON.stringify(row));
-      })
-      
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.pageData.modalConfig.show = false; //关闭modal
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.pageData.modalData.userId = this.$store.state.user.id;
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          if(content.isVideo==0){
-            content.videoUrl=''
-          }
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveServiceNewInfo(content).then((res) => {
-              this.searchTableList();
-            });
-          } else {
-            this.$api.updateServiceNewInfo(content).then((res) => {
-              this.searchTableList();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteServiceNewInfo(ids).then((res) => {
-            this.searchTableList();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].contentInfoId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteServiceNewInfo(ids).then((res) => {
-              this.searchTableList();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-  .content-dialog ::v-deep .el-dialog__body{
-    padding: 0px;
-  }
-  
-</style>
\ No newline at end of file
diff --git a/src/views/modules/service/poetry-manage.vue b/src/views/modules/service/poetry-manage.vue
deleted file mode 100644
index 6233759..0000000
--- a/src/views/modules/service/poetry-manage.vue
+++ /dev/null
@@ -1,708 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      ref="searchForm"
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-      labelWidth="120px"
-    >
-    </searchForm>
-    <obj-table-plus
-      style="height: 60vh"
-      @query="searchTableList"
-      ref="oTable"
-      v-model="pageData.tableData"
-      :isPagination="true"
-      :tableCols="pageData.tableCols"
-      :tableProp="tableProp"
-      :toolbarProp="toolbarProp"
-      :toolbarEvent="toolbarEvent"
-     :tableEvent="{ 'checkbox-change': selectChange ,'checkbox-all':selectChange}"
-    />
-    <!-- <cusTable
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable> -->
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  watch: {
-    "pageData.modalData.fileListVideo": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.pageData.modalData.videoUrl = "";
-        }
-      },
-    },
-    "pageData.modalData.fileListAudio": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.pageData.modalData.audioUrl = "";
-        }
-      },
-    },
-  },
-  data() {
-    return {
-      //加载动画
-      loading: false,
-      typeList: [],
-      tableProp: {
-        height: "auto",
-      },
-      toolbarProp: {
-        buttons: [
-          {
-            name: "新增",
-            status: "primary",
-            code: "add",
-          },
-          {
-            name: "批量删除",
-            status: "danger",
-            code:'del'
-          },
-        ],
-      },
-      toolbarEvent: {
-        "button-click": ({code}) => {
-          if(code=='add')
-          this.showModal(this.commonConstants.modalType.insert);
-          else if(code=='del'){
-            this.deleteBatch()
-          }
-        },
-      },
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          {
-            type: "Cascader",
-            label: "古诗词分类",
-            prop: "typeId",
-            props: { checkStrictly: true },
-            data: [],
-          },
-          { type: "Input", label: "标题/作者/朝代", prop: "searchName" },
-          {
-            type: "Select",
-            label: "审核状态",
-            prop: "examineStatus",
-            default: true,
-            // size: "mini",
-            options: [
-              { label: "未审核", value: 0 },
-              { label: "审核通过", value: 1 },
-              { label: "审核未通过", value: 2 },
-            ],
-          },
-        ],
-
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          typeId: [],
-          examineStatus:''
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            handle: () => this.$refs.oTable.reload(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-          {
-            label: "批量删除",
-            type: "danger",
-            handle: () => this.deleteBatch(),
-            auth: "reportDatasource_batchDelete",
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 10,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          {
-            type:'checkbox',
-            width:50
-          },
-          { title: "标题", field: "title", align: "center",'min-width':160, },
-          { title: "副标题", field: "subtitle", align: "center",'min-width':100, },
-          { title: "作者", field: "author", align: "center" ,'min-width':100,},
-          { title: "朝代", field: "dynasty", align: "center" ,'min-width':100,},
-          { title: "修改时间", field: "createTime", align: "center" ,'min-width':100,},
-            {
-            title: "审核状态",
-            field: "examineStatus",
-            align: "center"
-            ,'min-width':100,
-            // "title-help":{message: '开关开启代表通过审核，关闭代表不通过审核'},
-            type: "jsx",
-            render: ({ row }) => {
-              switch (row.examineStatus) {
-                case 0:
-                  return (
-                    <span>
-                      <span style="color:gray">未审核</span>
-                    </span>
-                  );
-                case 1:
-                  return (
-                    <span>
-                      <span style="color:green">审核通过</span>
-                    </span>
-                  );
-                case 2:
-                  return (
-                    <span>
-                      <span style="color:red">审核未通过</span>
-                    </span>
-                  );
-                default:
-                  return <span></span>;
-              }
-            },
-          },
-          {
-            title: "操作",
-            align: "center",
-            type: "jsx",
-            fixed: "right",
-            width:120,
-            render: ({ row }) => {
-              return (
-                <div>
-                  {row.examineStatus === 2 ? (
-                    <el-button
-                      type="text"
-                      size="mini"
-                      on-click={() =>
-                        this.$confirm("确认重新提交吗？", "提示").then(
-                          (action) => {
-                            if (action == "confirm") {
-                              this.$api
-                                .updateRedPoetry({
-                                  poetryId: row.poetryId,
-                                  examineStatus: 0,
-                                })
-                                .then((res) => {
-                                  this.$refs.oTable.reload();
-                                });
-                            }
-                          }
-                        )
-                      }
-                    >
-                      重新提交
-                    </el-button>
-                  ) : (
-                    ""
-                  )}
-                  <el-button
-                    type="text"
-                    size="mini"
-                    on-click={() =>
-                      this.showModal(this.commonConstants.modalType.edit, row)
-                    }
-                  >
-                    编辑
-                  </el-button>
-                  <el-button
-                    type="danger"
-                    size="text"
-                    on-click={() => this.deleteOne(row.poetryId)}
-                  >
-                    删除
-                  </el-button>
-                </div>
-              );
-            },
-            // btnList: [
-            //   // {
-            //   //   label: "预览",
-            //   //   type: "text",
-            //   //   auth: "reportDatasource_getDetail",
-            //   //   handle: (row) =>
-            //   //     this.showModal(this.commonConstants.modalType.detail, row.id),
-            //   // },
-            //   {
-            //     label: "编辑",
-            //     type: "text",
-            //     auth: "reportDatasource_update",
-            //     handle: (row) =>
-            //       this.showModal(this.commonConstants.modalType.update, row),
-            //   },
-            //   {
-            //     label: "删除",
-            //     type: "text",
-            //     auth: "reportDatasource_delete",
-            //     handle: (row) => this.deleteOne(row.poetryId),
-            //   },
-            // ],
-          },
-          //   { label: "评论数", prop: "commentNumber", align: "center" },
-          //   { label: "来源", prop: "source", align: "center" },
-          //   { label: "创建时间", prop: "createTime", align: "center" },
-          //   { label: "更新时间", prop: "updateTime", align: "center" },
-          //   { label: "用户ID", prop: "userId", align: "center" },
-          //   { label: "用户名", prop: "username", align: "center" },
-          //   { label: "关键词", prop: "keywords", align: "center" },
-          //   { label: "标签名", prop: "labelName", align: "center" },
-          //   { label: "标签ID", prop: "labelId", align: "center" },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "70vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-          fullscreen:true
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "标题",
-            prop: "title",
-            rules: { required: true, maxLength: 100 },
-            width: "796px",
-          },
-          {
-            type: "Input",
-            label: "副标题",
-            prop: "subtitle",
-            rules: { maxLength: 100 },
-            width: "796px",
-          },
-          {
-            type: "Cascader",
-            label: "古诗词分类",
-            prop: "typeId",
-            data: [],
-            rules: { required: true },
-            props: { multiple: true, checkStrictly: true },
-          },
-          {
-            type: "Input",
-            label: "作者",
-            prop: "author",
-            rules: { maxLength: 100 },
-            rules: { required: true },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "朝代",
-            prop: "dynasty",
-            rules: { maxLength: 100, required: true },
-            width: "300px",
-          },
-          {
-            type: "Tinymce",
-            label: "注释",
-            prop: "notes",
-            width: "800px"
-          },
-          {
-            type: "Tinymce",
-            label: "翻译",
-            prop: "translate",
-            rules: { required: true },
-            width: "800px"
-          },
-          {
-            type: "Tinymce",
-            label: "古诗词正文",
-            prop: "content",
-            rules: { required: true },
-            width: "800px"
-          },
-          {
-            type: "Upload",
-            label: "视频",
-            fileUrl: "videoUrl",
-            prop: "fileListVideo",
-            listType: "text",
-            width: "300px",
-            isVideo: true,
-            accept: ".mp4,.avi,.mov,.rmvb,.flv,.MP4,.AVI,.MOV,.RMVB,.FLV",
-            tips: "请上传视频文件",
-            drag:true
-          },
-          {
-            type: "Upload",
-            label: "音频",
-            fileUrl: "audioUrl",
-            prop: "fileListAudio",
-            width: "300px",
-            listType: "text",
-            accept: ".MP3,.WAV,.WMA,.Flac,.MIDI,.RA,.APE,.AAC,.CDA,.MOV,.mp3.wav,.wma.flac,.midi.ra,.ape,.aac,.cda,.mov,.m4a,.M4A",
-            tips: "请上传音频文件",
-            drag:true
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          title: "",
-          fileListVideo: [],
-          fileListAudio: [],
-          videoUrl: "",
-          audioUrl: "",
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default",icon:"el-icon-close", handle: () => this.closeModal() },
-          { label: "提交", type: "primary",icon:"el-icon-upload2", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-      },
-    };
-  },
-  created() {
-    console.log(123);
-  },
-  activated() {
-    this.$refs.oTable.refresh();
-    this.searchContentType();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList(pageNo, pageSize) {
-      this.loading = true;
-      // 初始化obj
-      var obj = {};
-      console.log(this.pageData.queryData);
-      this.pageData.queryData.typeId[0]
-        ? (this.pageData.queryData.mainTypeId =
-            this.pageData.queryData.typeId[0])
-        : delete this.pageData.queryData["mainTypeId"];
-      this.pageData.queryData.typeId[1]
-        ? (this.pageData.queryData.secondTypeId =
-            this.pageData.queryData.typeId[1])
-        : delete this.pageData.queryData["secondTypeId"];
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      delete obj["pageSizeRange"];
-      delete obj["typeId"];
-      delete obj["currentPage"];
-      delete obj["pageSize"];
-      // 请求数据
-      this.$api
-        .getPoetryByParams({ ...obj, page: pageNo, limit: pageSize })
-        .then((res) => {
-          this.$refs.oTable.complete(
-            res.data.page.list,
-            res.data.page.totalCount
-          );
-          // this.commonUtil.tableAssignment(
-          //   res.data.page,
-          //   this.pageData.tablePage,
-          //   this.pageData.tableData
-          // );
-        })
-        .finally(() => {
-          this.loading = false;
-        });
-    },
-    // 查询分类
-    searchContentType() {
-      this.$api.getMainSecondTypeList().then((res) => {
-        this.pageData.searchForm[0].data = this.addChildren(res.data.list);
-        this.pageData.modalForm[2].data = this.pageData.searchForm[0].data;
-        console.log("this.pageData.searchForm", this.pageData.searchForm);
-      });
-    },
-    // 重置
-    resetSearch() {
-      // this.commonUtil.clearObj(this.pageData.queryData);
-      this.$refs.searchForm.$refs.searchFormRef.resetFields();
-      // this.searchTableList();
-      this.$refs.oTable.reload();
-    },
-    addChildren(arr) {
-      if (Array.isArray(arr) && arr.length > 0) {
-        let outPut = [];
-        arr.forEach((item, index) => {
-          outPut.push({
-            children: item.children ? this.addChildren(item.children) : "",
-            label: item.secondTypeId ? item.secondTypeName : item.mainTypeName,
-            // value: item.secondTypeId ? item.secondTypeName : item.mainTypeName,
-            value: item.secondTypeId ? item.secondTypeId : item.mainTypeId,
-            id: item.secondTypeId ? item.secondTypeId : item.mainTypeId,
-          });
-        });
-        return outPut;
-      } else {
-        return arr;
-      }
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      console.log(type, row);
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-      this.$nextTick(() => {
-        this.$refs["modalRef"].$refs["modalFormRef"].clearValidate(); //校验重置
-      });
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      if (row.videoUrl) {
-        row.fileListVideo = [
-          {
-            url: row.videoUrl,
-          },
-        ];
-      }
-      if (row.audioUrl) {
-        row.fileListAudio = [
-          {
-            url: row.audioUrl,
-          },
-        ];
-      }
-      this.pageData.modalData = JSON.parse(JSON.stringify(row));
-      let mainTypeIds = this.pageData.modalData.mainTypeIds.split(",");
-      let secondTypeIds = this.pageData.modalData.secondTypeIds.split(",");
-      let data = this.pageData.searchForm[0].data;
-      let typeId = [];
-
-      mainTypeIds.forEach((mainTypeId) => {
-        let mainIndex;
-        data.forEach((item, index) => {
-          if (item.value === mainTypeId) {
-            mainIndex = index;
-            return;
-          }
-        });
-        secondTypeIds.forEach((secondTypeId) => {
-          data[mainIndex].children.forEach((item1) => {
-            if (item1.value === secondTypeId) {
-              typeId.push([mainTypeId, secondTypeId]);
-            }
-          });
-        });
-      });
-      this.pageData.modalData.typeId = typeId;
-      // console.log(mainTypeIds,secondTypeIds);
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.pageData.modalConfig.show = false; //关闭modal
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.pageData.modalData.userId = this.$store.state.user.id;
-      let list = this.pageData.modalData.typeId;
-      console.log(JSON.parse(JSON.stringify(list)));
-      let main = [];
-      let sec = [];
-      list.forEach((item, index) => {
-        main.push(item[0]);
-        item[1] ? sec.push(item[1]) : "";
-      });
-      main = Array.from(new Set(main));
-      sec = Array.from(new Set(sec));
-      let mainIds = main.length > 0 ? main.join() : "";
-      let secIds = sec.length > 0 ? sec.join() : "";
-      this.pageData.modalData.mainTypeIds = mainIds;
-      this.pageData.modalData.secondTypeIds = secIds;
-      console.log(this.pageData.modalData);
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveRedPoetry(content).then((res) => {
-              this.$refs.oTable.reload();
-            });
-          } else {
-            // 审核通过的内容再次编辑会变成未审核
-            // if(content.examineStatus==1){
-            //   content.examineStatus=0
-            // }
-            this.$api.updateRedPoetry(content).then((res) => {
-              this.$refs.oTable.reload();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteRedPoetry(ids).then((res) => {
-            this.$refs.oTable.reload();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].poetryId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteRedPoetry(ids).then((res) => {
-              this.$refs.oTable.reload();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange({records,reserves}) {
-      // console.log(val)
-      this.pageData.selectList = [...records,...reserves];
-    },
-    routerTo(row) {
-      this.$store.commit("setParameters", {
-        key: "datasourceId",
-        value: row.id,
-      });
-      this.$router.push({ name: "datesourceDictCode" });
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/service/popup/exam-popup.vue b/src/views/modules/service/popup/exam-popup.vue
deleted file mode 100644
index 3e9011c..0000000
--- a/src/views/modules/service/popup/exam-popup.vue
+++ /dev/null
@@ -1,336 +0,0 @@
-<template>
-  <el-dialog
-    :visible.sync="visible"
-    width="70vw"
-    :title="title"
-    :close-on-click-modal="false"
-    :close-on-press-escape="true"
-    :modal="false"
-  >
-    <!-- 试卷列表 -->
-    <div class="exam__page" v-loading="loading">
-      <template v-for="(problem, index) in examData.list">
-        <div class="problem__item">
-          <div class="subjectContext">
-            <p class="subjectTitle">{{ index + 1 }}、{{ problem.label }}</p>
-            <el-radio-group
-              v-model="finalResult[index].data.answer"
-              @change="(val) => handleChooseChange(val, problem.options, index)"
-              v-if="problem.type === 'RADIO'|| problem.type === 'DECIDE'"
-            >
-              <el-radio
-                v-for="(option, index) in problem.options"
-                :key="index"
-                :label="option.label"
-                >{{ option.label }}</el-radio
-              >
-            </el-radio-group>
-            <el-checkbox-group
-              v-model="finalResult[index].data.answer"
-              @change="(val) => handleChooseChange(val, problem.options, index)"
-              v-else-if="problem.type === 'CHECKBOX'"
-            >
-              <el-checkbox
-                v-for="(option, index) in problem.options"
-                :key="index"
-                :label="option.label"
-                >{{ option.label }}</el-checkbox
-              >
-            </el-checkbox-group>
-          </div>
-        </div>
-      </template>
-    </div>
-    <div slot="footer" class="d-flex j-end">
-      <el-button type="info" icon="el-icon-close" @click="visible=false">关闭</el-button>
-      <el-button @click="submitPaper" type="primary" icon="el-icon-upload2"
-        >提交试卷</el-button
-      >
-    </div>
-  </el-dialog>
-</template>
-<script>
-/**
- * 考试练习弹窗
- * 基本使用方法：this.$refs.examPopup(item-data);
- */
-export default {
-  data() {
-    return {
-      //标题
-      title: "练习",
-      // radio
-      radio: "",
-      //基本数据
-      innerData: {},
-      //答题的数据
-      answerData: {
-        // 46:{}
-      },
-      //答题结果
-      finalResult: [],
-      //试卷数据，template模板就是使用这个来渲染
-      examData: {},
-      //加载试卷动画
-      loading: false,
-      visible: false,
-    };
-  },
-  methods: {
-    init(data) {
-      this.innerData = data;
-      this.examData = {};
-      this.finalResult = [];
-      this.visible = true;
-      //加载试题
-      this.load();
-    },
-    load() {
-      /**
-       * 此处有两种考试类型：
-       * 1）课程练习，即上课的课程附赠的练习，数据包含courseId
-       * 2) 随堂练习，即老师发布的随堂练习，数据包含practiceId
-       */
-      if (this.innerData.hasOwnProperty("courseId")) {
-        this.loading = true;
-        this.$api.study
-          .getPatriotismCourseInfo(this.innerData.courseId)
-          .then((res) => {
-            console.log(res);
-            //由于拦截器拦截到res，此处重新赋值res；
-            res = res.data;
-            res.data.projectDTO.list = res.data.projectDTO.list.map((item) => {
-              //加工下答题数据
-              if (item.type === "CHECKBOX") {
-                console.log("初始化", item.id);
-                //如果是多选，answerData要初始化一个空对象
-                // this.answerData[item.id]={}
-                this.$set(this.answerData, item.id, {});
-              }
-              return {
-                prop: item.id,
-                label: item.label,
-                type: item.type,
-                options: item.expand.options,
-                score: item.score,
-              };
-            });
-
-            this.examData = res.data.projectDTO;
-            console.log(this.examData);
-            this.examData.list.forEach((item, index) => {
-              let resultObj = {
-                index,
-                data: {
-                  id: item.prop,
-                  answer:item.type==="RADIO"?'':[],
-                  isAnswer: false,
-                  score: 0,
-                  problem: {
-                    ...item,
-                  },
-                },
-              };
-              this.finalResult.push(resultObj);
-            });
-          })
-          .finally(() => {
-            this.loading = false;
-          });
-      } else if (this.innerData.hasOwnProperty("practiceId")) {
-        this.loading = true;
-        this.$api.study
-          .getPracticeInfoById(this.innerData.practiceId)
-          .then((res) => {
-            console.log(res);
-            //由于拦截器拦截到res，此处重新赋值res；
-            res = res.data;
-            res.data.projectVO.list = res.data.projectVO.list.map((item) => {
-              //加工下答题数据
-              if (item.type === "CHECKBOX") {
-                console.log("初始化", item.id);
-                //如果是多选，answerData要初始化一个空对象
-                // this.answerData[item.id]={}
-                this.$set(this.answerData, item.id, {});
-              }
-              return {
-                prop: item.id,
-                label: item.label,
-                type: item.type,
-                options: item.expand.options,
-                score: item.score,
-              };
-            });
-
-            this.examData = res.data.projectVO;
-            console.log(this.examData);
-            this.title = this.examData.name;
-            this.examData.list.forEach((item, index) => {
-              let resultObj = {
-                index,
-                data: {
-                  id: item.prop,
-                  answer: item.type==="RADIO"?"":[],
-                  isAnswer: false,
-                  score: 0,
-                  problem: {
-                    ...item,
-                  },
-                },
-              };
-              this.finalResult.push(resultObj);
-            });
-            console.log("this.finalResult", this.finalResult);
-          })
-          .finally(() => {
-            this.loading = false;
-          });
-      }
-    },
-    // 选择选项
-    handleChooseChange(val, checkArr, index) {
-      let currentAnswer;
-      if (typeof val === "string") {
-        currentAnswer = checkArr.find((item) => item.label === val);
-        console.log("val", val);
-      } else {
-        currentAnswer = {
-          isAnswer:true
-        }
-        let count = 0;
-        let rightAnswerArr = checkArr.filter(option=>option.isAnswer);
-        val.forEach(answerItem=>{
-          rightAnswerArr.forEach(rightAnswer=>{
-              if(answerItem === rightAnswer.label) count ++;
-          })
-        }) 
-        if(count !== rightAnswerArr.length) currentAnswer.isAnswer = false;
-      }
-
-      this.finalResult[index].data.isAnswer=currentAnswer.isAnswer;
-      this.finalResult[index].data.score=currentAnswer.isAnswer?1:0
-    },
-    //将多选答题卡转为字符串 /## item.data.answer
-    array2String(arr) {
-      let str = "";
-      for (let i = 0; i < arr.length; i++) {
-        if (i == arr.length - 1) {
-          str += arr[i];
-        } else {
-          str += arr[i] + `/##`;
-        }
-      }
-      // console.log(str);
-      return str;
-    },
-    //提交答卷
-    submitPaper() {
-      console.log("交卷");
-      console.log(this.finalResult);
-      //计算试卷总分
-      let fullMarks = 0;
-      //计算试卷得分
-      let totalMarks = 0;
-      //计算试卷得分详情
-      let marksDetail = [];
-      for (let i = 0; i < this.finalResult.length; i++) {
-        if (this.finalResult[i].data.answer == ""||!this.finalResult[i].data.answer.length) {
-          return this.$message.error("存在没用作答的问题");
-        }
-      }
-      //遍历答题结果
-      this.finalResult.map((item) => {
-        fullMarks += item.data.problem.score;
-        totalMarks += item.data.score;
-        marksDetail.push({
-          problemIndex: item.index + 1,
-          id: item.data.id,
-          answer:
-            typeof item.data.answer === "string"
-              ? item.data.answer
-              : this.array2String(item.data.answer),
-          problemFullMarks: item.data.problem.score,
-          marks: item.data.score,
-        });
-      });
-      //展示分数
-      this.$confirm(`得分/总分：${totalMarks}/${fullMarks}`,"你的分数是")
-      //课堂端先暂时不做完卷动画
-      // this.playAnimation((totalMarks / fullMarks) * 100);
-      this.totalMarks = totalMarks;
-      this.fullMarks = fullMarks;
-      if (this.innerData.hasOwnProperty("courseId")) {
-        this.$api.study
-          .submitExam({
-            courseId: this.innerData.courseId,
-            title: this.innerData.title,
-            fullMarks: fullMarks,
-            totalMarks: totalMarks,
-            studentGrade: this.$store.state.user.studentGrade,
-            studentClass: this.$store.state.user.studentClass,
-            schoolId: this.$store.state.user.schoolId,
-            educationId: this.$store.state.user.educationId,
-            marksDetail: marksDetail,
-          })
-          .then((res) => {
-            setTimeout(() => {         
-              this.visible = false;
-              this.$alert(`得分/总分：${totalMarks}/${fullMarks}`,`正确率 ${(this.totalMarks/this.fullMarks) * 100 }%`,{
-                callback: action => {
-                  this.$emit("refresh")
-                }
-              })
-            }, 500);
-          });
-      } else if (this.innerData.hasOwnProperty("practiceId")) {
-        this.$api.study
-          .submitPractice({
-            practiceId: this.innerData.practiceId,
-            title: this.innerData.title,
-            fullMarks: fullMarks,
-            totalMarks: totalMarks,
-            studentGrade: this.$store.state.user.studentGrade,
-            studentClass: this.$store.state.user.studentClass,
-            schoolId: this.$store.state.user.schoolId,
-            educationId: this.$store.state.user.educationId,
-            marksDetail: marksDetail,
-          })
-          .then((res) => {
-            setTimeout(() => {         
-              this.visible = false;
-              this.$alert(`得分/总分：${totalMarks}/${fullMarks}`,`正确率 ${(this.totalMarks/this.fullMarks) * 100 }%`,{
-                callback: action => {
-                  this.$emit("refresh")
-                }
-              })
-            }, 500);
-          });
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.exam__page {
-  height: calc(100vh - 70px - 54px);
-  margin: 0 20px;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  .subjectContext {
-    border: 1px solid rgba(192, 214, 243, 0.232);
-    width: 100%;
-    padding: 10px 30px 20px;
-    border-radius: 5px;
-    margin-left: 10px;
-    margin-bottom: 20px;
-    background-color: rgba(192, 214, 243, 0.232);
-    .subjectTitle {
-      margin-bottom: 15px;
-    }
-  }
-}
-::v-deep .el-dialog__body {
-  padding: 0;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/service/popup/publish-inclass-exercises.vue b/src/views/modules/service/popup/publish-inclass-exercises.vue
deleted file mode 100644
index d29e815..0000000
--- a/src/views/modules/service/popup/publish-inclass-exercises.vue
+++ /dev/null
@@ -1,366 +0,0 @@
-<template>
-  <el-dialog
-    :visible.sync="visible"
-    title="选题组卷"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    fullscreen
-    :modal="false"
-  >
-    <selectSubjectPopup
-      :chooseObj="chooseObj"
-      @checkChange="checkChange"
-      ref="selectSubjectPopup"
-    />
-    <submitSubjectPopup
-      ref="submitSubjectPopup"
-      @publicSubject="publicSubject"
-    />
-    <div class="container" style="position: relative">
-      <div class="subjectCategory">
-        主题类型：
-        <el-cascader
-          v-model="subjectType"
-          :options="options"
-          :props="{ expandTrigger: 'hover' }"
-          @change="handleChange"
-        ></el-cascader>
-      </div>
-      <div class="subjectContainer" v-loading="queryListLoading">
-        <el-checkbox
-          :indeterminate="isIndeterminate"
-          v-model="checkAll"
-          @change="handleCheckAllChange"
-          style="margin-bottom: 10px"
-          >全选</el-checkbox
-        >
-        <div
-          class="subjectItem"
-          v-for="(item, itemIndex) in subjectList"
-          :key="item.id"
-        >
-          <el-checkbox
-            style="display: flex; align-items: center"
-            v-model="checkStore[item.id]"
-            @change="(isChoose) => checkChange(isChoose, item.id)"
-            :checked="isChoose(item.id)"
-          ></el-checkbox>
-          <div class="subjectContext">
-            <div class="subjectTitle">{{ item.label }}</div>
-            <el-checkbox
-              v-for="(option, index) in item.expand.options"
-              :key="index"
-              :checked="option.isAnswer == true"
-              disabled
-              >{{ option.label }}</el-checkbox
-            >
-          </div>
-        </div>
-      </div>
-      <el-pagination
-        layout="total,prev, pager, next"
-        :hide-on-single-page="false"
-        @current-change="currentChange"
-        :total="pageData.total"
-        style="subjectPagination"
-      >
-      </el-pagination>
-    </div>
-    <div class="d-flex j-sb a-center subjectFooter" slot="footer">
-      <el-button @click="initPopup('selectSubjectPopup')" icon="el-icon-check" type="success"
-        >已选题目({{ Object.keys(chooseObj).length }})</el-button
-      >
-      <el-button
-        @click="
-          () => {
-            subjectType.length
-              ? initPopup('submitSubjectPopup')
-              : $message.error('请选择练习主题类型');
-          }
-        "
-        type="primary"
-        icon="el-icon-upload2"
-        >发布试卷</el-button
-      >
-    </div>
-  </el-dialog>
-</template>
-<script>
-import selectSubjectPopup from "./select-subject-popup.vue";
-import submitSubjectPopup from "./submit-subject-popup.vue";
-export default {
-  data() {
-    return {
-      visible: false,
-      isTrue: false,
-      checkAll: false,
-      isIndeterminate: false,
-      options: [
-        {
-          label: "红心向党",
-          value: "红心向党",
-          children: [
-            {
-              label: "人民领袖",
-              value: "6",
-            },
-            {
-              label: "红色印记",
-              value: "7",
-            },
-            {
-              label: "英雄模范",
-              value: "8",
-            },
-            {
-              label: "家国情怀",
-              value: "9",
-            },
-          ],
-        },
-        {
-          label: "道德修养",
-          value: "道德修养",
-          children: [
-            {
-              label: "德行天下",
-              value: "10",
-            },
-            {
-              label: "美在少年",
-              value: "11",
-            },
-            {
-              label: "我的责任",
-              value: "12",
-            },
-          ],
-        },
-        {
-          label: "好好学习",
-          value: "好好学习",
-          children: [
-            {
-              label: "党史问答",
-              value: "13",
-            },
-            {
-              label: "传统文化",
-              value: "14",
-            },
-            {
-              label: "诗词之美",
-              value: "15",
-            },
-          ],
-        },
-        {
-          label: "奋进新时代",
-          value: "奋进新时代",
-          children: [
-            {
-              label: "习近平金句",
-              value: "16",
-            },
-            {
-              label: "伟人足迹",
-              value: "17",
-            },
-            {
-              label: "辉煌成就",
-              value: "18",
-            },
-          ],
-        },
-      ],
-      subjectType: [],
-      subjectList: [],
-      checkStore: {},
-      chooseObj: {},
-      pageData: {
-        page: 1,
-        limit: 10,
-        total: 10,
-      },
-      //查询的加载动画
-      queryListLoading:false,
-    };
-  },
-  methods: {
-    init() {
-      this.visible = true;
-      this.subjectType = [];
-      this.chooseObj = {};
-      this.checkStore = {};
-      this.query();
-    },
-    query() {
-      this.queryListLoading=true;
-      this.$api.study
-        .getPracticeList("总题库", this.pageData.page, this.pageData.limit)
-        .then(({ data }) => {
-          this.checkStore = {};
-          data.page.list.forEach((item) => {
-            this.$set(
-              this.checkStore,
-              item.id,
-              this.chooseObj[item.id] ? this.chooseObj[item.id].isChoose : false
-            );
-          });
-          this.isCheckAll();
-          this.subjectList = data.page.list;
-          this.pageData.total = data.page.totalCount;
-        })
-        .finally(() => {
-          this.queryListLoading=false;
-        })
-    },
-    isChoose(key) {
-      return (
-        this.chooseObj[key] !== undefined &&
-        this.chooseObj[key].isChoose !== false
-      );
-    },
-    handleCheckAllChange() {
-      this.subjectList.forEach((item) => {
-        this.$set(this.checkStore, item.id, this.checkAll);
-        console.log("123", this.getSubjectObj(item.id));
-        this.checkAll
-          ? this.$set(this.chooseObj, item.id, {
-              ...this.getSubjectObj(item.id),
-              isChoose: this.checkAll,
-            })
-          : delete this.chooseObj[item.id];
-      });
-      console.log("this.chooseObj1", this.chooseObj);
-      this.isIndeterminate = false;
-    },
-    checkChange(isChoose, value) {
-      this.$set(this.checkStore, value, isChoose);
-      isChoose
-        ? this.$set(this.chooseObj, value, {
-            ...this.getSubjectObj(value),
-            isChoose,
-          })
-        : delete this.chooseObj[value];
-      console.log("this.chooseObj2", this.chooseObj);
-      this.isCheckAll();
-    },
-    getSubjectObj(id) {
-      return this.subjectList.filter((item) => {
-        return item.id === id;
-      })[0];
-    },
-    isCheckAll() {
-      let checkedCount = 0;
-      Object.keys(this.checkStore).forEach((key) => {
-        checkedCount += this.checkStore[key] ? 1 : 0;
-      });
-      this.checkAll = checkedCount === 10;
-      this.isIndeterminate = checkedCount > 0 && checkedCount < 10;
-    },
-    // 弹窗初始化
-    initPopup() {
-      if (!Object.keys(this.chooseObj).length) {
-        return this.$message.error("请选择题目");
-      }
-      let refName = [].shift.call(arguments);
-      let args = [].slice.call(arguments);
-      this.$refs[refName].init.apply(this, args);
-    },
-    currentChange(page) {
-      this.pageData.page = page;
-      this.query();
-    },
-    handleChange(val) {
-      console.log(val);
-    },
-    async publicSubject(subjectName, subjectDescription) {
-      const chooseSubjectList = Object.keys(this.chooseObj).map((key) => {
-        return {
-          ...this.chooseObj[key],
-          score: 1,
-        };
-      });
-      // console.log(subjectName)
-      let data = {
-        image: "",
-        releaseTime: null,
-        practiceName: subjectName,
-        content: subjectDescription,
-        courseThemeId: this.subjectType[1],
-        practiceType: this.subjectType[0],
-        projectDTO: {
-          name: subjectName,
-          describe: subjectDescription,
-          score: chooseSubjectList.length,
-          list: chooseSubjectList,
-        },
-      };
-      // console.log(data)
-      await this.$api.study.sendNewPractice(data);
-      setTimeout(() => {
-        this.$emit("refresh");
-        this.visible = false;
-      }, 500);
-    },
-  },
-  components: { selectSubjectPopup, submitSubjectPopup },
-};
-</script>
-
-<style scoped lang='scss'>
-.subjectCategory {
-  margin-left: 30px;
-}
-.subjectContainer {
-  height: calc(100vh - 60px - 38px - 146px);
-  overflow-y: scroll;
-  margin: 20px 0 40px;
-  .subjectItem {
-    width: 100%;
-    display: flex;
-    margin-bottom: 20px;
-    .subjectContext {
-      border: 1px solid rgba(192, 214, 243, 0.232);
-      width: 100%;
-      padding: 20px 30px;
-      border-radius: 5px;
-      margin-left: 10px;
-      background-color: rgba(192, 214, 243, 0.232);
-      .subjectTitle {
-        margin-bottom: 15px;
-      }
-    }
-  }
-}
-.subjectFooter {
-  position: fixed;
-  bottom: 0;
-  width: 100%;
-  margin-left: -20px;
-  background-color: #fff;
-  padding: 10px 20px;
-  z-index: 2;
-}
-.container ::v-deep .el-pagination {
-  position: fixed;
-  bottom: 60px !important;
-  width: 100%;
-  margin-left: -20px;
-  padding: 5px 20px;
-  z-index: 2;
-  background-color: #fff;
-}
-::v-deep .el-checkbox__input.is-disabled + span.el-checkbox__label {
-  color: #606266;
-}
-
-::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
-  background-color: #409eff;
-}
-
-::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after {
-  border-color: #fff;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/service/popup/question-editor/content-editor.vue b/src/views/modules/service/popup/question-editor/content-editor.vue
deleted file mode 100644
index f99208a..0000000
--- a/src/views/modules/service/popup/question-editor/content-editor.vue
+++ /dev/null
@@ -1,392 +0,0 @@
-<!--
- * @author: ym
- * @Date: 2021-10-16 12:58:57
- * @LastEditTime: 2022-09-06 14:48:37
- * @LastEditors: chenkangxu
- * @Description: 
- * @FilePath: \background-front-end\src\components\common\content-editor\content-editor.vue
--->
-<template>
-  <div class="form-index-container">
-    <div class="main-container">
-      <div class="left-menu-container">
-        <el-menu
-          :collapse="isCollapse"
-          :default-active="defaultActiveMenu"
-          class="el-menu-vertical"
-        >
-          <!-- <el-menu-item>
-            <el-button type="primary" @click="previewDialogVisible = true">
-              预览
-            </el-button></el-menu-item
-          > -->
-          <el-menu-item>
-            <el-button type="info" @click="close">关闭</el-button>
-          </el-menu-item>
-          <el-menu-item>
-            <el-button type="success" @click="saveProjectAsTemplateHandle">保存</el-button>
-          </el-menu-item>
-          <el-menu-item
-            v-for="menuItem in menuItemList"
-            :key="menuItem.route"
-            :index="menuItem.route"
-            @click="changeOption(menuItem.option)"
-          >
-            <i :class="menuItem.icon" />
-            <span slot="title">{{ menuItem.title }}</span>
-          </el-menu-item>
-        </el-menu>
-      </div>
-      <div class="right-content-container">
-        <div v-show="menuOption == 'editor'">
-          <editor
-            :drawingList="drawingList"
-            :updateFormConf="updateFormConf"
-            :isUpdate="isUpdate"
-            @changeFormConf="changeFormConf"
-          ></editor>
-        </div>
-      </div>
-    </div>
-    <el-dialog :visible.sync="previewDialogVisible" destroy-on-close fullscreen>
-      <pre-view
-        v-if="previewDialogVisible"
-        :drawingList="drawingListPreView"
-        :key="previewKey"
-        :preview-qrcode="true"
-      />
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import preView from "@/components/common/content-editor/preview";
-import editor from "./editor/index.vue";
-import objForm from "@/components/common/form/form.vue";
-import { dbDataConvertForItemJson, formItemConvertData } from "@/utils/convert";
-export default {
-  components: { editor,objForm, preView },
-  props: {
-    isUpdate: {
-      type: Boolean,
-    },
-    updateData: {
-      type: Object,
-    }
-  },
-  data() {
-    return {
-      // 试卷基本数据
-      formConf: {},
-      updateFormConf: {},
-      // 表单项列表
-      drawingList: [],
-      menuOption: "editor",
-      previewKey: +new Date(),
-      projectKey: null,
-      previewDialogVisible: false,
-      defaultActiveMenu: "/project/form/editor",
-      isCollapse: false,
-      menuItemList: [
-        // {
-        //   title: "信息",
-        //   icon: "el-icon-info",
-        //   route: "/project/form/setting",
-        //   option: "info",
-        // },
-        {
-          title: "编辑",
-          icon: "el-icon-edit",
-          route: "/project/form/editor",
-          option: "editor",
-        },
-      ],
-      pageData: {
-        formForm: [],
-        //发布时间
-        baseForm: [
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        formData: {
-          fileList: [],
-          projectDTO: {},
-          fileListVideo: [],
-          videoUrl: "",
-          isSubmit: false,
-          courseThemeId:'',
-          itemType:"总题库"
-        },
-        //查询条件 end
-        //查询表单按钮start
-        formHandles: [
-          {
-            label: "下一步",
-            type: "primary",
-            handle: () => this.goEditor(),
-          },
-        ],
-      },
-      //查询表单按钮end
-    };
-  },
-  created() {
-    // this.projectKey = this.$route.query.key
-    // this.defaultActiveMenu = this.$route.path
-    // this.isCollapse = this.$store.state.form.isCollapse
-  },
-  beforeMount() {
-    // 如果是编辑
-    // console.log(11)
-    if (this.isUpdate) {
-      console.log("editor", this.updateData);
-      this.pageData.formData = JSON.parse(JSON.stringify(this.updateData));
-      this.pageData.formData.fileList = [{ url: this.pageData.formData.image }];
-      this.pageData.formData.fileListVideo = [
-        { url: this.pageData.formData.videoUrl },
-      ];
-      // this.$api.courseThemeAll({courseType:this.updateData.courseType}).then(res=>{
-          
-      //     this.pageData.formForm[1].options=res.data.list.map(item=>{
-      //       return{label:item.themeName,value:item.courseThemeId}
-      //     })
-      //   })
-      // this.updateData.expand=JSON.parse(this.updateData.expand)
-      // this.updateData.regList=JSON.parse(this.updateData.regList)
-      console.log( this.updateData);
-      console.log(dbDataConvertForItemJson(this.updateData));
-      this.drawingList = [dbDataConvertForItemJson(this.updateData)]
-        
-      // this.updateFormConf = {
-      //   title: 'this.updateData.label',
-      //   description: 'this.updateData.describe',
-      //   score: 'this.updateData.score',
-      // };
-    }
-  },
-  watch: {
-    "pageData.formData.isSubmit": {
-      handler: function (val, oldval) {
-        if (val && !oldval) {
-          this.pageData.formForm.splice(3, 0, ...this.pageData.baseForm);
-        } else if (!val && oldval) {
-          this.pageData.formForm.splice(3, 1);
-        }
-      },
-    },
-    // 'isUpdate':{
-    //   handler:function(val,oldval){
-    //     if(val){
-    //       pageData.formForm[2].disabled=true
-    //     }
-    //     else{
-    //       pageData.formForm[2].disabled=false
-    //     }
-    //   }
-    // }
-  },
-  computed: {
-    // 预览数据
-    drawingListPreView() {
-      let list = JSON.parse(JSON.stringify(this.drawingList));
-      list.forEach((item, index) => {
-        list[index] = formItemConvertData(item, this.updateData.projectKey);
-      });
-      return list;
-    },
-  },
-  methods: {
-    changeDrawingList(val) {
-      this.drawingList = val;
-    },
-    changeFormConf(val) {
-      this.formConf = val;
-    },
-    openPreviewHandle() {
-      // this.previewKey = +new Date()
-      // this.previewDialogVisible = true
-    },
-    goEditor() {
-      this.changeOption("editor");
-      // this.$refs["formFormRef"].$refs["formFormRef"].validate((valid) => {
-      //   if (valid) {
-      //     // let content = this.pageData.modalData;
-      //     // if (
-      //     //   this.pageData.modalConfig.type ==
-      //     //   this.commonConstants.modalType.insert
-      //     // ) {
-      //     //   this.$api.saveNewContent(content).then((res) => {
-      //     //     this.searchTableList();
-      //     //   });
-      //     // } else {
-      //     //   this.$api.updateRedContentInfo(content).then((res) => {
-      //     //     this.searchTableList();
-      //     //   });
-      //     // }
-      //     this.changeOption("editor");
-      //   } else {
-      //     this.commonUtil.showMessage({
-      //       message: "请填写题库基本信息",
-      //       type: this.commonConstants.messageType.error,
-      //     });
-      //   }
-      // });
-    },
-    saveProjectAsTemplateHandle() {
-          let totalScore = 0;
-          let list = JSON.parse(JSON.stringify(this.drawingList));
-          list.forEach((item, index) => {
-            list[index] = formItemConvertData(item, this.updateData.projectKey);
-          });
-          list.forEach((item) => {
-            totalScore += item.score;
-          });
-
-
-          this.pageData.formData.paperName = this.formConf.title;
-          this.pageData.formData.projectDTO = {
-            name: this.formConf.title,
-            describe: this.formConf.description,
-            score: this.formConf.score,
-            list: list,
-            key: this.updateData.projectKey,
-          };
-          let __data=this.pageData.formData.projectDTO.list.map(item=>{
-            item.defaultValue=null;
-            return {
-              ...item,
-              id:this.updateData.id,
-              itemType:this.pageData.formData.itemType,
-              courseThemeId:this.pageData.formData.courseThemeId
-            }
-          })
-          console.log(__data);
-          if (!this.isUpdate) {
-            this.$api.service.addQuestionBatch(__data)
-            .then((res) => {
-              this.$emit("close");
-            });
-          } else {
-            this.$api.service.editQuestion(__data[0])
-            .then((res) => {
-              this.$emit("close");
-            });
-          }
-    },
-    //更改菜单
-    changeOption(option) {
-      this.menuOption = option;
-    },
-    //关闭
-    close(){
-      this.$emit("close")
-    }
-    // save() {
-    //   this.pageData.modalData.userId = this.$store.state.user.id;
-    //   this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-    //     if (valid) {
-    //       let content = this.pageData.modalData;
-    //       if (
-    //         this.pageData.modalConfig.type ==
-    //         this.commonConstants.modalType.insert
-    //       ) {
-    //         this.$api.saveNewContent(content).then((res) => {
-    //           this.searchTableList();
-    //         });
-    //       } else {
-    //         this.$api.updateRedContentInfo(content).then((res) => {
-    //           this.searchTableList();
-    //         });
-    //       }
-    //       this.closeModal();
-    //     } else {
-    //       return false;
-    //     }
-    //   });
-    // },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.form-index-container {
-  height: 100%;
-  width: 100%;
-}
-
-::v-deep .el-card__body {
-  padding: 0;
-}
-
-::v-deep .el-menu {
-  border: none;
-  background-color: transparent;
-}
-
-.header-container {
-  width: 100%;
-  height: 50px;
-  padding: 0 20px;
-
-  .el-icon-back {
-    font-size: 22px;
-    font-weight: 550;
-    cursor: pointer;
-    color: #000;
-    margin-right: 75px;
-
-    &:hover {
-      color: rgb(32, 160, 255);
-    }
-  }
-
-  .header-logo {
-    height: 45px;
-    width: 200px;
-  }
-}
-
-.main-container {
-  height: calc(100vh - 60px);
-  display: flex;
-  flex-direction: row;
-
-  .right-content-container {
-    width: calc(100vw - 100px);
-    height: calc(100vh - 60px);
-    overflow-x: hidden;
-  }
-}
-
-.left-menu-container {
-  max-width: 100px;
-  text-align: center;
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  border-right: solid 1px #e6e6e6;
-
-  .el-menu-vertical:not(.el-menu--collapse) {
-    width: 100px;
-    min-height: 400px;
-  }
-
-  .el-icon-d-arrow-left,
-  .el-icon-d-arrow-right {
-    font-size: 19px;
-    cursor: pointer;
-    font-weight: 550;
-    color: #000;
-    margin-bottom: 100px;
-
-    &:hover {
-      color: rgb(32, 160, 255);
-    }
-  }
-}
-
-::v-deep.preview-container {
-  background-color: #ffffff;
-}
-</style>
diff --git a/src/views/modules/service/popup/question-editor/editor/DraggableItem.vue b/src/views/modules/service/popup/question-editor/editor/DraggableItem.vue
deleted file mode 100644
index 1a4d8df..0000000
--- a/src/views/modules/service/popup/question-editor/editor/DraggableItem.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<script>
-import draggable from 'vuedraggable'
-import render from '@/components/render/render'
-
-const components = {
-    itemBtns(h, currentItem, index, list) {
-        const {copyItem, deleteItem} = this.$listeners
-        return this.isUpdate?<div></div>:[
-            <span class="drawing-item-copy" title="复制" onClick={event => {
-                copyItem(currentItem, list)
-                event.stopPropagation()
-            }}>
-                <i class="el-icon-copy-document"/>
-            </span>,
-            <span class="drawing-item-delete" title="删除" onClick={event => {
-                deleteItem(index, list)
-                event.stopPropagation()
-            }}>
-                <i class="el-icon-delete"/>
-            </span>
-        ]
-
-    }
-}
-const layouts = {
-    // eslint-disable-next-line no-unused-vars
-    colFormItem(h, currentItem, index, list) {
-        // eslint-disable-next-line no-unused-vars
-        const {activeItem, changeLabel} = this.$listeners
-        const config = currentItem.__config__
-        const child = renderChildren.apply(this, arguments)
-        let className = this.activeId === config.formId ? 'drawing-item active-from-item' : 'drawing-item'
-        if (this.formConf.unFocusedComponentBorder) className += ' unfocus-bordered'
-        let labelWidth = config.labelWidth ? `${config.labelWidth}px` : null
-        if (config.showLabel === false) labelWidth = '0'
-        return (
-            <el-col span={config.span} class={className}
-                nativeOnClick={event => {
-                    activeItem(currentItem)
-                    event.stopPropagation()
-                }}>
-                <el-form-item label-width={labelWidth}
-                    label={config.showLabel ? config.label : ''} required={config.required}>
-                    <render key={config.renderKey} conf={currentItem} onInput={event => {
-                        this.$set(config, 'defaultValue', event)
-                    }}>
-                        {child}
-                    </render>
-                </el-form-item>
-                {components.itemBtns.apply(this, arguments)}
-            </el-col>
-        )
-    },
-    // eslint-disable-next-line no-unused-vars
-    rowFormItem(h, currentItem, index, list) {
-        const {activeItem} = this.$listeners
-        const config = currentItem.__config__
-        const className = this.activeId === config.formId
-            ? 'drawing-row-item active-from-item'
-            : 'drawing-row-item'
-        let child = renderChildren.apply(this, arguments)
-        if (currentItem.type === 'flex') {
-            child = <el-row type={currentItem.type} justify={currentItem.justify} align={currentItem.align}>
-                {child}
-            </el-row>
-        }
-        return (
-            <el-col span={config.span}>
-                <el-row gutter={config.gutter} class={className}
-                    nativeOnClick={event => {
-                        activeItem(currentItem)
-                        event.stopPropagation()
-                    }}>
-                    <span class="component-name">{config.componentName}</span>
-                    <draggable list={config.children || []} animation={340}
-                        group="componentsGroup" class="drag-wrapper">
-                        {child}
-                    </draggable>
-                    {components.itemBtns.apply(this, arguments)}
-                </el-row>
-            </el-col>
-        )
-    },
-    // eslint-disable-next-line no-unused-vars
-    raw(h, currentItem, index, list) {
-        const config = currentItem.__config__
-        const child = renderChildren.apply(this, arguments)
-        return <render key={config.renderKey} conf={currentItem} onInput={event => {
-            this.$set(config, 'defaultValue', event)
-        }}>
-            {child}
-        </render>
-    }
-}
-
-// eslint-disable-next-line no-unused-vars
-function renderChildren(h, currentItem, index, list) {
-    const config = currentItem.__config__
-    if (!Array.isArray(config.children)) return null
-    return config.children.map((el, i) => {
-        const layout = layouts[el.__config__.layout]
-        if (layout) {
-            return layout.call(this, h, el, i, config.children)
-        }
-        return layoutIsNotFound.call(this)
-    })
-}
-
-function layoutIsNotFound() {
-    throw new Error(`没有与${this.currentItem.__config__.layout}匹配的layout`)
-}
-
-export default {
-    components: {
-        render,
-        draggable
-    },
-    props: [
-        'currentItem',
-        'index',
-        'drawingList',
-        'activeId',
-        'formConf',
-        'isUpdate'//是否为编辑模式，如果是编辑的就不允许删除和复制以及添加题目
-    ],
-    render(h) {
-        const layout = layouts[this.currentItem.__config__.layout]
-
-        if (layout) {
-            return layout.call(this, h, this.currentItem, this.index, this.drawingList)
-        }
-        return layoutIsNotFound.call(this)
-    }
-}
-</script>
-<style scoped>
-::v-deep .el-radio-group,
-::v-deep .el-checkbox-group {
-    margin-left: 10px;
-}
-::v-deep .el-radio,
-::v-deep .el-checkbox {
-    display: block;
-    min-height: 23px;
-    line-height: 23px;
-}
-::v-deep .el-radio__label,
-::v-deep .el-checkbox__label {
-    font-size: 14px;
-    padding-left: 10px;
-    text-overflow: ellipsis;
-    white-space: normal;
-    min-height: 18px;
-    vertical-align: middle;
-    display: inline-block;
-}
-::v-deep .item-other-input {
-    margin-left: 20px;
-    -webkit-tap-highlight-color: rgba(255, 255, 255, 0);
-}
-::v-deep .item-other-input:focus {
-    outline: none;
-}
-</style>
diff --git a/src/views/modules/service/popup/question-editor/editor/IconsDialog.vue b/src/views/modules/service/popup/question-editor/editor/IconsDialog.vue
deleted file mode 100644
index 6fd3799..0000000
--- a/src/views/modules/service/popup/question-editor/editor/IconsDialog.vue
+++ /dev/null
@@ -1,131 +0,0 @@
-<template>
-    <div class="icon-dialog">
-        <el-dialog
-            v-bind="$attrs"
-            width="980px"
-            :modal-append-to-body="false"
-            v-on="$listeners"
-            @open="onOpen"
-            @close="onClose"
-        >
-            <div slot="title">
-                选择图标
-                <el-input
-                    v-model="key"
-                    size="mini"
-                    :style="{width: '260px'}"
-                    placeholder="请输入图标名称"
-                    prefix-icon="el-icon-search"
-                    clearable
-                />
-            </div>
-            <ul class="icon-ul">
-                <li
-                    v-for="icon in iconList"
-                    :key="icon"
-                    :class="active===icon?'active-item':''"
-                    @click="onSelect(icon)"
-                >
-                    <i :class="icon" />
-                    <div>{{ icon }}</div>
-                </li>
-            </ul>
-        </el-dialog>
-    </div>
-</template>
-<script>
-import iconList from '@/utils/icon.json'
-
-const originList = iconList.map(name => `el-icon-${name}`)
-
-export default {
-    inheritAttrs: false,
-    props: ['current'],
-    data() {
-        return {
-            iconList: originList,
-            active: null,
-            key: ''
-        }
-    },
-    watch: {
-        key(val) {
-            if (val) {
-                this.iconList = originList.filter(name => name.indexOf(val) > -1)
-            } else {
-                this.iconList = originList
-            }
-        }
-    },
-    methods: {
-        onOpen() {
-            this.active = this.current
-            this.key = ''
-        },
-        onClose() {
-        },
-        onSelect(icon) {
-            this.active = icon
-            this.$emit('select', icon)
-            this.$emit('update:visible', false)
-        }
-    }
-}
-</script>
-<style lang="scss" scoped>
-.icon-ul {
-  margin: 0;
-  padding: 0;
-  font-size: 0;
-
-  li {
-    list-style-type: none;
-    text-align: center;
-    font-size: 14px;
-    display: inline-block;
-    width: 16.66%;
-    box-sizing: border-box;
-    height: 108px;
-    padding: 15px 6px 6px 6px;
-    cursor: pointer;
-    overflow: hidden;
-
-    &:hover {
-      background: #f2f2f2;
-    }
-
-    &.active-item {
-      background: #e1f3fb;
-      color: #7a6df0;
-    }
-
-    > i {
-      font-size: 30px;
-      line-height: 50px;
-    }
-  }
-}
-
-.icon-dialog {
-  ::v-deep .el-dialog {
-    border-radius: 8px;
-    margin-bottom: 0;
-    margin-top: 4vh !important;
-    display: flex;
-    flex-direction: column;
-    max-height: 92vh;
-    overflow: hidden;
-    box-sizing: border-box;
-
-    .el-dialog__header {
-      padding-top: 14px;
-    }
-
-    .el-dialog__body {
-      margin: 0px;
-      padding: 0px;
-      overflow: auto;
-    }
-  }
-}
-</style>
diff --git a/src/views/modules/service/popup/question-editor/editor/RightPanel.vue b/src/views/modules/service/popup/question-editor/editor/RightPanel.vue
deleted file mode 100644
index a025255..0000000
--- a/src/views/modules/service/popup/question-editor/editor/RightPanel.vue
+++ /dev/null
@@ -1,1761 +0,0 @@
-<template>
-  <div class="right-board">
-    <el-tabs v-model="currentTab" class="center-tabs">
-      <el-tab-pane label="题目详情" name="field" />
-    </el-tabs>
-    <div class="field-box">
-      <el-scrollbar class="right-scrollbar">
-        <!-- 组件属性 -->
-        <el-form
-          v-show="currentTab === 'field' && showField"
-          label-width="90px"
-          size="small"
-        >
-          <el-form-item
-            v-if="
-              activeData.__config__.changeTag &&
-              activeData.__config__.tag != 'el-radio-group' &&
-              activeData.__config__.tag != 'el-checkbox-group'
-            "
-            label="组件类型"
-          >
-            <el-select
-              v-model="activeData.__config__.tagIcon"
-              :style="{ width: '100%' }"
-              placeholder="请选择组件类型"
-              @change="tagChange"
-            >
-              <el-option-group
-                v-for="group in tagList"
-                :key="group.label"
-                :label="group.label"
-              >
-                <el-option
-                  v-for="item in group.options"
-                  :key="item.__config__.label"
-                  :label="item.__config__.label"
-                  :value="item.__config__.tagIcon"
-                >
-                  <svg-icon :name="item.__config__.tagIcon" class="node-icon" />
-                  <!--                    <svg-icon class="node-icon" :icon-class="item.__config__.tagIcon" />-->
-                  <span>
-                    {{ item.__config__.label
-                    }}{{ item.__config__.tagIcon }}</span
-                  >
-                </el-option>
-              </el-option-group>
-            </el-select>
-          </el-form-item>
-          <!--          <el-form-item v-if="activeData.__vModel__!==undefined" label="字段名">-->
-          <!--            <el-input v-model="activeData.__vModel__" placeholder="请输入字段名（v-model）" />-->
-          <!--          </el-form-item>-->
-          <el-form-item
-            v-if="activeData.__config__.componentName !== undefined"
-            label="组件名"
-          >
-            {{ activeData.__config__.componentName }}
-          </el-form-item>
-          <el-form-item
-            v-if="
-              activeData.__config__.label !== undefined &&
-              activeData.__config__.showLabel !== false
-            "
-            label="标题"
-          >
-            <el-input
-              v-model="activeData.__config__.label"
-              placeholder="请输入标题"
-              @input="changeRenderKey"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="
-              activeData.__config__.score !== undefined 
-            "
-            label="本题分数"
-          >
-            <el-input-number
-              v-model="activeData.__config__.score"
-              @change="changeRenderKey"
-              :min="1"
-              :max="scoreMaxLimit"
-            ></el-input-number>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.placeholder !== undefined"
-            label="占位提示"
-          >
-            <el-input
-              v-model="activeData.placeholder"
-              placeholder="请输入占位提示"
-              @input="changeRenderKey"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['start-placeholder'] !== undefined"
-            label="开始占位"
-          >
-            <el-input
-              v-model="activeData['start-placeholder']"
-              placeholder="请输入占位提示"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['end-placeholder'] !== undefined"
-            label="结束占位"
-          >
-            <el-input
-              v-model="activeData['end-placeholder']"
-              placeholder="请输入占位提示"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.span !== undefined"
-            label="表单栅格"
-          >
-            <el-slider
-              v-model="activeData.__config__.span"
-              :marks="{ 12: '' }"
-              :max="24"
-              :min="1"
-              @change="spanChange"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="
-              activeData.__config__.layout === 'rowFormItem' &&
-              activeData.gutter !== undefined
-            "
-            label="栅格间隔"
-          >
-            <el-input-number
-              v-model="activeData.gutter"
-              :min="0"
-              placeholder="栅格间隔"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="
-              activeData.__config__.layout === 'rowFormItem' &&
-              activeData.type !== undefined
-            "
-            label="布局模式"
-          >
-            <el-radio-group v-model="activeData.type">
-              <el-radio-button label="default" />
-              <el-radio-button label="flex" />
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item
-            v-if="
-              activeData.justify !== undefined && activeData.type === 'flex'
-            "
-            label="水平排列"
-          >
-            <el-select
-              v-model="activeData.justify"
-              :style="{ width: '100%' }"
-              placeholder="请选择水平排列"
-            >
-              <el-option
-                v-for="(item, index) in justifyOptions"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.align !== undefined && activeData.type === 'flex'"
-            label="垂直排列"
-          >
-            <el-radio-group v-model="activeData.align">
-              <el-radio-button label="top" />
-              <el-radio-button label="middle" />
-              <el-radio-button label="bottom" />
-            </el-radio-group>
-          </el-form-item>
-          <!--                    <el-form-item v-if="activeData.__config__.labelWidth!==undefined" label="标签宽度">-->
-          <!--                        <el-input v-model.number="activeData.__config__.labelWidth" type="number"-->
-          <!--                                  placeholder="请输入标签宽度"/>-->
-          <!--                    </el-form-item>-->
-          <!--                    <el-form-item v-if="activeData.style&&activeData.style.width!==undefined" label="组件宽度">-->
-          <!--                        <el-input v-model="activeData.style.width" placeholder="请输入组件宽度" clearable/>-->
-          <!--                    </el-form-item>-->
-          <!-- <el-form-item
-            v-if="
-              activeData.__vModel__ !== undefined &&
-              activeData.__config__.showDefaultValue !== false
-            "
-            label="默认值"
-          >
-            <el-input
-              :value="setDefaultValue(activeData.__config__.defaultValue)"
-              placeholder="请输入默认值"
-              @input="onDefaultValueInput"
-            />
-          </el-form-item> -->
-          <!-- <el-form-item
-            v-if="activeData.__config__.tag === 'el-checkbox-group'"
-            label="至少应选"
-          >
-            <el-input-number
-              :min="0"
-              :value="activeData.min"
-              placeholder="至少应选"
-              @input="$set(activeData, 'min', $event ? $event : undefined)"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-checkbox-group'"
-            label="最多可选"
-          >
-            <el-input-number
-              :min="0"
-              :value="activeData.max"
-              placeholder="最多可选"
-              @input="$set(activeData, 'max', $event ? $event : undefined)"
-            />
-          </el-form-item> -->
-          <el-form-item
-            v-if="
-              activeData.__slot__ && activeData.__slot__.prepend !== undefined
-            "
-            label="前缀"
-          >
-            <el-input
-              v-model="activeData.__slot__.prepend"
-              placeholder="请输入前缀"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="
-              activeData.__slot__ && activeData.__slot__.append !== undefined
-            "
-            label="后缀"
-          >
-            <el-input
-              v-model="activeData.__slot__.append"
-              placeholder="请输入后缀"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['prefix-icon'] !== undefined"
-            label="前图标"
-          >
-            <el-input
-              v-model="activeData['prefix-icon']"
-              placeholder="请输入前图标名称"
-            >
-              <el-button
-                slot="append"
-                icon="el-icon-thumb"
-                @click="openIconsDialog('prefix-icon')"
-              >
-                选择
-              </el-button>
-            </el-input>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['suffix-icon'] !== undefined"
-            label="后图标"
-          >
-            <el-input
-              v-model="activeData['suffix-icon']"
-              placeholder="请输入后图标名称"
-            >
-              <el-button
-                slot="append"
-                icon="el-icon-thumb"
-                @click="openIconsDialog('suffix-icon')"
-              >
-                选择
-              </el-button>
-            </el-input>
-          </el-form-item>
-          <el-form-item
-            v-if="
-              activeData['icon'] !== undefined &&
-              activeData.__config__.tag === 'el-button'
-            "
-            label="按钮图标"
-          >
-            <el-input
-              v-model="activeData['icon']"
-              placeholder="请输入按钮图标名称"
-            >
-              <el-button
-                slot="append"
-                icon="el-icon-thumb"
-                @click="openIconsDialog('icon')"
-              >
-                选择
-              </el-button>
-            </el-input>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-cascader'"
-            label="选项分隔符"
-          >
-            <el-input
-              v-model="activeData.separator"
-              placeholder="请输入选项分隔符"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.autosize !== undefined"
-            label="最小行数"
-          >
-            <el-input-number
-              v-model="activeData.autosize.minRows"
-              :min="1"
-              placeholder="最小行数"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.autosize !== undefined"
-            label="最大行数"
-          >
-            <el-input-number
-              v-model="activeData.autosize.maxRows"
-              :min="1"
-              placeholder="最大行数"
-            />
-          </el-form-item>
-          <el-form-item v-if="isShowMin" label="最小值">
-            <el-input-number v-model="activeData.min" placeholder="最小值" />
-          </el-form-item>
-          <el-form-item v-if="isShowMax" label="最大值">
-            <el-input-number v-model="activeData.max" placeholder="最大值" />
-          </el-form-item>
-          <el-form-item v-if="activeData.height !== undefined" label="组件高度">
-            <el-input-number
-              v-model="activeData.height"
-              placeholder="高度"
-              @input="changeRenderKey"
-            />
-          </el-form-item>
-          <el-form-item v-if="isShowStep" label="步长">
-            <el-input-number v-model="activeData.step" placeholder="步数" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-input-number'"
-            label="精度"
-          >
-            <el-input-number
-              v-model="activeData.precision"
-              :min="0"
-              placeholder="精度"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-input-number'"
-            label="按钮位置"
-          >
-            <el-radio-group v-model="activeData['controls-position']">
-              <el-radio-button label=""> 默认 </el-radio-button>
-              <el-radio-button label="right"> 右侧 </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.maxlength !== undefined"
-            label="最多输入"
-          >
-            <el-input
-              v-model="activeData.maxlength"
-              placeholder="请输入字符长度"
-            >
-              <template slot="append"> 个字符 </template>
-            </el-input>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['active-text'] !== undefined"
-            label="开启提示"
-          >
-            <el-input
-              v-model="activeData['active-text']"
-              placeholder="请输入开启提示"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['inactive-text'] !== undefined"
-            label="关闭提示"
-          >
-            <el-input
-              v-model="activeData['inactive-text']"
-              placeholder="请输入关闭提示"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['active-value'] !== undefined"
-            label="开启值"
-          >
-            <el-input
-              :value="setDefaultValue(activeData['active-value'])"
-              placeholder="请输入开启值"
-              @input="onSwitchValueInput($event, 'active-value')"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['inactive-value'] !== undefined"
-            label="关闭值"
-          >
-            <el-input
-              :value="setDefaultValue(activeData['inactive-value'])"
-              placeholder="请输入关闭值"
-              @input="onSwitchValueInput($event, 'inactive-value')"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="
-              activeData.type !== undefined &&
-              'el-date-picker' === activeData.__config__.tag
-            "
-            label="时间类型"
-          >
-            <el-select
-              v-model="activeData.type"
-              :style="{ width: '100%' }"
-              placeholder="请选择时间类型"
-              @change="dateTypeChange"
-            >
-              <el-option
-                v-for="(item, index) in dateOptions"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <!--          <el-form-item v-if="activeData.name !== undefined" label="文件字段名">-->
-          <!--            <el-input v-model="activeData.name" placeholder="请输入上传文件字段名" />-->
-          <!--          </el-form-item>-->
-          <el-form-item v-if="activeData.accept !== undefined" label="文件类型">
-            <el-select
-              v-model="activeData.accept"
-              :style="{ width: '100%' }"
-              clearable
-              placeholder="请选择文件类型"
-            >
-              <el-option label="图片" value="image/*" />
-              <el-option label="视频" value="video/*" />
-              <el-option label="音频" value="audio/*" />
-              <el-option label="excel" value=".xls,.xlsx" />
-              <el-option label="word" value=".doc,.docx" />
-              <el-option label="pdf" value=".pdf" />
-              <el-option label="txt" value=".txt" />
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.fileSize !== undefined"
-            label="文件大小"
-          >
-            <el-input
-              v-model.number="activeData.__config__.fileSize"
-              placeholder="请输入文件大小"
-            >
-              <el-select
-                slot="append"
-                v-model="activeData.__config__.sizeUnit"
-                :style="{ width: '66px' }"
-              >
-                <el-option label="KB" value="KB" />
-                <el-option label="MB" value="MB" />
-                <el-option label="GB" value="GB" />
-              </el-select>
-            </el-input>
-          </el-form-item>
-          <!--          <el-form-item v-if="activeData.action !== undefined" label="上传地址">-->
-          <!--            <el-input v-model="activeData.action" placeholder="请输入上传地址" clearable />-->
-          <!--          </el-form-item>-->
-          <el-form-item
-            v-if="activeData['list-type'] !== undefined"
-            label="列表类型"
-          >
-            <el-radio-group v-model="activeData['list-type']" size="small">
-              <el-radio-button label="text"> text </el-radio-button>
-              <el-radio-button label="picture"> picture </el-radio-button>
-              <el-radio-button label="picture-card">
-                picture-card
-              </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item
-            v-if="
-              activeData.type !== undefined &&
-              activeData.__config__.tag === 'el-button'
-            "
-            label="按钮类型"
-          >
-            <el-select v-model="activeData.type" :style="{ width: '100%' }">
-              <el-option label="primary" value="primary" />
-              <el-option label="success" value="success" />
-              <el-option label="warning" value="warning" />
-              <el-option label="danger" value="danger" />
-              <el-option label="info" value="info" />
-              <el-option label="text" value="text" />
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.buttonText !== undefined"
-            v-show="'picture-card' !== activeData['list-type']"
-            label="按钮文字"
-          >
-            <el-input
-              v-model="activeData.__config__.buttonText"
-              placeholder="请输入按钮文字"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-button'"
-            label="按钮文字"
-          >
-            <el-input
-              v-model="activeData.__slot__.default"
-              placeholder="请输入按钮文字"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['range-separator'] !== undefined"
-            label="分隔符"
-          >
-            <el-input
-              v-model="activeData['range-separator']"
-              placeholder="请输入分隔符"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['picker-options'] !== undefined"
-            label="时间段"
-          >
-            <el-input
-              v-model="activeData['picker-options'].selectableRange"
-              placeholder="请输入时间段"
-            />
-          </el-form-item>
-          <el-form-item v-if="activeData.format !== undefined" label="时间格式">
-            <el-input
-              :value="activeData.format"
-              placeholder="请输入时间格式"
-              @input="setTimeValue($event)"
-            />
-          </el-form-item>
-          <template
-            v-if="
-              ['el-checkbox-group', 'el-radio-group', 'el-select'].indexOf(
-                activeData.__config__.tag
-              ) > -1
-            "
-          >
-            <el-divider>选项</el-divider>
-            <div class="right-answer">正确选项</div>
-            <draggable
-              :animation="340"
-              :list="activeData.__slot__.options"
-              group="selectItem"
-              handle=".option-drag"
-            >
-              <div
-                v-for="(item, index) in activeData.__slot__.options"
-                :key="index"
-                class="select-item"
-              >
-                <div class="select-line-icon option-drag">
-                  <i class="el-icon-s-operation" />
-                </div>
-                <el-input
-                  v-model="item.label"
-                  placeholder="选项名"
-                  size="small"
-                />
-                <!--                <el-input-->
-                <!--                  placeholder="选项值"-->
-                <!--                  size="small"-->
-                <!--                  :value="item.value"-->
-                <!--                  @input="setOptionValue(item, $event)"-->
-                <!--                />-->
-                <div
-                  class="close-btn select-line-icon"
-                  @click="activeData.__slot__.options.splice(index, 1)"
-                >
-                  <i class="el-icon-remove-outline" />
-                </div>
-                <el-switch
-                  v-model="item.isAnswer"
-                  @change="changeAnswer(item, index)"
-                  active-color="#13ce66"
-                  inactive-color="#ff4949"
-                >
-                </el-switch>
-              </div>
-            </draggable>
-            <div style="margin-left: 20px">
-              <el-button
-                icon="el-icon-circle-plus-outline"
-                style="padding-bottom: 0"
-                type="text"
-                @click="addSelectItem"
-              >
-                添加选项
-              </el-button>
-              <!-- <el-button
-                icon="el-icon-document-copy"
-                style="padding-bottom: 0"
-                type="text"
-                @click="blukAddSelectItems"
-              >
-                批量贴入
-              </el-button> -->
-              <el-button
-                v-if="
-                  ['el-checkbox-group', 'el-radio-group'].indexOf(
-                    activeData.__config__.tag
-                  ) > -1
-                "
-                icon="el-icon-circle-plus-outline"
-                style="padding-bottom: 0"
-                type="text"
-                @click="addSelectOtherItem"
-              >
-                添加其他
-              </el-button>
-            </div>
-            <el-divider />
-          </template>
-
-          <template
-            v-if="['el-carousel'].indexOf(activeData.__config__.tag) > -1"
-          >
-            <el-divider>选项</el-divider>
-            <draggable
-              :animation="340"
-              :list="activeData.__slot__.options"
-              group="selectItem"
-              handle=".option-drag"
-            >
-              <div
-                v-for="(item, index) in activeData.__slot__.options"
-                :key="index"
-                class="select-item"
-              >
-                <div class="select-line-icon option-drag">
-                  <i class="el-icon-s-operation" />
-                </div>
-                <div class="width-full">
-                  <div class="flex-row">
-                    <el-input
-                      v-model="item.label"
-                      placeholder="选项名"
-                      size="small"
-                    />
-                    <div
-                      class="close-btn select-line-icon"
-                      @click="activeData.__slot__.options.splice(index, 1)"
-                    >
-                      <i class="el-icon-remove-outline" />
-                    </div>
-                  </div>
-                  <div class="flex-row">
-                    <el-input
-                      v-model="item.image"
-                      placeholder="图片"
-                      size="small"
-                    />
-                    <el-upload
-                      ref="logoUpload"
-                      :action="getUploadUrl"
-                      :headers="getUploadHeader"
-                      :on-progress="uploadProgressHandle"
-                      :on-success="
-                        (response, file, fileList) => {
-                          item.image = response.url;
-                          $set(activeData.__slot__.options, index, item);
-                          closeUploadProgressHandle();
-                        }
-                      "
-                      :show-file-list="false"
-                      accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
-                      style="text-align: center"
-                    >
-                      <div slot="trigger" class="select-line-icon">
-                        <i class="el-icon-upload" />
-                      </div>
-                    </el-upload>
-                  </div>
-                </div>
-              </div>
-            </draggable>
-            <div style="margin-left: 20px">
-              <el-button
-                icon="el-icon-circle-plus-outline"
-                style="padding-bottom: 0"
-                type="text"
-                @click="addImageCarouselItem"
-              >
-                添加选项
-              </el-button>
-            </div>
-            <el-divider />
-          </template>
-          <template
-            v-if="['image-select'].indexOf(activeData.__config__.tag) > -1"
-          >
-            <el-divider>选项</el-divider>
-            <draggable
-              :animation="340"
-              :list="activeData.options"
-              group="selectItem"
-              handle=".option-drag"
-            >
-              <div
-                v-for="(item, index) in activeData.options"
-                :key="index"
-                class="select-item"
-              >
-                <div class="select-line-icon option-drag">
-                  <i class="el-icon-s-operation" />
-                </div>
-                <div class="width-full">
-                  <div class="flex-row">
-                    <el-input
-                      v-model="item.label"
-                      placeholder="选项名"
-                      size="small"
-                    />
-                    <div
-                      class="close-btn select-line-icon"
-                      @click="activeData.options.splice(index, 1)"
-                    >
-                      <i class="el-icon-remove-outline" />
-                    </div>
-                  </div>
-                  <div class="flex-row">
-                    <el-input
-                      v-model="item.image"
-                      placeholder="图片"
-                      size="small"
-                    />
-                    <el-upload
-                      ref="logoUpload"
-                      :action="getUploadUrl"
-                      :headers="getUploadHeader"
-                      :on-progress="uploadProgressHandle"
-                      :on-success="
-                        (response, file, fileList) => {
-                          item.image = response.data;
-                          $set(activeData.options, index, item);
-                          closeUploadProgressHandle();
-                        }
-                      "
-                      :show-file-list="false"
-                      accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
-                      style="text-align: center"
-                    >
-                      <div slot="trigger" class="select-line-icon">
-                        <i class="el-icon-upload" />
-                      </div>
-                    </el-upload>
-                  </div>
-                </div>
-              </div>
-            </draggable>
-            <div style="margin-left: 20px">
-              <el-button
-                icon="el-icon-circle-plus-outline"
-                style="padding-bottom: 0"
-                type="text"
-                @click="addImageSelectItem"
-              >
-                添加选项
-              </el-button>
-            </div>
-            <el-divider />
-          </template>
-          <template
-            v-if="['el-cascader'].indexOf(activeData.__config__.tag) > -1"
-          >
-            <el-divider>选项</el-divider>
-            <!--            <el-form-item label="数据类型">-->
-            <!--              <el-radio-group v-model="activeData.__config__.dataType" size="small">-->
-            <!--                <el-radio-button label="dynamic">-->
-            <!--                  动态数据-->
-            <!--                </el-radio-button>-->
-            <!--                <el-radio-button label="static">-->
-            <!--                  静态数据-->
-            <!--                </el-radio-button>-->
-            <!--              </el-radio-group>-->
-            <!--            </el-form-item>-->
-
-            <!--            <template v-if="activeData.__config__.dataType === 'dynamic'">-->
-            <!--              <el-form-item label="接口地址">-->
-            <!--                <el-input-->
-            <!--                  v-model="activeData.__config__.url"-->
-            <!--                  :title="activeData.__config__.url"-->
-            <!--                  placeholder="请输入接口地址"-->
-            <!--                  clearable-->
-            <!--                >-->
-            <!--                  <el-select-->
-            <!--                    slot="prepend"-->
-            <!--                    v-model="activeData.__config__.method"-->
-            <!--                    :style="{width: '85px'}"-->
-            <!--                  >-->
-            <!--                    <el-option label="get" value="get" />-->
-            <!--                    <el-option label="post" value="post" />-->
-            <!--                    <el-option label="put" value="put" />-->
-            <!--                    <el-option label="delete" value="delete" />-->
-            <!--                  </el-select>-->
-            <!--                </el-input>-->
-            <!--              </el-form-item>-->
-            <!--              <el-form-item label="数据位置">-->
-            <!--                <el-input v-model="activeData.__config__.dataKey" placeholder="请输入标签键名" />-->
-            <!--              </el-form-item>-->
-            <!--              <el-form-item label="标签键名">-->
-            <!--                <el-input v-model="activeData.props.props.label" placeholder="请输入标签键名" />-->
-            <!--              </el-form-item>-->
-            <!--              <el-form-item label="值键名">-->
-            <!--                <el-input v-model="activeData.props.props.value" placeholder="请输入值键名" />-->
-            <!--              </el-form-item>-->
-            <!--              <el-form-item label="子级键名">-->
-            <!--                <el-input v-model="activeData.props.props.children" placeholder="请输入子级键名" />-->
-            <!--              </el-form-item>-->
-            <!--            </template>-->
-
-            <!-- 级联选择静态树 -->
-            <el-tree
-              v-if="activeData.__config__.dataType === 'static'"
-              :data="activeData.options"
-              :expand-on-click-node="false"
-              :render-content="renderContent"
-              draggable="true"
-              node-key="id"
-            />
-            <div
-              v-if="activeData.__config__.dataType === 'static'"
-              style="margin-left: 20px"
-            >
-              <el-button
-                icon="el-icon-circle-plus-outline"
-                style="padding-bottom: 0"
-                type="text"
-                @click="addTreeItem"
-              >
-                添加父级
-              </el-button>
-            </div>
-            <el-divider />
-          </template>
-
-          <el-form-item
-            v-if="activeData.__config__.optionType !== undefined"
-            label="选项样式"
-          >
-            <el-radio-group v-model="activeData.__config__.optionType">
-              <el-radio-button label="default"> 默认 </el-radio-button>
-              <!-- <el-radio-button label="button"> 按钮 </el-radio-button> -->
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['active-color'] !== undefined"
-            label="开启颜色"
-          >
-            <el-color-picker v-model="activeData['active-color']" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['inactive-color'] !== undefined"
-            label="关闭颜色"
-          >
-            <el-color-picker v-model="activeData['inactive-color']" />
-          </el-form-item>
-
-          <el-form-item
-            v-if="
-              activeData.__config__.showLabel !== undefined &&
-              activeData.__config__.labelWidth !== undefined
-            "
-            label="显示标题"
-          >
-            <el-switch v-model="activeData.__config__.showLabel" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.branding !== undefined"
-            label="品牌烙印"
-          >
-            <el-switch v-model="activeData.branding" @input="changeRenderKey" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['allow-half'] !== undefined"
-            label="允许半选"
-          >
-            <el-switch v-model="activeData['allow-half']" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['show-text'] !== undefined"
-            label="辅助文字"
-          >
-            <el-switch
-              v-model="activeData['show-text']"
-              @change="rateTextChange"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['show-score'] !== undefined"
-            label="显示分数"
-          >
-            <el-switch
-              v-model="activeData['show-score']"
-              @change="rateScoreChange"
-            />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['show-stops'] !== undefined"
-            label="显示间断点"
-          >
-            <el-switch v-model="activeData['show-stops']" />
-          </el-form-item>
-          <el-form-item v-if="activeData.range !== undefined" label="范围选择">
-            <el-switch v-model="activeData.range" @change="rangeChange" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-color-picker'"
-            label="颜色格式"
-          >
-            <el-select
-              v-model="activeData['color-format']"
-              :style="{ width: '100%' }"
-              clearable
-              placeholder="请选择颜色格式"
-              @change="colorFormatChange"
-            >
-              <el-option
-                v-for="(item, index) in colorFormatOptions"
-                :key="index"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            v-if="
-              activeData.size !== undefined &&
-              (activeData.__config__.border ||
-                activeData.__config__.tag === 'el-color-picker' ||
-                activeData.__config__.tag === 'el-button')
-            "
-            label="组件尺寸"
-          >
-            <el-radio-group v-model="activeData.size">
-              <el-radio-button label="medium"> 中等 </el-radio-button>
-              <el-radio-button label="small"> 较小 </el-radio-button>
-              <el-radio-button label="mini"> 迷你 </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <!-- <el-form-item
-            v-if="activeData['show-word-limit'] !== undefined"
-            label="输入统计"
-          >
-            <el-switch v-model="activeData['show-word-limit']" />
-          </el-form-item> -->
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-input-number'"
-            label="严格步数"
-          >
-            <el-switch v-model="activeData['step-strictly']" />
-          </el-form-item>
-          <!--          <el-form-item-->
-          <!--            v-if="activeData.__config__.tag === 'el-cascader'"-->
-          <!--            label="任选层级"-->
-          <!--          >-->
-          <!--            <el-switch v-model="activeData.props.props.checkStrictly" />-->
-          <!--          </el-form-item>-->
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-cascader'"
-            label="是否多选"
-          >
-            <el-switch v-model="activeData.props.props.multiple" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-cascader'"
-            label="展示全路径"
-          >
-            <el-switch v-model="activeData['show-all-levels']" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-cascader'"
-            label="可否筛选"
-          >
-            <el-switch v-model="activeData.filterable" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.clearable !== undefined"
-            label="能否清空"
-          >
-            <el-switch v-model="activeData.clearable" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.showTip !== undefined"
-            label="显示提示"
-          >
-            <el-switch v-model="activeData.__config__.showTip" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-upload'"
-            label="多选文件"
-          >
-            <el-switch v-model="activeData.multiple" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-upload'"
-            label="文件个数"
-          >
-            <el-input-number v-model="activeData.limit" />
-          </el-form-item>
-          <!--          <el-form-item v-if="activeData['auto-upload'] !== undefined" label="自动上传">-->
-          <!--            <el-switch v-model="activeData['auto-upload']" />-->
-          <!--          </el-form-item>-->
-          <el-form-item
-            v-if="activeData.readonly !== undefined"
-            label="是否只读"
-          >
-            <el-switch v-model="activeData.readonly" />
-          </el-form-item>
-          <!--          <el-form-item-->
-          <!--            v-if="activeData.disabled !== undefined"-->
-          <!--            label="是否禁用"-->
-          <!--          >-->
-          <!--            <el-switch v-model="activeData.disabled" />-->
-          <!--          </el-form-item>-->
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-select'"
-            label="能否搜索"
-          >
-            <el-switch v-model="activeData.filterable" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-select'"
-            label="是否多选"
-          >
-            <el-switch v-model="activeData.multiple" @change="multipleChange" />
-          </el-form-item>
-          <el-form-item v-if="activeData['color'] !== undefined" label="颜色">
-            <el-color-picker v-model="activeData['color']" />
-          </el-form-item>
-          <el-form-item
-            v-if="activeData['textAlign'] !== undefined"
-            label="对齐方式"
-          >
-            <el-radio-group v-model="activeData.textAlign">
-              <el-radio-button label="left"> 左对齐 </el-radio-button>
-              <el-radio-button label="center"> 居中 </el-radio-button>
-              <el-radio-button label="right"> 右对齐 </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item
-            v-if="activeData.__config__.tag === 'el-image'"
-            label="图片地址"
-          >
-            <el-input
-              v-model="activeData.src"
-              placeholder="请输入图片url地址"
-            />
-            <el-upload
-              ref="logoUpload"
-              :action="getUploadUrl"
-              :headers="getUploadHeader"
-              :on-progress="uploadProgressHandle"
-              :on-success="onSuccess"
-              :show-file-list="false"
-              accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
-              style="text-align: center"
-            >
-              <el-button slot="trigger" size="small" type="text"
-                >点击上传图片 *</el-button
-              >
-            </el-upload>
-          </el-form-item>
-          <el-form-item
-            v-if="
-              activeData.__config__.required !== undefined &&
-              activeData.__config__.showRequired !== false
-            "
-            label="是否必填"
-          >
-            <el-switch v-model="activeData.__config__.required" />
-          </el-form-item>
-
-          <template v-if="activeData.__config__.layoutTree">
-            <el-divider>布局结构树</el-divider>
-            <el-tree
-              :data="[activeData.__config__]"
-              :props="layoutTreeProps"
-              default-expand-all
-              draggable="true"
-              node-key="renderKey"
-            >
-              <span slot-scope="{ node, data }">
-                <span class="node-label">
-                  <svg-icon
-                    :name="
-                      data.__config__ ? data.__config__.tagIcon : data.tagIcon
-                    "
-                    class="node-icon"
-                  />
-                  {{ node.label }}
-                </span>
-              </span>
-            </el-tree>
-          </template>
-
-          <!-- <template
-            v-if="
-              Array.isArray(activeData.__config__.regList) &&
-              activeData.__config__.showRegList !== false
-            "
-          >
-            <el-divider>正则校验</el-divider>
-            <div
-              v-for="(item, index) in activeData.__config__.regList"
-              :key="index"
-              class="reg-item"
-            >
-              <span
-                class="close-btn"
-                @click="activeData.__config__.regList.splice(index, 1)"
-              >
-                <i class="el-icon-close" />
-              </span>
-              <el-form-item label="表达式">
-                <el-input v-model="item.pattern" placeholder="请输入正则" />
-              </el-form-item>
-              <el-form-item label="错误提示" style="margin-bottom: 0">
-                <el-input v-model="item.message" placeholder="请输入错误提示" />
-              </el-form-item>
-            </div>
-            <div style="margin-left: 20px">
-              <el-button
-                icon="el-icon-circle-plus-outline"
-                type="text"
-                @click="addReg"
-              >
-                添加规则
-              </el-button>
-            </div>
-          </template> -->
-        </el-form>
-        <el-form v-show="currentTab === 'form'" label-width="90px" size="small">
-          <el-form-item label="表单名">
-            <el-input
-              v-model="formConf.formRef"
-              placeholder="请输入表单名（ref）"
-            />
-          </el-form-item>
-          <el-form-item label="表单模型">
-            <el-input
-              v-model="formConf.formModel"
-              placeholder="请输入数据模型"
-            />
-          </el-form-item>
-          <el-form-item label="校验模型">
-            <el-input
-              v-model="formConf.formRules"
-              placeholder="请输入校验模型"
-            />
-          </el-form-item>
-          <el-form-item label="表单尺寸">
-            <el-radio-group v-model="formConf.size">
-              <el-radio-button label="medium"> 中等 </el-radio-button>
-              <el-radio-button label="small"> 较小 </el-radio-button>
-              <el-radio-button label="mini"> 迷你 </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="标签对齐">
-            <el-radio-group v-model="formConf.labelPosition">
-              <el-radio-button label="left"> 左对齐 </el-radio-button>
-              <el-radio-button label="right"> 右对齐 </el-radio-button>
-              <el-radio-button label="top"> 顶部对齐 </el-radio-button>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="标签宽度">
-            <el-input
-              v-model.number="formConf.labelWidth"
-              placeholder="请输入标签宽度"
-              type="number"
-            />
-          </el-form-item>
-          <el-form-item label="栅格间隔">
-            <el-input-number
-              v-model="formConf.gutter"
-              :min="0"
-              placeholder="栅格间隔"
-            />
-          </el-form-item>
-          <el-form-item label="禁用表单">
-            <el-switch v-model="formConf.disabled" />
-          </el-form-item>
-          <el-form-item label="表单按钮">
-            <el-switch v-model="formConf.formBtns" />
-          </el-form-item>
-          <el-form-item label="显示未选中组件边框">
-            <el-switch v-model="formConf.unFocusedComponentBorder" />
-          </el-form-item>
-        </el-form>
-      </el-scrollbar>
-    </div>
-
-    <treeNode-dialog
-      :visible.sync="dialogVisible"
-      title="添加选项"
-      @commit="addNode"
-    />
-    <icons-dialog
-      :current="activeData[currentIconModel]"
-      :visible.sync="iconsVisible"
-      @select="setIcon"
-    />
-  </div>
-</template>
-
-<script>
-import { isArray } from "util";
-import TreeNodeDialog from "./TreeNodeDialog";
-import { isNumberStr } from "@/utils";
-import IconsDialog from "./IconsDialog";
-import {
-  imageComponents,
-  inputComponents,
-  selectComponents,
-} from "@/components/generator/config";
-import { saveFormConf } from "@/utils/db";
-import { debounce } from "throttle-debounce";
-import draggable from "vuedraggable";
-import _ from "lodash";
-
-const dateTimeFormat = {
-  date: "yyyy-MM-dd",
-  week: "yyyy 第 WW 周",
-  month: "yyyy-MM",
-  year: "yyyy",
-  datetime: "yyyy-MM-dd HH:mm:ss",
-  daterange: "yyyy-MM-dd",
-  monthrange: "yyyy-MM",
-  datetimerange: "yyyy-MM-dd HH:mm:ss",
-};
-
-// 使changeRenderKey在目标组件改变时可用
-const needRerenderList = ["tinymce"];
-
-export default {
-  components: {
-    TreeNodeDialog,
-    draggable,
-    IconsDialog,
-  },
-  props: ["showField", "activeData", "formConf",'drawingList'],
-  data() {
-    return {
-      loading: null,
-      currentTab: "field",
-      currentNode: null,
-      dialogVisible: false,
-      iconsVisible: false,
-      currentIconModel: null,
-      dateTypeOptions: [
-        {
-          label: "日(date)",
-          value: "date",
-        },
-        {
-          label: "周(week)",
-          value: "week",
-        },
-        {
-          label: "月(month)",
-          value: "month",
-        },
-        {
-          label: "年(year)",
-          value: "year",
-        },
-        {
-          label: "日期时间(datetime)",
-          value: "datetime",
-        },
-      ],
-      dateRangeTypeOptions: [
-        {
-          label: "日期范围(daterange)",
-          value: "daterange",
-        },
-        {
-          label: "月范围(monthrange)",
-          value: "monthrange",
-        },
-        {
-          label: "日期时间范围(datetimerange)",
-          value: "datetimerange",
-        },
-      ],
-      colorFormatOptions: [
-        {
-          label: "hex",
-          value: "hex",
-        },
-        {
-          label: "rgb",
-          value: "rgb",
-        },
-        {
-          label: "rgba",
-          value: "rgba",
-        },
-        {
-          label: "hsv",
-          value: "hsv",
-        },
-        {
-          label: "hsl",
-          value: "hsl",
-        },
-      ],
-      justifyOptions: [
-        {
-          label: "start",
-          value: "start",
-        },
-        {
-          label: "end",
-          value: "end",
-        },
-        {
-          label: "center",
-          value: "center",
-        },
-        {
-          label: "space-around",
-          value: "space-around",
-        },
-        {
-          label: "space-between",
-          value: "space-between",
-        },
-      ],
-      layoutTreeProps: {
-        label(data, node) {
-          const config = data.__config__;
-          return data.componentName || `${config.label}: ${data.__vModel__}`;
-        },
-      },
-    };
-  },
-  computed: {
-    scoreMaxLimit(){
-      let score=this.formConf.score
-      this.drawingList.forEach((item)=>{
-        if(item.__config__.score){
-          score-=item.__config__.score
-        }
-      })
-      return score+this.activeData.__config__.score
-    },
-    dateOptions() {
-      if (
-        this.activeData.type !== undefined &&
-        this.activeData.__config__.tag === "el-date-picker"
-      ) {
-        if (this.activeData["start-placeholder"] === undefined) {
-          return this.dateTypeOptions;
-        }
-        return this.dateRangeTypeOptions;
-      }
-      return [];
-    },
-    tagList() {
-      return [
-        {
-          label: "输入型组件",
-          options: inputComponents,
-        },
-        {
-          label: "图片型组件",
-          options: imageComponents,
-        },
-        {
-          label: "选择型组件",
-          options: selectComponents,
-        },
-      ];
-    },
-    activeTag() {
-      return this.activeData.__config__.tag;
-    },
-    isShowMin() {
-      return ["el-input-number", "el-slider"].indexOf(this.activeTag) > -1;
-    },
-    isShowMax() {
-      return (
-        ["el-input-number", "el-slider", "el-rate"].indexOf(this.activeTag) > -1
-      );
-    },
-    isShowStep() {
-      return ["el-input-number", "el-slider"].indexOf(this.activeTag) > -1;
-    },
-    getUploadHeader() {
-      return {
-        token: this.$store.getters["user/isLogin"],
-      };
-    },
-    getUploadUrl() {
-      return this.$uploadUrl;
-    },
-  },
-  watch: {
-    formConf: {
-      handler(val) {
-        saveFormConf(val);
-      },
-      deep: true,
-    },
-    activeData: {
-      handler(newValue, oldValue) {
-        // 切换选中时不触发
-        if (newValue.__config__.formId === oldValue.__config__.formId) {
-          if (newValue) {
-            this.dataChange(newValue);
-          }
-        }
-      },
-      deep: true,
-    },
-  },
-  methods: {
-    
-    onSuccess(response, file, fileList) {
-      console.log(response);
-      this.activeData.src = response.url;
-      this.closeUploadProgressHandle();
-    },
-    // 改变正确选项
-    changeAnswer(item, index) {
-      // console.log(this.activeData.__config__.tag)
-
-      //单选只能有一个正确答案
-      if (
-        this.activeData.__config__.tag == "el-radio-group" &&
-        item.isAnswer == true
-      ) {
-        // console.log(1)
-        this.activeData.__slot__.options.forEach((t, i) => {
-          if (t.isAnswer == true && i != index) {
-            t.isAnswer = false;
-          }
-        });
-      }
-      //选择题不能没有正确答案
-      if(item.isAnswer==false){
-        let allFalse=true
-        for(let i=0;i< this.activeData.__slot__.options.length;i++){
-          if (this.activeData.__slot__.options[i].isAnswer == true) {
-            allFalse=false;
-            break;
-          }
-        }
-        //如果全是false
-        if(allFalse){
-          this.activeData.__slot__.options[index].isAnswer=true
-        }
-      }
-    },
-    addReg() {
-      this.activeData.__config__.regList.push({
-        pattern: "",
-        message: "",
-      });
-    },
-    // 添加选项
-    addSelectItem() {
-      let lastItem = _.last(this.activeData.__slot__.options);
-      this.activeData.__slot__.options.push({
-        label: "",
-        value: lastItem
-          ? lastItem.value === 0
-            ? _.max(
-                _.values(
-                  this.activeData.__slot__.options.map((item) => item.value)
-                )
-              ) + 1
-            : lastItem.value + 1
-          : 1,
-        isAnswer: false,
-      });
-    },
-    async blukAddSelectItems() {
-      let arrStrs = await navigator.clipboard.readText();
-      let arr = arrStrs.split("\n");
-      if (arr.length > 1) {
-        const options = [];
-        for (let index = 0; index < arr.length; index++) {
-          const element = arr[index];
-          if (element.length > 0) {
-            options.push({
-              label: element,
-              value: index + 1,
-            });
-          }
-        }
-        this.activeData.__slot__.options = options;
-      }
-    },
-    addImageSelectItem() {
-      let lastItem = _.last(this.activeData.options);
-      this.activeData.options.push({
-        label: "",
-        image: "",
-        value: lastItem ? lastItem.value + 1 : 1,
-      });
-    },
-    addImageCarouselItem() {
-      let lastItem = _.last(this.activeData.__slot__.options);
-      this.activeData.__slot__.options.push({
-        label: "",
-        image: "",
-        value: lastItem ? lastItem.value + 1 : 1,
-      });
-    },
-    addSelectOtherItem() {
-      let item = this.activeData.__slot__.options.find((item) => {
-        return item.value == 0;
-      });
-      if (item) {
-        return;
-      }
-      this.activeData.__slot__.options.push({
-        label: "其他",
-        value: 0,
-      });
-    },
-    uploadProgressHandle() {
-      this.loading = this.$loading({
-        lock: true,
-        text: "上传中",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
-    },
-    closeUploadProgressHandle() {
-      setTimeout(() => {
-        this.loading.close();
-      }, 100);
-    },
-    addTreeItem() {
-      ++this.idGlobal;
-      this.dialogVisible = true;
-      this.currentNode = this.activeData.options;
-    },
-    renderContent(h, { node, data, store }) {
-      return (
-        <div class="custom-tree-node">
-          <span>{node.label}</span>
-          <span class="node-operation">
-            <i
-              on-click={() => this.append(data)}
-              class="el-icon-plus"
-              title="添加"
-            ></i>
-            <i
-              on-click={() => this.remove(node, data)}
-              class="el-icon-delete"
-              title="删除"
-            ></i>
-          </span>
-        </div>
-      );
-    },
-    append(data) {
-      if (!data.children) {
-        this.$set(data, "children", []);
-      }
-      this.dialogVisible = true;
-      this.currentNode = data.children;
-    },
-    remove(node, data) {
-      this.activeData.__config__.defaultValue = []; // 避免删除时报错
-      const { parent } = node;
-      const children = parent.data.children || parent.data;
-      const index = children.findIndex((d) => d.id === data.id);
-      children.splice(index, 1);
-    },
-    addNode(data) {
-      this.currentNode.push(data);
-    },
-    setOptionValue(item, val) {
-      item.value = isNumberStr(val) ? +val : val;
-    },
-    setDefaultValue(val) {
-      if (Array.isArray(val)) {
-        return val.join(",");
-      }
-      // if (['string', 'number'].indexOf(typeof val) > -1) {
-      //   return val
-      // }
-      if (typeof val === "boolean") {
-        return `${val}`;
-      }
-      return val;
-    },
-    onDefaultValueInput(str) {
-      if (isArray(this.activeData.__config__.defaultValue)) {
-        // 数组
-        this.$set(
-          this.activeData.__config__,
-          "defaultValue",
-          str.split(",").map((val) => (isNumberStr(val) ? +val : val))
-        );
-      } else if (["true", "false"].indexOf(str) > -1) {
-        // 布尔
-        this.$set(this.activeData.__config__, "defaultValue", JSON.parse(str));
-      } else {
-        // 字符串和数字
-        this.$set(
-          this.activeData.__config__,
-          "defaultValue",
-          isNumberStr(str) ? +str : str
-        );
-      }
-    },
-    onSwitchValueInput(val, name) {
-      if (["true", "false"].indexOf(val) > -1) {
-        this.$set(this.activeData, name, JSON.parse(val));
-      } else {
-        this.$set(this.activeData, name, isNumberStr(val) ? +val : val);
-      }
-    },
-    setTimeValue(val, type) {
-      const valueFormat = type === "week" ? dateTimeFormat.date : val;
-      this.$set(this.activeData.__config__, "defaultValue", null);
-      this.$set(this.activeData, "value-format", valueFormat);
-      this.$set(this.activeData, "format", val);
-    },
-    spanChange(val) {
-      this.formConf.span = val;
-    },
-    multipleChange(val) {
-      this.$set(this.activeData.__config__, "defaultValue", val ? [] : "");
-    },
-    dateTypeChange(val) {
-      this.setTimeValue(dateTimeFormat[val], val);
-    },
-    rangeChange(val) {
-      this.$set(
-        this.activeData.__config__,
-        "defaultValue",
-        val ? [this.activeData.min, this.activeData.max] : this.activeData.min
-      );
-    },
-    rateTextChange(val) {
-      if (val) this.activeData["show-score"] = false;
-    },
-    rateScoreChange(val) {
-      if (val) this.activeData["show-text"] = false;
-    },
-    colorFormatChange(val) {
-      this.activeData.__config__.defaultValue = null;
-      this.activeData["show-alpha"] = val.indexOf("a") > -1;
-      this.activeData.__config__.renderKey = +new Date(); // 更新renderKey,重新渲染该组件
-    },
-    openIconsDialog(model) {
-      this.iconsVisible = true;
-      this.currentIconModel = model;
-    },
-    setIcon(val) {
-      this.activeData[this.currentIconModel] = val;
-    },
-    tagChange(tagIcon) {
-      let target = inputComponents.find(
-        (item) => item.__config__.tagIcon === tagIcon
-      );
-      if (!target)
-        target = selectComponents.find(
-          (item) => item.__config__.tagIcon === tagIcon
-        );
-      this.$emit("tag-change", target);
-    },
-    dataChange: debounce(430, false, function (val) {
-      this.$emit("data-change", val);
-    }),
-    changeRenderKey() {
-      if (needRerenderList.includes(this.activeData.__config__.tag)) {
-        this.activeData.__config__.renderKey = +new Date();
-      }
-    }
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "@/assets/styles/form/index.scss";
-.right-answer {
-  display: flex;
-  justify-content: flex-end;
-  padding-bottom: 10px;
-}
-.right-board {
-  width: 350px;
-  position: absolute;
-  right: 0px;
-  top: 0;
-  padding-top: 3px;
-  background-color: #fff;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-  .field-box {
-    position: relative;
-    height: calc(100vh - 70px);
-    box-sizing: border-box;
-    overflow: hidden;
-  }
-  .el-scrollbar {
-    height: 100%;
-    padding-bottom: 50px;
-  }
-}
-.select-item {
-  display: flex;
-  border: 1px dashed #fff;
-  box-sizing: border-box;
-  align-items: center;
-  & .close-btn {
-    cursor: pointer;
-    color: #f56c6c;
-  }
-  & .el-input + .el-input {
-    margin-left: 4px;
-  }
-}
-.select-item + .select-item {
-  margin-top: 4px;
-}
-.select-item.sortable-chosen {
-  border: 1px dashed #409eff;
-}
-.select-line-icon {
-  line-height: 32px;
-  font-size: 22px;
-  padding: 0 4px;
-  color: #777;
-}
-.option-drag {
-  cursor: move;
-}
-.time-range {
-  .el-date-editor {
-    width: 227px;
-  }
-  ::v-deep .el-icon-time {
-    display: none;
-  }
-}
-.node-label {
-  font-size: 14px;
-}
-.node-icon {
-  color: #bebfc3;
-}
-</style>
diff --git a/src/views/modules/service/popup/question-editor/editor/TreeNodeDialog.vue b/src/views/modules/service/popup/question-editor/editor/TreeNodeDialog.vue
deleted file mode 100644
index 236ed34..0000000
--- a/src/views/modules/service/popup/question-editor/editor/TreeNodeDialog.vue
+++ /dev/null
@@ -1,156 +0,0 @@
-<template>
-    <div>
-        <el-dialog
-            v-bind="$attrs"
-            :close-on-click-modal="false"
-            :modal-append-to-body="false"
-            v-on="$listeners"
-            @open="onOpen"
-            @close="onClose"
-        >
-            <el-row :gutter="0">
-                <el-form
-                    ref="elForm"
-                    :model="formData"
-                    :rules="rules"
-                    size="small"
-                    label-width="100px"
-                >
-                    <el-col :span="24">
-                        <el-form-item
-                            label="选项名"
-                            prop="label"
-                        >
-                            <el-input
-                                v-model="formData.label"
-                                placeholder="请输入选项名"
-                                clearable
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item
-                            label="选项值"
-                            prop="value"
-                        >
-                            <el-input
-                                v-model="formData.value"
-                                placeholder="请输入选项值"
-                                clearable
-                            >
-                                <el-select
-                                    slot="append"
-                                    v-model="dataType"
-                                    :style="{width: '100px'}"
-                                >
-                                    <el-option
-                                        v-for="(item, index) in dataTypeOptions"
-                                        :key="index"
-                                        :label="item.label"
-                                        :value="item.value"
-                                        :disabled="item.disabled"
-                                    />
-                                </el-select>
-                            </el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-form>
-            </el-row>
-            <div slot="footer">
-                <el-button
-                    type="primary"
-                    @click="handelConfirm"
-                >
-                    确定
-                </el-button>
-                <el-button @click="close">
-                    取消
-                </el-button>
-            </div>
-        </el-dialog>
-    </div>
-</template>
-<script>
-import { isNumberStr } from '@/utils'
-import { getTreeNodeId, saveTreeNodeId } from '@/utils/db'
-
-const id = getTreeNodeId()
-
-export default {
-    components: {},
-    inheritAttrs: false,
-    props: [],
-    data() {
-        return {
-            id,
-            formData: {
-                label: undefined,
-                value: undefined
-            },
-            rules: {
-                label: [
-                    {
-                        required: true,
-                        message: '请输入选项名',
-                        trigger: 'blur'
-                    }
-                ],
-                value: [
-                    {
-                        required: true,
-                        message: '请输入选项值',
-                        trigger: 'blur'
-                    }
-                ]
-            },
-            dataType: 'string',
-            dataTypeOptions: [
-                {
-                    label: '字符串',
-                    value: 'string'
-                },
-                {
-                    label: '数字',
-                    value: 'number'
-                }
-            ]
-        }
-    },
-    computed: {},
-    watch: {
-        // eslint-disable-next-line func-names
-        'formData.value': function(val) {
-            this.dataType = isNumberStr(val) ? 'number' : 'string'
-        },
-        id(val) {
-            saveTreeNodeId(val)
-        }
-    },
-    created() {},
-    mounted() {},
-    methods: {
-        onOpen() {
-            this.formData = {
-                label: undefined,
-                value: undefined
-            }
-        },
-        onClose() {},
-        close() {
-            this.$emit('update:visible', false)
-        },
-        handelConfirm() {
-            this.$refs.elForm.validate(valid => {
-                if (!valid) return
-                if (this.dataType === 'number') {
-                    this.formData.value = parseFloat(this.formData.value)
-                }
-                this.formData.id = this.id++
-                this.$emit('commit', this.formData)
-                this.close()
-            })
-        }
-    }
-}
-</script>
-
diff --git a/src/views/modules/service/popup/question-editor/editor/index.vue b/src/views/modules/service/popup/question-editor/editor/index.vue
deleted file mode 100644
index 72d1540..0000000
--- a/src/views/modules/service/popup/question-editor/editor/index.vue
+++ /dev/null
@@ -1,505 +0,0 @@
-<!--
- * @author: ym
- * @Date: 2021-10-16 13:49:28
- * @LastEditTime: 2022-09-05 19:02:30
- * @LastEditors: chenkangxu
- * @Description: 
- * @FilePath: \background-front-end\src\components\common\content-editor\editor\index.vue
--->
-<template>
-  <div class="form-edit-container">
-    <div class="left-board" v-if="isUpdate===false">
-      <!----------------- 左侧拖拽组件 ------------------->
-      <el-scrollbar class="left-scrollbar">
-        <div class="components-list">
-          <div v-for="(item, listIndex) in leftComponents" :key="listIndex">
-            <div class="components-title">
-              <svg-icon name="component" />
-              {{ item.title }}
-            </div>
-            <draggable
-              :clone="cloneComponent"
-              :group="{ name: 'componentsGroup', pull: 'clone', put: false }"
-              :list="item.list"
-              :sort="false"
-              class="components-draggable"
-              draggable=".components-item"
-              @end="onEnd"
-            >
-              <div
-                v-for="(element, index) in item.list"
-                :key="index"
-                class="components-item"
-                @click="addComponent(element)"
-              >
-                <div class="components-body">
-                  <svg-icon :name="element.__config__.tagIcon" />
-                  {{ element.__config__.label }}
-                </div>
-              </div>
-            </draggable>
-          </div>
-        </div>
-      </el-scrollbar>
-    </div>
-    <!----------------- 中间表单 ------------------->
-    <div class="center-board">
-      <el-scrollbar class="center-scrollbar">
-        <el-row
-          v-if="formConf"
-          :gutter="formConf.gutter"
-          class="center-board-row"
-        >
-          <el-form
-            :disabled="formConf.disabled"
-            :label-position="formConf.labelPosition"
-            :label-width="formConf.labelWidth + 'px'"
-            :size="formConf.size"
-          >
-            <draggable
-              :animation="340"
-              :list="drawingList"
-              class="drawing-board"
-              group="componentsGroup"
-              @end="onItemEnd"
-            >
-              <draggableItem
-                v-for="(item, index) in drawingList"
-                :key="item.renderKey"
-                :active-id="activeId"
-                :current-item="item"
-                :drawing-list="drawingList"
-                :form-conf="formConf"
-                :index="index"
-                :isUpdate="isUpdate"
-                @activeItem="activeFormItem"
-                @changeLabel="changeLabel"
-                @copyItem="drawingItemCopy"
-                @deleteItem="drawingItemDelete"
-              />
-            </draggable>
-            <div v-show="!drawingList.length" class="empty-info">
-              <img style="width: 20%" src="~@/assets/images/form-bg.png" />
-              <p>从左侧拖入或点选组件进行表单设计</p>
-            </div>
-          </el-form>
-        </el-row>
-      </el-scrollbar>
-    </div>
-    <!-- 右侧 -->
-    <!-- drawingList仅用于限制分数最大值 -->
-    <right-panel
-      v-if="activeData"
-      :drawingList="drawingList"
-      :active-data="activeData"
-      :form-conf="formConf"
-      :show-field="!!drawingList.length"
-      @tag-change="tagChange"
-      @data-change="updateProjectItemInfo"
-    />
-  </div>
-</template>
-
-<script>
-import draggable from "vuedraggable";
-import { debounce } from "throttle-debounce";
-import RightPanel from "./RightPanel.vue";
-// 拖拽组件列表
-import {
-  assistComponents,
-  formConf,
-  imageComponents,
-  inputComponents,
-  personalInfoComponents,
-  selectComponents,
-  questionComponents,
-} from "@/components/generator/config";
-//
-import { deepClone } from "@/utils";
-import { dbDataConvertForItemJson, formItemConvertData } from "@/utils/convert";
-import drawingDefalut from "@/components/generator/drawingDefalut";
-import draggableItem from "./DraggableItem";
-import { saveDrawingList, saveIdGlobal } from "@/utils/db";
-import Tinymce from "@/components/tinymce/index.vue";
-
-let oldActiveId;
-let tempActiveData;
-let idGlobal;
-
-export default {
-  components: {
-    draggable,
-    Tinymce,
-    draggableItem,
-    RightPanel,
-  },
-  props: {
-    drawingList: {
-      type: Array,
-      require: true,
-      default: drawingDefalut,
-    },
-    updateFormConf: {
-      type: Object,
-    },
-    isUpdate: {
-      type: Boolean,
-      default: false,
-    }
-  },
-  data() {
-    return {
-      idGlobal,
-      formConf: null,
-      editDescription: true,
-      inputComponents,
-      selectComponents,
-      labelWidth: 100,
-      // drawingData: {},
-      activeId: drawingDefalut.length != 0 ? drawingDefalut[0].formId : 0,
-      // formData: {},
-      // dialogVisible: false,
-      // generateConf: null,
-      // showFileName: false,
-      activeData: drawingDefalut ? drawingDefalut[0] : null,
-      saveDrawingListDebounce: debounce(340, saveDrawingList),
-      saveIdGlobalDebounce: debounce(340, saveIdGlobal),
-      projectKey: null,
-      leftComponents: [
-        // {
-        //   title: "联系人组件",
-        //   list: personalInfoComponents,
-        // },
-        // {
-        //   title: "输入型组件",
-        //   list: inputComponents,
-        // },
-        // {
-        //   title: "图片型组件",
-        //   list: imageComponents,
-        // },
-        // {
-        //   title: "辅助型组件",
-        //   list: assistComponents,
-        // },
-        // {
-        //   title: "选择型组件",
-        //   list: selectComponents,
-        // },
-        {
-          title: "考试题型",
-          list: questionComponents,
-        },
-      ],
-    };
-  },
-  computed: {
-    scoreMinLimit(){
-      let score=0
-      this.drawingList.forEach((item)=>{
-        if(item.__config__.score){
-          score+=item.__config__.score
-        }
-      })
-      return score
-    }
-  },
-  watch: {
-    // eslint-disable-next-line func-names
-    "activeData.__config__.label": function (val, oldVal) {
-      if (
-        this.activeData.placeholder === undefined ||
-        !this.activeData.__config__.tag ||
-        oldActiveId !== this.activeId
-      ) {
-        return;
-      }
-      this.activeData.placeholder =
-        this.activeData.placeholder.replace(oldVal, "") + val;
-    },
-    activeId: {
-      handler(val) {
-        oldActiveId = val;
-      },
-      immediate: true,
-    },
-    drawingList: {
-      handler(val) {
-        this.$emit("changeDrawingList", this.drawingList);
-        this.saveDrawingListDebounce(val, this.projectKey);
-        // if (val.length === 0) this.idGlobal = 100;
-      },
-      deep: true,
-    },
-    formConf: {
-      handler(val) {
-        this.$emit("changeFormConf", this.formConf);
-      },
-    },
-    idGlobal: {
-      handler(val) {
-        if (val) {
-          this.saveIdGlobalDebounce(val, this.projectKey);
-        }
-      },
-      immediate: true,
-    },
-  },
-  mounted() {
-    this.idGlobal=Date.parse(new Date());
-    // 复制对象 避免修改改变原始对象
-    this.formConf = JSON.parse(JSON.stringify(formConf));
-    console.log('index',this.isUpdate,this.updateFormConf);
-    if (this.isUpdate) {
-      this.formConf.title = this.updateFormConf.title
-      this.formConf.description = this.updateFormConf.description
-      this.formConf.score = this.updateFormConf.score
-    }
-    // 项目key
-    // this.projectKey = this.$route.query.key
-    // 从服务端获取
-    this.queryProjectItems();
-    // 获取表单配置
-    // this.$api.get(`/user/project/${this.projectKey}`).then(res => {
-    //     this.formConf.title = res.data.name
-    //     this.formConf.description = res.data.describe
-    // })
-    // 全局组件Id
-    // this.$api.get('/user/project/item/max-form-id', {params: {key: this.projectKey}}).then(res => {
-    //     this.idGlobal = res.data ? res.data : 100
-    // })
-  },
-  methods: {
-    // 保存基本信息 debounce防抖
-    saveProjectInfo: debounce(430, true, function () {
-      // this.$api.post('/user/project/update', {
-      //     'key': this.projectKey,
-      //     'name': this.formConf.title,
-      //     'describe': this.formConf.description
-      // }).then(() => {
-      // })
-    }),
-    // 更新表单项右侧配置
-    updateProjectItemInfo(val) {
-      console.log("val", val);
-      let data = formItemConvertData(val, this.projectKey);
-      console.log("data", data);
-      // this.$api.post('/user/project/item/update', data).then(() => {
-
-      // })
-    },
-    // 后台删除
-    // deleteProjectItemInfo(val) {
-    //     let data = formItemConvertData(val, this.projectKey)
-    //     this.$api.post('/user/project/item/delete', data).then(() => {
-
-    //     })
-    // },
-
-    async saveProjectItemInfo(item) {
-      console.log("saveProjectItemInfo", item);
-      let isSuccess = true;
-      let params = formItemConvertData(item, this.projectKey);
-      console.log("saveProjectItemInfo", params);
-      let pItem = item;
-      // await this.$api.post('/user/project/item/create', params).then(res => {
-      //     pItem.sort = res.data.sort
-      //     isSuccess = true
-      // })
-      // 如果是分页组件 刷新所有分页的页码
-      // if (item.typeId === 'PAGINATION') {
-      //     this.updatePaginationList()
-      // }
-      return isSuccess;
-    },
-    // updatePaginationList() {
-    //     // 页总数
-    //     const length = this.drawingList.filter(item => item.typeId === 'PAGINATION').length
-    //     let curr = 1
-    //     this.drawingList.forEach((item, index) => {
-    //         if (item.typeId === 'PAGINATION') {
-    //             item.totalPageNum = length
-    //             item.currPageNum = curr++
-    //             this.$set(this.drawingList, index, item)
-    //         }
-    //     })
-    // },
-    // 请求表单项
-    queryProjectItems() {
-      // this.$api.get('/user/project/item/list', {params: {key: this.projectKey}}).then(res => {
-      //     this.drawingList = res.data.map(item => dbDataConvertForItemJson(item))
-      //     // 更新分页
-      //     this.updatePaginationList()
-      // })
-    },
-    // 选中的表单项
-    activeFormItem(currentItem) {
-      this.activeData = currentItem;
-      this.activeId = currentItem.__config__.formId;
-    },
-
-    changeLabel(currentItem, value) {
-      console.log(currentItem, value);
-    },
-    // 左侧栏目拖拽结束
-    onEnd(obj) {
-      console.log("onEnd", obj);
-      if (obj.from !== obj.to) {
-        this.activeData = tempActiveData;
-        this.activeId = this.idGlobal;
-        this.saveProjectItemInfo(tempActiveData).then(() => {
-          this.onItemEnd(obj);
-        });
-      }
-    },
-    // 中间表单项拖拽结束
-    onItemEnd(obj) {
-      console.log("onItemEnd", obj);
-      let params = { projectKey: this.projectKey };
-      if (this.drawingList[obj.newIndex - 1]) {
-        let sort1 = this.drawingList[obj.newIndex - 1].sort;
-        params.beforePosition = sort1;
-      }
-      if (this.drawingList[obj.newIndex + 1]) {
-        let sort2 = this.drawingList[obj.newIndex + 1].sort;
-        params.afterPosition = sort2;
-      }
-      params.formItemId = this.drawingList[obj.newIndex].__config__.formId;
-      if (params.beforePosition || params.afterPosition) {
-        // this.$api.post('/user/project/item/sort', params).then(res => {
-        //     this.drawingList[obj.newIndex].sort = res.data.sort
-        // })
-      }
-    },
-    //点击左侧添加表单项
-    addComponent(item) {
-      console.log("addComponent", item);
-      const clone = this.cloneComponent(item);
-      this.saveProjectItemInfo(clone);
-      this.drawingList.push(clone);
-      this.activeFormItem(clone);
-      console.log("drawingList", this.drawingList);
-    },
-    // 复制表单项
-    cloneComponent(origin) {
-      const clone = deepClone(origin);
-      const config = clone.__config__;
-      config.span = this.formConf.span; // 生成代码时，会根据span做精简判断
-      this.createIdAndKey(clone);
-      clone.placeholder !== undefined && (clone.placeholder += config.label);
-      tempActiveData = clone;
-      return tempActiveData;
-    },
-    createIdAndKey(item) {
-      const config = item.__config__;
-      config.formId = ++this.idGlobal;
-      config.renderKey = `${config.formId}${+new Date()}`; // 改变renderKey后可以实现强制更新组件
-      if (config.layout === "colFormItem") {
-        item.__vModel__ = `field${this.idGlobal}`;
-      } else if (config.layout === "rowFormItem") {
-        config.componentName = `row${this.idGlobal}`;
-        !Array.isArray(config.children) && (config.children = []);
-        delete config.label; // rowFormItem无需配置label属性
-      }
-      if (Array.isArray(config.children)) {
-        config.children = config.children.map((childItem) =>
-          this.createIdAndKey(childItem)
-        );
-      }
-      // console.log(this.idGlobal)
-      console.log('createidandkey',item)
-      return item;
-    },
-    drawingItemCopy(item, list) {
-      let clone = deepClone(item);
-      clone = this.createIdAndKey(clone);
-      list.push(clone);
-      this.activeFormItem(clone);
-      this.saveProjectItemInfo(clone);
-    },
-    // 删除表单一项
-    drawingItemDelete(index, list) {
-      console.log("drawingItemDelete", index, list);
-      let item = list[index];
-      list.splice(index, 1);
-      this.$nextTick(() => {
-        const len = this.drawingList.length;
-        if (len) {
-          this.activeFormItem(this.drawingList[len - 1]);
-        }
-      });
-      // this.deleteProjectItemInfo(item)
-    },
-    tagChange(newTag) {
-      newTag = this.cloneComponent(newTag);
-      const config = newTag.__config__;
-      newTag.__vModel__ = this.activeData.__vModel__;
-      newTag.sort = this.activeData.sort;
-      config.formId = this.activeId;
-      config.span = this.activeData.__config__.span;
-      this.activeData.__config__.tag = config.tag;
-      this.activeData.__config__.tagIcon = config.tagIcon;
-      this.activeData.__config__.document = config.document;
-      this.activeData.typeId = newTag.typeId;
-      if (
-        typeof this.activeData.__config__.defaultValue ===
-        typeof config.defaultValue
-      ) {
-        config.defaultValue = this.activeData.__config__.defaultValue;
-      }
-      Object.keys(newTag).forEach((key) => {
-        if (this.activeData[key] !== undefined) {
-          newTag[key] = this.activeData[key];
-        }
-      });
-      this.activeData = newTag;
-      this.updateProjectItemInfo(newTag);
-      this.updateDrawingList(newTag, this.drawingList);
-    },
-    updateDrawingList(newTag, list) {
-      const index = list.findIndex(
-        (item) => item.__config__.formId === this.activeId
-      );
-      if (index > -1) {
-        list.splice(index, 1, newTag);
-      } else {
-        list.forEach((item) => {
-          if (Array.isArray(item.__config__.children))
-            this.updateDrawingList(newTag, item.__config__.children);
-        });
-      }
-    },
-  },
-};
-</script>
-
-<style lang='scss'>
-@import "@/assets/styles/form/home.scss";
-@import "@/assets/styles/form/index.scss";
-</style>
-<style lang="scss" scoped>
-.center-board {
-  .center-board-row {
-  }
-
-  .form-head-title {
-    padding: 0 10px;
-    text-align: center;
-
-    .form-name-text:hover {
-      border: 1px dashed #7b7b7b;
-      min-height: 100px;
-    }
-  }
-
-  .form-head-desc {
-    padding: 0 10px;
-  }
-
-  .form-head-divider {
-    margin-right: 10px;
-    margin-left: 10px;
-    width: auto;
-  }
-}
-</style>
diff --git a/src/views/modules/service/popup/question-editor/preview/ProjectForm.vue b/src/views/modules/service/popup/question-editor/preview/ProjectForm.vue
deleted file mode 100644
index baca52a..0000000
--- a/src/views/modules/service/popup/question-editor/preview/ProjectForm.vue
+++ /dev/null
@@ -1,362 +0,0 @@
-<template>
-  <div
-    class="project-form"
-    :style="{
-      backgroundColor: projectTheme.backgroundColor,
-      background: projectTheme.backgroundImg
-        ? 'url(' + projectTheme.backgroundImg + ')  no-repeat center'
-        : '',
-    }"
-  >
-    <div class="">
-      <div :style="{ textAlign: projectTheme.logoPosition }">
-        <img :src="projectTheme.logoImg" class="logo-img" />
-      </div>
-      <el-image
-        v-if="projectTheme.headImgUrl"
-        :src="projectTheme.headImgUrl"
-        style="width: 100%"
-        fit="scale-down"
-      />
-      <h4
-        v-if="projectTheme.showTitle"
-        class="form-name-text"
-        style="text-align: center"
-      >
-        {{ formConf.title }}
-      </h4>
-      <div
-        v-show="projectTheme.showDescribe"
-        class="form-name-text describe-html"
-        v-html="formConf.description"
-      />
-      <el-divider />
-      <parser
-        v-if="startParser"
-        :key="parserKey"
-        :form-model="formModel"
-        :label-form-model="labelFormModel"
-        :form-conf="formConf"
-        @next="nextPage"
-        @prev="prevPage"
-        @submit="submitForm"
-      />
-    </div>
-  </div>
-</template>
-
-<script>
-import Parser from "@/components/parser/Parser";
-import { dbDataConvertForItemJson } from "@/utils/convert";
-import { getExpression } from "@/utils/expression";
-import _ from "lodash";
-
-window.onload = function () {
-  document.addEventListener("touchstart", function (event) {
-    if (event.touches.length > 1) {
-      event.preventDefault();
-    }
-  });
-  document.addEventListener("gesturestart", function (event) {
-    event.preventDefault();
-  });
-};
-export default {
-  components: {
-    Parser,
-  },
-  props: {
-    projectConfig: {
-      projectKey: "",
-      showBtns: true,
-      // 项目种类  1 普通  2模板
-      projectKind: 1,
-    },
-    drawingList: {
-      type: Array,
-    },
-  },
-  metaInfo: {
-    meta: [
-      {
-        name: "viewport",
-        content:
-          "width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no",
-      },
-    ],
-  },
-  data() {
-    return {
-      logicShowTriggerRule: {},
-      startParser: false,
-      formModel: {},
-      labelFormModel: {},
-      projectTheme: {
-        headImgUrl: "",
-        logoImg: "",
-        showTitle: true,
-        showDescribe: true,
-      },
-      parserKey: +new Date(),
-      // 每页数据
-      perPageFields: {},
-      formConf: {
-        fields: [],
-        logicShowRule: {},
-        projectKey: "",
-        projectKind: 1,
-        __methods__: {},
-        formRef: "elForm",
-        formModel: "formData",
-        labelFormModel: "labelFormData",
-        size: "small",
-        labelPosition: "top",
-        labelWidth: 100,
-        formRules: "rules",
-        gutter: 15,
-        disabled: false,
-        span: 24,
-        formBtns: true,
-        resetBtn: false,
-        submitBtnText: "提交",
-        submitBtnColor: "#409EFF",
-        showNumber: false,
-        unFocusedComponentBorder: true,
-      },
-    };
-  },
-  computed: {},
-  watch: {},
-  beforeCreate() {
-    document.querySelector("body").className = "project-body";
-  },
-  created() {
-    if (this.projectConfig && this.projectConfig.projectKey) {
-      this.formConf.projectKey = this.projectConfig.projectKey;
-      if (this.projectConfig.projectKind) {
-        this.formConf.projectKind = this.projectConfig.projectKind;
-      }
-    } else if (this.$route.query.key) {
-      // 不存去路由中尝试获取 iframe
-      this.formConf.projectKey = this.$route.query.key;
-      if (this.$route.query.kind) {
-        this.formConf.projectKind = this.$route.query.kind;
-      }
-      this.formConf.formBtns = true;
-    }
-    this.formConf.size = window.innerWidth < 480 ? "medium" : "small";
-  },
-  async mounted() {
-    let url = `/user/project/details/${this.formConf.projectKey}`;
-    if (this.formConf.projectKind == 2) {
-      url = `/project/template/details/${this.formConf.projectKey}`;
-    }
-    let logicItemList = [];
-    // 处理逻辑表单
-    if (this.formConf.projectKind == 1) {
-      let res = await this.queryLogicItemList();
-      logicItemList = res.data;
-    }
-    let logicItemMap = new Map();
-    logicItemList.forEach((item) => {
-      logicItemMap.set(item.formItemId, item);
-      this.logicShowTriggerHandle(item);
-    });
-    // this.$api.get(url).then(res => {
-    //     if (res.data) {
-    let serialNumber = 1;
-    let fields = this.drawingList.map((item) => {
-      let projectItem = dbDataConvertForItemJson(item);
-      projectItem.serialNumber = serialNumber;
-      projectItem.logicShow = !logicItemMap.get(projectItem.formItemId);
-      serialNumber++;
-      return projectItem;
-    });
-    this.pageShowHandle(fields);
-    if (_.keys(this.perPageFields).length != 0) {
-      this.formConf.fields = _.get(this.perPageFields, 1);
-      this.formConf.formBtns = false;
-    } else {
-      this.formConf.fields = fields;
-    }
-    if (res.data.project) {
-      this.formConf.title = res.data.project.name;
-      document.title = res.data.project.name;
-      this.formConf.description = res.data.project.describe;
-    }
-    this.formConf.logicShowRule = this.logicShowTriggerRule;
-    // 主题数据
-    if (res.data.userProjectTheme) {
-      this.projectTheme = res.data.userProjectTheme;
-      let { submitBtnText, showNumber, btnsColor } = res.data.userProjectTheme;
-      if (submitBtnText) this.formConf.submitBtnText = submitBtnText;
-      if (showNumber) this.formConf.showNumber = showNumber;
-      if (btnsColor) this.formConf.submitBtnColor = btnsColor;
-    }
-    this.startParser = true;
-
-    // }
-    // })
-  },
-  methods: {
-    // 分页显示数据处理
-    pageShowHandle(allFields) {
-      // 判断是否存在分页
-      let index = allFields.findIndex((item) => {
-        return item.typeId === "PAGINATION";
-      });
-      if (index < 0) {
-        return;
-      }
-      let curr = 1;
-      // 每页字段
-      let perPageFields = {};
-      // 分页字段数据
-      let pageFields = {};
-      allFields.forEach((item) => {
-        let fields = _.get(perPageFields, curr);
-        if (item.typeId === "PAGINATION") {
-          _.set(pageFields, curr, item);
-          if (fields) {
-            item.currPageNum = curr++;
-          }
-        } else {
-          if (!fields || fields == undefined) {
-            fields = new Array();
-          }
-          fields.push(item);
-          _.set(perPageFields, curr, fields);
-        }
-      });
-      let len = _.keys(perPageFields).length;
-      // 计算页数 添加分页
-      _.keys(perPageFields).forEach((key) => {
-        let pageItem = _.get(pageFields, key);
-        if (pageItem) {
-          let fields = _.get(perPageFields, key);
-          pageItem.totalPageNum = len;
-          fields.push(pageItem);
-          _.set(perPageFields, key, fields);
-        }
-      });
-      this.perPageFields = perPageFields;
-    },
-    /**
-     * 处理逻辑显示数据
-     */
-    logicShowTriggerHandle(logicItem) {
-      if (!logicItem) {
-        return;
-      }
-      // 建立触发关系 该字段值发生变化时 哪些问题需要进行逻辑判断 确定是否显示
-      logicItem.conditionList.forEach((item) => {
-        if (Object.keys(item).length === 0) {
-          return;
-        }
-        let rules = this.logicShowTriggerRule[item.formItemId];
-        if (!rules) {
-          rules = new Array();
-        }
-        rules.push({
-          // 触发的字段
-          triggerFormItemId: logicItem.formItemId,
-          logicExpression: getExpression(
-            logicItem.conditionList,
-            logicItem.expression
-          ),
-        });
-        this.logicShowTriggerRule[item.formItemId] = rules;
-      });
-    },
-    // 统一处理axios请求
-    queryLogicItemList() {
-      return new Promise((resolve, reject) => {
-        this.$api
-          .get("/user/project/logic/list", {
-            params: { projectKey: this.formConf.projectKey },
-          })
-          .then((res) => {
-            resolve(res);
-          })
-          .catch((err) => {
-            reject(err);
-          });
-      });
-    },
-    prevPage(params) {
-      this.switchPage(params.page - 1, params);
-    },
-    nextPage(params) {
-      this.switchPage(params.page + 1, params);
-    },
-    switchPage(page, params) {
-      let { labelFormModel, formModel } = params;
-      this.formModel = formModel;
-      this.labelFormModel = labelFormModel;
-      this.formConf.formBtns = _.keys(this.perPageFields).length == page;
-      this.formConf.fields = _.get(this.perPageFields, page);
-      this.parserKey = +new Date();
-    },
-    submitForm(data) {
-      this.$emit("submit", data);
-    },
-  },
-};
-</script>
-
-<style lang="scss">
-@import "@/assets/styles/elementui-mobile.scss";
-.project-form {
-  margin: 15px auto;
-  width: 800px;
-  padding: 15px;
-  background-repeat: repeat;
-  background-color: rgba(229, 239, 247, 0.87);
-}
-.project-form .describe-html img {
-  max-width: 780px;
-  margin: 0px;
-}
-
-.project-body::-webkit-scrollbar {
-  width: 0 !important;
-  background: transparent;
-}
-
-.project-body {
-  -ms-overflow-style: none;
-  overflow: -moz-scrollbars-none;
-}
-
-.logo-img {
-  max-height: 120px;
-}
-
-.submit-btn-form-item {
-  text-align: left;
-}
-
-.submit-btn-form-item button {
-  width: 20%;
-}
-
-@media screen and (max-width: 750px) {
-  .project-form {
-    margin: 0;
-    width: 100% !important;
-    background-color: white;
-  }
-  .logo-img {
-    max-height: 2.94rem;
-  }
-  .submit-btn-form-item {
-    text-align: center;
-  }
-  .submit-btn-form-item button {
-    width: 80%;
-  }
-  .project-form .describe-html img {
-    width: 95vw !important;
-  }
-}
-</style>
diff --git a/src/views/modules/service/popup/question-editor/preview/index.vue b/src/views/modules/service/popup/question-editor/preview/index.vue
deleted file mode 100644
index acf45ae..0000000
--- a/src/views/modules/service/popup/question-editor/preview/index.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<template>
-    <div class="preview-container">
-        <el-tabs v-if="projectConfig.projectKey" type="card">
-            <el-tab-pane>
-                <span slot="label"><i class="el-icon-mobile" />
-                    手机
-                </span>
-                <div class="preview-layer">
-                    <div class="preview-bg" />
-                    <div class="preview-phone">
-                        <iframe id="preview-html"
-                                :src="mobilePreviewUrl"
-                                class="preview-html" frameborder="0"
-                                name="preview-html"
-                                scrolling="auto"
-                        />
-                    </div>
-                </div>
-                <!-- <div v-if="mobilePreviewUrl&&previewQrcode" class="qrcode-view">
-                    <p>手机扫码查看效果</p>
-                    <vue-qr
-                        v-if="mobilePreviewUrl&&previewQrcode" :size="194" :text="mobilePreviewUrl"
-                    />
-                </div> -->
-            </el-tab-pane>
-            <el-tab-pane>
-                <span slot="label"><i class="el-icon-monitor" />
-                    电脑
-                </span>
-                <el-scrollbar style="height: 77vh;overflow-x: hidden!important;">
-                    <project-form
-                        v-if="projectConfig.projectKey"
-                        :project-config="projectConfig"
-                        :drawingList="drawingList"
-                    />
-                </el-scrollbar>
-            </el-tab-pane>
-        </el-tabs>
-    </div>
-</template>
-
-<script>
-import ProjectForm from './ProjectForm'
-// import VueQr from 'vue-qr'
-
-export default {
-    name: 'PreView',
-    components: {
-        ProjectForm,
-        // VueQr
-    },
-    props: {
-        previewQrcode: null,
-        drawingList:{
-          type:Array
-        }
-    },
-    data() {
-        return {
-            projectKey: null,
-            mobilePreviewUrl: '',
-            projectConfig: {
-                projectKey: '',
-                showBtns: true
-            }
-        }
-    },
-    mounted() {
-        this.projectKey = this.$route.query.key
-        let url = window.location.protocol + '//' + window.location.host
-        this.mobilePreviewUrl = `${url}/project/view?key=${this.projectKey}`
-        this.$set(this.projectConfig, 'projectKey', this.projectKey)
-    }
-}
-</script>
-
-<style lang="scss" scoped>
-
-.preview-container {
-  margin: 0;
-  padding-top: 30px;
-  background-color: #f7f7f7;
-}
-::v-deep .el-tabs--card>.el-tabs__header .el-tabs__nav{
-  border: 1px solid #E4E7ED!important;
-}
-::v-deep .el-tabs__header {
-  width: 300px;
-  margin: 0 auto;
-  border: none;
-}
-
-::v-deep .el-tabs--card > .el-tabs__header .el-tabs__item {
-  background-color: white;
-  border: 1px solid white;
-}
-
-div.preview-layer {
-  width: 500px;
-  height: 100%;
-  margin: 10px auto;
-  right: 0;
-  text-align: center;
-}
-
-div.preview-layer .preview-bg {
-  width: 500px;
-  height: 100%;
-  margin: 20px auto;
-  z-index: 999;
-  opacity: 0.7;
-}
-
-div.preview-layer .preview-phone {
-  width: 372px;
-  height: 744px;
-  background: url('~@/assets/images/appearset_bgc_big.png');
-  background-size: 372px 744px;
-  z-index: 1000;
-}
-
-.qrcode-view{
-  position: absolute;
-  top: 0;
-  right: 20px;
-  p{
-    text-align: center;
-    font-size: 12px;
-    color: #303133;
-  }
-}
-
-.preview-html {
-  width: 345px !important;
-  height: 568px !important;
-  margin: 74px 0 0;
-  border-radius: 5px;
-  outline: none;
-  background-color: #fff;
-  border-width: 2px;
-  border-style: inset;
-  border-color: initial;
-  border-image: initial;
-  border-top-width: 0;
-  border-right-width: 0;
-  border-bottom-width: 0;
-  border-left-width: 0;
-}
-
-</style>
diff --git a/src/views/modules/service/popup/question-editor/setting/index.vue b/src/views/modules/service/popup/question-editor/setting/index.vue
deleted file mode 100644
index 80a7a2c..0000000
--- a/src/views/modules/service/popup/question-editor/setting/index.vue
+++ /dev/null
@@ -1,973 +0,0 @@
-<template>
-    <el-form ref="setting" :model="userProjectSettingData" :rules="settingRules">
-        <el-row align="top" class="project-setting-container" justify="center" type="flex">
-            <el-col :offset="3" :span="5" class="project-setting-view">
-                <p class="project-setting-title">
-                    提交设置
-                </p>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label">显示提示图片</p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch
-                            v-model="projectSetting.showPromptImg"
-                            @change="()=>{this.userProjectSettingData.submitPromptImg=''}"
-                        />
-                    </el-col>
-                </el-row>
-                <div v-if="projectSetting.showPromptImg">
-                    <div class="block">
-                        <el-image
-                            :src="userProjectSettingData.submitPromptImg"
-                            class="submit-prompt-img"
-                            fit="cover "
-                        >
-                            <div slot="error" class="image-slot">
-                                <i class="el-icon-picture-outline" />
-                            </div>
-                        </el-image>
-                    </div>
-                    <el-upload
-                        ref="logoUpload"
-                        :action="getUploadUrl"
-                        :headers="getUploadHeader"
-                        :on-success="uploadSubmitPromptHandle"
-                        :show-file-list="false"
-                        accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
-                    >
-                        <el-button slot="trigger" size="small" type="text">请上传提示图片 *</el-button>
-                    </el-upload>
-                </div>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label">显示提示文字</p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch
-                            v-model="projectSetting.showPromptText"
-                            @change="()=>{
-                                this.userProjectSettingData.submitPromptText=''
-                                this.saveUserProjectSetting()
-                            }"
-                        />
-                    </el-col>
-                </el-row>
-                <el-row v-if="projectSetting.showPromptText">
-                    <el-col :span="20" class="setting-input">
-                        <el-input v-model="userProjectSettingData.submitPromptText"
-                                  :maxlength="50"
-                                  :show-word-limit="true"
-                                  @change="saveUserProjectSetting"
-                        />
-                    </el-col>
-                </el-row>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label">跳转网页地址</p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch
-                            v-model="projectSetting.showSubmitJumpUrl"
-                            @change="()=>{
-                                this.userProjectSettingData.submitJumpUrl=''
-                                this.saveUserProjectSetting()
-                            }"
-                        />
-                    </el-col>
-                </el-row>
-                <el-row v-if="projectSetting.showSubmitJumpUrl">
-                    <el-col :span="20" class="setting-input">
-                        <el-input
-                            v-model="userProjectSettingData.submitJumpUrl"
-                            :maxlength="50"
-                            :show-word-limit="true"
-                            placeholder="https://demo.tduckapp.com"
-                            @change="saveUserProjectSetting"
-                        />
-                    </el-col>
-                </el-row>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label">公开反馈结果</p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch
-                            v-model="userProjectSettingData.publicResult"
-                            @change="()=>{
-                                this.saveUserProjectSetting()
-                            }"
-                        />
-                    </el-col>
-                </el-row>
-            </el-col>
-            <el-col :span="6" class="project-setting-view text-center">
-                <p class="project-setting-title">
-                    回收设置
-                </p>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label">只在微信中填写</p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch
-                            v-model="userProjectSettingData.wxWrite"
-                            @change="saveUserProjectSetting"
-                        />
-                    </el-col>
-                </el-row>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label">定时收集表单</p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch
-                            v-model="projectSetting.timingCollectForm"
-                            @change="()=>{
-                                this.projectSetting.timingQuantitativeForm=false
-                                this.clearFieldHandle(['timedCollectionBeginTime','timedCollectionEndTime'
-                                                       ,'timedNotEnabledPromptText','timedDeactivatePromptText'])
-                                this.saveUserProjectSetting()
-                            }"
-                        />
-                    </el-col>
-                </el-row>
-                <div v-if="projectSetting.timingCollectForm">
-                    <el-row align="middle" type="flex">
-                        <el-col :span="5">
-                            <p class="project-setting-sub-label">收集时间：</p>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-date-picker
-                                v-model="userProjectSettingData.timedCollectionBeginTime"
-                                align="center"
-                                class="collection-date-picker"
-                                placeholder="选择开始时间"
-                                style="width: 100%; border: none;"
-                                type="datetime"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                @change="saveUserProjectSetting"
-                            />
-                        </el-col>
-                        <el-col :span="1"><span>  至</span></el-col>
-                        <el-col :span="8">
-                            <el-date-picker
-                                v-model="userProjectSettingData.timedCollectionEndTime"
-                                align="center"
-                                class="collection-date-picker"
-                                placeholder="结束日期"
-                                style="width: 100%; border: none;"
-                                type="datetime"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                @change="saveUserProjectSetting"
-                            />
-                        </el-col>
-                    </el-row>
-                    <el-row align="middle" type="flex">
-                        <el-col :span="8">
-                            <p class="project-setting-sub-label">未启用提示语：</p>
-                        </el-col>
-                        <el-col :span="15">
-                            <el-input v-model="userProjectSettingData.timedNotEnabledPromptText" :maxlength="50"
-                                      :show-word-limit="true"
-                                      class="setting-input"
-                                      style="width: 80%;"
-                                      @change="saveUserProjectSetting"
-                            />
-                        </el-col>
-                    </el-row>
-                    <el-row align="middle" type="flex">
-                        <el-col :span="8">
-                            <p class="project-setting-sub-label">停用后提示语：</p>
-                        </el-col>
-                        <el-col :span="15">
-                            <el-input v-model="userProjectSettingData.timedDeactivatePromptText" :maxlength="50"
-                                      :show-word-limit="true"
-                                      class="setting-input"
-                                      style="width: 80%;"
-                                      @change="saveUserProjectSetting"
-                            />
-                        </el-col>
-                    </el-row>
-                </div>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label">定时定量表单</p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch
-                            v-model="projectSetting.timingQuantitativeForm"
-                            @change="()=>{
-                                this.projectSetting.timingCollectForm=false
-                                this.clearFieldHandle(['timedCollectionBeginTime','timedCollectionEndTime'
-                                                       ,'timedNotEnabledPromptText','timedDeactivatePromptText','timedQuantitativeQuantity','timedEndPromptText'])
-                                this.saveUserProjectSetting()
-                            }"
-                        />
-                    </el-col>
-                </el-row>
-                <div v-if="projectSetting.timingQuantitativeForm">
-                    <el-row align="middle" type="flex">
-                        <el-col :span="5">
-                            <p class="project-setting-sub-label">收集时间：</p>
-                        </el-col>
-                        <el-col :span="8">
-                            <el-date-picker
-                                v-model="userProjectSettingData.timedCollectionBeginTime"
-                                align="center"
-                                class="collection-date-picker"
-                                placeholder="选择开始时间"
-                                style="width: 100%; border: none;"
-                                type="datetime"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                @change="saveUserProjectSetting"
-                            />
-                        </el-col>
-                        <el-col :span="1"><span>  至</span></el-col>
-                        <el-col :span="8">
-                            <el-date-picker
-                                v-model="userProjectSettingData.timedCollectionEndTime"
-                                align="center"
-                                class="collection-date-picker"
-                                placeholder="结束日期"
-                                style="width: 100%; border: none;"
-                                type="datetime"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                                @change="saveUserProjectSetting"
-                            />
-                        </el-col>
-                    </el-row>
-                    <el-row align="middle" type="flex">
-                        <el-col :span="8">
-                            <p class="project-setting-sub-label">未启用提示语：</p>
-                        </el-col>
-                        <el-col :span="15">
-                            <el-input v-model="userProjectSettingData.timedNotEnabledPromptText" :maxlength="50"
-                                      :show-word-limit="true"
-                                      class="setting-input"
-                                      style="width: 80%;"
-                                      @change="saveUserProjectSetting"
-                            />
-                        </el-col>
-                    </el-row>
-                    <el-row align="middle" type="flex">
-                        <el-col :span="8">
-                            <p class="project-setting-sub-label">停用后提示语：</p>
-                        </el-col>
-                        <el-col :span="15">
-                            <el-input v-model="userProjectSettingData.timedDeactivatePromptText" :maxlength="50"
-                                      :show-word-limit="true"
-                                      class="setting-input"
-                                      style="width: 80%;"
-                                      @change="saveUserProjectSetting"
-                            />
-                        </el-col>
-                    </el-row>
-                    <el-row v-if="projectSetting.timingQuantitativeForm" align="middle" type="flex">
-                        <el-col :span="8">
-                            <p class="project-setting-sub-label">定量表单填写数量：</p>
-                        </el-col>
-                        <el-col :span="15">
-                            <el-input v-model="userProjectSettingData.timedQuantitativeQuantity" class="setting-input"
-                                      oninput="value=value.replace(/[^\d]/g,'')"
-                                      style="width: 80%;"
-                                      @change="saveUserProjectSetting"
-                            />
-                        </el-col>
-                    </el-row>
-                </div>
-                <div v-if="projectSetting.timingQuantitativeForm">
-                    <el-row align="middle" type="flex">
-                        <el-col :span="8">
-                            <p class="project-setting-sub-label">收集完成后提示：</p>
-                        </el-col>
-                        <el-col :span="15">
-                            <el-input v-model="userProjectSettingData.timedEndPromptText" :maxlength="50"
-                                      :show-word-limit="true"
-                                      class="setting-input"
-                                      style="width: 80%;"
-                                      @change="saveUserProjectSetting"
-                            />
-                        </el-col>
-                    </el-row>
-                </div>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label ">
-                            每个微信仅填写一次
-                        </p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch
-                            v-model="userProjectSettingData.wxWriteOnce"
-                            @change="()=>{
-                                this.userProjectSettingData.recordWxUser=true
-                                this.userProjectSettingData.wxWrite=true
-                                this.saveUserProjectSetting()
-                            }"
-                        />
-                    </el-col>
-                </el-row>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label ">
-                            每人限制填写1次
-                            <el-tooltip class="item" content="根据IP地址限制填写" effect="dark" placement="top-start">
-                                <i class="el-icon-warning" />
-                            </el-tooltip>
-                        </p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch
-                            v-model="userProjectSettingData.everyoneWriteOnce"
-                            @change="saveUserProjectSetting"
-                        />
-                    </el-col>
-                </el-row>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label">每人每天限制填写1次</p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch
-                            v-model="userProjectSettingData.everyoneDayWriteOnce"
-                            @change="saveUserProjectSetting"
-                        />
-                    </el-col>
-                </el-row>
-                <el-row v-if="userProjectSettingData.everyoneDayWriteOnce||userProjectSettingData.everyoneWriteOnce"
-                        align="middle"
-                        type="flex"
-                >
-                    <el-col :span="8">
-                        <p class="project-setting-sub-label">重复填写后提示：</p>
-                    </el-col>
-                    <el-col :span="15">
-                        <el-input v-model="userProjectSettingData.writeOncePromptText" :maxlength="50"
-                                  :show-word-limit="true"
-                                  class="setting-input"
-                                  style="width: 80%;"
-                                  @change="saveUserProjectSetting"
-                        />
-                    </el-col>
-                </el-row>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label">新反馈提醒我</p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch v-model="projectSetting.newFeedbackRemind" />
-                    </el-col>
-                </el-row>
-                <div v-if="projectSetting.newFeedbackRemind">
-                    <el-row align="middle" type="flex">
-                        <el-col :span="5">
-                            <p class="project-setting-sub-label">发邮件提醒我</p>
-                        </el-col>
-                        <el-col :span="3">
-                            <el-checkbox
-                                v-model="projectSetting.newFeedbackRemindEmail"
-                                @change="()=>{
-                                    this.clearFieldHandle(['newWriteNotifyEmail'])
-                                    this.saveUserProjectSetting()
-                                }"
-                            />
-                        </el-col>
-                    </el-row>
-                    <el-row v-if="projectSetting.newFeedbackRemindEmail" align="middle" type="flex">
-                        <el-col :offset="3" :span="5">
-                            <p class="project-setting-sub-label">请填写邮箱：</p>
-                        </el-col>
-                        <el-col :span="12">
-                            <el-form-item prop="newWriteNotifyEmail">
-                                <el-input v-model="userProjectSettingData.newWriteNotifyEmail" class="setting-input"
-                                          placeholder="多个邮箱用 ; 隔开"
-                                          style="width: 80%;"
-                                          @change="saveUserProjectSetting"
-                                />
-                            </el-form-item>
-                        </el-col>
-                    </el-row>
-                    <el-row align="middle" type="flex">
-                        <el-col :span="5">
-                            <p class="project-setting-sub-label">发微信提醒我</p>
-                        </el-col>
-                        <el-col :span="3">
-                            <el-checkbox
-                                v-model="projectSetting.newFeedbackRemindWx"
-                                @change="()=>{
-                                    this.clearFieldHandle(['newWriteNotifyWx'])
-                                    this.saveUserProjectSetting()
-                                }"
-                            />
-                        </el-col>
-                        <el-col :span="10">
-                            <p class="project-setting-sub-label">
-                                需要关注公众号
-                                <el-link type="primary" @click="openSubNotifyWxDialogHandle">TDUCK</el-link>
-                            </p>
-                        </el-col>
-                    </el-row>
-                    <el-row v-if="userProjectSettingData.newWriteNotifyWx" align="middle" type="flex">
-                        <el-col :offset="3" :span="5">
-                            <p class="project-setting-sub-label">提醒人：</p>
-                        </el-col>
-                        <el-col :span="12">
-                            <span v-for="(user,i) in subNotifyWxUserList" :key="i" class="sub-user-view">
-                                <i class="el-icon-close sub-user-delete" @click="deleteSubNotifyUserHandle(i)" />
-                                <el-avatar :src="user.headImgUrl" />
-                            </span>
-                        </el-col>
-                    </el-row>
-                </div>
-                <el-dialog :visible.sync="dialogSubNotifyVisible"
-                           title="微信扫描二维码订阅"
-                           width="400px"
-                >
-                    <el-image
-                        :src="subNotifyWxQrCode"
-                        fit="fill"
-                        style="width: 150px; height: 150px;"
-                    />
-                </el-dialog>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label">记录微信用户个人信息</p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch
-                            v-model="userProjectSettingData.recordWxUser"
-                            @change="()=>{
-                                this.userProjectSettingData.wxWrite=true
-                                this.saveUserProjectSetting()
-                            }"
-                        />
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <p class="project-setting-sub-label">
-                        * 开启后将会授权登录，提供微信昵称、性别、城市信息
-                    </p>
-                </el-row>
-            </el-col>
-            <el-col :span="6" class="project-setting-view">
-                <p class="project-setting-title">
-                    分享设置
-                </p>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label">自定义分享图标</p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch
-                            v-model="projectSetting.customizeShareIcon"
-                            @change="clearFieldHandle(['userProjectSettingData.shareImg'])"
-                        />
-                    </el-col>
-                </el-row>
-                <el-row v-if="projectSetting.customizeShareIcon" align="middle" type="flex">
-                    <el-col :span="10">
-                        <p class="project-setting-label">
-                            请上传分享图片 *
-                            建议尺寸500px*500px
-                        </p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-upload
-                            ref="logoUpload"
-                            :action="getUploadUrl"
-                            :headers="getUploadHeader"
-                            :on-success="uploadShareImgHandle"
-                            :show-file-list="false"
-                            accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP"
-                        >
-                            <div class="block">
-                                <el-image
-                                    :src="userProjectSettingData.shareImg"
-                                    class="share-img"
-                                    fit="cover "
-                                >
-                                    <div slot="error" class="image-slot">
-                                        <i class="el-icon-picture-outline" />
-                                    </div>
-                                </el-image>
-                            </div>
-                        </el-upload>
-                    </el-col>
-                </el-row>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label">自定义分享标题</p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch
-                            v-model="projectSetting.customizeShareTitle"
-                            @change="clearFieldHandle(['userProjectSettingData.shareTitle'])"
-                        />
-                    </el-col>
-                </el-row>
-                <el-row v-if="projectSetting.customizeShareTitle" align="middle"
-                        type="flex"
-                >
-                    <el-col :span="8">
-                        <p class="project-setting-sub-label">请输入标题：</p>
-                    </el-col>
-                    <el-col :span="15">
-                        <el-input
-                            v-model="userProjectSettingData.shareTitle"
-                            :maxlength="50"
-                            :show-word-limit="true"
-                            class="setting-input" style="width: 80%;" @change="saveUserProjectSetting"
-                        />
-                    </el-col>
-                </el-row>
-                <el-row align="middle" type="flex">
-                    <el-col :span="12">
-                        <p class="project-setting-label">自定义分享描述</p>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-switch v-model="projectSetting.customizeShareDesc" />
-                    </el-col>
-                </el-row>
-                <el-row v-if="projectSetting.customizeShareDesc" align="middle"
-                        type="flex"
-                >
-                    <el-col :span="8">
-                        <p class="project-setting-sub-label">请输入描述：</p>
-                    </el-col>
-                    <el-col :span="15">
-                        <el-input
-                            v-model="userProjectSettingData.shareDesc"
-                            :maxlength="50"
-                            :show-word-limit="true"
-                            class="setting-input" style="width: 80%;" @change="saveUserProjectSetting"
-                        />
-                    </el-col>
-                </el-row>
-                <div
-                    v-if="userProjectSettingData.shareDesc||userProjectSettingData.shareTitle||userProjectSettingData.shareImg"
-                >
-                    <p>通知卡片预览</p>
-                    <div class="share-preview">
-                        <div style="flex: 1" />
-                        <div class="share-preview-msg">
-                            <div class="share-preview-msg-box">
-                                <p class="share-preview-msg-title">
-                                    {{ userProjectSettingData.shareTitle }}
-                                </p>
-                                <div class="share-preview-info">
-                                    <p class="share-preview-msg-desc">
-                                        {{ userProjectSettingData.shareDesc }}
-                                    </p>
-                                    <div class="share-preview-img-box">
-                                        <img v-if="userProjectSettingData.shareImg" :src="userProjectSettingData.shareImg" class="share-preview-img">
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="share-preview-msg-angle" />
-                        </div>
-                        <div class="share-preview-avatar">
-                            <img :src="getUserInfo.avatar" class="share-user-avatar">
-                        </div>
-                    </div>
-                </div>
-            </el-col>
-        </el-row>
-    </el-form>
-</template>
-
-<script>
-
-export default {
-    name: 'ProjectSetting',
-    data() {
-        return {
-            projectKey: null,
-            settingRules: {
-                newWriteNotifyEmail: [
-                    {
-                        trigger: 'blur',
-                        pattern: /^\w+((.\w+)|(-\w+))@[A-Za-z0-9]+((.|-)[A-Za-z0-9]+).[A-Za-z0-9]+$/,
-                        message: '请输入正确发送的邮箱'
-                    }
-                ]
-            },
-            projectSetting: {
-                showPromptImg: false,
-                showPromptText: true,
-                showSubmitJumpUrl: false,
-                timingCollectForm: false,
-                timingQuantitativeForm: false,
-                newFeedbackRemind: false,
-                newFeedbackRemindEmail: false,
-                newFeedbackRemindWx: false,
-                customizeShareIcon: false,
-                customizeShareTitle: false,
-                customizeShareDesc: false
-            },
-            userProjectSettingData: {
-                submitPromptImg: '',
-                wxWriteOnce: false,
-                submitPromptText: '提交成功 !',
-                submitJumpUrl: '',
-                wxWrite: false,
-                publicResult: false,
-                timedNotEnabledPromptText: '填写尚未启用',
-                timedDeactivatePromptText: '填写尚已经停用',
-                timedQuantitativeQuantity: null,
-                timedEndPromptText: '',
-                everyoneWriteOnce: false,
-                everyoneDayWriteOnce: false,
-                timedCollectionBeginTime: '',
-                timedCollectionEndTime: '',
-                writeOncePromptText: '',
-                newWriteNotifyEmail: '',
-                newWriteNotifyWx: '',
-                recordWxUser: false,
-                shareImg: '',
-                shareTitle: '',
-                shareDesc: ''
-            },
-            dialogSubNotifyVisible: false,
-            subNotifyWxQrCode: '',
-            subNotifyWxUserList: [],
-            subNotifyUserTimer: null
-        }
-    },
-    computed: {
-        getUploadHeader() {
-            return {
-                'token': this.$store.getters['user/isLogin']
-            }
-        },
-        getUploadUrl() {
-            return `${process.env.VUE_APP_API_ROOT}/user/file/upload`
-        },
-        getUserInfo() {
-            return JSON.parse(this.$store.getters['user/userInfo'])
-        }
-    },
-    mounted() {
-        this.projectKey = this.$route.query.key
-        this.queryUserProjectSetting()
-        this.getSubNotifyWxQrCode()
-    },
-    destroyed() {
-        clearInterval(this.subNotifyUserTimer)
-    },
-    methods: {
-        uploadSubmitPromptHandle(response) {
-            this.userProjectSettingData.submitPromptImg = response.data
-            this.saveUserProjectSetting()
-        },
-        uploadShareImgHandle(response) {
-            this.userProjectSettingData.shareImg = response.data
-            this.saveUserProjectSetting()
-        },
-        queryUserProjectSetting() {
-            this.userProjectSettingData.projectKey = this.projectKey
-            this.$api.get(`/user/project/setting/${this.projectKey}`).then(res => {
-                if (res.data) {
-                    this.userProjectSettingData = res.data
-                    let {
-                        submitPromptImg, submitPromptText, submitJumpUrl, timedCollectionBeginTime,
-                        timedQuantitativeQuantity, newWriteNotifyEmail, newWriteNotifyWx,
-                        shareImg, shareTitle, shareDesc
-                    } = res.data
-                    if (newWriteNotifyWx) {
-                        this.querySubNotifyWxUser(newWriteNotifyWx)
-                    }
-                    this.projectSetting = {
-                        showPromptImg: !!submitPromptImg,
-                        showPromptText: !!submitPromptText,
-                        showSubmitJumpUrl: !!submitJumpUrl,
-                        timingCollectForm: !!timedCollectionBeginTime && !!timedQuantitativeQuantity,
-                        timingCollectTimeRange: !!timedQuantitativeQuantity,
-                        newFeedbackRemind: !!newWriteNotifyEmail || !!newWriteNotifyWx,
-                        newFeedbackRemindEmail: !!newWriteNotifyEmail,
-                        newFeedbackRemindWx: !!newWriteNotifyWx,
-                        customizeShareIcon: !!shareImg,
-                        customizeShareTitle: !!shareTitle,
-                        customizeShareDesc: !!shareDesc
-                    }
-                }
-            })
-        },
-        saveUserProjectSetting() {
-            this.userProjectSettingData.projectKey = this.projectKey
-            this.$api.post('/user/project/setting/save', this.userProjectSettingData).then(() => {
-
-            })
-        },
-        openSubNotifyWxDialogHandle() {
-            this.dialogSubNotifyVisible = true
-            this.projectSetting.newFeedbackRemindWx = true
-            this.subNotifyUserTimer = setInterval(() => {
-                this.querySubNotifyWxUser()
-            }, 5 * 1000)
-        },
-        querySubNotifyWxUser(openIdStr) {
-            this.$api.get('/user/project/wx/notify-user', {
-                params: {
-                    key: this.projectKey,
-                    openIdStr: openIdStr
-                }
-            }).then(res => {
-                this.subNotifyWxUserList = res.data
-                if (this.subNotifyWxUserList) {
-                    let changeNewWriteNotifyWx = this.subNotifyWxUserList.map(item => item.openId).join(';')
-                    if (!openIdStr && changeNewWriteNotifyWx != this.userProjectSettingData.newWriteNotifyWx) {
-                        this.userProjectSettingData.newWriteNotifyWx = changeNewWriteNotifyWx
-                        this.saveUserProjectSetting()
-                    }
-                }
-            })
-        },
-        getSubNotifyWxQrCode() {
-            this.$api.get('user/project/wx/notify-qrcode', {params: {key: this.projectKey}}).then(res => {
-                this.subNotifyWxQrCode = res.data
-            })
-        },
-        deleteSubNotifyUserHandle(i) {
-            if (this.subNotifyWxUserList) {
-                let openId = this.subNotifyWxUserList[i].openId
-                let key = this.projectKey
-                this.$api.post(`/user/project/wx/delete/notify-user?key=${key}&openId=${openId}`).then(() => {
-                    this.subNotifyWxUserList.splice(i)
-                    this.userProjectSettingData.newWriteNotifyWx = this.subNotifyWxUserList.map(item => item.openId).join(';')
-                    this.saveUserProjectSetting()
-                })
-            }
-        },
-        clearFieldHandle(fields) {
-            fields.forEach(field => {
-                this.$set(this.userProjectSettingData, field, '')
-            })
-        }
-    }
-}
-</script>
-
-<style scoped>
-.project-setting-container {
-  width: 100%;
-  height: 100%;
-  min-height: 85vh;
-  padding-top: 30px;
-  margin: 0;
-  background-color: #f7f7f7;
-}
-
-.project-setting-view {
-  height: 100%;
-  line-height: 20px;
-  border-radius: 7px;
-  color: rgba(16, 16, 16, 100);
-  font-size: 14px;
-  text-align: center;
-  border: 1px solid rgba(255, 255, 255, 100);
-  background-color: white;
-  margin-right: 10px;
-  padding: 10px;
-}
-
-.project-setting-title {
-  color: rgba(16, 16, 16, 100);
-  font-size: 18px;
-  text-align: left;
-  font-weight: 550;
-  margin-left: 20px;
-}
-
-.project-setting-label {
-  color: rgba(16, 16, 16, 100);
-  font-size: 14px;
-  text-align: left;
-  line-height: 20px;
-}
-
-.project-setting-sub-label {
-  color: rgba(144, 147, 149, 100);
-  font-size: 14px;
-  text-align: left;
-  margin-left: 2px;
-  line-height: 20px;
-}
-
-.submit-prompt-img {
-  width: 80%;
-  height: 117px;
-  background-color: #f7f7f7;
-  display: flex;
-  align-items: center;
-  justify-items: center;
-  justify-content: center;
-}
-
-.sub-user-view {
-  position: relative;
-  width: 60px;
-  cursor: pointer;
-}
-
-.sub-user-view:hover .sub-user-delete {
-  display: block;
-}
-
-.sub-user-delete {
-  position: absolute;
-  right: -6px;
-  background-color: red;
-  color: white;
-  border-radius: 50px;
-  padding: 2px;
-  font-size: 12px;
-  height: 16px;
-  width: 16px;
-  font-weight: 500;
-  line-height: 18px;
-  display: none;
-}
-
-.share-img {
-  width: 123px;
-  height: 117px;
-  background-color: #f7f7f7;
-  display: flex;
-  align-items: center;
-  justify-items: center;
-  justify-content: center;
-}
-
-.share-preview {
-  height: 162px;
-  margin: 0 auto;
-  border-radius: 5px;
-  background-color: #0001;
-  border: 1px solid rgba(255, 255, 255, 100);
-  display: flex;
-  align-content: center;
-  align-items: center;
-  justify-content: space-around;
-}
-
-.share-preview-msg {
-  width: 210px;
-  margin-right: 25px;
-  border-radius: 5px;
-  background-color: white;
-  color: rgba(16, 16, 16, 100);
-  box-shadow: 0 0 3px 0 rgba(157, 158, 162, 100);
-  padding: 7px 10px 10px;
-  display: flex;
-  align-items: center;
-  justify-items: center;
-  justify-content: center;
-  position: relative;
-  z-index: 1;
-}
-
-.share-preview-msg-box {
-  width: 100%;
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-}
-
-.share-preview-msg::after,.share-preview-msg-angle {
-  content: '';
-  border: 8px solid transparent;
-  border-style: solid;
-  border-left-color: rgba(157, 158, 162, 0.397);
-  position: absolute;
-  right: -15px;
-  top: 16px;
-  width: 0;
-  z-index: -1;
-}
-
-.share-preview-msg-angle {
-  border: 7px solid transparent;
-  border-left-color: #ffffff;
-  right: -13px;
-  top: 17px;
-  z-index: 1;
-}
-
-.share-preview-msg-title {
-  line-height: 22px;
-  margin: 0;
-  color: rgba(16, 16, 16, 100);
-  font-size: 14px;
-  text-align: left;
-
-  overflow : hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  -webkit-box-orient: vertical;
-}
-
-.share-preview-info {
-  flex: 1;
-  display: flex;
-  margin-top: 5px;
-}
-
-.share-preview-msg-desc {
-  flex: 1;
-  height: 100%;
-  margin: 0;
-  color: rgba(144, 147, 153, 100);
-  font-size: 12px;
-  line-height: 20px;
-  text-align: left;
-
-  overflow : hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-line-clamp: 3;
-  -webkit-box-orient: vertical;
-}
-
-.share-preview-img-box {
-  display: flex;
-  align-items: flex-end;
-  margin-left: 5px;
-}
-.share-preview-img {
-  width: 49px;
-  height: 46px;
-}
-
-.share-preview-avatar {
-  margin-right: 30px;
-  margin-top: -35px;
-}
-
-.share-user-avatar {
-  width: 49px;
-  height: 49px;
-  border-radius: 6px;
-}
-
-::v-deep .setting-input input {
-  border: none;
-  border-bottom: 1px solid rgba(187, 187, 187, 100);
-  border-radius: 0;
-  line-height: 20px;
-  height: 20px;
-}
-
-::v-deep .collection-date-picker input {
-  border: none;
-  border-bottom: 1px solid rgba(187, 187, 187, 100);
-  border-radius: 0;
-}
-
-::v-deep .el-form-item--mini.el-form-item,
-.el-form-item--small.el-form-item {
-  margin: 0;
-}
-</style>
diff --git a/src/views/modules/service/popup/select-subject-popup.vue b/src/views/modules/service/popup/select-subject-popup.vue
deleted file mode 100644
index 1540a5c..0000000
--- a/src/views/modules/service/popup/select-subject-popup.vue
+++ /dev/null
@@ -1,133 +0,0 @@
-<script>
-export default {
-  data() {
-    return {
-      visible: false,
-      list: [],
-      pageList:[],
-      cancelList: {},
-      pageData: {
-        page: 1,
-        limit: 10,
-        total: 10,
-      },
-    };
-  },
-  watch:{
-    "pageData.page":{
-        handler(){
-            this.pageList = this.list.slice((this.pageData.page-1)*10,this.pageData.page*10)
-        }
-    }
-  },
-  props: ["chooseObj"],
-  methods: {
-    init() {
-      this.visible = true;
-      this.list = Object.keys(this.chooseObj).map((key) => {
-        return this.chooseObj[key];
-      });
-      this.pageList = this.list.slice(0,10)
-    },
-    isChoose(key) {
-      return (
-        this.chooseObj[key] !== undefined &&
-        this.chooseObj[key].isChoose !== false
-      );
-    },
-    chooseChange(val, item) {
-      this.$set(this.cancelList, item.id, null);
-    },
-    saveChange() {
-      console.log(this.cancelList);
-      Object.keys(this.cancelList).forEach((key) => {
-        this.$emit("checkChange", false, key);
-      });
-      this.list = Object.keys(this.chooseObj).map((key) => {
-        return this.chooseObj[key];
-      });
-      this.pageData.page = 1;
-      this.pageList = this.list.slice((this.pageData.page-1)*10,this.pageData.page*10)
-      this.cancelList = {};
-    },
-    cancelDefaultDialog() {
-      this.visible = false;
-    },
-    currentChange(page){
-        this.pageData.page = page;
-    }
-  },
-};
-</script>
-
-<template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="`已选题目(${list ? list.length : 0})`"
-    append-to-body
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-  >
-    <div class="main" style="position: relative">
-      <div class="subjectContainer">
-        <div
-          class="subjectItem"
-          v-for="(item, itemIndex) in pageList"
-          :key="item.id"
-        >
-          <el-checkbox
-            style="display: flex; align-items: center"
-            @change="(val) => chooseChange(val, item)"
-            :checked="isChoose(item.id)"
-          ></el-checkbox>
-          <div class="subjectContext">
-            <div class="subjectTitle">{{ item.label }}</div>
-            <el-checkbox
-              v-for="(option, index) in item.expand.options"
-              :key="index"
-              :checked="option.isAnswer == true"
-              disabled
-              >{{ option.label }}</el-checkbox
-            >
-          </div>
-        </div>
-      </div>
-      <el-pagination
-        layout="total,prev, pager, next"
-        :hide-on-single-page="false"
-        :current-page="pageData.page"
-        @current-change="currentChange"
-        :total="list.length"
-      >
-      </el-pagination>
-    </div>
-    <div class="d-flex j-sb a-center subjectFooter" slot="footer">
-      <el-button type="primary" @click="saveChange">保存</el-button>
-      <el-button @click="cancelDefaultDialog">关闭</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<style scoped lang='scss'>
-.subjectContainer {
-  max-height: 40vh;
-  overflow: auto;
-  .subjectItem {
-    width: 100%;
-    display: flex;
-    margin-bottom: 20px;
-
-    .subjectContext {
-      border: 1px solid rgba(192, 214, 243, 0.232);
-      border-radius: 5px;
-      background-color: rgba(192, 214, 243, 0.232);
-      width: 100%;
-      padding: 20px 30px;
-      margin-left: 10px;
-      .subjectTitle {
-        margin-bottom: 15px;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/service/popup/submit-subject-popup.vue b/src/views/modules/service/popup/submit-subject-popup.vue
deleted file mode 100644
index cc05718..0000000
--- a/src/views/modules/service/popup/submit-subject-popup.vue
+++ /dev/null
@@ -1,87 +0,0 @@
-<script>
-import debounce from "lodash/debounce";
-export default {
-  data() {
-    return {
-      visible: false,
-      formData: {
-        subjectTitle: "",
-        subjectContent: "",
-      },
-    };
-  },
-  computed: {
-    rules() {
-      return {
-        subjectTitle: [{ required: true, message: "请输入练习名称" }],
-        subjectContent: [{ required: true, message: "请输入练习介绍" }],
-      };
-    },
-  },
-  methods: {
-    init() {
-      this.visible = true;
-      this.$refs.ruleForm&&this.$refs.ruleForm.resetFields();
-    },
-    cancelDefaultDialog() {
-      this.visible = false;
-    },
-    dataFormSubmitHandle: debounce(function () {
-      this.$refs["ruleForm"].validate(async (valid) => {
-        if (valid) {
-          const { subjectTitle, subjectContent } = this.formData;
-          await this.$emit("publicSubject", subjectTitle, subjectContent);
-          this.visible = false;
-          this.$refs["ruleForm"].resetFields();
-        }
-      });
-    }, 500),
-  },
-};
-</script>
-
-<template>
-  <el-dialog
-    :visible.sync="visible"
-    title="发布练习"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    append-to-body
-    @close="cancelDefaultDialog"
-  >
-    <el-form
-      :model="formData"
-      :rules="rules"
-      ref="ruleForm"
-      class="createClassPopup"
-    >
-      <el-form-item label="练习名称：" prop="subjectTitle">
-        <el-input
-          v-model="formData.subjectTitle"
-          autocomplete="off"
-          style="width: 350px"
-          placeholder="请填写练习名称"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="练习介绍：" prop="subjectContent">
-        <el-input
-          v-model="formData.subjectContent"
-          type="textarea"
-          autocomplete="off"
-          style="width: 350px"
-          :autosize="{ minRows: 8 }"
-          placeholder="请填练习介绍"
-          maxlength="800"
-          show-word-limit
-        ></el-input>
-      </el-form-item>
-    </el-form>
-    <template slot="footer">
-      <el-button @click="cancelDefaultDialog">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle">发布</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style scoped lang='scss'>
-</style>
\ No newline at end of file
diff --git a/src/views/modules/service/popup/swiper-image-see.vue b/src/views/modules/service/popup/swiper-image-see.vue
deleted file mode 100644
index 65105f7..0000000
--- a/src/views/modules/service/popup/swiper-image-see.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-<template >
-  <Modal
-    ref="modalRef"
-    :modalConfig="modalConfig"
-    :modalForm="modalForm"
-    :modalData="modalData"
-  >
-    <div slot="dialog__before" class="examine ">
-        <div class="mb-2">
-            审核状态：<span :style="examineStatusStyle" >{{examineStatus}}</span>
-        </div>
-        <div class="mb-2">审核人员：{{modalData.examineName}}</div>
-        <div class="mb-2">审核原因：{{modalData.examineReason}}</div>
-    </div>
-  </Modal>
-</template>
-<script>
-import Modal from "@/components/common/modal/modal.vue";
-export default {
-  components: {
-    Modal,
-  },
-  props:{
-    //咨询分类
-    contentTypeData:{
-        type:Array,
-        default:()=>[]
-    }
-  },
-  computed:{
-    examineStatus(){
-        switch (this.modalData.examineStatus){
-            case 0:
-                return '未审核';
-            case 1:
-                return '审核通过';
-            case 2:
-                return '审核未通过'
-        }
-    },
-    examineStatusStyle(){
-        switch (this.modalData.examineStatus){
-            case 0:
-                return 'color:gray';
-            case 1:
-                return 'color:green';
-            case 2:
-                return 'color:red'
-        }
-    }
-  },
-  data() {
-    return {
-      modalConfig: {
-        title: "查看", //弹窗标题,值为:新增，查看，编辑
-        show: false, //弹框显示
-        formEditDisabled: false, //编辑弹窗是否可编辑
-        width: "80vw", //弹出框宽度
-        modalRef: "modalRef", //modal标识
-        type: "1", //类型 1新增 2编辑 3保存
-        fullscreen:true
-      },
-      //modal配置 end
-      //modal表单 start
-      modalForm: [
-        {
-          type: "Input",
-          label: "标题",
-          prop: "title",
-        //   rules: { required: true, maxLength: 100 },
-          width: "900px",
-          disabled: () => true,
-        },
-
-        {
-          type: "Input",
-          label: "副标题",
-          prop: "subtitle",
-        //   rules: { maxLength: 100 },
-          width: "900px",
-          disabled: () => true,
-        },
-        {
-          type: "Cascader",
-          label: "资讯分类",
-          prop: "mainTypeId", //实际传参时进行了处理
-          data: [],
-        //   rules: { required: true },
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Input",
-          label: "资讯来源",
-          prop: "source",
-        //   rules: { required: true, maxLength: 100 },
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Input",
-          label: "作者",
-          prop: "author",
-        //   rules: { maxLength: 100 },
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Input",
-          label: "编辑者",
-          prop: "editorName",
-        //   rules: { maxLength: 100 },
-          width: "300px",
-          disabled: () => true,
-        },
-        // {
-        //   type: "Input",
-        //   label: "外链",
-        //   prop: "contentLink",
-        //   rules: { maxLength: 100 },
-        //   width: "300px",
-        // },
-        {
-          type: "Input",
-          label: "关键词",
-          prop: "keywords",
-        //   rules: { maxLength: 100 },
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Radio",
-          prop: "isVideo",
-          label: "内容类型",
-          radios: [
-            { label: "资讯", value: "0" },
-            { label: "视频", value: "1" },
-          ],
-          width: "300px",
-          disabled: () => true,
-        },
-        {
-          type: "Img",
-          label: "封面",
-          prop: "imageUrl",
-          width: "300px",
-        },
-        {
-          type: "ShowTinymce",
-          label: "资讯内容",
-          prop: "content",
-        //   rules: { required: true },
-          width: "900px",
-        },
-      ],
-      videoModalForm: [
-        {
-          type: "Video",
-          label: "视频",
-          prop: "videoUrl",
-          width: "900px",
-        },
-      ], //视频专属内容
-      modalData: {},
-    };
-  },
-  methods: {
-    show(row) {
-      if (row.secondTypeId && typeof row.mainTypeId === "string") {
-        row.mainTypeId = [row.mainTypeId, row.secondTypeId];
-      }
-      row.isVideo = row.isVideo + "";
-      let haveVideo=this.modalForm.filter(item=>item.label=='视频').length
-        if(row.isVideo=='1'&&!haveVideo){
-            this.modalForm.splice(8,0,...this.videoModalForm)
-        }
-        else if(row.isVideo=='0'&&haveVideo){
-             this.modalForm.splice(8,1)
-        }
-        console.log(this.modalForm)
-      this.modalData = JSON.parse(JSON.stringify(row));
-      this.modalConfig.show = true;
-    },
-  },
-};
-</script>
-<style  scoped>
-.examine{
-    box-shadow: 0px 0px 5px rgb(240,240,240);
-    margin:10px 20px  20px 20px ;
-    padding:10px
-}
-.mb-2{
-    margin-bottom:10px
-}
->>> .el-input.is-disabled .el-input__inner {
-  background-color: #fff;
-  color: rgb(100, 100, 100);
-  cursor: default;
-}
-
->>> .el-cascader .el-input .el-icon-arrow-down::before {
-  content: "";
-  /* cursor:default; */
-}
->>> .el-input.is-disabled .el-input__icon {
-  cursor: default;
-}
-
->>> .el-form{
-    margin: 20px;
-    box-shadow: 0px 0px 5px rgb(240,240,240);
-    padding-top:20px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/service/popup/text-content-popup.vue b/src/views/modules/service/popup/text-content-popup.vue
deleted file mode 100644
index fceca3e..0000000
--- a/src/views/modules/service/popup/text-content-popup.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<!--
- * @Author: chenkangxu
- * @Date: 2022-09-26 18:22:23
- * @LastEditTime: 2022-09-26 18:23:20
- * @LastEditors: chenkangxu
- * @Description: 课文详情弹窗
- * @Github: 
--->
-<template>
-  <el-dialog
-    :visible.sync="visible"
-    :title="innerData.title"
-    :close-on-click-modal="false"
-    :close-on-press-escape="true"
-    fullscreen
-    :modal="false"
-    @close="cancelDefaultDialog"
-  >
-    <div class="d-flex j-center content">
-        <div class="container" :style="{'--font-size-rate':fontSizeRate+'px'}" ref="container" v-html="innerData.content"></div>
-    </div>
-    <!-- 底部操作 字体大小调整 -->
-    <div slot="footer">
-      <el-button @click="minusFontSize">减小字体</el-button>
-      <el-button @click="addFontSize">增大字体</el-button>
-    </div>
-  </el-dialog>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      visible: false,
-      innerData: {
-        talkTitle: "",
-        talkContent: "",
-      },
-      //字体大小
-      fontSizeRate:24
-    };
-  },
-  computed: {
-  },
-  methods: {
-    init(data) {
-      console.log(this)
-      this.visible = true;
-      this.innerData=data;
-      console.log("innerData",this.innerData);
-    },
-    cancelDefaultDialog() {
-      this.visible = false;
-    },
-    // 增加字体大小
-    addFontSize(){
-      this.fontSizeRate+=2;
-    },
-    //减少字体大小
-    minusFontSize(){
-      this.fontSizeRate-=2;
-    }
-  }
-};
-</script>
-
-<style scoped lang='scss'>
-.content{
-  height: calc(100vh - 54px - 30px - 30px - 70px);
-  overflow-y: scroll;
-}
-.container{
-  width: 1000px;
-}
-.container ::v-deep{
-  p{
-    font-size:var(--font-size-rate);
-    line-height:calc(var(--font-size-rate) * 1.5);
-  }
-  img{
-    width: 40%;
-    height: 100%;
-    display: block;
-    margin:0 auto;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/service/popup/video-popup.vue b/src/views/modules/service/popup/video-popup.vue
deleted file mode 100644
index f803a2b..0000000
--- a/src/views/modules/service/popup/video-popup.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--
- * @Author: chenkangxu
- * @Date: 2022-09-26 18:22:23
- * @LastEditTime: 2022-09-26 18:23:20
- * @LastEditors: chenkangxu
- * @Description: 视频详情弹窗
- * @Github: 
--->
-<template>
-  <el-dialog
-    class="video_popup"
-    v-if="visible"
-    :visible.sync="visible"
-    :title="innerData.title"
-    :close-on-click-modal="false"
-    :close-on-press-escape="true"
-    fullscreen
-    :modal="false"
-    @close="cancelDefaultDialog"
-  >
-    <div class="video-js-container d-flex j-center a-center">
-      <video ref="videoPlayer" class="video-js"></video>
-    </div>
-  </el-dialog>
-</template>
-<script>
-import videojs from "video.js";
-export default {
-  data() {
-    return {
-      player: null,
-      visible: false,
-      innerData: {
-        talkTitle: "",
-        talkContent: ""
-      }
-    };
-  },
-  computed: {
-    options() {
-      return {
-        autoplay: true,
-        controls: true,
-        fullscreen: true,
-        sources: [
-          {
-            src: this.innerData.videoUrl
-          }
-        ]
-      };
-    }
-  },
-  methods: {
-    init(data) {
-      this.visible = true;
-      this.innerData = data;
-      console.log("innerData", this.innerData);
-    },
-    cancelDefaultDialog() {
-      this.visible = false;
-    }
-  },
-  watch: {
-    visible(newVal) {
-      if (newVal == true) {
-        this.$nextTick(() => {
-          this.player = videojs(this.$refs.videoPlayer, this.options, () => {
-            this.player.log("onPlayerReady", this);
-          });
-        });
-      } else {
-        if (this.player) {
-          this.player.dispose();
-        }
-      }
-    }
-  }
-};
-</script>
-
-<style scoped lang='scss'>
-.video-js-container {
-  width: 100%;
-  height: calc(100vh - 54px);
-  .video-js {
-    width: 80%;
-    height: 80%;
-  }
-}
-
-.video_popup {
-  &::v-deep {
-    .el-dialog__body {
-      padding: 0;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/service/question-bank-main.vue b/src/views/modules/service/question-bank-main.vue
deleted file mode 100644
index 07a8582..0000000
--- a/src/views/modules/service/question-bank-main.vue
+++ /dev/null
@@ -1,450 +0,0 @@
-<!--
- * @Author: chenkangxu
- * @Date: 2022-03-17 14:05:51
- * @LastEditTime: 2022-09-05 18:57:10
- * @LastEditors: chenkangxu
- * @Description: 
- * @Github: 
--->
-<template>
-  <div class="_tablepage">
-    <!-- <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-      labelWidth="120px"
-    >
-    </searchForm> -->
-    <cusTable
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable>
-    <el-dialog
-      :visible.sync="editorDialogVisible"
-      fullscreen
-      @close="closeDialog"
-      class="content-dialog"
-    >
-      <contentEditor
-        v-if="editorDialogVisible"
-        :isUpdate="isUpdate"
-        :updateData="updateData"
-        @close="editorDialogVisible = false"
-      ></contentEditor>
-    </el-dialog>
-    <!-- 发布时间modal -->
-    <modal
-      ref="modal"
-      :modalConfig="modalSetting.modalConfig"
-      :modalForm="modalSetting.modalForm"
-      :modalData="modalSetting.modalData"
-      :modalHandles="modalSetting.modalHandles"
-    />
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-import contentEditor from "./popup/question-editor/content-editor.vue";
-export default {
-  components: { searchForm, cusTable, contentEditor, modal },
-  data() {
-    return {
-      //加载动画
-      loading:false,
-      typeList: [],
-      editorDialogVisible: false,
-      pageData: {
-        //查询表单内容 start
-        searchForm: [],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          itemType: "总题库",
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            submit: true,
-            handle: () => this.searchTableList(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增题目",
-            type: "primary",
-            handle: () => {
-                this.showModal(this.commonConstants.modalType.insert);
-                //新增模式并非编辑模式
-                this.isUpdate=false;
-            },
-            auth: "reportDatasource_insert",
-          },
-          // {
-          //   label: "批量删除",
-          //   type: "danger",
-          //   handle: () => this.deleteBatch(),
-          //   auth: "reportDatasource_batchDelete",
-          // },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "题目", prop: "label", align: "center" },
-          {
-            label: "发布时间",
-            prop: "createTime",
-            align: "center"
-          },
-          { label: "题库分类", prop: "itemType", align: "center" },
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            type: "button",
-            fixed: "right",
-            btnList: [
-              {
-                label: "编辑",
-                type: "primary",
-                size:"mini",
-                handle: (row) =>{
-                    this.showModal(this.commonConstants.modalType.update, row);
-                    //编辑模式
-                    this.isUpdate=true;
-                }
-              },
-              {
-                label: "删除",
-                type: "danger",
-                size:"mini",
-                // auth: "reportDatasource_update",
-                handle: (row) =>{
-                    this.$confirm("确认删除该题目？","温馨提示")
-                    .then(res=>{
-                        this.$api.service.deleteQuestion([row.id])
-                        .then(res=>{
-                            this.searchTableList();
-                        })
-                    })
-
-                }
-              },
-            ],
-          },
-        ],
-      },
-      modalSetting: {
-        modalConfig: {
-          show: false,
-          title: "发布",
-        },
-        modalForm: [
-          {
-            label: "发布时间",
-            prop: "releaseTime",
-            type: "DateTime",
-            rules: { required: true },
-          },
-        ],
-        modalData: {
-          releaseTime: "",
-        },
-        row: {},
-        modalHandles: [
-          {
-            label: "确认",
-            type: "primary",
-            handle: () => {
-              this.updateReleaseTime();
-            },
-          },
-        ],
-      },
-      // 修改数据
-      isUpdate: false,
-      updateData: {},
-    };
-  },
-  activated() {
-    // this.pageData.searchForm[0].children=[{label:'test',value:'test'}]
-    // let obj={...this.pageData.queryData}
-    // if (obj.itemType.length == 0) {
-    //     obj.itemType = "";
-    //     obj.courseThemeId = "";
-    //   } else if (obj.itemType.length == 1) {
-    //     obj.itemType = obj.itemType[0];
-    //     obj.courseThemeId = "";
-    //   } else if (obj.itemType.length == 2) {
-    //     obj.courseThemeId = obj.itemType[1];
-    //     obj.itemType = obj.itemType[0];
-        
-    //   }
-    // this.$api.courseThemeAll({courseType:obj.itemType}).then(res=>{
-    //   let arr=this.pageData.searchForm[0].data.filter(item=>item.value==obj.itemType)
-    //   if(arr.length!=0){
-    //     arr[0].children=res.data.list.map(item=>{
-    //       return{
-    //         label: item.themeName,
-    //         value: item.courseThemeId,
-    //         leaf: true,
-    //       }
-    //     })
-    //   }
-    // })
-    this.searchTableList();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList() {
-      this.loading=true;
-      // 初始化obj
-      var obj = {};
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      obj.page = this.pageData.tablePage.currentPage;
-      obj.limit = this.pageData.tablePage.pageSize;
-      delete obj["pageSizeRange"];
-      if (obj.itemType.length == 0) {
-        obj.itemType = "";
-        obj.courseThemeId = "";
-      } else if (obj.itemType.length == 1) {
-        obj.itemType = obj.itemType[0];
-        obj.courseThemeId = "";
-      } else if (obj.itemType.length == 2) {
-        obj.courseThemeId = obj.itemType[1];
-        obj.itemType = obj.itemType[0];
-        
-      }
-      // 请求数据
-      this.$api.service.getQuestionList({itemType:obj.itemType,page:obj.page,limit:obj.limit,courseThemeId:obj.courseThemeId}).then((res) => {
-        this.commonUtil.tableAssignment(
-          res.data.page,
-          this.pageData.tablePage,
-          this.pageData.tableData
-        );
-      })
-      .finally(()=>{
-        this.loading=false;
-      })
-    },
-    // 重置
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      this.searchTableList();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      console.log(type, row);
-      if (row && row.releaseTime) {
-        row.isSubmit = true;
-      } else if (row) {
-        row.isSubmit = false;
-      }
-      if (type != this.commonConstants.modalType.insert) {
-        this.isUpdate = true;
-        this.updateData = JSON.parse(JSON.stringify(row));
-      } else {
-        this.isUpdate = false;
-        this.updateData = {};
-      }
-      this.editorDialogVisible = true;
-    },
-    /**
-     * @description: 重置编辑数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    closeDialog() {
-      this.isUpdate = false;
-      this.updateData = {};
-      this.searchTableList();
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      // this.$refs["modalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      // this.pageData.modalConfig.show = false; //关闭modal
-      // this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.pageData.modalData.userId = this.$store.state.user.id;
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveNewContent(content).then((res) => {
-              this.searchTableList();
-            });
-          } else {
-            this.$api.updateRedContentInfo(content).then((res) => {
-              this.searchTableList();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    updateReleaseTime() {
-      this.$refs.modal.$refs.modalFormRef.validate((valid) => {
-        if (valid) {
-          let data = Object.assign({}, this.modalSetting.row);
-          data.releaseTime = this.modalSetting.modalData.releaseTime;
-
-          this.$api.updateRedCourse(data).then((res) => {
-            this.modalSetting.modalData.releaseTime = "";
-            this.$nextTick(() => {
-              this.$refs.modal.$refs.modalFormRef.clearValidate();
-            });
-            this.modalSetting.modalConfig.show = false;
-            this.searchTableList();
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteRedContentInfo(ids).then((res) => {
-            this.searchTableList();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].contentInfoId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteRedContentInfo(ids).then((res) => {
-              this.searchTableList();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.content-dialog ::v-deep .el-dialog__body {
-  padding: 0px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/service/question-bank.vue b/src/views/modules/service/question-bank.vue
deleted file mode 100644
index e577423..0000000
--- a/src/views/modules/service/question-bank.vue
+++ /dev/null
@@ -1,486 +0,0 @@
-<!--
- * @Author: chenkangxu
- * @Date: 2022-03-17 14:05:51
- * @LastEditTime: 2022-08-09 20:27:48
- * @LastEditors: 陈伟亮 1186723967@qq.com
- * @Description: 
- * @Github: 
--->
-<template>
-  <div class="_tablepage">
-    <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-      labelWidth="120px"
-    >
-    </searchForm>
-    <cusTable
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable>
-    <el-dialog
-      :visible.sync="editorDialogVisible"
-      fullscreen
-      @close="closeDialog"
-      class="content-dialog"
-    >
-      <contentEditor
-        v-if="editorDialogVisible"
-        :isUpdate="isUpdate"
-        :updateData="updateData"
-        @close="editorDialogVisible = false"
-      ></contentEditor>
-    </el-dialog>
-    <!-- 发布时间modal -->
-    <modal
-      ref="modal"
-      :modalConfig="modalSetting.modalConfig"
-      :modalForm="modalSetting.modalForm"
-      :modalData="modalSetting.modalData"
-      :modalHandles="modalSetting.modalHandles"
-    />
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-import contentEditor from "../../../components/common/question-editor/content-editor.vue";
-export default {
-  components: { searchForm, cusTable, contentEditor, modal },
-  data() {
-    return {
-      //加载动画
-      loading:false,
-      typeList: [],
-      editorDialogVisible: false,
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-        //   { type: "Input", label: "标题/题目", prop: "searchName" },
-          {
-            type: "Cascader",
-            label: "题目类型",
-            prop: "itemType",
-            rules: {
-              required: true,
-              message: "请选择题目类型",
-              trigger: "blur",
-            },
-            props: {
-              lazy: true,
-              lazyLoad: (node, reslove) => {
-                if (node.data.leaf) {
-                  reslove();
-                } else {
-                  this.$api
-                    .courseThemeAll({ courseType: node.value })
-                    .then((res) => {
-                      reslove(
-                        res.data.list.map((item) => {
-                          return {
-                            label: item.themeName,
-                            value: item.courseThemeId,
-                            leaf: true,
-                          };
-                        })
-                      );
-                    });
-                }
-              },
-              checkStrictly: true,
-            },
-            data: this.commonConstants.courseType,
-          },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          itemType: "红心向党",
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            submit: true,
-            handle: () => this.searchTableList(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增题目",
-            type: "primary",
-            handle: () => {
-                this.showModal(this.commonConstants.modalType.insert);
-                //新增模式并非编辑模式
-                this.isUpdate=false;
-            },
-            auth: "reportDatasource_insert",
-          },
-          // {
-          //   label: "批量删除",
-          //   type: "danger",
-          //   handle: () => this.deleteBatch(),
-          //   auth: "reportDatasource_batchDelete",
-          // },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "题目", prop: "label", align: "center" },
-          {
-            label: "发布时间",
-            prop: "createTime",
-            align: "center"
-          },
-          { label: "题库分类", prop: "itemType", align: "center" },
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            type: "button",
-            fixed: "right",
-            btnList: [
-              {
-                label: "编辑",
-                type: "primary",
-                size:"mini",
-                handle: (row) =>{
-                    this.showModal(this.commonConstants.modalType.update, row);
-                    //编辑模式
-                    this.isUpdate=true;
-                }
-              },
-              {
-                label: "删除",
-                type: "danger",
-                size:"mini",
-                // auth: "reportDatasource_update",
-                handle: (row) =>{
-                    this.$confirm("确认删除该题目？","温馨提示")
-                    .then(res=>{
-                        this.$api.service.deleteQuestion([row.id])
-                        .then(res=>{
-                            this.searchTableList();
-                        })
-                    })
-
-                }
-              },
-            ],
-          },
-        ],
-      },
-      modalSetting: {
-        modalConfig: {
-          show: false,
-          title: "发布",
-        },
-        modalForm: [
-          {
-            label: "发布时间",
-            prop: "releaseTime",
-            type: "DateTime",
-            rules: { required: true },
-          },
-        ],
-        modalData: {
-          releaseTime: "",
-        },
-        row: {},
-        modalHandles: [
-          {
-            label: "确认",
-            type: "primary",
-            handle: () => {
-              this.updateReleaseTime();
-            },
-          },
-        ],
-      },
-      // 修改数据
-      isUpdate: false,
-      updateData: {},
-    };
-  },
-  activated() {
-    // this.pageData.searchForm[0].children=[{label:'test',value:'test'}]
-    // let obj={...this.pageData.queryData}
-    // if (obj.itemType.length == 0) {
-    //     obj.itemType = "";
-    //     obj.courseThemeId = "";
-    //   } else if (obj.itemType.length == 1) {
-    //     obj.itemType = obj.itemType[0];
-    //     obj.courseThemeId = "";
-    //   } else if (obj.itemType.length == 2) {
-    //     obj.courseThemeId = obj.itemType[1];
-    //     obj.itemType = obj.itemType[0];
-        
-    //   }
-    // this.$api.courseThemeAll({courseType:obj.itemType}).then(res=>{
-    //   let arr=this.pageData.searchForm[0].data.filter(item=>item.value==obj.itemType)
-    //   if(arr.length!=0){
-    //     arr[0].children=res.data.list.map(item=>{
-    //       return{
-    //         label: item.themeName,
-    //         value: item.courseThemeId,
-    //         leaf: true,
-    //       }
-    //     })
-    //   }
-    // })
-    this.searchTableList();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList() {
-      this.loading=true;
-      // 初始化obj
-      var obj = {};
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      obj.page = this.pageData.tablePage.currentPage;
-      obj.limit = this.pageData.tablePage.pageSize;
-      delete obj["pageSizeRange"];
-      if (obj.itemType.length == 0) {
-        obj.itemType = "";
-        obj.courseThemeId = "";
-      } else if (obj.itemType.length == 1) {
-        obj.itemType = obj.itemType[0];
-        obj.courseThemeId = "";
-      } else if (obj.itemType.length == 2) {
-        obj.courseThemeId = obj.itemType[1];
-        obj.itemType = obj.itemType[0];
-        
-      }
-      // 请求数据
-      this.$api.service.getQuestionList({itemType:obj.itemType,page:obj.page,limit:obj.limit,courseThemeId:obj.courseThemeId}).then((res) => {
-        this.commonUtil.tableAssignment(
-          res.data.page,
-          this.pageData.tablePage,
-          this.pageData.tableData
-        );
-      })
-      .finally(()=>{
-        this.loading=false;
-      })
-    },
-    // 重置
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      this.searchTableList();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      console.log(type, row);
-      if (row && row.releaseTime) {
-        row.isSubmit = true;
-      } else if (row) {
-        row.isSubmit = false;
-      }
-      if (type != this.commonConstants.modalType.insert) {
-        this.isUpdate = true;
-        this.updateData = JSON.parse(JSON.stringify(row));
-      } else {
-        this.isUpdate = false;
-        this.updateData = {};
-      }
-      this.editorDialogVisible = true;
-    },
-    /**
-     * @description: 重置编辑数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    closeDialog() {
-      this.isUpdate = false;
-      this.updateData = {};
-      this.searchTableList();
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      // this.$refs["modalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      // this.pageData.modalConfig.show = false; //关闭modal
-      // this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.pageData.modalData.userId = this.$store.state.user.id;
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveNewContent(content).then((res) => {
-              this.searchTableList();
-            });
-          } else {
-            this.$api.updateRedContentInfo(content).then((res) => {
-              this.searchTableList();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    updateReleaseTime() {
-      this.$refs.modal.$refs.modalFormRef.validate((valid) => {
-        if (valid) {
-          let data = Object.assign({}, this.modalSetting.row);
-          data.releaseTime = this.modalSetting.modalData.releaseTime;
-
-          this.$api.updateRedCourse(data).then((res) => {
-            this.modalSetting.modalData.releaseTime = "";
-            this.$nextTick(() => {
-              this.$refs.modal.$refs.modalFormRef.clearValidate();
-            });
-            this.modalSetting.modalConfig.show = false;
-            this.searchTableList();
-          });
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteRedContentInfo(ids).then((res) => {
-            this.searchTableList();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].contentInfoId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteRedContentInfo(ids).then((res) => {
-              this.searchTableList();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.content-dialog ::v-deep .el-dialog__body {
-  padding: 0px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/service/school-manage.vue b/src/views/modules/service/school-manage.vue
deleted file mode 100644
index b750be4..0000000
--- a/src/views/modules/service/school-manage.vue
+++ /dev/null
@@ -1,473 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <!-- <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm> -->
-    <cusTable
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable>
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-  </div>
-</template>
-<script>
-import cc from '../../../utils/country-level2-data'
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  data() {
-    return {
-      typeList: [],
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          {
-            type: "Cascader",
-            label: "资讯分类",
-            prop: "typeId",
-            props: { checkStrictly: true },
-            data: [],
-          },
-          { type: "Input", label: "关键字", prop: "searchName" },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          typeId: [],
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            handle: () => this.searchTableList(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增学校",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "学校名称", prop: "schoolName", align: "center" },
-          { label: "用户名", prop: "username", align: "center" },
-          { label: "地址", prop: "address", align: "center" },
-          { label: "头像", prop: "headUrl", align: "center", type: "image" },
-          { label: "电话", prop: "mobile", align: "center" },
-          { label: "邮箱", prop: "email", align: "center" },
-          { label: "状态", align: "center", type: "status" },
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            type: "button",
-            fixed: "right",
-            btnList: [
-              {
-                label: "编辑",
-                type: "text",
-                auth: "reportDatasource_update",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.update, row),
-              },
-            ],
-          },
-          //   { label: "评论数", prop: "commentNumber", align: "center" },
-          //   { label: "来源", prop: "source", align: "center" },
-          //   { label: "创建时间", prop: "createTime", align: "center" },
-          //   { label: "更新时间", prop: "updateTime", align: "center" },
-          //   { label: "用户ID", prop: "userId", align: "center" },
-          //   { label: "用户名", prop: "username", align: "center" },
-          //   { label: "关键词", prop: "keywords", align: "center" },
-          //   { label: "标签名", prop: "labelName", align: "center" },
-          //   { label: "标签ID", prop: "labelId", align: "center" },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "70vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "用户名",
-            prop: "username",
-            rules: { required: true, maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "密码",
-            prop: "password",
-            rules: { required: true, maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "邮箱",
-            prop: "email",
-            width: "300px",
-            rules:{required:true ,type:'email'}
-          },
-          {
-            type: "Input",
-            label: "电话",
-            prop: "mobile",
-            width: "300px",
-             rules: { required: true },
-          },
-          {
-            type: "RadioButton",
-            label: "状态",
-            prop: "status",
-            rules: { required: true },
-            width: "300px",
-            radios: [
-              { value: "1", label: "正常" },
-              { value: "0", label: "封禁" },
-            ],
-          },
-          {
-            type: "Checkbox",
-            label: "角色",
-            prop: "roleIdList",
-            rules: { required: true },
-            checkboxs: [],
-          },
-          {
-            type: "Input",
-            label: "学校名称",
-            prop: "schoolName",
-            width: "300px",
-             rules: { required: true },
-          },
-          {
-            type: "Input",
-            label: "地址",
-            prop: "address",
-            width: "300px",
-             rules: { required: true },
-          },
-          {
-            type: "Upload",
-            label: "头像",
-            fileUrl: "headUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-            drag:true
-          },
-          {
-            type: "Cascader",
-            label: "省市",
-            prop: "cityList",
-            data: cc,
-            rules:{required:true}
-            
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          fileList: [],
-          roleIdList: [],
-          username: "",
-          password: "",
-          email: "",
-          mobile: "",
-          status: "",
-          schoolName: "",
-          address: "",
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-      },
-    };
-  },
-  activated() {
-    this.searchTableList();
-    this.searchTypeList();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList() {
-      // 初始化obj
-      var obj = {};
-      //   this.pageData.queryData.typeId[0]
-      //     ? (this.pageData.queryData.mainTypeId =
-      //         this.pageData.queryData.typeId[0])
-      //     : delete this.pageData.queryData["mainTypeId"];
-      //   this.pageData.queryData.typeId[1]
-      //     ? (this.pageData.queryData.secondTypeId =
-      //         this.pageData.queryData.typeId[1])
-      //     : delete this.pageData.queryData["secondTypeId"];
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      obj.page = this.pageData.tablePage.currentPage;
-      obj.limit = this.pageData.tablePage.pageSize;
-      delete obj["pageSizeRange"];
-      delete obj["typeId"];
-      delete obj["currentPage"];
-      delete obj["pageSize"];
-      // 请求数据
-      this.$api.getSchoolByParams(obj).then((res) => {
-        this.commonUtil.tableAssignment(
-          res.data.page,
-          this.pageData.tablePage,
-          this.pageData.tableData
-        );
-      });
-    },
-    // 查询分类
-    searchTypeList() {
-      this.$api.selectRoles().then((res) => {
-        res.data.list.forEach((item, index) => {
-          item.label = item.roleName;
-          item.value = item.roleId;
-        });
-        this.pageData.modalForm[5].checkboxs = res.data.list;
-        console.log(this.pageData.modalForm[5]);
-      });
-    },
-    // 重置
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      this.searchTableList();
-    },
-    addChildren(arr) {
-      if (Array.isArray(arr) && arr.length > 0) {
-        let outPut = [];
-        arr.forEach((item, index) => {
-          outPut.push({
-            children: item.children ? this.addChildren(item.children) : "",
-            label: item.secondTypeId ? item.secondTypeName : item.mainTypeName,
-            // value: item.secondTypeId ? item.secondTypeName : item.mainTypeName,
-            value: item.secondTypeId ? item.secondTypeId : item.mainTypeId,
-            id: item.secondTypeId ? item.secondTypeId : item.mainTypeId,
-          });
-        });
-        return outPut;
-      } else {
-        return arr;
-      }
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.pageData.modalData.fileList = [];
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      this.pageData.modalData = JSON.parse(JSON.stringify(row));
-      
-      let url = [];
-      if(this.pageData.modalData.headUrl){
-        url[0] = { url: this.pageData.modalData.headUrl };
-      }
-      
-      this.$set(this.pageData.modalData, "fileList", url);
-      console.log(this.pageData.modalData);
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.$refs["modalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.modalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      console.log(this.pageData.modalData);
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveNewSchool(content).then((res) => {
-              this.searchTableList();
-            });
-          } else {
-            this.$api.updateSchool(content).then((res) => {
-              this.searchTableList();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteRedPoetry(ids).then((res) => {
-            this.searchTableList();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].poetryId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteRedPoetry(ids).then((res) => {
-              this.searchTableList();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-    routerTo(row) {
-      this.$store.commit("setParameters", {
-        key: "datasourceId",
-        value: row.id,
-      });
-      this.$router.push({ name: "datesourceDictCode" });
-    },
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/service/swiper-image.vue b/src/views/modules/service/swiper-image.vue
deleted file mode 100644
index de456d0..0000000
--- a/src/views/modules/service/swiper-image.vue
+++ /dev/null
@@ -1,791 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      ref="searchForm"
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm>
-    <!-- <cusTable
-      :loading="loading"
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable> -->
-    <obj-table-plus
-      style="height: 60vh"
-      @query="searchTableList"
-      ref="oTable"
-      v-model="pageData.tableData"
-      :isPagination="true"
-      :tableCols="pageData.tableCols"
-      :tableProp="tableProp"
-      :toolbarProp="toolbarProp"
-      :toolbarEvent="toolbarEvent"
-      :tableEvent="{
-        'checkbox-change': selectChange,
-        'checkbox-all': selectChange,
-      }"
-    />
-    <modal
-      class="modal"
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-    <comment ref="comment" :parentId="parentId" type="STUDYIMG" />
-    <see ref="see" />
-  </div>
-</template>
-<script>
-import see from "./popup/swiper-image-see.vue";
-import comment from "@/components/comment/comment.vue";
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal, comment, see },
-  data() {
-    return {
-      //加载动画
-      loading: false,
-      //提交按钮loading
-      submitLoading:false,
-      typeList: [],
-      tableProp: {
-        height: "auto",
-      },
-      toolbarProp: {
-        buttons: [
-          {
-            status: "primary",
-            name: "新增",
-            code: "add",
-          },
-          {
-            status: "danger",
-            name: "批量删除",
-            code: "delBatch",
-          },
-        ],
-      },
-      toolbarEvent: {
-        "button-click": ({ code }) => {
-          if (code == "add") {
-            this.showModal(this.commonConstants.modalType.insert);
-          } else if (code == "delBatch") {
-            this.deleteBatch();
-          }
-        },
-      },
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          {
-            type: "Input",
-            label: "关键字",
-            prop: "searchName",
-            placeholder: "标题、来源、编辑者名称",
-            width: "230px",
-          },
-
-          {
-            type: "Select",
-            label: "内容类型",
-            prop: "isVideo",
-            options: [
-              {
-                label: "资讯",
-                value: 0,
-              },
-              { label: "视频", value: 1 },
-            ],
-          },
-          {
-            type: "DateTimeRange",
-            label: "发布时间范围",
-            prop: "time",
-          },
-          {
-            type: "Select",
-            label: "审核状态",
-            prop: "examineStatus",
-            default: true,
-            options: [
-              { label: "未审核", value: 0 },
-              { label: "审核通过", value: 1 },
-              { label: "审核未通过", value: 2 },
-            ],
-          },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          contentTypeId: "",
-          time: [],
-          isVideo: 0,
-          examineStatus: "",
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            handle: () => this.$refs.oTable.reload(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { type: "checkbox", width: "60px", fixed: "left" },
-          { title: "标题", field: "title", align: "center", "min-width": 160 },
-          {
-            title: "副标题",
-            field: "subtitle",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "资讯来源",
-            field: "source",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "编辑者",
-            field: "editorName",
-            align: "center",
-            "min-width": 100,
-          },
-          { title: "作者", field: "author", align: "center", "min-width": 100 },
-          {
-            title: "封面",
-            type: "jsx",
-            field: "imageUrl",
-            align: "center",
-            "min-width": 100,
-            render: ({ row }) => {
-              // @/assets/images/noimg.svg
-              return (
-                <el-image
-                  fit="cover"
-                  src={
-                    row.imageUrl
-                      ? row.imageUrl
-                      : require("@/assets/images/noimg.svg")
-                  }
-                ></el-image>
-              );
-            },
-          },
-          // { title: "外链", field: "contentLink", align: "center" },
-          {
-            title: "阅读数",
-            field: "readNumber",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "点赞数",
-            field: "likeNumber",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "收藏数",
-            field: "collectNumber",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "评论数",
-            field: "commentNumber",
-            align: "center",
-            "min-width": 100,
-          },
-          {
-            title: "审核状态",
-            field: "createTime",
-            align: "center",
-            "min-width": 100,
-            // "title-help":{message: '开关开启代表通过审核，关闭代表不通过审核'},
-            type: "jsx",
-            render: ({ row }) => {
-              switch (row.examineStatus) {
-                case 0:
-                  return (
-                    <span>
-                      <span style="color:gray">未审核</span>
-                    </span>
-                  );
-                case 1:
-                  return (
-                    <span>
-                      <span style="color:green">审核通过</span>
-                    </span>
-                  );
-                case 2:
-                  return (
-                    <span>
-                      <span style="color:red">审核未通过</span>
-                    </span>
-                  );
-                default:
-                  return <span></span>;
-              }
-            },
-          },
-          {
-            title: "是否轮播",
-            field: "status",
-            align: "center",
-            type: "switch",
-            values: [1, 0],
-            "min-width": 100,
-            change: (row) => {
-              this.$api.updateLocalServiceImage(row).then((res) => {
-                this.$refs.oTable.refresh();
-              });
-            },
-          },
-          {
-            title: "操作",
-            field: "operation",
-            align: "center",
-            type: "jsx",
-            fixed: "right",
-            width: "200px",
-            render: ({ row }) => {
-              const com = () => {
-                if (row.examineStatus == 1) {
-                  return (
-                    <el-button
-                      type="text"
-                      size="mini"
-                      onClick={() => {
-                        this.parentId = row.contentInfoId;
-                        this.$refs.comment.modalConfig.show = true;
-                      }}
-                    >
-                      查看评论
-                    </el-button>
-                  );
-                } else if (row.examineStatus == 2) {
-                  return (
-                    <el-button
-                      type="text"
-                      size="mini"
-                      onClick={() =>
-                        this.$confirm("确认重新提交吗？", "提示").then(
-                          (action) => {
-                            if (action == "confirm") {
-                              this.$api
-                                .updateLocalServiceImage({
-                                  ...row,
-                                  examineStatus: 0,
-                                })
-                                .then((res) => {
-                                  this.$refs.oTable.refresh();
-                                });
-                            }
-                          }
-                        )
-                      }
-                    >
-                      重新提交
-                    </el-button>
-                  );
-                }
-              };
-              return (
-                <div>
-                  {com()}
-                  <el-button
-                    type="text"
-                    size="mini"
-                    onClick={
-                      () => this.$refs.see.show(row)
-                      // this.showModal(this.commonConstants.modalType.detail, row)
-                    }
-                  >
-                    查看
-                  </el-button>
-                  <el-button
-                    type="text"
-                    size="mini"
-                    onClick={() =>
-                      this.showModal(this.commonConstants.modalType.update, row)
-                    }
-                  >
-                    编辑
-                  </el-button>
-                  <el-button
-                    type="text"
-                    size="mini"
-                    onClick={() => this.deleteOne(row.contentInfoId)}
-                  >
-                    删除
-                  </el-button>
-                </div>
-              );
-            },
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "80vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-          fullscreen:true,
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "标题",
-            prop: "title",
-            rules: { required: true, maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "副标题",
-            prop: "subtitle",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Tinymce",
-            label: "资讯内容",
-            prop: "content",
-            rules: { required: true },
-            width: "796px",
-            //tinymce init的config配置
-            config:{
-              toolbar_sticky:true,
-              // fixed_toolbar_container:"#tinymce_fixed_toolbar",
-              max_height:Infinity,
-              min_height:300,
-              skin:"oxide-sticky",
-              placeholder:"从这里开始填写正文",
-              border:"0 0 0 0"
-            },
-            //覆盖原本的工具栏
-            toolbars:['undo redo  fontsizeselect  bold italic underline strikethrough forecolor backcolor   removeformat subscript superscript blockquote alignleft aligncenter alignright alignjustify lineheightcustom indent2em wlindent    hr  bullist numlist link image charmap    insertdatetime media table emoticons preview print tpImportword wlxiumi' ]
-          },
-          {
-            type: "Input",
-            label: "资讯来源",
-            prop: "source",
-            rules: { required: true, maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "作者",
-            prop: "author",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Input",
-            label: "编辑者",
-            prop: "editorName",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          // {
-          //   type: "Input",
-          //   label: "外链",
-          //   prop: "contentLink",
-          //   rules: { maxLength: 100 },
-          //   width: "300px",
-          // },
-          {
-            type: "Input",
-            label: "关键词",
-            prop: "keywords",
-            rules: { maxLength: 100 },
-            width: "300px",
-          },
-          {
-            type: "Radio",
-            prop: "isVideo",
-            label: "内容类型",
-            radios: [
-              { label: "资讯", value: "0" },
-              { label: "视频", value: "1" },
-            ],
-            width: "300px",
-          },
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            rules: { required: true },
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-            drag:true
-          }
-        ],
-        //modal表单 end
-        //modal表单 end
-        newModalForm: [
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-            rules: { required: true },
-            drag:true
-          },
-        ], //咨询专属内容
-        videoModalForm: [
-          {
-            type: "Upload",
-            label: "封面",
-            fileUrl: "imageUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-            drag:true
-          },
-          {
-            type: "Upload",
-            label: "视频",
-            fileUrl: "videoUrl",
-            prop: "fileListVideo",
-            listType: "text",
-            rules: { required: true },
-            width: "300px",
-            isVideo: true,
-            drag:true,
-            accept: ".mp4,.avi,.mov,.rmvb,.flv,.MP4,.AVI,.MOV,.RMVB,.FLV",
-            tips: "请上传视频文件",
-          },
-        ], //视频专属内容
-        //modal 数据 start
-        modalData: {
-          userId: "",
-          content: "",
-          fileUrl: "",
-          source: "",
-          fileList: [],
-          status: 0,
-          isVideo: "0",
-          videoUrl: "",
-          fileListVideo: [],
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消",icon:"el-icon-close", type: "default", handle: () => this.closeModal() },
-          { label: "提交",icon:"el-icon-upload2",loading:false,type: "primary", handle: (item) => this.save(item) },
-        ],
-        //modal 按钮 end
-      },
-      parentId: "",
-    };
-  },
-  activated() {
-    this.$refs.oTable.refresh();
-  },
-  watch: {
-    "pageData.modalData.isVideo": {
-      handler: function (val, oldval) {
-        // console.log(val)
-        if (val === "1" && oldval === "0") {
-          this.pageData.modalForm.splice(
-            0 - this.pageData.newModalForm.length,
-            this.pageData.newModalForm.length,
-            ...this.pageData.videoModalForm
-          );
-        } else if (val === "0" && oldval === "1") {
-          this.pageData.modalForm.splice(
-            0 - this.pageData.videoModalForm.length,
-            this.pageData.videoModalForm.length,
-            ...this.pageData.newModalForm
-          );
-        }
-      },
-    },
-    "pageData.modalData.fileList": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.pageData.modalData.imageUrl = "";
-        }
-      },
-    },
-    "pageData.modalData.fileListVideo": {
-      handler: function (val) {
-        if (val && val.length === 0) {
-          this.pageData.modalData.videoUrl = "";
-        }
-      },
-    },
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList(pageNo, pageSize) {
-      // 初始化obj
-      var obj = {};
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      delete obj["pageSizeRange"];
-      if (obj.time.length == 2) {
-        obj.startTime = obj.time[0];
-        obj.endTime = obj.time[1];
-      }
-      delete obj.time;
-      // 请求数据
-      this.$api
-        .getLocalServiceImage({ ...obj, page: pageNo, limit: pageSize })
-        .then((res) => {
-          this.$refs.oTable.complete(
-            res.data.page.list,
-            res.data.page.totalCount
-          );
-          // this.commonUtil.tableAssignment(
-          //   res.data.page,
-          //   this.pageData.tablePage,
-          //   this.pageData.tableData
-          // );
-        });
-    },
-    // 重置
-    resetSearch() {
-      // this.commonUtil.clearObj(this.pageData.queryData);
-      this.$refs.searchForm.$refs.searchFormRef.resetFields();
-      this.$refs.oTable.reload();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-      this.$nextTick(() => {
-        this.$refs["modalRef"].$refs["modalFormRef"].clearValidate(); //校验重置
-      });
-      this.pageData.modalData.isVideo = "0"; //补充isVideo 不会触发watch
-      this.pageData.modalData.source = this.$newSource; //获取默认的资讯来源
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      if (row.imageUrl) {
-        row.fileList = [
-          {
-            url: row.imageUrl,
-          },
-        ];
-      }
-      if (row.videoUrl) {
-        row.fileListVideo = [
-          {
-            url: row.videoUrl,
-            // +'?x-oss-process=video/snapshot,t_10000,m_fast'
-          },
-        ];
-      }
-      row.isVideo = row.isVideo + "";
-      this.$nextTick(() => {
-        this.pageData.modalData = JSON.parse(JSON.stringify(row));
-      });
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.pageData.modalConfig.show = false; //关闭modal
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save(item) {
-      this.pageData.modalData.userId = this.$store.state.user.id;
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          if (content.isVideo == 0) {
-            content.videoUrl = "";
-          }
-          // console.log(content.content)
-          this.$set(item,'loading',true)
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveLocalServiceImage(content).then((res) => {
-              this.$refs.oTable.refresh();
-              this.closeModal();
-            }).finally(()=>this.$set(item,'loading',false))
-          } else {
-            // 审核通过的内容再次编辑会变成未审核
-            // if(content.examineStatus==1){
-            //   content.examineStatus=0
-            // }
-            this.$api.updateLocalServiceImage(content).then((res) => {
-              this.$refs.oTable.refresh();
-              this.closeModal();
-            }).finally(()=>this.$set(item,'loading',false))
-          }
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteLocalServiceImage(ids).then((res) => {
-            this.$refs.oTable.refresh();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].contentInfoId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteLocalServiceImage(ids).then((res) => {
-              this.$refs.oTable.refresh();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange({ records, reserves }) {
-      // console.log(val)
-      this.pageData.selectList = [...records, ...reserves];
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.content-dialog ::v-deep .el-dialog__body {
-  padding: 0px;
-}
-.modal ::v-deep .el-dialog-div{
-  padding-top: 40px;
-  .el-form{
-    width: 910px;
-    margin: 0 auto;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/shop/product-manage.vue b/src/views/modules/shop/product-manage.vue
deleted file mode 100644
index 734b1b0..0000000
--- a/src/views/modules/shop/product-manage.vue
+++ /dev/null
@@ -1,441 +0,0 @@
-<template>
-  <div class="_tablepage">
-    <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm>
-    <cusTable
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="true"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="searchTableList"
-      @selectChange="selectChange"
-      @handleSizeChange="searchTableList"
-    ></cusTable>
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  data() {
-    return {
-      typeList: [],
-      pageData: {
-        //查询表单内容 start
-        searchForm: [
-          { type: "Input", label: "商品名", prop: "searchName" },
-          // {
-          //   type: "Select",
-          //   label: "商品分类",
-          //   prop: "productTypeId",
-          //   options: [],
-          //   props: { label: "productTypeName", value: "productTypeId" },
-          // },
-        ],
-        //查询表单内容 end
-        //查询条件 start
-        queryData: {
-          searchName: "",
-          productTypeId: "",
-        },
-        //查询条件 end
-        //查询表单按钮start
-        searchHandle: [
-          {
-            label: "查询",
-            type: "primary",
-            handle: () => this.searchTableList(),
-            auth: "reportDatasource_search",
-          },
-          {
-            label: "重置",
-            type: "warning",
-            handle: () => this.resetSearch(),
-            auth: "reportDatasource_search",
-          },
-        ],
-        //查询表单按钮end
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-          {
-            label: "批量删除",
-            type: "danger",
-            handle: () => this.deleteBatch(),
-            auth: "reportDatasource_batchDelete",
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "商品名", prop: "productName", align: "center" },
-          { label: "主图", type: "image", prop: "productUrl", align: "center" },
-          { label: "分类名", prop: "productTypeName", align: "center" },
-          { label: "红星币数", prop: "redCoin", align: "center" },
-          { label: "库存", prop: "store", align: "center" },
-          { label: "出售量", prop: "salesAll", align: "center" },
-          { label: "月售", prop: "salesMonth", align: "center" },
-          { label: "限购", prop: "limitMax", align: "center" },
-          
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            type: "button",
-            fixed: "right",
-            btnList: [
-              // {
-              //   label: "预览",
-              //   type: "text",
-              //   auth: "reportDatasource_getDetail",
-              //   handle: (row) =>
-              //     this.showModal(this.commonConstants.modalType.detail, row.id),
-              // },
-              {
-                label: "编辑",
-                type: "text",
-                auth: "reportDatasource_update",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.update, row),
-              },
-              {
-                label: "删除",
-                type: "text",
-                auth: "reportDatasource_delete",
-                handle: (row) => this.deleteOne(row.productId),
-              },
-            ],
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "80vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "商品名称",
-            prop: "productName",
-            rules: { required: true, maxLength: 50 },
-            width: "600px",
-          },
-          // {
-          //   type: "Select",
-          //   label: "商品分类",
-          //   prop: "productTypeId",
-          //   options: [],
-          //   props: { label: "productTypeName", value: "productTypeId" },
-          //   rules: { required: true },
-          //   width: "300px",
-          //   change: (value) => {
-          //     this.changeProductType(value);
-          //   },
-          // },
-          {
-            type: "InputNumber",
-            label: "库存",
-            prop: "store",
-            min: 1,
-            width: "300px",
-          },
-          {
-            type: "Radio",
-            label: "状态",
-            prop: "status",
-            width: "300px",
-            rules: { required: true },
-            radios: [
-              { label: "上架", value: 1 },
-              { label: "下架", value: 0 },
-            ],
-          },
-          {
-            type: "Upload",
-            label: "主图",
-            fileUrl: "productUrl",
-            prop: "fileList",
-            accept: ".jpg,.jpeg,.png,.JPG,.JPEG",
-            width: "300px",
-          },
-          {
-            type: "InputNumber",
-            label: "红星币数",
-            prop: "redCoin",
-            min: 1,
-            width: "300px",
-          },
-          {
-            type: "InputNumber",
-            label: "限购",
-            prop: "limitMax",
-            min: 1,
-            width: "300px",
-          },
-          {
-            type: "Tinymce",
-            label: "描述",
-            prop: "descripe",
-            rules: { required: true },
-            width: "1200px",
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          userId: "",
-          store: 1,
-          redCoin: 1,
-          limitMax: 1,
-          productTypeName: "",
-          fileList: [],
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-      },
-    };
-  },
-  activated() {
-    this.searchTableList();
-    this.searchContentType();
-  },
-  methods: {
-    changeProductType(obj) {
-      let type = this.pageData.searchForm[1].options.find((item) => {
-        return item.productTypeId === obj; 
-      });
-      this.pageData.modalData.productTypeName = type.productTypeName
-      this.pageData.modalData.productTypeId = type.productTypeId
-    },
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList() {
-      // 初始化obj
-      var obj = {};
-      Object.assign(obj, this.pageData.queryData, this.pageData.tablePage);
-      obj.page = this.pageData.tablePage.currentPage;
-      obj.limit = this.pageData.tablePage.pageSize;
-      delete obj["pageSizeRange"];
-      console.log("1111111111111111111111111111111111111111")
-      console.log(obj);
-
-      // 请求数据
-      this.$api.getProductListByParams(obj).then((res) => {
-         
-          this.commonUtil.tableAssignment(
-          res.data.page,
-          this.pageData.tablePage,
-          this.pageData.tableData
-        );
-      });
-    },
-    // 查询分类
-    searchContentType() {
-      this.$api.getProductTypeListByParams().then((res) => {
-        this.pageData.searchForm[1].options = res.data.list;
-        this.pageData.modalForm[1].options = res.data.list;
-      });
-    },
-    // 重置
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      this.searchTableList();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-      this.$nextTick(()=>{
-        this.$refs["modalRef"].$refs["modalFormRef"].clearValidate(); //校验重置
-      })
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      this.pageData.modalData = JSON.parse(JSON.stringify(row));
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.pageData.modalConfig.show = false; //关闭modal
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      console.log(this.pageData.modalData);
-      this.pageData.modalData.userId = this.$store.state.user.id;
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            this.$api.saveProduct(content).then((res) => {
-              this.searchTableList();
-            });
-          } else {
-            this.$api.updateProduct(content).then((res) => {
-              this.searchTableList();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteProduct(ids).then((res) => {
-            this.searchTableList();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].productId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteProduct(ids).then((res) => {
-              this.searchTableList();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.content-dialog ::v-deep .el-dialog__body {
-  padding: 0px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/shop/product-type.vue b/src/views/modules/shop/product-type.vue
deleted file mode 100644
index 201699b..0000000
--- a/src/views/modules/shop/product-type.vue
+++ /dev/null
@@ -1,407 +0,0 @@
-<!--
- * @author: ym
- * @Date: 2021-10-30 20:54:17
- * @LastEditTime: 2022-03-24 20:20:40
- * @LastEditors: chenkangxu
- * @Description: 
- * @FilePath: \background-front-end\src\views\modules\data-dictionary\product-type.vue
--->
-<!--
- * @author: ym
- * @Date: 2021-10-29 20:43:37
- * @LastEditTime: 2021-10-30 13:41:23
- * @LastEditors: ym
- * @Description: 
- * @FilePath: \local-backstage\src\views\modules\human-management\teacher-management.vue
--->
-<template>
-  <div class="_tablepage">
-    <!-- <searchForm
-      :searchForm="pageData.searchForm"
-      :searchData="pageData.queryData"
-      :searchHandle="pageData.searchHandle"
-    >
-    </searchForm> -->
-    <cusTable
-      :isSelection="true"
-      :isIndex="true"
-      :isPagination="false"
-      :isHandle="true"
-      :tableCols="pageData.tableCols"
-      :tableHandles="pageData.tableHandles"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @selectChange="selectChange"
-    ></cusTable>
-    <modal
-      ref="modalRef"
-      :modalConfig="pageData.modalConfig"
-      :modalForm="pageData.modalForm"
-      :modalData="pageData.modalData"
-      :modalHandles="pageData.modalHandles"
-      @closeModal="closeModal()"
-    ></modal>
-    <modal
-      ref="sortModalRef"
-      :modalConfig="pageData.sortModalConfig"
-      :modalForm="pageData.sortModalForm"
-      :modalData="pageData.sortModalData"
-      :modalHandles="pageData.sortModalHandles"
-      @closeModal="closeSortModal()"
-    ></modal>
-  </div>
-</template>
-<script>
-import modal from "../../../components/common/modal/modal.vue";
-import searchForm from "../../../components/common/searchform/searchForm.vue";
-import cusTable from "../../../components/common/table/custable.vue";
-export default {
-  components: { searchForm, cusTable, modal },
-  data() {
-    return {
-      typeList: [],
-      pageData: {
-        //表格数据start
-        tableData: [],
-        //表格数据end
-        //表格工具栏按钮 start
-        tableHandles: [
-          {
-            label: "新增",
-            type: "primary",
-            handle: () => this.showModal(this.commonConstants.modalType.insert),
-            auth: "reportDatasource_insert",
-          },
-          {
-            label: "排序",
-            type: "success",
-            handle: () =>
-              this.showSortModal(this.commonConstants.modalType.update),
-            auth: "reportType_insert",
-          },
-          {
-            label: "批量删除",
-            type: "danger",
-            handle: () => this.deleteBatch(),
-          },
-        ],
-        //表格工具栏按钮 end
-        selectList: [], //表格选中的数据
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 5,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "分类名", prop: "productTypeName", align: "center" },
-          { label: "分类图片", prop: "imageUrl", align: "center" ,type:'elImage'},
-          { label: "修改时间", prop: "createTime", align: "center" },
-          {
-            label: "操作",
-            prop: "operation",
-            align: "center",
-            type: "button",
-            fixed: "right",
-            btnList: [
-              {
-                label: "编辑",
-                type: "text",
-                auth: "reportDatasource_update",
-                handle: (row) =>
-                  this.showModal(this.commonConstants.modalType.update, row),
-              },
-              {
-                label: "删除",
-                type: "text",
-                auth: "reportDatasource_delete",
-                handle: (row) => this.deleteOne(row.productTypeId),
-              },
-            ],
-          },
-        ],
-        //表格列表头end
-        //modal配置 start
-        modalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "80vw", //弹出框宽度
-          modalRef: "modalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        modalForm: [
-          {
-            type: "Input",
-            label: "商品分类名",
-            prop: "productTypeName",
-            rules: { required: true },
-            width: "300px",
-          },
-          {
-            type: "Upload",
-            label: "分类图片",
-            fileUrl:'imageUrl',
-            prop: "fileList",
-            rules: { required: true },
-            limit:1
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        modalData: {
-          productTypeName: "",
-          imageUrl:'',
-          fileList:[]
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        modalHandles: [
-          { label: "取消", type: "default", handle: () => this.closeModal() },
-          { label: "提交", type: "primary", handle: () => this.save() },
-        ],
-        //modal 按钮 end
-        //modal配置 start
-        sortModalConfig: {
-          title: "新增", //弹窗标题,值为:新增，查看，编辑
-          show: false, //弹框显示
-          formEditDisabled: false, //编辑弹窗是否可编辑
-          width: "700px", //弹出框宽度
-          modalRef: "sortModalRef", //modal标识
-          type: "1", //类型 1新增 2编辑 3保存
-        },
-        //modal配置 end
-        //modal表单 start
-        sortModalForm: [
-          {
-            type: "Draggable",
-            label: "拖拽排序",
-            data: [],
-            prop: "productTypeName",
-            key: "productTypeId",
-          },
-        ],
-        //modal表单 end
-        //modal 数据 start
-        sortModalData: {
-          //modal页面数据
-          sort: [], //类型名称
-        },
-        //modal 数据 end
-        //modal 按钮 start
-        sortModalHandles: [
-          {
-            label: "取消",
-            type: "default",
-            handle: () => this.closeSortModal(),
-          },
-          { label: "提交", type: "primary", handle: () => this.saveSort() },
-        ],
-        //modal 按钮 end
-      },
-    };
-  },
-  watch:{
-    'pageData.modalData.fileList':{
-      handler:function(val){
-        if(val&&val.length===0){
-          console.log(val)
-          this.pageData.modalData.imageUrl=''
-        }
-      }
-    }
-  },
-  activated() {
-    this.searchTableList();
-  },
-  methods: {
-    /**
-     * @description: 获取表格数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    searchTableList() {
-      // 请求数据
-      this.$api.getProductTypeListByParams().then((res) => {
-        console.log(res.data.list);
-        this.commonUtil.tableAssignment(
-          res.data,
-          this.pageData.tablePage,
-          this.pageData.tableData
-        );
-      });
-    },
-    // 重置
-    resetSearch() {
-      this.commonUtil.clearObj(this.pageData.queryData);
-      this.searchTableList();
-    },
-    /**
-     * @description: modal显示
-     * @param {type} 类型 1新增，2编辑 3详情
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    showModal(type, row) {
-      this.commonUtil.showModal(this.pageData.modalConfig, type);
-      if (type != this.commonConstants.modalType.insert) {
-        this.getDetail(row);
-      }
-    },
-    showSortModal(type) {
-      this.pageData.sortModalForm[0].data = this.pageData.tableData;
-      this.commonUtil.showModal(this.pageData.sortModalConfig, type);
-    },
-    /**
-     * @description: 获取详细数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    getDetail(row) {
-      this.pageData.modalData = JSON.parse(JSON.stringify(row));
-      this.pageData.modalData.fileList=[{url:row.imageUrl}]
-    },
-    /**
-     * @description: 关闭modal
-     * @param
-     * @return:
-     * @author: ym
-     */
-    closeModal() {
-      this.$refs["modalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.modalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.modalData); //清空modalData
-    },
-    closeSortModal() {
-      this.$refs["sortModalRef"].$refs["modalFormRef"].resetFields(); //校验重置
-      this.pageData.sortModalConfig.show = false; //关闭modal
-      this.commonUtil.clearObj(this.pageData.sortModalData); //清空modalData
-    },
-    /**
-     * @description: 保存数据
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    save() {
-      this.$refs["modalRef"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          let content = this.pageData.modalData;
-          if (
-            this.pageData.modalConfig.type ==
-            this.commonConstants.modalType.insert
-          ) {
-            console.log(content);
-            this.$api.saveDataProductType(content).then((res) => {
-              this.searchTableList();
-            });
-          } else {
-            let list = [content];
-            this.$api.updateProductTypeSort(list).then((res) => {
-              this.searchTableList();
-            });
-          }
-          this.closeModal();
-        } else {
-          return false;
-        }
-      });
-    },
-    async saveSort() {
-      let { data } = await this.$api.updateProductTypeSort(
-        this.pageData.sortModalForm[0].data
-      );
-      this.closeSortModal();
-      this.searchTableList();
-    },
-    /**
-     * @description: 删除一条数据
-     * @param {id} 数据唯一标识
-     * @return:
-     * @author: ym
-     */
-    deleteOne(id) {
-      let ids = [];
-      ids[0] = id;
-      let obj = {
-        messageContent: this.commonUtil.getMessageFromList(
-          "confirm.delete",
-          null
-        ),
-      };
-      this.commonUtil
-        .showConfirm(obj)
-        .then(async () => {
-          await this.$api.deleteProductType(ids).then((res) => {
-            this.searchTableList();
-          });
-        })
-        .catch(() => {
-          this.commonUtil.showMessage({
-            message: this.commonUtil.getMessageFromList("error.cancel", null),
-            type: this.commonConstants.messageType.info,
-          });
-        });
-    },
-    /**
-     * @description: 批量删除
-     * @param {type}
-     * @return:
-     * @author: ym
-     */
-    deleteBatch() {
-      const length = this.pageData.selectList.length;
-      if (length == 0) {
-        this.commonUtil.showMessage({
-          message: this.commonUtil.getMessageFromList(
-            "error.batchdelete.empty",
-            null
-          ),
-          type: this.commonConstants.messageType.error,
-        });
-      } else {
-        let ids = [];
-        for (let i = 0; i < length; i++) {
-          ids.push("" + this.pageData.selectList[i].productTypeId);
-        }
-        let obj = {
-          messageContent: this.commonUtil.getMessageFromList(
-            "confirm.delete",
-            null
-          ),
-        };
-        this.commonUtil
-          .showConfirm(obj)
-          .then(() => {
-            this.$api.deleteProductType(ids).then((res) => {
-              this.searchTableList();
-            });
-          })
-          .catch(() => {
-            this.commonUtil.showMessage({
-              message: this.commonUtil.getMessageFromList("error.cancel", null),
-              type: this.commonConstants.messageType.info,
-            });
-          });
-      }
-    },
-    selectChange(rows) {
-      this.pageData.selectList = rows;
-      rows = []
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-.content-dialog ::v-deep .el-dialog__body {
-  padding: 0px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/sys/common-problem.vue b/src/views/modules/sys/common-problem.vue
deleted file mode 100644
index bbf7ec2..0000000
--- a/src/views/modules/sys/common-problem.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-  <div class="mod-role">
-    <el-form :inline="true" @keyup.enter.native="getDataList()">
-      <el-form-item>
-        <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
-        <el-button type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table
-      :data="dataList"
-      border
-
-      v-loading="dataListLoading"
-      @selection-change="selectionChangeHandle"
-      style="width: 100%;">
-      <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50">
-      </el-table-column>
-      <el-table-column
-        type="index"
-        header-align="center"
-        align="center"
-        width="80"
-        label="序号">
-      </el-table-column>
-      <el-table-column
-        prop="problemName"
-        header-align="center"
-        align="center"
-        label="问题名称">
-      </el-table-column>
-      <el-table-column
-        prop="problemContent"
-        header-align="center"
-        align="center"
-        label="问题解答">
-        <template #default="scope">
-          <div style="display: flex">
-            <div>
-              {{ scope.row.problemContent.substring(0, 44) }}
-              <i v-if="scope.row.problemContent.length > 45" style="marginleft: 5px" class="el-icon-more"></i>
-            </div>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="createTime"
-        header-align="center"
-        align="center"
-        width="180"
-        label="修改时间">
-      </el-table-column>
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作">
-        <template slot-scope="scope">
-          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.problemId)">修改</el-button>
-          <el-button type="text" size="small" @click="deleteHandle(scope.row.problemId)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
-    </el-pagination>
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-  </div>
-</template>
-
-<script>
-  import AddOrUpdate from './problem-add-or-update'
-  export default {
-    data () {
-      return {
-        dataList: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false
-      }
-    },
-     components: {
-      AddOrUpdate
-    },
-    activated () {
-      this.getDataList()
-    },
-    methods: {
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
-        this.$http({
-          url: '/management/redsystemproblemsolve/getProblemList',
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize
-          })
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
-          } else {
-            this.dataList = []
-            this.totalPage = 0
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.getDataList()
-      },
-      // 多选
-      selectionChangeHandle (val) {
-        this.dataListSelections = val
-      },
-      // 新增 / 修改
-      addOrUpdateHandle (id) {
-        this.addOrUpdateVisible = true
-        console.log("新增时候的id为",id)
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
-        })
-      },
-      // 删除
-      deleteHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
-          return item.problemId
-        })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: '/management/redsystemproblemsolve/delete',
-            method: 'post',
-            data: this.$http.adornData(ids, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {})
-      }
-    }
-  }
-</script>
diff --git a/src/views/modules/sys/config-add-or-update.vue b/src/views/modules/sys/config-add-or-update.vue
deleted file mode 100644
index a16cea5..0000000
--- a/src/views/modules/sys/config-add-or-update.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<template>
-  <el-dialog
-    :title="!dataForm.id ? '新增' : '修改'"
-    :close-on-click-modal="false"
-    :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-      <el-form-item label="参数名" prop="paramKey">
-        <el-input v-model="dataForm.paramKey" placeholder="参数名"></el-input>
-      </el-form-item>
-      <el-form-item label="参数值" prop="paramValue">
-        <el-input v-model="dataForm.paramValue" placeholder="参数值"></el-input>
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-  export default {
-    data () {
-      return {
-        visible: false,
-        dataForm: {
-          id: 0,
-          paramKey: '',
-          paramValue: '',
-          remark: ''
-        },
-        dataRule: {
-          paramKey: [
-            { required: true, message: '参数名不能为空', trigger: 'blur' }
-          ],
-          paramValue: [
-            { required: true, message: '参数值不能为空', trigger: 'blur' }
-          ]
-        }
-      }
-    },
-    methods: {
-      init (id) {
-        this.dataForm.id = id || 0
-        this.visible = true
-        this.$nextTick(() => {
-          this.$refs['dataForm'].resetFields()
-          if (this.dataForm.id) {
-            this.$http({
-              url: `/sys/config/info/${this.dataForm.id}`,
-              method: 'get',
-              params: this.$http.adornParams()
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.dataForm.paramKey = data.config.paramKey
-                this.dataForm.paramValue = data.config.paramValue
-                this.dataForm.remark = data.config.remark
-              }
-            })
-          }
-        })
-      },
-      // 表单提交
-      dataFormSubmit () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            this.$http({
-              url: `/sys/config/${!this.dataForm.id ? 'save' : 'update'}`,
-              method: 'post',
-              data: this.$http.adornData({
-                'id': this.dataForm.id || undefined,
-                'paramKey': this.dataForm.paramKey,
-                'paramValue': this.dataForm.paramValue,
-                'remark': this.dataForm.remark
-              })
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                    this.visible = false
-                    this.$emit('refreshDataList')
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
-              }
-            })
-          }
-        })
-      }
-    }
-  }
-</script>
diff --git a/src/views/modules/sys/config.vue b/src/views/modules/sys/config.vue
deleted file mode 100644
index 3580f88..0000000
--- a/src/views/modules/sys/config.vue
+++ /dev/null
@@ -1,176 +0,0 @@
-<template>
-  <div class="mod-config">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item>
-        <el-input v-model="dataForm.paramKey" placeholder="参数名" clearable></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-        <el-button type="primary" @click="addOrUpdateHandle()">新增</el-button>
-        <el-button type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      @selection-change="selectionChangeHandle"
-      style="width: 100%;">
-      <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50">
-      </el-table-column>
-      <el-table-column
-        prop="id"
-        header-align="center"
-        align="center"
-        width="80"
-        label="ID">
-      </el-table-column>
-      <el-table-column
-        prop="paramKey"
-        header-align="center"
-        align="center"
-        label="参数名">
-      </el-table-column>
-      <el-table-column
-        prop="paramValue"
-        header-align="center"
-        align="center"
-        label="参数值">
-      </el-table-column>
-      <el-table-column
-        prop="remark"
-        header-align="center"
-        align="center"
-        label="备注">
-      </el-table-column>
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作">
-        <template slot-scope="scope">
-          <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">修改</el-button>
-          <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
-    </el-pagination>
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-  </div>
-</template>
-
-<script>
-  import AddOrUpdate from './config-add-or-update'
-  export default {
-    data () {
-      return {
-        dataForm: {
-          paramKey: ''
-        },
-        dataList: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false
-      }
-    },
-    components: {
-      AddOrUpdate
-    },
-    activated () {
-      this.getDataList()
-    },
-    methods: {
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
-        this.$http({
-          url: '/sys/config/list',
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize,
-            'paramKey': this.dataForm.paramKey
-          })
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
-          } else {
-            this.dataList = []
-            this.totalPage = 0
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.getDataList()
-      },
-      // 多选
-      selectionChangeHandle (val) {
-        this.dataListSelections = val
-      },
-      // 新增 / 修改
-      addOrUpdateHandle (id) {
-        this.addOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
-        })
-      },
-      // 删除
-      deleteHandle (id) {
-        var ids = id ? [id] : this.dataListSelections.map(item => {
-          return item.id
-        })
-        this.$confirm(`确定对[id=${ids.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: '/sys/config/delete',
-            method: 'post',
-            data: this.$http.adornData(ids, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {})
-      }
-    }
-  }
-</script>
diff --git a/src/views/modules/sys/feedback.vue b/src/views/modules/sys/feedback.vue
deleted file mode 100644
index 8b4a4e1..0000000
--- a/src/views/modules/sys/feedback.vue
+++ /dev/null
@@ -1,481 +0,0 @@
-<template>
-  <div class="mod-role">
-    <el-form
-      :inline="true"
-      :model="dataForm"
-      @keyup.enter.native="getDataList()"
-    >
-      <el-form-item label="搜索" label-width="100px">
-        <el-input
-          v-model="dataForm.searchName"
-          placeholder="搜索用户名/用户电话"
-          clearable
-        ></el-input>
-      </el-form-item>
-      <!-- 来源筛选 -->
-      <!-- <el-form-item label="反馈来源" label-width="100px">
-        <el-select v-model="dataForm.sourceValue" placeholder="请选择反馈来源">
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item> -->
-      <!-- 类型筛选 -->
-      <el-form-item label="反馈类型" label-width="100px">
-        <el-select v-model="dataForm.feedbackType" placeholder="请选择反馈类型">
-          <el-option
-            v-for="item in typeOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <!-- 日期选择器 -->
-      <el-form-item label="选择日期" label-width="100px">
-        <div class="block">
-          <el-date-picker
-            format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            v-model="dataForm.timeValue"
-            type="datetimerange"
-            :picker-options="pickerOptions"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            align="right"
-          >
-          </el-date-picker>
-        </div>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="getDataList()">查询</el-button>
-        <el-button type="warning" @click="clearData()">重置</el-button>
-        <el-button
-          type="danger"
-          @click="deleteHandle()"
-          :disabled="dataListSelections.length <= 0"
-          >批量删除</el-button
-        >
-      </el-form-item>
-    </el-form>
-    <!-- 展示内容为  意见反馈图片 内容  用户名  用户电话 反馈来源  反馈时间  操作 -->
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      @selection-change="selectionChangeHandle"
-      style="width: 100%"
-    >
-      <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50"
-      >
-      </el-table-column>
-      <el-table-column
-        type="index"
-        header-align="center"
-        align="center"
-        width="80"
-        label="序号"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="feedbackContent"
-        header-align="center"
-        align="center"
-        label="内容"
-        width="350"
-      >
-        <!-- 只展示前面几十个字 -->
-        <template #default="scope">
-          <div style="display: flex">
-            <div>
-              {{
-                scope.row.feedbackContent
-                  ? scope.row.feedbackContent.substring(0, 44)
-                  : ""
-              }}
-              <i
-                v-if="
-                  scope.row.feedbackContent &&
-                  scope.row.feedbackContent.length > 45
-                "
-                style="marginleft: 5px"
-                class="el-icon-more"
-              ></i>
-            </div>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="feedbackImg"
-        header-align="center"
-        align="center"
-        label="图片"
-        width="350"
-      >
-        <!-- 只要展示少量的几张图片 -->
-        <template #default="scope">
-          <div style="display: flex" v-if="scope.row.feedbackImg.length > 0">
-            <div
-              v-for="(item, index) in scope.row.feedbackImg.slice(0, 3)"
-              :key="index"
-              :style="{
-                width: item == '' ? '0px' : '90px',
-                height: item == '' ? '0px' : '90px',
-                backgroundImage: 'url(' + item + ')',
-                backgroundSize: 'cover',
-                marginLeft: '10px',
-              }"
-              @click="shopPicture(item)"
-            ></div>
-            <div
-              v-if="scope.row.feedbackImg.length > 3"
-              style="marginleft: 10px; margintop: 35px"
-            >
-              <i
-                class="el-icon-more"
-                style="marginleft: 10px; margintop: 40px"
-              ></i>
-            </div>
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="userName"
-        header-align="center"
-        align="center"
-        label="用户名"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="userCellphone"
-        header-align="center"
-        align="center"
-        width=""
-        label="用户电话"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="feedbackType"
-        header-align="center"
-        align="center"
-        width=""
-        label="反馈类型"
-      >
-      </el-table-column>
-      <!-- <el-table-column
-        prop="feedbackSource"
-        header-align="center"
-        align="center"
-        label="反馈来源"
-      >
-        <template slot-scope="scope">
-          {{
-            scope.row.feedbackSource == 1
-              ? "红色记忆APP"
-              : scope.row.feedbackSource == 2
-              ? "红色记忆小程序"
-              : "暂无"
-          }}
-        </template>
-      </el-table-column> -->
-      <el-table-column
-        prop="createTime"
-        header-align="center"
-        align="center"
-        label="反馈时间"
-      >
-      </el-table-column>
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作"
-      >
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="
-              showDetail(scope.row.feedbackImg, scope.row.feedbackContent)
-            "
-            >详情</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="deleteHandle(scope.row.feedbackId)"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper"
-    >
-    </el-pagination>
-    <!-- 图片展示弹出框 -->
-    <el-dialog :visible.sync="dialogVisible" width="800px">
-      <img style="width: 600px" :src="dialogImageUrl" alt="" />
-    </el-dialog>
-    <!-- 反馈详情弹出框 -->
-    <el-dialog :visible.sync="dialogDetailVisible" width="600px">
-      <div>
-        <div style="margin:40px 0;">
-          <div style="font-size: 30px; font-weight: bold">反馈图片</div>
-          <div style="display: flex">
-            <div
-              style="margin-top:30px"
-              v-for="(item, index) in feedbackImg"
-              :key="index"
-            >
-              <img style="width: 100%; margin-left: 20px" :src="item" alt="" />
-            </div>
-          </div>
-        </div>
-        <div style="margin:40px 0;">
-          <div style="font-size: 30px;font-weight: bold; margin-top: 50px;">
-            反馈内容
-          </div>
-          <div style="margin: 30px 20px 20px 50px">
-            {{ feedbackContent }}
-          </div>
-        </div>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      dataForm: {
-        searchName: "",
-        timeValue: "",
-        sourceValue: "",
-        feedbackType: "",
-      },
-      dataList: [],
-      pageIndex: 1,
-      pageSize: 10,
-      totalPage: 0,
-      dataListLoading: false,
-      dataListSelections: [],
-      dialogVisible: false,
-      dialogImageUrl: "",
-      dialogDetailVisible: false,
-      feedbackImg: [],
-      feedbackContent: "",
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
-            },
-          },
-        ],
-      },
-      options: [
-        {
-          value: "1",
-          label: "红色记忆APP",
-        },
-        {
-          value: "2",
-          label: "红色记忆小程序",
-        },
-      ],
-      typeOptions: [
-        {
-          value: "功能异常",
-          label: "功能异常",
-        },
-        {
-          value: "体验问题",
-          label: "体验问题",
-        },
-        {
-          value: "产品建议",
-          label: "产品建议",
-        },
-      ],
-    };
-  },
-  activated() {
-    this.getDataList();
-  },
-  methods: {
-    // 获取数据列表
-    getDataList() {
-      // console.log(this.dataForm);
-      if (this.dataForm.timeValue != null && this.dataForm.timeValue != "") {
-        this.dataForm.startTime = this.dataForm.timeValue[0];
-        this.dataForm.endTime = this.dataForm.timeValue[1];
-      }
-      if (
-        this.dataForm.sourceValue != null &&
-        this.dataForm.sourceValue != ""
-      ) {
-        this.dataForm.feedbackSource = this.dataForm.sourceValue;
-      }
-      if (
-        this.dataForm.feedbackType != null &&
-        this.dataForm.feedbackType != ""
-      ) {
-        this.dataForm.feedbackType = this.dataForm.feedbackType;
-      }
-      // console.log(this.dataForm);
-      this.dataListLoading = true;
-      this.$http({
-        url: "/management/redsystemfeedback/getFeedbackByParams",
-        method: "get",
-        params: this.$http.adornParams({
-          page: this.pageIndex,
-          limit: this.pageSize,
-          searchName: this.dataForm.searchName,
-          startTime: this.dataForm.startTime,
-          endTime: this.dataForm.endTime,
-          feedbackSource: this.dataForm.feedbackSource,
-          feedbackType: this.dataForm.feedbackType,
-        }),
-      }).then(({ data }) => {
-        // console.log(data)
-        if (data && data.code === 0) {
-          this.dataList = data.page.list;
-          this.totalPage = data.page.totalCount;
-          //处理图片改为一个图片列表
-          for (var i = 0; i < this.dataList.length; i++) {
-            if (
-              this.dataList[i].feedbackImg != null &&
-              this.dataList[i].feedbackImg != ""
-            ) {
-              var list = this.dataList[i].feedbackImg.split(",");
-              this.dataList[i].feedbackImg = list;
-            } else {
-              this.dataList[i].feedbackImg = "";
-            }
-          }
-        } else {
-          this.dataList = [];
-          this.totalPage = 0;
-        }
-        this.dataListLoading = false;
-      });
-    },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.pageSize = val;
-      this.pageIndex = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.pageIndex = val;
-      this.getDataList();
-    },
-    // 多选
-    selectionChangeHandle(val) {
-      this.dataListSelections = val;
-    },
-    // 删除
-    deleteHandle(id) {
-      console.log(id);
-      var ids = id
-        ? [id]
-        : this.dataListSelections.map((item) => {
-            return item.feedbackId;
-          });
-      this.$confirm(
-        `确定对[id=${ids.join(",")}]进行[${id ? "删除" : "批量删除"}]操作?`,
-        "提示",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
-        .then(() => {
-          this.$http({
-            url: "/management/redsystemfeedback/delete",
-            method: "post",
-            data: this.$http.adornData(ids, false),
-          }).then(({ data }) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: "操作成功",
-                type: "success",
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList();
-                },
-              });
-            } else {
-              this.$message.error(data.msg);
-            }
-          });
-        })
-        .catch(() => {});
-    },
-    //点击展示图片
-    shopPicture(data) {
-      this.dialogVisible = true;
-      this.dialogImageUrl = data;
-    },
-    //展示意见反馈信息
-    showDetail(feedbackImg, feedbackContent) {
-      this.feedbackImg = feedbackImg;
-      this.feedbackContent = feedbackContent;
-      this.dialogDetailVisible = true;
-    },
-    //重置清空当前的数据
-    clearData() {
-      this.dataForm = {
-        searchName: "",
-        timeValue: "",
-        sourceValue: "",
-        feedbackType: "",
-      };
-    },
-  },
-};
-</script>
diff --git a/src/views/modules/sys/log.vue b/src/views/modules/sys/log.vue
deleted file mode 100644
index fb16572..0000000
--- a/src/views/modules/sys/log.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <div class="mod-log">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item>
-        <el-input v-model="dataForm.key" placeholder="用户名／用户操作" clearable></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      style="width: 100%">
-      <el-table-column
-        prop="id"
-        header-align="center"
-        align="center"
-        width="80"
-        label="ID">
-      </el-table-column>
-      <el-table-column
-        prop="username"
-        header-align="center"
-        align="center"
-        label="用户名">
-      </el-table-column>
-      <el-table-column
-        prop="operation"
-        header-align="center"
-        align="center"
-        label="用户操作">
-      </el-table-column>
-      <el-table-column
-        prop="method"
-        header-align="center"
-        align="center"
-        width="150"
-        :show-overflow-tooltip="true"
-        label="请求方法">
-      </el-table-column>
-      <el-table-column
-        prop="params"
-        header-align="center"
-        align="center"
-        width="150"
-        :show-overflow-tooltip="true"
-        label="请求参数">
-      </el-table-column>
-      <el-table-column
-        prop="time"
-        header-align="center"
-        align="center"
-        label="执行时长(毫秒)">
-      </el-table-column>
-      <el-table-column
-        prop="ip"
-        header-align="center"
-        align="center"
-        width="150"
-        label="IP地址">
-      </el-table-column>
-      <el-table-column
-        prop="createDate"
-        header-align="center"
-        align="center"
-        width="180"
-        label="创建时间">
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
-    </el-pagination>
-  </div>
-</template>
-
-<script>
-  export default {
-    data () {
-      return {
-        dataForm: {
-          key: ''
-        },
-        dataList: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
-        dataListLoading: false,
-        selectionDataList: []
-      }
-    },
-    created () {
-      this.getDataList()
-    },
-    methods: {
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
-        this.$http({
-          url: '/sys/log/list',
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize,
-            'key': this.dataForm.key
-          })
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
-          } else {
-            this.dataList = []
-            this.totalPage = 0
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.getDataList()
-      }
-    }
-  }
-</script>
diff --git a/src/views/modules/sys/menu-add-or-update.vue b/src/views/modules/sys/menu-add-or-update.vue
deleted file mode 100644
index 7451da0..0000000
--- a/src/views/modules/sys/menu-add-or-update.vue
+++ /dev/null
@@ -1,259 +0,0 @@
-<template>
-  <el-dialog
-    :title="!dataForm.id ? '新增' : '修改'"
-    :close-on-click-modal="false"
-    :visible.sync="visible"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmit()"
-      label-width="80px"
-    >
-      <el-form-item label="资源类型" prop="type">
-        <el-radio-group v-model="dataForm.type">
-          <el-radio
-            v-for="(type, index) in dataForm.typeList"
-            :label="index+1"
-            :key="index"
-            >{{ type }}</el-radio
-          >
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        :label="dataForm.typeList[dataForm.type-1] + '名称'"
-        prop="name"
-      >
-        <el-input
-          v-model="dataForm.name"
-          :placeholder="dataForm.typeList[dataForm.type-1] + '名称'"
-        ></el-input>
-      </el-form-item>
-      <el-form-item label="上级资源" prop="parentName">
-        <el-popover
-          ref="menuListPopover"
-          placement="bottom-start"
-          trigger="click"
-        >
-          <div style="max-height: 50vh; overflow-y: scroll; width: 500px">
-            <el-tree
-              :data="menuList"
-              :props="menuListTreeProps"
-              node-key="id"
-              ref="menuListTree"
-              @current-change="menuListTreeCurrentChangeHandle"
-              :default-expand-all="true"
-              :highlight-current="true"
-              :expand-on-click-node="false"
-            >
-            </el-tree>
-          </div>
-        </el-popover>
-        <el-input
-          v-model="dataForm.parentName"
-          v-popover:menuListPopover
-          :readonly="true"
-          placeholder="点击选择上级菜单"
-          class="menu-list__input"
-        ></el-input>
-      </el-form-item>
-      <!-- <el-form-item v-if="dataForm.type === 1" label="菜单路由" prop="url">
-        <el-input v-model="dataForm.url" placeholder="菜单路由"></el-input>
-      </el-form-item> -->
-      <el-form-item label="授权标识" prop="permissionKey">
-        <el-input
-          v-model="dataForm.permissionKey"
-          placeholder="多个用逗号分隔, 如: user:list,user:create"
-        ></el-input>
-      </el-form-item>
-      <!-- <el-form-item v-if="dataForm.type !== 2" label="排序号" prop="orderNum">
-        <el-input-number v-model="dataForm.orderNum" controls-position="right" :min="0" label="排序号"></el-input-number>
-      </el-form-item> -->
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { treeDataTranslate } from "@/utils";
-import Icon from "@/icons";
-export default {
-  data() {
-    var validateUrl = (rule, value, callback) => {
-      if (this.dataForm.type === 1 && !/\S/.test(value)) {
-        callback(new Error("菜单URL不能为空"));
-      } else {
-        callback();
-      }
-    };
-    return {
-      visible: false,
-      dataForm: {
-        id: 0,
-        type: 1,
-        typeList: ["目录", "菜单", "按钮"],
-        name: "",
-        parentId: 0,
-        parentName: "",
-        url: "",
-        permissionKey: "",
-        orderNum: 0,
-        icon: "",
-        iconList: [],
-      },
-      dataRule: {
-        name: [
-          { required: true, message: "菜单名称不能为空", trigger: "blur" },
-        ],
-        parentName: [
-          { required: true, message: "上级菜单不能为空", trigger: "change" },
-        ],
-        permissionKey: [
-          { required: true, message: "权限标识不能为空", trigger: "blur" },
-        ],
-        url: [{ validator: validateUrl, trigger: "blur" }],
-      },
-      menuList: [],
-      menuListTreeProps: {
-        label: "name",
-        children: "children",
-      },
-    };
-  },
-  created() {
-    this.iconList = Icon.getNameList();
-  },
-  methods: {
-    init(id, rowData) {
-      this.dataForm.id = id || 0;
-      this.$http({
-        url: "/resource/list",
-        method: "get",
-        params: this.$http.adornParams(),
-      })
-        .then(({ data }) => {
-          this.menuList = [{
-            id:0,
-            name:"一级资源",
-            parentId:-1,
-            // permissionKey:"",
-            children:data.data
-          }];
-        })
-        .then(() => {
-          this.visible = true;
-          this.$nextTick(() => {
-            this.$refs["dataForm"].resetFields();
-          });
-        })
-        .then(() => {
-          if (!this.dataForm.id) {
-            // 新增
-            this.menuListTreeSetCurrentNode();
-          } else {
-            this.dataForm.id=rowData.id;
-            this.dataForm.name=rowData.name;
-            this.dataForm.parentId=rowData.parentId;
-            this.dataForm.permissionKey=rowData.permissionKey;
-            this.dataForm.type=rowData.type;
-            console.log("this.dataForm",this.dataForm);
-            this.menuListTreeSetCurrentNode();
-          }
-        });
-    },
-    // 菜单树选中
-    menuListTreeCurrentChangeHandle(data, node) {
-      this.dataForm.parentId = data.id;
-      this.dataForm.parentName = data.name;
-    },
-    // 菜单树设置当前选中节点
-    menuListTreeSetCurrentNode() {
-      this.$refs.menuListTree.setCurrentKey(this.dataForm.parentId);
-      this.dataForm.parentName = (this.$refs.menuListTree.getCurrentNode() ||
-        {})["name"];
-    },
-    // 图标选中
-    iconActiveHandle(iconName) {
-      this.dataForm.icon = iconName;
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs["dataForm"].validate((valid) => {
-        if (valid) {
-          this.$http({
-            url: `/resource/${!this.dataForm.id ? "add" : "update"}${this.dataForm.id?`?resourceId=${this.dataForm.id}`:''}`,
-            method: !this.dataForm.id ? "post" : "put",
-            data: this.$http.adornData({
-              type: this.dataForm.type,
-              name: this.dataForm.name,
-              parentId: this.dataForm.parentId,
-              permissionKey: this.dataForm.permissionKey
-              // 'menuId': this.dataForm.id || undefined,
-              // 'url': this.dataForm.url,
-              // 'orderNum': this.dataForm.orderNum,
-              // 'icon': this.dataForm.icon
-            }),
-          }).then(({ data }) => {
-            this.$message({
-              message: "操作成功",
-              type: "success",
-              duration: 1500,
-              onClose: () => {
-                this.visible = false;
-                this.$emit("refreshDataList");
-              },
-            });
-          });
-        }
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss">
-.mod-menu {
-  .menu-list__input,
-  .icon-list__input {
-    > .el-input__inner {
-      cursor: pointer;
-    }
-  }
-  &__icon-popover {
-    width: 458px;
-    overflow: hidden;
-  }
-  &__icon-inner {
-    width: 478px;
-    max-height: 258px;
-    overflow-x: hidden;
-    overflow-y: auto;
-  }
-  &__icon-list {
-    width: 458px;
-    padding: 0;
-    margin: -8px 0 0 -8px;
-    > .el-button {
-      padding: 8px;
-      margin: 8px 0 0 8px;
-      > span {
-        display: inline-block;
-        vertical-align: middle;
-        width: 18px;
-        height: 18px;
-        font-size: 18px;
-      }
-    }
-  }
-  .icon-list__tips {
-    font-size: 18px;
-    text-align: center;
-    color: #e6a23c;
-    cursor: pointer;
-  }
-}
-</style>
diff --git a/src/views/modules/sys/menu.vue b/src/views/modules/sys/menu.vue
deleted file mode 100644
index f8932d2..0000000
--- a/src/views/modules/sys/menu.vue
+++ /dev/null
@@ -1,173 +0,0 @@
-<template>
-  <div class="mod-menu">
-    <el-form :inline="true" :model="dataForm">
-      <el-form-item>
-        <el-button
-          icon="el-icon-plus"
-          round
-          type="primary"
-          @click="addOrUpdateHandle()"
-          >新增资源</el-button
-        >
-      </el-form-item>
-    </el-form>
-
-    <el-table :data="dataList" row-key="id" border style="width: 100%">
-      <el-table-column
-        prop="name"
-        header-align="center"
-        min-width="150"
-        label="资源名称"
-      >
-      </el-table-column>
-      <!-- <el-table-column
-        prop="parentName"
-        header-align="center"
-        align="center"
-        width="120"
-        label="上级菜单"
-      >
-      </el-table-column> -->
-      <!-- <el-table-column header-align="center" align="center" label="图标">
-        <template slot-scope="scope">
-          <icon-svg :name="scope.row.icon || ''"></icon-svg>
-        </template>
-      </el-table-column> -->
-      <el-table-column
-        prop="type"
-        header-align="center"
-        align="center"
-        label="资源类型"
-      >
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.type === 1" size="small">目录</el-tag>
-          <el-tag v-else-if="scope.row.type === 2" size="small" type="success"
-            >菜单</el-tag
-          >
-          <el-tag v-else-if="scope.row.type === 3" size="small" type="info"
-            >按钮</el-tag
-          >
-        </template>
-      </el-table-column>
-      <!-- <el-table-column
-        prop="orderNum"
-        header-align="center"
-        align="center"
-        label="排序号"
-      >
-      </el-table-column> -->
-      <el-table-column
-        prop="url"
-        header-align="center"
-        align="center"
-        :show-overflow-tooltip="true"
-        label="资源地址"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="permissionKey"
-        header-align="center"
-        align="center"
-        :show-overflow-tooltip="true"
-        label="资源授权标识"
-      >
-      </el-table-column>
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作"
-      >
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="addOrUpdateHandle(scope.row.id,scope.row)"
-            >修改</el-button
-          >
-          <el-button
-            type="text"
-            size="small"
-            @click="deleteHandle(scope.row.id)"
-            >删除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update
-      v-if="addOrUpdateVisible"
-      ref="addOrUpdate"
-      @refreshDataList="getDataList"
-    ></add-or-update>
-  </div>
-</template>
-
-<script>
-import AddOrUpdate from "./menu-add-or-update";
-import { treeDataTranslate } from "@/utils";
-export default {
-  data() {
-    return {
-      dataForm: {},
-      dataList: [],
-      dataListLoading: false,
-      addOrUpdateVisible: false,
-    };
-  },
-  components: {
-    AddOrUpdate,
-  },
-  activated() {
-    this.getDataList();
-  },
-  methods: {
-    // 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.$http({
-        url: "/resource/list",
-        method: "get",
-        params: this.$http.adornParams(),
-      }).then(({ data }) => {
-        console.log("data",data);
-        this.dataList = data.data;
-        this.dataListLoading = false;
-      });
-    },
-    // 新增 / 修改
-    addOrUpdateHandle(id,rowData) {
-      this.addOrUpdateVisible = true;
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(id,rowData);
-      });
-    },
-    // 删除
-    deleteHandle(id) {
-      this.$confirm(`确定对[id=${id}]进行[删除]操作?`, "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          this.$http({
-            url: `/resource/delete?resourceId=${id}`,
-            method: "delete",
-            data: this.$http.adornData(),
-          }).then(({ data }) => {
-            this.$message({
-              message: "操作成功",
-              type: "success",
-              duration: 1500,
-              onClose: () => {
-                this.getDataList();
-              },
-            });
-          });
-        })
-        .catch(() => {});
-    },
-  },
-};
-</script>
diff --git a/src/views/modules/sys/org-add-or-update-super-admin-account.vue b/src/views/modules/sys/org-add-or-update-super-admin-account.vue
deleted file mode 100644
index 63f0d19..0000000
--- a/src/views/modules/sys/org-add-or-update-super-admin-account.vue
+++ /dev/null
@@ -1,214 +0,0 @@
-<template>
-  <div>
-    <obj-modal
-      :key="refreshKey"
-      ref="modal"
-      labelWidth="100px"
-      :modalConfig="modalConfig"
-      :modalCols="modalCols"
-      :modalData="modalData"
-      :modalHandles="modalHandles"
-    >
-      <div slot="dialog__before" class="mb-2" v-if="!isAdd">
-        <el-alert
-          title="重新分配与修改提示"
-          type="warning"
-          description="如果账号名称发生改变，系统将重新分配新账号，原先的账号将被删除并无法恢复，请谨慎操作。如果账号名称不改变，仅重新填入密码，系统将对原账号进行重置密码操作。"
-          show-icon
-        >
-        </el-alert>
-      </div>
-    </obj-modal>
-  </div>
-</template>
-<script>
-import { orgTypeOptions } from "@/mapper/org-type.js";
-import { debounce, cloneDeep } from "lodash";
-export default {
-  data() {
-    return {
-      refreshKey: 1,
-      isAdd: true,
-      isLoading: false,
-      //监控对象数据
-      tableData: [],
-      //表格属性
-      tableProp: {},
-      modalConfig: {
-        title: "创建账号",
-        show: false,
-      },
-      modalCols: [
-        {
-          label: "账号",
-          prop: "username",
-          type: "Input",
-          require: true,
-          rules: { required: true, message: "请输入账号" },
-        },
-        {
-          label: "密码",
-          prop: "password",
-          type: "jsx",
-          width: "100%",
-          require: true,
-          rules: { required: true, message: "请输入密码" },
-          render: () => {
-            return (
-              <el-input
-                placeholder="请输入密码"
-                type="password"
-                v-model={this.modalData.password}
-              />
-            );
-          },
-        },
-      ],
-      modalData: {
-        username: "",
-        password: "",
-      },
-    };
-  },
-  methods: {
-    toggle(e) {
-      if (this.modalConfig.show == false) {
-        this.modalConfig.show = true;
-      } else {
-        this.modalConfig.show = false;
-        setTimeout(() => {
-          this.refreshKey = -this.refreshKey;
-        }, 300);
-      }
-      if (e) {
-        this.init(cloneDeep(e));
-      }
-      return {
-        add: () => {
-          this.$set(this.modalConfig, "title", "分配账号");
-          this.$nextTick(() => {
-            this.modalData = {
-              ...this.modalData,
-              username: "",
-              password: "",
-            };
-            console.log("this.modalData", this.modalData);
-            this.$refs.modal.resetFields();
-          });
-          this.isAdd = true;
-        },
-        update: () => {
-          this.$set(this.modalData, "username", this.modalData.account);
-          this.$set(this.modalConfig, "title", "重新分配账号/修改密码");
-          this.isAdd = false;
-        },
-      };
-    },
-    init(row) {
-      this.modalData = row;
-    },
-  },
-  computed: {
-    modalHandles() {
-      return [
-        {
-          label: "取消",
-          icon: "el-icon-close",
-          handle: () => {
-            this.toggle();
-          },
-        },
-        {
-          label: this.isAdd
-            ? "确认分配"
-            : this.modalData.username == this.modalData.account
-            ? "确认修改密码"
-            : "确认重新分配",
-          type: this.isAdd
-            ? "primary"
-            : this.modalData.username == this.modalData.account
-            ? "warning"
-            : "danger",
-          icon: "el-icon-check",
-          loading: this.isLoading,
-          submit: true,
-          handle: () => {
-            setTimeout(() => {
-              this.isLoading = false;
-            }, 1000);
-            console.log(this.modalData);
-            if (this.isAdd) {
-              this.$api.org
-                .assignAccount({
-                  username: this.modalData.username,
-                  password: this.modalData.password,
-                  orgId: this.modalData.id,
-                })
-                .then((res) => {
-                  this.isLoading = false;
-                  this.$emit("refresh");
-                  this.toggle();
-                })
-                .catch((err) => {
-                  this.isLoading = false;
-                  console.log(err);
-                });
-            } else {
-              if (this.modalData.username == this.modalData.account) {
-                //修改密码
-                this.$api.org
-                  .changeAccountPassword({
-                    password: this.modalData.password,
-                    orgId: this.modalData.id,
-                  })
-                  .then((res) => {
-                    this.isLoading = false;
-                    this.$emit("refresh");
-                    this.toggle();
-                  })
-                  .catch((err) => {
-                    this.isLoading = false;
-                    console.log(err);
-                  });
-              } else {
-                //重修分配
-                this.$api.org
-                  .reassignAccount({
-                    username: this.modalData.username,
-                    password: this.modalData.password,
-                    orgId: this.modalData.id,
-                  })
-                  .then((res) => {
-                    this.isLoading = false;
-                    this.$emit("refresh");
-                    this.toggle();
-                  })
-                  .catch((err) => {
-                    this.isLoading = false;
-                    console.log(err);
-                  });
-              }
-            }
-          },
-        },
-      ];
-    },
-  },
-  asyncComputed: {
-    async orgTree() {
-      let res = await this.$api.org.getOrgList();
-      return [
-        {
-          name: "最高级机构",
-          type: "0",
-          id: "0",
-          parentId: "0",
-          children: res.data.data,
-        },
-      ];
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/modules/sys/org-add-or-update.vue b/src/views/modules/sys/org-add-or-update.vue
deleted file mode 100644
index 7e6897e..0000000
--- a/src/views/modules/sys/org-add-or-update.vue
+++ /dev/null
@@ -1,190 +0,0 @@
-<template>
-  <div>
-    <obj-modal
-      ref="modal"
-      labelWidth="100px"
-      :modalConfig="modalConfig"
-      :modalCols="modalCols"
-      :modalData="modalData"
-      :modalHandles="modalHandles"
-    >
-    </obj-modal>
-  </div>
-</template>
-<script>
-import { orgTypeOptions } from "@/mapper/org-type.js";
-import { debounce, cloneDeep } from "lodash";
-export default {
-  data() {
-    return {
-      isAdd: true,
-      isLoading: false,
-      //监控对象数据
-      tableData: [],
-      //表格属性
-      tableProp: {},
-      modalConfig: {
-        title: "添加机构",
-        show: false,
-      },
-      modalCols: [
-        {
-          label: "机构名称",
-          prop: "name",
-          type: "Input",
-          require: true,
-          rules: { required: true, message: "机构名称" },
-        },
-        {
-          label: "机构类型",
-          prop: "type",
-          type: "Select",
-          width: "100%",
-          //    1 省教育厅 2 市教育局 3 区教育局 4 学校
-          options: orgTypeOptions,
-          require: true,
-          rules: { required: true, message: "获奖成就" },
-        },
-        {
-          label: "上级机构",
-          prop: "parentId",
-          type: "jsx",
-          width: "100%",
-          required: true,
-          rules: { required: true, message: "上级机构" },
-          render: () => {
-            return (
-              <el-cascader
-                show-all-levels={false}
-                class="w-100"
-                filterable={true}
-                v-model={this.modalData.parentId}
-                options={this.orgTree}
-                props={{
-                  props: { checkStrictly: true, label: "name", value: "id",emitPath:false },
-                }}
-                clearable={true}
-              ></el-cascader>
-            );
-          },
-        },
-      ],
-      modalData: {
-        name: "",
-        type: "",
-        parentId: "",
-      },
-    };
-  },
-  methods: {
-    toggle(e) {
-      if (this.modalConfig.show == false) {
-        this.modalConfig.show = true;
-      } else {
-        this.modalConfig.show = false;
-      }
-      if (e) {
-        this.init(cloneDeep(e));
-      }
-      return {
-        add: () => {
-          this.$set(this.modalConfig, "title", "添加机构");
-          this.$nextTick(() => {
-            this.modalData = {
-              name: "",
-              parentId: "",
-              type: "",
-            };
-            this.$refs.modal.resetFields();
-          });
-          this.isAdd = true;
-        },
-        update: () => {
-          this.$set(this.modalConfig, "title", "编辑机构");
-          this.isAdd = false;
-        },
-      };
-    },
-    init(row) {
-      this.modalData = row;
-    },
-  },
-  computed: {
-    modalHandles() {
-      return [
-        {
-          label: "取消",
-          icon: "el-icon-close",
-          handle: () => {
-            this.toggle();
-          },
-        },
-        {
-          label: this.isAdd ? "确认添加" : "确认修改",
-          type: "primary",
-          icon: "el-icon-check",
-          loading: this.isLoading,
-          submit: true,
-          handle: () => {
-            setTimeout(() => {
-              this.isLoading = false;
-            }, 1000);
-            console.log(this.modalData);
-            if (this.isAdd) {
-              this.$api.org
-                .createOrg({
-                  name: this.modalData.name,
-                  parentId:
-                    this.modalData.parentId,
-                  type: this.modalData.type,
-                })
-                .then((res) => {
-                  this.isLoading = false;
-                  this.$emit("refresh");
-                  this.toggle();
-                })
-                .catch((err) => {
-                  this.isLoading = false;
-                  console.log(err);
-                });
-            } else {
-              this.$api.org
-                .editOrg(this.modalData.id, {
-                  name: this.modalData.name,
-                  parentId: this.modalData.parentId,
-                  type: this.modalData.type,
-                })
-                .then((res) => {
-                  this.isLoading = false;
-                  this.$emit("refresh");
-                  this.toggle();
-                })
-                .catch((err) => {
-                  this.isLoading = false;
-                  console.log(err);
-                });
-            }
-          },
-        },
-      ];
-    },
-  },
-  asyncComputed: {
-    async orgTree() {
-      let a=this.modalConfig.show;
-      let res = await this.$api.org.getOrgList();
-      return [
-        {
-          name: "【最高级机构】",
-          type: "0",
-          id: "0",
-          parentId: "0",
-          children: res.data.data,
-        },
-      ];
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/modules/sys/org.vue b/src/views/modules/sys/org.vue
deleted file mode 100644
index 73eacf5..0000000
--- a/src/views/modules/sys/org.vue
+++ /dev/null
@@ -1,170 +0,0 @@
-<template>
-  <div style="height: calc(100vh - 92px - 40px);">
-    <div style="height: 100%">
-      <obj-table-plus
-        ref="oTable"
-        @query="queryList"
-        :tableCols="tableCols"
-        :tableProp="tableProp"
-        :isPagination="false"
-        v-model="dataList"
-      >
-        <div slot="tableTop" class="mb-2">
-          <el-button type="primary" round @click="addOrg">
-            <i class="el-icon-plus"></i>
-            <span>新增组织机构</span>
-          </el-button>
-        </div>
-      </obj-table-plus>
-    </div>
-    <org-add-or-update @refresh="$refs.oTable.reload()" ref="orgAddOrUpdate" />
-    <org-add-or-update-super-admin-account
-      @refresh="$refs.oTable.reload()"
-      ref="orgAddOrUpdateSuperAdminAccount"
-    />
-  </div>
-</template>
-
-<script>
-import { orgTypeMapper } from "@/mapper/org-type.js";
-import orgAddOrUpdate from "./org-add-or-update.vue";
-import OrgAddOrUpdateSuperAdminAccount from "./org-add-or-update-super-admin-account.vue";
-export default {
-  components: { orgAddOrUpdate, OrgAddOrUpdateSuperAdminAccount },
-  data() {
-    return {
-      dataList: [],
-      tableProp: {
-        "row-config": {
-          keyField: "id",
-        },
-        "auto-resize": true,
-        //带多选
-        "checkbox-config": {
-          labelField: "",
-          reserve: true,
-        },
-        "show-overflow": false,
-        "tree-config": {
-          childrenField: "children",
-          expandAll: true,
-          rowField: "id",
-          parentField: "parentId",
-        },
-        height: "auto",
-      },
-    };
-  },
-  methods: {
-    queryList(pageNo, pageSize) {
-      this.$api.org
-        .getOrgList()
-        .then((res) => {
-          this.$refs.oTable.complete(res.data.data);
-        })
-        .catch((err) => {
-          console.log(err);
-          this.$refs.oTable.complete(false);
-        });
-    },
-    addOrg() {
-      this.$refs.orgAddOrUpdate.toggle().add();
-    },
-  },
-  computed: {
-    tableCols() {
-      return [
-        {
-          title: "组织机构名称",
-          field: "name",
-          "tree-node": true,
-          "header-align": "center",
-        },
-        {
-          title: "组织机构类型",
-          field: "type",
-          type: "jsx",
-          "header-align": "center",
-          align:"center",
-          render: ({ row }) => {
-            return <el-tag type="info">{orgTypeMapper[row.type]}</el-tag>;
-          },
-        },
-        {
-          title: "管理员账号",
-          type: "jsx",
-          "title-prefix": {
-            content:
-              "每个组织机构需要手动创建一个【超级管理员】账号，用于管理该机构下的用户和角色。",
-          },
-          "header-align": "center",
-          align: "center",
-          render: ({ row }) => {
-            const addAccount = () => {
-              this.$refs.orgAddOrUpdateSuperAdminAccount.toggle(row).add();
-            };
-            const editAccount=()=>{
-              this.$refs.orgAddOrUpdateSuperAdminAccount.toggle(row).update();
-            }
-            return (
-              <el-button
-                onClick={row.bind?editAccount:addAccount}
-                type="text"
-                icon={row.bind ? "" : "el-icon-plus"}
-              >
-                {row.bind ? row.account : "分配账号"}
-              </el-button>
-            );
-          },
-        },
-        {
-          title: "操作",
-          type: "jsx",
-          fixed: "right",
-          "header-align": "center",
-          render: ({ row }) => {
-            const editOrg = () => {
-              this.$refs.orgAddOrUpdate.toggle(row).update();
-            };
-            const deleteOrg = () => {
-              this.$api.org.deleteOrg(row.id).then(() => {
-                this.$refs.oTable.reload();
-              });
-            };
-            const deleteTips = () => {
-              if (row.children.length > 0) {
-                return "确认删除吗？该机构下有子机构，删除后将不可恢复。";
-              } else {
-                return "确认删除吗？删除后将不可恢复。";
-              }
-            };
-            return (
-              <div class="flex flex-row justify-center">
-                <el-button type="primary" size="mini" onClick={editOrg}>
-                  编辑
-                </el-button>
-                <el-popconfirm
-                  confirm-button-type="danger"
-                  confirm-button-text="确定删除"
-                  cancel-button-type="info"
-                  icon-color="red"
-                  onConfirm={deleteOrg}
-                  title={deleteTips()}
-                  class="ml-2"
-                >
-                  <el-button slot="reference" type="danger" size="mini">
-                    删除
-                  </el-button>
-                </el-popconfirm>
-              </div>
-            );
-          },
-        },
-      ];
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/modules/sys/problem-add-or-update.vue b/src/views/modules/sys/problem-add-or-update.vue
deleted file mode 100644
index d13aff9..0000000
--- a/src/views/modules/sys/problem-add-or-update.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-  <el-dialog
-    :title="!dataForm.id ? '新增' : '修改'"
-    :close-on-click-modal="false"
-    :visible.sync="visible"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmit()"
-      label-width="80px"
-    >
-      <el-form-item label="问题名称" prop="problemName">
-        <el-input
-          v-model="dataForm.problemName"
-          placeholder="请输入问题名称"
-        ></el-input>
-      </el-form-item>
-
-      <el-form-item label="问题解答" prop="problemContent">
-        <tinymce
-          style="width:300;height:500px;"
-          v-model="dataForm.problemContent"
-        ></tinymce>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { treeDataTranslate } from "@/utils";
-
-import tinymce from "../../../components/tinymce/index.vue";
-export default {
-  components:{
-    tinymce
-  },
-  data() {
-    return {
-      visible: false,
-      menuList: [],
-      menuListTreeProps: {
-        label: "name",
-        children: "children",
-      },
-      dataForm: {
-        id: 0,
-        problemName: "",
-        problemContent:"",
-      },
-      dataRule: {
-        problemName: [
-          { required: true, message: "问题名称不能为空", trigger: "blur" },
-        ],
-        problemContent: [
-          { required: true, message: "问题解答不能为空", trigger: "blur" },
-        ],
-      },
-      tempKey: -666666, // 临时key, 用于解决tree半选中状态项不能传给后台接口问题. # 待优化
-    };
-  },
-  methods: {
-    init(id) {
-      this.dataForm.id = id || 0;
-      if(this.dataForm.id){
-        this.$http({
-              url: `/management/redsystemproblemsolve/info/${this.dataForm.id}`,
-              method: "get",              
-            }).then(({ data }) => {
-              if (data && data.code === 0) {
-                this.dataForm.id = data.redSystemProblemSolve.problemId;
-                this.dataForm.problemName =data.redSystemProblemSolve.problemName;
-                this.dataForm.problemContent =data.redSystemProblemSolve.problemContent;
-              }
-              
-            });
-      }else{
-        this.dataForm.problemName = '';
-        this.dataForm.problemContent = '';
-      }
-      this.visible = true;
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs["dataForm"].validate((valid) => {
-        if (valid) {
-          this.$http({
-            url: `/management/redsystemproblemsolve/${!this.dataForm.id ? "saveNewProblem" : "update"}`,
-            method: "post",
-            data: this.$http.adornData({
-              problemId: this.dataForm.id,
-              problemName: this.dataForm.problemName,
-              problemContent: this.dataForm.problemContent,
-            }),
-          }).then(({ data }) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: "操作成功",
-                type: "success",
-                duration: 1500,
-                onClose: () => {
-                  this.visible = false;
-                  this.$emit("refreshDataList");
-                },
-              });
-            } else {
-              this.$message.error(data.msg);
-            }
-          });
-        }
-      });
-    },
-  },
-};
-</script>
-
-<style lang="scss" scope>
-</style>
diff --git a/src/views/modules/sys/report-management.vue b/src/views/modules/sys/report-management.vue
deleted file mode 100644
index c058c76..0000000
--- a/src/views/modules/sys/report-management.vue
+++ /dev/null
@@ -1,507 +0,0 @@
-<!--
- * @Author: chenkangxu
- * @Date: 2021-09-20 22:09:44
- * @LastEditTime: 2022-01-09 15:43:16
- * @LastEditors: chenkangxu
- * @Description: 通知管理
- * @Github: 
--->
-
-
-<template>
-  <div class="container">
-    <el-row>
-      <custable
-        isSelection
-        :tableCols="tableCols"
-        :tableHandles="tableHandles"
-        :tableData="tableData"
-        isIndex
-        @selectChange="selectChange"
-        @handleCurrentChange="handleCurrentChange"
-        @handleSizeChange="handleSizeChange"
-        :tablePage="tablePage"
-      >
-        <search-form
-          :searchForm="searchForm"
-          :hasBottomButton="false"
-          class="form"
-          slot="insert"
-          style="margin-top: 20px"
-        ></search-form>
-      </custable>
-    </el-row>
-    <el-row> </el-row>
-
-    <modal
-      :modalConfig="modalConfig"
-      :modalForm="modalForm"
-      :modalHandles="modalHandles"
-      :modalData="modalData"
-    ></modal>
-  </div>
-</template>
-
-<script>
-import Modal from "../../../components/common/modal/modal.vue";
-import SearchForm from "../../../components/common/searchform/searchForm.vue";
-import custable from "../../../components/common/table/custable.vue";
-export default {
-  components: { custable, Modal, SearchForm },
-  data() {
-    return {
-      //弹窗配置
-      modalConfig: {
-        title: "新公告",
-        show: false,
-        width: "700px",
-        formEditDisabled: false,
-        autocomplete: false,
-      },
-      // 起始时间
-      startDate: "",
-      // 结束时间
-      endDate: "",
-      //标题或内容
-      titleOrContain: "",
-      // 表头
-      tableCols: [
-        { id: "2", prop: "createTime", label: "发布时间" },
-        { id: "3", prop: "reportTitle", label: "公告标题" },
-        { id: "4", prop: "reportContent", label: "公告内容" },
-      ],
-      //表格数据
-      tableData: [],
-      // 添加新公告的数据==================
-      reportTitle: "",
-      reportContent: "",
-      // ===============================
-      // 选中的数据
-      selectedList: [],
-      // ===============
-      // 弹出层数据 响应式数据
-      modalData: {},
-      // 分页数据
-      tablePage: {
-        pageSize: 10,
-        pageSizeRange: [5, 10, 20, 50, 100],
-        currentPage: 1,
-        total: null,
-      },
-    };
-  },
-  activated() {
-    this.querytTbleData();
-  },
-  methods: {
-    //修改到第几页的操作
-    handleCurrentChange(currentPage) {
-      this.tablePage.currentPage = currentPage;
-      this.querytTbleData();
-    },
-    //修改每页几个数据的操作
-    handleSizeChange(pageSize) {
-      this.tablePage.pageSize = pageSize;
-      this.querytTbleData();
-    },
-    // 选中操作
-    selectChange(value) {
-      this.selectedList = value;
-      // console.log(this.selectedList);
-    },
-    // ============按钮操作start==============
-    buttonHandler(title) {
-      if (title == "修改") {
-        this.modalConfig.show = true;
-        this.modalConfig.title = title;
-        // 选择修改的时候把数据传到弹出层的表单里
-        this.modalData.reportTitle = this.selectedList[0].reportTitle;
-        this.modalData.reportContent = this.selectedList[0].reportContent;
-      } else if (title == "新公告") {
-        this.modalConfig.show = true;
-        this.modalConfig.title = title;
-        // 选择添加的时候就把弹出层的表单清空
-        this.modalData = {};
-      } else if (title == "删除") {
-        this.$msgbox({
-          title: `确认删除？`,
-          message: "此操作将永久删除",
-          showCancelButton: true,
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          callback: async (action) => {
-            if (action === "confirm") {
-              let ids = this.selectedList.map((item) => {
-                return item.reportId;
-              });
-              let res = await this.$api.deleteReportsByIds(ids);
-              // console.log(res);
-              this.$message({
-                type: "success",
-                message: "删除成功!",
-              });
-              this.querytTbleData();
-            } else {
-              this.$message({
-                type: "info",
-                message: "已取消删除",
-              });
-            }
-          },
-        });
-      }
-    },
-    // ============按钮操作end================
-    // ===========加载列表start===================
-    async querytTbleData() {
-      let { data } = await this.$api.getReportsList(
-        // this.titleOrContain == null ? "" : this.titleOrContain,
-        // this.startDate == null ? "" : this.startDate,
-        // this.endDate == null ? "" : this.endDate,
-        this.tablePage.currentPage == null ? "" : this.tablePage.currentPage,
-        this.tablePage.pageSize == null ? "" : this.tablePage.pageSize
-      );
-      this.$message({
-        message: "搜索成功",
-        type: "success",
-      });
-      this.tableData = data.page.list;
-      // pageSize: 10,
-      // currentPage: 1,
-      // total: 0,
-      // pageSizeRange: [5, 10, 20, 50, 100],
-      // pageTotal: 3,
-      // 总条数
-      this.tablePage.total = data.page.totalCount;
-    },
-    //================end=======================
-    // ==============提交=====================
-  },
-  computed: {
-    // 按钮配置
-    tableHandles() {
-      return [
-        {
-          label: "新公告",
-          type: "primary",
-          icon: "",
-          handle: () => {
-            return this.buttonHandler("新公告");
-          },
-        },
-        {
-          label: "修改",
-          type: "warning",
-          icon: "",
-          //   disabled: this.shouldWeEdit,
-          handle: () => {
-            if (this.shouldWeEdit) {
-              this.$message("请选中要修改的公告");
-            } else {
-              this.buttonHandler("修改");
-            }
-          },
-        },
-        {
-          label: "删除",
-          type: "danger",
-          icon: "",
-          handle: () => {
-            if (this.shouldWeDelete) {
-              this.$message("请选中要删除的公告");
-            } else {
-              this.buttonHandler("删除");
-            }
-          },
-        },
-      ];
-    },
-    // 搜索栏配置
-    searchForm() {
-      return [
-        // {
-        //   type: "DateTimeRange",
-        //   prop: "time",
-        //   label:"时间:",
-        //   pickerOptions: {
-        //     shortcuts: [
-        //       {
-        //         text: "今天",
-        //         onClick(picker) {
-        //           const end = new Date();
-        //           const start = new Date();
-        //           start.setHours(0);
-        //           start.setMinutes(0);
-        //           start.setSeconds(0);
-        //           start.setMilliseconds(0);
-        //           picker.$emit("pick", [start, end]);
-        //         },
-        //       },
-        //       {
-        //         text: "昨天",
-        //         onClick(picker) {
-        //           const end = new Date();
-        //           const start = new Date();
-        //           start.setTime(start.getTime() - 3600 * 1000 * 24);
-        //           start.setHours(0);
-        //           start.setMinutes(0);
-        //           start.setSeconds(0);
-        //           start.setMilliseconds(0);
-        //           end.setDate(start.getDate());
-        //           end.setHours(23);
-        //           end.setMinutes(59);
-        //           end.setSeconds(59);
-        //           end.setMilliseconds(999);
-        //           picker.$emit("pick", [start, end]);
-        //         },
-        //       },
-        //       {
-        //         text: "本月",
-        //         onClick(picker) {
-        //           const end = new Date();
-        //           const start = new Date();
-        //           start.setTime(start.setDate(1));
-        //           start.setHours(0);
-        //           start.setMinutes(0);
-        //           start.setSeconds(0);
-        //           start.setMilliseconds(0);
-        //           picker.$emit("pick", [start, end]);
-        //         },
-        //       },
-        //       {
-        //         text: "上月",
-        //         onClick(picker) {
-        //           const end = new Date();
-        //           const start = new Date();
-        //           start.setMonth(end.getMonth() - 1);
-        //           start.setDate(1);
-        //           start.setHours(0);
-        //           start.setMinutes(0);
-        //           start.setSeconds(0);
-        //           start.setMilliseconds(0);
-        //           end.setMonth(end.getMonth());
-        //           end.setDate(0);
-        //           end.setHours(23);
-        //           end.setMinutes(59);
-        //           end.setSeconds(59);
-        //           end.setMilliseconds(999);
-        //           picker.$emit("pick", [start, end]);
-        //         },
-        //       },
-        //       {
-        //         text: "近俩月",
-        //         onClick(picker) {
-        //           const end = new Date();
-        //           const start = new Date();
-        //           start.setMonth(end.getMonth() - 2);
-        //           start.setDate(1);
-        //           start.setHours(0);
-        //           start.setMinutes(0);
-        //           start.setSeconds(0);
-        //           start.setMilliseconds(0);
-        //           picker.$emit("pick", [start, end]);
-        //         },
-        //       },
-        //       {
-        //         text: "近三月",
-        //         onClick(picker) {
-        //           const end = new Date();
-        //           const start = new Date();
-        //           start.setMonth(end.getMonth() - 3);
-        //           start.setDate(1);
-        //           start.setHours(0);
-        //           start.setMinutes(0);
-        //           start.setSeconds(0);
-        //           start.setMilliseconds(0);
-        //           picker.$emit("pick", [start, end]);
-        //         },
-        //       },
-        //       {
-        //         text: "近半年",
-        //         onClick(picker) {
-        //           const end = new Date();
-        //           const start = new Date();
-        //           start.setMonth(end.getMonth() - 6);
-        //           start.setDate(1);
-        //           start.setHours(0);
-        //           start.setMinutes(0);
-        //           start.setSeconds(0);
-        //           start.setMilliseconds(0);
-        //           picker.$emit("pick", [start, end]);
-        //         },
-        //       },
-        //       {
-        //         text: "近一年",
-        //         onClick(picker) {
-        //           const end = new Date();
-        //           const start = new Date();
-        //           start.setFullYear(end.getFullYear() - 1);
-        //           picker.$emit("pick", [start, end]);
-        //         },
-        //       },
-        //       {
-        //         text: "今年",
-        //         onClick(picker) {
-        //           const end = new Date();
-        //           const start = new Date();
-        //           start.setMonth(0);
-        //           start.setDate(1);
-        //           start.setHours(0);
-        //           start.setMinutes(0);
-        //           start.setSeconds(0);
-        //           start.setMilliseconds(0);
-        //           picker.$emit("pick", [start, end]);
-        //         },
-        //       },
-        //       {
-        //         text: "去年",
-        //         onClick(picker) {
-        //           const end = new Date();
-        //           const start = new Date();
-        //           start.setFullYear(start.getFullYear() - 1);
-        //           start.setMonth(0);
-        //           start.setDate(1);
-        //           start.setHours(0);
-        //           start.setMinutes(0);
-        //           start.setSeconds(0);
-        //           start.setMilliseconds(0);
-        //           end.setMonth(0);
-        //           end.setDate(0);
-        //           end.setHours(23);
-        //           end.setMinutes(59);
-        //           end.setSeconds(59);
-        //           end.setMilliseconds(999);
-        //           picker.$emit("pick", [start, end]);
-        //         },
-        //       },
-        //       {
-        //         text: "无限",
-        //         onClick(picker) {
-        //           const end = new Date();
-        //           const start = new Date();
-        //           start.setTime(start.getFullYear());
-        //           start.setMonth(0);
-        //           start.setDate(1);
-        //           start.setHours(0);
-        //           start.setMinutes(0);
-        //           start.setSeconds(0);
-        //           start.setMilliseconds(0);
-        //           picker.$emit("pick", [start, end]);
-        //         },
-        //       },
-        //     ],
-        //   },
-        //   change: (_d) => {
-        //    if(_d){
-        //      this.startDate = _d[0];
-        //     this.endDate = _d[1];
-        //    }
-        //     else{
-        //       this.startDate = '';
-        //     this.endDate = '';
-        //     }
-        //   },
-        // },
-        // {
-        //   type: "Input",
-        //   prop: "titleOrContain",
-        //   label: "标题/内容",
-        //   placeholder: "请输入款式编号或款式名称",
-        //   input: (value) => {
-        //     this.titleOrContain = value;
-        //     // console.log(this.titleOrContain);
-        //   },
-        // },
-        // {
-        //   type: "Button",
-        //   name: "查询",
-        //   handle: () => {
-        //     this.querytTbleData();
-        //   },
-        // },
-      ];
-    },
-    // 弹窗内容
-    modalForm() {
-      return [
-        {
-          type: "Input",
-          prop: "reportTitle",
-          label: "公告标题",
-          value: this.reportTitle,
-          input: (value) => {
-            this.reportTitle = value;
-          },
-        },
-        {
-          type: "Textarea",
-          prop: "reportContent",
-          label: "公告内容",
-          value: this.reportContent,
-          input: (value) => {
-            this.reportContent = value;
-          },
-        },
-      ];
-    },
-    // 弹窗按钮
-    modalHandles() {
-      return [
-        {
-          type: "primary",
-          label: "保存",
-          handle: async () => {
-            if (this.modalConfig.title == "新公告") {
-              await this.$api.addReport(this.reportTitle, this.reportContent);
-              this.$message({
-                message: "添加成功",
-                type: "success",
-              });
-              //提交成功后消息清空
-              this.reportTitle = "";
-              this.reportContent = "";
-              this.modalConfig.show = false;
-              // 刷新数据
-              this.querytTbleData();
-            } else if (this.modalConfig.title == "修改") {
-              await this.$api.updateReport(
-                this.selectedList[0].reportId,
-                this.modalData.reportTitle,
-                this.modalData.reportContent
-              );
-              this.$message({
-                message: "修改成功",
-                type: "success",
-              });
-              //提交成功后消息清空
-              this.reportTitle = "";
-              this.reportContent = "";
-              this.modalConfig.show = false;
-              //刷新数据
-              this.querytTbleData();
-            }
-          },
-        },
-        {
-          type: "warning",
-          label: "取消",
-          handle: () => {
-            this.modalConfig.show = false;
-          },
-        },
-      ];
-    },
-    // 只有选中一个时才可以修改
-    shouldWeEdit() {
-      return this.selectedList.length == 1 ? false : true;
-    },
-    // 必须选择一个及其以上才可以删除
-    shouldWeDelete() {
-      return this.selectedList.length >= 1 ? false : true;
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-</style>
\ No newline at end of file
diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
deleted file mode 100644
index 501c08f..0000000
--- a/src/views/modules/sys/role-add-or-update.vue
+++ /dev/null
@@ -1,148 +0,0 @@
-<template>
-  <el-dialog
-    :title="!dataForm.id ? '分配资源' : '修改'"
-    :close-on-click-modal="false"
-    :visible.sync="visible"
-  >
-    <el-form
-      :model="dataForm"
-      :rules="dataRule"
-      ref="dataForm"
-      @keyup.enter.native="dataFormSubmit()"
-      label-width="80px"
-    >
-      <el-form-item label="角色名称" prop="roleName">
-        <el-input v-model="dataForm.roleName" readonly placeholder="角色名称"></el-input>
-      </el-form-item>
-      <!-- <el-form-item label="备注" prop="remark">
-        <el-input v-model="dataForm.remark" placeholder="备注"></el-input>
-      </el-form-item> -->
-      <el-form-item size="mini" label="授权">
-        <el-tree
-          :data="menuList"
-          :props="menuListTreeProps"
-          node-key="permissionKey"
-          ref="menuListTree"
-          :default-expand-all="true"
-          show-checkbox
-        >
-        </el-tree>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-import { treeDataTranslate } from "@/utils";
-export default {
-  data() {
-    return {
-      visible: false,
-      menuList: [],
-      menuListTreeProps: {
-        label: "name",
-        children: "children",
-      },
-      dataForm: {
-        id: 0,
-        roleName: "",
-        remark: "",
-      },
-      dataRule: {
-        roleName: [
-          { required: true, message: "角色名称不能为空", trigger: "blur" },
-        ],
-      },
-      tempKey: '-666666', // 临时key, 用于解决tree半选中状态项不能传给后台接口问题. # 待优化
-    };
-  },
-  methods: {
-    init({ name, role }) {
-      this.dataForm.role = role || 0;
-      this.$http({
-        url: "/resource/list",
-        method: "get",
-        params: this.$http.adornParams(),
-      })
-        .then(({ data }) => {
-          this.menuList = data.data;
-        })
-        .then(() => {
-          this.visible = true;
-          this.$nextTick(() => {
-            this.$refs["dataForm"].resetFields();
-            this.$refs.menuListTree.setCheckedKeys([]);
-          });
-        })
-        .then(() => {
-          if (this.dataForm.role) {
-            this.$http({
-              url: `/role/resource/list?role=${this.dataForm.role}`,
-              method: "get",
-              params: this.$http.adornParams(),
-            }).then(({ data }) => {
-              // if (data && data.code === 0) {
-              //   this.dataForm.roleName = data.role.roleName;
-              //   this.dataForm.remark = data.role.remark;
-              //   var idx = data.role.menuIdList.indexOf(this.tempKey);
-              //   if (idx !== -1) {
-              //     data.role.menuIdList.splice(
-              //       idx,
-              //       data.role.menuIdList.length - idx
-              //     );
-              //   }
-              //   this.$refs.menuListTree.setCheckedKeys(data.role.menuIdList);
-              // }
-
-              this.dataForm.roleName = name;
-              // this.dataForm.remark = data.role.remark;
-              console.log("data", data.data);
-              var idx = data.data.indexOf(this.tempKey);
-              console.log("idx",idx);
-              if (idx !== -1) {
-                data.data.splice(
-                  idx,
-                  data.data.length - idx
-                );
-              }
-              this.$refs.menuListTree.setCheckedKeys(data.data);
-            });
-          }
-        });
-    },
-    // 表单提交
-    dataFormSubmit() {
-      this.$refs["dataForm"].validate((valid) => {
-        if (valid) {
-          this.$http({
-            url: `/role/resource/assign`,
-            method: "put",
-            data: this.$http.adornData({
-              role: this.dataForm.role,
-              resources: [].concat(
-                this.$refs.menuListTree.getCheckedKeys(),
-                [this.tempKey],
-                this.$refs.menuListTree.getHalfCheckedKeys()
-              ),
-            }),
-          }).then(({ data }) => {
-            this.$message({
-              message: "操作成功",
-              type: "success",
-              duration: 1500,
-              onClose: () => {
-                this.visible = false;
-                this.$emit("refreshDataList");
-              },
-            });
-          });
-        }
-      });
-    },
-  },
-};
-</script>
diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue
deleted file mode 100644
index d4737e7..0000000
--- a/src/views/modules/sys/role.vue
+++ /dev/null
@@ -1,219 +0,0 @@
-<template>
-  <div class="mod-role">
-    <el-form
-      :inline="true"
-      :model="dataForm"
-      @keyup.enter.native="getDataList()"
-    >
-      <el-form-item>
-        <el-input
-          v-model="dataForm.roleName"
-          placeholder="角色名称"
-          clearable
-        ></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-        <el-button
-          v-if="false"
-          type="primary"
-          @click="addOrUpdateHandle()"
-          >新增</el-button
-        >
-        <el-button
-          v-if="false"
-          type="danger"
-          @click="deleteHandle()"
-          :disabled="dataListSelections.length <= 0"
-          >批量删除</el-button
-        >
-      </el-form-item>
-    </el-form>
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      @selection-change="selectionChangeHandle"
-      style="width: 100%"
-    >
-      <!-- <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50"
-      >
-      </el-table-column> -->
-      <!-- <el-table-column
-        prop="roleId"
-        header-align="center"
-        align="center"
-        width="80"
-        label="ID"
-      > -->
-      </el-table-column>
-      <el-table-column
-        prop="name"
-        header-align="center"
-        align="center"
-        label="角色名称"
-      >
-      </el-table-column>
-      <el-table-column
-        prop="role"
-        header-align="center"
-        align="center"
-        label="标识符"
-      >
-      </el-table-column>
-      <!-- <el-table-column
-        prop="createTime"
-        header-align="center"
-        align="center"
-        width="180"
-        label="创建时间"
-      >
-      </el-table-column> -->
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作"
-      >
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            size="small"
-            @click="addOrUpdateHandle(scope.row)"
-            >查看/分配资源</el-button
-          >
-          <!-- <el-button
-            type="text"
-            size="small"
-            @click="deleteHandle(scope.row.roleId)"
-            >删除</el-button
-          > -->
-        </template>
-      </el-table-column>
-    </el-table>
-    <!-- <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper"
-    >
-    </el-pagination> -->
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update
-      v-if="addOrUpdateVisible"
-      ref="addOrUpdate"
-      @refreshDataList="getDataList"
-    ></add-or-update>
-  </div>
-</template>
-
-<script>
-import AddOrUpdate from "./role-add-or-update";
-export default {
-  data() {
-    return {
-      dataForm: {
-        roleName: "",
-      },
-      dataList: [],
-      pageIndex: 1,
-      pageSize: 10,
-      totalPage: 0,
-      dataListLoading: false,
-      dataListSelections: [],
-      addOrUpdateVisible: false,
-    };
-  },
-  components: {
-    AddOrUpdate,
-  },
-  activated() {
-    this.getDataList();
-  },
-  methods: {
-    // 获取数据列表
-    getDataList() {
-      this.dataListLoading = true;
-      this.$http({
-        url: "/role/list",
-        method: "get",
-        params: this.$http.adornParams({
-          role: JSON.parse(sessionStorage.getItem("userInfo")).role,
-        }),
-      }).then(({ data }) => {
-        this.dataList = data.data;
-        // this.totalPage = data.page.totalCount;
-        this.dataListLoading = false;
-      });
-    },
-    // 每页数
-    sizeChangeHandle(val) {
-      this.pageSize = val;
-      this.pageIndex = 1;
-      this.getDataList();
-    },
-    // 当前页
-    currentChangeHandle(val) {
-      this.pageIndex = val;
-      this.getDataList();
-    },
-    // 多选
-    selectionChangeHandle(val) {
-      this.dataListSelections = val;
-    },
-    // 新增 / 修改
-    addOrUpdateHandle(row) {
-      this.addOrUpdateVisible = true;
-      this.$nextTick(() => {
-        this.$refs.addOrUpdate.init(row);
-      });
-    },
-    // 删除
-    deleteHandle(id) {
-      var ids = id
-        ? [id]
-        : this.dataListSelections.map((item) => {
-            return item.roleId;
-          });
-      this.$confirm(
-        `确定对[id=${ids.join(",")}]进行[${id ? "删除" : "批量删除"}]操作?`,
-        "提示",
-        {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }
-      )
-        .then(() => {
-          this.$http({
-            url: "/sys/role/delete",
-            method: "post",
-            data: this.$http.adornData(ids, false),
-          }).then(({ data }) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: "操作成功",
-                type: "success",
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList();
-                },
-              });
-            } else {
-              this.$message.error(data.msg);
-            }
-          });
-        })
-        .catch(() => {});
-    },
-  },
-};
-</script>
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
deleted file mode 100644
index c509fc5..0000000
--- a/src/views/modules/sys/user-add-or-update.vue
+++ /dev/null
@@ -1,180 +0,0 @@
-<template>
-  <el-dialog
-    :title="!dataForm.id ? '新增' : '修改'"
-    :close-on-click-modal="false"
-    :visible.sync="visible">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
-      <el-form-item label="用户名" prop="userName">
-        <el-input v-model="dataForm.userName" placeholder="登录帐号"></el-input>
-      </el-form-item>
-      <el-form-item label="密码" prop="password" :class="{ 'is-required': !dataForm.id }">
-        <el-input v-model="dataForm.password" type="password" placeholder="密码"></el-input>
-      </el-form-item>
-      <el-form-item label="确认密码" prop="comfirmPassword" :class="{ 'is-required': !dataForm.id }">
-        <el-input v-model="dataForm.comfirmPassword" type="password" placeholder="确认密码"></el-input>
-      </el-form-item>
-      <el-form-item label="邮箱" prop="email">
-        <el-input v-model="dataForm.email" placeholder="邮箱"></el-input>
-      </el-form-item>
-      <el-form-item label="手机号" prop="mobile">
-        <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
-      </el-form-item>
-      <el-form-item label="角色" size="mini" prop="roleIdList">
-        <el-checkbox-group v-model="dataForm.roleIdList">
-          <el-checkbox v-for="role in roleList" :key="role.roleId" :label="role.roleId">{{ role.roleName }}</el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-      <el-form-item label="状态" size="mini" prop="status">
-        <el-radio-group v-model="dataForm.status">
-          <el-radio :label="0">禁用</el-radio>
-          <el-radio :label="1">正常</el-radio>
-        </el-radio-group>
-      </el-form-item>
-    </el-form>
-    <span slot="footer" class="dialog-footer">
-      <el-button @click="visible = false">取消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-    </span>
-  </el-dialog>
-</template>
-
-<script>
-  import { isEmail, isMobile } from '@/utils/validate'
-  export default {
-    data () {
-      var validatePassword = (rule, value, callback) => {
-        if (!this.dataForm.id && !/\S/.test(value)) {
-          callback(new Error('密码不能为空'))
-        } else {
-          callback()
-        }
-      }
-      var validateComfirmPassword = (rule, value, callback) => {
-        if (!this.dataForm.id && !/\S/.test(value)) {
-          callback(new Error('确认密码不能为空'))
-        } else if (this.dataForm.password !== value) {
-          callback(new Error('确认密码与密码输入不一致'))
-        } else {
-          callback()
-        }
-      }
-      var validateEmail = (rule, value, callback) => {
-        if (!isEmail(value)) {
-          callback(new Error('邮箱格式错误'))
-        } else {
-          callback()
-        }
-      }
-      var validateMobile = (rule, value, callback) => {
-        if (!isMobile(value)) {
-          callback(new Error('手机号格式错误'))
-        } else {
-          callback()
-        }
-      }
-      return {
-        visible: false,
-        roleList: [],
-        dataForm: {
-          id: 0,
-          userName: '',
-          password: '',
-          comfirmPassword: '',
-          salt: '',
-          email: '',
-          mobile: '',
-          roleIdList: [],
-          status: 1
-        },
-        dataRule: {
-          userName: [
-            { required: true, message: '用户名不能为空', trigger: 'blur' }
-          ],
-          password: [
-            { validator: validatePassword, trigger: 'blur' }
-          ],
-          comfirmPassword: [
-            { validator: validateComfirmPassword, trigger: 'blur' }
-          ],
-          email: [
-            { required: true, message: '邮箱不能为空', trigger: 'blur' },
-            { validator: validateEmail, trigger: 'blur' }
-          ],
-          mobile: [
-            { required: true, message: '手机号不能为空', trigger: 'blur' },
-            { validator: validateMobile, trigger: 'blur' }
-          ]
-        }
-      }
-    },
-    methods: {
-      init (id) {
-        this.dataForm.id = id || 0
-        this.$http({
-          url: '/sys/role/select',
-          method: 'get',
-          params: this.$http.adornParams()
-        }).then(({data}) => {
-          this.roleList = data && data.code === 0 ? data.list : []
-        }).then(() => {
-          this.visible = true
-          this.$nextTick(() => {
-            this.$refs['dataForm'].resetFields()
-          })
-        }).then(() => {
-          if (this.dataForm.id) {
-            this.$http({
-              url: `/sys/user/info/${this.dataForm.id}`,
-              method: 'get',
-              params: this.$http.adornParams()
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.dataForm.userName = data.user.username
-                this.dataForm.salt = data.user.salt
-                this.dataForm.email = data.user.email
-                this.dataForm.mobile = data.user.mobile
-                this.dataForm.roleIdList = data.user.roleIdList
-                this.dataForm.status = data.user.status
-              }
-            })
-          }
-        })
-      },
-      // 表单提交
-      dataFormSubmit () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            this.$http({
-              url: `/sys/user/${!this.dataForm.id ? 'save' : 'update'}`,
-              method: 'post',
-              data: this.$http.adornData({
-                'userId': this.dataForm.id || undefined,
-                'username': this.dataForm.userName,
-                'password': this.dataForm.password,
-                'salt': this.dataForm.salt,
-                'email': this.dataForm.email,
-                'mobile': this.dataForm.mobile,
-                'status': this.dataForm.status,
-                'roleIdList': this.dataForm.roleIdList
-              })
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                    this.visible = false
-                    this.$emit('refreshDataList')
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
-              }
-            })
-          }
-        })
-      }
-    }
-  }
-</script>
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
deleted file mode 100644
index 65a2bd5..0000000
--- a/src/views/modules/sys/user.vue
+++ /dev/null
@@ -1,193 +0,0 @@
-<template>
-  <div class="mod-user">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-      <el-form-item>
-        <el-input v-model="dataForm.userName" placeholder="用户名" clearable></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-button @click="getDataList()">查询</el-button>
-        <el-button v-if="isAuth('sys:user:save')" type="primary" @click="addOrUpdateHandle()">新增</el-button>
-        <el-button v-if="isAuth('sys:user:delete')" type="danger" @click="deleteHandle()" :disabled="dataListSelections.length <= 0">批量删除</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table
-      :data="dataList"
-      border
-      v-loading="dataListLoading"
-      @selection-change="selectionChangeHandle"
-      style="width: 100%;">
-      <el-table-column
-        type="selection"
-        header-align="center"
-        align="center"
-        width="50">
-      </el-table-column>
-      <el-table-column
-        prop="userId"
-        header-align="center"
-        align="center"
-        width="80"
-        label="ID">
-      </el-table-column>
-      <el-table-column
-        prop="username"
-        header-align="center"
-        align="center"
-        label="用户名">
-      </el-table-column>
-      <el-table-column
-        prop="email"
-        header-align="center"
-        align="center"
-        label="邮箱">
-      </el-table-column>
-      <el-table-column
-        prop="mobile"
-        header-align="center"
-        align="center"
-        label="手机号">
-      </el-table-column>
-      <el-table-column
-        prop="status"
-        header-align="center"
-        align="center"
-        label="状态">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.status === 0" size="small" type="danger">禁用</el-tag>
-          <el-tag v-else size="small">正常</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="createTime"
-        header-align="center"
-        align="center"
-        width="180"
-        label="创建时间">
-      </el-table-column>
-      <el-table-column
-        fixed="right"
-        header-align="center"
-        align="center"
-        width="150"
-        label="操作">
-        <template slot-scope="scope">
-          <el-button v-if="isAuth('sys:user:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">修改</el-button>
-          <el-button v-if="isAuth('sys:user:delete')" type="text" size="small" @click="deleteHandle(scope.row.userId)">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-pagination
-      @size-change="sizeChangeHandle"
-      @current-change="currentChangeHandle"
-      :current-page="pageIndex"
-      :page-sizes="[10, 20, 50, 100]"
-      :page-size="pageSize"
-      :total="totalPage"
-      layout="total, sizes, prev, pager, next, jumper">
-    </el-pagination>
-    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
-  </div>
-</template>
-
-<script>
-  import AddOrUpdate from './user-add-or-update'
-  export default {
-    data () {
-      return {
-        dataForm: {
-          userName: ''
-        },
-        dataList: [],
-        pageIndex: 1,
-        pageSize: 10,
-        totalPage: 0,
-        dataListLoading: false,
-        dataListSelections: [],
-        addOrUpdateVisible: false
-      }
-    },
-    components: {
-      AddOrUpdate
-    },
-    activated () {
-      this.getDataList()
-    },
-    methods: {
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
-        this.$http({
-          url: '/sys/user/list',
-          method: 'get',
-          params: this.$http.adornParams({
-            'page': this.pageIndex,
-            'limit': this.pageSize,
-            'username': this.dataForm.userName
-          })
-        }).then(({data}) => {
-          if (data && data.code === 0) {
-            this.dataList = data.page.list
-            this.totalPage = data.page.totalCount
-          } else {
-            this.dataList = []
-            this.totalPage = 0
-          }
-          this.dataListLoading = false
-        })
-      },
-      // 每页数
-      sizeChangeHandle (val) {
-        this.pageSize = val
-        this.pageIndex = 1
-        this.getDataList()
-      },
-      // 当前页
-      currentChangeHandle (val) {
-        this.pageIndex = val
-        this.getDataList()
-      },
-      // 多选
-      selectionChangeHandle (val) {
-        this.dataListSelections = val
-      },
-      // 新增 / 修改
-      addOrUpdateHandle (id) {
-        this.addOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
-        })
-      },
-      // 删除
-      deleteHandle (id) {
-        var userIds = id ? [id] : this.dataListSelections.map(item => {
-          return item.userId
-        })
-        this.$confirm(`确定对[id=${userIds.join(',')}]进行[${id ? '删除' : '批量删除'}]操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: '/sys/user/delete',
-            method: 'post',
-            data: this.$http.adornData(userIds, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        }).catch(() => {})
-      }
-    }
-  }
-</script>
diff --git a/src/views/modules/user/agreement.vue b/src/views/modules/user/agreement.vue
deleted file mode 100644
index 133e1ea..0000000
--- a/src/views/modules/user/agreement.vue
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--
- * @author: ym
- * @Date: 2021-10-09 22:15:38
- * @LastEditTime: 2022-01-02 19:51:53
- * @LastEditors: Please set LastEditors
- * @Description: 
- * @FilePath: \background-front-end\src\views\modules\user\agreement.vue
--->
-<template>
-  <div :key="check">
-    <notice/>
-    <Editor    v-model="redPublishAgreement.content" />
-    <div style="padding:20px 0">
-      <el-button type="primary" @click="save">保存</el-button>
-    </div>
-  </div>
-  
-</template>
-<script>
-import notice from '../../../components/tinymce/notice.vue'
-import Editor from "../../../components/tinymce/index.vue";
-
-export default {
-  components: {
-    Editor,
-    notice
-  },
-  activated() {
-    this.check=true;
-    this.find();
-  },
-  deactivated(){
-    this.check=false
-  },
-  data() {
-    return {
-      redPublishAgreement: {
-        content:''
-      },
-      check:true
-    };
-  },
-  methods: {
-    find() {
-      this.$api.getUserAgreement().then((res) => {
-          this.redPublishAgreement=res.data.redPublishAgreement
-      });
-    },
-    save(){
-            let data={
-                agreementId:this.redPublishAgreement.agreementId,
-                content:this.redPublishAgreement.content
-            }
-          this.$api.saveUserAgreement(data).then(res=>{
-            
-          })
-      }
-  },
-};
-</script>
\ No newline at end of file
diff --git a/src/views/modules/user/components/user-detail-modal.vue b/src/views/modules/user/components/user-detail-modal.vue
deleted file mode 100644
index 8d75931..0000000
--- a/src/views/modules/user/components/user-detail-modal.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2022-01-02 15:11:03
- * @LastEditTime: 2022-01-02 16:53:32
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\user\components\user-detail-modal.vue
--->
-<template>
-    <div>
-        <modal
-        :modalConfig="modalConfig"
-        >
-            <div slot="dialog__content">
-                <userType style="margin-bottom:20px" content="基本信息" />
-                <userForm :form="userData" :arr="base" />
-                <div v-if="userData.role==='学生'">
-                    <userType  style="margin:20px 0px; " content="学生信息" />
-                    <userForm :form="userData" :arr="stu" />
-                </div>
-                <div v-if="userData.role==='老师'">
-                    <userType  style="margin:20px 0px;" content="老师信息" />
-                    <userForm :form="userData" :arr="tea" />
-                </div>
-            </div>
-        </modal>
-    </div>
-</template>
-<script>
-import userForm from './user-form.vue'
-import userType from '../../../../components/modelType/modelType.vue'
-import modal from '@/components/common/modal/modal.vue'
-export default {
-    components:{
-        modal,
-        userType,
-        userForm
-    },
-    watch:{
-        'modalConfig.show':{
-            handler:function(val){
-                if(val){
-                    this.$api.getUserDetail(this.form.userId).then(res=>{
-                        this.userData=res.data.data
-                    })
-                }
-            }
-        }
-    },
-    data(){
-        return{
-            modalConfig:{
-                show:false,
-                title:'用户详情',
-                width:'900px'
-            },
-            userData:{
-
-            },
-            base:[
-                {label:'红色护照号',prop:'redPassportNumber'},
-                {label:'账号',prop:'username'},
-                {label:'姓名',prop:'name'},
-                {label:'性别',prop:'sex'},
-                 {label:'角色',prop:'role'},
-                {label:'头像',prop:'headUrl',type:'image'},
-                {label:'生日',prop:'birthday'},
-                {label:'地址',prop:'address'},
-                {label:'红色学龄',prop:'redAge'},
-                {label:'手机号码',prop:'mobile'},
-                {label:'红星币',prop:'starCoin'},
-                {label:'等级',prop:'levelType'},
-                {label:'邮箱',prop:'email'},
-            ],
-            stu:[
-                {label:'教育局',prop:'educationName'},
-                {label:'学校',prop:'schoolName'},
-                {label:'学籍号',prop:'studentStatusNumber'},
-                {label:'学号',prop:'studentNumber'},
-                {label:'年级',prop:'studentGrade'},
-                {label:'班级',prop:'studentClass'},
-            ],
-            tea:[
-                {label:'教育局',prop:'educationName'},
-                {label:'学校',prop:'schoolName'},
-                {label:'年级',prop:'teacherGrade'},
-                {label:'班级',prop:'teacherClass'},
-            ],
-        }
-    },
-    props:{
-        form:{type:Object,default:()=>{}}
-    }
-}
-</script>
-<style lang="scss" scoped>
-    
-</style>
\ No newline at end of file
diff --git a/src/views/modules/user/components/user-form.vue b/src/views/modules/user/components/user-form.vue
deleted file mode 100644
index d74c61b..0000000
--- a/src/views/modules/user/components/user-form.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2022-01-02 15:46:09
- * @LastEditTime: 2022-01-02 16:50:24
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\user\components\user-form.vue
--->
-<template>
-    <div>
-        <div v-for="item in arr" :key="item.label" class="content">
-            <div class="label">{{item.label}}</div>
-            <div v-if="!item.type" class="value">{{form[item.prop]?form[item.prop]:'暂无'}}</div>
-            <el-image v-if="item.type==='image'" :preview-src-list="form[item.prop]?[form[item.prop]]:[require('@/assets/images/noimg.svg')]"    :src="form[item.prop]?form[item.prop]:require('@/assets/images/noimg.svg')" alt=""></el-image >
-        </div>
-    </div>
-</template>
-<script>
-export default {
-    props:{
-        form:{type:Object,default:()=>{}},
-        arr:{type:Array,default:()=>[]}
-    }
-}
-</script>
-<style lang="scss" scoped>
-    .content{
-        display: flex;
-        // height: 30px;
-        line-height: 40px;
-        font-size:16px
-    }
-    .label{
-        width:150px;
-        text-align: right;
-        margin-right: 10px;
-         flex-shrink:0;
-    }
-    .value{
-        // width:600px
-    }
-</style>
\ No newline at end of file
diff --git a/src/views/modules/user/index.vue b/src/views/modules/user/index.vue
deleted file mode 100644
index dd2f0c4..0000000
--- a/src/views/modules/user/index.vue
+++ /dev/null
@@ -1,304 +0,0 @@
-<template>
-  <div>
-    <!-- 顶部搜索条件 -->
-    <searchForm ref="searchForm"  :searchForm="searchForm" :searchData="searchData" />
-    <!-- 表格 -->
-    <cusTable
-      :loading="loading"
-      :isIndex="true"
-      indexFixed="left"
-      :isPagination="true"
-      :tableCols="pageData.tableCols"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      @handleCurrentChange="findAll()"
-      @handleSizeChange="findAll()"
-    />
-    <!-- modal弹窗（编辑） -->
-    <modal
-      :modalConfig="modalSetting.modalConfig"
-      :modalData="modalSetting.modalData"
-      :modalForm="modalSetting.modalForm"
-      :modalHandles="modalSetting.modalHandles"
-      labelWidth="140px"
-      ref="modal"
-    />
-    <modalDetail ref="modalDetail" :form="row" />
-  </div>
-</template>
-<script>
-import modalDetail from './components/user-detail-modal.vue'
-import modal from "../../../components/common/modal/modal.vue";
-import cusTable from "../../../components/common/table/custable.vue"; //表格组件
-import searchForm from "../../../components/common/searchform/searchForm.vue"; //搜索框组件
-export default {
-  components: {
-    cusTable,
-    searchForm,
-    modal,
-    modalDetail
-  },
-  data() {
-    return {
-      // 加载动画
-      loading:false,
-      searchForm: [
-        {
-          label: "姓名",
-          prop: "searchName",
-          rules: [],
-          type: "Input",
-          size:"mini",
-          placeholder: "请输入姓名",
-        },
-        {
-          label: "红色护照号",
-          prop: "redPassportNumber",
-          rules: [],
-          type: "Input",
-          size:"mini",
-          placeholder: "请输入红色护照号",
-        },
-        {
-          label: "红色学龄/天",
-          prop: "year",
-          rules: { type: "number" },
-          type: "Input",
-          size:"mini",
-          placeholder: "请输入红色学龄",
-        },
-        {
-          label: "性别",
-          prop: "sex",
-          size:"mini",
-          type: "Select",
-          options: [
-            { label: "男", value: '男' },
-            { label: "女", value: '女' },
-          ],
-        },
-        // {
-        //   label: "等级",
-        //   prop: "levelType",
-        //   type: "Select",
-        //   options: [
-        //     { label: 1, value: 1 },
-        //     { label: 2, value: 2 },
-        //     { label: 3, value: 3 },
-        //     { label: 4, value: 4 },
-        //     { label: 5, value: 5 },
-        //     { label: 6, value: 6 },
-        //     { label: 7, value: 7 },
-        //     { label: 8, value: 8 },
-        //     { label: 9, value: 9 },
-        //     { label: 10, value: 10 },
-        //   ],
-        // },
-        {
-          label: "状态",
-          prop: "userStatus",
-          type: "Select",
-          size:"mini",
-          options: [
-            { label: "正常", value: 1 },
-            { label: "封禁", value: 0 },
-          ],
-        },
-        {
-          type: "Button",
-          style: "primary",
-          size:"mini",
-          name: "查询",
-          handle:()=> this.findAll()
-        },
-        {
-          type: "Button",
-          style: "warning",
-          size:"mini",
-          name: "重置",
-          handle:()=> this.resetSearchForm()
-        },
-      ], //搜索框组件内容
-      searchData: {
-        searchName: "",
-        year: "",
-        sex: "",
-        levelType: "",
-        userStatus: "",
-        redPassportNumber:""
-      }, //搜索框参数内容
-      pageData: {
-        tableData: [],
-        //表格工具栏按钮 end
-        //表格分页信息start
-        tablePage: {
-          currentPage: 1,
-          pageSize: 10,
-          pageTotal: 0,
-          pageSizeRange: [5, 10, 20, 50, 100],
-        },
-        //表格分页信息end
-        //表格列表头start
-        tableCols: [
-          { label: "姓名", prop: "name", align: "center",fixed:"left" },
-          { label: "性别", prop: "sex", align: "center" },
-          {
-            label: "红色护照号",
-            prop: "redPassportNumber",
-            align: "center",
-          },
-          { label: "用户名", prop: "username", align: "center" },
-           {
-            label: "联系电话",
-            prop: "mobile",
-            align: "center",
-          },
-           {
-            label: "段位",
-            prop: "levelTitle",
-            align: "center",
-          },
-          {
-            label: "积分",
-            prop: "integral",
-            align: "center",
-          },
-          {
-            label: "红星币",
-            prop: "starCoin",
-            align: "center",
-          },
-          {
-            label: "红色学龄/天",
-            prop: "redAge",
-            align: "center",
-          },
-          {
-            label: "状态",
-            prop: "userStatus",
-            align: "center",
-            formatter: (prop, row, codeType) =>
-              this.getStatus(prop, row, codeType),
-          },
-          {
-            label: "操作",
-            align: "center",
-            type: "button",
-            width: "180px",
-            fixed:"right",
-            btnList: [
-              {
-                label: "详情",
-                type: "text",
-                size: "small",
-                handle:(row)=>{
-                  this.row=row
-                  this.$refs.modalDetail.modalConfig.show=true
-                }
-              },
-              {
-                label: "编辑",
-                type: "text",
-                size: "small",
-                handle:(row)=>this.showDialog('edit',row)
-              }
-            ],
-          },
-        ],
-      }, //表格组件参数
-      modalSetting: {
-        modalForm: [
-          {
-            label: "状态",
-            type: "Radio",
-            prop: "userStatus",
-            radios:[{
-              label:'正常',
-              value:1
-            },
-            {
-              label:'封禁',
-              value:0
-            }]
-          },
-        ],
-        modalData: {
-          userStatus: "",
-        },
-        modalConfig: {
-          show: false,
-          title: "编辑用户信息",
-        },
-        modalHandles: [
-          {
-            label: "确认",
-            type: "primary",
-            handle: () => this.onSubmit(),
-          },
-        ],
-      },//modal参数
-      row:{}
-    };
-  },
-  activated() {
-    this.findAll();
-  },
-  methods: {
-    //查询所有会员
-    findAll() {
-      this.loading=true;
-      let params = {};
-      //分页
-      params.page = this.pageData.tablePage.currentPage;
-      params.limit = this.pageData.tablePage.pageSize;
-      //参数
-      params={...params,...this.searchData}
-      this.$api.getUserList(params).then((res) => {
-        this.pageData.tableData = res.data.page.list;
-        this.pageData.tablePage.pageTotal = res.data.page.totalCount;
-        this.loading=false;
-      });
-    },
-    resetSearchForm(){
-      this.$refs['searchForm'].$refs['searchFormRef'].resetFields()
-    },
-    getStatus(prop,row,codeType){
-      if (row[prop] == 1) return "正常";
-      else if (row[prop] == 0) return "封禁";
-      else return "暂无";
-    },
-    showDialog(type,row)
-    {
-      this.modalSetting.modalConfig.show=true
-      if(type==='edit'){
-        this.modalSetting.modalData=JSON.parse(JSON.stringify(row))
-      }
-    },
-    update(){
-      let data=this.modalSetting.modalData
-      this.$api.updateUserList(data).then(res=>{
-        this.modalSetting.modalConfig.show = false;
-        this.findAll();
-      })
-    },
-    onSubmit(){
-      this.$refs["modal"].$refs["modalFormRef"].validate((valid) => {
-        if (valid) {
-          this.update()
-        } 
-          return false;
-        
-      });
-    }
-  },
-};
-</script>
-<style scoped>
-.select-contain {
-  display: flex;
-  margin-bottom: 20px;
-}
-.mr-20 {
-  margin-right: 20px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/user/red-passport.vue b/src/views/modules/user/red-passport.vue
deleted file mode 100644
index 93087cd..0000000
--- a/src/views/modules/user/red-passport.vue
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
- * @Author: your name
- * @Date: 2021-10-08 18:01:50
- * @LastEditTime: 2021-12-02 19:56:15
- * @LastEditors: Please set LastEditors
- * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \background-front-end\src\views\modules\user\red-passport.vue
--->
-<template>
-  <div>
-    <el-upload
-      class="avatar-uploader"
-      :action="$uploadUrl"
-      :show-file-list="false"
-      :on-success="handleAvatarSuccess"
-    >
-      <img v-if="redPassport.passportUrl" :src="redPassport.passportUrl" class="avatar" />
-      <i v-else class="el-icon-plus avatar-uploader-icon"></i>
-    </el-upload>
-    <el-button style="margin-top: 20px" type="primary" @click="save">保存</el-button>
-  </div>
-</template>
-<script>
-export default {
-  data() {
-    return {
-      redPassport:{}
-    };
-  },
-  activated(){
-    this.find()
-  },
-  methods: {
-    handleAvatarSuccess(res, file) {
-      this.redPassport.passportUrl =res.url;
-    },
-    find(){
-      this.$api.getUserRedPassport().then(res=>{
-        this.redPassport=res.data.redPassport
-      })
-    },
-    save(){
-      this.$api.saveUserRedPassport(this.redPassport)
-    }
-  },
-};
-</script>
-<style>
-.avatar-uploader .el-upload {
-  border: 1px dashed #d9d9d9;
-  border-radius: 6px;
-  cursor: pointer;
-  position: relative;
-  overflow: hidden;
-}
-.avatar-uploader .el-upload:hover {
-  border-color: #409eff;
-}
-.avatar-uploader-icon {
-  font-size: 28px;
-  color: #8c939d;
-  width: 178px;
-  height: 178px;
-  line-height: 178px;
-  text-align: center;
-}
-.avatar {
-  /* width: 178px;
-  height: 178px; */
-  display: block;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/modules/version-management/user-version.vue b/src/views/modules/version-management/user-version.vue
deleted file mode 100644
index 27eccea..0000000
--- a/src/views/modules/version-management/user-version.vue
+++ /dev/null
@@ -1,274 +0,0 @@
-<template>
-  <div style="padding:20px">
-      <searchForm
-      ref="searchForm"
-      labelWidth='60px'
-      :searchForm="searchSetting.searchForm"
-      :searchData="searchSetting.searchData"
-      :hasBottomButton="false"
-        />
-      <cesTable
-      :isIndex="true"
-      :isSelection="false"
-      :isPagination="true"
-      :tableCols="pageData.tableCols"
-      :tableData="pageData.tableData"
-      :tablePage="pageData.tablePage"
-      :tableHandles="pageData.tableHandles"
-      @handleCurrentChange="findAll"
-      @handleSizeChange="findAll"
-      />
-      <modal
-      ref="modal"
-      :modalConfig="modalSetting.modalConfig"
-      :modalForm="modalSetting.modalForm"
-      :modalData="modalSetting.modalData"
-      :modalHandles="modalSetting.modalHandles"
-      />
-      
-  </div>
-</template>
-<script>
-
-import modal from '@/components/common/modal/modal.vue'
-import searchForm from '@/components/common/searchform/searchForm.vue'
-import cesTable from '@/components/common/table/custable.vue'
-
-export default {
-  components: {
-    cesTable,
-    modal,
-    searchForm
-  },
-  data () {
-    return {
-      pageData: {
-        tableCols: [
-          { label: '版本名称', prop: 'versionName', align: 'center' },
-          { label: '版本号', prop: 'versionCode', align: 'center' },
-          { label: '更新类型', prop: 'updateType', align: 'center' ,
-            formatter:(prop,row)=>{
-              switch (row[prop]){
-                case 'silent':
-                  return '静默更新';
-                case 'forcibly':
-                  return '强制更新';
-                case 'solicit':
-                  return '弹窗确认更新'
-              }
-            }
-          },
-          { label: 'APP平台', prop: 'type', align: 'center' ,formatter:(prop,row)=>{
-            switch (row[prop]){
-              case 'android,user':
-                return 'android';
-              case 'ios,user':
-                return 'ios';
-            }
-          }},
-          { label: '版本说明', prop: 'versionInfo', align: 'center',formatter:(prop,row)=>{
-            return row[prop].slice(0,20)+'...'
-          } },
-          { label: '下载地址', prop: 'downloadUrl', align: 'center',formatter:(prop,row)=>{
-            return row[prop].slice(0,20)+'...'
-          } },
-          {
-            label: '操作',
-            type: 'button',
-            align: 'center',
-            width:'180px',
-            size:"mini",
-            btnList: [
-              {
-                label: '编辑',
-                type: 'primary',
-                size:"mini",
-                handle: (row) => {
-                  const data = JSON.parse(JSON.stringify(row))
-                  this.modalSetting.modalConfig.title = '编辑'
-                  this.$nextTick(() => {
-                    this.modalSetting.modalData = data
-                  })
-
-                  this.modalSetting.modalConfig.show = true
-                }
-              },
-              {
-                label: '删除',
-                size:"mini",
-                type: 'danger',
-                handle: (row) => {
-                  this.del(row.versionId)
-                }
-              }
-            ]
-          }
-        ],
-        tableData: [],
-        selectList: [],
-        tablePage: {pageSize:10,currentPage:1,total:0,pageSizeRange:[5, 10, 20, 50,100]},
-        tableHandles: [
-          {
-            label: '新增',
-            type: 'primary',
-            handle: () => {
-              this.modalSetting.modalConfig.title = '添加'
-              this.modalSetting.modalConfig.show = true
-              this.clearValidate()
-            }
-          },
-        ]
-      },
-      modalSetting: {
-        modalConfig: {
-          show: false,
-          title: '添加',
-          width: '600px'
-        },
-        modalForm: [
-          { label: '平台',width:'400px', rules: { required: true }, type: 'Radio', prop: 'type' ,
-            radios:[{label:'android',value:'android,user'},{label:'ios',value:'ios,user'}]
-          },
-          { label: '版本名称',width:'400px', rules: { required: true }, type: 'Input', prop: 'versionName',haveToolTip:true,content:'例：1.0.1' },
-          { label: '版本号',width:'400px', rules: { required: true }, type: 'Input', prop: 'versionCode' },
-          
-          { label: '更新类型',width:'400px', rules: { required: true }, type: 'Radio', prop: 'updateType',
-            radios:[
-                {label:'静默更新',value:'silent'},
-                {label:'强制更新',value:'forcibly'},
-                {label:'弹窗确认更新',value:'solicit'},
-            ]
-          },
-          { label: 'wgt更新',width:'400px',values:[true,false],  type: 'Switch', prop: 'isWgt' },
-          { label: '版本说明',width:'400px', maxlength:"150",showWordLimit:true, rules: { required: true }, type: 'Textarea', prop: 'versionInfo' },
-          { label: '下载地址',width:'400px', rules: { required: true }, type: 'Input', prop: 'downloadUrl' }
-
-        ],
-        modalData: {
-          versionName: '',
-          versionCode:'',
-          updateType:'',
-          versionInfo:'',
-          downloadUrl:'',
-          isWgt:false,
-        },
-        modalHandles: [
-          {
-            label: '确认',
-            type: 'primary',
-            handle: () => {
-              this.submit()
-            }
-          }
-        ]
-      },
-      searchSetting:{
-          searchForm:[
-              {
-                  label:'平台',
-                  prop:'type',
-                  type:'Select',
-                  options:[
-                    {label:"android",value:'android,user'},
-                    {label:'ios',value:'ios,user'}
-                  ],
-              },
-              {
-                  name:'查询',
-                  style:'primary',
-                  type:'Button',
-                  handle:()=>{
-                      this.findAll()
-                  }
-              },
-          ],
-          searchData:{type:'android,user'}
-      },
-      
-    }
-  },
-  computed:{
-    checkIosDownload(){
-      return !this.modalSetting.modalData.isWgt&&this.modalSetting.modalData.type=='ios,user'
-    }
-  },
-  watch:{
-    checkIosDownload(val){
-      if(val){
-        this.modalSetting.modalForm[this.modalSetting.modalForm.length-1].disabled=()=>{return true}
-        this.modalSetting.modalData.downloadUrl='itms-apps://itunes.apple.com/cn/app/id1615577871?mt=8'
-      }else{
-        this.modalSetting.modalForm[this.modalSetting.modalForm.length-1].disabled=()=>{return false}
-        this.modalSetting.modalData.downloadUrl=''
-      }
-    }
-  },
-  activated () {
-    this.findAll()
-  },
-  methods: {
-    findAll () {
-      const data = {
-        type:this.searchSetting.searchData.type
-      }
-      data.page = this.pageData.tablePage.currentPage
-      data.limit = this.pageData.tablePage.pageSize
-      this.$api.version.getAppVersion(data).then(res => {
-        this.pageData.tableData = res.data.page.list
-        this.pageData.tablePage.total = res.data.page.totalCount
-      })
-    },
-    clearValidate () {
-        this.commonUtil.clearObj(this.modalSetting.modalData)
-        
-      // console.log(this.modalSetting.modalData)
-      this.$nextTick(() => {
-        this.$refs.modal.$refs.modalFormRef.clearValidate()
-      })
-    },
-    submit () {
-      this.$refs.modal.$refs.modalFormRef.validate((valid) => {
-        if (valid) {
-          const data = JSON.parse(JSON.stringify(this.modalSetting.modalData))
-          console.log(data)
-          const title = this.modalSetting.modalConfig.title
-          if (title === '添加') {
-            this.$api.version.addAppVersion(data).then(res => {
-              this.modalSetting.modalConfig.show = false
-              this.findAll()
-            })
-          } else {
-            this.$api.version.updateAppVersion(data).then(res => {
-              this.modalSetting.modalConfig.show = false
-              this.findAll()
-            })
-          }
-        }
-      })
-    },
-    del (id) {
-      let data
-      if (id) {
-        data = [id]
-      } else {
-        data = this.pageData.selectList.map(item => item.versionId)
-      }
-      console.log(data)
-      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-        .then(() => {
-          this.$api.version.delAppVersion(data).then(res => this.findAll())
-        })
-        .catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消删除'
-          })
-        })
-    },
-  }
-}
-</script>