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

dsk-operate-ui/src/views/detail/party-a/component/Tables.vue

@@ -62,7 +62,7 @@
         </template>
       </el-table>
     </div>
-    <div class="pagination-box" v-if="paging">
+    <div class="pagination-box" v-if="paging && tableDataTotal>queryParams.pageSize">
       <el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
     </div>
   </div>

dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue

@@ -32,6 +32,9 @@
                 {{ scope.row.projectName }}
               </span>
             </template>
+            <template slot="investmentAmount" slot-scope="scope">
+                {{ numbers(scope.row.investmentAmount) }}
+            </template>
           </tables>
 
         </template>
@@ -155,13 +158,13 @@ export default {
       forData: [
         {label: '项目名称', prop: 'projectName', slot: true},
         {label: '项目阶段', prop: 'projectStage', width: '120'},
-        {label: '投资金额(万元)', prop: 'investmentAmount', width: '140'},
+        {label: '投资金额(万元)', prop: 'investmentAmount', width: '140', slot: true},
         {label: '项目状态', prop: 'status', width: '90'}
       ],
       formData: [
         { type: 1, fieldName: 'projectStage', value: '', placeholder: '项目阶段', options: []},
         { type: 1, fieldName: 'status', value: '', placeholder: '项目状态', options: []},
-        { type: 3, fieldName: 'projectName', value: '', placeholder: '输入项目名称关键字搜索'},
+        { type: 3, fieldName: 'projectName', width:'200', value: '', placeholder: '输入项目名称关键字搜索'},
       ],
       stageOptions:[],
       statusOptions:[],
@@ -363,6 +366,10 @@ export default {
     closeDetail(){
       this.isDetailId = false
       this.detailId = ''
+    },
+    // 转科学计算
+    numbers(v){
+      return new Number(v);
     }
 
   }

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue

@@ -74,7 +74,7 @@
                 </template>
               </div>
             </div>
-            <div class="item">
+            <div class="item" v-if="false">
               <span class="wrap_label">开发区类别</span>
               <div class="item_ckquery">
                 <span :class="{color_text:queryParams.developmentZone.length == 0}" @click="changeBeCurrent('','developmentZone')">全部</span>
@@ -427,7 +427,7 @@ export default {
       box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.1);
       border-radius: 4px;
       width: 880px;
-      height: 337px;
+      //height: 337px;
       padding: 16px;
       position: absolute;
       top: 25px;

dsk-operate-ui/src/views/radar/BidRecord/details.vue

@@ -39,7 +39,7 @@
 	
 	
 		<div class="content main5">
-		  <div class="common-title">立项审批</div>
+		  <div class="common-title">参投列表</div>
 		  <div class="table-item">
 		    <el-table
 		      :data="tableData"

dsk-operate-ui/src/views/radar/Bidding/details.vue

@@ -24,15 +24,18 @@
 					<div  class="list-content">
 						<p class="list-content-text">
 							<span>招采单位：</span>
-							<span>{{textList.Name||'--'}}万元</span>
+							<span v-if="textList.Name">{{textList.Name}}</span>
+							<span>--</span>
 						</p>
 						<p class="list-content-text">
 							<span>预算金款：</span>
-							<span>{{textList.planTenderAmount||'--'}}万元</span>
+							<span v-if="textList.planTenderAmount">{{textList.planTenderAmount}}</span>
+							<span>--</span>
 						</p>
 						<p class="list-content-text">
 							<span>资金来源：</span>
 							<span >{{textList.projecetCapitalSource||'--'}}</span>
+							
 						</p>
 					</div>
 					
@@ -62,7 +65,7 @@
 				<img v-if="showimg" src="@/assets/images/bxpro/original1.png">
 				<img v-else src="@/assets/images/bxpro/original.png">
 				<span>
-					<a :href="textList.url">原文链接</a>
+					<a :href="textList.url"  target="_blank">原文链接</a>
 				</span>
 			</div>
 			<div class="main3-box" v-html="textList.content">

dsk-operate-ui/src/views/radar/Land/details.vue

@@ -15,11 +15,13 @@
 						</p>
 						<p class="list-content-text">
 							<span>成交金额：</span>
-							<span>{{textList.transactionPrice||"--"}}</span>
+							<span v-if="textList.transactionPrice">{{textList.transactionPrice}}万元</span>
+							<span>--</span>
 						</p>
 						<p class="list-content-text">
 							<span>总面积：</span>
-							<span>{{textList.acreage||"--"}}</span>
+							<span v-if="textList.transactionPrice">{{textList.transactionPrice}}平方米</span>
+							<span>--</span>
 						</p>
 						<p class="list-content-text">
 							<span>合同签订：</span>
@@ -70,7 +72,7 @@
 
 				</p>
 				<p>
-					<label class="label">面积</label>
+					<label class="label">面积（平方米）</label>
 					<span>{{textList.buildArea||"--"}}</span>
 					<label class="label">土地来源</label>
 					<span>{{textList.landSource||"--"}}</span>
@@ -162,9 +164,9 @@
 					<span>{{textList.auctionEndTime||"--"}}</span>
 				</p>
 				<p>
-					<label class="label">起始价</label>
+					<label class="label">起始价（万元）</label>
 					<span>{{textList.moneyBegin||"--"}}</span>
-					<label class="label">竞买保证金</label>
+					<label class="label">竞买保证金（万元）</label>
 					<span>{{textList.bondmoney||"--"}}</span>
 				</p>
 				<p>
@@ -174,7 +176,7 @@
 					<span>{{textList.investmentIntensity||"--"}}</span>
 				</p>
 				<p>
-					<label class="label">成交价</label>
+					<label class="label">成交价（万元）</label>
 					<span>{{textList.transactionPrice||"--"}}</span>
 					<label class="label">受让人</label>
 					<span>{{textList.company||"--"}}</span>

dsk-operate-ui/src/views/radar/bxprozbgg/details.vue

@@ -22,7 +22,7 @@
 						<img v-if="showimg" src="@/assets/images/bxpro/original1.png">
 						<img v-else src="@/assets/images/bxpro/original.png">
 						<span>
-							<a :href="textList.url">原文链接</a>
+							<a :href="textList.url"  target="_blank">原文链接</a>
 						</span>
 					</div>
 

dsk-operate-ui/src/views/radar/debtProject/details.vue

@@ -13,28 +13,40 @@
 				<div class="list">
 					<div class="item color1">
 						<div class="item-left">
-							<h4>{{textList.projectTotalInvestment||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.projectTotalInvestment">{{textList.projectTotalInvestment}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>项目总投资额</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon1.png" />
 					</div>
 					<div class="item color2">
 						<div class="item-left">
-							<h4>{{textList.projectCapital||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.projectCapital">{{textList.projectCapital}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>项目资本金</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon2.png" />
 					</div>
 					<div class="item color3">
 						<div class="item-left">
-							<h4>{{textList.econData_013||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.econData_013">{{textList.econData_013}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>专项债融资</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon3.png" />
 					</div>
 					<div class="item color4">
 						<div class="item-left">
-							<h4>{{textList.specialBondCapital||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.specialBondCapital">{{textList.specialBondCapital}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>专项债用作资本金</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon4.png" />
@@ -43,28 +55,40 @@
 				<div class="list">
 					<div class="item color4">
 						<div class="item-left">
-							<h4>{{textList.otherFunds||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.otherFunds">{{textList.otherFunds}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>其他资金</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon5.png" />
 					</div>
 					<div class="item color3">
 						<div class="item-left">
-							<h4>{{textList.specialBondIssue_number||'--'}}<span>万元 / 10只</span></h4>
+							<h4 v-if="textList.specialBondIssue_number">{{textList.specialBondIssue_number}}<span>万元/ 10只</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>专项债融资额/专项债只数</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon6.png" />
 					</div>
 					<div class="item color4">
 						<div class="item-left">
-							<h4>{{textList.otherFinancing||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.otherFinancing">{{textList.otherFinancing}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>其他融资</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon7.png" />
 					</div>
 					<div class="item color2">
 						<div class="item-left">
-							<h4>{{textList.govSupportFunds||'--'}}<span>万元</span></h4>
+							<h4 v-if="textList.govSupportFunds">{{textList.govSupportFunds}}<span>万元</span></h4>
+							<h4 v-else>
+								--
+							</h4>
 							<p>政府安排资金</p>
 						</div>
 						<img class="img" src="@/assets/images/financing/icon8.png" />
@@ -77,27 +101,33 @@
 			<div class="main3-box">
 				<p>
 					<label class="label">项目总收益/项目总债务融资本息(覆盖倍数)</label>
-					<span>{{textList.econData_007||'--'}}</span>
+					<span v-if="textList.econData_007">{{textList.econData_007}}倍</span>
+					<span>--</span>
 				</p>
 				<p>
 					<label class="label">项目总收益/项目总地方债券融资本息</label>
-					<span>{{textList.econData_008||'--'}}</span>
+					<span v-if="textList.econData_008">{{textList.econData_008}}倍</span>
+					<span>--</span>
 				</p>
 				<p>
 					<label class="label">项目总收益/项目总投资</label>
-					<span>{{textList.econData_009||'--'}}</span>
+					<span v-if="textList.econData_009">{{textList.econData_009}}倍</span>
+					<span>--</span>
 				</p>
 				<p>
 					<label class="label">项目总收益/项目总地方债券融资本金</label>
-					<span>{{textList.econData_010||'--'}}</span>
+					<span v-if="textList.econData_010">{{textList.econData_010}}倍</span>
+					<span>--</span>
 				</p>
 				<p>
 					<label class="label">项目总收益/项目总债务融资本金</label>
-					<span>{{textList.econData_011||'--'}}</span>
+					<span v-if="textList.econData_011">{{textList.econData_011}}倍</span>
+					<span>--</span>
 				</p>
 				<p>
 					<label class="label">项目预测总收益</label>
-					<span>{{textList.projectForecastTotalRevenue||'--'}}</span>
+					<span v-if="textList.projectForecastTotalRevenue">{{textList.projectForecastTotalRevenue}}万元</span>
+					<span>--</span>
 				</p>
 			</div>
 		</div>