Skip to content

X
xxx_phase2_web
Commit ba57cf80 authored by 高飞's avatar 高飞
Browse files
Options

Merge branch 'master' of http://192.168.168.218/xiaminwei/xxx_phase2_web

parents 3f2e547e aaa4d44f
Hide whitespace changes
Inline Side-by-side
Showing with 146 additions and 85 deletions
onlyoffice.html deleted 100644 → 0
View file @ 3f2e547e
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>文件预览</title>
</head>
<body>
<div id="placeholder"></div>
<script src="http://192.168.168.213:9000/web-apps/apps/api/documents/api.js"></script>
<script>
var getParameters = function () {
var search = window.location.search;
var obj = {};
if (search != '') {
// window.location.search '' or start with '?'
search = search.substring(1);
var keypairArray = search.split('&');
for (i in keypairArray) {
keypair = keypairArray[i];
partArray = keypair.split('=');
if (partArray.length == 2) {
obj[partArray[0]] = partArray[1];
}
}
}
return obj;
}
var param = getParameters();
var docEditor = new DocsAPI.DocEditor("placeholder", {
"document": {
"fileType": param.fileType.replace(".", ""),
"permissions": {
"edit": false,
"copy": false,
"download": false,
"print": false,
"chat": false
},
// "key": "C8D7FB890BAC496FB0D27B163EDB88BDAA",
"title": decodeURIComponent(param.filename),
"url": decodeURIComponent(param.url),
},
"height": "1000px",
"width": "100%",
"editorConfig": {
"mode": 'view',
"customization": {
//是否显示插件
"plugins": false,
"feedback": {
"url": "https://example.com",
"visible": false
},
"help": false
},
about: false,
}
});
</script>
</body>
</html>
\ No newline at end of file
onlyoffice/dev.html 0 → 100644
View file @ ba57cf80
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>文件预览</title>
<script src="http://192.168.168.213:9000/web-apps/apps/api/documents/api.js"></script>
</head>
<body>
<div id="placeholder"></div>
</body>
</html>
\ No newline at end of file
onlyoffice/prod.html 0 → 100644
View file @ ba57cf80
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>文件预览</title>
<script src="http://6.1.22.98:9000/web-apps/apps/api/documents/api.js"></script>
</head>
<body>
<div id="placeholder"></div>
</body>
</html>
\ No newline at end of file
src/components/common/bigfile_upload.vue
View file @ ba57cf80
...@@ -157,8 +157,8 @@ export default { ...@@ -157,8 +157,8 @@ export default {
//创建实例 //创建实例
var uploader = WebUploader.create({ var uploader = WebUploader.create({
accept: { accept: {
extensions: "pdf,doc,ppt,pptx,xls,xlsx,docx,txt,flv,mp4,avi,mvb,rmvb,rm", extensions: "pdf,doc,ppt,pptx,xls,xlsx,docx,txt,flv,mp4,avi,mvb,rmvb,rm,gif,jepg,bmp,tif,jpg,png,mp3",
mimeTypes: ".pdf,.doc,.ppt,.pptx,.xls,.xlsx,.docx,.txt,.flv,.mp4,.avi,.mvb,.rmvb,.rm" mimeTypes: ".pdf,.doc,.ppt,.pptx,.xls,.xlsx,.docx,.txt,.flv,.mp4,.avi,.mvb,.rmvb,.rm,.gif,.jepg,.bmp,.tif,.jpg,.png,.mp3"
}, },
pick: { pick: {
id: '#picker', id: '#picker',
......
src/constant/user.js
View file @ ba57cf80
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
export const ACCESS_TOKEN = "3ZTOKENFLAG"; export const ACCESS_TOKEN = "3ZTOKENFLAG";
export const ACCESS_USER = "3ZUSERFLAG"; export const ACCESS_USER = "3ZUSERFLAG";
export const SESSION_ID = "3ZSESSIONID"; export const SESSION_ID = "3ZSESSIONID";
export const HTTP_STATUS = {message: "服务请求失败", code:9004}; export const HTTP_STATUS = { message: "服务请求失败", code: 9004 };
/** /**
* 邮件系统 * 邮件系统
......
src/onlyoffice.js 0 → 100644
View file @ ba57cf80
var getParameters = function () {
var search = window.location.search;
var obj = {};
if (search != '') {
// window.location.search '' or start with '?'
search = search.substring(1);
var keypairArray = search.split('&');
for (i in keypairArray) {
keypair = keypairArray[i];
partArray = keypair.split('=');
if (partArray.length == 2) {
obj[partArray[0]] = partArray[1];
}
}
}
return obj;
}
var param = getParameters();
var docEditor = new DocsAPI.DocEditor("placeholder", {
"document": {
"fileType": param.fileType.replace(".", ""),
"permissions": {
"edit": false,
"copy": false,
"download": false,
"print": false,
"chat": false
},
// "key": "C8D7FB890BAC496FB0D27B163EDB88BDAA",
"title": decodeURIComponent(param.filename),
"url": decodeURIComponent(param.url),
},
"height": "1000px",
"width": "100%",
"editorConfig": {
"mode": 'view',
"customization": {
//是否显示插件
"plugins": false,
"feedback": {
"url": "https://example.com",
"visible": false
},
"help": false
},
about: false,
}
});
\ No newline at end of file
src/view/ddkz/components/chatRoomInfo.vue
View file @ ba57cf80
...@@ -152,7 +152,28 @@ export default { ...@@ -152,7 +152,28 @@ export default {
//取消导演部审批 //取消导演部审批
//订阅大群主题，订阅功能中设置ID： //订阅大群主题，订阅功能中设置ID：
this.stompClient.subscribe(item.address, res => { this.stompClient.subscribe(item.address, res => {
this.getRecordsByPagingFn(item); // this.getRecordsByPagingFn(item);
let body = JSON.parse(res.body);
this.publicNoticeList.push({
attachment: body.attachment,
content: body.content,
destId: res.headers.chatRoomId,
fromUserId: res.headers.fromUserId,
messageForm: body.messageForm,
remark: body.remark,
teamId: body.teamInfo.id,
teamInfo: body.teamInfo,
title: body.title,
createTime: body.createTime
});
this.publicNoticeList = this.publicNoticeList.sort(this.compare);
this.dataOrderByParams(5, null);
this.optionsFrom = [];
this.publicNoticeList.forEach(item => {
if (this.optionsFrom.indexOf(item.fromUserId) == -1) {
this.optionsFrom.push(item.fromUserId);
}
});
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.myNotice.handleClose(); this.$refs.myNotice.handleClose();
}) })
...@@ -183,7 +204,7 @@ export default { ...@@ -183,7 +204,7 @@ export default {
dataOrderByParams(timeFrame, user) { dataOrderByParams(timeFrame, user) {
let newsArr = []; let newsArr = [];
let tmpArr = this.publicNoticeList; let tmpArr = this.publicNoticeList;
if (user != null) { if (user) {
tmpArr = this.publicNoticeList.filter(item => { return item.fromUserId == user }); tmpArr = this.publicNoticeList.filter(item => { return item.fromUserId == user });
} }
tmpArr.forEach(item => { tmpArr.forEach(item => {
...@@ -329,7 +350,18 @@ export default { ...@@ -329,7 +350,18 @@ export default {
this.dataOrderByParams(5, val ? val : null); this.dataOrderByParams(5, val ? val : null);
}, },
handleChangeTimeFrame(val) { handleChangeTimeFrame(val) {
this.dataOrderByParams(val, this.formInfo.fromUser); this.dataOrderByParams(val ? val : 5, this.formInfo.fromUser);
},
compare(obj1, obj2) {
var val1 = obj1.createTime;
var val2 = obj2.createTime;
if (val1 > val2) {
return -1;
} else if (val1 < val2) {
return 1;
} else {
return 0;
}
} }
}, },
computed: { computed: {
......
webpack.config.js
View file @ ba57cf80
...@@ -8,29 +8,49 @@ const vueLoaderPlugin = require('vue-loader/lib/plugin') ...@@ -8,29 +8,49 @@ const vueLoaderPlugin = require('vue-loader/lib/plugin')
module.exports = { module.exports = {
mode: 'development', // 开发模式 mode: 'development', // 开发模式
// mode: 'production', // mode: 'production',
entry: path.resolve(__dirname, './src/main.js'), // 项目入口文件 entry: {
main: path.resolve(__dirname, './src/main.js'),
onlyoffice: path.resolve(__dirname, './src/onlyoffice.js')
}, // 项目入口文件
output: { output: {
filename: '[name].[contenthash:8].js', filename: '[name].[contenthash:8].js',
path: path.resolve(__dirname, './web') // 打包后的目录 path: path.resolve(__dirname, './web') // 打包后的目录
}, },
resolve:{ resolve: {
alias:{ alias: {
'@':path.join(__dirname,'./src/') '@': path.join(__dirname, './src/')
} }
}, },
plugins: [ plugins: [
new HtmlWebpackPlugin({ new HtmlWebpackPlugin({
template: path.resolve(__dirname, './index.html'), template: path.resolve(__dirname, './index.html'),
filename: 'index.html',
inject: true, inject: true,
chunks: ['main'],
favicon: path.join('static/img/favicon.ico') favicon: path.join('static/img/favicon.ico')
}), }),
new CleanWebpackPlugin(), new HtmlWebpackPlugin({
new CopyWebpackPlugin({ template: path.resolve(__dirname, './onlyoffice/dev.html'),
patterns: [ filename: 'onlyoffice.html',
{ from: path.resolve(__dirname, './static'), to: 'static' }, inject: 'body',
{ from: path.resolve(__dirname, './onlyoffice.html'), to: 'onlyoffice.html' }, chunks: ['onlyoffice'],
] favicon: path.join('static/img/favicon.ico'),
// tags: {//webpack5.5以上才支持
// body: [{
// tagName: 'script',
// attributes: {
// src: 'https://cdn.bootcdn.net/ajax/libs/jquery/3.6.0/jquery.min.js',
// },
// }]
// }
}), }),
new CleanWebpackPlugin(),
// new CopyWebpackPlugin({
// patterns: [
// { from: path.resolve(__dirname, './static'), to: 'static' },
// { from: path.resolve(__dirname, './onlyoffice.html'), to: 'onlyoffice.html' },
// ]
// }),
new vueLoaderPlugin() new vueLoaderPlugin()
], ],
devtool: 'eval', devtool: 'eval',
......
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