修改

dsk-operate-ui/src/views/component/CustomMoneySelect.vue

@@ -249,7 +249,7 @@ export default {
             overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;
-            border-radius: 2px;
+            border-radius: 4px;
           }
         }
       }

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -115,20 +115,20 @@
             value:'集团本身'
           },
           {
-            name:'一级公司',
-            value:'一级公司'
+            name:'一级企业',
+            value:'一级企业'
           },
           {
-            name:'二级公司',
-            value:'二级公司'
+            name:'二级企业',
+            value:'二级企业'
           },
           {
-            name:'三级公司',
-            value:'三级公司'
+            name:'三级企业',
+            value:'三级企业'
           },
           {
-            name:'其他公司',
-            value:'其他公司'
+            name:'其他企业',
+            value:'其他企业'
           },
         ],
         kjxqy:[

dsk-operate-ui/src/views/index.vue

@@ -191,11 +191,39 @@
                 </div>
               </div>
             </div>
-            <div class="pagination-box" v-if="zbTableTotal>queryParams3.pageSize">
-              <el-pagination background :current-page="queryParams3.pageNum" :page-size="queryParams3.pageSize" :total="zbTableTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
+            <div class="pagination-box" v-if="zbTableTotal>queryParams2.pageSize">
+              <el-pagination background :current-page="queryParams2.pageNum" :page-size="queryParams2.pageSize" :total="zbTableTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
             </div>
           </el-tab-pane>
         </el-tabs>
+        <div class="search">
+          <el-form ref="queryForm" :model="queryParams2" :inline="true" size="small">
+            <el-form-item prop="amount">
+              <custom-money-select
+                :moneyList="moneyList"
+                v-model="queryParams2.amount"
+                placeholder="中标金额"
+                @handle-search="changeSelect" />
+            </el-form-item>
+            <el-form-item prop="provinceId">
+              <el-select v-model="queryParams2.provinceId" placeholder="项目地区" style="width: 150px;">
+                <el-option v-for="(item,index) in addressList" :key="index" :label="item.label" :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="projects">
+              <el-select v-model="queryParams2.projects" multiple collapse-tags clearable placeholder="项目类型" :class="queryParams2.projects.length > 1 ? 'selectTag' : ''" style="width: 170px;">
+                <el-option v-for="(item,index) in typeList" :key="index" :label="item" :value="item"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item prop="time">
+              <custom-time-select
+                :timeList="timeList"
+                v-model="queryParams2.time"
+                placeholder="中标日期"
+                @handle-search="changeSelect"/>
+            </el-form-item>
+          </el-form>
+        </div>
       </div>
     </div>
     <!--员工视角-->
@@ -649,14 +677,6 @@ export default {
         pageNum:1,
         pageSize:10
       },
-      queryParams3:{
-        provinceId:'',
-        projects:[],
-        amount:'',
-        time:'',
-        pageNum:1,
-        pageSize:10
-      },
       timeList: ['近三天', '近七天', '近半月', '自定义'],
       moneyList: ['2亿以上', '5亿以上', '10亿以上', '自定义'],
       projectList:[],
@@ -717,6 +737,7 @@ export default {
       this.addressList = str;
     },
     initChart(data) {
+      console.log(data)
       this.$nextTick(()=>{
         let myChart = echarts.init(document.getElementById("zbtj-echarts"))
         let option ={
@@ -1010,6 +1031,7 @@ export default {
       });
     },
     handleClickTab(){
+      this.queryParams2.pageNum=1;
       if(this.activeName === 'first'){
         this.getBigWinningBidsPage()
       }
@@ -1152,6 +1174,7 @@ export default {
             .el-input__inner{
               height: 32px;
               line-height: 32px;
+              border-radius: 4px
             }
           }
 
@@ -1266,6 +1289,7 @@ export default {
       .content_wap3{
         margin-top: 12px;
         background: #ffffff;
+        position:relative;
         ::v-deep .el-tabs{
           .el-tabs__header{
             margin-bottom: 0;
@@ -1290,6 +1314,16 @@ export default {
           }
         }
 
+        .search{
+          position: absolute;
+          right: 8px;
+          top: 10px;
+          ::v-deep .el-form {
+            .el-form-item--small.el-form-item {
+              margin-bottom: 0;
+            }
+          }
+        }
         .list{
           margin: 0 16px;
           .item{

dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue

@@ -74,8 +74,8 @@
             <el-table-column prop="province" label="地区" :formatter="formatStatus" width="100"/>
             <el-table-column prop="count" label="中标数量 (个)" align="right" :formatter="formatStatus" sortable width="130"/>
             <el-table-column prop="countRate" label="数量占比（%）" align="right" :formatter="formatStatus" sortable width="150"/>
-            <el-table-column prop="sumMoney" label="中标总金额 (万元）" align="right" :formatter="formatStatus" width="140"/>
-            <el-table-column prop="moneyRate" label="金额占比（%）" align="right" :formatter="formatStatus"/>
+            <el-table-column prop="sumMoney" label="中标总金额 (万元）" align="right" :formatter="formatStatus" sortable width="170"/>
+            <el-table-column prop="moneyRate" label="金额占比（%）" align="right" :formatter="formatStatus" sortable width="145"/>
           </el-table>
         </div>
       </div>