Merge branch 'master' of http://git.jihengcc.cn/sendy/KM-Front-Milestone2

src/views/modules/knowledge/config/bannerAddEdit.vue

@@ -71,11 +71,15 @@
                     <img v-if="bannerForm.bannerFile" mode="aspectFill" :src="'/api/api-system/system/core/sysFile/previewFile?fileId='+bannerForm.bannerFile" alt="" />
                     <div v-else class="upload-inline">
                       <div>
-                        <a-icon type="plus" style="fontSize:20px;color:#aaa;" />
+                        <a-icon v-if="!loading" type="plus" style="fontSize:20px;color:#aaa;" />
+                        <a-icon v-else type="loading" />
                       </div>
                       <div>
-                        <div>上传图片</div>
-                        <div>仅支持.png格式</div>
+                        <div v-if="!loading">
+                          <div>上传图片</div>
+                          <div>仅支持.png格式</div>
+                        </div>
+                        <div v-else>上传中...</div>
                       </div>
                       <span style="margin-top:10px;font-size:12px;">推荐尺寸 (1920*460)</span>
                     </div>

src/views/modules/knowledge/news/newsAddEdit.vue

@@ -55,11 +55,15 @@
                     <img v-if="newsForm.thumbnail" mode="aspectFill" :src="'/api/api-system/system/core/sysFile/previewFile?fileId='+newsForm.thumbnail" alt="" />
                     <div v-else class="upload-inline">
                       <div>
-                        <a-icon type="plus" style="fontSize:20px;color:#aaa;" />
+                        <a-icon v-if="!loading" type="plus" style="fontSize:20px;color:#aaa;" />
+                        <a-icon v-else type="loading" />
                       </div>
                       <div>
-                        <div>上传图片</div>
-                        <div>仅支持.png格式</div>
+                        <div v-if="!loading">
+                          <div>上传图片</div>
+                          <div>仅支持.png格式</div>
+                        </div>
+                        <div v-else>上传中...</div>
                       </div>
                     </div>
                   </a-upload>

src/views/modules/knowledge/warehouse/knowledgeAddUpdate.vue

@@ -48,11 +48,15 @@
                   :beforeUpload="beforeUpload"
                 >
                   <p class="ant-upload-drag-icon">
-                    <a-icon type="inbox" />
+                    <a-icon v-if="!loading" type="inbox" />
+                    <a-icon v-else type="loading" />
                   </p>
-                  <p class="ant-upload-text">
+                  <p class="ant-upload-text" v-if="!loading">
                     点击或将文件拖拽到这里上传（仅可上传一份
                   </p>
+                  <p v-else class="ant-upload-text">
+                    上传中...
+                  </p>
                   <p class="ant-upload-hint">
                     支持扩展名：.doc .docx .pdf .xls .xlsx .pptx
                   </p>
@@ -152,6 +156,7 @@ export default {
   },
   data() {
     return {
+      loading:false,
       api,
       classApi,
       saveLoading: false,
@@ -333,6 +338,7 @@ export default {
         return
       }
       if(info.file.status === 'done') {
+        this.loading = false
         this.knowledgeForm.attachment = info.file.response.data[0].fileId
         this.knowledgeForm.attachmentName = info.file.response.data[0].fileName
       }
@@ -436,7 +442,7 @@ export default {
       this.option.isEdit = false
       this.option.lang = 'zh-CN'
       // this.option.url = 'http://10.5.100.64:9900/api-system/system/core/sysFile/previewFile?fileId=1597050108435845121'
-      this.option.url = 'http://www.hkcqjy.com.cn:8088/api/api-system/system/core/sysFile/previewFile?fileId='+ this.knowledgeForm.attachment,
+      this.option.url = 'http://10.5.100.101/:8088/api/api-system/system/core/sysFile/previewFile?fileId='+ this.knowledgeForm.attachment,
       this.option.title = this.knowledgeForm.attachmentName
       this.option.fileType = this.knowledgeForm.attachmentName.split('.').slice(-1)[0]
       this.option.isPrint = false