1.所有搜索样式调整

2.统计分析调整
3.导出word格式调整

src/views/statistic/index.vue

@@ -7,12 +7,12 @@
           <!--  -->
           <div class="tjbox2" v-if="isPieChart">
             <PieChart
-              height="207px"
+              height="285px"
               :data="toolTypeData"
               :legendData="toolTypeLegendData"
               legendBottom="5"
               chartRef="toolType"
-              :radius="50"
+              :radius="['40%', '70%']"
             />
           </div>
         </el-card><!--el-card-->
@@ -22,7 +22,7 @@
           <div slot="header" class="clearfix"><span class="tline">工具状态统计</span></div>
           <div class="tjbox2" v-if="isPieChart">
             <PieChart
-              height="207px"
+              height="285px"
               :data="toolStatusData"
               :legendData="toolStatusLegendData"
               legendBottom="5"
@@ -38,7 +38,7 @@
           <div slot="header" class="clearfix"><span class="tline">工具来源统计</span></div>
           <div class="tjbox2" v-if="isPieChart">
             <PieChart
-              height="207px"
+              height="285px"
               :data="toolSourceData"
               :legendData="toolSourceLegendData"
               legendBottom="5"
@@ -54,13 +54,12 @@
         <el-card>
           <div slot="header" class="clearfix"><span class="tline">工具下载</span></div>
           <div class="tjbox2">
-            <el-form label-width="80px" ref="queryForm">
+            <el-form label-width="70px" ref="queryForm">
               <div class="search">
                 <div class="sl">
                   <el-form-item label="下载时间">
                     <el-date-picker
                       v-model="dateRange"
-                      style="width: 240px"
                       value-format="yyyy-MM-dd"
                       type="daterange"
                       range-separator="-"
@@ -68,6 +67,22 @@
                       end-placeholder="结束日期"
                     ></el-date-picker>
                   </el-form-item>
+                  <el-form-item label="工具编号" prop="toolCode">
+                    <el-input
+                      v-model="queryParams.toolCode"
+                      placeholder="请输入工具编号"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                    />
+                  </el-form-item>
+                  <el-form-item label="工具名称" prop="toolName">
+                    <el-input
+                      v-model="queryParams.toolName"
+                      placeholder="请输入工具名称"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                    />
+                  </el-form-item>
                 </div>
                 <div class="sr">
                   <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -79,9 +94,10 @@
           </div>
           <div class="rt">
             <el-table v-loading="downLoading" :data="toolDownStatList">
+              <el-table-column type="index" label="序号" width="50" />
               <el-table-column label="工具编号" align="center" key="toolCode" prop="toolCode" />
               <el-table-column label="工具名称" align="center" key="toolName" prop="toolName"  :show-overflow-tooltip="true" />
-              <el-table-column label="下载数量" align="center" key="toolDownNum" prop="toolDownNum" width="120" />
+              <el-table-column label="下载次数" align="center" key="toolDownNum" prop="toolDownNum" width="120" />
               <el-table-column
                 label="操作"
                 align="center"
@@ -178,6 +194,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        toolCode: null,
+        toolName: null,
       },
       queryParams1: {
         pageNum: 1,
@@ -207,7 +225,6 @@ export default {
       let self = this
       this.loading = true
       userDownList(this.addDateRange(this.queryParams1)).then(res => {
-        console.info("res=========", res)
         self.total = res?.total
         self.toolDownDetailStatList = res?.rows || []
         self.loading = false
@@ -234,7 +251,6 @@ export default {
       let self = this
       this.downLoading = true
       listCount(this.addDateRange(this.queryParams, this.dateRange)).then(res => {
-        console.info("res=========", res)
         self.total = res?.total
         self.toolDownStatList = res?.rows || []
         self.downLoading = false
@@ -260,25 +276,33 @@ export default {
       self.pageloading = true
 
       getStatistics(this.queryParams).then(res => {
-        console.info("res===========", res)
         if(res.data){
+          const countToolType = JSON.parse(JSON.stringify(res.data.countToolType)).filter(item => item.name)
           //类别
-          self.toolTypeData = JSON.parse(JSON.stringify(res.data.countToolType))
+          self.toolTypeData = countToolType
           self.toolTypeData.forEach(item => {
-            self.toolTypeLegendData.push(item.name)
+            if(item && item.name){
+              self.toolTypeLegendData.push(item.name)
+            }
           })
 
+          const recordStatus = JSON.parse(JSON.stringify(res.data.recordStatus)).filter(item => item.name)
           //状态
-          self.toolStatusData = JSON.parse(JSON.stringify(res.data.recordStatus))
+          self.toolStatusData = recordStatus
           self.toolStatusData.forEach(item => {
-            self.toolStatusLegendData.push(item.name)
+            if(item && item.name){
+              self.toolStatusLegendData.push(item.name)
+            }
+          })
+          const toolSource = JSON.parse(JSON.stringify(res.data.toolSource)).filter(item => item.name)
+          //来源
+          self.toolSourceData = toolSource
+          self.toolSourceData.forEach(item => {
+            if(item && item.name){
+              self.toolSourceLegendData.push(item.name)
+            }
           })
 
-          //来源
-          self.toolSourceData = JSON.parse(JSON.stringify(res.data.toolSource))
-          self.toolSourceData.forEach(item => {
-            self.toolSourceLegendData.push(item.name)
-          })
           self.isPieChart= true
           self.pageloading= false
         }