2 コミット 8ad495bb57 ... d22293c72b

作者 SHA1 メッセージ 日付
  menchuang d22293c72b Merge branch 'zdsz3.0' of http://192.168.10.18:3000/wangtong/zd_wechatApp into zdsz3.0 11 ヶ月 前
  menchuang 22a62b88f2 sync 11 ヶ月 前
3 ファイル変更36 行追加8 行削除
  1. 8 1
      api/common.js
  2. 2 2
      config.js
  3. 26 5
      pages/statistics/statistics.vue

+ 8 - 1
api/common.js

@@ -572,4 +572,11 @@ export function getProjectStatisticsData(id, type) {
 		'url': '/zdsz/engineeringWasteMaterial/' + id + '/' + type,
 		'method': 'get',
 	})
-}
+}
+//工程进度详情
+export function getProjectScheduleDetails(id, type) {
+	return request({
+		'url': '/zdsz/engineeringGY/' + id + '/' + type,
+		'method': 'get',
+	})
+}

+ 2 - 2
config.js

@@ -2,9 +2,9 @@
 module.exports = {
 
 	//baseUrl: 'https://www.xcx.cczdsz.cn/prod-api',
-	// baseUrl: 'http://192.168.4.88:8080',
+	baseUrl: 'http://192.168.4.88:8080',
 	 //baseUrl: 'http://192.168.4.23:8080',
-	baseUrl: 'http://192.168.4.20:8080',
+	// baseUrl: 'http://192.168.4.20:8080',
 	// baseUrl: 'http://192.168.4.6:8080',
 
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',

+ 26 - 5
pages/statistics/statistics.vue

@@ -267,7 +267,7 @@
 						</view>
 						<view class="felx-row" v-for="(item, index) in projectBody01.nodeCheck" :key="index">
 							<view class="h-td" style="flex: 1">{{ item.name }}</view>
-							<view class="h-td" style="flex: 1">{{ item.value }}</view>
+							<view class="h-td" style="flex: 1" @click="industryItemClick(item)">{{ item.value }}</view>
 						</view>
 					</view>
 				</view>
@@ -696,7 +696,9 @@
 			</view>
 		</view>
 
-		<bottom-sheet ref="refShare" :data="historyList"></bottom-sheet>
+		<bottomSheet> ref="refShare" :data="historyList"></bottomSheet>
+		<BottomSheetNew> ref="refShareNew" :data="historyListNew"></BottomSheetNew>
+		<bottomSheetMore> ref="refShareMore" :data="historyListMore"></bottomSheetMore>
 		<SelectPicker :list="selectList" @change="changeSelect" v-if="open" @close="close" titleKey="name"
 			subtitleKey="id" v-model="name"></SelectPicker>
 
@@ -712,6 +714,9 @@
 	import SelectPicker from '../../components/selectPicker/select_picker.vue'
 	import bottomSheet from '../../components/bottomSheet/bottomSheet.vue'
 	import CCBProjectList from '../../uni_modules/cc-pullScroolView/components/cc-pullScroolView/cc-pullScroolView.vue';
+	import bottomSheetNew from '../../components/bottomSheet/bottomSheetMoreNew.vue'
+	import bottomSheetMore from '../../components/bottomSheet/bottomSheetMore.vue'
+
 	import {
 		gethistoryList,
 		getKShistoryList,
@@ -742,19 +747,23 @@
 		getengineeringNameListNew,
 		getengineeringNameList,
 		getTopPipeNameList,
-		getProjectName
+		getProjectName,
+		getProjectScheduleDetails
 	} from '@/api/common'
 
 	export default {
 		components: {
 			SelectPicker,
 			CCBProjectList,
-			bottomSheet
-
+			bottomSheet,
+			bottomSheetNew,
+			bottomSheetMore
 		},
 		data() {
 			return {
 				historyList: {}, //历史数据
+				historyListNew: {}, //历史数据
+				historyListMore: {}, //历史数据
 				userRole: getUserRole(),
 				tabValue: ['旧改', '新建'],
 				tabIndex: 0,
@@ -907,6 +916,12 @@
 
 		},
 		methods: {
+			industryItemClick(item) {
+				getProjectScheduleDetails(this.projectObj01.id, item.name).then(res => {
+					this.historyListNew=res.data;
+					this.showHistoryNewList();
+				})
+			},
 			changeSelectP(item, index) {
 				this.openP = false;
 				let type = this.currentProjectType;
@@ -1067,6 +1082,12 @@
 			showHistoryList() {
 				this.$refs.refShare.handleShowShare();
 			},
+			showHistoryNewList() {
+				this.$refs.refShareNew.handleShowShare();
+			},
+			showHistoryMoreList() {
+				this.$refs.refShareMore.handleShowShare();
+			},
 			showTypeSheet(item) {
 				if (this.isLeader == 'sys_user') {