教师端1期问题修复

(cherry picked from commit ffeb5bf0b6)

.env.development

@@ -41,6 +41,7 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
+VUE_APP_GROWTH_API_PATH=''
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.preview

@@ -37,6 +37,7 @@ VUE_APP_PUBLIC_PATH='/pc-release'
 VUE_APP_MANAGER_PATH='/manage-release'
 VUE_APP_STUDENT_PATH='/fe-student-release'
 VUE_APP_MANAGER_API_PATH='/manageApi-release'
+VUE_APP_GROWTH_API_PATH='/growth'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u.boe.com/web-release/'

.env.production

@@ -37,6 +37,7 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
+VUE_APP_GROWTH_API_PATH='/growth'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u.boe.com/web/'

.env.testing

@@ -36,6 +36,7 @@ VUE_APP_PUBLIC_PATH='/pc'
 VUE_APP_MANAGER_PATH='/manage'
 VUE_APP_STUDENT_PATH='/fe-student'
 VUE_APP_MANAGER_API_PATH='/manageApi'
+VUE_APP_GROWTH_API_PATH='/growth'
 
 # 登录地址
 VUE_APP_LOGIN_URL='https://u-pre.boe.com/web/'

package.json

@@ -15,6 +15,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
+    "@mermaid-js/parser": "^0.6.3",
     "axios": "^0.21.4",
     "core-js": "^3.6.5",
     "driver.js": "^0.9.8",
@@ -23,9 +24,15 @@
     "element-ui": "^2.15.7",
     "file-saver": "^2.0.5",
     "fuse.js": "^6.4.6",
+    "highlight.js": "^11.11.1",
     "image-conversion": "^2.1.1",
     "jsencrypt": "^3.2.1",
     "json-bigint": "^1.0.0",
+    "katex": "^0.16.25",
+    "markdown-it": "^14.1.0",
+    "markdown-it-highlightjs": "^4.2.0",
+    "markdown-it-mermaid": "^0.2.5",
+    "mermaid": "^8.13.10",
     "mockjs": "^1.1.0",
     "moment": "^2.29.1",
     "nprogress": "^0.2.0",
@@ -43,6 +50,7 @@
     "vue": "^2.6.11",
     "vue-awesome-swiper": "^3.1.3",
     "vue-cookies": "^1.7.4",
+    "vue-katex": "^0.5.0",
     "vue-pdf": "^4.2.0",
     "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.5.2",
@@ -60,6 +68,7 @@
     "html-webpack-plugin": "^5.5.0",
     "less": "^4.1.1",
     "less-loader": "^6.2.0",
+    "null-loader": "^4.0.1",
     "sass": "^1.32.13",
     "sass-loader": "^10.1.0",
     "vue-template-compiler": "^2.6.11"

src/App.vue

@@ -1,17 +1,57 @@
 <template>
-  <div id="app">
+  <div id="app" style="width: 100vw">
     <keep-alive :include="['case']">
       <router-view />
+      12312
     </keep-alive>
+    <!-- 添加AI Call组件 -->
+    <AICall
+      :dialogVisible="showAICall"
+      @close="onCloseAICall"
+      @restore="onRestoreAICall"
+    />
   </div>
 </template>
 
 <script>
-  import { mapGetters } from 'vuex';
+  import { mapGetters, mapState } from 'vuex';
+  import AICall from '@/views/portal/case/AICall.vue';
+
   export default{
     name:  'App',
+    components: {
+      AICall
+    },
     computed: {
-      ...mapGetters(['userInfo'])
+      ...mapGetters(['userInfo']),
+      ...mapState('app', ['showAICall', 'showAICallMinimized'])
+    },
+    methods: {
+      onCloseAICall() {
+        // 通过Vuex关闭AI Call组件
+        this.$store.dispatch('app/setShowAICall', false);
+      },
+
+      onRestoreAICall() {
+        // 通过Vuex显示AI Call组件
+        this.$store.dispatch('app/setShowAICall', true);
+      },
+
+      // 检查当前路由是否应该显示AI弹窗
+      checkRouteForAICall() {
+        const currentRoute = this.$route.name;
+        // 只在case或caseDetail路由显示弹窗
+        if (currentRoute === 'case' || currentRoute === 'caseDetail') {
+          // 设置最小化窗口显示状态为true
+          this.$store.dispatch('app/setShowAICallMinimized', true);
+          // 注意：这里不再强制设置showAICall为true，保留用户之前的操作状态
+        } else {
+          // 其他路由关闭弹窗
+          this.$store.dispatch('app/setShowAICall', false);
+          // 设置最小化窗口显示状态为false
+          this.$store.dispatch('app/setShowAICallMinimized', false);
+        }
+      }
     },
     mounted() {
       //从状态值中取,因为登录处理，所以移动watch中
@@ -19,7 +59,16 @@
       // if(this.userInfo && this.userInfo.name!=''){
       //   this.$watermark.set(this.userInfo.name+this.userInfo.loginName);
       // }
+
+      // 初始化检查路由
+      this.checkRouteForAICall();
     },
+    watch: {
+      // 监听路由变化
+      $route(to, from) {
+        this.checkRouteForAICall();
+      }
+    }
     // watch:{
     //   userInfo(newVal,oldVal){
     //     if(newVal && newVal.name!=''){
@@ -39,4 +88,3 @@
     box-shadow: 0px 1px 5px 1px rgba(92,98,111,.3);
 }
 </style>
-

src/api/boe/aiChat.js

@@ -0,0 +1,30 @@
+import ajax from '@/utils/xajax.js'
+
+/**
+ * AI聊天对话接口
+ * @param {Object} data - 请求参数
+ * @param {string} data.conversationId - 会话ID，如果为空则创建新会话
+ * @param {string} data.query - 用户提问内容
+ * @returns {Promise} - 返回SSE流
+ */
+export function aiChat(data) {
+  return ajax.postJson('http://192.168.3.178/xboe/m/boe/case/ai/chat', data)
+}
+
+/**
+ * 查询会话消息记录接口
+ * @param {string} conversationId - 会话ID
+ * @returns {Promise} - 返回会话历史记录
+ */
+export function getChatMessages(conversationId) {
+  return ajax.get('/xboe/m/boe/case/ai/messages?conversationId=' + conversationId)
+}
+
+/**
+ * 案例专家功能入口显示权限判断接口
+ * 判断当前登录用户是否显示"案例专家"功能入口
+ * @returns {Promise} - 返回是否显示功能入口的布尔值
+ */
+export function showCaseAiEntrance() {
+  return ajax.get('/xboe/m/boe/case/ai/show-entrance')
+}

src/api/boe/courseRecord.js

@@ -1,5 +1,6 @@
 /**我的授课记录*/
 import ajax from '@/api/boe/boeApiAjax.js'
+import ajax2 from '@/api/unionAjax.js'
 import axios from 'axios'
 import { getToken } from '@/utils/token'
 const baseURL = process.env.VUE_APP_BOE_BASE_API;
@@ -60,13 +61,63 @@ const exportStudentOfTearcher = function(userId) {
 const courseRecordList = function(data) {
     return ajax.postJson('/b1/system/teacher/teacher-course-list',data);
 }
+const getListByToken = function(data) {
+  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`);
+}
 
+/**
+ * 导出授课记录
+ *
+ * @param {Object} data
+ */
+const courseRecordExport2 = function(data) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/admin/export/exportInTeacherRecord',
+    method: 'get',
+    data:data,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
+
+/**
+ * 导出课程下的学员信息
+ *
+ */
+const exportStudentOfCourse2 = function(courseId,courseType) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/admin/export/exportTeacherRecordStudentInfo?courseId='+courseId+'&courseType='+courseType,
+    method: 'get'
+    // headers:{'Content-Type':'application/json;charset=utf-8'},
+    // responseType: 'blob'
+  })
+}
+
+/**
+ * 导出教师下的所有授课记录下的学员信息
+ *
+ */
+const exportStudentOfTearcher2 = function(userId) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/b1/system/teacher/teacher-course-student-export?userId='+userId,
+    method: 'post',
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
 
 
 export default {
     courseRecordExport,
+    courseRecordExport2,
     courseRecordList,
+    getListByToken,
     exportStudentOfCourse,
-    exportStudentOfTearcher
+    exportStudentOfCourse2,
+    exportStudentOfTearcher,
+    exportStudentOfTearcher2,
 
 }

src/api/boe/userbasic.js

@@ -103,6 +103,14 @@ const getUsersByIds = function(ids) {
     return ajax.postJson(baseURL,'/user/getUserMessageToDai',ids);
 }
 
+/**
+ * 根据关键字检索用户（创建人下拉）
+ * @param {string} keyword
+ */
+const selectUser = function(keyword = '') {
+    return ajax.postJson(baseURL,'/user/selectuser',{ keyword });
+}
+
 export default {
     userParentOrg,
     findOrgsByKeyword,
@@ -116,5 +124,6 @@ export default {
     getInAudienceIds,
     getUsersByIds,
     updateUser,
-    logout
+    logout,
+    selectUser
 }

src/api/growth/growthpath.js

@@ -0,0 +1,8 @@
+// import ajax from '@/utils/xajax.js'
+import ajax from '../ajax';
+// const baseURL = process.env.VUE_APP_GROWTH_API_PATH;
+const baseURL = '/growth';
+// 查询专业力必修列表
+export const listData = (obj) => ajax.get(baseURL, '/professional/student/studentGrowthList', { params: obj })
+// 查询专业力统计
+export const getTotalGrowthTaskDetail = (obj) => ajax.get(baseURL, '/professional/student/getTotalGrowthTaskDetail', { params: obj })

src/api/httpAjax.js

@@ -0,0 +1,208 @@
+import axios from 'axios'
+import qs from 'qs'
+import {Notification, MessageBox, Message} from 'element-ui'
+import store from '@/store'
+import {getToken} from '@/utils/token'
+import errorCode from '@/utils/errorCode'
+
+/**
+ *request请求 axios.request(config)
+ *requestJson请求 axios.request(config)
+ *get请求 axios.get(url[, config])
+ *post请求 axios.post(url[, data[, config]])
+ *postJson请求 axios.post(url[, data[, config]])
+ *put请求 axios.put(url[, data[, config]])
+ *putJson请求 axios.put(url[, data[, config]])
+ *patch请求 axios.patch(url[, data[, config]])
+ *patchJson请求 axios.patch(url[, data[, config]])
+ *delete请求 axios.delete(url[, config])
+ */
+
+
+// const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
+const TokenName = 'token';
+/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
+//只是用于发送json对象数据时使用post,put,patch
+/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
+//只是用于发送json对象数据时使用post,put,patch
+//用于普通的发送请求
+const formRequest = axios.create({
+  //headers:{'Content-Type':'application/x-www-form-urlencoded'},
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  // baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
+  //超时
+  timeout: 10000,
+})
+//发送json对象的拦截器
+formRequest.interceptors.request.use(config => {
+  //是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  let curToken = getToken();
+  //curToken='eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIzMTE2MTIsImV4cCI6MTY3MjMxODgxMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.a4f41376e994c5fcd3ab537ce17572ef4c633863f87785cf7b6ffa353e2ed51c';
+  if (curToken && !isToken) {
+    config.headers[TokenName] = curToken // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  return config
+}, error => {
+  console.log(error)
+  Promise.reject(error)
+});
+formRequest.interceptors.response.use(res => {
+    //console.log(res);
+    const code = res.data.status || 200;
+    if (code === 200) {
+      return res.data
+    } else {
+      if (code === 401) {
+        // store.dispatch('LogOut').then(() => {
+        //    location.href = this.webBaseUrl + ReLoginUrl;
+        // })
+        console.error('', res.data);
+        return Promise.reject(new Error('接口返回未登录'))
+      } else if (code === 403) {
+        var msg = '当前操作没有权限';
+        Message({message: msg, type: 'error'});
+        return Promise.reject(new Error(msg))
+      } else {
+        //Message({message: res.data.message, type: 'error'});
+        //console.log('err' + res.data.error);
+        return res.data
+      }
+    }
+  },
+  error => {
+    console.log('err', error)
+    let {message} = error;
+    if (message == "Network Error") {
+      message = "网络异常，请稍后重试";
+    } else if (message.includes("timeout")) {
+      message = "网络异常或接口错误，请求超时";
+    } else if (message.includes("Request failed with status code")) {
+      message = "系统接口" + message.substr(message.length - 3) + "异常";
+    }
+    Message({
+      message: message,
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(error)
+  }
+)
+
+/**
+ * request请求,可以自定义参数
+ */
+const request = formRequest.request;
+
+/**
+ * get请求 ,只有url
+ */
+const get = function (baseURL, url) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'get',
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+/**
+ * post请求
+ * @param {Object} url
+ * @param {Object} postData
+ */
+const post = function (baseURL, url, postData) {
+  // if (postData) {
+  //   postData = qs.stringify(postData);
+  // }
+  return request({
+    baseURL,
+    url: url,
+    method: 'post',
+    data: postData,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+//post请求
+const postForm = function (baseURL, url, data) {
+  return request({
+    baseURL,
+    url,
+    data,
+    method: 'post',
+    headers: {'Content-Type': 'application/x-www-form-urlencoded'}
+  });
+}
+//  const postJson=jsonRequest.post;
+
+const postJson = function (baseURL, url, postData) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'post',
+    data: postData,
+    headers: {'Content-Type': 'application/json;charset=utf-8'},
+  })
+}
+
+// 导出文件请求定义
+const postJsonToFile = function (baseURL, url, postData) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'post',
+    data: postData,
+    headers: {'Content-Type': 'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
+
+const getJsonToFile = function (baseURL, url, postData) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'get',
+    data: postData,
+    headers: {'Content-Type': 'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
+
+/**
+ * put请求
+ */
+const put = function (baseURL, url, data) {
+  if (data) {
+    data = qs.stringify(data);
+  }
+  return request({
+    baseURL,
+    url: url,
+    method: 'put',
+    data: data,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded'}
+  })
+}
+
+const putJson = function (baseURL, url, data) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'put',
+    data: data,
+    headers: {'Content-Type': 'application/json;charset=utf-8'},
+  })
+}
+
+
+export default {
+  tokenName: TokenName,
+  request,
+  get,
+  post,
+  postJson,
+  postJsonToFile,
+  put,
+  putJson,
+  getJsonToFile
+}

src/api/modules/cases.js

@@ -1,6 +1,6 @@
 /* 案例模块的相关处理*/
 import ajax from '@/utils/xajax.js'
-
+import ajaxs from '@/api/ajax.js'
 /**首页查询
  * pageSize
  * orderField
@@ -88,6 +88,12 @@ const usernameList = function (pageSize) {
 const queryPraises = function (pageSize) {
   return ajax.get(`/xboe/m/boe/cases/query-praises?pageSize=${pageSize}`);
 }
+const queryPraisesNew = function (pageSize,rankType) {
+  return ajax.get(`/xboe/m/boe/cases/queryPopularity?pageSize=${pageSize}&rankType=${rankType}`);
+}
+const queryRecommendRank = function (pageSize) {
+  return ajax.get(`/xboe/m/boe/cases/queryRecommendRank?pageSize=${pageSize}`);
+}
 /*
 好评榜
 @param pageSize 长度
@@ -95,6 +101,9 @@ const queryPraises = function (pageSize) {
 const queryComments = function (pageSize) {
   return ajax.get(`/xboe/m/boe/cases/query-comments?pageSize=${pageSize}`);
 }
+const queryCommentsNew = function (pageSize,rankType) {
+  return ajax.get(`/xboe/m/boe/cases/queryHighOpinion?pageSize=${pageSize}&rankType=${rankType}`);
+}
 
 /**
  * 专业分类
@@ -186,11 +195,36 @@ const endReadTimer =  (data)=> ajax.postJson('/xboe/m/boe/cases/recommend/record
 const caseYears = function (query = {}) {
   return ajax.post('/xboe/m/boe/cases/caseYears', query);
 }
-
+//案例推荐榜单
-
+const getQueryRecommendRank = function (params) {
-
+  return ajax.get(`/xboe/m/boe/cases/queryRecommendRank?pageSize=${params.pageSize}`)
-
+}
+//案例上榜
+const riseIntoRank = (data) => ajax.post(`/xboe/m/boe/cases/riseIntoRank?caseId=${data.caseId}`)
+//取消上榜
+const cancelRiseIntoRank = (data) => ajax.post(`/xboe/m/boe/cases/cancelRiseIntoRank?caseId=${data.caseId}`)
+//调整榜单
+const adjustRank = (data) => ajax.post(`/xboe/m/boe/cases/adjustRank?caseIds=${data.caseIds}`)
+//收藏案例
+const queryFavoriteCaseOfIndex = (params) => ajax.get(`/xboe/m/boe/cases/queryFavoriteCaseOfIndex?pageIndex=${params.pageIndex}&pageSize=${params.pageSize}&orderField=${params.orderField}&orderAsc=${params.orderAsc}`)
+//浏览记录
+const queryViewRecord = (data) => ajaxs.post(`/statApi/xboe/m/stat/userdynamic/list?pageIndex=${data.pageIndex}&pageSize=${data.pageSize}&contentType=${data.contentType}&aid=${data.aid}&hidden=${data.hidden}&eventKey=${data.eventKey}`)
+//浏览量TOP榜单
+const queryPopularityOfMajor = (params) => ajax.get(`/xboe/m/boe/cases/queryPopularityOfMajor?pageSize=${params.pageSize}&rankMonth=${params.rankMonth}&majorId=${params.majorId}`)
+//浏览记录新
+const browsingHistory = (params) => ajax.get(`/xboe/m/boe/cases/browsingHistory?pageIndex=${params.pageIndex}&pageSize=5`)
+//获取所有的专业月份
+const queryAllTimePopularityOfMajor = () => ajax.get('/xboe/m/boe/cases/queryAllTimePopularityOfMajor')
 export default {
+  queryAllTimePopularityOfMajor,
+  getQueryRecommendRank,
+  queryPopularityOfMajor,
+  browsingHistory,
+  queryViewRecord,
+  queryFavoriteCaseOfIndex,
+  riseIntoRank,
+  cancelRiseIntoRank,
+  adjustRank,
   indexList,
   queryList,
   queryListV2,
@@ -202,7 +236,10 @@ export default {
   query,
   usernameList,
   queryPraises,
+  queryPraisesNew,
+  queryRecommendRank,
   queryComments,
+  queryCommentsNew,
   majorTypes,
   details,
   ids,

src/api/modules/course.js

@@ -170,7 +170,9 @@ const updateContentOrders = function(cid,items) {
 const detail = function(id) {
     return ajax.get('/xboe/m/course/manage/detail?id=' + id);
 }
-
+const getDictIds = function(pid,type) {
+  return ajax.get(`/xboe/m/course/manage/getDictIds?pid=${pid}&type=${type}`);
+}
 /**
  * 更新内容的名称
  * @param {Object} data
@@ -267,6 +269,14 @@ const pageList = function(query) {
     return ajax.post('/xboe/m/course/manage/pagelist', query);
 }
 
+/**
+ * 课程管理分页查询（新）
+ * @param {Object} query
+ */
+const managePage = function(query) {
+    return ajax.postJson('/xboe/m/course/manage/page', query);
+}
+
 
 /**计算待审核课程*/
 const countWaitAudit = function() {
@@ -353,6 +363,28 @@ const setTop = function(data) {
     return ajax.post('/xboe/m/course/manage/top', data);
 }
 
+/**
+ * 是否展示置顶相关功能
+ */
+const showSetTop = function() {
+  return ajax.get('/xboe/m/course/manage/show-settop');
+}
+
+/**
+ * 获取置顶课程列表
+ */
+const fetchTopCourseList = function() {
+  return ajax.get('/xboe/m/course/manage/topList');
+}
+
+/**
+ * 更新置顶课程排序
+ * @param {Array<{id:string,sortWeight:number}>} data
+ */
+const updateTopCourseSort = function(data) {
+  return ajax.postJson('/xboe/m/course/manage/top-sortchange', data);
+}
+
 /**
  * 管理员的设置启用停用
  * @param {Object} query {ids:课程id,多个使用逗号分隔,title:课程的名称, Boolean enabled 是否启用}
@@ -420,8 +452,13 @@ const exportCourseAudit=function(query){
 参数同上待审核课程记录导出
  课程的导出和已审核的课程导出
  */
-const exportCourse=function(query){
+const exportCourse = function(query) {
-	return ajax.post('/xboe/m/course/manage/exportCourse',query);
+	return ajax.get({
+		url: '/xboe/m/course/manage/export',
+		method: 'get',
+		params: query,
+		responseType: 'blob'
+	});
 }
 
 //判断受众id是否有关联
@@ -438,6 +475,19 @@ const queryCrowd=function(query){
 const ids=function (data){
   return ajax.postJson('/xboe/m/course/manage/ids',data);
 }
+
+const saveTip = function() {
+  return ajax.postJson('/xboe/m/course/manage/saveTip');
+}
+
+/**
+ * 获取我开发的课程列表
+ */
+const courseList = function(data) {
+  return ajax.postJson('/xboe/m/course/manage/develop_page', data);
+}
+
+
 export default {
     saveBase,
     submitCourse,
@@ -446,8 +496,10 @@ export default {
     findUpdateLogs,
     getUpdateLog,
     detail,
+    getDictIds,
     saveContent,
     pageList,
+    managePage,
     setEnabled,
     del,
     publish,
@@ -464,6 +516,9 @@ export default {
     auditAndPublish,
     getAssess,
     setTop,
+    showSetTop,
+    fetchTopCourseList,
+    updateTopCourseSort,
     delSection,
     getExam,
     delContent,
@@ -479,6 +534,7 @@ export default {
 	exportCourseAudit,
 	exportCourse,
 	queryCrowd,
-  ids
+  ids,
-
+  saveTip,
+  courseList
 }

src/api/modules/courseFile.js

@@ -47,7 +47,9 @@ const findList = function(data) {
  }
  */
 const saveUpload = function(data) {
-    return ajax.post('/xboe/m/course/file/upload/save', data);
+    return ajax.post('/xboe/m/course/file/upload/save', data, {
+      timeout: 60000
+    });
 }
 
 /**

src/api/modules/coursePortal.js

@@ -102,6 +102,24 @@ const courseSearch=function(query){
 const detailStudy = function(courseId,aid) {
   return ajax.get(`/xboe/m/course/portal/detail-study?courseId=${courseId}&aid=${aid}`);
 }
+
+
+/**
+ * 课程学习进度的详细信息-分页
+ * @param {Object} data
+ */
+const detailStudyPage = function(data) {
+  return ajax.get(`/xboe/m/course/portal/detail-study-page?courseId=${data.courseId}&aid=${data.aid}&pageIndex=${data.pageIndex}&pageSize=${data.pageSize}`);
+}
+
+/**
+ * 资源学习情况列列表-分页
+ * @param {Object} data
+ */
+const pageListResource=function(data){
+	return ajax.post('/xboe/school/study/course/pagelist-resource',data);
+}
+
 export default {
     list,
     pageList,
@@ -112,5 +130,7 @@ export default {
     studyCounts,
     courseSearch,
   detailStudy,
-  detailPost
+  detailPost,
+  detailStudyPage,
+  pageListResource
 }

src/api/modules/courseStudy.js

@@ -114,6 +114,10 @@ const studyVideoTime = function(data) {
   return ajax.post('/xboe/school/study/course/study-video-time',data);
 }
 
+const updateStudyVideoTime = function(data) {
+  return ajax.post('/xboe/school/study/course/updateStudyVideoTime',data);
+}
+
 /**
  * 获取上一次的学习内容
  * @returns
@@ -161,7 +165,7 @@ const appendStudyTime = function(data) {
  * name: 学习人的姓名
  */
 const studyRecords = function(data) {
-    return ajax.post('/xboe/school/study/course/pagelist',data);
+  return ajax.post('/xboe/school/study/course/pagelistEx',data);
 }
 
 /**
@@ -185,7 +189,7 @@ const studyContentRecords = function(data) {
  }
  */
 const studyExport = function(data) {
-    return ajax.post('/xboe/school/study/course/export',data);
+  return ajax.post('/xboe/school/study/course/export',data, { responseType: 'blob' });
 }
 
 /**
@@ -338,7 +342,7 @@ const myExamList = function(itemId) {
    contentId:''
  }
  */
- const myExamList2 = function(data) {
+const myExamList2 = function(data) {
   return ajax.post('/xboe/school/study/exam/list-study',data);
 }
 
@@ -398,6 +402,31 @@ const findByIds=function (ids){
   return ajax.postJson('/xboe/school/study/es/list-by-ids',ids);
 }
 
+const exportSignup=function (data){
+  return ajax.post('/xboe/school/study/course/export-signup',data, { responseType: 'blob' });
+}
+
+// 作业导出
+const exportHomework=function (data){
+  return ajax.post('/xboe/school/study/course/contents-homework-export',data, { responseType: 'blob' });
+}
+
+// 考试导出
+const exportExam=function (data){
+  return ajax.post('/xboe/school/study/course/contents-exam-export',data, { responseType: 'blob' });
+}
+
+// 评估类型资源
+const contentsAssess=function (data){
+  return ajax.post('/xboe/school/study/course/contents-assess',data);
+}
+
+// 考试类型资源
+const contentsExam=function (data){
+  return ajax.post('/xboe/school/study/course/contents-exam',data);
+}
+
+
 export default {
   hasSignup,
   signup,
@@ -408,6 +437,7 @@ export default {
   studyIndex,
   studyInfo,
   studyVideoTime,
+  updateStudyVideoTime,
   lastStudy,
   studyContent,
   appendStudyTime,
@@ -433,5 +463,10 @@ export default {
   deleteSignUp,
   ids,
   followIds,
-  studyIndexPost
+  studyIndexPost,
+  exportSignup,
+  exportHomework,
+  exportExam,
+  contentsAssess,
+  contentsExam
 }

src/api/modules/courseTag.js

@@ -0,0 +1,64 @@
+/**课程标签模块的相关处理*/
+import ajax from '@/utils/xajax.js'
+
+/**
+ * 分页查询：标签列表
+ * @param {Object} query
+ */
+const portalPageList = function(query) {
+  return ajax.post('/xboe/m/coursetag/page', query);
+}
+
+//改变标签的公共属性
+const changeTagPublic = function (row){
+  // 返回 Promise 的 API 调用
+  return ajax.post('/xboe/m/coursetag/changePublicStatus', {
+    id: row.id,
+    isPublic: row.isPublic
+  });
+}
+
+//改变标签的热点属性
+const changeTagHot = function (row){
+  // 返回 Promise 的 API 调用
+  return ajax.post('/xboe/m/coursetag/changeHotStatus', {
+    id: row.id,
+    isHot: row.isHot
+  });
+}
+
+//查询指定id的标签关联的所有课程
+const showCourseByTag = function (query){
+  return ajax.post('/xboe/m/coursetag/showCourseByTag', query);
+}
+
+//解除指定id的课程和某个标签之间的关联关系
+const unbindCourseTagRelation = function (params){
+  return ajax.post('/xboe/m/coursetag/unbind', params);
+}
+
+//编辑课程：标签模糊查询
+const searchTags = function (params){
+  return ajax.post('/xboe/m/coursetag/searchTags', params);
+}
+
+//编辑课程：创建标签(与当前课程关联)
+const createTag = function (params){
+  return ajax.post('/xboe/m/coursetag/createTag', params);
+}
+
+//获取最新前10个热点标签
+const getHotTagList = function (params){
+  return ajax.post('/xboe/m/coursetag/getHotTagList', params);
+}
+
+export default {
+  portalPageList,
+  changeTagPublic,
+  changeTagHot,
+  showCourseByTag,
+  unbindCourseTagRelation,
+  searchTags,
+  createTag,
+  getHotTagList
+}

src/api/modules/paper.js

@@ -72,6 +72,9 @@ const querypaper = function(data) {
 const getPaperContent = function(id) {
     return ajax.get('/xboe/m/exam/paper/paper-content?id=' + id);
 }
+const newPaperContent = function(id){
+    return ajax.get('/xboe/m/course/content/exam/paper-content?courseExamId='+id);
+}
 export default {
     detail,
     update,
@@ -80,6 +83,7 @@ export default {
     querylist,
     querypaper,
     getPaperContent,
+    newPaperContent,
     batchImportCount,
     batchImportData
 }

src/api/modules/teacher.js

@@ -1,5 +1,5 @@
 import ajax from '@/utils/xajax.js'
-
+import ajax2 from '../unionAjax.js';
 
 /**
  * 按名称查询
@@ -9,7 +9,9 @@ const findByName = function(name) {
     return ajax.get('/xboe/teacher/name?name=' + name);
 }
 
-
+const findByNameNew = function(name) {
+    return ajax2.get('/manageApi/admin/teacher/selectTeacher?name=' + name);
+}
 const updateTeacher=function(data){
     return ajax.postJson('/xboe/teacher/update-teacher',data);
 }
@@ -217,7 +219,7 @@ export default {
     update,
     del,
     detail,
-    findByName,
+    findByNameNew,
     updateSysId,
 	has,
 	start,

src/api/phase2/index.js

@@ -1,5 +1,7 @@
 import ajax from '@/utils/xajax.js'
 import http from '../unionAjax'
+import httpAjax from '../httpAjax'
+
 const baseURL = process.env.VUE_APP_MANAGER_API_PATH;
 
 
@@ -47,6 +49,18 @@ const articlelist=function (type){
 const courselist=function (data){
   return ajax.post('/xboe/portal/index/courselist',data);
 }
+// 精品课信息列表
+const qualitylist=function (data){
+  return httpAjax.post(baseURL,'/quality/home/qualityItem',data);
+}
+// 精品课分页查询
+export const qualityPageList=function (data){
+  return httpAjax.post(baseURL,'/quality/home/qualityPages',data);
+}
+// 课程精品课标记时间年份列表
+export const qualityCourseTimeMark=function (){
+  return httpAjax.post(baseURL,'/quality/manage/qualityYearList',{});
+}
 /**
  * 首页新课程推荐列表
  */
@@ -61,5 +75,7 @@ export default {
   articlelist,
   courselist,
   newCases,
-  getRecommendList
+  getRecommendList,
+  qualitylist,
+  qualityPageList
 }

src/assets/images/svg/createCourse.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="14px" viewBox="0 0 12 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>新建课程</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="管理端列表页2版" transform="translate(-253, -258)" fill="#4284F7" fill-rule="nonzero">
+            <path d="M263.588235,258 C264.367931,258 265,258.600685 265,259.341667 L265,265.459375 C265,265.737243 264.762974,265.9625 264.470588,265.9625 C264.178202,265.9625 263.941176,265.737243 263.941176,265.459375 L263.941176,259.341667 C263.941176,259.252709 263.903992,259.167394 263.837802,259.104491 C263.771613,259.041588 263.681841,259.00625 263.588235,259.00625 L254.411765,259.00625 C254.318159,259.00625 254.228387,259.041588 254.162198,259.104491 C254.096008,259.167394 254.058824,259.252709 254.058824,259.341667 L254.058824,270.658333 C254.058824,270.747291 254.096008,270.832606 254.162198,270.895509 C254.228387,270.958412 254.318159,270.99375 254.411765,270.99375 L257.411765,270.99375 C257.704116,270.993797 257.941087,271.21904 257.941087,271.496875 C257.941087,271.77471 257.704116,272 257.411765,272 L254.411765,272 C253.632069,272 253,271.399315 253,270.658333 L253,259.341667 C253,258.600685 253.632069,258 254.411765,258 L263.588235,258 Z M261.812997,265.982255 C262.658243,265.982255 263.46887,266.299261 264.066549,266.863534 C264.664227,267.427807 265,268.193125 265,268.991128 C265,270.652882 263.57313,272 261.812997,272 C260.052864,272 258.625995,270.652882 258.625995,268.991128 C258.625995,267.329373 260.052864,265.982255 261.812997,265.982255 Z M261.812997,266.851485 C260.561347,266.851485 259.546684,267.809436 259.546684,268.991128 C259.546684,270.17282 260.561347,271.13077 261.812997,271.13077 C263.063839,271.128929 264.07736,270.172056 264.07931,268.991128 C264.07931,267.809436 263.064647,266.851485 261.812997,266.851485 Z M261.741379,267.495134 C261.93817,267.495134 262.097701,267.646158 262.097701,267.832455 L262.097701,268.675757 L262.988506,268.675757 C263.185297,268.675757 263.344828,268.826781 263.344828,269.013078 C263.344828,269.199375 263.185297,269.350399 262.988506,269.350399 L262.097701,269.350399 L262.097701,270.193701 C262.097701,270.379998 261.93817,270.531022 261.741379,270.531022 C261.544588,270.531022 261.385057,270.379998 261.385057,270.193701 L261.385057,269.350399 L260.494253,269.350399 C260.297462,269.350399 260.137931,269.199375 260.137931,269.013078 C260.137931,268.826781 260.297462,268.675757 260.494253,268.675757 L261.385057,268.675757 L261.385057,267.832455 C261.385057,267.646158 261.544588,267.495134 261.741379,267.495134 Z M259.157162,264.14695 C259.450517,264.14695 259.688329,264.37147 259.688329,264.648429 C259.688329,264.925388 259.450517,265.149908 259.157162,265.149908 L256.324271,265.149908 C256.030915,265.149908 255.793103,264.925388 255.793103,264.648429 C255.793103,264.37147 256.030915,264.14695 256.324271,264.14695 L259.157162,264.14695 Z M261.28183,261.138078 C261.575151,261.138125 261.812907,261.362631 261.812907,261.639557 C261.812907,261.916482 261.575151,262.140988 261.28183,262.141035 L256.324271,262.141035 C256.03095,262.140988 255.793193,261.916482 255.793193,261.639557 C255.793193,261.362631 256.03095,261.138125 256.324271,261.138078 L261.28183,261.138078 Z" id="新建课程"></path>
+        </g>
+    </g>
+</svg>

src/assets/images/svg/createCourse_active.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="12px" height="14px" viewBox="0 0 12 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>新建课程2</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="管理端列表页2版_展开" transform="translate(-253, -304)" fill="#FFFFFF" fill-rule="nonzero">
+            <path d="M263.588235,304 C264.367931,304 265,304.600685 265,305.341667 L265,311.459375 C265,311.737243 264.762974,311.9625 264.470588,311.9625 C264.178202,311.9625 263.941176,311.737243 263.941176,311.459375 L263.941176,305.341667 C263.941176,305.252709 263.903992,305.167394 263.837802,305.104491 C263.771613,305.041588 263.681841,305.00625 263.588235,305.00625 L254.411765,305.00625 C254.318159,305.00625 254.228387,305.041588 254.162198,305.104491 C254.096008,305.167394 254.058824,305.252709 254.058824,305.341667 L254.058824,316.658333 C254.058824,316.747291 254.096008,316.832606 254.162198,316.895509 C254.228387,316.958412 254.318159,316.99375 254.411765,316.99375 L257.411765,316.99375 C257.704116,316.993797 257.941087,317.21904 257.941087,317.496875 C257.941087,317.77471 257.704116,318 257.411765,318 L254.411765,318 C253.632069,318 253,317.399315 253,316.658333 L253,305.341667 C253,304.600685 253.632069,304 254.411765,304 L263.588235,304 Z M261.812997,311.982255 C262.658243,311.982255 263.46887,312.299261 264.066549,312.863534 C264.664227,313.427807 265,314.193125 265,314.991128 C265,316.652882 263.57313,318 261.812997,318 C260.052864,318 258.625995,316.652882 258.625995,314.991128 C258.625995,313.329373 260.052864,311.982255 261.812997,311.982255 Z M261.812997,312.851485 C260.561347,312.851485 259.546684,313.809436 259.546684,314.991128 C259.546684,316.17282 260.561347,317.13077 261.812997,317.13077 C263.063839,317.128929 264.07736,316.172056 264.07931,314.991128 C264.07931,313.809436 263.064647,312.851485 261.812997,312.851485 Z M261.741379,313.495134 C261.93817,313.495134 262.097701,313.646158 262.097701,313.832455 L262.097701,314.675757 L262.988506,314.675757 C263.185297,314.675757 263.344828,314.826781 263.344828,315.013078 C263.344828,315.199375 263.185297,315.350399 262.988506,315.350399 L262.097701,315.350399 L262.097701,316.193701 C262.097701,316.379998 261.93817,316.531022 261.741379,316.531022 C261.544588,316.531022 261.385057,316.379998 261.385057,316.193701 L261.385057,315.350399 L260.494253,315.350399 C260.297462,315.350399 260.137931,315.199375 260.137931,315.013078 C260.137931,314.826781 260.297462,314.675757 260.494253,314.675757 L261.385057,314.675757 L261.385057,313.832455 C261.385057,313.646158 261.544588,313.495134 261.741379,313.495134 Z M259.157162,310.14695 C259.450517,310.14695 259.688329,310.37147 259.688329,310.648429 C259.688329,310.925388 259.450517,311.149908 259.157162,311.149908 L256.324271,311.149908 C256.030915,311.149908 255.793103,310.925388 255.793103,310.648429 C255.793103,310.37147 256.030915,310.14695 256.324271,310.14695 L259.157162,310.14695 Z M261.28183,307.138078 C261.575151,307.138125 261.812907,307.362631 261.812907,307.639557 C261.812907,307.916482 261.575151,308.140988 261.28183,308.141035 L256.324271,308.141035 C256.03095,308.140988 255.793193,307.916482 255.793193,307.639557 C255.793193,307.362631 256.03095,307.138125 256.324271,307.138078 L261.28183,307.138078 Z" id="新建课程2"></path>
+        </g>
+    </g>
+</svg>

src/assets/images/svg/export.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>导出</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="管理端列表页2版" transform="translate(-406, -258)" fill="#999999" fill-rule="nonzero">
+            <path d="M407.8375,272 C407.3125,272 406.875,271.822785 406.525,271.468354 C406.175,271.113924 406,270.670886 406,270.139241 L406,267.56962 C406,267.392405 406.0875,267.21519 406.175,267.126582 C406.2625,267.037975 406.4375,266.949367 406.6125,266.949367 C406.7875,266.949367 406.9625,267.037975 407.05,267.126582 C407.1375,267.21519 407.225,267.392405 407.225,267.56962 L407.225,270.139241 C407.225,270.316456 407.3125,270.582278 407.4,270.670886 C407.4875,270.759494 407.6625,270.848101 407.925,270.848101 L418.075,270.848101 C418.25,270.848101 418.5125,270.759494 418.6,270.670886 C418.6875,270.582278 418.775,270.405063 418.775,270.139241 L418.775,267.56962 C418.775,267.392405 418.8625,267.21519 418.95,267.126582 C419.0375,267.037975 419.2125,266.949367 419.3875,266.949367 C419.5625,266.949367 419.7375,267.037975 419.825,267.126582 C419.9125,267.21519 420,267.392405 420,267.56962 L420,270.139241 C420,270.670886 419.825,271.113924 419.475,271.468354 C419.125,271.822785 418.6875,272 418.1625,272 L407.8375,272 Z M413,268.189873 C412.825,268.189873 412.65,268.101266 412.5625,268.012658 C412.475,267.924051 412.3875,267.746835 412.3875,267.56962 L412.3875,260.126582 C412.3875,260.126582 412.3875,260.037975 412.3,260.037975 L412.2125,260.037975 L410.2,262.253165 C410.1125,262.341772 409.85,262.43038 409.85,262.43038 C409.675,262.43038 409.5,262.341772 409.4125,262.253165 C409.2375,262.075949 409.15,261.987342 409.15,261.898734 C409.15,261.721519 409.2375,261.544304 409.325,261.455696 L412.475,258.265823 C412.65,258.088608 412.825,258 413,258 C413.175,258 413.35,258.088608 413.4375,258.177215 L416.5,261.455696 C416.5875,261.544304 416.675,261.721519 416.675,261.898734 C416.675,262.075949 416.5875,262.253165 416.5,262.341772 C416.4125,262.43038 416.2375,262.518987 416.0625,262.518987 C415.8875,262.518987 415.8,262.341772 415.7125,262.253165 L413.6125,260.037975 L413.525,260.037975 C413.525,260.037975 413.4375,260.037975 413.4375,260.126582 L413.4375,267.658228 C413.4375,267.835443 413.35,268.012658 413.2625,268.101266 C413.175,268.189873 413.0875,268.189873 413,268.189873 Z" id="导出"></path>
+        </g>
+    </g>
+</svg>

src/assets/images/svg/export_active.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>导出</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="管理端列表页2版_展开" transform="translate(-399, -295)">
+            <g id="导出" transform="translate(399, 295)">
+                <rect id="矩形" fill="#000000" opacity="0.05" x="0" y="0" width="32" height="32" rx="4"></rect>
+                <path d="M10.8375,23 C10.3125,23 9.875,22.8227848 9.525,22.4683544 C9.175,22.1139241 9,21.6708861 9,21.1392405 L9,18.5696203 C9,18.3924051 9.0875,18.2151899 9.175,18.1265823 C9.2625,18.0379747 9.4375,17.9493671 9.6125,17.9493671 C9.7875,17.9493671 9.9625,18.0379747 10.05,18.1265823 C10.1375,18.2151899 10.225,18.3924051 10.225,18.5696203 L10.225,21.1392405 C10.225,21.3164557 10.3125,21.5822785 10.4,21.6708861 C10.4875,21.7594937 10.6625,21.8481013 10.925,21.8481013 L21.075,21.8481013 C21.25,21.8481013 21.5125,21.7594937 21.6,21.6708861 C21.6875,21.5822785 21.775,21.4050633 21.775,21.1392405 L21.775,18.5696203 C21.775,18.3924051 21.8625,18.2151899 21.95,18.1265823 C22.0375,18.0379747 22.2125,17.9493671 22.3875,17.9493671 C22.5625,17.9493671 22.7375,18.0379747 22.825,18.1265823 C22.9125,18.2151899 23,18.3924051 23,18.5696203 L23,21.1392405 C23,21.6708861 22.825,22.1139241 22.475,22.4683544 C22.125,22.8227848 21.6875,23 21.1625,23 L10.8375,23 Z M16,19.1898734 C15.825,19.1898734 15.65,19.1012658 15.5625,19.0126582 C15.475,18.9240506 15.3875,18.7468354 15.3875,18.5696203 L15.3875,11.1265823 C15.3875,11.1265823 15.3875,11.0379747 15.3,11.0379747 L15.2125,11.0379747 L13.2,13.2531646 C13.1125,13.3417722 12.85,13.4303797 12.85,13.4303797 C12.675,13.4303797 12.5,13.3417722 12.4125,13.2531646 C12.2375,13.0759494 12.15,12.9873418 12.15,12.8987342 C12.15,12.721519 12.2375,12.5443038 12.325,12.4556962 L15.475,9.26582278 C15.65,9.08860759 15.825,9 16,9 C16.175,9 16.35,9.08860759 16.4375,9.17721519 L19.5,12.4556962 C19.5875,12.5443038 19.675,12.721519 19.675,12.8987342 C19.675,13.0759494 19.5875,13.2531646 19.5,13.3417722 C19.4125,13.4303797 19.2375,13.5189873 19.0625,13.5189873 C18.8875,13.5189873 18.8,13.3417722 18.7125,13.2531646 L16.6125,11.0379747 L16.525,11.0379747 C16.525,11.0379747 16.4375,11.0379747 16.4375,11.1265823 L16.4375,18.6582278 C16.4375,18.835443 16.35,19.0126582 16.2625,19.1012658 C16.175,19.1898734 16.0875,19.1898734 16,19.1898734 Z" id="形状" fill="#4284F7" fill-rule="nonzero"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/images/svg/pintotop.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="14px" viewBox="0 0 10 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>置顶</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="管理端列表页2版" transform="translate(-370, -258)" fill="#999999" fill-rule="nonzero">
+            <path d="M379.893423,258.616603 C379.893423,258.957143 379.62302,259.233205 379.289461,259.233205 L370.613945,259.233205 C370.280386,259.233205 370.009984,258.957143 370.009984,258.616603 C370.009984,258.276062 370.280386,258 370.613945,258 L379.289461,258 C379.62302,258 379.893423,258.276062 379.893423,258.616603 Z M375.000061,260.909695 C374.666502,260.909695 374.3961,261.185758 374.3961,261.526298 L374.3961,271.383397 C374.3961,271.723938 374.666502,272 375.000061,272 C375.33362,272 375.604022,271.723938 375.604022,271.383397 L375.604022,261.526298 C375.604022,261.185758 375.33362,260.909695 375.000061,260.909695 Z M374.605006,260.423894 L370.155854,264.965705 C369.936707,265.189438 369.950361,265.566044 370.18612,265.806738 C370.422106,266.047663 370.790764,266.061371 371.009911,265.837637 L375.458835,261.295827 C375.677754,261.072094 375.664327,260.695487 375.428569,260.454794 C375.19281,260.214101 374.823925,260.200161 374.605006,260.423894 Z M374.571553,260.454794 C374.335794,260.695487 374.32214,261.072094 374.541287,261.295827 L378.990211,265.83787 C379.20913,266.061371 379.578015,266.047663 379.814002,265.806738 C380.049761,265.566044 380.063187,265.189438 379.844041,264.965705 L375.395344,260.423894 C375.176197,260.200161 374.807312,260.214101 374.571553,260.454794 Z" id="置顶"></path>
+        </g>
+    </g>
+</svg>

src/assets/images/svg/pintotop_active.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>置顶</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="管理端列表页2版_展开" transform="translate(-359, -295)">
+            <g id="置顶" transform="translate(359, 295)">
+                <rect id="矩形" fill="#000000" opacity="0.05" x="0" y="0" width="32" height="32" rx="4"></rect>
+                <path d="M20.8934226,9.61660263 C20.8934226,9.95714285 20.6230199,10.2332053 20.2894612,10.2332053 L11.613945,10.2332053 C11.2803864,10.2332053 11.0099836,9.95714285 11.0099836,9.61660263 C11.0099836,9.2760624 11.2803864,9 11.613945,9 L20.2894612,9 C20.6230199,9 20.8934226,9.2760624 20.8934226,9.61660263 Z M16.000061,11.9096953 C15.6665023,11.9096953 15.3960996,12.1857577 15.3960996,12.5262979 L15.3960996,22.3833974 C15.3960996,22.7239376 15.6665023,23 16.000061,23 C16.3336196,23 16.6040224,22.7239376 16.6040224,22.3833974 L16.6040224,12.5262979 C16.6040224,12.1857577 16.3336196,11.9096953 16.000061,11.9096953 Z M15.6050056,11.4238942 L11.1558537,15.9657046 C10.9367072,16.1894379 10.9503612,16.5660441 11.1861201,16.8067376 C11.4221065,17.0476633 11.7907642,17.0613707 12.0099107,16.8376374 L16.458835,12.295827 C16.6777539,12.0720936 16.6643275,11.6954874 16.4285686,11.454794 C16.1928098,11.2141006 15.8239245,11.2001608 15.6050056,11.4238942 Z M15.5715533,11.454794 C15.3357945,11.6954874 15.3221405,12.0720936 15.541287,12.295827 L19.9902113,16.8378697 C20.2091302,17.0613707 20.5780155,17.0476633 20.8140019,16.8067376 C21.0497608,16.5660441 21.0631872,16.1894379 20.8440407,15.9657046 L16.3953439,11.4238942 C16.1761974,11.2001608 15.8073122,11.2141006 15.5715533,11.454794 Z" fill="#4284F7" fill-rule="nonzero"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/images/svg/reset.svg

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="15px" height="14px" viewBox="0 0 15 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>重置</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="管理端列表页2版" transform="translate(-1856, -184)" fill="#999999" fill-rule="nonzero">
+            <path d="M1869.71817,192.111106 C1869.4322,192.034115 1869.13954,192.209582 1869.06445,192.503055 C1868.40237,195.092745 1866.11453,196.901755 1863.50209,196.901755 C1861.15555,196.899152 1859.04494,195.436448 1858.16588,193.203628 L1859.21633,193.203628 L1857.5998,190.995338 L1856,193.203628 L1857.02588,193.203628 C1857.04017,193.247973 1857.05486,193.292079 1857.06996,193.335947 C1858.03525,196.131656 1860.61197,198.000082 1863.50209,198 C1866.60098,198 1869.31413,195.854292 1870.10009,192.781997 C1870.17511,192.488507 1870.00413,192.188163 1869.71817,192.111106 L1869.71817,192.111106 Z M1857.27782,189.936967 C1857.41541,189.973056 1857.56135,189.951488 1857.68343,189.877019 C1857.80551,189.802551 1857.89371,189.6813 1857.92858,189.540011 C1858.57704,186.92501 1860.8728,185.095707 1863.50209,185.098933 C1865.88559,185.098933 1867.97254,186.565167 1868.84057,188.800279 L1867.78367,188.800279 L1869.4002,191.008569 L1871,188.800279 L1869.97935,188.800279 C1869.02652,185.848952 1866.29164,183.895768 1863.26396,184.004305 C1860.23628,184.112842 1857.64087,186.257109 1856.89102,189.269473 C1856.81842,189.563384 1856.99152,189.8621 1857.27782,189.936967 Z" id="重置"></path>
+        </g>
+    </g>
+</svg>

src/assets/images/svg/reset_active.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>zhongzhi-</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="管理端列表页2版_展开" transform="translate(-867, -217)">
+            <g id="zhongzhi-" transform="translate(867, 217)">
+                <rect id="矩形备份-12" fill="#000000" opacity="0.05" x="0" y="0" width="32" height="32" rx="6"></rect>
+                <path d="M22.7181736,17.1111055 C22.4321954,17.0341148 22.1395394,17.209582 22.0644543,17.5030548 C21.4023719,20.092745 19.1145286,21.9017553 16.5020908,21.9017553 C14.1555467,21.8991521 12.0449381,20.4364475 11.1658807,18.2036283 L12.2163267,18.2036283 L10.5998002,15.9953376 L9,18.2036283 L10.0258793,18.2036283 C10.0401663,18.2479729 10.0548599,18.2920791 10.06996,18.3359469 C11.0352515,21.1316558 13.6119724,23.0000823 16.5020908,23 C19.600985,23 22.3141291,20.8542924 23.1000906,17.7819967 C23.1751107,17.4885065 23.0041347,17.1881629 22.7181736,17.1111055 L22.7181736,17.1111055 Z M10.2778191,14.9369673 C10.4154149,14.9730564 10.5613478,14.951488 10.6834293,14.8770194 C10.8055109,14.8025508 10.8937114,14.6813 10.9285764,14.5400114 C11.5770444,11.9250098 13.8728029,10.0957074 16.5020908,10.0989331 C18.8855875,10.0989331 20.972541,11.5651666 21.8405659,13.8002787 L20.7836733,13.8002787 L22.4001998,16.0085694 L24,13.8002787 L22.9793477,13.8002787 C22.0265159,10.848952 19.2916412,8.89576768 16.2639616,9.00430498 C13.2362819,9.11284227 10.6408709,11.2571085 9.89102356,14.2694734 C9.8184212,14.5633845 9.9915194,14.8621004 10.2778191,14.9369673 Z" id="形状" fill="#999999" fill-rule="nonzero"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/images/svg/search.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>sousuo</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="京东方_在线管理3版" transform="translate(-1496, -191)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="chaxun" transform="translate(1482, 179)">
+                <g id="sousuo" transform="translate(14, 12)">
+                    <path d="M15.8180325,14.9374363 L12.4571361,11.5685482 C13.5099726,10.3025262 14.0854618,8.70594283 14.0830354,7.05780481 C14.0830354,3.15992486 10.9303387,0 7.04166051,0 C3.15269672,0 0,3.16021111 0,7.05780481 C0,10.9553985 3.15269672,14.1153234 7.04166051,14.1153234 C8.70394773,14.1177783 10.3130671,13.5283697 11.5820693,12.452205 L14.9398241,15.8176581 C15.0612025,15.9393148 15.219994,16 15.3790711,16 C15.6301938,16 15.8565501,15.8482487 15.952674,15.6157194 C16.048798,15.38319 15.9957782,15.1155246 15.8183181,14.9374363 L15.8180325,14.9374363 Z M7.04166051,12.8704224 C5.50312892,12.872373 4.0272712,12.2596195 2.94078432,11.1677968 C1.85145906,10.0788189 1.24010717,8.59957752 1.24205333,7.05751856 C1.24010717,5.51545961 1.85145906,4.0362182 2.94078432,2.94724036 C4.02736505,1.8556276 5.50321116,1.24308494 7.04166051,1.24518646 C8.5801921,1.2432366 10.0560498,1.85599012 11.1425367,2.94781286 C12.2316602,4.03678569 12.8428963,5.51589252 12.8409821,7.05780481 C12.8429283,8.59986377 12.2315764,10.0791052 11.1422511,11.168083 C10.0557872,12.2597304 8.58005203,12.8723727 7.04166051,12.8704224 L7.04166051,12.8704224 Z" id="形状"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/images/svg/search_active.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>chaxun</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="管理端列表页2版" transform="translate(-1807, -175)">
+            <g id="chaxun" transform="translate(1807, 175)">
+                <rect id="矩形备份-11" fill="#4284F7" x="0" y="0" width="32" height="32" rx="6"></rect>
+                <path d="M23.8180325,22.9374363 L20.4571361,19.5685482 C21.5099726,18.3025262 22.0854618,16.7059428 22.0830354,15.0578048 C22.0830354,11.1599249 18.9303387,8 15.0416605,8 C11.1526967,8 8,11.1602111 8,15.0578048 C8,18.9553985 11.1526967,22.1153234 15.0416605,22.1153234 C16.7039477,22.1177783 18.3130671,21.5283697 19.5820693,20.452205 L22.9398241,23.8176581 C23.0612025,23.9393148 23.219994,24 23.3790711,24 C23.6301938,24 23.8565501,23.8482487 23.952674,23.6157194 C24.048798,23.38319 23.9957782,23.1155246 23.8183181,22.9374363 L23.8180325,22.9374363 Z M15.0416605,20.8704224 C13.5031289,20.872373 12.0272712,20.2596195 10.9407843,19.1677968 C9.85145906,18.0788189 9.24010717,16.5995775 9.24205333,15.0575186 C9.24010717,13.5154596 9.85145906,12.0362182 10.9407843,10.9472404 C12.0273651,9.8556276 13.5032112,9.24308494 15.0416605,9.24518646 C16.5801921,9.2432366 18.0560498,9.85599012 19.1425367,10.9478129 C20.2316602,12.0367857 20.8428963,13.5158925 20.8409821,15.0578048 C20.8429283,16.5998638 20.2315764,18.0791052 19.1422511,19.168083 C18.0557872,20.2597304 16.580052,20.8723727 15.0416605,20.8704224 L15.0416605,20.8704224 Z" id="搜索" fill="#FFFFFF" fill-rule="nonzero"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/images/svg/收起.svg

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="10px" height="6px" viewBox="0 0 10 6" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>收起</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="京东方_在线管理_展开" transform="translate(-864, -257)" fill="#4284F7" fill-rule="nonzero">
+            <g id="收起" transform="translate(869, 260) scale(-1, -1) rotate(-270) translate(-869, -260)translate(866, 255)">
+                <path d="M0.828204731,0.121981959 C0.622033338,-0.0563083543 0.311020892,-0.036938598 0.12859169,0.165553637 C-0.0538375124,0.368045871 -0.040602445,0.679202183 0.158363572,0.865490299 L4.75263287,4.99731525 L0.186899406,9.12914019 C-0.000258078139,9.29809982 -0.0324364247,9.57982078 0.111805105,9.78658969 L0.151855399,9.83562322 C0.337423297,10.0402931 0.653830189,10.05597 0.85874308,9.87064716 L5.83549268,5.36756839 C5.94042055,5.2725631 6.00019036,5.13759575 6,4.99609231 C5.99980873,4.85458886 5.93967513,4.71978301 5.83449142,4.62506073 L0.828204731,0.121981959 Z" id="路径"></path>
+            </g>
+        </g>
+    </g>
+</svg>

src/assets/styles/index.scss

@@ -392,3 +392,100 @@ li{
     }
   }
 
+.custom-confirm-dialog {
+  max-width: 692px;
+  min-width: 692px;
+  min-height: 222px !important;
+  padding: 0px 0px 0px;
+  border-radius: 10px;
+  height: auto !important;
+
+  .el-message-box__header {
+    // padding: 0 0 16px 0;
+    padding: 2px 8px 2px 16px;
+    display: block;
+
+    .el-message-box__title {
+      font-size: 16px;
+      color: #000;
+      line-height: 32px;
+    }
+
+    .el-message-box__headerbtn {
+      top: 8px;
+      right: 10px;
+      .el-message-box__close {
+        font-size: 22px;
+        color: #b2b2b2;
+      }
+    }
+  }
+
+  .el-message-box__content {
+    margin-top: 0;
+    padding: 50px 0;
+    .el-message-box__status {
+      margin-right: 14px;
+      font-size: 24px;
+      color: #e32e2e;
+    //   display: block;
+    }
+
+    .el-message-box__message {
+      margin-left: 0;
+      color: #000;
+      font-size: 16px;
+      line-height: 32px;
+      font-weight: normal;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      padding: 0 20px;
+      p{
+        display: flex;
+        align-items: baseline;
+        justify-content: center;
+        text-align: left;
+        .el-icon-warning-outline{
+            margin-right: 6px;
+            font-size: 18px;
+            color: #e32e2e;
+        }
+      }
+      
+    }
+  }
+
+  .el-message-box__btns {
+    padding: 0;
+    display: flex;
+    justify-content: flex-end;
+    padding-right: 20px;
+    margin-top: 0px;
+    padding-bottom: 20px;
+
+    .el-button {
+      min-width: 120px;
+      height: 40px;
+      font-size: 16px;
+      border-radius: 6px;
+      padding: 0 18px;
+    }
+
+    .el-button--default {
+      color: rgba(0, 0, 0, .2);
+      border-color: rgba(0, 0, 0, .1);
+      background-color: #FFFFFF;
+    }
+
+    .el-button--primary {
+      background-color: #3b7cff;
+      border-color: #3b7cff;
+      color: #fff;
+    }
+  }
+}
+
+.custom-message-dialog {
+
+}

src/assets/styles/portal-index.scss

@@ -432,6 +432,37 @@
     color: #333333;
  }
 }
+.el-message.new-message {
+  background-color: #edf2fc !important;
+  box-shadow: none !important;
+  border-color: #EBEEF5 !important;
+  min-width: 170px !important;
+  border-radius: 10px !important;
+  }
+.el-message--success.new-message {
+  background-color: #f0f9eb !important;
+  box-shadow: none !important;
+  border-color: #e1f3d8 !important;
+  min-width: 170px !important;
+  border-radius: 10px !important
+  }
+.el-message--error.new-message {
+  background-color: #fef0f0 !important;
+  box-shadow: none !important;
+  border-color: #fde2e2 !important;
+  min-width: 170px !important;
+  border-radius: 10px !important
+  }
+  .el-message--warning.new-message {
+    background-color: #fdf6ec !important;
+    box-shadow: none !important;
+    border-color: #faecd8 !important;
+    min-width: 170px !important;
+    border-radius: 10px !important
+  }
+
+
+
 .el-badge__content{// badge去掉白色边框
   border:1px solid #f56c6c;
 }