update

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

@@ -2,8 +2,11 @@
   <div class="no-data">
     <div class="no-data-box">
       <img :src="noData" alt="抱歉，没找到相关数据" />
-      <div v-if="text">抱歉，您还未添加{{text}}项目</div>
-      <div v-else>抱歉，没找到相关数据</div>
+      <div v-if="record">抱歉，您还未添加跟进动态</div>
+      <template v-else>
+        <div v-if="text">抱歉，您还未添加{{text}}项目</div>
+        <div v-else>抱歉，没找到相关数据</div>
+      </template>
       <span v-if="condition">建议调整关键词或筛选条件，重新搜索</span>
     </div>
   </div>
@@ -13,6 +16,10 @@
 export default {
   name: "NoData",
   props: {
+    record: {
+      type: Boolean,
+      default: false
+    },
     condition: {
       type: Boolean,
       default: false

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

@@ -151,7 +151,7 @@
 			  <el-table  :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"  class="table-item1 fixed-table"  border  highlight-current-row>
 					<el-table-column type="index" label="序号" fixed width="60">
 					 <template slot-scope="scope">
-						 <span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
+						 <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
 					 </template>
 					</el-table-column>
 					<el-table-column  label="公司名称" fixed width="380" >

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

@@ -345,7 +345,7 @@
               </div>
             </div>
           </template>
-          <no-data :condition="true" style="padding:40px" v-if="viewData6.length==0"/>
+          <no-data :record="true" style="padding:40px" v-if="viewData6.length==0"/>
         </div>
       </el-card>
     </div>

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

@@ -51,7 +51,7 @@
 				</div>
 				<el-dropdown @command="transactionPricehandleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="transactionPriceShowPopper" :hide-on-click="false">
 					<span class="el-dropdown-link" :class="importantProjectDto.startMoney ||importantProjectDto.endMoney ? 'color_text': ''">
-						项目投资额（万元）{{importantProjectDto.startMoney ||importantProjectDto.endMoney? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
+						项目投资额{{importantProjectDto.startMoney ||importantProjectDto.endMoney? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
 					</span>
 					<el-dropdown-menu slot="dropdown">
 						<el-dropdown-item v-for="(item, i) in transactionPriceOptions" :class="importantProjectDto.startMoney == item.value[0] &&importantProjectDto.endMoney == item.value[1] &&