From c7fe309c56fb21548994a9292edfa8a9d9f7ae32 Mon Sep 17 00:00:00 2001
From: vce <daisy_vce@yeah.net>
Date: Tue, 12 Mar 2024 21:38:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/http.js                                  |  4 ++--
 src/views/projectFront/laborManage/personDetails.vue   |  2 +-
 .../projectFront/materialProcure/unProcureForm.vue     |  2 +-
 src/views/projectFront/wareHouseManage/devManage.vue   | 10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 1b2b505a..fd882353 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -83,12 +83,12 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
   // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工）
   // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
-  axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
+  // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
   // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
   // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
   // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
   // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
-  // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
+  axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
   // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上（最新）地址
   // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上（最新）地址
 
diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue
index c77f7f48..6b753c03 100644
--- a/src/views/projectFront/laborManage/personDetails.vue
+++ b/src/views/projectFront/laborManage/personDetails.vue
@@ -1301,7 +1301,7 @@
                   }}</span>
                 </template>
               </el-table-column>
-              <el-table-column prop="address" :label="dateOfIssue">
+              <el-table-column prop="address" :label="$t('message.laborMange.dateOfIssue')">
                 <template slot-scope="scope">
                   <el-date-picker
                     v-if="scope.row.certificateState"
diff --git a/src/views/projectFront/materialProcure/unProcureForm.vue b/src/views/projectFront/materialProcure/unProcureForm.vue
index 21259232..fafd6d9c 100644
--- a/src/views/projectFront/materialProcure/unProcureForm.vue
+++ b/src/views/projectFront/materialProcure/unProcureForm.vue
@@ -518,7 +518,7 @@ export default {
 <style lang="less" scoped>
 .header-info{
   width: 35%;
-  height: 50px;
+  height: 25px;
   display: flex;
   justify-content: space-between;
   align-items: center;
diff --git a/src/views/projectFront/wareHouseManage/devManage.vue b/src/views/projectFront/wareHouseManage/devManage.vue
index fe71f8b8..50ff0b57 100644
--- a/src/views/projectFront/wareHouseManage/devManage.vue
+++ b/src/views/projectFront/wareHouseManage/devManage.vue
@@ -86,7 +86,7 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="进场时间" prop="entryTime">
+          <el-form-item label="时间" prop="entryTime">
             <el-date-picker
               :disabled="isDetail"
               value-format="yyyy-MM-dd HH:mm:ss"
@@ -152,7 +152,7 @@ export default {
   },
   data() {
     return {
-      id: '',
+      devSn: '',
       pageNo2: 1,
       pageSize2: 10,
       total2: 0,
@@ -351,18 +351,18 @@ export default {
       this.dialogTableVisible = true
       this.pageNo2 = 1
       this.pageSize2 = 10
-      this.id = obj.id
+      this.devSn = obj.devSn
       this.getPageList()
     },
 
-    //获取人员动态--今日数据列表
+    //获取历史数据列表
     getPageList() {
       console.log(this.startTime)
       let data = {
         projectSn: this.$store.state.projectSn,
         pageNo: this.pageNo2,
         pageSize: this.pageSize2,
-        id: this.id
+        devSn: this.devSn
       }
       rtToolPageHistory(data).then((res) => {
         if (res.code == 200) {