3 Commity d284318683 ... 91d7e5dd0f

Autor SHA1 Správa Dátum
  menchuang 91d7e5dd0f sync 带气封堵 历史列表 以及提交 完成 1 rok pred
  menchuang 7210ec0af3 Merge branch 'zdsz3.0' of http://192.168.10.18:3000/wangtong/zd_wechatApp into zdsz3.0 1 rok pred
  menchuang eeda3c3a55 sync 1 rok pred

+ 10 - 0
api/common.js

@@ -469,6 +469,16 @@ export function submitGasSealingProject(param) {
 		'data': param
 	})
 }
+
+//新增/修改 带气封堵施工历史
+export function submitGasSealingHistory(param) {
+	return request({
+		'url': '/zdsz/engineeringAirWall/updateNodeByBo',
+		'method': 'put',
+		'data': param
+	})
+}
+
 //列表 带气封堵施工工程
 export function getGasSealingHistoryList(id, type) {
 	return request({

+ 1 - 1
config.js

@@ -1,7 +1,7 @@
 // 应用全局配置
 module.exports = {
 
-	baseUrl: 'http://192.168.4.20:8080',
+	baseUrl: 'http://192.168.4.6:8080',
 	
 	baseIconUrl: 'https://www.xcx.cczdsz.cn/app/images/',
 	// 应用信息

+ 7 - 2
pages.json

@@ -133,7 +133,12 @@
 			"path": "pages/statistics/history_details_bottom_leg",
 			"style": {
 				"navigationBarTitleText": "历史详情"
-
+			}
+		},
+		{
+			"path": "pages/statistics/history_gas_sealing",
+			"style": {
+				"navigationBarTitleText": "历史详情"
 			}
 		},
 		{
@@ -165,7 +170,7 @@
 		{
 			"path": "pages/gas_sealing_project/gas_sealing_project",
 			"style": {
-				"navigationBarTitleText": "",
+				"navigationBarTitleText": "带气封堵施工",
 				"enablePullDownRefresh": false
 			}
 		}

+ 3 - 3
pages/gas_sealing_project/gas_sealing_project.vue

@@ -637,9 +637,9 @@
 				}
 			}
 
-			uni.setNavigationBarTitle({
-				title: '带气封堵施工'
-			})
+			// uni.setNavigationBarTitle({
+			// 	title: '带气封堵施工'
+			// })
 		},
 		methods: {
 			isEmpty(str) {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 1373 - 0
pages/statistics/history_gas_sealing.vue


+ 11 - 4
pages/statistics/statistics.vue

@@ -685,10 +685,7 @@
 
 
 			chooseNode(item) {
-
 				if (this.EngineeringValue == '民用工程') {
-
-
 					this.typeList = item.nodeReViewStateList
 					this.nodeId = item.id;
 					this.nodeType = item.enginClassification;
@@ -737,6 +734,17 @@
 							.stringify(
 								obj))
 					})
+				} else if (this.EngineeringValue == '带气封堵施工') {
+					this.nodeId = item.id;
+					let obj = {
+						id: this.nodeId,
+						type: item.dictvalue
+					};
+					uni.navigateTo({
+						url: '/pages/statistics/history_gas_sealing?params=' + encodeURIComponent(JSON
+							.stringify(
+								obj))
+					})
 				}
 			},
 			showHistoryList() {
@@ -1421,7 +1429,6 @@
 
 					}
 					getHistoryByUserList(param).then(res => {
-
 						this.totalNum = res.data.total
 
 						if (res.code == '200') {

+ 1 - 1
pages/work/index.vue

@@ -17,7 +17,7 @@
 					<image class="icon-item" :src="loadImgSrc('dggc.png')" v-if="item.title == '顶管工程'"></image>
 					<image class="icon-item" :src="loadImgSrc('jjgc.png')" v-if="item.title == '基建工程'"></image>
 					<image class="icon-item" :src="loadImgSrc('open_bolt.png')" v-if="item.title == '开栓'"></image>
-					<image class="icon-item" :src="loadImgSrc('open_bolt.png')" v-if="item.title == '带气封堵施工'"></image>
+					<image class="icon-item" :src="loadImgSrc('gas_sealing.png')" v-if="item.title == '带气封堵施工'"></image>
 					<view class="GStitle">{{ item.title }}</view>
 				</view>
 			</view>