Browse Source

去重数据添加

xiuli.gao 2 years ago
parent
commit
6af769f881

+ 1 - 1
index.html

@@ -7,4 +7,4 @@
7 7
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8 8
         var s = document.getElementsByTagName("script")[0];
9 9
         s.parentNode.insertBefore(hm, s);
10
-      })();</script><link href=./static/css/app.47b2566e97f27ba03f24fd9b983aab88.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.e72c0cb61d09cd3a52bd.js></script><script type=text/javascript src=./static/js/app.60585c612ee712eaadd5.js></script></body></html>
10
+      })();</script><link href=./static/css/app.0c65f3fdac8558b67602e15d23556df1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.a94e9d143013c732c5f4.js></script><script type=text/javascript src=./static/js/app.6c91ca6a1a472d822dc5.js></script></body></html>

+ 14 - 8
project/src/components/dataBoard/regRangeReport.vue

@@ -2,26 +2,32 @@
2 2
   <div v-loading="loading">
3 3
     <div class="screenBox flex">
4 4
       <div class="flex">
5
-        <date-picker title="自定义" :quickFlag='true' :afferent_time="default_time" :clearFlag='false' @changeTime="changeTime"></date-picker>
5
+        <date-picker title="自定义" :quickFlag='true' :afferent_time="default_time" :clearFlag='false'
6
+          @changeTime="changeTime"></date-picker>
6 7
       </div>
7
-      <el-button type="primary" size="mini" @click="init(1,'export')">导出Excel</el-button>
8
+      <el-button type="primary" size="mini" @click="init(1, 'export')">导出Excel</el-button>
8 9
     </div>
9
-    <ux-grid style="margin-top:10px" ref="plxTable" :border="false" @row-click="()=>{return}" :header-cell-style="()=>{return { backgroundColor: '#FFFFFF !important', border: 'none!important' }}" :height="height" show-footer-overflow="tooltip" show-overflow="tooltip" size="mini">
10
-      <ux-table-column v-for="item in desCol" :key="item.column" :resizable="true" :field="item.column" :title="item.name" :min-width="item.min_width?item.min_width:120" :fixed="item.column == 'date'?'left':''" align="center">
10
+    <ux-grid style="margin-top:10px" ref="plxTable" :border="false" @row-click="() => { return }"
11
+      :header-cell-style="() => { return { backgroundColor: '#FFFFFF !important', border: 'none!important' } }"
12
+      :height="height" show-footer-overflow="tooltip" show-overflow="tooltip" size="mini">
13
+      <ux-table-column v-for="item in desCol" :key="item.column" :resizable="true" :field="item.column"
14
+        :title="item.name" :min-width="item.min_width ? item.min_width : 140" :fixed="item.column == 'date' ? 'left' : ''"
15
+        align="center">
11 16
         <template #header>
12
-          <div class="flex-align-jus-center">{{item.name}}
17
+          <div class="flex-align-jus-center">{{ item.name }}
13 18
             <el-tooltip v-if="item.notes" :content="item.notes" placement="top">
14 19
               <div><i class="el-icon-question"></i></div>
15 20
             </el-tooltip>
16 21
           </div>
17 22
         </template>
18 23
         <template v-slot="{ row }">
19
-          <span>{{row[item.column]?$formatNum(row[item.column]):'-' }}</span>
24
+          <span>{{ row[item.column] ? $formatNum(row[item.column]) : '-' }}</span>
20 25
         </template>
21 26
       </ux-table-column>
22 27
     </ux-grid>
23
-    <div class="pagination" v-show="total>0">
24
-      <el-pagination background :current-page="page" @current-change="handleCurrentChange" layout="prev, pager, next" :page-count='Number(pages)'>
28
+    <div class="pagination" v-show="total > 0">
29
+      <el-pagination background :current-page="page" @current-change="handleCurrentChange" layout="prev, pager, next"
30
+        :page-count='Number(pages)'>
25 31
       </el-pagination>
26 32
     </div>
27 33
   </div>

File diff suppressed because it is too large
+ 1 - 1
static/css/app.47b2566e97f27ba03f24fd9b983aab88.css


File diff suppressed because it is too large
+ 1 - 1
static/js/43.1b08ae6efd247e5628bc.js


File diff suppressed because it is too large
+ 0 - 1
static/js/42.d285248cfd8ee58dd8fc.js


File diff suppressed because it is too large
+ 1 - 1
static/js/44.c17dc6581010b5604e4e.js


File diff suppressed because it is too large
+ 1 - 0
static/js/44.1c3256930e22e9c99509.js


File diff suppressed because it is too large
+ 1 - 1
static/js/app.60585c612ee712eaadd5.js


File diff suppressed because it is too large
+ 1 - 1
static/js/manifest.e72c0cb61d09cd3a52bd.js