Commit 2862857e authored by 夏敏伟's avatar 夏敏伟

修改api

parent a982817e
import { get, post, delete_util, fileUpload_PUT, addParam } from "../util/http_util";
const PREFIX_RESOURCE = "api/rest/3z/resource/";
const PREFIX_ELASTIC = "api/rest/elastic/";
const PREFIX_DOCUMENT = "api/rest/3z/document/";
//文献增加标签
export const queryCollection = (id) => {
return get(`${PREFIX_RESOURCE}queryCollection?folderId=${id}`);
}
export const queryOneNews = (id) => {
return get(`${PREFIX_ELASTIC}queryOneNews?Id=${id}`);
}
export const queryLiterature = (id) => {
return get(`${PREFIX_DOCUMENT}queryLiterature?id=${id}`);
}
export const removeCollection = (id) => {
return delete_util(`${PREFIX_RESOURCE}removeCollection?id=${id}`);
}
\ No newline at end of file
import { type } from "jquery";
import { get, post,delete_util } from "../util/http_util";
//#region 公共
//服务前缀
const PREFIX = "api/rest/resource";
const PREFIX = "api/rest/3z/resource";
const PREFIX_Sentiment = "api/rest/sentiment";
/**
* 添加param
......
import { get, post, delete_util, fileUpload_PUT, addParam } from "../../util/http_util";
const PREFIX_DOCUMENT = "api/rest/3z/document/";
const PREFIX_RESOURCE = "api/rest/3z/resource/";
// 查询关注
export const queryAttention = (pageNum, pageSize, content) => {
let url = `${PREFIX_RESOURCE}queryAttention`;
url += addParam({ pageNum, pageSize, content });
return get(url);
}
// 编辑数据
export const updateAttention = (data) => {
return post(`${PREFIX_RESOURCE}updateAttention`, data);
}
// 删除关注
export const removeAttention = (id) => {
return delete_util(`${PREFIX_RESOURCE}removeAttention/${id}`);
}
// 新增数据
export const addAttention = (data) => {
return post(`${PREFIX_RESOURCE}addAttention`, data);
}
\ No newline at end of file
import { get_exame, post_exame, delete_util_exame, addParam } from "../../util/http_util";
const PREFIX = "api_exame/user/";
const PREFIX_ADMIN = "api_exame/admin/";
//查询考试记录
export const queryExame = (pageNum, pageSize, account, name) => {
let url = `${PREFIX}questionBank/queryExame`;
url += addParam({ pageNum, pageSize, account, name });
return get_exame(url);
}
export const queryDetails = data => {
return post_exame(`api_exame/admin/TRecordDetails/queryDetails`, data);
}
//新建记录
export const createRecord = data => {
return post_exame(`${PREFIX_ADMIN}TExameRecord/createRecord`, data);
}
//查询记录
export const queryRecord = data => {
return post_exame(`${PREFIX_ADMIN}TExameRecord/queryRecord`, data);
}
//创建考试题目
export const createExame = (name, suggestTime, startTime, endTime, singleNum, multiNum, judgeNum, singlePointValue, multiPointValue, judgePointValue) => {
let url = `${PREFIX}questionBank/createExame`;
url += addParam({ name, suggestTime, startTime, endTime, singleNum, multiNum, judgeNum, singlePointValue, multiPointValue, judgePointValue });
return get_exame(url)
}
//删除试卷
export const removeExame = data => {
return delete_util_exame(`${PREFIX}questionBank/removeExame`, data)
}
export const addQuestionBank = data => {
return post_exame(`${PREFIX_ADMIN}questionBank/addQuestionBank`, data);
}
export const updateQuestionBankById = data => {
return post_exame(`${PREFIX_ADMIN}questionBank/updateQuestionBankById`, data);
}
export const deleteQuestionBankById = data => {
return post_exame(`${PREFIX_ADMIN}questionBank/deleteQuestionBankById`, data);
}
export const listQuestionBank = data => {
return post_exame(`${PREFIX_ADMIN}questionBank/listQuestionBank`, data);
}
export const addTExameContent = data => {
return post_exame(`${PREFIX_ADMIN}TExameContent/addTExameContent`, data);
}
export const updateTExameContent = data => {
return post_exame(`${PREFIX_ADMIN}TExameContent/updateTExameContent`, data);
}
export const deleteTExameContent = data => {
return post_exame(`${PREFIX_ADMIN}TExameContent/deleteTExameContent`, data);
}
export const listTExameContent = data => {
return post_exame(`${PREFIX_ADMIN}TExameContent/listTExameContent`, data);
}
import { get, post, delete_util, fileUpload_PUT, addParam } from "../../util/http_util";
const PREFIX_DOCUMENT = "api/rest/3z/document/";
const PREFIX_RESOURCE = "api/rest/3z/resource/";
const PREFIX_ELASTIC = "api/rest/elastic/";
// 板块查询
export const queryLiteratureFolder = (module) => {
return get(`${PREFIX_DOCUMENT}queryLiteratureFolder?module=${module}`)
}
// 文献资料查询
export const queryLiterature = (module, pageNum, pageSize, origin_name, folder, stick) => {
let url = `${PREFIX_DOCUMENT}queryLiterature`;
url += addParam({ module, pageNum, pageSize, origin_name, folder, stick });
return get(url);
}
//多板块文献资料查询
export const multiQueryLiterature = (module, showPic, ids) => {
let url = `${PREFIX_DOCUMENT}multiQueryLiterature`;
url += addParam({ module, showPic });
return post(url, ids);
}
// 新增人员关联信息
export const addRelatedInfo = (data) => {
return post(`${PREFIX_RESOURCE}addRelatedInfo`, data);
}
//文献增加标签
export const addLiteratureLabel = (id, data) => {
return post(`${PREFIX_DOCUMENT}addLiteratureLabel?id=${id}`, data);
}
//查询收藏目录
export const queryCollectionFolder = (collector) => {
return get(`${PREFIX_RESOURCE}queryCollectionFolder?collector=${collector}`);
}
//添加收藏
export const addCollection = (data) => {
return post(`${PREFIX_RESOURCE}addCollection`, data);
}
//添加收藏夹目录
export const addCollectionFolder = data => {
return post(`${PREFIX_RESOURCE}addCollectionFolder`, data);
}
//删除收藏目录
export const removeCollectionFolder = id => {
return delete_util(`${PREFIX_RESOURCE}removeCollectionFolder?folderId=${id}`);
}
//文献资料上传
export const uploadLiterature = data => {
return fileUpload_PUT(`${PREFIX_DOCUMENT}uploadLiterature`, data)
}
//文献资料删除
export const removeLiterature = (folder, name) => {
return get(`${PREFIX_DOCUMENT}removeLiterature?folder=${folder}&name=${name}`);
}
//给文献资料附加图片
export const addPictureToLiterature = data => {
return fileUpload_PUT(`${PREFIX_DOCUMENT}addPictureToLiterature`, data);
}
//批量文献置顶
export const bulkStickLiterature = data => {
return post(`${PREFIX_DOCUMENT}bulkStickLiterature`, data);
}
//文献资料批量删除
export const removeLiteratureByBatch = data => {
return delete_util(`${PREFIX_DOCUMENT}removeLiteratureByBatch`, data);
}
//批量修改文献资料所在的板块
export const bulkChangeLiteratureFolder = data => {
return post(`${PREFIX_DOCUMENT}bulkChangeLiteratureFolder`, data)
}
//板块名称修改
export const updateLiteratureFolder = data => {
return post(`${PREFIX_DOCUMENT}updateLiteratureFolder`, data)
}
//查询相关推荐文献资料
export const queryRecommendLiterature = id => {
return post(`${PREFIX_ELASTIC}queryRecommendLiterature?id=${id}`);
}
//分页检索文献列表
export const searchLiterature = (module, pageNum, pageSize, text) => {
let url = `${PREFIX_ELASTIC}queryRecommendLiterature`;
url += addParam({ module, pageNum, pageSize, text });
return post(url);
}
//根据文献name获取文献
export const queryLiteratureById = name => {
return get(`${PREFIX_ELASTIC}queryLiteratureById?id=${name}`);
}
//文件文献预览
export const previewPdf = (bucket, objectName) => {
window.open(`api/rest/file/pdf/${bucket}?objectName=${objectName}`);
}
\ No newline at end of file
......@@ -6,14 +6,14 @@ import {
import {
saveAs
} from 'file-saver';
import {ACCESS_TOKEN, ACCESS_USER, HTTP_STATUS} from "../constant/user";
import { ACCESS_TOKEN, ACCESS_USER, HTTP_STATUS } from "../constant/user";
/**
* 添加请求头
* @param {} headers
* @returns
*/
function addHeaders(headers){
function addHeaders(headers) {
let headers_target = {
'Content-Type': 'application/json', // 指定提交方式为表单提交
'x-requested-with': 'XMLHttpRequest'
......@@ -105,12 +105,12 @@ let delete_util = (url, data, headers = {}) => {
};
let fileUpload = (url, formData, headers = {}) => {
let headers_target = {'x-requested-with': 'XMLHttpRequest'};
let headers_target = { 'x-requested-with': 'XMLHttpRequest' };
headers_target = Object.assign(headers_target, headers);
let token = sessionStorage.getItem("token");
if (token) {
headers_target[ACCESS_TOKEN] = token;
}
}
let user = sessionStorage.getItem("user");
if (user) {
headers_target[ACCESS_USER] = JSON.parse(user).account;
......@@ -158,14 +158,14 @@ let fileDownload = (url, filename, type, headers = {}) => {
//下载文件 type传文件类型 例如:doc,xls...
let fileDownload1 = (url, param, filename, headers = {}) => {
return new Promise((resolve, reject)=>{
return new Promise((resolve, reject) => {
fetch(url, {
method: "POST",
body: typeof param == "object" ? JSON.stringify(param) : param,
headers: new Headers(addHeaders(headers))
}).then(res => {
let tmp = res.headers.get('content-disposition');
if(filename == null && tmp != null){
if (filename == null && tmp != null) {
// 解码
filename = decodeURIComponent(tmp.split('filename=')[1]);
}
......@@ -178,11 +178,11 @@ let fileDownload1 = (url, param, filename, headers = {}) => {
a.click();
window.URL.revokeObjectURL(url);
resolve();
}).catch(err=>{
}).catch(err => {
console.log(err);
});
});
}
//此方法是 用于标识文字段落中一些特殊的信息 用不同的颜色来区分
......@@ -338,14 +338,14 @@ let base64DataURLToArrayBuffer = (dataURL) => {
}
return bytes.buffer;
}
let imageToBase64 = (file,that) =>{
let imageToBase64 = (file, that) => {
var reader = new FileReader()
reader.readAsDataURL(file)
reader.onload = () => {
that.img_Base64 = reader.result;
that.img_Base64 = reader.result;
}
reader.onerror = function (error) {
console.log('Error: ', error)
console.log('Error: ', error)
}
}
......@@ -427,26 +427,159 @@ let dateChangeFormat = (format, date) => {
});
return format;
}
let getCookie = (name)=>{
let getCookie = (name) => {
let arr, reg = new RegExp("(^| )" + name + "=([^;]*)(;|$)");
if (arr = document.cookie.match(reg))
return (arr[2]);
return (arr[2]);
else
return null;
return null;
}
let setCookie = (c_name, value, b)=>{
let setCookie = (c_name, value, b) => {
let s = new Date();
s.setDate(s.getDate() + b);
document.cookie = c_name + "=" + escape(value) + ((b == null) ? "" : ";expires=" + s.toGMTString());
}
let delCookie = (name)=>{
let delCookie = (name) => {
let exp = new Date();
exp.setTime(exp.getTime() - 1);
let s = getCookie(name);
if (s != null)
document.cookie = name + "=" + s + ";expires=" + exp.toGMTString();
document.cookie = name + "=" + s + ";expires=" + exp.toGMTString();
}
/**
* 添加param
* @param {*} param
* @returns
*/
const addParam = (param) => {
let url = "";
let keys = Object.getOwnPropertyNames(param);
keys.forEach(function (key, index) {
if (param[key] != undefined) {
if (index == 0) {
url += "?";
}
url += key + "=" + param[key];
if (index != keys.length - 1) {
url += "&";
}
}
});
return url;
}
let get_exame = (url, headers = {}) => {
return new Promise((resolve, reject) => {
fetch(url, {
method: "GET",
headers: new Headers(addHeaders(headers))
}).then(res => {
if (res.status == 200) {
return res.text();
} else {
console.log(res.statusText);
reject(HTTP_STATUS);
}
}).then(res => {
let result = JSON.parse(res);
if (result.state.code == 90001) {
resolve(result.data);
} else {
console.log(result);
reject(result);
}
}).catch(err => reject(err));
})
};
let post_exame = (url, data, headers = {}) => {
return new Promise((resolve, reject) => {
fetch(url, {
method: "POST",
body: typeof data == "object" ? JSON.stringify(data) : data,
headers: new Headers(addHeaders(headers))
}).then(res => {
if (res.status == 200) {
return res.text();
} else {
console.log(res.statusText);
reject(HTTP_STATUS);
}
}).then(res => {
let result = JSON.parse(res);
if (result.state.code == 90001) {
resolve(result.data);
} else {
console.log(result);
reject(result);
}
}).catch(err => reject(err));
})
};
let delete_util_exame = (url, data, headers = {}) => {
return new Promise((resolve, reject) => {
fetch(url, {
method: "DELETE",
body: typeof data == "object" ? JSON.stringify(data) : data,
headers: new Headers(addHeaders(headers))
}).then(res => {
if (res.status == 200) {
return res.text();
} else {
console.log(res.statusText);
reject(HTTP_STATUS);
}
}).then(res => {
let result = JSON.parse(res);
if (result.state.code == 90001) {
resolve(result.data);
} else {
console.log(result);
reject(result);
}
}).catch(err => reject(err));
})
};
let fileUpload_PUT = (url, formData, headers = {}) => {
let headers_target = { 'x-requested-with': 'XMLHttpRequest' };
headers_target = Object.assign(headers_target, headers);
let token = sessionStorage.getItem("token");
if (token) {
headers_target[ACCESS_TOKEN] = token;
}
let user = sessionStorage.getItem("user");
if (user) {
headers_target[ACCESS_USER] = JSON.parse(user).account;
}
return new Promise((resolve, reject) => {
fetch(url, {
method: "PUT",
body: formData,
headers: new Headers(headers_target)
}).then(res => {
if (res.status == 200) {
return res.text();
} else {
console.log(res.statusText);
reject(HTTP_STATUS);
}
}).then(res => {
let result = JSON.parse(res);
if (result.code == 9000) {
resolve(result.data);
} else {
console.log(result);
reject(result);
}
}).catch(err => reject(err));
})
};
export {
get,
post,
......@@ -472,4 +605,9 @@ export {
fileDownload1,
imageToBase64,
rw_jg_IsConfirm,
addParam,
get_exame,
post_exame,
delete_util_exame,
fileUpload_PUT
}
\ No newline at end of file
......@@ -3,34 +3,41 @@
<div class="left-bookMark1">
<div class="title">文件夹</div>
<ul>
<li v-for="(item,index) in collectionFolder" @click="queryCollectionFolderNews(item.id,index)" :style="{'color':(index==selectIndex)?'#0dada7':'','font-weight':(index==selectIndex)?'900':''}">
<span class="el-icon-folder-opened"></span>&emsp;{{item.name}}
<li v-for="(item, index) in collectionFolder" @click="queryCollectionFolderNews(item.id, index)"
:style="{ 'color': (index == selectIndex) ? '#0dada7' : '', 'font-weight': (index == selectIndex) ? '900' : '' }">
<span class="el-icon-folder-opened"></span>&emsp;{{ item.name }}
</li>
</ul>
</div>
<div class="right-bookMark1">
<ul>
<li v-for="(item,index) in collectionFolderNews">
<li v-for="(item, index) in collectionFolderNews">
<div @click="showNews(item)">
<span style="color:#ff4949;font-size: 15px;font-weight: 900;" v-show="item.description==''||item.description==null">全文:</span>
<span v-text="item.description==''||item.description==null?''+item.title:item.description" style="font-size: 14px;"></span>
<span style="color:#ff4949;font-size: 15px;font-weight: 900;"
v-show="item.description == '' || item.description == null">全文:</span>
<span
v-text="item.description == '' || item.description == null ? '' + item.title : item.description"
style="font-size: 14px;"></span>
</div>
<div>
<span>收藏时间:</span>
<span v-text="item.createTime"></span>
<el-button class="removeButton" type="danger" icon="el-icon-delete" circle size="mini" @click="removeCollection(item)"></el-button>
<el-button class="removeButton" type="danger" icon="el-icon-delete" circle size="mini"
@click="removeCollection(item)"></el-button>
</div>
</li>
</ul>
</div>
<!-- 新闻详情展示 -->
<el-dialog :title="newInfo.title" :visible.sync="dialogVisible" width="60%" :before-close="handleClose" center v-if="newInfo">
<el-dialog :title="newInfo.title" :visible.sync="dialogVisible" width="60%" :before-close="handleClose" center
v-if="newInfo">
<span>
<div>发布时间:<span v-text="newInfo.pubdate"></span></div>
<div>
<el-tag type="danger" effect="dark" v-text="newInfo.is_original?'原创':'转发'"></el-tag>
<el-tag type="primary" effect="dark" v-text="newInfo.country" v-show="newInfo.country!=''&&newInfo.country!=null"></el-tag>
<el-tag type="danger" effect="dark" v-text="newInfo.is_original ? '原创' : '转发'"></el-tag>
<el-tag type="primary" effect="dark" v-text="newInfo.country"
v-show="newInfo.country != '' && newInfo.country != null"></el-tag>
<el-tag type="success" effect="dark" v-text="newInfo.site_name"></el-tag>
</div>
<div id="txt" v-html="newInfo.txt"></div>
......@@ -49,6 +56,7 @@
padding: 1% 3% 3% 2%;
color: white;
box-sizing: border-box;
.left-bookMark1 {
width: 260px;
height: 100%;
......@@ -57,6 +65,7 @@
box-sizing: border-box;
background-image: url(../../assets/img/bookMark/03.png);
background-size: 100% 100%;
.title {
width: 100%;
height: 30px;
......@@ -66,6 +75,7 @@
background-size: 100% 100%;
color: #ff9900;
}
ul {
width: 100%;
height: calc(100% - 40px);
......@@ -74,9 +84,11 @@
padding: 0;
list-style: none;
overflow-y: auto;
&::-webkit-scrollbar {
display: none;
}
li {
width: 100%;
height: 30px;
......@@ -87,7 +99,8 @@
box-sizing: border-box;
background-image: url(../../assets/img/bookMark/08.png);
background-size: 100% 100%;
color:#797979;
color: #797979;
&:hover {
cursor: pointer;
font-weight: bold;
......@@ -96,6 +109,7 @@
}
}
}
.right-bookMark1 {
width: calc(100% - 280px);
height: 100%;
......@@ -105,6 +119,7 @@
box-sizing: border-box;
background-image: url(../../assets/img/bookMark/05.png);
background-size: 100% 100%;
ul {
width: 100%;
height: 98%;
......@@ -113,26 +128,31 @@
box-sizing: border-box;
list-style: none;
overflow-y: auto;
&::-webkit-scrollbar {
display: none;
}
li {
padding: 20px;
box-sizing: border-box;
background-image: url(../../assets/img/bookMark/06.png);
background-size: 100% 100%;
cursor: pointer;
div {
&:first-child {
color: #ffffff;
}
&:nth-child(2) {
font-size: 13px;
color: #ffffff;
margin-top: 10px;
text-align: right;
}
.removeButton{
.removeButton {
margin-left: 20px;
}
}
......@@ -149,6 +169,7 @@
text-align: center;
color: #b3b3b3;
}
&:nth-child(3) {
color: white;
margin-top: 10px;
......@@ -158,6 +179,7 @@
}
}
}
.el-tag {
height: 20px;
padding: 0px 8px;
......@@ -169,6 +191,8 @@
<script>
import { endLoading, get, startLoading, delete_util } from '../../util/http_util'
import { queryCollection, queryOneNews, queryLiterature, removeCollection } from '../../api/bookMark';
import { queryCollectionFolder } from '../../api/xxxl/llxx';
export default {
name: 'bookMark1',
data() {
......@@ -181,22 +205,22 @@ export default {
selectItem: {}
}
},
inject:['reload'],
inject: ['reload'],
methods: {
queryCollectionFolderNews(id, index) {
this.selectIndex = index;
get('api/rest/resource/queryCollection?folderId=' + id).then(res => {
queryCollection(id).then(res => {
this.collectionFolderNews = res;
})
.catch((err)=>{
this.$message.warning(err.message);
})
.catch((err) => {
this.$message.warning(err.message);
})
},
//展示收藏的新闻详情
showNews(item) {
this.selectItem = item;
startLoading();
get('api/rest/fulltext/queryOneNews?Id=' + item.originId).then(res => {
queryOneNews(item.originId).then(res => {
if (res != null) {
this.dialogVisible = true;
this.newInfo = res;
......@@ -206,7 +230,7 @@ export default {
this.newInfo.txt = htmlStr.replace(keyword, "<span style='color:red'>" + keyword + "</span>");
});
} else {
get('api/rest/document/queryLiterature?id=' + item.originId).then(resLi => {
queryLiterature(item.originId).then(resLi => {
window.open('api/rest/document/viewLiterature/' + resLi.list[0].folder + '/' + resLi.list[0].name);
}).catch(err => {
this.$message.warning(err.message);
......@@ -214,10 +238,10 @@ export default {
}
endLoading();
})
.catch((err)=>{
endLoading();
this.$message.warning(err.message);
})
.catch((err) => {
endLoading();
this.$message.warning(err.message);
})
},
handleClose(done) {
done();
......@@ -228,7 +252,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delete_util('api/rest/resource/removeCollection?id=' + item.id).then(res => {
removeCollection(item.id).then(res => {
if (res == 1) {
this.$message.success("删除成功!");
this.reload();
......@@ -254,13 +278,13 @@ export default {
}
},
activated() {
get('api/rest/resource/queryCollectionFolder?collector=' + this.userInfo.account).then(res => {
queryCollectionFolder(this.userInfo.account).then(res => {
this.collectionFolder = res;
res[0].id && this.queryCollectionFolderNews(res[0].id, 0);
})
.catch((err)=>{
this.$message.warning(err.message);
})
.catch((err) => {
this.$message.warning(err.message);
})
}
}
</script>
\ No newline at end of file
......@@ -217,6 +217,7 @@ export default {
}
},
mounted() {
console.log(this.$store.state.navList);
let arr = this.$store.state.navList[0].children.filter((e) => e.path == '/sjgl');
this.$store.state.navList[0].children.forEach((item) => {
if (item.children.length > 0) {
......@@ -230,6 +231,7 @@ export default {
})
}
});
this.manager_module = this.$store.state.navList[0].children.filter(
(e) => e.meta.type == "1"
);
......
......@@ -149,6 +149,10 @@
<script>
import { get, fileUpload, startLoading, endLoading, download, delete_util, post } from '../../util/http_util';
import {
queryLiterature, uploadLiterature, removeLiterature, addPictureToLiterature, bulkStickLiterature, removeLiteratureByBatch, bulkChangeLiteratureFolder,
updateLiteratureFolder, queryLiteratureFolder, previewPdf
} from "../../api/xxxl/llxx"
export default {
name: 'flfggl',
inject: ['reload'],
......@@ -190,10 +194,10 @@ export default {
},
//查询上传的文件
queryLiterature(pageNum, pageSize, title, type) {
let titleUrl = (title != '' && title != null) ? ('&origin_name=' + title) : '';
let typeUrl = (type != '' && type != null) ? ('&folder=' + type) : '';
let titleUrl = title == '' ? null : title;
let typeUrl = type == '' ? null : type;;
let type_stick = this.valueSelectFile_type == "1";
get('api/rest/document/queryLiterature?module=法律法规&stick=' + type_stick + '&pageNum=' + pageNum + '&pageSize=' + pageSize + titleUrl + typeUrl).then(res => {
queryLiterature('法律法规', pageNum, pageSize, titleUrl, typeUrl, type_stick).then(res => {
this.literatureList = res.list;
this.total = res.totals;
this.currentPage = pageNum;
......@@ -214,7 +218,7 @@ export default {
fd.append("folder", this.value);
fd.append("module", '法律法规');
this.imgList.length == 1 && fd.append('image', this.imgList[0].raw);
fileUpload('api/rest/document/uploadLiterature', fd).then(res => {
uploadLiterature(fd).then(res => {
if (res == 1) {
this.$message.success('上传成功!');
this.valueSelectFile_type = '2';
......@@ -252,7 +256,8 @@ export default {
},
//以pdf形式预览
viewLiterature(item) {
window.open('api/rest/document/viewLiterature/' + item.folder + '/' + item.name);
// window.open('api/rest/document/viewLiterature/' + item.folder + '/' + item.name);
previewPdf('LiteraturePDF', item.name);
},
//修改文件
editFile(item) {
......@@ -267,7 +272,7 @@ export default {
type: 'warning'
})
.then(res => {
return delete_util('api/rest/document/removeLiterature?folder=' + item.folder + '&name=' + item.name);
return removeLiterature(item.folder, item.name);
})
.then(res => {
if (res == 1) {
......@@ -292,7 +297,7 @@ export default {
let fd = new FormData();
fd.append('name', item.name);
fd.append('folder', item.folder);
fileUpload('api/rest/document/addPictureToLiterature', fd).then(res => {
addPictureToLiterature(fd).then(res => {
if (res == 1) {
this.$message.success('图片删除成功!');
this.dialogVisibleImg = false;
......@@ -333,7 +338,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delete_util('api/rest/document/removeLiteratureByBatch', this.multipleSelection).then(res => {
removeLiteratureByBatch(this.multipleSelection).then(res => {
if (res == this.multipleSelection.length) {
this.$message.success('删除成功!');
this.queryLiterature(this.currentPage, this.everySize, this.input, this.valueSelect);
......@@ -366,7 +371,7 @@ export default {
obj.oldFolder = res.bucket;
list.push(obj);
})
post('api/rest/document/bulkChangeLiteratureFolder', list).then(res => {
bulkChangeLiteratureFolder(list).then(res => {
if (res == list.length) {
this.$message.success('转移成功!');
this.dialogVisibleFolder = false;
......@@ -415,7 +420,7 @@ export default {
fd.append('name', this.selectFile.name);
fd.append('folder', this.selectFile.folder);
fd.append('file', this.fileListImg[0].raw);
fileUpload('api/rest/document/addPictureToLiterature', fd).then(res => {
addPictureToLiterature(fd).then(res => {
if (res == 1) {
this.$message.success('新增图片成功!');
this.dialogVisibleImg = false;
......@@ -451,7 +456,7 @@ export default {
obj.id = row.id;
obj.stick = row.stick == null ? 1 : 0;
let message = obj.stick == 1 ? '置顶' : '取消置顶';
post('api/rest/document/bulkStickLiterature', [obj]).then(res => {
bulkStickLiterature([obj]).then(res => {
if (res == 1) {
this.search();
this.$message.success(message + '成功!');
......@@ -473,7 +478,7 @@ export default {
tmpList.push(obj);
})
});;
post('api/rest/document/updateLiteratureFolder', tmpList).then(res => {
updateLiteratureFolder(tmpList).then(res => {
if (res == tmpList.length) {
this.$message.success('模块名称修改成功!');
this.dialogVisibleModule = false;
......@@ -489,7 +494,7 @@ export default {
},
activated() {
//查询板块名称
get('api/rest/document/queryLiteratureFolder?module=法律法规').then(res => {
queryLiteratureFolder('法律法规').then(res => {
this.moduleList = res;
this.transferRadios = res;
let arrListModule = [
......
This diff is collapsed.
......@@ -72,6 +72,7 @@
<script>
import { delete_util, get, post } from '../../util/http_util'
import { queryAttention, updateAttention, removeAttention, addAttention } from '../../api/sjgl/tsbj';
export default {
data() {
return {
......@@ -92,7 +93,7 @@ export default {
methods: {
//查询数据
queryAttention() {
get('api/rest/resource/queryAttention?pageNum=' + this.currentPage + '&pageSize=' + this.everySize).then(res => {
queryAttention(this.currentPage, this.everySize).then(res => {
this.attentionList = res.list;
this.total = res.totals;
}).catch(err => {
......@@ -119,7 +120,7 @@ export default {
//确定编辑数据
defineEditAttention() {
if (this.selectAttention.content) {
post('api/rest/resource/updateAttention', this.selectAttention).then(res => {
updateAttention(this.selectAttention).then(res => {
if (res == 1) {
this.$message.success('状态编辑成功!');
this.dialogVisible = false;
......@@ -142,7 +143,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delete_util('api/rest/resource/removeAttention/' + item.id).then(res => {
removeAttention(item.id).then(res => {
if (res == 1) {
this.$message.success('删除成功!');
this.queryAttention();
......@@ -174,7 +175,7 @@ export default {
//确定新增关注
defineAddAttention() {
if (this.newAttention.content) {
post('api/rest/resource/addAttention', this.newAttention).then(res => {
addAttention(this.newAttention).then(res => {
if (res == 1) {
this.$message.success('新增成功!');
this.dialogVisible = false;
......@@ -194,7 +195,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
post('api/rest/resource/updateAttention', { visualizing: item.visualizing, id: item.id }).then(res => {
updateAttention({ visualizing: item.visualizing, id: item.id }).then(res => {
if (res == 1) {
this.$message.success('状态编辑成功!');
this.queryAttention();
......
......@@ -35,8 +35,8 @@
</el-table-column>
<el-table-column label="文件名" align="center" show-overflow-tooltip>
<template slot-scope="scope">
<span><span
style="font-size:12px;color:red;">{{ scope.row.stick != null ? '[置顶]' : '' }}</span>{{ scope.row.originName }}</span>
<span><span style="font-size:12px;color:red;">{{ scope.row.stick != null ? '[置顶]' : ''
}}</span>{{ scope.row.originName }}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" label="日期" align="center">
......@@ -52,8 +52,8 @@
<el-button size="mini" type="danger" @click="deleteLiterature(scope.row)">删除</el-button>
<el-button size="mini" type="danger" @click="deleteLiteratureImg(scope.row)"
:disabled="scope.row.image == null || scope.row.image == '' ? true : false">删除图片</el-button>
<el-button size="mini" type="success"
@click="top(scope.row)">{{ scope.row.stick == null ? '置顶' : '取消置顶' }}</el-button>
<el-button size="mini" type="success" @click="top(scope.row)">{{ scope.row.stick == null ?
'置顶' : '取消置顶' }}</el-button>
</template>
</el-table-column>
</el-table>
......@@ -106,8 +106,8 @@
<el-form ref="form" label-width="120px">
<el-form-item label="转移到:">
<el-radio-group v-model="radio">
<el-radio v-for="(item, index) in transferRadios" :label="item.id" border
:key="index">{{ item.name }}</el-radio>
<el-radio v-for="(item, index) in transferRadios" :label="item.id" border :key="index">{{
item.name }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item align="center">
......@@ -582,6 +582,10 @@ import navs_tm from "../xxxl/tmlb.vue";
import navs_sj from "./sjlb.vue";
import export_doc_util from '../../util/export_doc_util';
import { uuid } from "../../util/data_util";
import {
queryLiterature, uploadLiterature, removeLiterature, addPictureToLiterature, bulkStickLiterature, removeLiteratureByBatch, bulkChangeLiteratureFolder,
updateLiteratureFolder, queryLiteratureFolder, previewPdf
} from "../../api/xxxl/llxx"
export default {
name: 'xxxlgl',
inject: ['reload'],
......@@ -716,10 +720,10 @@ export default {
},
//查询上传的文件
queryLiterature(pageNum, pageSize, title, type) {
let titleUrl = (title != '' && title != null) ? ('&origin_name=' + title) : '';
let typeUrl = (type != '' && type != null) ? ('&folder=' + type) : '';
let titleUrl = title == '' ? null : title;
let typeUrl = type == '' ? null : type;;
let type_stick = this.valueSelectFile_type == "1";
get('api/rest/document/queryLiterature?module=学习训练&stick=' + type_stick + '&pageNum=' + pageNum + '&pageSize=' + pageSize + titleUrl + typeUrl).then(res => {
queryLiterature('学习训练', pageNum, pageSize, titleUrl, typeUrl, type_stick).then(res => {
this.literatureList = res.list;
this.total = res.totals;
this.currentPage = pageNum;
......@@ -736,7 +740,7 @@ export default {
fd.append("folder", this.value);
fd.append("module", '学习训练');
this.imgList.length == 1 && fd.append('image', this.imgList[0].raw);
fileUpload('api/rest/document/uploadLiterature', fd).then(res => {
uploadLiterature(fd).then(res => {
if (res == 1) {
this.$message.success('上传成功!');
this.valueSelectFile_type = '2';
......@@ -779,11 +783,15 @@ export default {
},
//以pdf形式预览
viewLiterature(item) {
window.open('api/rest/document/viewLiterature/' + item.folder + '/' + item.name);
previewPdf('LiteraturePDF', item.name);
},
//下载文件
downFile(item) {
download('api/rest/document/downloadLiterature/' + item.folder + '/' + item.name, item.originName);
if (item.path) {
window.open(item.path);
} else {
alert('暂未找到文件!');
}
},
//删除文件
deleteLiterature(item) {
......@@ -792,7 +800,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delete_util('api/rest/document/removeLiterature?folder=' + item.folder + '&name=' + item.name).then(res => {
removeLiterature(item.folder, item.name).then(res => {
if (res == 1) {
this.$message.success('删除成功!');
this.queryLiterature(this.currentPage, this.everySize, this.input, this.valueSelect);
......@@ -831,7 +839,7 @@ export default {
let fd = new FormData();
fd.append('name', item.name);
fd.append('folder', item.folder);
fileUpload('api/rest/document/addPictureToLiterature', fd).then(res => {
addPictureToLiterature(fd).then(res => {
if (res == 1) {
this.$message.success('图片删除成功!');
this.dialogVisibleImg = false;
......@@ -872,7 +880,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
delete_util('api/rest/document/removeLiteratureByBatch', this.multipleSelection).then(res => {
removeLiteratureByBatch(this.multipleSelection).then(res => {
if (res == this.multipleSelection.length) {
this.$message.success('删除成功!');
this.queryLiterature(this.currentPage, this.everySize, this.input, this.valueSelect);
......@@ -917,7 +925,7 @@ export default {
obj.oldFolder = res.bucket;
list.push(obj);
})
post('api/rest/document/bulkChangeLiteratureFolder', list).then(res => {
bulkChangeLiteratureFolder(list).then(res => {
if (res == list.length) {
this.$message.success('转移成功!');
this.queryLiterature(this.currentPage, this.everySize, this.input, this.valueSelect);
......@@ -976,7 +984,7 @@ export default {
fd.append('name', this.selectFile.name);
fd.append('folder', this.selectFile.folder);
fd.append('file', this.fileListImg[0].raw);
fileUpload('api/rest/document/addPictureToLiterature', fd).then(res => {
addPictureToLiterature(fd).then(res => {
if (res == 1) {
this.$message.success('新增图片成功!');
this.dialogVisibleImg = false;
......@@ -1012,7 +1020,7 @@ export default {
obj.id = row.id;
obj.stick = row.stick == null ? 1 : 0;
let message = obj.stick == 1 ? '置顶' : '取消置顶';
post('api/rest/document/bulkStickLiterature', [obj]).then(res => {
bulkStickLiterature([obj]).then(res => {
if (res == 1) {
this.search();
this.$message.success(message + '成功!');
......@@ -1034,7 +1042,7 @@ export default {
tmpList.push(obj);
})
});;
post('api/rest/document/updateLiteratureFolder', tmpList).then(res => {
updateLiteratureFolder(tmpList).then(res => {
if (res == tmpList.length) {
this.$message.success('模块名称修改成功!');
this.dialogVisibleModule = false;
......@@ -1705,7 +1713,7 @@ export default {
//#region +++++++++++++++++++++++++++++++理论学习+++++++++++++++++++++++++++++++
//查询板块名称
get('api/rest/document/queryLiteratureFolder?module=学习训练').then(res => {
queryLiteratureFolder('学习训练').then(res => {
this.moduleList = res;
this.transferRadios = res;
let arrListModule = [
......@@ -2851,4 +2859,5 @@ export default {
.el-tabs__content {
height: calc(100% - 60px);
}
}</style>
\ No newline at end of file
}
</style>
\ No newline at end of file
......@@ -24,14 +24,14 @@
<template slot-scope="scope">
<div class="lsjl pub-xdzy" title="历史记录" @click="ckxq(scope.row)"></div>
<el-button style="margin-top: 4px; margin-left: 20px" :type="scope.row.type == 1
? 'success'
: scope.row.type == 2
? 'info'
: scope.row.type == 3
? 'danger'
: scope.row.type == 4
? 'warning'
: ''
? 'success'
: scope.row.type == 2
? 'info'
: scope.row.type == 3
? 'danger'
: scope.row.type == 4
? 'warning'
: ''
" icon="el-icon-edit-outline" :disabled="scope.row.type != 1" size="mini"
@click="mnxl_cli(scope.row)">{{
scope.row.type == 1
......@@ -331,6 +331,7 @@ import {
isDuringDate,
} from "../../util/http_util";
import { } from "../../util/data_util";
import { queryExame, createRecord, queryRecord, queryDetails } from '../../api/xxxl/llkh';
export default {
data() {
return {
......@@ -387,7 +388,7 @@ export default {
},
ckjl(item) {
let _this = this;
post("api_exame/admin/TRecordDetails/queryDetails", {
queryDetails({
erId: item.id,
})
.then((data) => {
......@@ -679,7 +680,7 @@ export default {
tRecordDetails: arr_tRecordDetails,
};
// return
post("api_exame/admin/TExameRecord/createRecord", paramDatas)
createRecord(paramDatas)
.then((data) => {
_this.handleCurrentChange_qw(1);
if (data != 1) {
......@@ -747,34 +748,24 @@ export default {
let _this = this;
startLoading();
_this.tableData = [];
get(
"api_exame/user/questionBank/queryExame?pageNum=" +
pageNum +
"&pageSize=" +
_this.pageRow +
"&account=" +
this.$store.state.userInfo.account +
"&name=" +
this.input
)
.then((data) => {
if (data.list.length > 0) {
data.list.forEach((item) => {
let types = isDuringDate(item.limitStartTime, item.limitEndTime); // 1时间没到,2时间已过,3可以考试
//1为可以考试,2为已考完试,3为当前时间没到,4时间已过
if (item.userId == undefined) {
item.type = types == "3" ? "1" : types == "2" ? "4" : "3";
} else {
item.type = "2";
}
});
_this.tableData = data.list;
_this.totals = data.total;
_this.current_page_qw = pageNum;
}
endLoading();
})
queryExame(pageNum, _this.pageRow, _this.$store.state.userInfo.account, _this.input).then(data => {
if (data.list.length > 0) {
data.list.forEach((item) => {
let types = isDuringDate(item.limitStartTime, item.limitEndTime); // 1时间没到,2时间已过,3可以考试
//1为可以考试,2为已考完试,3为当前时间没到,4时间已过
if (item.userId == undefined) {
item.type = types == "3" ? "1" : types == "2" ? "4" : "3";
} else {
item.type = "2";
}
});
_this.tableData = data.list;
_this.totals = data.total;
_this.current_page_qw = pageNum;
}
endLoading();
})
.catch((err) => {
console.log(err);
});
......@@ -804,20 +795,19 @@ export default {
pageNum: pagenum,
pageRow: this.pageRow_lsjl,
};
post("api_exame/admin/TExameRecord/queryRecord", paramDatas)
.then((data) => {
if (data.list.length > 0) {
this.dialogVisible_lsjl = true;
this.tableData_history = data.list;
this.totals_lsjl = data.total;
this.current_page_qw_lsjl = pagenum;
} else {
this.$message({
type: "warning",
message: "暂无答题记录!!!",
});
}
})
queryRecord(paramDatas).then((data) => {
if (data.list.length > 0) {
this.dialogVisible_lsjl = true;
this.tableData_history = data.list;
this.totals_lsjl = data.total;
this.current_page_qw_lsjl = pagenum;
} else {
this.$message({
type: "warning",
message: "暂无答题记录!!!",
});
}
})
.catch((err) => {
console.log(err);
});
......@@ -843,6 +833,7 @@ export default {
// background-image: url("../../assets/img/xxxl/01.png");
// background-size: 100% 100%;
color: white;
.table_lb {
width: 100%;
height: 100%;
......
This diff is collapsed.
......@@ -101,6 +101,7 @@
<script>
import { post, startLoading, endLoading } from "../../util/http_util";
import back from "../../assets/img/setting/back.png";
import { addQuestionBank, updateQuestionBankById, deleteQuestionBankById, listQuestionBank } from '../../api/xxxl/llkh';
export default {
data() {
return {
......@@ -158,10 +159,7 @@ export default {
questionsName: _this.form_add.name,
createBy: "admin",
};
post(
"api_exame/admin/questionBank/addQuestionBank",
form_datas
).then((data) => {
addQuestionBank(form_datas).then((data) => {
if (data == 1) {
this.$message({
type: "success",
......@@ -184,10 +182,7 @@ export default {
id: _this.form_edit.id,
updateBy: "admin",
};
post(
"api_exame/admin/questionBank/updateQuestionBankById",
form_datas
).then((data) => {
updateQuestionBankById(form_datas).then((data) => {
if (data == 1) {
this.$message({
type: "success",
......@@ -224,10 +219,7 @@ export default {
type: "warning",
})
.then(() => {
post(
"api_exame/admin/questionBank/deleteQuestionBankById",
paramDatas
)
deleteQuestionBankById(paramDatas)
.then((data) => {
this.$message({
type: "success",
......@@ -261,10 +253,7 @@ export default {
};
// startLoading();
_this.tableData = [];
post(
"api_exame/admin/questionBank/listQuestionBank",
paramDatas
)
listQuestionBank(paramDatas)
.then((data) => {
if (data.list.length > 0) {
_this.tableData = data.list;
......@@ -295,6 +284,7 @@ export default {
background-image: url("../../assets/img/xxxl/01.png");
background-size: 100% 100%;
color: white;
.top-div {
width: calc(100% - 40px);
height: 80px;
......
......@@ -239,6 +239,7 @@ import {
endLoading,
download,
} from "../../util/http_util";
import {addTExameContent,updateTExameContent,deleteTExameContent,listTExameContent,listQuestionBank} from '../../api/xxxl/llkh';
export default {
data() {
return {
......@@ -459,10 +460,7 @@ export default {
type: _this.form_add.region_tmlx, //题类型
qbId: _this.form_add.region_tklx, //题库id
};
post(
"api_exame/admin/TExameContent/addTExameContent",
paramDatas
)
addTExameContent(paramDatas)
.then((data) => {
_this.centerDialogVisible_add = false;
this.$message({
......@@ -595,10 +593,7 @@ export default {
qbId: _this.form_edit.region_tklx, //题库id
};
console.log(1);
post(
"api_exame/admin/TExameContent/updateTExameContent",
paramDatas
)
updateTExameContent(paramDatas)
.then((data) => {
_this.centerDialogVisible_edit = false;
this.$message({
......@@ -632,10 +627,7 @@ export default {
type: "warning",
})
.then(() => {
post(
"api_exame/admin/TExameContent/deleteTExameContent",
paramDatas
)
deleteTExameContent(paramDatas)
.then((data) => {
this.$message({
type: "success",
......@@ -667,10 +659,7 @@ export default {
};
// startLoading();
_this.tableData = [];
post(
"api_exame/admin/TExameContent/listTExameContent",
paramDatas
)
listTExameContent(paramDatas)
.then((data) => {
if (data.list.length > 0) {
data.list.forEach((item) => {
......@@ -722,10 +711,7 @@ export default {
};
_this.options = [];
// _this.totals = 0;
post(
"api_exame/admin/questionBank/listQuestionBank",
paramDatas
)
listQuestionBank(paramDatas)
.then((data) => {
if (data.list.length > 0) {
data.list.forEach((item) => {
......
......@@ -169,9 +169,9 @@ export default {
methods: {
//历史记录弹框
history_div(row) {
debugger
this.dialogVisible_lsjl = true;
queryAnswerQuestionRecord(row.id, 1, 10)
.then((res) => {
queryAnswerQuestionRecord(row.id, 1, 10).then((res) => {
this.tableData_history = res.list.map((e) => {
return {
qkfx: e.fullAnalysis,
......@@ -687,7 +687,7 @@ export default {
background-size: 100% 100%;
.el-dialog__header {
padding: 35px 0px 0px;
padding: 45px 0px 0px 40px;
.el-dialog__headerbtn {
top: 40px;
......
......@@ -86,7 +86,7 @@ module.exports = {
//后台代理
proxy: {
'/api/': {
target: 'http://192.168.168.106:8081',
target: 'http://192.168.168.110:8081',
ws: true,
secure: false,
changeOrigin: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment