Merge branch 'master' into eta1.0.2

src/components/loading.vue

@@ -0,0 +1,37 @@
+<template>
+<div class="loading-cont" v-if="loading">
+  <img src="~@/assets/img/home/loading.gif" alt="">
+</div>
+</template>
+<script>
+export default {
+  props: {
+    loading: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+
+    }
+  },
+  methods:{
+
+  },
+}
+</script>
+<style scoped lang='scss'>
+.loading-cont {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  z-index: 99;
+  background: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+</style>

src/utils/registryComponents.js

@@ -34,3 +34,7 @@ Vue.component('chartListWrap',chartListWrap)
 //详情图表操作
 import chartDetailHandlesWrap from '@/components/chart/chartDetailHandlesWrap.vue'
 Vue.component('chartHandlesWrap',chartDetailHandlesWrap)
+
+//长loading统一
+import dataLoading from '@/components/loading.vue';
+Vue.component('dataLoading',dataLoading)

src/views/dataEntry_manage/components/insertData.vue

@@ -17,7 +17,9 @@
       />
       <span style="fontsize: 16px">导入数据</span>
     </div>
-    <div class="down-min" v-loading="isLoading">
+    <div class="down-min">
+      <dataLoading :loading="isLoading"/>
+      
       <div class="download-ico">
         <a :href="downloadTemplate" download="模板">
           <i class="icon down_ico"></i>
@@ -180,6 +182,7 @@ export default {
 .dialog-cont {
   max-width: 800px;
   .down-min {
+    position: relative;
     display: flex;
     align-items: center;
     justify-content: center;