上传问题,未解决
This commit is contained in:
@@ -26,3 +26,4 @@ node_modules
|
||||
node_modules
|
||||
node_modules
|
||||
node_modules
|
||||
/dist
|
||||
|
||||
Vendored
+1
-1
@@ -1 +1 @@
|
||||
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>nouiroom</title><script defer="defer" src="/js/chunk-vendors.89f300f8.js"></script><script defer="defer" src="/js/app.1c5f71ee.js"></script><link href="/css/chunk-vendors.10dd4e95.css" rel="stylesheet"><link href="/css/app.ff48263a.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but nouiroom doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
|
||||
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/favicon.ico"><title>nouiroom</title><script src="https://api.xayunmei.com/onlyOffice/web-apps/apps/api/documents/api.js"></script><script defer="defer" src="/js/chunk-vendors.5307e452.js"></script><script defer="defer" src="/js/app.41e65d09.js"></script><link href="/css/chunk-vendors.10dd4e95.css" rel="stylesheet"><link href="/css/app.b59bb92e.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but nouiroom doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
|
||||
+1
-1
@@ -6,7 +6,7 @@
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1.0">
|
||||
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
|
||||
<title><%= htmlWebpackPlugin.options.title %></title>
|
||||
<script src="http://121.40.189.20:8899/web-apps/apps/api/documents/api.js"></script>
|
||||
<!-- <script src="https://api.xayunmei.com/onlyOffice/web-apps/apps/api/documents/api.js"></script> -->
|
||||
</head>
|
||||
<body>
|
||||
<noscript>
|
||||
|
||||
+9
-9
@@ -1,36 +1,36 @@
|
||||
import axios from "@/utils/request";
|
||||
let baseUrlZc = 'https://api.xayunmei.com/zhongcaiapi';
|
||||
let baseUrl = 'https://api.xayunmei.com/tiaojieapi';
|
||||
// let baseUrlZc = 'https://api.xayunmei.com/zhongcaiapi';
|
||||
// let baseUrl = 'https://api.xayunmei.com/tiaojieapitest';
|
||||
// let baseUrl = 'http://172.16.1.4:6001';
|
||||
// 获取usersig
|
||||
export function getUsersig(userId) {
|
||||
let appType = sessionStorage.getItem('type');
|
||||
if (appType == 'tiaojie') {
|
||||
return axios.get(`${baseUrl}/caseApplication/generateUserSign?userId=${userId}`);
|
||||
return axios.get(`tiaojie/caseApplication/generateUserSign?userId=${userId}`);
|
||||
} else {
|
||||
return axios.get(`${baseUrlZc}/caseApplication/generateUserSign?userId=${userId}`);
|
||||
return axios.get(`zhongcai/caseApplication/generateUserSign?userId=${userId}`);
|
||||
}
|
||||
}
|
||||
// 获取房间号
|
||||
export function getRoomId(caseId) {
|
||||
let appType = sessionStorage.getItem('type');
|
||||
if (appType == 'tiaojie') {
|
||||
return axios.get(`${baseUrl}/caseApplication/createRoomId?caseId=${caseId}`);
|
||||
return axios.get(`tiaojie/caseApplication/createRoomId?caseId=${caseId}`);
|
||||
} else {
|
||||
return axios.get(`${baseUrlZc}/caseApplication/createRoomId?caseId=${caseId}`);
|
||||
return axios.get(`zhongcai/caseApplication/createRoomId?caseId=${caseId}`);
|
||||
}
|
||||
}
|
||||
// 根据案件id查询相关信息
|
||||
export function reserveConferenceList(caseId) {
|
||||
let appType = sessionStorage.getItem('type');
|
||||
if (appType == 'tiaojie') {
|
||||
return axios.get(`${baseUrl}/caseApplication/reserveConferenceList?caseId=${caseId}`);
|
||||
return axios.get(`tiaojie/caseApplication/reserveConferenceList?caseId=${caseId}`);
|
||||
} else {
|
||||
return axios.get(`${baseUrlZc}/caseApplication/reserveConferenceList?caseId=${caseId}`);
|
||||
return axios.get(`zhongcai/caseApplication/reserveConferenceList?caseId=${caseId}`);
|
||||
}
|
||||
|
||||
}
|
||||
//根据id查询密文信息
|
||||
export function getEncryptInfoByid(caseId) {
|
||||
return axios.get(`${baseUrl}/shortMessage/getMeetingInfo?authId=${caseId}`);
|
||||
return axios.get(`tiaojie/shortMessage/getMeetingInfo?authId=${caseId}`);
|
||||
}
|
||||
+20
-16
@@ -1,65 +1,69 @@
|
||||
import axios from "@/utils/request";
|
||||
let baseUrlZC = 'https://api.xayunmei.com/zhongcaiapi';
|
||||
let baseUrl = 'https://api.xayunmei.com/tiaojieapi';
|
||||
// let baseUrlZC = 'https://api.xayunmei.com/zhongcaiapi';
|
||||
// let baseUrl = 'https://api.xayunmei.com/tiaojieapitest';
|
||||
// let baseUrl = 'http://121.40.189.20:6001';
|
||||
// 开始云端录制
|
||||
export function startVideo(data) {
|
||||
let appType = sessionStorage.getItem('type');
|
||||
if (appType == 'tiaojie') {
|
||||
return axios.post(`${baseUrl}/video/openCloudRecording`, data);
|
||||
return axios.post(`tiaojie/video/openCloudRecording`, data);
|
||||
} else {
|
||||
return axios.post(`${baseUrlZC}/video/openCloudRecording`, data);
|
||||
return axios.post(`zhongcai/video/openCloudRecording`, data);
|
||||
}
|
||||
}
|
||||
// 结束云端录制
|
||||
export function stopVideo(data) {
|
||||
let appType = sessionStorage.getItem('type');
|
||||
if (appType == 'tiaojie') {
|
||||
return axios.post(`${baseUrl}/video/closeDeleteCloudRecording?taskId=${data}`);
|
||||
return axios.post(`tiaojie/video/closeDeleteCloudRecording?taskId=${data}`);
|
||||
} else {
|
||||
return axios.post(`${baseUrlZC}/video/closeDeleteCloudRecording?taskId=${data}`);
|
||||
return axios.post(`zhongcai/video/closeDeleteCloudRecording?taskId=${data}`);
|
||||
}
|
||||
}
|
||||
// 解散房间
|
||||
export function destructionRoom(data) {
|
||||
let appType = sessionStorage.getItem('type');
|
||||
if (appType == 'tiaojie') {
|
||||
return axios.post(`${baseUrl}/video/dissolveRoom`, data);
|
||||
return axios.post(`tiaojie/video/dissolveRoom`, data);
|
||||
} else {
|
||||
return axios.post(`${baseUrlZC}/video/dissolveRoom`, data);
|
||||
return axios.post(`zhongcai/video/dissolveRoom`, data);
|
||||
}
|
||||
}
|
||||
// 根据html字符串转pdf并且和案件关联
|
||||
export function htmlToPDF(data) {
|
||||
let appType = sessionStorage.getItem('type');
|
||||
if (appType == 'tiaojie') {
|
||||
return axios.post(`${baseUrl}/video/htmlToPDF`, data);
|
||||
return axios.post(`tiaojie/video/htmlToPDF`, data);
|
||||
} else {
|
||||
return axios.post(`${baseUrlZC}/video/htmlToPDF`, data);
|
||||
return axios.post(`zhongcai/video/htmlToPDF`, data);
|
||||
}
|
||||
}
|
||||
// 根据userId查询该用户是否是秘书
|
||||
export function secretaryRoleByUserId(userId, caseId) {
|
||||
let appType = sessionStorage.getItem('type');
|
||||
if (appType == 'tiaojie') {
|
||||
return axios.get(`${baseUrl}/video/secretaryRoleByUserId?userId=${userId}&caseId=${caseId}`);
|
||||
return axios.get(`tiaojie/video/secretaryRoleByUserId?userId=${userId}&caseId=${caseId}`);
|
||||
} else {
|
||||
return axios.get(`${baseUrlZC}/video/secretaryRoleByUserId?userId=${userId}`);
|
||||
return axios.get(`zhongcai/video/secretaryRoleByUserId?userId=${userId}`);
|
||||
}
|
||||
}
|
||||
// 获取证据列表
|
||||
export function selectById(caseId) {
|
||||
return axios.get(`${baseUrl}/caseApplication/selectById?id=${caseId}`);
|
||||
return axios.get(`tiaojie/caseApplication/selectById?id=${caseId}`);
|
||||
}
|
||||
// 根据案件id查询登录人是否为申请人被申请人
|
||||
export function selectRoleMenuByCaseId(caseId) {
|
||||
return axios.get(`${baseUrl}/video/selectRoleMenuByCaseId?caseId=${caseId}`);
|
||||
return axios.get(`tiaojie/video/selectRoleMenuByCaseId?caseId=${caseId}`);
|
||||
}
|
||||
// 保存onlyOffice文档
|
||||
export function saveOnlyOfficeFile(data) {
|
||||
return axios.post(`${baseUrl}/caseApplication/saveOnlyOfficeFile`, data);
|
||||
return axios.post(`tiaojie/caseApplication/saveOnlyOfficeFile`, data);
|
||||
}
|
||||
//获取当前用户的操作权限
|
||||
export function getMenuPermsByUser(caseId) {
|
||||
return axios.get(`${baseUrl}/system/menu/getMenuPermsByUser`);
|
||||
return axios.get(`tiaojie/system/menu/getMenuPermsByUser`);
|
||||
}
|
||||
// 上传文件
|
||||
export function videoUpload(data) {
|
||||
return axios.post(`tiaojie/video/upload`,data);
|
||||
}
|
||||
+6
-6
@@ -21,12 +21,12 @@ const routes = [
|
||||
component: () => import("../views/room.vue"),
|
||||
meta: { title: "房间" }
|
||||
},
|
||||
{
|
||||
path: "/onlyOffice",
|
||||
name: "onlyOffice",
|
||||
component: () => import("../views/onlyOffice.vue"),
|
||||
meta: { title: "在线文档" }
|
||||
},
|
||||
// {
|
||||
// path: "/onlyOffice",
|
||||
// name: "onlyOffice",
|
||||
// component: () => import("../views/onlyOffice.vue"),
|
||||
// meta: { title: "在线文档" }
|
||||
// },
|
||||
{
|
||||
path: "/test",
|
||||
name: "test",
|
||||
|
||||
@@ -13,7 +13,7 @@ const server = axios.create({
|
||||
server.interceptors.request.use(config => {
|
||||
// config包含了请求相关的所有信息
|
||||
// 可以同过config对象给请求配置或者修改信息
|
||||
config.headers.Authorization = sessionStorage.getItem('token');
|
||||
config.headers.Authorization ="Bearer " + sessionStorage.getItem('token');
|
||||
return config // 将配置完成的token返回 如果不返回 请求不会继续进行
|
||||
}, err => {
|
||||
// 请求发生错误时的回调函数
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
@click="videoClickOff"
|
||||
/>
|
||||
</div>
|
||||
<div class="sharing">
|
||||
<!-- <div class="sharing">
|
||||
<img
|
||||
class="sharImg"
|
||||
src="@/assets/screenShare_on.png"
|
||||
@@ -56,7 +56,7 @@
|
||||
v-else
|
||||
@click="sharClickOff"
|
||||
/>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
+6
-2
@@ -18,11 +18,11 @@ export default {
|
||||
name: "App",
|
||||
components: {
|
||||
homepc,
|
||||
homePhone
|
||||
homePhone,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
modileFlag: false
|
||||
modileFlag: false,
|
||||
};
|
||||
},
|
||||
methods: {},
|
||||
@@ -30,8 +30,12 @@ export default {
|
||||
this.modileFlag = getModile();
|
||||
let routeParams = this.$route.query;
|
||||
let appType = routeParams.type;
|
||||
if (appType) {
|
||||
sessionStorage.setItem("type", appType);
|
||||
}else{
|
||||
sessionStorage.setItem("type", "tiaojie");
|
||||
}
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
|
||||
@@ -35,6 +35,7 @@ export default {
|
||||
}
|
||||
axios.get(`http://121.40.189.20:9090/onlyOfficeConfig/${edit}/${id}/${this.userId}/desktop/true`).then(res => {
|
||||
this.config = res.data;
|
||||
debugger
|
||||
var docEditor = new DocsAPI.DocEditor("placeholder", this.config);
|
||||
})
|
||||
},
|
||||
|
||||
+69
-13
@@ -71,7 +71,7 @@
|
||||
<el-upload
|
||||
ref="upload"
|
||||
:limit="1"
|
||||
action="https://api.xayunmei.com/tiaojieapi/video/upload"
|
||||
action="https://api.xayunmei.com/tiaojieapitest/video/upload"
|
||||
:headers="headers"
|
||||
:data="filedata"
|
||||
:on-change="beforeUpload"
|
||||
@@ -87,7 +87,7 @@
|
||||
v-if="resFlag"
|
||||
ref="upload1"
|
||||
:limit="1"
|
||||
action="https://api.xayunmei.com/tiaojieapi/video/upload"
|
||||
action="https://api.xayunmei.com/tiaojieapitest/video/upload"
|
||||
:headers="headers1"
|
||||
:data="filedata1"
|
||||
:on-change="beforeUpload1"
|
||||
@@ -99,10 +99,11 @@
|
||||
>
|
||||
</el-upload>
|
||||
<el-upload
|
||||
v-if="editFlag"
|
||||
v-if="updataFlag"
|
||||
ref="upload3"
|
||||
:limit="1"
|
||||
action="https://api.xayunmei.com/tiaojieapi/video/upload"
|
||||
action=""
|
||||
:http-request="upload3"
|
||||
:headers="headers3"
|
||||
:data="filedata3"
|
||||
:on-change="beforeUpload3"
|
||||
@@ -114,6 +115,7 @@
|
||||
>上传调解书</el-button
|
||||
>
|
||||
</el-upload>
|
||||
<!-- https://api.xayunmei.com/tiaojieapitest/video/upload -->
|
||||
</div>
|
||||
<div class="list">
|
||||
<div class="applicant" v-if="applicantFile.length > 0">
|
||||
@@ -178,6 +180,7 @@ import {
|
||||
selectById,
|
||||
selectRoleMenuByCaseId,
|
||||
getMenuPermsByUser,
|
||||
videoUpload
|
||||
} from "@/api/room";
|
||||
import { getWidth, getHeight, getWidthPhone, getModile } from "@/utils/utils";
|
||||
import roomFooter from "./components/roomFooter.vue";
|
||||
@@ -314,10 +317,12 @@ export default {
|
||||
this.sharFlag = true;
|
||||
this.videoList = "videoList";
|
||||
this.screenShareFlag = false;
|
||||
if(this.userList.length >= 1){
|
||||
if (this.userList.length > 1) {
|
||||
this.videoClass = "videoItem1";
|
||||
}else{
|
||||
} else if (this.userList.length < 1) {
|
||||
this.videoClass = "videoItem";
|
||||
} else if (this.userList.length == 1) {
|
||||
this.videoClass = "videoItem3";
|
||||
}
|
||||
},
|
||||
/**获取当前用户操作权限 */
|
||||
@@ -373,15 +378,47 @@ export default {
|
||||
this.$refs.upload3.clearFiles();
|
||||
this.selectByIdFn(this.caseId);
|
||||
},
|
||||
upload3(param){
|
||||
const formData = new FormData()
|
||||
formData.append('file', param.file);
|
||||
formData.append('annexType', 7);
|
||||
formData.append('officeFlag', 1);
|
||||
formData.append('caseId', this.caseId);
|
||||
videoUpload(formData).then(res=>{
|
||||
console.log('上传图片成功')
|
||||
})
|
||||
// axios.post(url, formData).then(response => {
|
||||
// //根据返回值进行判断是否上传成功
|
||||
// if(response.data.flag){
|
||||
// //上传成功
|
||||
// console.log('上传图片成功')
|
||||
// }else{
|
||||
// //上传失败
|
||||
// console.log('图片上传失败')
|
||||
// }
|
||||
// }).catch(response => {
|
||||
// console.log('异常处理')
|
||||
// })
|
||||
},
|
||||
preview(item, flag) {
|
||||
if (item.onlyOfficeFileId) {
|
||||
this.$router.push({
|
||||
path: "/onlyoffice",
|
||||
query: { id: item.onlyOfficeFileId, flag: flag },
|
||||
});
|
||||
// this.$router.push({
|
||||
// path: "/onlyoffice",
|
||||
// query: { id: item.onlyOfficeFileId, flag: flag },
|
||||
// });
|
||||
let flag = 1;
|
||||
if(this.editFlag){
|
||||
flag = 1
|
||||
}else{
|
||||
flag = 0
|
||||
}
|
||||
window.open(
|
||||
`http://121.40.189.20:8002/onlyoffice?id=${item.onlyOfficeFileId}&flag=${flag}`,
|
||||
"_black"
|
||||
);
|
||||
} else {
|
||||
window.open(
|
||||
"https://api.xayunmei.com/tiaojieapi" + item.annexPath,
|
||||
"http://121.40.189.20:6001" + item.annexPath,
|
||||
"_black"
|
||||
);
|
||||
}
|
||||
@@ -536,7 +573,7 @@ export default {
|
||||
this.userList.splice(deleteIndex, 1);
|
||||
}
|
||||
if (this.modileFlag) {
|
||||
this.userHeight = getHeight(this.userList);
|
||||
// this.userHeight = getHeight(this.userList);
|
||||
} else {
|
||||
this.userClassPhone = getWidthPhone(this.userList);
|
||||
}
|
||||
@@ -575,11 +612,24 @@ export default {
|
||||
return this.$refs.myQuillEditor.quill;
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
userList(value) {
|
||||
if (value.length == 1) {
|
||||
this.videoClass = "videoItem3";
|
||||
} else if (value.length > 1) {
|
||||
this.videoClass = "videoItem1";
|
||||
} else if (value.length < 1) {
|
||||
this.videoClass = "videoItem";
|
||||
}
|
||||
},
|
||||
},
|
||||
async mounted() {
|
||||
if (this.userList.length == 1) {
|
||||
this.videoClass = "videoItem";
|
||||
this.videoClass = "videoItem3";
|
||||
} else if (this.userList.length > 1) {
|
||||
this.videoClass = "videoItem1";
|
||||
} else if (this.userList.length < 1) {
|
||||
this.videoClass = "videoItem";
|
||||
}
|
||||
// 判断设备类型
|
||||
this.modileFlag = getModile();
|
||||
@@ -722,6 +772,12 @@ export default {
|
||||
background: red;
|
||||
border-radius: 20px;
|
||||
}
|
||||
.videoItem3 {
|
||||
width: 48%;
|
||||
height: 100%;
|
||||
background: red;
|
||||
border-radius: 20px;
|
||||
}
|
||||
.videoItem2 {
|
||||
width: 90%;
|
||||
height: 25%;
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
<el-upload
|
||||
ref="upload"
|
||||
:limit="1"
|
||||
action="https://api.xayunmei.com/tiaojieapi/video/upload"
|
||||
action="https://api.xayunmei.com/tiaojieapitest/video/upload"
|
||||
:headers="headers"
|
||||
:data="filedata"
|
||||
:on-change="beforeUpload"
|
||||
@@ -87,7 +87,7 @@
|
||||
v-if="resFlag"
|
||||
ref="upload1"
|
||||
:limit="1"
|
||||
action="https://api.xayunmei.com/tiaojieapi/video/upload"
|
||||
action="https://api.xayunmei.com/tiaojieapitest/video/upload"
|
||||
:headers="headers1"
|
||||
:data="filedata1"
|
||||
:on-change="beforeUpload1"
|
||||
@@ -102,7 +102,7 @@
|
||||
v-if="editFlag"
|
||||
ref="upload3"
|
||||
:limit="1"
|
||||
action="https://api.xayunmei.com/tiaojieapi/video/upload"
|
||||
action="https://api.xayunmei.com/tiaojieapitest/video/upload"
|
||||
:headers="headers3"
|
||||
:data="filedata3"
|
||||
:on-change="beforeUpload3"
|
||||
@@ -381,7 +381,7 @@ export default {
|
||||
});
|
||||
} else {
|
||||
window.open(
|
||||
"https://api.xayunmei.com/tiaojieapi" + item.annexPath,
|
||||
"https://api.xayunmei.com/tiaojieapitest" + item.annexPath,
|
||||
"_black"
|
||||
);
|
||||
}
|
||||
|
||||
+21
-1
@@ -1,4 +1,24 @@
|
||||
const { defineConfig } = require('@vue/cli-service')
|
||||
module.exports = defineConfig({
|
||||
transpileDependencies: true
|
||||
transpileDependencies: true,
|
||||
devServer: {
|
||||
proxy: {
|
||||
'/tiaojie': {
|
||||
target: 'https://api.xayunmei.com/tiaojieapitest', // 后端服务器地址
|
||||
changeOrigin: true, // 是否改变Origin头信息
|
||||
secure : false,
|
||||
pathRewrite: {
|
||||
'^/api': '' // 将/api前缀重写为空字符串
|
||||
},
|
||||
},
|
||||
'/zhongcai': {
|
||||
target: 'https://api.xayunmei.com/zhongcaiapi', // 后端服务器地址
|
||||
changeOrigin: true, // 是否改变Origin头信息
|
||||
secure : false,
|
||||
pathRewrite: {
|
||||
'^/zhongcai': '' // 将/api前缀重写为空字符串
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user