Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/controller/BusinessOpportunityRadarController.java

@@ -190,4 +190,12 @@ public class BusinessOpportunityRadarController {
         ExcelUtils<ImportantProjectExportVo> util = new ExcelUtils<>(ImportantProjectExportVo.class);
         util.exportExcel(response, list, "重点项目", "重点项目导出明细", true);
     }
+
+    /*
+     * 公招市场
+     */
+    @RequestMapping("/bxproPage")
+    public AjaxResult bxproPage(@RequestBody JSONObject object) {
+        return opportunityRadarService.bxproPage(object);
+    }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/BusinessOpportunityRadarService.java

@@ -160,4 +160,9 @@ public class BusinessOpportunityRadarService {
         return result;
 
     }
+
+    public AjaxResult bxproPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/subscription/bxproPage", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
 }

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

@@ -167,6 +167,7 @@
       getYears(){
         getYears({}).then(res => {
           this.yearOptions=res.data.reverse();
+          this.queryParams.year=this.yearOptions[0].year
         })
       },
       //地区

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

@@ -31,8 +31,12 @@
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
               </el-table-column>
               <el-table-column prop="type" label="供应方式" :formatter="formatStatus"/>
-              <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/>
-              <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100"/>
+              <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
+                <template slot-scope="scope">{{ scope.row.count }}个</template>
+              </el-table-column>
+              <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
+                <template slot-scope="scope">{{ scope.row.rate }}%</template>
+              </el-table-column>
             </el-table>
           </div>
         </div>
@@ -70,8 +74,12 @@
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
               </el-table-column>
               <el-table-column prop="type" label="供应方式" :formatter="formatStatus"/>
-              <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/>
-              <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100"/>
+              <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
+                <template slot-scope="scope">{{ scope.row.count }}个</template>
+              </el-table-column>
+              <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
+                <template slot-scope="scope">{{ scope.row.rate }}%</template>
+              </el-table-column>
             </el-table>
           </div>
         </div>
@@ -112,8 +120,12 @@
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
               </el-table-column>
               <el-table-column prop="province" label="地区" :formatter="formatStatus"/>
-              <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/>
-              <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100"/>
+              <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
+                <template slot-scope="scope">{{ scope.row.count }}个</template>
+              </el-table-column>
+              <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
+                <template slot-scope="scope">{{ scope.row.rate }}%</template>
+              </el-table-column>
             </el-table>
           </div>
         </div>
@@ -147,8 +159,12 @@
                 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
               </el-table-column>
               <el-table-column prop="type" label="年份" :formatter="formatStatus"/>
-              <el-table-column prop="count" label="土地交易项目 (个)" align="right" :formatter="formatStatus" sortable/>
-              <el-table-column prop="rate" label="占比（%）" align="right" :formatter="formatStatus" width="100"/>
+              <el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
+                <template slot-scope="scope">{{ scope.row.count }}个</template>
+              </el-table-column>
+              <el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
+                <template slot-scope="scope">{{ scope.row.rate }}%</template>
+              </el-table-column>
             </el-table>
           </div>
         </div>
@@ -789,6 +805,9 @@ export default {
         width: 33%;
         float: right;
         ::v-deep .el-table{
+          .caret-wrapper{
+            width: 13px;
+          }
           .sort-caret.ascending{
             border-bottom-color: rgba(0,129,255,0.5);
           }