Merge remote-tracking branch 'origin/dev20230707' into dev20230707

dsk-operate-ui/src/router/index.js

@@ -70,7 +70,7 @@ export const constantRoutes = [
         path: 'index',
         component: () => import('@/views/index'),
         name: 'Index',
-        meta: { title: '首页', icon: 'index',noCache: true }
+        meta: { title: '首页', icon: 'index',noCache: false }
       }
     ]
   },

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

@@ -51,6 +51,10 @@ export default {
       type: String,
       default: '请选择'
     },
+    'moneyValue': {
+      type: String,
+      default: ''
+    },
     'ref-str': {
       type: String,
       default: `timeselect${String(Math.random(0, 100)).slice(2)}`,
@@ -92,6 +96,9 @@ export default {
     if(this.moneyList&&this.moneyList.length>0){
       this.options = this.moneyList
     }
+    if(this.moneyValue){
+      this.value = this.moneyValue
+    }
   },
   destroyed() {
     const app = document.getElementById('app')
@@ -411,20 +418,20 @@ export default {
       width: 186px;
       color: #606266;
       text-indent: 0;
-      padding: 16px;
+      padding: 14px;
       padding-top: 0px;
       border: 1px solid #e0e0e0;
       .popper_wrap {
         margin-top: 16px;
         display: inline-block;
         .popper_input {
-          width: 100px;
+          width: 90px;
           display: inline-block;
           margin: 0px 8px;
           line-height: 34px;
         }
         .el-input__inner {
-          width: 100px;
+          width: 90px;
         }
       }
       input::-webkit-outer-spin-button,

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

@@ -46,6 +46,10 @@ export default {
       type: String,
       default: '请选择',
     },
+    'timeValue': {
+      type: String,
+      default: '',
+    },
     'ref-str': {
       type: String,
       default: `timeselect${String(Math.random(0, 100)).slice(2)}`,
@@ -106,6 +110,9 @@ export default {
     if(this.dateTo){
       this.defaultValue = new Date(this.dateTo)
     }
+    if(this.timeValue){
+      this.value = this.timeValue
+    }
     this.handleAppClick()
     if(this.timeList&&this.timeList.length>0){
       this.options = this.timeList

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

@@ -212,7 +212,7 @@
       pageSize:10,
       recordlist:[],
       timeList:['今日','近三天','近七天','自定义'],
-      datatype:0,
+      datatype:'',
       defaultValue:new Date(),
       pickerValue: [],
       params:{
@@ -301,88 +301,120 @@
         self.myChart1.resize()
       }, 10)
     },
-    initChart(data){
-
+    initChart(list){
+      let data=[]
+      if(list.length > 10){
+        for(var i=0;i<10;i++){
+          data.push(list[i])
+        }
+      }else {
+        data=list
+      }
       //业主单位合作情况
-      this.option = {
-        legend: {
-          show: false,
-          x:'center',
-          y:'bottom',
-          padding:[10,0,10,0],
-          itemWidth: 24,
-          itemHeight: 10,
-          textStyle:{
-            borderRadius:30,
+      this.option ={
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross'
           }
         },
-        yAxis: {
+        xAxis: {
           type: 'category',
-          inverse: true, // 反向坐标
-          data: data.map(item => item.companyName),
-          axisLine: {
-            show: false,
-          },
-          axisTick: {
-            show: false,
+          axisLabel: { //坐标轴刻度标签的相关设置
+            margin: 15, //刻度标签与轴线之间的距离
+            color:"#666666"
           },
+          axisTick: false, //坐标轴刻度
           axisPointer: {
-            label: {
-              show: true,
-              margin: 30
+            type: 'shadow'
+          },
+          data: data.map(item => item.companyName),
+        },
+        yAxis: [
+          {
+            type: 'value',
+            axisLabel: { //坐标轴刻度标签的相关设置
+              color:"#666666"
+            },
+            name: '单位：次',
+            nameLocation: 'end',
+            nameTextStyle: {
+              padding: [0, 10, 0, -60],    // 四个数字分别为上右下左与原位置距离
+              color: '#666666',
             }
           },
-          axisLabel: {
-            margin: 200,
-            textStyle: {
-              align: 'left',
+          {
+            type: 'value',
+            axisLabel: { //坐标轴刻度标签的相关设置
+              color:"#666666"
             },
-            formatter: function (value,index) {
-              if (value.length > 15) {
-                value=`${value.slice(0, 15)}...`
-              }
-              return value
+            name: '单位：万元',
+            nameLocation: 'end',
+            nameTextStyle: {
+              padding: [0, 0, 0, 100],    // 四个数字分别为上右下左与原位置距离
+              color: '#666666',
             },
-          },
-        },
-        xAxis: {
-          type: 'value',
-          axisLabel: { //坐标轴刻度标签的相关设置
-            // color:"#666666"
-          },
-          name: '单位/万元',
-          // nameLocation: 'start',
-          nameLocation: 'end',
-          nameTextStyle: {
-            padding: [0, 0, 0, 0],    // 四个数字分别为上右下左与原位置距离
-            // color: '#666666',
-          },
-        },
+            splitLine: {
+              show: true,
+              lineStyle: {
+                type: 'dashed',
+                color: ['#FFFFFF']
+              }
+            }
+          }
+        ],
         grid: {
-          left: '22%',
-          top: 60,
-          right: 80,
-          bottom: 60,
-        },
-        tooltip: {
-          show: true,
-          // backgroundColor: 'rgba(0,0,0,.7)',
-          borderWidth: 0,
-          // textStyle: {
-          //   color: '#fff',
-          // },
+          top:30,
+          left:80,
+          right:90,
+          bottom:30,
         },
-        series: {
-          name:'合同总额',
-          data: data.map(item => item.totalAmount),
-          barGap: 0,
-          type: 'bar',
-          itemStyle:{
-            color: '#92C9FF',
-            barBorderRadius:[0, 20, 20, 0]
+        series: [
+          {
+            name:'合作金额（万元）',
+            smooth: false, //平滑
+            type:"line",
+            symbolSize: 6,
+            yAxisIndex: 1,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value + '万元'
+              }
+            },
+            itemStyle: {
+              normal:{
+                color: '#67B3FD',
+                lineStyle: {
+                  width:3
+                },
+              }
+            },
+            data:data.map(item => item.totalAmount),
           },
-          barWidth: 8,
-        },
+          {
+            name:'合作次数（次）',
+            type: 'bar',
+            barWidth: 20,
+            tooltip: {
+              valueFormatter: function (value) {
+                return value + '次';
+              }
+            },
+            itemStyle: {
+              normal:{
+                color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+                  offset: 0,
+                  color: '#56A5FF'
+                }, {
+                  offset: 1,
+                  color: '#1B8EFF'
+                }]),
+                barBorderRadius:[20,20, 0, 0]
+              }
+            },
+            data:data.map(item => item.businessCount),
+          }
+        ]
       }
       this.option && this.myChart.setOption(this.option)
     },

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

@@ -33,6 +33,9 @@
       <template slot="stockPercent" slot-scope="scope">
         <span>{{scope.row.stockPercent?parseFloat(Number(scope.row.stockPercent*100).toFixed(4))+'%':'--'}}</span>
       </template>
+      <template slot="shouldCapiConv" slot-scope="scope">
+        <span>{{scope.row.shouldCapiConv === '0.00万元人民币'? '--':scope.row.shouldCapiConv}}</span>
+      </template>
     </tables>
   </div>
 </template>
@@ -56,7 +59,7 @@ export default {
       forData: [
         {label: '发起人/股东', prop: 'stockName', minWidth: '230', slot: true},
         {label: '持股比例', prop: 'stockPercent', slot: true},
-        {label: '认缴出资', prop: 'shouldCapiConv'},
+        {label: '认缴出资', prop: 'shouldCapiConv', slot: true},
         {label: '实缴出资额', prop: 'realCapi'},
         {label: '认缴出资日期', prop: 'conDate'},
         {label: '参股日期', prop: 'realCapiDate', width: '150'}

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -391,14 +391,17 @@
     <select id="selectAmountAnalyze" resultType="com.dsk.system.domain.business.vo.BusinessAnalyzeVo">
         select
             bi.amount_source,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
-        <include refid="businessSearchSql"/>
+            <include refid="businessSearchSql"/>
+        and bi.amount_source is not null
         group by bi.amount_source
+        having businessCount > 0
     </select>
 
     <select id="selectTypeAnalyze" resultType="com.dsk.system.domain.business.vo.BusinessAnalyzeVo">
         select
             bi.project_type,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
         <include refid="businessSearchSql"/>
+        and bi.project_type is not null
         group by bi.project_type
         <if test="status != null and status == 0 "> order by businessCount desc </if>
         <if test="status != null and status == 2 "> order by totalAmount desc </if>
@@ -408,6 +411,7 @@
         select
             bi.project_category,count(bi.id) businessCount, ROUND(sum(bi.investment_amount), 4) totalAmount
         <include refid="businessSearchSql"/>
+        and bi.project_category is not null
         group by bi.project_category
         <if test="status != null and status == 0 "> order by businessCount desc </if>
         <if test="status != null and status == 2 "> order by totalAmount desc </if>

dsk-system/src/main/resources/mapper/system/customer/CustomerMapper.xml

@@ -118,6 +118,7 @@
         left join business_info bi on (bi.customer_id = ct.customer_id and bi.status = 2)
         where ctu.status = 0 and ctu.user_id = #{userId}
         group by ct.customer_id
+        having businessCount > 0
         order by totalAmount desc
         limit 10
     </select>