*

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/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-b/index.vue

@@ -16,15 +16,14 @@ export default {
       navHeight: 68,  // iframe距离顶部距离px
       iframeHight: window.innerHeight, // iframe高度
       scrollTop: 0, // 滚动条距离内部页面顶部距离
-      domain: 'https://pre-plug.jiansheku.com',
-      // domain: 'http://192.168.60.30:3300',
+      // domain: 'https://pre-plug.jiansheku.com',
+      domain: 'http://192.168.60.30:3300',
       ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912' // 需要携带的sdkId
     }
   },
   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/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, // 默认生成截图框宽度