Prechádzať zdrojové kódy

文章等级及词云接口

natasha 1 rok pred
rodič
commit
9995170c9e
4 zmenil súbory, kde vykonal 350 pridanie a 322 odobranie
  1. 6 6
      public/ciyun/ciyunindex.html
  2. 310 298
      src/api/api.js
  3. 30 14
      src/common/data.js
  4. 4 4
      src/views/Textanalysis/index.vue

+ 6 - 6
public/ciyun/ciyunindex.html

@@ -407,12 +407,12 @@
 
         function getdata() {
             let data = {
-                searchType: searchType * 1,
-                partitionKey: partitionKey * 1,
-                stopWordStatus: W_stopWordStatus,
+                type: searchType * 1,
+                analyse_record_id: partitionKey,
+                is_contain_stop_word: W_stopWordStatus ? 'true' : 'false',
             }
             $.ajax({
-                url: window.location.origin + "/GCLSTCServer/tools/TS/glossary/ciyun",
+                url: window.location.origin + "/TeachingServer/TextAnalyser/GetWordCloudData",
                 // url: "/i21st-newspaper-management-test/api/article/detail/wordCloud",
                 data: JSON.stringify(data),
                 contentType: "application/json",
@@ -420,13 +420,13 @@
                 type: "post",
                 success: function(res) {
                     let str = ''
-                    res.data.result.forEach(item => {
+                    res.data_list.forEach(item => {
                         if (item.word.indexOf(" ") != -1) {
                             item.word = item.word.replace(" ", "")
                         }
                         str += item.word + " "
                     })
-                    ciyunData = res.data.result
+                    ciyunData = res.data_list
                     text = str
                     $("#text").val(text);
                     $("#go").trigger("click");

+ 310 - 298
src/api/api.js

@@ -3,22 +3,22 @@ import { getToken, getAccessToken } from '@/utils/auth';
 
 // 文件流 /GCLSFileServer/WebFileDownload?
 export function WebFileDownload(data) {
-  let userInfor = getToken();
-  let SessionID = '';
-  let UserCode = '';
-  let UserType = '';
-  if (userInfor) {
-    let user = JSON.parse(getToken());
-    UserCode = user.user_code;
-    UserType = user.user_type;
-    SessionID = user.session_id;
-  }
-  return request({
-    url: `/GCLSFileServer/WebFileDownload?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'get',
-    responseType: 'blob',
-    params: data,
-  });
+    let userInfor = getToken();
+    let SessionID = '';
+    let UserCode = '';
+    let UserType = '';
+    if (userInfor) {
+        let user = JSON.parse(getToken());
+        UserCode = user.user_code;
+        UserType = user.user_type;
+        SessionID = user.session_id;
+    }
+    return request({
+        url: `/GCLSFileServer/WebFileDownload?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'get',
+        responseType: 'blob',
+        params: data,
+    });
 }
 
 let userInfor = getToken();
@@ -26,288 +26,288 @@ let SessionID = '';
 let UserCode = '';
 let UserType = '';
 if (userInfor) {
-  userInfor = JSON.parse(getToken());
-  UserCode = userInfor.user_code;
-  UserType = userInfor.user_type;
-  SessionID = userInfor.session_id;
+    userInfor = JSON.parse(getToken());
+    UserCode = userInfor.user_code;
+    UserType = userInfor.user_type;
+    SessionID = userInfor.session_id;
 }
 
 export function getContentFile(MethodName, data) {
-  let userInfor = getToken();
-  let SessionID = '';
-  let UserCode = '';
-  let UserType = '';
-  if (userInfor) {
-    let user = JSON.parse(getToken());
-    UserCode = user.user_code;
-    UserType = user.user_type;
-    SessionID = user.session_id;
-  }
-  return request({
-    url: `/GCLSFileServer/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    let userInfor = getToken();
+    let SessionID = '';
+    let UserCode = '';
+    let UserType = '';
+    if (userInfor) {
+        let user = JSON.parse(getToken());
+        UserCode = user.user_code;
+        UserType = user.user_type;
+        SessionID = user.session_id;
+    }
+    return request({
+        url: `/GCLSFileServer/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 
 export function getLogin(MethodName, data) {
-  let userInfor = getToken();
-  let SessionID = '';
-  let UserCode = '';
-  let UserType = '';
-  if (userInfor) {
-    let user = JSON.parse(getToken());
-    UserCode = user.user_code;
-    UserType = user.user_type;
-    SessionID = user.session_id;
-  }
-  return request({
-    url: `/GCLSFileServer/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    let userInfor = getToken();
+    let SessionID = '';
+    let UserCode = '';
+    let UserType = '';
+    if (userInfor) {
+        let user = JSON.parse(getToken());
+        UserCode = user.user_code;
+        UserType = user.user_type;
+        SessionID = user.session_id;
+    }
+    return request({
+        url: `/GCLSFileServer/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 
 export function BookgetContent(MethodName, data) {
-  let userInfor = getToken();
-  let SessionID = '';
-  let UserCode = '';
-  let UserType = '';
-  if (userInfor) {
-    let user = JSON.parse(getToken());
-    UserCode = user.user_code;
-    UserType = user.user_type;
-    SessionID = user.session_id;
-  }
-  return request({
-    url: `/GCLSBookWebSI/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    let userInfor = getToken();
+    let SessionID = '';
+    let UserCode = '';
+    let UserType = '';
+    if (userInfor) {
+        let user = JSON.parse(getToken());
+        UserCode = user.user_code;
+        UserType = user.user_type;
+        SessionID = user.session_id;
+    }
+    return request({
+        url: `/GCLSBookWebSI/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 
 export function getStaticContent(MethodName, data) {
-  return request({
-    url: `/GCLSFileServer/ServiceInterface?MethodName=${MethodName}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSFileServer/ServiceInterface?MethodName=${MethodName}`,
+        method: 'post',
+        data,
+    });
 }
 export function LearnWebSI(MethodName, data) {
-  let userInfor = JSON.parse(getToken());
-  let SessionID = '';
-  let UserCode = '';
-  let UserType = '';
-  if (userInfor) {
-    UserCode = userInfor.user_code;
-    UserType = userInfor.user_type;
-    SessionID = userInfor.session_id;
-  }
-  return request({
-    url: `/GCLSLearnWebSI/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    let userInfor = JSON.parse(getToken());
+    let SessionID = '';
+    let UserCode = '';
+    let UserType = '';
+    if (userInfor) {
+        UserCode = userInfor.user_code;
+        UserType = userInfor.user_type;
+        SessionID = userInfor.session_id;
+    }
+    return request({
+        url: `/GCLSLearnWebSI/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 根据id获取文件信息
 export function GetFillemessage(MethodName, data) {
-  return request({
-    url: `/GCLSFileServer/ServiceInterface?MethodName=${MethodName}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSFileServer/ServiceInterface?MethodName=${MethodName}`,
+        method: 'post',
+        data,
+    });
 }
 export function getContent(MethodName, data) {
-  let userInfor = JSON.parse(getToken());
-  let SessionID = '';
-  let UserCode = '';
-  let UserType = '';
-  if (userInfor) {
-    UserCode = userInfor.user_code;
-    UserType = userInfor.user_type;
-    SessionID = userInfor.session_id;
-  }
-  return request({
-    url: `/GCLSFileServer/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    let userInfor = JSON.parse(getToken());
+    let SessionID = '';
+    let UserCode = '';
+    let UserType = '';
+    if (userInfor) {
+        UserCode = userInfor.user_code;
+        UserType = userInfor.user_type;
+        SessionID = userInfor.session_id;
+    }
+    return request({
+        url: `/GCLSFileServer/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 验证是否登录
 export function VerifyLogin() {
-  let userInfor = getToken();
-  let SessionID = '';
-  let UserCode = '';
-  let UserType = '';
-  if (userInfor) {
-    userInfor = JSON.parse(getToken());
-    UserCode = userInfor.user_code;
-    UserType = userInfor.user_type;
-    SessionID = userInfor.session_id;
-  }
-  let data = {
-    userCode: UserCode,
-    userType: UserType,
-    sessionId: SessionID,
-  };
-  return request({
-    url: `/GCLSTCServer/login?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    let userInfor = getToken();
+    let SessionID = '';
+    let UserCode = '';
+    let UserType = '';
+    if (userInfor) {
+        userInfor = JSON.parse(getToken());
+        UserCode = userInfor.user_code;
+        UserType = userInfor.user_type;
+        SessionID = userInfor.session_id;
+    }
+    let data = {
+        userCode: UserCode,
+        userType: UserType,
+        sessionId: SessionID,
+    };
+    return request({
+        url: `/GCLSTCServer/login?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 查询学习资料列表
 export function materiallist(data) {
-  return request({
-    url: `/GCLSTCServer/material/list?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/material/list?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 查询所有学习资料列表
 export function materiallistAll(data) {
-  let userInfor = getToken();
-  let SessionID = '';
-  let UserCode = '';
-  let UserType = '';
-  if (userInfor) {
-    let user = JSON.parse(getToken());
-    UserCode = user.user_code;
-    UserType = user.user_type;
-    SessionID = user.session_id;
-  }
-  return request({
-    url: `/GCLSTCWebSI/ServiceInterface?MethodName=page_query-PageQueryTCMaterialList&&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    let userInfor = getToken();
+    let SessionID = '';
+    let UserCode = '';
+    let UserType = '';
+    if (userInfor) {
+        let user = JSON.parse(getToken());
+        UserCode = user.user_code;
+        UserType = user.user_type;
+        SessionID = user.session_id;
+    }
+    return request({
+        url: `/GCLSTCWebSI/ServiceInterface?MethodName=page_query-PageQueryTCMaterialList&&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 查询学习资料详情
 export function materialdetail(data) {
-  let userInfor = getToken();
-  let SessionID = '';
-  let UserCode = '';
-  let UserType = '';
-  if (userInfor) {
-    userInfor = JSON.parse(getToken());
-    UserCode = userInfor.user_code;
-    UserType = userInfor.user_type;
-    SessionID = userInfor.session_id;
-  }
+    let userInfor = getToken();
+    let SessionID = '';
+    let UserCode = '';
+    let UserType = '';
+    if (userInfor) {
+        userInfor = JSON.parse(getToken());
+        UserCode = userInfor.user_code;
+        UserType = userInfor.user_type;
+        SessionID = userInfor.session_id;
+    }
 
-  return request({
-    url: `/GCLSTCServer/material/detail?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/material/detail?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 
 export function Personamaterialdetail(data) {
-  let userInfor = getToken();
-  let SessionID = '';
-  let UserCode = '';
-  let UserType = '';
-  if (userInfor) {
-    userInfor = JSON.parse(getToken());
-    UserCode = userInfor.user_code;
-    UserType = userInfor.user_type;
-    SessionID = userInfor.session_id;
-  }
+    let userInfor = getToken();
+    let SessionID = '';
+    let UserCode = '';
+    let UserType = '';
+    if (userInfor) {
+        userInfor = JSON.parse(getToken());
+        UserCode = userInfor.user_code;
+        UserType = userInfor.user_type;
+        SessionID = userInfor.session_id;
+    }
 
-  return request({
-    url: `/GCLSTCServer/material/detail4owner?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/material/detail4owner?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 
 // 上传附件(课程资源)
 export function attachmentinsert(data) {
-  return request({
-    url: `/GCLSTCServer/attachment/insert?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/attachment/insert?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 下架学习资料  /material/outOfStockAction
 export function materialoutOfStockAction(data) {
-  return request({
-    url: `/GCLSTCServer/material/outOfStockAction?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/material/outOfStockAction?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 上架学习资料  /material/inStockAction
 export function materialinStockAction(data) {
-  return request({
-    url: `/GCLSTCServer/material/inStockAction?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/material/inStockAction?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 删除学习资料/material/delete
 export function materialdelete(data) {
-  return request({
-    url: `/GCLSTCServer/material/delete?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/material/delete?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 更新学习资料
 export function materialupdate(data) {
-  return request({
-    url: `/GCLSTCServer/material/update?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/material/update?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 插入学习资料
 export function materialinsert(data) {
-  return request({
-    url: `/GCLSTCServer/material/insert?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/material/insert?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 查询企业信息 (机构信息)
 export function usertenant(data) {
-  return request({
-    url: `/GCLSTCServer/user/tenant?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/user/tenant?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 收藏 /material/favorite/insert
 export function materialfavoriteinsert(data) {
-  return request({
-    url: `/GCLSTCServer/material/favorite/insert?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/material/favorite/insert?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 取消收藏/material/favorite/delete
 export function materialfavoritedelete(data) {
-  return request({
-    url: `/GCLSTCServer/material/favorite/delete?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/material/favorite/delete?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 浏览次数计数/material/visit
 export function materialvisit(data) {
-  return request({
-    url: `/GCLSTCServer/material/visit?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/material/visit?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 // 查询作者列表 /material/teacher/list
 export function teacherlist(data) {
-  return request({
-    url: `/GCLSTCServer/material/teacher/list?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/GCLSTCServer/material/teacher/list?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 
 /**
@@ -315,12 +315,12 @@ export function teacherlist(data) {
  * @param {object} data
  */
 export function AddTextFile(data) {
-  return request({
-    url: `/TeachingServer/TextAnalyser/AddTextFile`,
-    params: getAccessToken(),
-    method: 'post',
-    data,
-  });
+    return request({
+        url: `/TeachingServer/TextAnalyser/AddTextFile`,
+        params: getAccessToken(),
+        method: 'post',
+        data,
+    });
 }
 
 /**
@@ -328,12 +328,12 @@ export function AddTextFile(data) {
  * @param {object} data
  */
 export function PageQueryMyTextAnalyseRecordList(data) {
-  return request({
-    method: 'post',
-    url: `/TeachingServer/TextAnalyser/PageQueryMyTextAnalyseRecordList`,
-    params: getAccessToken(),
-    data,
-  });
+    return request({
+        method: 'post',
+        url: `/TeachingServer/TextAnalyser/PageQueryMyTextAnalyseRecordList`,
+        params: getAccessToken(),
+        data,
+    });
 }
 
 /**
@@ -341,12 +341,12 @@ export function PageQueryMyTextAnalyseRecordList(data) {
  * @param {object} data
  */
 export function GetTextAnalyseRecordInfo(data) {
-  return request({
-    method: 'post',
-    url: `/TeachingServer/TextAnalyser/GetTextAnalyseRecordInfo`,
-    params: getAccessToken(),
-    data,
-  });
+    return request({
+        method: 'post',
+        url: `/TeachingServer/TextAnalyser/GetTextAnalyseRecordInfo`,
+        params: getAccessToken(),
+        data,
+    });
 }
 
 /**
@@ -356,12 +356,12 @@ export function GetTextAnalyseRecordInfo(data) {
  * @param {string} data.analyse_record_id 分析记录id
  */
 export function analyse(data) {
-  return request({
-    method: 'post',
-    url: `/GCLSTCServer/tools/TS/analys`,
-    params: getAccessToken(),
-    data,
-  });
+    return request({
+        method: 'post',
+        url: `/TeachingServer/TextAnalyser/Analyse`,
+        params: getAccessToken(),
+        data,
+    });
 }
 
 /**
@@ -370,12 +370,12 @@ export function analyse(data) {
  * @param {string} data.analyse_record_id 分析记录id
  */
 export function reparse(data) {
-  return request({
-    method: 'post',
-    url: `/GCLSTCServer/tools/TS/reparse`,
-    params: getAccessToken(),
-    data,
-  });
+    return request({
+        method: 'post',
+        url: `/TeachingServer/TextAnalyser/ReAnalyse`,
+        params: getAccessToken(),
+        data,
+    });
 }
 
 /**
@@ -384,51 +384,63 @@ export function reparse(data) {
  * @param {string} data.id 分析记录id
  */
 export function DeleteTextAnalyseRecord(data) {
-  return request({
-    method: 'post',
-    url: `/TeachingServer/TextAnalyser/DeleteTextAnalyseRecord`,
-    params: getAccessToken(),
-    data,
-  });
+    return request({
+        method: 'post',
+        url: `/TeachingServer/TextAnalyser/DeleteTextAnalyseRecord`,
+        params: getAccessToken(),
+        data,
+    });
+}
+
+/**
+ * 公共方法
+ */
+export function publicMethods(MethodName, data) {
+    return request({
+        method: 'post',
+        url: MethodName,
+        params: getAccessToken(),
+        data,
+    });
 }
 
 // 消息部分
 export function getLearnWebContent(MethodName, data) {
-  let userInfor = getToken();
-  let SessionID = '';
-  let UserCode = '';
-  let UserType = '';
-  if (userInfor) {
-    let user = JSON.parse(getToken());
-    UserCode = user.user_code;
-    UserType = user.user_type;
-    SessionID = user.session_id;
-  }
-  return request({
-    url: `/GCLSLearnWebSI/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data,
-  });
+    let userInfor = getToken();
+    let SessionID = '';
+    let UserCode = '';
+    let UserType = '';
+    if (userInfor) {
+        let user = JSON.parse(getToken());
+        UserCode = user.user_code;
+        UserType = user.user_type;
+        SessionID = user.session_id;
+    }
+    return request({
+        url: `/GCLSLearnWebSI/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data,
+    });
 }
 
 // post api
 export function postapi(data) {
-  let userInfor = getToken();
-  let JSESSIONID = '';
-  let SessionID = '';
-  let UserCode = '';
-  let UserType = '';
-  if (userInfor) {
-    let user = JSON.parse(getToken());
-    UserCode = user.user_code;
-    UserType = user.user_type;
-    SessionID = user.session_id;
-    JSESSIONID = user['JSESSIONID'];
-  }
-  return request({
-    url: `${data.url}?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
-    method: 'post',
-    data: data.data,
-  });
-}
-// 子登录
+    let userInfor = getToken();
+    let JSESSIONID = '';
+    let SessionID = '';
+    let UserCode = '';
+    let UserType = '';
+    if (userInfor) {
+        let user = JSON.parse(getToken());
+        UserCode = user.user_code;
+        UserType = user.user_type;
+        SessionID = user.session_id;
+        JSESSIONID = user['JSESSIONID'];
+    }
+    return request({
+        url: `${data.url}?UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}`,
+        method: 'post',
+        data: data.data,
+    });
+}
+// 子登录

+ 30 - 14
src/common/data.js

@@ -1,17 +1,33 @@
 const levelMap = {
-  初等: { name: '初等', color: '#66AE5B' },
-  中等: { name: '中等', color: '#4CA6EE' },
-  高等: { name: '高等', color: '#9031AA' },
-  超纲: { name: '超纲', color: '#EA1F1F' },
-  专有: { name: '专有', color: '#CBCBCB' },
-  其它: { name: '其它', color: '#888888' },
-  '初等(1级)': { name: '初等(1级)', color: '#B6D58A' },
-  '初等(2级)': { name: '初等(2级)', color: '#66AE5B' },
-  '初等(3级)': { name: '初等(3级)', color: '#35776B' },
-  '中等(4级)': { name: '中等(4级)', color: '#73CDDE' },
-  '中等(5级)': { name: '中等(5级)', color: '#4CA6EE' },
-  '中等(6级)': { name: '中等(6级)', color: '#3873CB' },
-  '高等(7-9级)': { name: '高等(7-9级)', color: '#9031AA' },
+    初等: { name: '初等', color: '#66AE5B' },
+    中等: { name: '中等', color: '#4CA6EE' },
+    高等: { name: '高等', color: '#9031AA' },
+    超纲: { name: '超纲', color: '#EA1F1F' },
+    专有: { name: '专有', color: '#CBCBCB' },
+    其它: { name: '其它', color: '#888888' },
+    '初等(1级)': { name: '初等(1级)', color: '#B6D58A' },
+    '初等(2级)': { name: '初等(2级)', color: '#66AE5B' },
+    '初等(3级)': { name: '初等(3级)', color: '#35776B' },
+    '中等(4级)': { name: '中等(4级)', color: '#73CDDE' },
+    '中等(5级)': { name: '中等(5级)', color: '#4CA6EE' },
+    '中等(6级)': { name: '中等(6级)', color: '#3873CB' },
+    '高等(7-9级)': { name: '高等(7-9级)', color: '#9031AA' },
+    '1': { name: '初等', color: '#66AE5B' },
+    '2': { name: '中等', color: '#4CA6EE' },
+    '3': { name: '高等', color: '#9031AA' },
+    '4': { name: '超纲', color: '#EA1F1F' },
+    '5': { name: '专有', color: '#CBCBCB' },
+    '6': { name: '其它', color: '#888888' },
+    '100': { name: '初等(1级)', color: '#B6D58A' },
+    '101': { name: '初等(2级)', color: '#66AE5B' },
+    '102': { name: '初等(3级)', color: '#35776B' },
+    '103': { name: '中等(4级)', color: '#73CDDE' },
+    '104': { name: '中等(5级)', color: '#4CA6EE' },
+    '105': { name: '中等(6级)', color: '#3873CB' },
+    '106': { name: '高等(7-9级)', color: '#9031AA' },
+    '107': { name: '超纲', color: '#EA1F1F' },
+    '108': { name: '专有', color: '#CBCBCB' },
+    '109': { name: '其它', color: '#888888' },
 };
 
-export { levelMap };
+export { levelMap };

+ 4 - 4
src/views/Textanalysis/index.vue

@@ -567,16 +567,16 @@ export default {
       } else {
         this.seleLevelMapList = [];
         this.leftList.forEach((item) => {
-          this.seleLevelMapList.push(item.name);
+          this.seleLevelMapList.push(item.id);
         });
       }
     },
     // 选择高亮等级
     levelMapListEvent(item) {
       // this.clearSelected("all");
-      let index = this.seleLevelMapList.indexOf(item.name);
+      let index = this.seleLevelMapList.indexOf(item.id);
       if (index === -1) {
-        this.seleLevelMapList.push(item.name);
+        this.seleLevelMapList.push(item.id);
       } else {
         this.seleLevelMapList.splice(index, 1);
       }
@@ -623,7 +623,7 @@ export default {
     },
     ciyunEvent() {
       window.open(
-        `./ciyun/ciyunindex.html?partitionKey=${this.partitionKey}&searchType=${this.leftNavIndex}`,
+        `./ciyun/ciyunindex.html?partitionKey=${this.id}&searchType=${this.leftNavIndex}`,
         '_blank',
       );
     },