修改

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

@@ -823,6 +823,9 @@ li {
     .el-select-dropdown__item {
       padding: 0 16px;
     }
+    .el-select-dropdown__item.selected::after {
+      right:8px;
+    }
   }
 }
 

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

@@ -75,7 +75,7 @@
         </el-col>
         <div class="empty" v-if="hzqkTotal === 0">
           <img class="img" src="@/assets/images/project/empty.png">
-          <div class="p1">抱歉，您还未添加合作客户</div>
+          <div class="p1">抱歉，您还未添加与客户的合作中标项目情况</div>
         </div>
       </el-row>
     </div>
@@ -240,9 +240,10 @@
         this.hzqkList=res.data;
         let list=[];
         for(let i=0; i<res.data.length; i++){
-          if(res.data[i].totalAmount){
-            list.push(res.data[i])
+          if(!res.data[i].totalAmount){
+            res.data[i].totalAmount=0
           }
+          list.push(res.data[i])
         }
         if(list.length > 0){
           this.initChart(list)

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

@@ -360,6 +360,12 @@ export default {
     sortChange({ column, prop, order }){
       if(prop === 'aptitudeCountNew'){
         this.queryParams.field ='aptitudeCountNew'
+      }else if(prop === 'recentlyCount'){
+        this.queryParams.field ='winBidCount'
+      }else if(prop === 'customerCount'){
+        this.queryParams.field ='customer'
+      }else if(prop === 'supplierCount'){
+        this.queryParams.field ='supplier'
       }else {
         this.queryParams.field = prop
       }

dsk-operate-ui/src/views/project/projectList/component/BidOpeningRecord.vue

@@ -205,7 +205,7 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + `"/business/open/tender/importData/"}${this.detailId ? this.detailId : parseInt(this.$route.query.id)}`,
+        url: process.env.VUE_APP_BASE_API + `/business/open/tender/importData/${this.detailId ? this.detailId : parseInt(this.$route.query.id)}`,
         // 展示上传结果
         showResult: false,
         // 模板下载地址

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

@@ -99,7 +99,7 @@
 			       招标方式{{jskBidPlanDto.tenderWay.length? jskBidPlanDto.tenderWay.length + "项": ""}}
 			       <i class="el-icon-caret-bottom"></i>
 			     </span>
-			     <el-select v-model="jskBidPlanDto.tenderWay" class="select-multiple" multiple placeholder="请选择">
+			     <el-select v-model="jskBidPlanDto.tenderWay" class="select-multiple" popper-class="select-option" multiple placeholder="请选择">
 			       <el-option v-for="(item, i) in tenderWayList" :key="i":label="item" :value="item">
 			       </el-option>
 			     </el-select>
@@ -1064,6 +1064,14 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+  .select-option{
+    .el-select-dropdown__list{
+      .el-select-dropdown__item{
+        padding: 0 26px 0 16px;
+      }
+    }
+
+  }
 	.content{
 	  padding: 0px 16px;
 	  padding-top: 16px;

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

@@ -970,7 +970,6 @@
 			   color: rgba(35,35,35,0.8);
 	       }
 	       .content_right{
-	           
            .ename_input{
              width: 640px;
              margin-right: 20px;
@@ -978,6 +977,7 @@
            .land_ipt_470 {
             width: 640px;
            }
+
          }
 
 		 .item_ckquery_list {

dsk-operate-ui/vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://47.104.91.229:9099/prod-api`,//测试
+        target: `http://120.46.64.239:9099/prod-api`,//测试
         // target: `https://szhapi.jiansheku.com`,//线上
         // target: `http://122.9.160.122:9011`,  //线上
         // target: `http://192.168.0.165:9098`,//施-无线