canvas-x/y

src/api/common.js

@@ -10,11 +10,13 @@ const uploadWj = basePart + '/simulation/resource/server/file/uploadWj'; // 上
 const download = basePart + '/simulation/resource/common/minio/download'; // 下载方法
 const uploadProcessBar = basePart + '/simulation/resource/common/minio/uploadProcessBar'; // 算法上传
 
+const uploadToLocal = basePart + '/simulation/resource/video/uploadToLocal'; // osgb上传
+
 const createMultipartUpload = basePart + '/simulation/resource/common/minio/createMultipartUpload'; // 分片上传-请求上传地址
 const completeMultipartUpload = basePart + '/simulation/resource/common/minio/completeMultipartUpload'; // 分片上传-文件合并地址
 
-const getMyMenuTree = '/simulation/resource/server/menu/getMyMenuTree';  //获取左侧菜单
+const getMyMenuTree = '/simulation/resource/server/menu/getMyMenuTree'; // 获取左侧菜单
-const getCurrentUserInfo = '/simulation/resource/server/userInfo/getCurrentUserInfo';   //获取个人信息
+const getCurrentUserInfo = '/simulation/resource/server/userInfo/getCurrentUserInfo'; // 获取个人信息
 
 export default {
     single,
@@ -23,10 +25,11 @@ export default {
 
     getDictListsByTypes,
     getDictTreesByTypes,
-    
+
     uploadWj,
     download,
     uploadProcessBar,
+    uploadToLocal,
 
     createMultipartUpload,
     completeMultipartUpload,

src/axios/filter.js

@@ -110,15 +110,15 @@ const instance = axios.create({
     baseURL: '',
 });
 
-// instance.defaults.headers.common['Authorization'] = ""; //请求token信息配置
+instance.defaults.headers.common['Authorization'] = ""; //请求token信息配置
-// instance.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'; //请求type设置
+instance.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded'; //请求type设置
 instance.defaults.timeout = 1000 * 60 * 3; //在超时前，所有请求都会等待
-// instance.defaults.withCredentials = true;
+instance.defaults.withCredentials = true;
 
 instance.interceptors.request.use(function (config) {
     // 在发送请求之前处理
     // 判断token在前台session中是否存在
-    // config.headers.common['Authorization'] = localStorage.getItem('Authorization');
+    config.headers.common['Authorization'] = localStorage.getItem('Authorization');
     showFullScreenLoading();
     return config;
 }, function (error) {

src/views/modelLibrary/components/canvasVehicleConfiguration.vue

@@ -71,8 +71,8 @@ export default {
             this.imgIcon.onload = () => {
                 let rate = this.rate;
                 // 摄像头从自己左上角的原点开始绘制，需要移到自己的中心点
-                let x = +data.x * rate;
+                let x = +data.y * rate;
-                let y = +data.y * rate;
+                let y = +data.x * rate;
                 // let h1 = 90 - +data.h / 2;
                 // let h2 = 90 + +data.h / 2;
 
@@ -81,7 +81,8 @@ export default {
 
                 this.ctx.clearRect(-250, -40, 500, 1000);
                 // this.ctx.drawImage(this.imgIcon, x - 6, y - 6, 20.5, 14.5);
-                this.ctx.drawImage(this.imgIcon, x - 24, y - 20, 40, 40);
+                // this.ctx.drawImage(this.imgIcon, x - 24, y - 20, 40, 40);
+                this.ctx.drawImage(this.imgIcon, x - 20, y - 24, 40, 40);
                 this.ctx.beginPath();
 
                 //定义起点

src/views/workManagement/components/canvasProjectInfo.vue

@@ -62,8 +62,8 @@ export default {
 
             // this.imgIcon.src = src;
 
-            let x = +data.x * rate;
+            let x = +data.y * rate;
-            let y = +data.y * rate;
+            let y = +data.x * rate;
             let h1 = 90 - +data.h / 2;
             let h2 = 90 + +data.h / 2;
 

vue.config.js

@@ -78,7 +78,8 @@ module.exports = {
         proxy: { // 配置跨域处理 可以设置多个
             '/simulation/oauth': {
                 // target: 'http://10.12.10.70', // windowstest
-                target: 'http://47.94.105.148:81',  // aliyun-new-dev
+                target: 'http://47.94.105.148:81', // aliyun-new-dev
+                // target: 'http://47.94.105.148:80', // aliyun-new
                 changeOrigin: true,
                 secure: false, // 如果是https接口，需要配置这个参数
                 pathRewrite: {
@@ -89,14 +90,15 @@ module.exports = {
                 // target: 'http://10.10.83.145:6888/user-center',
                 // target: 'http://10.12.10.70/simulation',
                 // target: 'http://10.12.10.70:7001', // 登录
-                // target: 'http://10.12.10.73:7003',  // 王志强
+                // target: 'http://10.12.10.73:7003', // 王志强
                 // target: 'http://10.12.10.70', // windowstest
-                // target: 'http://10.12.10.87:8001',  // 赵艳
+                // target: 'http://10.12.10.87:8001', // 赵艳
-                // target: 'http://10.12.10.72:8001',  // 王晓峰
+                // target: 'http://10.12.10.72:8001', // 王晓峰
-                // target: 'http://192.168.30.75',  // gq
+                // target: 'http://192.168.30.75', // gq
-                // target: 'http://47.94.105.148',  // aliyun
+                // target: 'http://47.94.105.148', // aliyun
-                target: 'http://47.94.105.148:81',  // aliyun-new-dev
+                target: 'http://47.94.105.148:81', // aliyun-new-dev
-                // target: 'http://47.93.217.159',  // aliyun-dev
+                // target: 'http://47.93.217.159', // aliyun-dev
+                // target: 'http://47.94.105.148:80', // aliyun-new
                 // target: 'http://10.12.10.74:8001',
                 changeOrigin: true,
                 secure: false, // 如果是https接口，需要配置这个参数
@@ -107,14 +109,33 @@ module.exports = {
             '/simulation/resource/server': {
                 // target: 'http://10.12.10.73:7003', // 王志强
                 // target: 'http://10.12.10.88:7003', // 王耀栋
-                // target: 'http://10.12.10.72:7003',  // 王晓峰
+                // target: 'http://10.12.10.72:7003', // 王晓峰
-                // target: 'http://10.12.10.87:7003',  // 赵艳
+                // target: 'http://10.12.10.87:7003', // 赵艳
-                // target: 'http://10.12.10.70',  // windowstest
+                // target: 'http://10.12.10.70', // windowstest
-                // target: 'http://192.168.30.75',  // gq
+                // target: 'http://192.168.30.75', // gq
-                // target: 'http://47.94.105.148',  // aliyun
+                // target: 'http://47.94.105.148', // aliyun
-                target: 'http://47.94.105.148:81',  // aliyun-new-dev
+                target: 'http://47.94.105.148:81', // aliyun-new-dev
-                // target: 'http://47.93.217.159',  // aliyun-dev
+                // target: 'http://47.93.217.159', // aliyun-dev
-                // target: 'http://10.12.10.74:7003', // 孟令鑫
+                // target: 'http://47.94.105.148:80', // aliyun-new
+                // target: 'http://10.12.10.74:7003',// 孟令鑫
+                changeOrigin: true,
+                secure: false, // 如果是https接口，需要配置这个参数
+                pathRewrite: {
+                    '^/simulation/resource/server': '/simulation/resource/server'
+                }
+            },
+            '/simulation/resource/video': {
+                // target: 'http://10.12.10.73:7003', // 王志强
+                // target: 'http://10.12.10.88:7003', // 王耀栋
+                // target: 'http://10.12.10.72:7003', // 王晓峰
+                // target: 'http://10.12.10.87:7003', // 赵艳
+                // target: 'http://10.12.10.70', // windowstest
+                // target: 'http://192.168.30.75', // gq
+                // target: 'http://47.94.105.148', // aliyun
+                target: 'http://47.94.105.148:81', // aliyun-new-dev
+                // target: 'http://47.94.105.148:80', // aliyun-new
+                // target: 'http://47.93.217.159', // aliyun-dev
+                // target: 'http://10.12.10.74:7003',// 孟令鑫
                 changeOrigin: true,
                 secure: false, // 如果是https接口，需要配置这个参数
                 pathRewrite: {