Merge remote-tracking branch 'origin/feature/phaseOne'

# Conflicts:
#	src/views/modules/workbench/workbench.vue

public/index.html

@@ -35,7 +35,7 @@
   <!-- 开发环境 -->
   <% if (process.env.VUE_APP_NODE_ENV === 'dev') { %>
   <script>
-    window.SITE_CONFIG['apiURL'] = 'http://localhost:9094/epdc-api'
+    window.SITE_CONFIG['apiURL'] = 'https://epdc-yushan.elinkservice.cn/epdc-api'
     // window.SITE_CONFIG['apiURL'] = 'https://epdc-yushan.elinkservice.cn/epdc-api'
     window.SITE_CONFIG['workLogURL'] = 'https://epmet-ext1.pingyin.gov.cn/plugin-wrf' //工作日志引用外链地址
   </script>

src/views/modules/workbench/barOption.js

@@ -44,13 +44,13 @@ export default function getBarOption (xdata, ydata1, ydata2) {
           show: false,
           realtime: true,
           start: 0,
-          end: 50
+          end: 8
       },
       {
           type: 'inside',
           realtime: true,
           start: 0,
-          end: 50
+          end: 8
       }
     ],
     series: [

src/views/modules/workbench/lineOption.js

@@ -44,13 +44,13 @@ export default function getLineOption (xdata, ydata1, ydata2, ydata3) {
           show: false,
           realtime: true,
           start: 0,
-          end: 50
+          end: 7
       },
       {
           type: 'inside',
           realtime: true,
           start: 0,
-          end: 50
+          end: 7
       }
     ],
     series: [

src/views/modules/workbench/workbench.vue

@@ -69,8 +69,8 @@
         <div class="title"><span class="line"></span>数据排行</div>
       </div>
       <div class="chart-box">
-        <div id="chart-bar" :style="{width: '45%', height: '400px'}"></div>
+        <div id="chart-bar" :style="{width: '500px', height: '400px'}"></div>
-        <div id="chart-line" :style="{width: '45%', height: '400px'}"></div>
+        <div id="chart-line" :style="{width: '500px', height: '400px'}"></div>
       </div>
     </el-card>
     <el-card shadow="never" class="aui-card--fill">
@@ -87,15 +87,15 @@
       <div class="data-table">
         <el-table v-loading="dataListLoading" :data="dataList" border style="width: 100%;">
           <el-table-column prop="deptName" label="组织" align="center" min-width="200px"></el-table-column>
-          <el-table-column prop="topicNum" label="话题数" header-align="center" align="center" min-width="200px" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="topicNum" label="话题数" header-align="center" align="center" min-width="120px" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="issueNum" label="议题数" header-align="center" min-width="200px" align="center"></el-table-column>
+          <el-table-column prop="issueNum" label="议题数" header-align="center" min-width="120px" align="center"></el-table-column>
-          <el-table-column prop="itemNum" label="项目数" header-align="center" align="center" min-width="200px" show-overflow-tooltip></el-table-column>
+          <el-table-column prop="itemNum" label="项目数" header-align="center" align="center" min-width="120px" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="itemCaseClosedNum" label="项目结案数" header-align="center" align="center" min-width="200px"></el-table-column>
+          <el-table-column prop="itemCaseClosedNum" label="项目结案数" header-align="center" align="center" min-width="120px"></el-table-column>
-          <el-table-column prop="superviseItemNum" label="督办项目数" header-align="center" min-width="200px" align="center"></el-table-column>
+          <el-table-column prop="superviseItemNum" label="督办项目数" header-align="center" min-width="120px" align="center"></el-table-column>
         </el-table>
         <el-pagination :current-page="page"
                         :page-sizes="[10, 20, 50, 100]"
-                        :page-size="page"
+                        :page-size="limit"
                         :total="total"
                         layout="total, sizes, prev, pager, next, jumper"
                         @size-change="pageSizeChangeHandle"
@@ -163,6 +163,7 @@ export default {
     },
     onRadioChange () {
       this.dataForm.dateType = this.radio
+      this.page = 1
       this.getDataList()
     },
     onQuery () {
@@ -289,10 +290,11 @@ export default {
   margin: 20px 0;
 }
 .data-list .data-item {
-  width: 270px;
+  width: 17%;
   height: 130px;
   display: flex;
   align-items: center;
+  overflow: hidden;
 }
 .data-list .data-item-bg-1 {
   background: url('~@/assets/img/topic.png') no-repeat center center;