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

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFileController.java

@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -81,10 +82,18 @@ public class BusinessFileController extends BaseController {
         try {
             //获取文件名
             String filename = file.getOriginalFilename();
-            //TODO 校验是否上传同名文件
             String businessFileName = request.getHeader("FilePath");
             // 上传文件路径
             String filePath = RuoYiConfig.getUploadPath() + businessFileName + "/";
+
+            //校验是否上传同名文件
+            File newFile = new File(filePath);
+            // 获取当前目录下的文件和文件夹
+            File[] files = newFile.listFiles();
+            for (File allFile : files) {
+                if(filename.equals(allFile.getName())) return error("文件已存在");
+            }
+
             // 上传并返回文件全路径
             String fileName = FileUploadUtils.upload(filePath, file);
             String url = serverConfig.getUrl() + fileName;

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/BusinessOpportunityRadarController.java

@@ -3,6 +3,7 @@ package com.dsk.web.controller.search.controller;
 import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.common.dtos.Page;
 import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
 import com.dsk.web.controller.search.service.MarketAnalysisService;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,32 +30,48 @@ public class BusinessOpportunityRadarController {
      * 公招标讯
      */
     @RequestMapping("/jskBidPage")
-    public AjaxResult jskBidPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.jskBidPage(compose);
+    public AjaxResult jskBidPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.jskBidPage(object);
     }
 
     /*
      * 土地交易
      */
     @RequestMapping("/landMarketPage")
-    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.landMarketPage(compose);
+    public AjaxResult landMarketPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.landMarketPage(object);
     }
 
     /*
      * 拟建项目
      */
     @RequestMapping("/establishmentPage")
-    public AjaxResult establishmentPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.establishmentPage(compose);
+    public AjaxResult establishmentPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.establishmentPage(object);
     }
 
     /*
      * 开标记录
      */
     @RequestMapping("/jskBidTenderPage")
-    public AjaxResult jskBidTenderPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.jskBidTenderPage(compose);
+    public AjaxResult jskBidTenderPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.jskBidTenderPage(object);
     }
 
 
@@ -62,8 +79,12 @@ public class BusinessOpportunityRadarController {
      * 标讯pro
      */
     @RequestMapping("/jskBidNewsPage")
-    public AjaxResult jskBidNewsPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.jskBidNewsPage(compose);
+    public AjaxResult jskBidNewsPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.jskBidNewsPage(object);
     }
 
 
@@ -71,16 +92,24 @@ public class BusinessOpportunityRadarController {
      * 专项债查询
      */
     @RequestMapping("/bondProjectPage")
-    public AjaxResult bondProjectPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.bondProjectPage(compose);
+    public AjaxResult bondProjectPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.bondProjectPage(object);
     }
 
     /*
      * 投标计划查询
      */
     @RequestMapping("/jskBidPlanPage")
-    public AjaxResult jskBidPlanPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.jskBidPlanPage(compose);
+    public AjaxResult jskBidPlanPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.jskBidPlanPage(object);
     }
 
     /*
@@ -103,7 +132,11 @@ public class BusinessOpportunityRadarController {
      * 招标来源网站
      */
     @RequestMapping("/bidSourceList")
-    public AjaxResult bidSourceList(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.bidSourceList(compose);
+    public AjaxResult bidSourceList(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.bidSourceList(object);
     }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java

 package com.dsk.web.controller.search.controller;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
@@ -25,8 +26,12 @@ public class CompanySearchController {
      * 模糊查询企业名称
      */
     @RequestMapping("/index")
-    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
-        return opportunityRadarService.enterpriseIndex(compose);
+    public AjaxResult landMarketPage(@RequestBody JSONObject object) {
+        ComposeQueryDto compose = JSONObject.parseObject(object.toJSONString(), ComposeQueryDto.class);
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
+        return opportunityRadarService.enterpriseIndex(object);
     }
 
     /*
@@ -42,6 +47,9 @@ public class CompanySearchController {
      */
     @PostMapping("/page")
     public AjaxResult page(@RequestBody ComposeQueryDto compose) {
+        if (PageQueryLimit.pageLimit(compose.getPage())){
+            return AjaxResult.error("翻页已达到上限");
+        }
         compose.getPage().setPage(compose.getPageNum());
         compose.getPage().setLimit(compose.getPageSize());
         compose.getPage().setField(compose.getField());

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/PageQueryLimit.java

+package com.dsk.web.controller.search.controller;
+
+import com.dsk.common.dtos.Page;
+
+/**
+ * @author lc
+ * @date 2023/6/20 17:48
+ */
+public class PageQueryLimit {
+
+    public static boolean pageLimit(Page page){
+        if (null == page) {
+            return true;
+        }
+        if (null==page.getLimit()||null==page.getPage()){
+            return true;
+        }
+        if ( page.getPage()*page.getLimit()>10000){
+            return true;
+        }
+        return false;
+    }
+}

dsk-admin/src/main/java/com/dsk/web/controller/search/service/BusinessOpportunityRadarService.java

@@ -12,29 +12,30 @@ import com.dsk.common.dtos.ComposeQueryDto;
 public interface BusinessOpportunityRadarService {
 
 
-    AjaxResult jskBidNewsPage(ComposeQueryDto compose);
-    AjaxResult jskBidTenderPage(ComposeQueryDto compose);
+    AjaxResult jskBidNewsPage(JSONObject object);
 
-    AjaxResult jskBidPage(ComposeQueryDto compose);
+    AjaxResult jskBidTenderPage(JSONObject object);
 
-    AjaxResult landMarketPage(ComposeQueryDto compose);
+    AjaxResult jskBidPage(JSONObject object);
 
-    AjaxResult establishmentPage(ComposeQueryDto compose);
+    AjaxResult landMarketPage( JSONObject object);
 
-    AjaxResult enterpriseIndex(ComposeQueryDto compose);
+    AjaxResult establishmentPage(JSONObject object);
+
+    AjaxResult enterpriseIndex(JSONObject object);
 
     AjaxResult enterpriseByName(String keyword);
 
     AjaxResult enterprisePage(ComposeQueryDto compose);
 
-    AjaxResult bondProjectPage(ComposeQueryDto compose);
+    AjaxResult bondProjectPage( JSONObject object);
 
-    AjaxResult jskBidPlanPage(ComposeQueryDto compose);
+    AjaxResult jskBidPlanPage( JSONObject object);
 
     AjaxResult getCapitalSourceSelect();
 
     AjaxResult keywordList();
 
-    AjaxResult bidSourceList(ComposeQueryDto compose);
+    AjaxResult bidSourceList( JSONObject object);
 
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/BusinessOpportunityRadarServiceImpl.java

@@ -26,45 +26,45 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
 
 
     @Override
-    public AjaxResult jskBidNewsPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult jskBidNewsPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/news/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
 
     @Override
-    public AjaxResult jskBidTenderPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidTender/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult jskBidTenderPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidTender/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult establishmentPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/establishment/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult establishmentPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/establishment/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult jskBidPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult jskBidPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/page",object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult landMarketPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/landMarket/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult landMarketPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/landMarket/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult enterpriseIndex(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult enterpriseIndex(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult enterprisePage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page", BeanUtil.beanToMap(compose, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/page",BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -78,14 +78,14 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
     }
 
     @Override
-    public AjaxResult bondProjectPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult bondProjectPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/bondProject/page", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult jskBidPlanPage(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/page", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult jskBidPlanPage(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBidPlan/page",object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
@@ -102,8 +102,8 @@ public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityR
     }
 
     @Override
-    public AjaxResult bidSourceList(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/source", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult bidSourceList(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/jskBid/source",object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

dsk-common/src/main/java/com/dsk/common/dtos/JskBidPlanDto.java

@@ -45,9 +45,13 @@ public class JskBidPlanDto {
 	Double startPlanTenderAmount;
 	Double endPlanTenderAmount;
 	//资金来源
-	String projecetCapitalSource;
+	String projectCapitalSource;
 	//发布时间
 	String issueTime;
+	//计划发布开始时间
+	String planTenderDateStart;
+	//计划发布截止时间
+	String planTenderDateEnd;
 	//来源网站
 	String sourceName;
 

dsk-common/src/main/java/com/dsk/common/dtos/SpecialBondProjectDto.java

@@ -16,6 +16,8 @@ public class SpecialBondProjectDto {
 	String uuid;
 
 	String projectName;
+	//match精确   like模糊
+	String nameType;
 
 	String projectType;
 	//项目总投资

dsk-operate-ui/src/assets/styles/index.scss

@@ -312,7 +312,9 @@ ul, li {
       height: auto !important;
       bottom: 16px;
     }
-
+    .el-table__body tr.current-row > td.el-table__cell{
+      background: none;
+    }
     .caret-wrapper{
       width: 10px;
     }
@@ -342,12 +344,42 @@ ul, li {
           background: #F8FBFF;
         }
       }
+      tr:hover > td.el-table__cell{
+        background: #DCEBFF;
+      }
+    }
+    .el-table__body tr.hover-row > td.el-table__cell{
+      background: #DCEBFF;
     }
     .el-table__fixed{
       tr:nth-child(2n){
         background-color: #F8FBFF;
       }
     }
+    ::-webkit-scrollbar-track-piece {
+      //滚动条凹槽的颜色，还可以设置边框属性
+      background-color: #F3F4F5;
+      height: 16px;
+      padding: 0 4px;
+    }
+    //滚动条的宽度
+    ::-webkit-scrollbar {
+      width: 8px;
+      height: 16px;
+      background-color: #F3F4F5;
+      border-radius: 6px;
+    }
+    //滚动条的滑块
+    ::-webkit-scrollbar-thumb {
+      border-radius: 8px;
+      height: 8px;
+      margin: 0 4px;
+      background: rgba(98,110,126,0.2);
+      border: 4px solid #F3F4F5;
+      &:hover{
+        background: #566380;
+      }
+    }
   }
 }
 

dsk-operate-ui/src/assets/styles/public.css

@@ -570,6 +570,10 @@ select {
 	height: 40px;
 	opacity: 0;
 }
+.el-select-dropdown.is-multiple .el-select-dropdown__item:hover {
+	color: #3181fa;
+}
+
 .select-list {
 	color: #666;
 	line-height: 24px;
@@ -586,6 +590,31 @@ select {
 	background-color: #fff;
 	padding: 6px 0px;
 }
+.select-radio {
+	max-height: 400px;
+	background: #fff;
+}
+
+.select-radio[x-placement^=bottom] {
+	margin-top: 8px;
+}
+.select-radio .select-radio-list {
+	position: relative;
+}
+
+.select-radio .select-radio-icon {
+	position: absolute;
+	top: 8px;
+	right: 4px;
+}
+
+.select-radio .select-radio-picker {
+	opacity: 0;
+	position: absolute;
+	top: -6px;
+	left: 0;
+	width: 0px;
+}
 
 .select-radio::-webkit-scrollbar-thumb {
 	background-color: #b9b9b9 !important;
@@ -681,8 +710,8 @@ select {
 }
 
 .select-list .el-radio .el-radio__label:hover {
-	/* color: #0381fa;
-	background: #f2f7ff; */
+	color: #0381fa;
+	background: #f2f7ff;
 }
 
 .select-list .el-radio__input.is-checked+.el-radio__label {
@@ -1074,4 +1103,26 @@ select {
 	color: #B589DB;
 }
 
+.performance_other_select.el-select-dropdown.el-popper .el-select-dropdown__wrap.el-scrollbar__wrap {
+	max-height: 274px;
+}
+
+.performance_other_select .el-scrollbar {
+	display: block !important;
+}
 
+.performance_other_select .performance_source_name_ipt {
+	margin: 10px 20px;
+	width: 300px;
+}
+
+.performance_pagination_wrap {
+	border-top: 1px solid #EFEFEF;
+	padding-right: 6px;
+	padding-bottom: 16px;
+	margin-bottom: 24px;
+}
+
+.performance_pagination_wrap .common-pagination {
+	margin-top: 16px;
+}

dsk-operate-ui/src/assets/styles/ruoyi.scss

@@ -252,6 +252,19 @@
 	height: 120px;
 }
 
+.userInfo-avatar {
+  display: inline-block;
+  cursor: pointer;
+  width: 120px;
+  height: 120px;
+  line-height: 120px;
+  text-align: center;
+  background: #E3EEF9;
+  font-size: 48px;
+  color: #0081FF;
+  border-radius: 50%;
+}
+
 .avatar-upload-preview {
 	position: relative;
 	top: 50%;

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -8,8 +8,8 @@
       <i class="menu-line" />
       <el-dropdown class="avatar-container" trigger="hover">
         <div class="flex-box avatar-wrapper">
-          <img v-if="avatar" class="pic-avatar" src="@/assets/images/avatar.png">
-          <span v-else class="user-avatar">{{ name&&name.slice(0, 1) }}</span>
+          <img v-if="avatar" class="pic-avatar" :src="avatar">
+          <span v-else class="user-avatar">{{ name&&name.slice(0, 1).toUpperCase() }}</span>
           {{ name }}
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">

dsk-operate-ui/src/store/modules/user.js

@@ -55,7 +55,7 @@ const user = {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
           const user = res.user
-          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
+          const avatar = user.avatar ? process.env.VUE_APP_BASE_API + user.avatar : '';
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
             commit('SET_ROLES', res.roles)
             commit('SET_PERMISSIONS', res.permissions)

dsk-operate-ui/src/views/detail/party-a/component/Tables.vue

@@ -62,7 +62,7 @@
         </template>
       </el-table>
     </div>
-    <div class="pagination-box" v-if="paging">
+    <div class="pagination-box" v-if="paging && tableDataTotal>queryParams.pageSize">
       <el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
     </div>
   </div>

dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue

@@ -32,6 +32,9 @@
                 {{ scope.row.projectName }}
               </span>
             </template>
+            <template slot="investmentAmount" slot-scope="scope">
+                {{ numbers(scope.row.investmentAmount) }}
+            </template>
           </tables>
 
         </template>
@@ -155,13 +158,13 @@ export default {
       forData: [
         {label: '项目名称', prop: 'projectName', slot: true},
         {label: '项目阶段', prop: 'projectStage', width: '120'},
-        {label: '投资金额(万元)', prop: 'investmentAmount', width: '140'},
+        {label: '投资金额(万元)', prop: 'investmentAmount', width: '140', slot: true},
         {label: '项目状态', prop: 'status', width: '90'}
       ],
       formData: [
         { type: 1, fieldName: 'projectStage', value: '', placeholder: '项目阶段', options: []},
         { type: 1, fieldName: 'status', value: '', placeholder: '项目状态', options: []},
-        { type: 3, fieldName: 'projectName', value: '', placeholder: '输入项目名称关键字搜索'},
+        { type: 3, fieldName: 'projectName', width:'200', value: '', placeholder: '输入项目名称关键字搜索'},
       ],
       stageOptions:[],
       statusOptions:[],
@@ -363,6 +366,10 @@ export default {
     closeDetail(){
       this.isDetailId = false
       this.detailId = ''
+    },
+    // 转科学计算
+    numbers(v){
+      return new Number(v);
     }
 
   }

dsk-operate-ui/src/views/detail/party-a/financial/index.vue

@@ -34,7 +34,7 @@
       <div class="flex-box zwqk-box">
         <div class="zwqk-info">
           <div class="zwqk-title">总负债</div>
-          <div class="zwqk-amount"><span>{{financialDetail.totalLiabilities?saveFixed(financialDetail.totalLiabilities):'0'}}</span>亿元</div>
+          <div class="zwqk-amount"><template v-if="financialDetail.totalLiabilities"><span>{{saveFixed(financialDetail.totalLiabilities)}}</span>亿元</template><template v-else><span>--</span></template></div>
           <div class="zwqk-pro">资产负债率 {{financialDetail.tdr?saveFixed(financialDetail.tdr)+'%':'--'}}</div>
           <img src="@/assets/images/detail/financial/zwqk_bg_ico.png">
         </div>
@@ -170,7 +170,6 @@ export default {
           item.amount = zjqkObj[Object.keys(zjqkObj)[index]]
         })
         this.echartsData = [
-          { value: res.data.uipInterestBearingDebt, name: '有息债务' },
           { value: res.data.econData_002, name: '有息债务/总债务' },
           { value: res.data.ofcb, name: '综合融资成本' },
           { value: res.data.ebitdaIcr, name: 'EBITDA保障倍数' }
@@ -185,7 +184,11 @@ export default {
       //配置图表
       let option = {
         tooltip: {
-          trigger: 'item'
+          trigger: 'item',
+          formatter: function (a, b) {
+            let radius = "<span style='display: inline-block; background: "+a.color+"; width:12px; height:12px; border-radius: 50%; margin-right: 6px;'></span>"
+            return radius+a.name +' '+ (a.percent).toFixed(2) + '%'
+          }
         },
         grid: {
           left:"0",

dsk-operate-ui/src/views/detail/party-a/overview/component/busclue.vue

@@ -124,6 +124,8 @@ export default {
       this.typeList.forEach((item, index) => {
         item.count = this.statistic[item.category]?this.statistic[item.category][item.field]:0
       })
+      this.typeList[2].count = 10 //写死代表有数据，英文统计里面没这项
+      this.typeList[3].count = 10 //写死代表有数据，英文统计里面没这项
     },
     handleType(it, idx){
       if(it.count){

dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue

@@ -65,7 +65,7 @@
         </div>
       </div>
       <div class="company-menu">
-        <el-button v-if="ifClaim==1" class="hasClaim" v-loading="claimLoading"><i class="el-ico-claim" alt="已认领" title="已认领"></i> 已认领</el-button>
+        <el-button v-if="ifClaim==1" class="hasClaim"><i class="el-ico-claim" alt="已认领" title="已认领"></i> 已认领</el-button>
         <el-button @click="handleClaim" v-else class="claim" v-loading="claimLoading"><i class="el-ico-claim" alt="认领客户" title="认领客户"></i> 认领客户</el-button>
       </div>
 
@@ -182,7 +182,7 @@ export default {
         this.claimLoading = true
         let param = {companyId:this.companyId, uipId:this.companyInfo.uipId, companyName:this.companyInfo.companyName}
         let res = await claim(param)
-        this.tableLoading = false
+        this.claimLoading = false
         if(res.code==200){
           this.dialogVisible=true
           this.ifClaim = 1

dsk-operate-ui/src/views/detail/party-a/overview/component/risk.vue

@@ -119,7 +119,8 @@ export default {
       }).reduce((prev, cur) => prev + cur)
       this.viewData = this.viewData.map(item => {
         let number = this.statistic[item.category]&&this.statistic[item.category][item.field]?this.statistic[item.category][item.field]:0
-        let it = {name:item.name, value:number, tz: '', bl:parseFloat(Number(Number(number)/Number(totalVal)*100).toFixed(2))+'%'}
+        let bl = number ? parseFloat(Number(Number(number)/Number(totalVal)*100).toFixed(2)) : 0
+        let it = {name:item.name, value:number, tz: '', bl:bl+'%'}
         return it
       })
       this.viewData.sort((a, b) => {
@@ -141,7 +142,7 @@ export default {
             if(params.data.tz){
               result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;" >'+ params.data.tz +'亿元</p>'
             }
-            result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.bl +'%</p>'
+            result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.bl+'</p>'
             return result;
           },
           extraCssText:'width:150px!important;',

dsk-operate-ui/src/views/detail/party-a/overview/component/tender.vue

@@ -4,7 +4,7 @@
       <div class="common-title">招标公告</div>
       <template v-if="zbggList.length>0">
         <div class="tender-item" v-for="(item, index) in zbggList" :key="index">
-          <div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Bidding/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.tenderStage=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.tenderStage}}</span></div>
+          <div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Tender/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.projectCategory=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.projectCategory}}</span></div>
           <span class="tender-time">{{item.issueTime}}</span>
         </div>
       </template>

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue

@@ -74,7 +74,7 @@
                 </template>
               </div>
             </div>
-            <div class="item">
+            <div class="item" v-if="false">
               <span class="wrap_label">开发区类别</span>
               <div class="item_ckquery">
                 <span :class="{color_text:queryParams.developmentZone.length == 0}" @click="changeBeCurrent('','developmentZone')">全部</span>
@@ -427,7 +427,7 @@ export default {
       box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.1);
       border-radius: 4px;
       width: 880px;
-      height: 337px;
+      //height: 337px;
       padding: 16px;
       position: absolute;
       top: 25px;

dsk-operate-ui/src/views/detail/party-b/index.vue

@@ -24,7 +24,6 @@ export default {
   created() {
     if (this.$route.params.id) { // 获取companyId
       this.loading = true
-      // this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?ak=${this.ak}`
       if(this.$route.name=='Company'){  //企业详情
         this.src = `${this.domain}/enterprise/${this.$route.params.id}?ak=${this.ak}`
       }
@@ -60,6 +59,10 @@ export default {
           if (data.clientHeight) {
             window.scrollTo(sc, sc - 30)
           }
+          // 点击下拉子标签动态设置滚动高度
+          if (data.initHeight || data.initHeight===0) {
+            window.scrollTo(sc, data.initHeight)
+          }
         }
       })
     },

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -2,9 +2,8 @@
   <div>
 	  <div class="content">
 	  	<div class="content_item">
-	  	    <div class="label">项目名称</div>
 	  	   <div class="content_right item_ckquery_list">
-	  	       <el-input class="ename_input" placeholder="请输入项目名称关键字" v-model="keys" >
+	  	       <el-input class="ename_input" placeholder="请输入企业名称关键字" v-model="keys" >
 	  	   		<div slot="append" class="btn-search" @click="search">搜索</div>
 	  	   	</el-input>
 	  	      
@@ -12,7 +11,7 @@
 	  	</div>
 		
 		<div class="content_item">
-		    <div class="label">基本信息</div>
+		    <div class="label">企业地区</div>
 		    <div class="content_right item_ckquery_list">
 		       <div class="select-popper" >
 		         <span :class="{color_text:jskBidQueryDto.provinceIds.length ||jskBidQueryDto.cityIds.length ||jskBidQueryDto.areaIds.length,}">
@@ -111,7 +110,7 @@
 	  	<div class="bottomlist-title">
 			<div class="bottomlist-title-left" >
 				<p class="title-left">
-					项目明细
+					查询结果列表
 				</p>
 				<el-popover v-model="fieldshow" placement="bottom-start" trigger="click"
 					popper-class="viewlist-el-popover">
@@ -145,7 +144,7 @@
 	  	  <el-table :data="tableData" :header-cell-style="{ background:'#F0F3FA'}"  element-loading-text="Loading" border  highlight-current-row>
 	  			<el-table-column type="index" label="序号" width="60">
 	  			 <template slot-scope="scope">
-	  			 	<span>{{(pageNum - 1) *10 + scope.$index + 1}}</span>
+	  			 	<span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
 	  			 </template>
 	  			</el-table-column>
 	  			<el-table-column  label="公司名称" width="430" >
@@ -277,7 +276,12 @@
 												  	{{scope.row.accountsReceivable||"--"}}
 											</template>
 								 </el-table-column>
-								 <el-table-column  label="公益性&准公益性主营占比" width="168" >
+								 <el-table-column  label="其他应收款（亿元）" width="132" >
+								 			<template slot-scope="scope">
+								 				  	{{scope.row.otherReceivable||"--"}}
+								 			</template>
+								  </el-table-column>
+								 <el-table-column  label="公益性&准公益性主营占比(%)" width="188" >
 								 			<template slot-scope="scope">
 								 				  	{{scope.row.econData_001||"--"}}
 								 			</template>
@@ -302,7 +306,7 @@
 									 				  	{{scope.row.belongNetProfit||"--"}}
 									 			</template>
 									  </el-table-column>
-									  <el-table-column  label="净资产收益率" width="96" >
+									  <el-table-column  label="净资产收益率(%)" width="136" >
 									  			<template slot-scope="scope">
 									  				  	{{scope.row.roe||"--"}}
 									  			</template>
@@ -332,27 +336,27 @@
 										 				  	{{scope.row.uipInterestBearingDebt||"--"}}
 										 			</template>
 										  </el-table-column>
-										  <el-table-column  label="有息债务/总负债" width="114" >
+										  <el-table-column  label="有息债务/总负债(%)" width="134" >
 										  			<template slot-scope="scope">
 										  				  	{{scope.row.econData_002||"--"}}
 										  			</template>
 										   </el-table-column>
-										   <el-table-column  label="综合融资成本" width="96" >
+										   <el-table-column  label="综合融资成本(%)" width="116" >
 										   			<template slot-scope="scope">
 										   				  	{{scope.row.ofcb||"--"}}
 										   			</template>
 										    </el-table-column>
-										<el-table-column  label="现金比率" width="72" >
+										<el-table-column  label="现金比率(%)" width="92" >
 													<template slot-scope="scope">
 														  	{{scope.row.cashRatio||"--"}}
 													</template>
 										</el-table-column>
-										<el-table-column  label="现金流量比率" width="96" >
+										<el-table-column  label="现金流量比率(%)" width="116" >
 													<template slot-scope="scope">
 														  	{{scope.row.cashFlowRatio||"--"}}
 													</template>
 										</el-table-column>
-										<el-table-column  label="现金到期债务比" width="112" >
+										<el-table-column  label="现金到期债务比(%)" width="132" >
 													<template slot-scope="scope">
 														  	{{scope.row.cashDebtRatio||"--"}}
 													</template>
@@ -362,7 +366,7 @@
 														  	{{scope.row.creditBalance||"--"}}
 													</template>
 										</el-table-column>
-										<el-table-column  label="授信余额/全部债务" width="126" >
+										<el-table-column  label="授信余额/全部债务(%)" width="146" >
 													<template slot-scope="scope">
 														  	{{scope.row.econData_003||"--"}}
 													</template>
@@ -372,17 +376,17 @@
 														  	{{scope.row.ebitdaIcr||"--"}}
 													</template>
 										</el-table-column>
-										<el-table-column  label="私募债余额占比" width="108" >
+										<el-table-column  label="私募债余额占比(%)" width="128" >
 													<template slot-scope="scope">
 														  	{{scope.row.ppnBalanceProp||"--"}}
 													</template>
 										</el-table-column>
-										<el-table-column  label="一年内到期债权占比" width="132" >
+										<el-table-column  label="一年内到期债权占比(%)" width="152" >
 													<template slot-scope="scope">
 														  	{{scope.row.econData_004||"--"}}
 													</template>
 										</el-table-column>
-										<el-table-column  label="债券余额/有息债务" width="132" >
+										<el-table-column  label="债券余额/有息债务(%)" width="152" >
 													<template slot-scope="scope">
 														  	{{scope.row.econData_005||"--"}}
 													</template>
@@ -392,7 +396,7 @@
 														  	{{scope.row.loan||"--"}}
 													</template>
 										</el-table-column>
-										<el-table-column  label="借款/有息债务" width="102" >
+										<el-table-column  label="借款/有息债务(%)" width="122" >
 													<template slot-scope="scope">
 														  	{{scope.row.econData_006||"--"}}
 													</template>
@@ -402,7 +406,7 @@
 														  	{{scope.row.nonStandardBalance||"--"}}
 													</template>
 										</el-table-column>
-										<el-table-column  label="非标余额/有息债务" width="132" >
+										<el-table-column  label="非标余额/有息债务(%)" width="152" >
 													<template slot-scope="scope">
 														  	{{scope.row.nonStandardRatio||"--"}}
 													</template>
@@ -412,9 +416,9 @@
 														  	{{scope.row.guaranteeAmount||"--"}}
 													</template>
 										</el-table-column>
-										<el-table-column  label="对外担保比例" width="96" >
+										<el-table-column  label="对外担保比例(%)" width="116" >
 													<template slot-scope="scope">
-														  	{{scope.row.guaranteeAmount||"--"}}
+														  	{{scope.row.guaranteeRatio||"--"}}
 													</template>
 										</el-table-column>
 										<el-table-column  label="所属开发区" width="84" >
@@ -610,11 +614,12 @@ export default {
     			this.domicile.push(arr[i].label);
     		}
     	}
-    	var obj = JSON.parse(JSON.stringify(this.landMarketDto));
+    	var obj = JSON.parse(JSON.stringify(this.jskBidQueryDto));
     	obj.provinceIds = provinceIds;
     	obj.cityIds = cityIds;
     	obj.areaIds = areaIds;
-    	this.landMarketDto = obj;
+    	this.jskBidQueryDto = obj;
+		this.search();
     },
     
    
@@ -677,16 +682,16 @@ export default {
     },
    
 	checkuipExecutivebtn(val){
-		if(val){
 		this.uipExecutiveText =[];
-		}
+		this.checkuipExecutive=true;
+		this.search();
 		
 	},
 	uipExecutiveLevelbtn(val){
 		if(val.length>0){
 			this.checkuipExecutive=false;
 		}else if(val.length==0){
-			this.checkuipExecutive=true;
+			this.checkuipExecutive==true;
 		}
 		this.search();
 		
@@ -947,8 +952,11 @@ export default {
 	               margin-right: 20px;
 				  ::v-deep  .el-input-group__append{
 					   cursor: pointer;
+					   padding: 0px;
 					   .btn-search{
+						   width: 70px;
 						   color: #0081ff;
+						   text-align: center;
 					   }
 				   }
 	           }

dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue

@@ -4,7 +4,7 @@
 		<div class="content">
 			<div class="content_item">
 			    <div class="content_right item_ckquery_list">
-			        <el-input class="ename_input" placeholder="请输入项目名称关键字" v-model="ename" @input="projectNamebtn('ename',ename,'关键字:')">
+			        <el-input class="ename_input" placeholder="请输入关键字，如企业名称、统一社会信用代码等" v-model="ename" @input="projectNamebtn('ename',ename,'关键字:')">
 						<div slot="append" class="btn-search" @click="submitbtn">搜索</div>
 					</el-input>
 			        <template v-if="ename">
@@ -48,9 +48,9 @@
 			    </div>
 			</div>
 			<div class="content_item content_item1">
-			    <div class="label">更多选项</div>
+			    <div class="label">更多筛选</div>
 			    <div class="content_right ">
-					<div class="select-popper">
+					<!-- <div class="select-popper">
 						<div class=" " :class="regionWeb.length>0?'select-active':''">
 							备案网站{{regionWeb.length>0?(regionWeb.length+'项'):''}}
 							<i class="el-icon-caret-bottom"></i>
@@ -63,7 +63,7 @@
 							</el-option>
 					
 						</el-select>
-					</div>
+					</div> -->
 					<div class="select-popper">
 						<el-dropdown trigger="click" placement='bottom-start' >
 							<div class="el-dropdown-link " :class="filePlaceCode?'select-active':''">
@@ -136,7 +136,7 @@
 					
 						</el-dropdown>
 					</div>
-					<div class="select-popper">
+					<!-- <div class="select-popper">
 						<el-dropdown trigger="click" placement='bottom-start'>
 							<div class="el-dropdown-link " :class="hasPhone?'select-active':''">
 								有无联系电话{{hasPhone?' 1项':''}}
@@ -153,8 +153,8 @@
 							</el-dropdown-menu>
 					
 						</el-dropdown>
-					</div>
-					<div class="select-popper">
+					</div> -->
+					<!-- <div class="select-popper">
 						<el-dropdown trigger="click"  placement='bottom-start'>
 							<div class="el-dropdown-link " :class="hasLiceCert!=''?'select-active':''">
 								<span>建筑安许证{{hasLiceCert!=''?' 1项':''}}</span>
@@ -170,7 +170,7 @@
 							</el-dropdown-menu>
 					
 						</el-dropdown>
-					</div>
+					</div> -->
 					<div class="select-popper">
 						<div class=" " :class="systemValue.length>0?'select-active':''">
 							管理体系认证{{systemValue.length>0?(systemValue.length+'项'):''}}
@@ -280,7 +280,7 @@
 							<el-dropdown-menu slot="dropdown" class="dropdown-list-radio">
 								<template v-for=" (item,i)  in registeredAssets">
 									<el-dropdown-item v-if='item.value!="自定义"'
-										:class="item.value==registeredAssetsText?'colort_ext ':''"
+										:class="item.value==registeredAssetsText?'color_text ':''"
 										:command="{'value':item.value,'key':'注册资本','label':item.label}">
 										<p @click="registeredAssetsText=item.value">
 											{{item.value}}
@@ -288,9 +288,9 @@
 									</el-dropdown-item>
 									<el-dropdown-item v-else command="自定义" style="padding: 0px;">
 										<div @mouseenter="showHandleNumber = true"
-											:class="registeredAssetsText=='自定义'?'colort_ext':''" style="padding: 0px  20px;"
+											:class="registeredAssetsText=='自定义'?'color_text':''" style="padding: 0px  20px;"
 											@mouseleave="showHandleNumber = false">
-											<span :class="registeredAssetsText=='自定义'?'colort_ext':''">
+											<span :class="registeredAssetsText=='自定义'?'color_text':''">
 												自定义<i class="el-icon-arrow-right" style="padding-left: 24px;"></i>
 											</span>
 											<div class="jabph_popper_box" style="position:absolute;left: 124px;"
@@ -324,7 +324,7 @@
 							<el-dropdown-menu slot="dropdown" class="dropdown-list-radio">
 								<template v-for=" (item,i)  in registeredAssets">
 									<el-dropdown-item v-if='item.value!="自定义"'
-										:class="item.value==actualCapi?'colort_ext ':''"
+										:class="item.value==actualCapi?'color_text ':''"
 										:command="{'value':item.value,'key':'实缴资本','label':item.label}">
 										<p @click="actualCapi=item.value">
 											{{item.value}}
@@ -332,9 +332,9 @@
 									</el-dropdown-item>
 									<el-dropdown-item v-else command="自定义" style="padding: 0px;">
 										<div @mouseenter="showHandleNumber = true"
-											:class="actualCapi=='自定义'?'colort_ext':''" style="padding: 0px  20px;"
+											:class="actualCapi=='自定义'?'color_text':''" style="padding: 0px  20px;"
 											@mouseleave="showHandleNumber = false">
-											<span :class="actualCapi=='自定义'?'colort_ext':''">
+											<span :class="actualCapi=='自定义'?'color_text':''">
 												自定义<i class="el-icon-arrow-right" style="padding-left: 24px;"></i>
 											</span>
 											<div class="jabph_popper_box" style="position:absolute;left: 124px;"
@@ -373,7 +373,7 @@
 							<el-dropdown-menu slot="dropdown" class="dropdown-list-radio">
 								<template v-for=" (item,i)  in InsuredNumList">
 									<el-dropdown-item v-if='item.value!="自定义"'
-										:class="item.value==InsuredNumText?'colort_ext ':''"
+										:class="item.value==InsuredNumText?'color_text ':''"
 										:command="{'value':item.value,'key':'社保人数','label':item.label}">
 										<p @click="InsuredNumText=item.value">
 											{{item.value}}
@@ -381,9 +381,9 @@
 									</el-dropdown-item>
 									<el-dropdown-item v-else command="自定义" style="padding: 0px;">
 										<div @mouseenter="showHandleNumber = true"
-											:class="InsuredNumText=='自定义'?'colort_ext':''" style="padding: 0px  20px;">
+											:class="InsuredNumText=='自定义'?'color_text':''" style="padding: 0px  20px;">
 											<!-- @mouseleave="showHandleNumber = false" -->
-											<span :class="InsuredNumText=='自定义'?'colort_ext':''">
+											<span :class="InsuredNumText=='自定义'?'color_text':''">
 												自定义<i class="el-icon-arrow-right" style="padding-left: 24px;"></i>
 											</span>
 											<div class="jabph_popper_box" style="position:absolute;left: 124px;"
@@ -777,6 +777,10 @@
 					{
 						value: '1',
 						label: '是高新企业'
+					},
+					{
+						value: '0',
+						label: '不是高新企业'
 					}
 
 				],
@@ -1407,7 +1411,7 @@
 			 }).catch(error=>{
 			            this.optionss = aptitudeCode;
 			 });
-			 
+			 this.getRegionWebList();
 			  this.getaddressList();
 			  this.submitbtn();
 			
@@ -1642,20 +1646,10 @@
 			getRegionWebList(){
 				api.searchDic().then(res=>{
 				          if (res) {
-				          	this.regionWebList = res
-				          } else {
-				          	api.regionWebList().then(res=>{
-				          	          if (res) {
-				          	          	this.regionWebList = res
-				          	          } 
-				          	})
+				          	this.regionWebList = res.regionWeb;
 				          } 
 				}).catch(error=>{
-				　　     api.regionWebList().then(res=>{
-				          	          if (res) {
-				          	          	this.regionWebList = res
-				          	          } 
-				          	})
+					
 				});
 
 			},
@@ -2597,9 +2591,9 @@
 			reset() {
 
 				Object.assign(this.$data, this.$options.data()) //重置data
-				this.$axios.get('https://files.jiansheku.com/file/json/common/aptitudeCode.json').then(res => {
-								if (res && res.status == 200) {
-									this.optionss = res.data;
+				api.aptitudeCode().then(res=>{
+				          if (res) {
+				          	this.optionss = res;
 				          
 				          } else {
 				          	this.optionss = aptitudeCode;
@@ -2607,8 +2601,8 @@
 				          }
 				}).catch(error=>{
 				           this.optionss = aptitudeCode;
-				　　
 				});
+				
 				this.getaddressList();
 				this.getRegionWebList();
 				

dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue

@@ -36,11 +36,11 @@
           <el-table-column label="产业类型" prop="projectType"></el-table-column>
           <el-table-column :label="oneYear">
             <el-table-column prop="money" label="金额（亿元）" sortable> </el-table-column>
-            <el-table-column prop="rate" label="占比"> </el-table-column>
+            <el-table-column prop="rate" label="占比（%）"> </el-table-column>
           </el-table-column>
           <el-table-column :label="twoYear">
             <el-table-column prop="lastMoney" label="金额（亿元）"> </el-table-column>
-            <el-table-column prop="lastRate" label="占比" > </el-table-column>
+            <el-table-column prop="lastRate" label="占比（%）" > </el-table-column>
           </el-table-column>
         </el-table>
       </div>
@@ -166,6 +166,7 @@ export default {
             return result
           },
         },
+        color:['#547FF7', '#63B6EA', '#93A1FF','#60C585','#FF956A','#F6BE5F','#946AFF','#36A860','#7781DD','#E372C6','#F7A396','#3BAAA9','#3F8DB1','#329857','#4A6DCD','#E75E5C','#BE59A4','#FFC094','#7B65DF','#FB8BA7','#CB9EFF'],
         series: [
           {
             type: 'treemap',

dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue

@@ -358,7 +358,6 @@ export default {
         },
         grid: {
           top:20,
-          // left:15,
           // right:15,
           bottom:0,
         },
@@ -608,6 +607,7 @@ export default {
         },
         grid: {
           top:20,
+          // left:5,
           bottom:0,
         },
         series: [
@@ -621,7 +621,7 @@ export default {
             },
             label: {
               show: true,
-              position: 'top'
+              position: 'top',
             },
             //设置折线颜色和粗细
             lineStyle: {
@@ -722,6 +722,7 @@ export default {
               width: 20px;
               height: 20px;
               margin-left: 22px;
+              margin-bottom: -2px;
             }
           }
           .item-text{
@@ -754,10 +755,10 @@ export default {
           width: 20%;
           line-height: 26px;
           img{
-            width: 12px;
-            height: 12px;
+            width: 16px;
+            height: 16px;
             margin-right: 4px;
-            margin-bottom: -1px;
+            margin-bottom: -4px;
           }
           label{
             font-weight: 700;
@@ -785,6 +786,11 @@ export default {
     }
     .table-item{
       margin-top: 22px;
+      /*::v-deep .el-table {*/
+        /*td.el-table__cell {*/
+          /*border-bottom: 0;*/
+        /*}*/
+      /*}*/
     }
   }
 </style>

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

@@ -110,9 +110,9 @@ export default {
     }
   },
   created() {
-    location({provinceId:'500000'}).then(res => {
-      this.province=res.data.currentProvince.regionName;
-      this.provinceId=res.data.currentProvince.id;
+    location({}).then(res => {
+      this.province=res.data.province;
+      this.provinceId=res.data.provinceId;
       this.querySubmit()
     })
     this.aptitudeCode()
@@ -159,8 +159,10 @@ export default {
         params.aptitudeQueryDto.aptitudeDtoList=aptitudeType
       }
       enterprise(params).then(res => {
+        if(res.code === 200){
           this.tableData=res.data.list;
           this.tableDataTotal=res.data.total;
+        }
       })
     },
     // 重置页数
@@ -187,6 +189,7 @@ export default {
       this.querySubmit()
     },
     handleClick(){
+      console.log(this.activeName)
       this.queryParams.codeStr=[]
       this.aptitudeType='';
       this.queryParams={

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

@@ -52,11 +52,11 @@
               <router-link :to="'/macro/financing/details/'+ scope.row.id" tag="a" class="a-link">{{ scope.row.projectName}}</router-link>
             </template>
           </el-table-column>
-          <el-table-column prop="projectTotalInvestment" label="项目总投资（亿）" :formatter="formatStatus" align="right" sortable="custom" width="155" />
-          <el-table-column prop="projectCapital" label="项目资本金（亿）" :formatter="formatStatus" align="right" sortable="custom"  width="155" />
+          <el-table-column prop="projectTotalInvestment" label="项目总投资（万元）" :formatter="formatStatus" align="right" sortable="custom" width="155" />
+          <el-table-column prop="projectCapital" label="项目资本金（万元）" :formatter="formatStatus" align="right" sortable="custom"  width="155" />
           <el-table-column prop="econData007" label="项目收益倍数（倍）" :formatter="formatStatus" align="right" sortable="custom" width="150" />
           <!--<el-table-column prop="zxz" label="专项债金额（亿）" :formatter="formatStatus" sortable="custom" width="150" />-->
-          <el-table-column prop="specialBondCapital" label="专项债用作资本金（亿）" align="right" sortable="custom" :formatter="formatStatus" width="170" />
+          <el-table-column prop="specialBondCapital" label="专项债用作资本金（万元）" align="right" sortable="custom" :formatter="formatStatus" width="170" />
           <el-table-column prop="projectEntity" :formatter="formatStatus" label="项目主体">
             <!--<template slot-scope="scope">-->
               <!--<router-link :to="'/macro/financing/details/'+ scope.row.projectEntityId" tag="a" class="a-link">{{ scope.row.projectEntity}}</router-link>-->
@@ -174,6 +174,7 @@ export default {
           itemWidth:12,
           pageButtonPosition: 'end',
         },
+        color:['#8A82F3', '#93A1FF', '#63B6EA','#42B393','#8ECF95','#FFDC6B','#FFC08D','#FE9C77','#E8649B','#A151F5'],
         series: [
           {
             type: 'pie',
@@ -310,11 +311,49 @@ export default {
       .box-right{
         float: right;
         ::v-deep .el-table{
+          td.el-table__cell{
+            border-bottom: 0;
+          }
+          tr{
+            &.current-row>td{
+              background-color: initial;
+            }
+            &:nth-child(2n) {
+              background: #F8FBFF;
+            }
+          }
           .el-table__cell{
             height: 40px;
             padding: 0;
             line-height: 40px;
           }
+          ::-webkit-scrollbar-track-piece {
+            //滚动条凹槽的颜色，还可以设置边框属性
+            background-color: #F3F4F5;
+            height: 16px;
+            padding: 0 4px;
+          }
+          //滚动条的宽度
+          ::-webkit-scrollbar {
+            width: 8px;
+            height: 8px;
+            background-color: #F3F4F5;
+            border-radius: 6px;
+          }
+          //滚动条的滑块
+          ::-webkit-scrollbar-thumb {
+            border-radius: 8px;
+            height: 8px;
+            margin: 0 4px;
+            background: rgba(98,110,126,0.2);
+            border: 4px solid rgba(98,110,126,0.2);;
+            &:hover{
+              background: #566380;
+            }
+          }
+          .gutter{
+            background: #f8f8f9;
+          }
         }
       }
     }

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

@@ -237,17 +237,15 @@ export default {
   },
   methods: {
     open(row) {
+      this.dialogVisible = true;
       this.$nextTick(() => {
         this.getDetail(row)
       })
     },
     // 获取明细
     async getDetail(row) {
-      console.log(row)
       getNationalDetails({id:row.id}).then(res => {
-        console.log(res.data)
         this.tableData=res.data;
-        this.dialogVisible = true;
       })
     },
     formatStatus: function(row, column, cellValue) {

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

@@ -12,7 +12,10 @@
           <el-radio label="2">本级</el-radio>
         </el-radio-group>
         <div class="search-box">
-          <span style="cursor: pointer;" @click="handleSearch">筛选<i class="el-icon-caret-bottom" style="color:rgba(35,35,35,0.4);margin-left: 5px"></i></span>
+          <span style="cursor: pointer;" :class="searchState ? 'color':''" @click="handleSearch">筛选
+            <i v-if="searchState" class="el-icon-caret-top" style="color:#0081FF;"></i>
+            <i v-else class="el-icon-caret-bottom" style="color:rgba(35,35,35,0.4);"></i>
+          </span>
           <div v-show="searchState" ref="showContent" class="search-main">
             <div class="item">
               <span class="wrap_label">行政等级</span>
@@ -604,6 +607,9 @@ export default {
           /*cursor: pointer;*/
           color:#232323;
           position: relative;
+          .color{
+            color:#0081FF;
+          }
           .search-main{
             background: #ffffff;
             box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.1);
@@ -635,6 +641,11 @@ export default {
                   cursor: pointer;
                   margin-right: 8px;
                 }
+                span:hover{
+                  background: #F3F4F5;
+                  border-radius: 4px;
+                  color:#232323;
+                }
                 .color_text{
                   background: #F3F4F5;
                   border-radius: 4px;

dsk-operate-ui/src/views/radar/BidRecord/details.vue

@@ -39,7 +39,7 @@
 	
 	
 		<div class="content main5">
-		  <div class="common-title">立项审批</div>
+		  <div class="common-title">参投列表</div>
 		  <div class="table-item">
 		    <el-table
 		      :data="tableData"

dsk-operate-ui/src/views/radar/Bidding/details.vue

@@ -24,15 +24,18 @@
 					<div  class="list-content">
 						<p class="list-content-text">
 							<span>招采单位：</span>
-							<span>{{textList.Name||'--'}}万元</span>
+							<span v-if="textList.Name">{{textList.Name}}</span>
+							<span>--</span>
 						</p>
 						<p class="list-content-text">
 							<span>预算金款：</span>
-							<span>{{textList.planTenderAmount||'--'}}万元</span>
+							<span v-if="textList.planTenderAmount">{{textList.planTenderAmount}}</span>
+							<span>--</span>
 						</p>
 						<p class="list-content-text">
 							<span>资金来源：</span>
 							<span >{{textList.projecetCapitalSource||'--'}}</span>
+							
 						</p>
 					</div>
 					
@@ -62,7 +65,7 @@
 				<img v-if="showimg" src="@/assets/images/bxpro/original1.png">
 				<img v-else src="@/assets/images/bxpro/original.png">
 				<span>
-					<a :href="textList.url">原文链接</a>
+					<a :href="textList.url"  target="_blank">原文链接</a>
 				</span>
 			</div>
 			<div class="main3-box" v-html="textList.content">

dsk-operate-ui/src/views/radar/Land/details.vue

@@ -15,11 +15,13 @@
 						</p>
 						<p class="list-content-text">
 							<span>成交金额：</span>
-							<span>{{textList.transactionPrice||"--"}}</span>
+							<span v-if="textList.transactionPrice">{{textList.transactionPrice}}万元</span>
+							<span>--</span>
 						</p>
 						<p class="list-content-text">
 							<span>总面积：</span>
-							<span>{{textList.acreage||"--"}}</span>
+							<span v-if="textList.transactionPrice">{{textList.transactionPrice}}平方米</span>
+							<span>--</span>
 						</p>
 						<p class="list-content-text">
 							<span>合同签订：</span>
@@ -70,7 +72,7 @@
 
 				</p>
 				<p>
-					<label class="label">面积</label>
+					<label class="label">面积（平方米）</label>
 					<span>{{textList.buildArea||"--"}}</span>
 					<label class="label">土地来源</label>
 					<span>{{textList.landSource||"--"}}</span>
@@ -162,9 +164,9 @@
 					<span>{{textList.auctionEndTime||"--"}}</span>
 				</p>
 				<p>
-					<label class="label">起始价</label>
+					<label class="label">起始价（万元）</label>
 					<span>{{textList.moneyBegin||"--"}}</span>
-					<label class="label">竞买保证金</label>
+					<label class="label">竞买保证金（万元）</label>
 					<span>{{textList.bondmoney||"--"}}</span>
 				</p>
 				<p>
@@ -174,7 +176,7 @@
 					<span>{{textList.investmentIntensity||"--"}}</span>
 				</p>
 				<p>
-					<label class="label">成交价</label>
+					<label class="label">成交价（万元）</label>
 					<span>{{textList.transactionPrice||"--"}}</span>
 					<label class="label">受让人</label>
 					<span>{{textList.company||"--"}}</span>

dsk-operate-ui/src/views/radar/bxprozbgg/details.vue

@@ -22,7 +22,7 @@
 						<img v-if="showimg" src="@/assets/images/bxpro/original1.png">
 						<img v-else src="@/assets/images/bxpro/original.png">
 						<span>
-							<a :href="textList.url">原文链接</a>
+							<a :href="textList.url"  target="_blank">原文链接</a>
 						</span>
 					</div>
 

dsk-operate-ui/src/views/radar/components/BidRecord/index.vue

@@ -8,13 +8,13 @@
 	  			placeholder="请输入项目名称关键字" v-model="keyword" ></el-input>
 	  	    </div>
 	  	</div>
-		<!-- <div class="content_item">
+		<div class="content_item">
 		    <div class="label">参投单位</div>
 		    <div class="content_right">
 		        <el-input class="ename_input" 
 				placeholder="请输入参投单位关键字" v-model="jskBidQueryDto.companyName" ></el-input>
 		    </div>
-		</div> -->
+		</div>
 		<div class="content_item">
 		    <div class="label">项目信息</div>
 		    <div class="content_right">
@@ -69,7 +69,7 @@
 			     </div>
 			   </el-dropdown>
 			   
-			   <el-dropdown @command="tenderDatehandleCommand" trigger="click" ref="tenderDateShowPopper"  :hide-on-click="false" >
+			   <el-dropdown @command="tenderDatehandleCommand" class="el-dropdown-land" trigger="click" ref="tenderDateShowPopper"  :hide-on-click="false" >
 			     <span class="el-dropdown-link" :class="tenderDateValue ? 'color_text' : ''" >开标时间{{ tenderDateValue ? " 1项" : ""}}<i class="el-icon-caret-bottom"></i>
 			     
 			   			</span>
@@ -134,24 +134,24 @@
 	  			<p class="list-titel">
 	  				 <router-link  :to="'/radar/BidRecord/details/'+ item.id" tag="a" class="list-titel-a"  v-html="item.projectName"></router-link>
 	  			</p>
-	  			<div class="content-label">
+	  			<div class="content-label" v-if="item.domicile">
 						<span class="list-label list-label-zb" v-if="item.domicile">
 						  {{item.domicile}}
 						</span>
 	  			</div>
 	  			
-	  			<div  class="list-content">
+	  			<div  class="list-content" v-if="item.tenderTime||item.source||item.punishDate">
 	  			
-	  				<p class="list-content-text">
+	  				<p class="list-content-text" v-if="item.tenderTime">
 	  					<span>开标时间：</span>
 	  					<span>{{item.tenderTime||'--'}}</span>
 	  				</p>
-	  				<p class="list-content-text">
+	  				<p class="list-content-text" v-if="item.punishDate">
 	  					<span>发布时间：</span>
 	  					<span>{{item.punishDate||'--'}}</span>
 	  				</p>
 	  				
-	  				<p class="list-content-text">
+	  				<p class="list-content-text" v-if="item.source">
 	  					<span>来源网站：</span>
 	  					<span>{{item.source||'--'}}</span>
 	  				</p>

dsk-operate-ui/src/views/radar/components/Bidding/index.vue

@@ -12,7 +12,7 @@
 		    <div class="label">招标单位</div>
 		    <div class="content_right">
 		        <el-input class="ename_input" 
-				placeholder="请输入招标单位关键字" v-model="jskBidPlanDto.tenderee" ></el-input>
+				placeholder="请输入招标采购单位关键字" v-model="jskBidPlanDto.tenderee" ></el-input>
 		    </div>
 		</div>
 		<div class="content_item">
@@ -73,7 +73,7 @@
 			   </div>
 			   <el-dropdown @command="planTenderAmounthandleCommand" class="el-dropdown-land" trigger="click" ref="planTenderAmountShowPopper" :hide-on-click="false">
 			   	<span class="el-dropdown-link" :class="jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount ? 'color_text': ''">
-			   		成交金额{{jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
+			   		合同预估金额{{jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
 			   	</span>
 			   	<el-dropdown-menu slot="dropdown">
 			   		<el-dropdown-item v-for="(item, i) in planTenderAmount" :class="jskBidPlanDto.startPlanTenderAmount == item.value[0] &&jskBidPlanDto.endPlanTenderAmount == item.value[1] &&
@@ -155,46 +155,55 @@
 	  				 <router-link  :to="'/radar/Bidding/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"  ></router-link>
 	  				 <!-- <div  v-else-if="item.projectName" v-html="item.projectName"></div> -->
 	  			</p>
-	  			<div class="content-label">
-	  				<span class="list-label" v-if="item.projectType">{{item.projectType}}</span>
+	  			<div class="content-label" v-if="(item.province||item.city||item.area)||(item.projectType&&item.projectType!='其他'&&item.projectType!='空白')||(item.objectType&&item.objectType!='其他'&&item.objectType!='空白')">
+	  				<span class="list-label" v-if="item.domicile">
+						{{item.province}}
+						<template v-if="item.city">
+							 -{{item.city}}
+						</template>
+						<template v-if="item.area">
+							  -{{item.area}}
+						</template>
+					</span>
 					<span class="list-label list-label-wl" v-if="item.objectType">{{item.objectType}}</span>
 					<span class="list-label list-label-lx" v-if="item.projectType">{{item.projectType}}</span>
+					
 	  			</div>
 	  			
-	  			<div  class="list-content">
-	  				<p class="list-content-text">
+	  			<div  class="list-content" v-if="item.tenderee||item.planTenderAmount||item.projectCapitalSource">
+	  				<p class="list-content-text"  v-if="item.tenderee">
 	  					<span>招采单位：</span>
 						<router-link v-if="item.tendereeId" :to="'/company/' + encodeStr(item.tendereeId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.tenderee"></router-link>
 						<span v-else>{{item.tenderee||'--'}}</span>
 	  				</p>
-	  				<p class="list-content-text">
+	  				<p class="list-content-text"  v-if="item.planTenderAmount">
 	  					<span>合同预估金额（万元）：</span>
 	  					<span>{{item.planTenderAmount||'--'}}</span>
 	  				</p>
-	  				<p class="list-content-text">
+	  				<p class="list-content-text" v-if="item.projectCapitalSource">
 	  					<span>资金来源：</span>
 	  					<span>{{item.projectCapitalSource||'--'}}</span>
 	  				</p>
 	  				
 	  				
 	  			</div>
-				<div  class="list-content">
-					<p class="list-content-text">
+				<div  class="list-content" v-if="item.issueTime||item.planTenderDateStart||item.sourceName">
+					<p class="list-content-text" v-if="item.issueTime">
 						<span>发布时间：</span>
-						<span >{{item.issueTimestamp||'--'}}</span>
+						<span >{{item.issueTime||'--'}}</span>
 					</p>
-					<p class="list-content-text">
+					<p class="list-content-text" v-if="item.planTenderDateStart">
 						<span>预计招标时间：</span>
 						<span>{{item.planTenderDateStart||'--'}}</span>
 					</p>
-					<p class="list-content-text">
+					<p class="list-content-text"  v-if="item.sourceName">
 						<span>来源网站：</span>
 						<span  >{{item.sourceName||'--'}}</span>
 					</p>
 					
 					
 				</div>
-				<div  class="list-content list-addree">
+				<div  class="list-content list-addree"  v-if="item.projectScale">
 					<p class="list-content-text">
 						<span class="content-text-gc">工程规模：</span>
 						<span class="content-text-p">{{item.projectScale||'--'}}</span>
@@ -789,7 +798,7 @@ export default {
 				width: auto;
 				background: #F3F4F5;
 				display: inline-flex;
-				margin-top: 7px;
+				margin-top: 12px;
 				.list-content-text{
 					margin-top: 0px;
 					span{

dsk-operate-ui/src/views/radar/components/Establishment/index.vue

@@ -190,52 +190,53 @@
 					<p class="list-titel">
 						 <router-link  :to="'/radar/Establishment/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
 					</p>
+					<div class="content-label" v-if="item.domicile||item.projectType&&item.projectType!='其他'&&item.projectType!='空白'||item.industry&&item.industry!='其他'&&item.industry!='空白'">
+						<span class="list-label " v-if="item.projectType&&item.projectType!='其他'&&item.projectType!='空白'">
+						 {{item.projectType}}
+						</span>
+						  <span class="list-label list-label-wl" v-if="item.industry&&item.industry!='其他'&&item.industry!='空白'">
+						   {{item.industry}}
+						  </span>
+						  <span class="list-label list-label-lx" v-if="item.domicile">
+						      {{item.domicile}}
+						  </span>
+					</div>
 					
 					
 					<div  class="list-content">
-						<p class="list-content-text"v-if="item.companyName">
-							<span>建设/申请单位：</span>
-							<span class="blue">{{item.companyName}}</span>
+						<p class="list-content-text" v-if="item.companyName">
+							<span>项目业主：</span>
+							<router-link  :to="`/company/${encodeStr(item.companyId)}/`" tag="a" class="list-titel-a blue" v-html="item.companyName" ></router-link>
 						</p>
-						<p class="list-content-text"v-if="item.handleTime">
-							<span>发布日期：</span>
-							<span>{{item.handleTime}}</span>
+						
+						<p class="list-content-text"v-if="item.money">
+							<span>总投资：</span>
+							<span v-html="item.money+'万元'"></span>
 						</p>
-						<p class="list-content-text"v-if="item.examineStatus">
-							<span>办件结果：</span>
-							<span>{{item.examineStatus}}</span>
+						<p class="list-content-text"v-if="item.planStartTime">
+							<span>计划开工日期：</span>
+							<span>{{item.planStartTime}}</span>
 						</p>
-						<p class="list-content-text"v-if="item.industry">
-							<span>行业分类：</span>
-							<span>{{item.industry}}</span>
+						<p class="list-content-text"v-if="item.planEndTime">
+							<span>计划完工日期：</span>
+							<span>{{item.planEndTime}}</span>
 						</p>
-						<p class="list-content-text"v-if="item.buildNature">
-							<span>建设性质：</span>
-							<span>{{item.buildNature}}</span>
+						<p class="list-content-text"v-if="item.isProject!=null">
+							<span>是否为民间推介项目：</span>
+							<span>{{item.isProject==0?'否':'是'}}</span>
 						</p>
 						
 						
 					</div>
-					<div  class="list-content list-addree">
-						<template v-if="item.province||item.city||item.district">
-							<img src="@/assets/images/addree.png" alt="">
+					<div  class="list-content"  v-if="item.buildScale">
 						<p class="list-content-text">
-								<span>行政区划：</span>
-								<span >
-									 {{item.province}}
-								   <template v-if="item.city">
-									  -{{item.city}}
-								   </template>
-								   <template v-if="item.district">
-								   	  -{{item.district}}
-								   </template>
-								</span>
+							<span class="content-text-gc">建设规模：</span>
+							<span class="content-text-p">{{item.buildScale||'--'}}</span>
 						</p>
-						</template>
 						
+					</div>
 				
 					
-					</div>
 				</li>
 			</ul>
 			<div class="pagination clearfix"  v-show="total>0">
@@ -557,8 +558,8 @@
 		methods: {
 			searchDic(){
 				api.searchDic().then(res=>{
-					this.projectTypeOptions = res.data.projectType;
-					this.industryOptions = res.data.establishmentIndustry
+					this.projectTypeOptions = res.projectType;
+					this.industryOptions = res.establishmentIndustry
 				}).catch(error=>{
 					
 				});
@@ -1260,7 +1261,7 @@
 				}
 			}
 			.content-label{
-				margin-top: 7px;
+				margin-top: 12px;
 				.list-label{
 					background: #F3F3FF;
 					color: #8491E8;
@@ -1270,11 +1271,20 @@
 					font-size: 12px;
 					
 				}
+				.list-label-wl{
+					background: #e8f7f0;
+					color: #38c8bf;
+					
+				}
+				.list-label-lx{
+					background: #e4f3fd;
+					color: #41a1fd;
+				}
 			}
 			
 			
 			.list-content{
-				margin-top: 3px;
+				margin-top: 8px;
 				display: flex;
 				justify-content: start;
 				align-items: center;
@@ -1297,6 +1307,12 @@
 						color: rgba(35,35,35,0.8);
 						line-height: 15px
 					}
+					.content-text-gc{
+						width: 72px;
+					}
+					.content-text-p{
+						width: 1200px;
+					}
 					.blue{
 						color: #0081FF !important;
 						cursor: pointer;
@@ -1311,7 +1327,7 @@
 				width: auto;
 				background: #F3F4F5;
 				display: inline-flex;
-				margin-top: 7px;
+				margin-top: 12px;
 				.list-content-text{
 					margin-top: 0px;
 					span{

dsk-operate-ui/src/views/radar/components/Tender/index.vue

@@ -208,12 +208,12 @@
 						<p class="list-content-text" v-if="item.companyName">
 							<span>招采单位：</span>
 							<router-link v-if="item.jskEid" :to="'/company/' + encodeStr(item.jskEid)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
-						    <span v-else class="blue">{{item.companyName||'--'}}</span>
+						    <span v-else class="blue" v-html="item.companyName"></span>
 						</p>
 						<p class="list-content-text" v-if="item.agency">
 							<span>代理单位：</span>
 							<router-link v-if="item.agencyId" :to="'/company/' + encodeStr(item.agencyId)  + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.agency"></router-link>
-							<span v-else class="blue">{{item.agency||'--'}}</span>
+							<span v-else class="blue" v-html="item.agency"></span>
 						</p>
 						
 					</div>
@@ -222,9 +222,16 @@
 							<span>预算金款：</span>
 							<span>{{item.bidMoney||'--'}}万元</span>
 						</p>
-						<p class="list-content-text" v-if="item.contact">
+						<p class="list-content-text" v-if="item.contactTel || item.agencyContactTel">
 							<span>联系方式：</span>
-							<span >招采单位{{item.contact}}{{item.contactTel}} </span>
+							<span >
+								<template v-if="item.contactTel">
+									招采单位 {{ item.contact }} {{ item.contactTel}}{{item.contactTel && item.agencyContactTel ? ";" : ""}}
+								</template>
+								<template v-if="item.agencyContactTel">
+									代理单位 {{ item.agencyContact }} {{ item.agencyContactTel }}
+								</template>
+							</span>
 						</p>
 					</div>
 					
@@ -716,8 +723,8 @@
 		methods: {
 			searchDic(){
 				api.searchDic().then(res=>{
-						this.projectTypeOptions = res.data.projectType;
-						this.subjectMatterOptions = res.data.subjectMatter
+						this.projectTypeOptions = res.projectType;
+						this.subjectMatterOptions = res.subjectMatter
 				}).catch(error=>{
 					
 				});

dsk-operate-ui/src/views/radar/debtProject/details.vue

@@ -13,28 +13,40 @@
 				<div class="list">
 					<div class="item color1">
 						<div class="item-left">
-							<h4>{{textList.projectTotalInvestment||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.projectTotalInvestment">{{textList.projectTotalInvestment}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>项目总投资额</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon1.png" />
 					</div>
 					<div class="item color2">
 						<div class="item-left">
-							<h4>{{textList.projectCapital||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.projectCapital">{{textList.projectCapital}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>项目资本金</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon2.png" />
 					</div>
 					<div class="item color3">
 						<div class="item-left">
-							<h4>{{textList.econData_013||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.econData_013">{{textList.econData_013}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>专项债融资</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon3.png" />
 					</div>
 					<div class="item color4">
 						<div class="item-left">
-							<h4>{{textList.specialBondCapital||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.specialBondCapital">{{textList.specialBondCapital}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>专项债用作资本金</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon4.png" />
@@ -43,28 +55,40 @@
 				<div class="list">
 					<div class="item color4">
 						<div class="item-left">
-							<h4>{{textList.otherFunds||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.otherFunds">{{textList.otherFunds}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>其他资金</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon5.png" />
 					</div>
 					<div class="item color3">
 						<div class="item-left">
-							<h4>{{textList.specialBondIssue_number||'--'}}<span>万元 / 10只</span></h4>
+							<h4 v-if="textList.specialBondIssue_number">{{textList.specialBondIssue_number}}<span>万元/ 10只</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>专项债融资额/专项债只数</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon6.png" />
 					</div>
 					<div class="item color4">
 						<div class="item-left">
-							<h4>{{textList.otherFinancing||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.otherFinancing">{{textList.otherFinancing}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>其他融资</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon7.png" />
 					</div>
 					<div class="item color2">
 						<div class="item-left">
-							<h4>{{textList.govSupportFunds||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.govSupportFunds">{{textList.govSupportFunds}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>政府安排资金</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon8.png" />
@@ -77,27 +101,33 @@
 			<div class="main3-box">
 				<p>
 					<label class="label">项目总收益/项目总债务融资本息(覆盖倍数)</label>
-					<span>{{textList.econData_007||'--'}}</span>
+					<span v-if="textList.econData_007">{{textList.econData_007}}倍</span>
+					<span>--</span>
 				</p>
 				<p>
 					<label class="label">项目总收益/项目总地方债券融资本息</label>
-					<span>{{textList.econData_008||'--'}}</span>
+					<span v-if="textList.econData_008">{{textList.econData_008}}倍</span>
+					<span>--</span>
 				</p>
 				<p>
 					<label class="label">项目总收益/项目总投资</label>
-					<span>{{textList.econData_009||'--'}}</span>
+					<span v-if="textList.econData_009">{{textList.econData_009}}倍</span>
+					<span>--</span>
 				</p>
 				<p>
 					<label class="label">项目总收益/项目总地方债券融资本金</label>
-					<span>{{textList.econData_010||'--'}}</span>
+					<span v-if="textList.econData_010">{{textList.econData_010}}倍</span>
+					<span>--</span>
 				</p>
 				<p>
 					<label class="label">项目总收益/项目总债务融资本金</label>
-					<span>{{textList.econData_011||'--'}}</span>
+					<span v-if="textList.econData_011">{{textList.econData_011}}倍</span>
+					<span>--</span>
 				</p>
 				<p>
 					<label class="label">项目预测总收益</label>
-					<span>{{textList.projectForecastTotalRevenue||'--'}}</span>
+					<span v-if="textList.projectForecastTotalRevenue">{{textList.projectForecastTotalRevenue}}万元</span>
+					<span>--</span>
 				</p>
 			</div>
 		</div>

dsk-operate-ui/src/views/system/user/profile/userAvatar.vue

 <template>
   <div>
-    <div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
+    <div class="user-info-head" @click="editCropper()">
+      <img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" v-if="options.img" />
+      <span v-else class="userInfo-avatar" v-else>{{ options.name&&options.name.slice(0, 1).toUpperCase() }}</span>
+    </div>
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened"  @close="closeDialog">
       <el-row>
         <el-col :xs="24" :md="12" :style="{height: '350px'}">
@@ -75,6 +78,7 @@ export default {
       // 弹出层标题
       title: "修改头像",
       options: {
+        name: store.getters.name, //用户名称
         img: store.getters.avatar, //裁剪图片的地址
         autoCrop: true, // 是否默认生成截图框
         autoCropWidth: 200, // 默认生成截图框宽度
@@ -89,7 +93,7 @@ export default {
   methods: {
     // 编辑头像
     editCropper() {
-      this.open = true;
+      // this.open = true;
     },
     // 打开弹出层结束时的回调
     modalOpened() {
@@ -167,7 +171,7 @@ export default {
   height: 120px;
 }
 
-.user-info-head:hover:after {
+/*.user-info-head:hover:after {
   content: '+';
   position: absolute;
   left: 0;
@@ -183,5 +187,5 @@ export default {
   cursor: pointer;
   line-height: 110px;
   border-radius: 50%;
-}
+}*/
 </style>