修改Loading

src/trace/ProjectArchive.vue

@@ -404,7 +404,7 @@
       </Modal>
     </div>
     <div>
-      <Loading ref="loading" />
+      <Loading v-if="loading" />
     </div>
   </div>
 </template>
@@ -459,6 +459,7 @@ export default {
       projectArchiveAuditDtos: [], //历史归档项记录
       parentProjectArchiveFolderId: undefined, //上级文件夹Id
       data: undefined,
+      loading: false,
     };
   },
   watch: {
@@ -798,7 +799,7 @@ export default {
       if (selectedFile == undefined) {
         return;
       }
-      _self.$refs.loading.show();
+      _self.loading=true;
       if (selectedFile.size != undefined && selectedFile.size != null) {
         var formData = new FormData();
         formData.append('files', selectedFile);
@@ -813,7 +814,7 @@ export default {
           contentType: false,
           processData: false,
           success: function (data) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             if (data != 'error') {
               Notify.success('提示', '文件上传成功！', 1000);
               var fileName = data.substring(data.indexOf(':') + 1);
@@ -848,12 +849,12 @@ export default {
             }
           },
           error: function (XMLHttpRequest, textStatus, errorThrown) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             Common.processException(XMLHttpRequest, textStatus, errorThrown);
           },
         });
       } else {
-        _self.$refs.loading.hide();
+        _self.loading=false;
         Notify.error('提示', '上传的文件为空！');
       }
     },

src/trace/TraceAttachment.vue

@@ -29,7 +29,7 @@
         </template>
       </ul>
     </div>
-    <Loading ref="loading" />
+    <Loading v-if="loading" />
   </div>
 </template>
 
@@ -56,6 +56,7 @@ export default {
       className: 'com.leanwo.prodog.model.trace.TraceAttachment',
       attachmentList: [],
       traceConfigDto: {},
+      loading: false,
     };
   },
 
@@ -149,7 +150,7 @@ export default {
         var formData = new FormData();
         formData.append('files', selectedFile);
         formData.append('className', _self.className);
-        _self.$refs.loading.show();
+        _self.loading=true;
         $.ajax({
           url: Common.getApiURL('file/classFileUpload'),
           type: 'post',
@@ -160,14 +161,14 @@ export default {
           contentType: false,
           processData: false,
           success: function (data) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             if (data != 'error') {
               var fileName = data.substring(data.indexOf(':') + 1);
               _self.uploadTraceAttachment(fileName);
             }
           },
           error: function (XMLHttpRequest, textStatus, errorThrown) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             Common.processException(XMLHttpRequest, textStatus, errorThrown);
           },
         });

src/trace/TraceCommentCreate.vue

@@ -52,7 +52,7 @@
         </div>
       </div>
     </div>
-    <Loading ref="loading" />
+    <Loading v-if="loading" />
   </div>
 </template>
 <script>
@@ -82,6 +82,7 @@ export default {
       files: [],
       traceConfigDto: {},
       summernoteInitSuccess: false, // summernote初始化成功
+      loading: false,
     };
   },
 
@@ -191,7 +192,7 @@ export default {
           var rst = new FormData();
           rst.append('images', bl, 'file_' + Date.parse(new Date()) + '.jpg');
           rst.append('className', 'com.leanwo.prodog.trace.model.TraceComment');
-          _self.$refs.loading.show();
+          _self.loading=true;
           $.ajax({
             url: Common.getApiURL('file/imageUpload'),
             type: 'post',
@@ -202,14 +203,14 @@ export default {
             contentType: false,
             processData: false,
             success: function (data) {
-              _self.$refs.loading.hide();
+              _self.loading=false;
               if (data != 'error') {
                 var imageName = data.substring(data.indexOf(':') + 1);
                 _self.addImg(imageName);
               }
             },
             error: function (XMLHttpRequest, textStatus, errorThrown) {
-              _self.$refs.loading.hide();
+              _self.loading=false;
               Common.processException(XMLHttpRequest, textStatus, errorThrown);
             },
           });
@@ -302,7 +303,7 @@ export default {
           var formData = new FormData();
           formData.append('files', selectedFile);
           formData.append('className', _self.className);
-          _self.$refs.loading.show();
+          _self.loading=true;
           $.ajax({
             url: Common.getApiURL('file/classFileUpload'),
             type: 'post',
@@ -313,14 +314,14 @@ export default {
             contentType: false,
             processData: false,
             success: function (data) {
-              _self.$refs.loading.hide();
+              _self.loading=false;
               if (data != 'error') {
                 var fileName = data.substring(data.indexOf(':') + 1);
                 _self.files.push(fileName);
               }
             },
             error: function (XMLHttpRequest, textStatus, errorThrown) {
-              _self.$refs.loading.hide();
+              _self.loading=false;
               Common.processException(XMLHttpRequest, textStatus, errorThrown);
             },
           });
@@ -434,7 +435,7 @@ export default {
           content: _self.content,
           attachments: _self.files.join(','),
         };
-        _self.$refs.loading.show();
+        _self.loading=true;
         $.ajax({
           url: Common.getApiURL('TraceCommentResource/saveTraceComment'),
           type: 'post',
@@ -444,11 +445,11 @@ export default {
           },
           data: JSON.stringify(traceComment),
           success: function (data) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             _self.back();
           },
           error: function (XMLHttpRequest, textStatus, errorThrown) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             Common.processException(XMLHttpRequest, textStatus, errorThrown);
           },
         });

src/trace/TraceCommentEdit.vue

@@ -41,7 +41,7 @@
         </div>
       </div>
     </div>
-    <Loading ref="loading" />
+    <Loading v-if="loading" />
   </div>
 </template>
 <script>
@@ -69,6 +69,7 @@ export default {
       className: 'com.leanwo.prodog.trace.model.TraceComment',
       summernoteInitSuccess: false, // summernote初始化成功
       files: [],
+      loading: false,
     };
   },
   mounted: function() {
@@ -192,7 +193,7 @@ export default {
           var formData = new FormData();
           formData.append('files', selectedFile);
           formData.append('className', _self.className);
-          _self.$refs.loading.show();
+          _self.loading=true;
           $.ajax({
             url: Common.getApiURL('file/classFileUpload'),
             type: 'post',
@@ -203,14 +204,14 @@ export default {
             contentType: false,
             processData: false,
             success: function(data) {
-              _self.$refs.loading.hide();
+              _self.loading=false;
               if (data != 'error') {
                 var fileName = data.substring(data.indexOf(':') + 1);
                 _self.files.push(fileName);
               }
             },
             error: function(XMLHttpRequest, textStatus, errorThrown) {
-              _self.$refs.loading.hide();
+              _self.loading=false;
               Common.processException(XMLHttpRequest, textStatus, errorThrown);
             },
           });
@@ -288,7 +289,7 @@ export default {
       _self.traceComment.content = $('#summernote').summernote('code');
       if (_self.traceComment.content != '' && _self.traceComment.content != null) {
         _self.traceComment.attachments = _self.files.join(',');
-        _self.$refs.loading.show();
+        _self.loading=true;
         $.ajax({
           url: Common.getApiURL('TraceCommentResource/updateTraceComment'),
           type: 'post',
@@ -298,11 +299,11 @@ export default {
           },
           data: JSON.stringify(_self.traceComment),
           success: function(data) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             _self.back();
           },
           error: function(XMLHttpRequest, textStatus, errorThrown) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             Common.processException(XMLHttpRequest, textStatus, errorThrown);
           },
         });

src/trace/TraceCreate.vue

@@ -88,7 +88,7 @@
         </button>
       </div>
     </div>
-    <Loading ref="loading" />
+    <Loading v-if="loading" />
   </div>
 </template>
 <script type="text/javascript">
@@ -128,6 +128,7 @@ export default {
       summernoteInitSuccess: false, // summernote初始化成功
       projectTaskDtos: [],//项目任务时间点
       srcArray: [],
+      loading: false,
     };
   },
   watch: {
@@ -208,7 +209,7 @@ export default {
 
       _self.traceDto.detail = $('#summernote').summernote('code');
       if (_self.traceDto.summary != '' && _self.traceDto.summary != undefined) {
-        _self.$refs.loading.show();
+        _self.loading=true;
         $.ajax({
           url: Common.getApiURL('TraceResource/saveTrace'),
           type: 'post',
@@ -219,11 +220,11 @@ export default {
           },
           success: function (data) {
             Notify.success('提示', '追踪成功！');
-            _self.$refs.loading.hide();
+            _self.loading=false;
             _self.back();
           },
           error: function (XMLHttpRequest, textStatus, errorThrown) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             Common.processException(XMLHttpRequest, textStatus, errorThrown);
           },
         });

src/trace/TraceName.vue

@@ -114,7 +114,7 @@
         <TraceLog ref="traceLog" :trace-id="traceId" :trace="trace" />
       </div>
     </div>
-    <Loading ref="loading" />
+    <Loading v-if="loading" />
   </div>
 </template>
 <script>
@@ -157,6 +157,7 @@ export default {
       className: 'com.leanwo.prodog.Trace',
       srcArray: [],
       isflag: true,
+      loading: false,
     };
   },
 
@@ -252,15 +253,15 @@ export default {
     updateTracefinished: function () {
       var _self = this;
       if (_self.count == 0) {
-        _self.$refs.loading.show();
+        _self.loading=true;
         TraceResource.updateTraceFinished(_self.trace.id).then(
           successData => {
             _self.loadTraceById();
-            _self.$refs.loading.hide();
+            _self.loading=false;
             _self.$refs.traceLog.getTraceLog();
           },
           errorData => {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             Common.processException(errorData);
           },
         );

src/trace/TraceTimeLine.vue

@@ -63,7 +63,7 @@
     >
       <span class="glyphicon glyphicon-plus" aria-hidden="true" />添加时间节点
     </button>
-    <Loading ref="loading" />
+    <Loading v-if="loading" />
   </div>
 </template>
 
@@ -120,6 +120,7 @@ export default {
         endDate: undefined,
       },
       formatDate: TraceCommon.formatDate,
+      loading: false,
     };
   },
 
@@ -291,7 +292,7 @@ export default {
       var _self = this;
       console.log(_self.trace);
       if (_self.trace.finished != true) {
-        _self.$refs.loading.show();
+        _self.loading=true;
         $.ajax({
           url: Common.getApiURL(
             'TraceTimeLineResource/updateTraceTimeLineFinished',
@@ -303,12 +304,12 @@ export default {
             Common.addTokenToRequest(request);
           },
           success: function (data) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             _self.refresh();
             _self.$emit('refreshTraceLog');
           },
           error: function (XMLHttpRequest, textStatus, errorThrown) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             Common.processException(XMLHttpRequest, textStatus, errorThrown);
           },
         });

src/trace/TraceTimeLineCreate.vue

@@ -58,7 +58,7 @@
         </div>
       </div>
     </div>
-    <Loading ref="loading" />
+    <Loading v-if="loading" />
   </div>
 </template>
 
@@ -91,6 +91,7 @@ export default {
         'content': undefined,
         'endDate': undefined,
       },	// 追踪单时间节点(输入参数)
+      loading: false,
     };
   },
 
@@ -124,7 +125,7 @@ export default {
       var dates = _self.traceTimeLine.endDate;
 
       if (content != null && content != '' && dates != null && dates != undefined && dates != '') {
-        _self.$refs.loading.show();
+        _self.loading=true;
         $.ajax({
           url: Common.getApiURL('TraceTimeLineResource/saveTraceTimeLine'),
           type: 'post',
@@ -134,16 +135,16 @@ export default {
           },
           data: JSON.stringify(_self.traceTimeLine),
           success: function (data) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             _self.returnBack();
           },
           error: function (XMLHttpRequest, textStatus, errorThrown) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             Common.processException(XMLHttpRequest, textStatus, errorThrown);
           },
         });
       } else {
-        _self.$refs.loading.hide();
+        _self.loading=false;
         Notify.error('提示', '请将界面内容填写完整！');
       }
     },

src/trace/TraceTimeLineEdit.vue

@@ -61,7 +61,7 @@
         </div>
       </div>
     </div>
-    <Loading ref="loading" />
+    <Loading v-if="loading" />
   </div>
 </template>
 
@@ -93,6 +93,7 @@ export default {
         content: undefined,
         endDate: undefined,
       }, // 追踪单时间节点(输入参数)
+      loading: false,
     };
   },
 
@@ -132,10 +133,10 @@ export default {
         success: function (data) {
           _self.traceTimeLine = data;
           _self.loadSelectUserName();
-          _self.$refs.loading.hide();
+          _self.loading=false;
         },
         error: function (XMLHttpRequest, textStatus, errorThrown) {
-          _self.$refs.loading.hide();
+          _self.loading=false;
           Common.processException(XMLHttpRequest, textStatus, errorThrown);
         },
       });
@@ -157,7 +158,7 @@ export default {
         dates != undefined &&
         dates != ''
       ) {
-        _self.$refs.loading.show();
+        _self.loading=true;
         $.ajax({
           url: Common.getApiURL('TraceTimeLineResource/saveTraceTimeLine'),
           type: 'post',
@@ -167,16 +168,16 @@ export default {
           },
           data: JSON.stringify(_self.traceTimeLine),
           success: function (data) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             _self.returnBack();
           },
           error: function (XMLHttpRequest, textStatus, errorThrown) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             Common.processException(XMLHttpRequest, textStatus, errorThrown);
           },
         });
       } else {
-        _self.$refs.loading.hide();
+        _self.loading=false;
         Notify.error('提示', '请将界面内容填写完整！');
       }
     },
@@ -186,7 +187,7 @@ export default {
      */
     deleteById: function () {
       var _self = this;
-      _self.$refs.loading.show();
+      _self.loading=true;
       $.ajax({
         url: Common.getApiURL('TraceTimeLineResource/deleteById'),
         type: 'get',
@@ -197,11 +198,11 @@ export default {
           Common.addTokenToRequest(request);
         },
         success: function (data) {
-          _self.$refs.loading.hide();
+          _self.loading=false;
           _self.returnBack();
         },
         error: function (xmlHttpRequest, textStatus, errorThrown) {
-          _self.$refs.loading.hide();
+          _self.loading=false;
           Common.processException(xmlHttpRequest, textStatus, errorThrown);
         },
       });

src/trace/TraceUpdate.vue

@@ -90,7 +90,7 @@
         </button>
       </div>
     </div>
-    <Loading ref="loading" />
+    <Loading v-if="loading" />
   </div>
 </template>
 <script>
@@ -127,6 +127,7 @@ export default {
       projectTaskDtos: [],//项目任务时间点
       isflag: true,
       srcArray: [],
+      loading: false,
     };
   },
   watch: {
@@ -187,7 +188,7 @@ export default {
       _self.traceDto.detail = $('#summernote').summernote('code');
       _self.traceDto.projectTaskId = _self.$refs.treeSelect.getValue();
       if (_self.traceDto.summary != '' && _self.traceDto.summary != undefined) {
-        _self.$refs.loading.show();
+        _self.loading=true;
         $.ajax({
           url: Common.getApiURL('TraceResource/updateTrace'),
           type: 'post',
@@ -198,11 +199,11 @@ export default {
           },
           success: function (data) {
             Notify.success('提示', '修改成功！');
-            _self.$refs.loading.hide();
+            _self.loading=false;
             _self.back();
           },
           error: function (XMLHttpRequest, textStatus, errorThrown) {
-            _self.$refs.loading.hide();
+            _self.loading=false;
             Common.processException(XMLHttpRequest, textStatus, errorThrown);
           },
         });