Преглед изворни кода

feat:添加文案、数据导出添加loading

Signed-off-by: tsz <2417024719@qq.com>
tsz пре 1 година
родитељ
комит
114c01807d

+ 44 - 1
src/web/staticres/dataExport/css/conditions.css

@@ -1279,4 +1279,47 @@ input.sm {
   color: #1d1d1d;
   background-color: #ececec;
 }
-/* E P289数据导出迭代优化 E*/
+/* E P289数据导出迭代优化 E*/
+
+/* loading */
+body .loading_ {
+  height: 100%;
+  width: 100%;
+  position: fixed;
+  background: #382f3d;
+  z-index: 999999999990;
+opacity: .7;
+    margin-top: 20px;
+}
+body .loading_ > p {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  margin: auto;
+  height: 60px;
+  width: 60px;
+  text-align: center;
+  line-height: 60px;
+  font-size: 0.36rem;
+  color: rgba(44, 183, 202, 0.8);
+}
+body .loading_ p span {
+  position: absolute;
+  display: block;
+  height: 40px;
+  width: 40px;
+  margin: 10px;
+  border-radius: 50%;
+  -webkit-box-shadow: 0 2px 3px rgba(44, 183, 202, 0.8);
+  animation: loading_ ease 1s infinite;
+  left: 0;
+  top: 0;
+}
+@keyframes loading_ {
+0% {
+  transform: rotate(0deg); }
+100% {
+  transform: rotate(360deg); }
+}

+ 1 - 1
src/web/templates/frontRouter/pc/collection/sess/index.html

@@ -197,7 +197,7 @@
                       <!-- <i class="j-icon icon-delete-gray" style="width: 24px;height: 24px;"></i> -->
                     </div>
                     <div class="dialog-content">
-                      <span>您选择的数据超过了导出数据最大值<span style="color: #2ABED1;">20,000</span> ,请优化条件后导出。您也可联系客服:400-108-6670 ,或添加<span style="color: #2ABED1;">客服微信</span></span>
+                      <span>您选择的数据超过了导出数据最大值<span style="color: #2ABED1;">20,000</span> ,请优化条件后导出。您也可联系客服:400-108-6670 ,或添加<span style="color: #2ABED1;">客服微信</span><span>进行定制化导出</span></span>
                       <div class="custom-wx"></div>
                       <p style="color: #1D1D1D;">客服微信</p>
                       <button class="continue-export-btn">继续导出20000条</button>

+ 9 - 0
src/web/templates/pc/dataExport_sieve.html

@@ -622,6 +622,9 @@
 </head>
 <body>
 {{include "/common/pchead.html"}}
+<div class="loading_" style="display:none;">
+  <p><span></span></p>
+</div>
 <section id="conditions-box" class="conditions-box w" style="min-height: calc(100vh - 364px);">
     <!-- 数据导出功能文案 -->
     <div class="dataExportFun">
@@ -1377,6 +1380,7 @@
       <span>您选择的数据超过了导出数据最大值20,000,请优化条件后导出。您也可联系客服:400-108-6670 ,或添加</span>
       <div class="custom-service-wx">
         <span class="customWx" style="color: #2ABED1;text-decoration: underline;cursor: pointer;">客服微信</span>
+        <span>进行定制化导出</span>
         <div class="custom-service-wximg" style="display: none;">
           <img class="custom-service-wximg-img" src="" alt="">
           <span style="color: #1D1D1D;margin-top: 8px;">客服微信</span>
@@ -1397,6 +1401,7 @@
       <span>您选择的数据超过了导出数据最大值20,000,请优化条件后导出。您也可联系客服:400-108-6670 ,或添加</span>
       <div class="custom-service-wx">
         <span class="customWx" style="color: #2ABED1;text-decoration: underline;cursor: pointer;">客服微信</span>
+        <span>进行定制化导出</span>
         <div class="custom-service-wximg" style="display: none;">
           <img class="custom-service-wximg-img" src="" alt="">
           <span style="color: #1D1D1D;margin-top: 8px;">客服微信</span>
@@ -3094,6 +3099,7 @@
     })
 
     $("#sieve").click(function () {
+        $('.loading_').show()
         dataNode.loading = true
         $("#sieve").addClass("sussecc");
         $("#reset").removeClass("sussecc");
@@ -3156,6 +3162,7 @@
         setLocalStorage(param);
         // console.log(param);
         $.post("/front/dataExport/sieveData", param, function (res) {
+          $('.loading_').hide()
           if(res.error_code == 0) {
             dataNode._data.dataInfo = res.data
             if(res.data.list) {
@@ -3207,6 +3214,8 @@
               dataNode._data.tableShow = false
               dataNode._data.noDataDialog = true
             }
+          } else {
+            $('.loading_').hide()
           }
         }, 'json');
     });

+ 1 - 1
src/web/templates/pc/supsearch.html

@@ -1760,7 +1760,7 @@
           <!-- <i class="j-icon icon-delete-gray" style="width: 24px;height: 24px;"></i> -->
         </div>
         <div class="dialog-content">
-          <span>您选择的数据超过了导出数据最大值<span style="color: #2ABED1;">20,000</span> ,请优化条件后导出。您也可联系客服:400-108-6670 ,或添加<span style="color: #2ABED1;">客服微信</span></span>
+          <span>您选择的数据超过了导出数据最大值<span style="color: #2ABED1;">20,000</span> ,请优化条件后导出。您也可联系客服:400-108-6670 ,或添加<span style="color: #2ABED1;">客服微信</span><span>进行定制化导出</span></span>
           <div class="custom-wx"></div>
           <p style="color: #1D1D1D;">客服微信</p>
           <button onclick="toPaydataExport()" class="continue-export-btn">继续导出20000条</button>