From 9fc679c00312581991886c7f5d9c314944998410 Mon Sep 17 00:00:00 2001
From: lSun <15893999301@qq.com>
Date: Tue, 31 Dec 2024 14:32:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config.js                                            | 12 ++++++------
 manifest.json                                        |  6 +++---
 pages/login.vue                                      |  9 ++++++---
 pages/realName/index/index.vue                       |  4 ++--
 .../workbench/dailyPlanManagement/details.vue        |  9 ++++++---
 .../realName/workbench/dailyPlanManagement/index.vue |  3 ++-
 pages/realName/workbench/index.vue                   |  5 ++---
 7 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/config.js b/config.js
index b9e6b45..cfaaf36 100644
--- a/config.js
+++ b/config.js
@@ -60,17 +60,17 @@ module.exports = {
 
 
 	//兰坪实名制
-	lpBaseUrl: 'http://192.168.2.131:1910/',
+	lpBaseUrl: 'http://192.168.0.14:31910/',
 	//兰坪实名制移动端--移动
-	lpAppUrl: 'http://192.168.2.131:1913/app',
+	lpAppUrl: 'http://192.168.0.14:31913/app',
 	//兰坪实名制移动端--登录
-	lpLoginUrl: 'http://192.168.2.131:9200/',
+	lpLoginUrl: 'http://192.168.0.14:39200/',
 	//兰坪实名制移动端--后台
-	lpBmwUrl: 'http://192.168.2.131:1912',
+	lpBmwUrl: 'http://192.168.0.14:31912',
 	// 兰坪实名制移动端-文件
-	lpFileUrl: 'http://192.168.2.131:1909/file/',
+	lpFileUrl: 'http://192.168.0.14:31909/file/',
 	// 兰坪实名制移动端-安培
-	lpExamUrl: 'http://192.168.2.131:1910/system',
+	lpExamUrl: 'http://192.168.0.14:31910/system',
 	
 	// //实名制移动端 -- 新
 	realNewYnUrl: 'http://192.168.0.14:1918',
diff --git a/manifest.json b/manifest.json
index 4297479..45648e7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
-    "name" : "作业管控智慧平台",
-    "appid" : "__UNI__4165875",
-    "description" : "作业管控智慧平台",
+    "name" : "兰坪实名制",
+    "appid" : "__UNI__FA2378B",
+    "description" : "兰坪实名制",
     "versionName" : "1.0.11",
     "versionCode" : 111,
     "transformPx" : false,
diff --git a/pages/login.vue b/pages/login.vue
index 3cd6d25..1b2427a 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -2,7 +2,7 @@
   <view class="normal-login-container">
     <view class="logo-content align-center justify-center flex">
       <view class="logo-img"></view>
-      <view class="title">作业管控智慧平台</view>
+      <view class="title">兰坪实名制</view>
     </view>
     <view class="login-form-content">
       <view class="login-form">
@@ -242,8 +242,11 @@ export default {
     return {
       selectTab: 1,
       loginForm: {
-        phone: '14769014289', // 18955734761  18700000001  17681010134 15955147005 15656751631
-        pd: 'Lphd@123456' //YNsbd@123456   Lv@200018
+        // phone: '14769014289', // 18955734761  18700000001  17681010134 15955147005 15656751631
+        // pd: 'Lphd@123456' ,//YNsbd@123456   Lv@200018
+		
+		phone: '',
+		pd: ''
       },
       loginForm0: {
         phone: this.$store.state.user.phone,
diff --git a/pages/realName/index/index.vue b/pages/realName/index/index.vue
index f76f24b..43b7791 100644
--- a/pages/realName/index/index.vue
+++ b/pages/realName/index/index.vue
@@ -359,7 +359,7 @@
 				showPopup: false,
 
 				showPopupBan: false,
-				countdown: 1,
+				countdown: 10,
 				timer: null,
 				safetyRules: [
 					'严禁未经安全教育培训合格人员进入施工现场',
@@ -529,7 +529,7 @@
 
 			showRules() {
 				this.showPopupBan = true;
-				this.countdown = 1;
+				this.countdown = 10;
 				this.startCountdown();
 			},
 			
diff --git a/pages/realName/workbench/dailyPlanManagement/details.vue b/pages/realName/workbench/dailyPlanManagement/details.vue
index 6d8a94e..3196b06 100644
--- a/pages/realName/workbench/dailyPlanManagement/details.vue
+++ b/pages/realName/workbench/dailyPlanManagement/details.vue
@@ -47,8 +47,9 @@
 		<!-- Image Upload Section -->
 		<view class="image-upload-section">
 			<text class="upload-title">* 当天作业人员合照</text>
-
-			<image v-if="imageUrl" :src="imageUrl" mode="aspectFit" class="preview-image"></image>
+			<view class="upload-area" >
+				<image :src="imageUrl"  class="preview-image"></image>
+			</view>
 		</view>
 	</view>
 </template>
@@ -96,7 +97,9 @@
 						console.log('日计划详情', res)
 						if (res.data.code == 200) {
 							this.tableData = res.data.data.contentList;
-							this.imageUrl = config.lpBmwUrl +  res.data.data.path;
+							this.imageUrl = config.lpBmwUrl +"/bmw/"+  res.data.data.path;
+							// this.imageUrl = "http://192.168.0.14:31912/bmw/"+  res.data.data.path;
+							console.log(this.imageUrl)
 							this.planWorkNum = res.data.data.planWorkNum
 						} else {
 							uni.$u.toast(res.data.msg);
diff --git a/pages/realName/workbench/dailyPlanManagement/index.vue b/pages/realName/workbench/dailyPlanManagement/index.vue
index db44695..c01cb8e 100644
--- a/pages/realName/workbench/dailyPlanManagement/index.vue
+++ b/pages/realName/workbench/dailyPlanManagement/index.vue
@@ -106,7 +106,7 @@
 				uni.navigateTo({ //修改日计划
 					url: `/pages/realName/workbench/dailyPlanManagement/edit?dayId=${encodeURIComponent(this.dayId)}&id=${encodeURIComponent(this.id)}&proName=${encodeURIComponent(this.proName)}`
 				})
-			}
+			},
 
 			uploadPlan() {
 				uni.navigateTo({ //完成情况上传
@@ -151,6 +151,7 @@
 							this.dayId = res.data.data[0].dayId
 						} else {
 							uni.$u.toast(res.data.msg);
+							this.taskList = '';
 						}
 					},
 					fail: err => {
diff --git a/pages/realName/workbench/index.vue b/pages/realName/workbench/index.vue
index a8892fa..b3d7464 100644
--- a/pages/realName/workbench/index.vue
+++ b/pages/realName/workbench/index.vue
@@ -397,12 +397,11 @@
  			getPro() {
  				let param = {
  					id: -1,
- 					// subId:this.subId
- 					subId: '161'
+ 					subId:this.subId
  				}
  				console.log(param)
  				uni.request({
- 					url: config.realAppUrl + '/offLine/getPro',
+ 					url: config.lpAppUrl + '/offLine/getPro',
  					method: 'post',
  					data: param,
  					header: {