diff --git a/miniprogram/app.js b/miniprogram/app.js
index de2748f..f2c00b0 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
+    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
     //   httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地
-    // httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
+    httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
     // httpsUrl: "http://139.198.18.188:8083/",
     // url: "http://127.0.0.1:8083/",
     //httpsUrl: "http://127.0.0.1:8083/",
@@ -30,7 +30,8 @@
     indexCount:1,
     nickName:"",
     userName:"",
-    role:"",
+    role:"", // 角色，是管理用户还是普通用户
+    isConfigProject: '', // 管理用户是否配置了选择项目，，1 是【选择项目】，'0'否，【不选择项目】， 
     devcode:"",
     projectList: [], // 项目列表
     safeBookStatus: '0', // 安全生产责任书签署状态

diff --git a/miniprogram/app.js b/miniprogram/app.js
index de2748f..f2c00b0 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
+    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
     //   httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地
-    // httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
+    httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
     // httpsUrl: "http://139.198.18.188:8083/",
     // url: "http://127.0.0.1:8083/",
     //httpsUrl: "http://127.0.0.1:8083/",
@@ -30,7 +30,8 @@
     indexCount:1,
     nickName:"",
     userName:"",
-    role:"",
+    role:"", // 角色，是管理用户还是普通用户
+    isConfigProject: '', // 管理用户是否配置了选择项目，，1 是【选择项目】，'0'否，【不选择项目】， 
     devcode:"",
     projectList: [], // 项目列表
     safeBookStatus: '0', // 安全生产责任书签署状态
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index e04855c..78bb997 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -81,6 +81,7 @@
         position: '', // 位置
         projectId: '', // 所在项目
     },
+    showSelectProject: false,
   },
 
   onDisplay() {
@@ -148,6 +149,16 @@
    */
   onLoad: function (options) {
     var that = this;
+    if(app.globalData.role === 'repair' && app.globalData.isConfigProject === '0') {
+        that.setData({
+            'showSelectProject': true,
+        })
+    } else {
+        that.setData({
+            'showSelectProject': false,
+        })
+    }
+    
     console.log(app.globalData.selectProjectId, '===');
     that.setData({
         'form.project': app.globalData.selectProjectName,

diff --git a/miniprogram/app.js b/miniprogram/app.js
index de2748f..f2c00b0 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
+    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
     //   httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地
-    // httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
+    httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
     // httpsUrl: "http://139.198.18.188:8083/",
     // url: "http://127.0.0.1:8083/",
     //httpsUrl: "http://127.0.0.1:8083/",
@@ -30,7 +30,8 @@
     indexCount:1,
     nickName:"",
     userName:"",
-    role:"",
+    role:"", // 角色，是管理用户还是普通用户
+    isConfigProject: '', // 管理用户是否配置了选择项目，，1 是【选择项目】，'0'否，【不选择项目】， 
     devcode:"",
     projectList: [], // 项目列表
     safeBookStatus: '0', // 安全生产责任书签署状态
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index e04855c..78bb997 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -81,6 +81,7 @@
         position: '', // 位置
         projectId: '', // 所在项目
     },
+    showSelectProject: false,
   },
 
   onDisplay() {
@@ -148,6 +149,16 @@
    */
   onLoad: function (options) {
     var that = this;
+    if(app.globalData.role === 'repair' && app.globalData.isConfigProject === '0') {
+        that.setData({
+            'showSelectProject': true,
+        })
+    } else {
+        that.setData({
+            'showSelectProject': false,
+        })
+    }
+    
     console.log(app.globalData.selectProjectId, '===');
     that.setData({
         'form.project': app.globalData.selectProjectName,
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index e281a5b..9cafc03 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -81,7 +81,7 @@
 
 <van-cell-group>
 	<van-field data-id="factory" value="{{form.factory}}" label="权属单位" bind:blur="confirm" clearable />
-	<!-- <van-row>
+	<van-row wx-if="{{showSelectProject}}">
 		<van-col span="6">
 			<van-field disabled label="所属项目" border="{{ true }}" required/>
 		</van-col>
@@ -91,8 +91,8 @@
 			</van-dropdown-menu>
 		</van-col>
 
-	</van-row> -->
-	<van-field disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
+	</van-row>
+	<van-field wx-if="{{!showSelectProject}}" disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />

diff --git a/miniprogram/app.js b/miniprogram/app.js
index de2748f..f2c00b0 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
+    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
     //   httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地
-    // httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
+    httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
     // httpsUrl: "http://139.198.18.188:8083/",
     // url: "http://127.0.0.1:8083/",
     //httpsUrl: "http://127.0.0.1:8083/",
@@ -30,7 +30,8 @@
     indexCount:1,
     nickName:"",
     userName:"",
-    role:"",
+    role:"", // 角色，是管理用户还是普通用户
+    isConfigProject: '', // 管理用户是否配置了选择项目，，1 是【选择项目】，'0'否，【不选择项目】， 
     devcode:"",
     projectList: [], // 项目列表
     safeBookStatus: '0', // 安全生产责任书签署状态
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index e04855c..78bb997 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -81,6 +81,7 @@
         position: '', // 位置
         projectId: '', // 所在项目
     },
+    showSelectProject: false,
   },
 
   onDisplay() {
@@ -148,6 +149,16 @@
    */
   onLoad: function (options) {
     var that = this;
+    if(app.globalData.role === 'repair' && app.globalData.isConfigProject === '0') {
+        that.setData({
+            'showSelectProject': true,
+        })
+    } else {
+        that.setData({
+            'showSelectProject': false,
+        })
+    }
+    
     console.log(app.globalData.selectProjectId, '===');
     that.setData({
         'form.project': app.globalData.selectProjectName,
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index e281a5b..9cafc03 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -81,7 +81,7 @@
 
 <van-cell-group>
 	<van-field data-id="factory" value="{{form.factory}}" label="权属单位" bind:blur="confirm" clearable />
-	<!-- <van-row>
+	<van-row wx-if="{{showSelectProject}}">
 		<van-col span="6">
 			<van-field disabled label="所属项目" border="{{ true }}" required/>
 		</van-col>
@@ -91,8 +91,8 @@
 			</van-dropdown-menu>
 		</van-col>
 
-	</van-row> -->
-	<van-field disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
+	</van-row>
+	<van-field wx-if="{{!showSelectProject}}" disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index 86e4980..47fc175 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -141,8 +141,8 @@
     var _this = this;
     console.log(wx.getStorageSync('resultObject').longitude, 'ppppp');
     _this.setData({
-        'form.project': app.globalData.selectProjectName,
-        'projectName': app.globalData.selectProjectName,
+        'form.project': app.globalData.selectProjectName || wx.getStorageSync('resultObject').project,
+        'projectName': app.globalData.selectProjectName || wx.getStorageSync('resultObject').project,
         'markers[0].latitude': Number(wx.getStorageSync('resultObject').latitude) ,
         'markers[0].longitude': Number(wx.getStorageSync('resultObject').longitude),
         // 'markers[0].label':'10',

diff --git a/miniprogram/app.js b/miniprogram/app.js
index de2748f..f2c00b0 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
+    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
     //   httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地
-    // httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
+    httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
     // httpsUrl: "http://139.198.18.188:8083/",
     // url: "http://127.0.0.1:8083/",
     //httpsUrl: "http://127.0.0.1:8083/",
@@ -30,7 +30,8 @@
     indexCount:1,
     nickName:"",
     userName:"",
-    role:"",
+    role:"", // 角色，是管理用户还是普通用户
+    isConfigProject: '', // 管理用户是否配置了选择项目，，1 是【选择项目】，'0'否，【不选择项目】， 
     devcode:"",
     projectList: [], // 项目列表
     safeBookStatus: '0', // 安全生产责任书签署状态
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index e04855c..78bb997 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -81,6 +81,7 @@
         position: '', // 位置
         projectId: '', // 所在项目
     },
+    showSelectProject: false,
   },
 
   onDisplay() {
@@ -148,6 +149,16 @@
    */
   onLoad: function (options) {
     var that = this;
+    if(app.globalData.role === 'repair' && app.globalData.isConfigProject === '0') {
+        that.setData({
+            'showSelectProject': true,
+        })
+    } else {
+        that.setData({
+            'showSelectProject': false,
+        })
+    }
+    
     console.log(app.globalData.selectProjectId, '===');
     that.setData({
         'form.project': app.globalData.selectProjectName,
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index e281a5b..9cafc03 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -81,7 +81,7 @@
 
 <van-cell-group>
 	<van-field data-id="factory" value="{{form.factory}}" label="权属单位" bind:blur="confirm" clearable />
-	<!-- <van-row>
+	<van-row wx-if="{{showSelectProject}}">
 		<van-col span="6">
 			<van-field disabled label="所属项目" border="{{ true }}" required/>
 		</van-col>
@@ -91,8 +91,8 @@
 			</van-dropdown-menu>
 		</van-col>
 
-	</van-row> -->
-	<van-field disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
+	</van-row>
+	<van-field wx-if="{{!showSelectProject}}" disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index 86e4980..47fc175 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -141,8 +141,8 @@
     var _this = this;
     console.log(wx.getStorageSync('resultObject').longitude, 'ppppp');
     _this.setData({
-        'form.project': app.globalData.selectProjectName,
-        'projectName': app.globalData.selectProjectName,
+        'form.project': app.globalData.selectProjectName || wx.getStorageSync('resultObject').project,
+        'projectName': app.globalData.selectProjectName || wx.getStorageSync('resultObject').project,
         'markers[0].latitude': Number(wx.getStorageSync('resultObject').latitude) ,
         'markers[0].longitude': Number(wx.getStorageSync('resultObject').longitude),
         // 'markers[0].label':'10',
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.wxml b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
index 3b7ffee..ff7292d 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.wxml
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
@@ -88,7 +88,7 @@
 <van-cell-group>
 	<van-field data-id="factory" value="{{form.factory}}" label="权属单位" bind:blur="confirm" clearable />
 
-	<!-- <van-row>
+	<!-- <van-row wx-if="{{showSelectProject}}">
 		<van-col span="12">
 			<van-field disabled label="所属项目" border="{{ true }}" required/>
 		</van-col>

diff --git a/miniprogram/app.js b/miniprogram/app.js
index de2748f..f2c00b0 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
+    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
     //   httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地
-    // httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
+    httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
     // httpsUrl: "http://139.198.18.188:8083/",
     // url: "http://127.0.0.1:8083/",
     //httpsUrl: "http://127.0.0.1:8083/",
@@ -30,7 +30,8 @@
     indexCount:1,
     nickName:"",
     userName:"",
-    role:"",
+    role:"", // 角色，是管理用户还是普通用户
+    isConfigProject: '', // 管理用户是否配置了选择项目，，1 是【选择项目】，'0'否，【不选择项目】， 
     devcode:"",
     projectList: [], // 项目列表
     safeBookStatus: '0', // 安全生产责任书签署状态
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index e04855c..78bb997 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -81,6 +81,7 @@
         position: '', // 位置
         projectId: '', // 所在项目
     },
+    showSelectProject: false,
   },
 
   onDisplay() {
@@ -148,6 +149,16 @@
    */
   onLoad: function (options) {
     var that = this;
+    if(app.globalData.role === 'repair' && app.globalData.isConfigProject === '0') {
+        that.setData({
+            'showSelectProject': true,
+        })
+    } else {
+        that.setData({
+            'showSelectProject': false,
+        })
+    }
+    
     console.log(app.globalData.selectProjectId, '===');
     that.setData({
         'form.project': app.globalData.selectProjectName,
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index e281a5b..9cafc03 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -81,7 +81,7 @@
 
 <van-cell-group>
 	<van-field data-id="factory" value="{{form.factory}}" label="权属单位" bind:blur="confirm" clearable />
-	<!-- <van-row>
+	<van-row wx-if="{{showSelectProject}}">
 		<van-col span="6">
 			<van-field disabled label="所属项目" border="{{ true }}" required/>
 		</van-col>
@@ -91,8 +91,8 @@
 			</van-dropdown-menu>
 		</van-col>
 
-	</van-row> -->
-	<van-field disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
+	</van-row>
+	<van-field wx-if="{{!showSelectProject}}" disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index 86e4980..47fc175 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -141,8 +141,8 @@
     var _this = this;
     console.log(wx.getStorageSync('resultObject').longitude, 'ppppp');
     _this.setData({
-        'form.project': app.globalData.selectProjectName,
-        'projectName': app.globalData.selectProjectName,
+        'form.project': app.globalData.selectProjectName || wx.getStorageSync('resultObject').project,
+        'projectName': app.globalData.selectProjectName || wx.getStorageSync('resultObject').project,
         'markers[0].latitude': Number(wx.getStorageSync('resultObject').latitude) ,
         'markers[0].longitude': Number(wx.getStorageSync('resultObject').longitude),
         // 'markers[0].label':'10',
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.wxml b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
index 3b7ffee..ff7292d 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.wxml
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
@@ -88,7 +88,7 @@
 <van-cell-group>
 	<van-field data-id="factory" value="{{form.factory}}" label="权属单位" bind:blur="confirm" clearable />
 
-	<!-- <van-row>
+	<!-- <van-row wx-if="{{showSelectProject}}">
 		<van-col span="12">
 			<van-field disabled label="所属项目" border="{{ true }}" required/>
 		</van-col>
diff --git a/miniprogram/pages/indexapp/indexapp.js b/miniprogram/pages/indexapp/indexapp.js
index aa162d2..2255c5e 100644
--- a/miniprogram/pages/indexapp/indexapp.js
+++ b/miniprogram/pages/indexapp/indexapp.js
@@ -43,11 +43,8 @@
     this.setData({
         projectList: projectList
     })
-    if(this.data.projectList.length > 1) { // 多个项目
-        this.setData({
-            actionSheetShow: true
-        })
-    }
+    this.solveSelectProject()
+    this.searchlogs() // 获取列表
   },
 
   /**
@@ -57,6 +54,37 @@
   
   },
 
+//   处理是否开启项目选择框
+solveSelectProject: function () {
+    console.log('此人的角色', app.globalData.role);
+    console.log('配置的管理员进入小程序是否选择项目', app.globalData.isConfigProject);
+    console.log('选择的项目名称', app.globalData.selectProjectName);
+    if(app.globalData.role === 'repair') { // 管理员
+        if(app.globalData.isConfigProject === '1' && app.globalData.selectProjectName) {
+            if (this.data.onshow) {
+                this.initPages();
+              }
+        } else if(app.globalData.isConfigProject === '1' && !app.globalData.selectProjectName){
+            this.setData({
+                actionSheetShow: true
+            })
+        } else {
+            wx.showTabBar()
+        }
+
+    } else { // 普通用户
+        if(app.globalData.selectProjectName) {
+            if (this.data.onshow) {
+                this.initPages();
+              }
+        } else {
+            this.setData({
+                actionSheetShow: true
+            })
+        } 
+    }
+},
+
   /**
    * 生命周期函数--监听页面显示
    */
@@ -66,21 +94,14 @@
     } else {
         wx.hideTabBar()
     }
-    console.log('333333', app.globalData.safeBookStatus);
+    // 获取安全生产责任书的状态
     this.getSafeBookStatus().then(() => {
         this.setData({
             isSign: app.globalData.safeBookStatus == '0' ? false : true
         })
-        if(app.globalData.selectProjectName) {
-            if (this.data.onshow) {
-                this.initPages();
-              }
-        } else {
-            this.setData({
-                actionSheetShow: true
-            })
-        }
-        
+       
+        this.solveSelectProject()
+       
     })
   },
 
@@ -96,12 +117,31 @@
    */
   onReachBottom: function () {
     console.log('触底');
-    if(app.globalData.selectProjectName) {
-        this.getlogs(this.data.devcode)
-    } else {
-        this.setData({
-            actionSheetShow: true
-        })
+    // if(app.globalData.selectProjectName) {
+    //     this.getlogs(this.data.devcode)
+    // } else {
+    //     this.setData({
+    //         actionSheetShow: true
+    //     })
+    // }
+
+    if(app.globalData.role === 'repair') { // 管理员
+        if(app.globalData.isConfigProject === '1' && app.globalData.selectProjectName) {
+            this.getlogs(this.data.devcode)
+        } else if(app.globalData.isConfigProject === '1' && !app.globalData.selectProjectName){
+            this.setData({
+                actionSheetShow: true
+            })
+        }
+
+    } else { // 普通用户
+        if(app.globalData.selectProjectName) {
+            this.getlogs(this.data.devcode)
+        } else {
+            this.setData({
+                actionSheetShow: true
+            })
+        }
     }
   },
 
@@ -222,7 +262,7 @@
       data: {
         devcode: devcode,
         limit: 100,
-        project: app.globalData.selectProjectName,
+        project: (app.globalData.role === 'repair' && app.globalData.isConfigProject === '0') ? '' : app.globalData.selectProjectName ,
         offset: that.data.deviceloglist.length % 100 > 0 ? parseInt(that.data.deviceloglist.length / 100) + 2 : parseInt(that.data.deviceloglist.length / 100) + 1
       },
       header: {
@@ -247,7 +287,7 @@
       url: app.globalData.httpsUrl + "appDeviceLog/listPage",
       data: {
         devcode: devcode,
-        project: app.globalData.selectProjectName,
+        project: (app.globalData.role === 'repair' && app.globalData.isConfigProject === '0') ? '' : app.globalData.selectProjectName ,
         limit: 100,
         offset: 1
       },

diff --git a/miniprogram/app.js b/miniprogram/app.js
index de2748f..f2c00b0 100644
--- a/miniprogram/app.js
+++ b/miniprogram/app.js
@@ -18,9 +18,9 @@
     // this.globalData = {}
   },
   globalData: {
-    httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
+    // httpsUrl: "https://logapi.smartlog.work/", // 20240716线上地址
     //   httpsUrl: "https://38ka911915.picp.vip/", // 周甜本地
-    // httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
+    httpsUrl: "http://192.168.147.39:5905/",// 周甜本地
     // httpsUrl: "http://139.198.18.188:8083/",
     // url: "http://127.0.0.1:8083/",
     //httpsUrl: "http://127.0.0.1:8083/",
@@ -30,7 +30,8 @@
     indexCount:1,
     nickName:"",
     userName:"",
-    role:"",
+    role:"", // 角色，是管理用户还是普通用户
+    isConfigProject: '', // 管理用户是否配置了选择项目，，1 是【选择项目】，'0'否，【不选择项目】， 
     devcode:"",
     projectList: [], // 项目列表
     safeBookStatus: '0', // 安全生产责任书签署状态
diff --git a/miniprogram/pages/addDevice/addDevice.js b/miniprogram/pages/addDevice/addDevice.js
index e04855c..78bb997 100644
--- a/miniprogram/pages/addDevice/addDevice.js
+++ b/miniprogram/pages/addDevice/addDevice.js
@@ -81,6 +81,7 @@
         position: '', // 位置
         projectId: '', // 所在项目
     },
+    showSelectProject: false,
   },
 
   onDisplay() {
@@ -148,6 +149,16 @@
    */
   onLoad: function (options) {
     var that = this;
+    if(app.globalData.role === 'repair' && app.globalData.isConfigProject === '0') {
+        that.setData({
+            'showSelectProject': true,
+        })
+    } else {
+        that.setData({
+            'showSelectProject': false,
+        })
+    }
+    
     console.log(app.globalData.selectProjectId, '===');
     that.setData({
         'form.project': app.globalData.selectProjectName,
diff --git a/miniprogram/pages/addDevice/addDevice.wxml b/miniprogram/pages/addDevice/addDevice.wxml
index e281a5b..9cafc03 100644
--- a/miniprogram/pages/addDevice/addDevice.wxml
+++ b/miniprogram/pages/addDevice/addDevice.wxml
@@ -81,7 +81,7 @@
 
 <van-cell-group>
 	<van-field data-id="factory" value="{{form.factory}}" label="权属单位" bind:blur="confirm" clearable />
-	<!-- <van-row>
+	<van-row wx-if="{{showSelectProject}}">
 		<van-col span="6">
 			<van-field disabled label="所属项目" border="{{ true }}" required/>
 		</van-col>
@@ -91,8 +91,8 @@
 			</van-dropdown-menu>
 		</van-col>
 
-	</van-row> -->
-	<van-field disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
+	</van-row>
+	<van-field wx-if="{{!showSelectProject}}" disabled label="所属项目" value="{{projectName}}" border="{{ true }}" required/>
 	<!-- <van-field value="{{project}}" label="所属项目" required /> -->
 	<!-- <van-field data-id="workmsg" value="{{workmsg}}" label="施工信息" placeholder="施工信息" bind:blur="confirm" required /> -->
 	<van-field data-id="description" value="{{form.description}}" label="备注" placeholder="备注" bind:blur="confirm"clearable />
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.js b/miniprogram/pages/addDevicelog/addDeviceLog.js
index 86e4980..47fc175 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.js
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.js
@@ -141,8 +141,8 @@
     var _this = this;
     console.log(wx.getStorageSync('resultObject').longitude, 'ppppp');
     _this.setData({
-        'form.project': app.globalData.selectProjectName,
-        'projectName': app.globalData.selectProjectName,
+        'form.project': app.globalData.selectProjectName || wx.getStorageSync('resultObject').project,
+        'projectName': app.globalData.selectProjectName || wx.getStorageSync('resultObject').project,
         'markers[0].latitude': Number(wx.getStorageSync('resultObject').latitude) ,
         'markers[0].longitude': Number(wx.getStorageSync('resultObject').longitude),
         // 'markers[0].label':'10',
diff --git a/miniprogram/pages/addDevicelog/addDeviceLog.wxml b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
index 3b7ffee..ff7292d 100644
--- a/miniprogram/pages/addDevicelog/addDeviceLog.wxml
+++ b/miniprogram/pages/addDevicelog/addDeviceLog.wxml
@@ -88,7 +88,7 @@
 <van-cell-group>
 	<van-field data-id="factory" value="{{form.factory}}" label="权属单位" bind:blur="confirm" clearable />
 
-	<!-- <van-row>
+	<!-- <van-row wx-if="{{showSelectProject}}">
 		<van-col span="12">
 			<van-field disabled label="所属项目" border="{{ true }}" required/>
 		</van-col>
diff --git a/miniprogram/pages/indexapp/indexapp.js b/miniprogram/pages/indexapp/indexapp.js
index aa162d2..2255c5e 100644
--- a/miniprogram/pages/indexapp/indexapp.js
+++ b/miniprogram/pages/indexapp/indexapp.js
@@ -43,11 +43,8 @@
     this.setData({
         projectList: projectList
     })
-    if(this.data.projectList.length > 1) { // 多个项目
-        this.setData({
-            actionSheetShow: true
-        })
-    }
+    this.solveSelectProject()
+    this.searchlogs() // 获取列表
   },
 
   /**
@@ -57,6 +54,37 @@
   
   },
 
+//   处理是否开启项目选择框
+solveSelectProject: function () {
+    console.log('此人的角色', app.globalData.role);
+    console.log('配置的管理员进入小程序是否选择项目', app.globalData.isConfigProject);
+    console.log('选择的项目名称', app.globalData.selectProjectName);
+    if(app.globalData.role === 'repair') { // 管理员
+        if(app.globalData.isConfigProject === '1' && app.globalData.selectProjectName) {
+            if (this.data.onshow) {
+                this.initPages();
+              }
+        } else if(app.globalData.isConfigProject === '1' && !app.globalData.selectProjectName){
+            this.setData({
+                actionSheetShow: true
+            })
+        } else {
+            wx.showTabBar()
+        }
+
+    } else { // 普通用户
+        if(app.globalData.selectProjectName) {
+            if (this.data.onshow) {
+                this.initPages();
+              }
+        } else {
+            this.setData({
+                actionSheetShow: true
+            })
+        } 
+    }
+},
+
   /**
    * 生命周期函数--监听页面显示
    */
@@ -66,21 +94,14 @@
     } else {
         wx.hideTabBar()
     }
-    console.log('333333', app.globalData.safeBookStatus);
+    // 获取安全生产责任书的状态
     this.getSafeBookStatus().then(() => {
         this.setData({
             isSign: app.globalData.safeBookStatus == '0' ? false : true
         })
-        if(app.globalData.selectProjectName) {
-            if (this.data.onshow) {
-                this.initPages();
-              }
-        } else {
-            this.setData({
-                actionSheetShow: true
-            })
-        }
-        
+       
+        this.solveSelectProject()
+       
     })
   },
 
@@ -96,12 +117,31 @@
    */
   onReachBottom: function () {
     console.log('触底');
-    if(app.globalData.selectProjectName) {
-        this.getlogs(this.data.devcode)
-    } else {
-        this.setData({
-            actionSheetShow: true
-        })
+    // if(app.globalData.selectProjectName) {
+    //     this.getlogs(this.data.devcode)
+    // } else {
+    //     this.setData({
+    //         actionSheetShow: true
+    //     })
+    // }
+
+    if(app.globalData.role === 'repair') { // 管理员
+        if(app.globalData.isConfigProject === '1' && app.globalData.selectProjectName) {
+            this.getlogs(this.data.devcode)
+        } else if(app.globalData.isConfigProject === '1' && !app.globalData.selectProjectName){
+            this.setData({
+                actionSheetShow: true
+            })
+        }
+
+    } else { // 普通用户
+        if(app.globalData.selectProjectName) {
+            this.getlogs(this.data.devcode)
+        } else {
+            this.setData({
+                actionSheetShow: true
+            })
+        }
     }
   },
 
@@ -222,7 +262,7 @@
       data: {
         devcode: devcode,
         limit: 100,
-        project: app.globalData.selectProjectName,
+        project: (app.globalData.role === 'repair' && app.globalData.isConfigProject === '0') ? '' : app.globalData.selectProjectName ,
         offset: that.data.deviceloglist.length % 100 > 0 ? parseInt(that.data.deviceloglist.length / 100) + 2 : parseInt(that.data.deviceloglist.length / 100) + 1
       },
       header: {
@@ -247,7 +287,7 @@
       url: app.globalData.httpsUrl + "appDeviceLog/listPage",
       data: {
         devcode: devcode,
-        project: app.globalData.selectProjectName,
+        project: (app.globalData.role === 'repair' && app.globalData.isConfigProject === '0') ? '' : app.globalData.selectProjectName ,
         limit: 100,
         offset: 1
       },
diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/login.js
index d5346c4..1df57b3 100644
--- a/miniprogram/pages/login/login.js
+++ b/miniprogram/pages/login/login.js
@@ -287,6 +287,7 @@
                 success: function (res) {
                 if(res.data.code === 200) { 
                     app.globalData.role = res.data.data.role === '1' ? 'repair' : 'member'
+                    app.globalData.isConfigProject = res.data.data.configProject === '0' ? '0' : '1' // 在【批产】里面是否配置了选择小程序
                     app.globalData.userName = res.data.data.phone
                     app.globalData.projectList = res.data.data.projects
                     if(!app.globalData.projectList.length) {