Kaynağa Gözat

1.0.8 修复图片上传

liuyanpeng 2 yıl önce
ebeveyn
işleme
65cad9a613

+ 1 - 1
package.json

@@ -1,7 +1,7 @@
 {
 {
   "name": "client-trace-v3",
   "name": "client-trace-v3",
   "description": "client-trace-v3",
   "description": "client-trace-v3",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "author": "yangzhijie <yangzhijie1488@163.com>",
   "author": "yangzhijie <yangzhijie1488@163.com>",
   "scripts": {
   "scripts": {
     "dev": "webpack serve --config ./webpack.dev.js",
     "dev": "webpack serve --config ./webpack.dev.js",

+ 7 - 7
src/common/Common.js

@@ -129,7 +129,7 @@ export default{
 
 
   // 获取图片路径
   // 获取图片路径
   getImageSrc: function (className, imageName) {
   getImageSrc: function (className, imageName) {
-    var accountId = localStorage.getItem('account');   
+    var accountId = localStorage.getItem('#accountId');   
     if (imageName == null) {
     if (imageName == null) {
       return null;
       return null;
     }
     }
@@ -143,7 +143,7 @@ export default{
 
 
   // 获取略缩图图片路径
   // 获取略缩图图片路径
   getThumbnailImageSrc: function (className, imageName) {
   getThumbnailImageSrc: function (className, imageName) {
-    var accountId = localStorage.getItem('account');
+    var accountId = localStorage.getItem('#accountId');
     if (imageName == null) {
     if (imageName == null) {
       return null;
       return null;
     }
     }
@@ -161,13 +161,13 @@ export default{
    * @return {[type]}           [description]
    * @return {[type]}           [description]
    */
    */
   getAttachmentsSrc: function (className, imageName) {
   getAttachmentsSrc: function (className, imageName) {
-    var accountId = localStorage.getItem('account');
+    var accountId = localStorage.getItem('#accountId');
     return this.getFileServerUrl() + 'Files/' + accountId + '/Attachments/' + className + '/' + imageName;
     return this.getFileServerUrl() + 'Files/' + accountId + '/Attachments/' + className + '/' + imageName;
   },
   },
 
 
   // 获取图片路径
   // 获取图片路径
   getVideoSrc: function (className, imageName) {
   getVideoSrc: function (className, imageName) {
-    var accountId = localStorage.getItem('account');
+    var accountId = localStorage.getItem('#accountId');
     if (imageName == undefined || imageName == '') {
     if (imageName == undefined || imageName == '') {
       return this.getHostPageBaseURL() + 'static/image/noImage.jpg';
       return this.getHostPageBaseURL() + 'static/image/noImage.jpg';
     }
     }
@@ -178,7 +178,7 @@ export default{
 
 
   //获取资源路径   type: 图片image,视频video,文件file,
   //获取资源路径   type: 图片image,视频video,文件file,
   getResourceUrl: function (type, className, resourceName) {
   getResourceUrl: function (type, className, resourceName) {
-    var accountId = localStorage.getItem('account');
+    var accountId = localStorage.getItem('#accountId');
     if (resourceName == undefined || className == undefined || type == undefined || resourceName == '' || className == '' || type == '') {
     if (resourceName == undefined || className == undefined || type == undefined || resourceName == '' || className == '' || type == '') {
       return;
       return;
     }
     }
@@ -280,13 +280,13 @@ export default{
     var token = $.cookie('token');
     var token = $.cookie('token');
     var account = $.cookie('account');
     var account = $.cookie('account');
     if (token == undefined) {
     if (token == undefined) {
-      var localStorageToken = localStorage.getItem('token');
+      var localStorageToken = localStorage.getItem('#token');
       if (localStorageToken != undefined) {
       if (localStorageToken != undefined) {
         token = localStorageToken;
         token = localStorageToken;
       }
       }
     }
     }
     if (account == undefined) {
     if (account == undefined) {
-      var localStorageAccount = localStorage.getItem('account');
+      var localStorageAccount = localStorage.getItem('#accountId');
       if (localStorageAccount != undefined) {
       if (localStorageAccount != undefined) {
         account = localStorageAccount;
         account = localStorageAccount;
       }
       }

+ 12 - 8
src/trace/TraceCreate.vue

@@ -98,6 +98,7 @@ import { Notify } from 'pc-component-v3';
 import Treeselect from '../widget/TreeSelect.vue';
 import Treeselect from '../widget/TreeSelect.vue';
 import ATreeselect from '../widget/ATreeSelect.vue';
 import ATreeselect from '../widget/ATreeSelect.vue';
 import AudioField from '../widget/AudioField.vue';
 import AudioField from '../widget/AudioField.vue';
+import { message } from 'ant-design-vue';
 export default {
 export default {
   components: {
   components: {
     UpladFile,
     UpladFile,
@@ -276,13 +277,17 @@ export default {
               Common.addTokenToRequest(request);
               Common.addTokenToRequest(request);
             },
             },
             success: function (data) {
             success: function (data) {
-              if (data != 'error') {
-                var imageName = data.substring(data.indexOf(':') + 1);
-                $('#summernote').summernote(
-                  'insertImage',
-                  Common.getResourceUrl('image', _self.className, imageName),
-                  'image name',
-                );
+              if(data.errorCode == 0){
+                if (data.datas) {
+                  var imageName = data.datas[0];
+                  $('#summernote').summernote(
+                    'insertImage',
+                    Common.getResourceUrl('image', _self.className, imageName),
+                    'image name',
+                  );
+                }
+              }else{
+                message.error(data.errorMessage);
               }
               }
             },
             },
             error: function () {
             error: function () {
@@ -392,7 +397,6 @@ export default {
         success: function (data) {
         success: function (data) {
           console.log(data, '时间节点');
           console.log(data, '时间节点');
           _self.projectTaskDtos = _self.convertToTreedata(data);
           _self.projectTaskDtos = _self.convertToTreedata(data);
-          console.log(_self.projectTaskDtos, '99999999999999999');
         },
         },
         error: function (XMLHttpRequest, textStatus, errorThrown) {
         error: function (XMLHttpRequest, textStatus, errorThrown) {
           Common.processException(XMLHttpRequest, textStatus, errorThrown);
           Common.processException(XMLHttpRequest, textStatus, errorThrown);

+ 2 - 1
src/trace/TraceName.vue

@@ -9,7 +9,7 @@
         <div class="row">
         <div class="row">
           <div align="center">
           <div align="center">
             <div v-if="finished" class="checked" @click="getTimeLineNumber()" />
             <div v-if="finished" class="checked" @click="getTimeLineNumber()" />
-            <div v-else class="clickFinished">
+            <div v-else class="clickFinished" @click="getTimeLineNumber()">
               <div
               <div
                 style="
                 style="
                   width: 50px;
                   width: 50px;
@@ -467,5 +467,6 @@ export default {
   border-radius: 16px;
   border-radius: 16px;
   position: relative;
   position: relative;
   cursor: pointer;
   cursor: pointer;
+  user-select: none;
 }
 }
 </style>
 </style>

+ 29 - 24
src/trace/TraceUpdate.vue

@@ -111,6 +111,7 @@ import { Notify } from 'pc-component-v3';
 
 
 import Treeselect from '../widget/TreeSelect.vue';
 import Treeselect from '../widget/TreeSelect.vue';
 import AudioField from '../widget/AudioField.vue';
 import AudioField from '../widget/AudioField.vue';
+import { message } from 'ant-design-vue';
 export default {
 export default {
   components: {
   components: {
     UpladFile,
     UpladFile,
@@ -243,34 +244,38 @@ export default {
               Common.addTokenToRequest(request);
               Common.addTokenToRequest(request);
             },
             },
             success: function (data) {
             success: function (data) {
-              if (data != 'error') {
-                var imageName = data.substring(data.indexOf(':') + 1);
-                // 方法1: 直接插入图片,由于图片不能加载,导致导致插入失败。
-                // $("#summernote").summernote('insertImage', Common.getResourceUrl("image", _self.className, imageName), 'image name');
+              if (data.errorCode == 0) {
+                if (data.datas) {
+                  var imageName = data.datas[0];
+                  // 方法1: 直接插入图片,由于图片不能加载,导致导致插入失败。
+                  // $("#summernote").summernote('insertImage', Common.getResourceUrl("image", _self.className, imageName), 'image name');
 
 
-                // 方法2:创建img节点,然后插入<img>节点,可以插入,但是图片没有显示,点击一下code,然后就显示了。
-                // var node = document.createElement('img') // 创建节点,用于包裹视频,再加这一层是方便调视频样式
-                // node.setAttribute("authSrc", Common.getResourceUrl("image", _self.className, imageName));
-                // node.setAttribute("is", "auth-img");
-                // $("#summernote").summernote('insertNode', node);
+                  // 方法2:创建img节点,然后插入<img>节点,可以插入,但是图片没有显示,点击一下code,然后就显示了。
+                  // var node = document.createElement('img') // 创建节点,用于包裹视频,再加这一层是方便调视频样式
+                  // node.setAttribute("authSrc", Common.getResourceUrl("image", _self.className, imageName));
+                  // node.setAttribute("is", "auth-img");
+                  // $("#summernote").summernote('insertNode', node);
 
 
-                // 方法3:重新给code赋值,此时丢失了鼠标焦点,此时不满足要求。
-                // var get_code = $('#summernote').summernote('code');
-                // $('#summernote').summernote('code', get_code);
+                  // 方法3:重新给code赋值,此时丢失了鼠标焦点,此时不满足要求。
+                  // var get_code = $('#summernote').summernote('code');
+                  // $('#summernote').summernote('code', get_code);
 
 
-                // 方法4:插入文本(尝试失败)
-                //let imageText = "<img is='auth-img' authSrc='" + Common.getResourceUrl("image", _self.className, imageName) + "'/>";
-                //$('#summernote').summernote('insertText', imageText);
+                  // 方法4:插入文本(尝试失败)
+                  //let imageText = "<img is='auth-img' authSrc='" + Common.getResourceUrl("image", _self.className, imageName) + "'/>";
+                  //$('#summernote').summernote('insertText', imageText);
 
 
-                // 方法5: 插入div,div中嵌入img,测试OK
-                //                          var node = document.createElement('div') // 创建节点,用于包裹视频,再加这一层是方便调视频样式
-                //                          node.innerHTML = "<img is='auth-img' authSrc='" + Common.getResourceUrl("image", _self.className, imageName) + "' />";
-                //                          $("#summernote").summernote('insertNode', node);
-                $('#summernote').summernote(
-                  'insertImage',
-                  Common.getResourceUrl('image', _self.className, imageName),
-                  'image name',
-                );
+                  // 方法5: 插入div,div中嵌入img,测试OK
+                  //                          var node = document.createElement('div') // 创建节点,用于包裹视频,再加这一层是方便调视频样式
+                  //                          node.innerHTML = "<img is='auth-img' authSrc='" + Common.getResourceUrl("image", _self.className, imageName) + "' />";
+                  //                          $("#summernote").summernote('insertNode', node);
+                  $('#summernote').summernote(
+                    'insertImage',
+                    Common.getResourceUrl('image', _self.className, imageName),
+                    'image name',
+                  );
+                }
+              } else {
+                message.error(data.errorMessage);
               }
               }
             },
             },
             error: function () {
             error: function () {