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

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

@@ -1238,4 +1238,7 @@ select {
 	  text-align: center;
 
 	}
+	.btn-search1{
+		width: 60px;
+	}
   }

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

@@ -80,43 +80,13 @@
           </div>
         </div> -->
         <el-input class="ename_input" prefix-icon="el-icon-search" clearable placeholder="快速搜索项目名称" v-model="projectName">
-					<div slot="append" class="btn-search" @click="search()">搜索</div>
+					<div slot="append" class="btn-search btn-search1" @click="search()">搜索</div>
 				</el-input>
         <div class="addnew" @click="addNew(true)"><div class="img"></div>新建项目</div>
       </el-card>
     </div>
 
     <div class="chart-bot">
-      <!-- <el-card class="box-card noborder left">
-        <div class="p1">目标完成率</div>
-        <div class="p2">78.09<span>%</span></div>
-        <div class="p3">较上月 +12.15 % <span></span> 较上月 +1542 亿 <span></span></div>
-        <div class="p4">年度目标总额 1500.00 亿元</div>
-      </el-card>
-      <el-card class="box-card noborder right">
-        <div class="cardtitles i">跟进记录</div>
-        <div class="records">
-          <div class="recordlist">
-            <div class="rec_detail" v-for="(item,index) in recordlist.rows">
-
-              <div class="rec_time">
-                <i class="el-icon-time"></i>
-                <div>{{item.createTime && item.createTime.slice(0, 16)}}</div>
-              </div>
-              <div class="rec_con">
-                <div><strong>{{item.nickName}}</strong> <span v-if="item.visitMode">({{item.visitMode}})</span></div>
-                <div><span>{{item.content}}</span></div>
-                <div class="rec_text">
-                  <span>拜访对象：{{item.name||'--'}}</span>
-                  <span>职位：{{item.position||'--'}}</span>
-                  <span>拜访时间：{{item.createTime && item.createTime.slice(0, 10)}}</span>
-                  <span>下次拜访时间：{{item.nextVisitTime == null?'--': item.createTime.slice(0, 10)}}</span>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </el-card> -->
       <el-card class="box-card noborder pd16">
         <h3>储备项目统计</h3>
         <skeleton v-if="isSkeleton1" style="padding: 16px"></skeleton>
@@ -145,6 +115,8 @@
         </div>
         <no-data text="储备" v-if="viewData1.length==0"/>
       </el-card>
+    </div>
+    <div class="chart-bot">
       <el-card class="box-card noborder pd16">
         <h3>储备项目资金来源</h3>
         <skeleton v-if="isSkeleton2" style="padding: 16px"></skeleton>
@@ -173,6 +145,8 @@
         </div>
         <no-data text="储备" v-if="viewData2.length==0"/>
       </el-card>
+    </div>
+    <div class="chart-bot">
       <el-card class="box-card noborder pd16">
         <h3>已合作项目统计</h3>
         <skeleton v-if="isSkeleton3" style="padding: 16px"></skeleton>
@@ -201,6 +175,8 @@
         </div>
         <no-data text="已合作" v-if="viewData3.length==0"/>
       </el-card>
+    </div>
+    <div class="chart-bot">
       <el-card class="box-card noborder pd16">
         <h3>公招项目地区统计</h3>
         <el-date-picker
@@ -251,6 +227,8 @@
         </div>
         <no-data  v-if="viewData4.length==0"/>
       </el-card>
+    </div>
+    <div class="chart-bot">
       <el-card class="box-card noborder pd16">
         <h3>公招项目投资金额统计</h3>
         <el-date-picker
@@ -293,6 +271,8 @@
         </div>
         <no-data v-if="viewData5.length==0"/>
       </el-card>
+    </div>
+    <div class="chart-bot">
       <el-card class="box-card noborder" style="margin-bottom:0;">
         <div >
           <div class="item_title">
@@ -1149,6 +1129,7 @@ export default {
 }
 .chart-bot{
   height: auto;
+  margin-bottom: 12px;
   .left{
     float: left;
     width: 353px;