Browse Source

修改问题

wzz 3 years ago
parent
commit
b415180e89
2 changed files with 11 additions and 11 deletions
  1. 6 6
      pages/metrics/importantPage/index.vue
  2. 5 5
      pages/metrics/projectPage/detail.vue

+ 6 - 6
pages/metrics/importantPage/index.vue

@@ -10,7 +10,7 @@
 		
 		<view class="project-box">
 			<view class="project-content display-around-column" v-for="(item, idx) in projectData" :key="idx" style="padding-top: 20rpx;"
-			:class="{ borderBottom: idx == projectData.length - 1 }" @click="enterProjectDeatil(item.id)">
+			:class="{ borderBottom: idx == projectData.length - 1 }" @click="enterProjectDeatil(item.id,dateYear,dateMonth)">
 				<view class="display-between items-center pos-class">
 					<view style="font-size: 30rpx;">{{item.name}}</view>
 					<image v-if="item.importent === '1'" src="/static/important_icon.png" mode="aspectFit" style="width:80rpx;height: 80rpx;"></image>
@@ -53,12 +53,12 @@
 		  this.active = Number(option.idx)
 		  this.dateMonth = option.month;
 		  this.dateYear = option.year;
-		  this.getProjectList(this.active,option.year,option.month)
+		  this.getProjectList(this.active,this.dateYear,this.dateMonth)
 	  },
 	  methods: {
-	    enterProjectDeatil(id) {
+	    enterProjectDeatil(id,y,m) {
 	      uni.navigateTo({
-			url:"/pages/metrics/projectPage/detail?id=" + id
+			url:"/pages/metrics/projectPage/detail?id=" + id + '&year=' + y + '&month=' + m
 	      });
 	    },
 		getProjectList(tabVal,y,m){
@@ -108,10 +108,10 @@
 	      that.active = idx;
 	      switch (idx) {
 	        case 0:
-	        that.getProjectList(0,this.dateYear,this.dateMonth);
+	        that.getProjectList(0,that.dateYear,that.dateMonth);
 	          break;
 	        case 1:
-	        that.getProjectList(1,this.dateYear,this.dateMonth);
+	        that.getProjectList(1,that.dateYear,that.dateMonth);
 	          break;
 	      }
 	    },

+ 5 - 5
pages/metrics/projectPage/detail.vue

@@ -28,7 +28,7 @@
 			<view class="term">
 					<view class="term-name">工业技改:</view>
 					<view class="term-value-group">
-					  <p  class="term-value-item">{{ industryType[itemObj.status] || "-" }}</p>
+					  <p  class="term-value-item">{{ industryType[itemObj.industrial_investment] || "-" }}</p>
 					</view>
 			 </view>
 		     <view class="term">
@@ -122,12 +122,12 @@
 		  return{
 			  itemObj:{},
 			  storeType:{
-				  '0':'库',
-				  '1':'未入库'
+				  '0':'未入库',
+				  '1':'库'
 			  },
 			  constructType:{
-				  '0':'新建',
-				  '1':'续建'
+				  '1':'新建',
+				  '2':'续建'
 			  },
 			  industryType:{
 				  '0':'否',