haozq
/
lj_zhgd-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加手环名称，一些图片修改

This commit is contained in:
zzyuan 2024-12-10 09:36:11 +08:00
parent 720aada784
commit 87d0b2a87c
28 changed files with 5136 additions and 3983 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zhgd-app/pages/bracelet/bracelet.vue
View File

@ -29,7 +29,7 @@
<view class="list-item">
<view class="item-header">
<view class="header-status">
<text style="margin-left: 20rpx;max-width: 65%;word-break: break-all;height: 100%;">{{item.shCode}}</text>
<text style="margin-left: 20rpx;max-width: 65%;word-break: break-all;height: 100%;">{{item.shName}}</text>
<view style="display: flex;align-items: center;">
<image src="@/static/img/electrical.png" v-if="item.dl&&Number(item.dl.replace('%',''))==100" mode="" style="width: 40rpx;height: 20rpx;margin-left: 30rpx;"></image>
@ -50,6 +50,10 @@
<text class="label">使用人：</text>
<text class="info">{{item.userName}}</text>
</view>
<view class="item-text">
<text class="label">手环编号：</text>
<text class="info">{{item.shCode}}</text>
</view>
<view class="item-text">
<text class="label">身份证号：</text>
<text class="info">{{item.idCard}}</text>

9
zhgd-app/pages/bracelet/braceletBack.vue
View File

@ -19,7 +19,7 @@
<u-checkbox-group v-model="item.checked" style="transform:scale(1.4)" @change="handleCheck(item)">
<u-checkbox :customStyle="{margin: '0rpx 20rpx'}" shape="circle" :label="''" :name="item.devId"></u-checkbox>
</u-checkbox-group>
<text style="margin-left: 20rpx;">{{item.shCode}}</text>
<text style="margin-left: 20rpx;">{{item.shName}}</text>
<view style="display: flex;align-items: center;">
<image src="@/static/img/electrical1.png" mode="" style="width: 40rpx;height: 20rpx;margin-left: 30rpx;"></image>
<text style="margin-left: 20rpx;">{{item.dl}}</text>
@ -35,6 +35,10 @@
<text class="label">使用人：</text>
<text class="info">{{item.userName}}</text>
</view>
<view class="item-text">
<text class="label">手环编号：</text>
<text class="info">{{item.shCode}}</text>
</view>
<view class="item-text">
<text class="label">身份证号：</text>
<text class="info">{{item.idCard}}</text>
@ -320,6 +324,9 @@
</script>
<style lang="scss">
::v-deep .u-modal__content {
word-break: break-all;
}
.search-box{
width: 100%;
height: 60rpx;

33
zhgd-app/pages/staff/staff.vue
View File

@ -42,7 +42,7 @@
<view class="list-item">
<view class="item-header">
<view class="header-status">
<text style="margin-left: 20rpx;max-width:65%;word-break: break-all;height: 100%;">{{item.shCode}}</text>
<text style="margin-left: 20rpx;max-width:65%;word-break: break-all;height: 100%;">{{item.shName}}</text>
<view style="display: flex;align-items: center;">
<image src="@/static/img/electrical.png" v-if="Number(item.dl)==100" mode="" style="width: 40rpx;height: 20rpx;margin-left: 30rpx;"></image>
@ -75,6 +75,10 @@
<text class="label">联系方式：</text>
<text class="info">{{item.phone}}</text>
</view>
<view class="item-text">
<text class="label">手环编号：</text>
<text class="info">{{item.shCode}}</text>
</view>
<view class="item-text">
<text class="label">安全帽：</text>
<text class="info">{{item.aqmCode}}</text>
@ -130,6 +134,7 @@
},
data() {
return {
timer: null,
proList:[],
proId:'',
powerList:[],
@ -149,11 +154,22 @@
};
},
onLoad() {
// this.loadmore()
// this.getProList()
this.getProList()
},
onShow() {
this.getProList()
this.timer = setInterval(() => {
console.log('定时器触发');
// 这里可以添加你需要定时执行的代码
this.loadmore()
}, 3000);
},
onHide() {
// 页面隐藏时清除定时器
clearInterval(this.timer);
},
onUnload() {
// 页面卸载时清除定时器
clearInterval(this.timer);
},
methods: {
getProList(){
@ -382,6 +398,7 @@
myBMapGL1().then((res) => {
// 创建地图实例
bmap = new BMapGL.Map("container");
console.log(1111)
bmap.centerAndZoom(new BMapGL.Point(this.center.longitude, this.center.latitude), 18);
// 这里边写加载完成之后的执行操作
bmap.enableScrollWheelZoom(true);
@ -391,6 +408,7 @@
/* 添加人员定位的覆盖物 */
addPersonMarker(item) {
// console.log(item);
console.log(3333)
let point = new BMapGL.Point(item.lon, item.lat)
let marker = "", myIcon = "";
if (item.isWarn === 0) {
@ -412,12 +430,14 @@
console.log(newValue,"newValue")
if(newValue.distance){
this.center=newValue;
// console.log(this.center)
const lon = Number(this.center.longitude);
const lat = Number(this.center.latitude);
this.circleRange.center.lng = lon;
this.circleRange.center.lat = lat;
this.circleRange.radius = Number(this.center.distance);
// 根据杆塔坐标 重新定义中心点 并绘制施工半径
console.log(22222)
const point = new BMapGL.Point(lon, lat);
bmap.centerAndZoom(point, 18);
const circle = new BMapGL.Circle(point, this.circleRange.radius, {
@ -438,9 +458,10 @@
const personList = newValue;
if (personList && personList.length > 0) {
for(let index = 0; index < personList.length; index++) {
let item = personList[index];
let item = personList[index];
if (item.lon && item.lat) {
this.addPersonMarker(item);
setTimeout(() => {this.addPersonMarker(item)}, 200);
// this.addPersonMarker(item);
}
}
}

4
zhgd-app/service/config.js
View File

@ -5,8 +5,8 @@ const CONFIG = {
// TEST_URL: 'http://10.40.92.44:18080', //文
// TEST_URL: 'http://10.40.92.95:18080', //郝
// TEST_URL: 'http://192.168.0.39:18080', // 测试环境
// TEST_URL: 'http://192.168.0.14:21900',
TEST_URL: 'http://192.168.0.39:18080',
TEST_URL: 'http://192.168.0.14:21900',
// TEST_URL: 'http://192.168.0.110:18080',
// TEST_URL: 'http://36.33.26.201:18080',
// POC_URL: 'http://app.uat.dictmc.com', // POC环境
};

12
zhgd-app/unpackage/cache/wgt/__UNI__94036B3/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
zhgd-app/unpackage/cache/wgt/__UNI__94036B3/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

2
zhgd-app/unpackage/cache/wgt/__UNI__94036B3/manifest.json vendored
View File

@ -1 +1 @@
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__94036B3","name":"智慧工地","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Barcode":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":true,"delay":0,"target":"id:1","waiting":true},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"}},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"packagename":"uni.UNI94036B3","custompermissions":true},"apple":{"dSYMs":false,"devices":"universal"},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}},"orientation":"portrait-primary"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"backgroundColor":"#fff","color":"#929292","borderStyle":"rgba(0,0,0,0.4)","list":[{"text":"首页","pagePath":"pages/index/index","iconPath":"static/img/index1.png","selectedIconPath":"static/img/index2.png"},{"text":"我的","pagePath":"pages/my/my","iconPath":"static/img/my1.png","selectedIconPath":"static/img/my2.png"}],"selectedColor":"#0062cc","height":"50px"},"launch_path":"__uniappview.html","adid":"128783290111"}}
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__94036B3","name":"智慧工地","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Barcode":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":true,"delay":0,"target":"id:1","waiting":true},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"}},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"packagename":"uni.UNI94036B3","aliasname":"","password":"","keystore":"html5plus://test","custompermissions":true},"apple":{"dSYMs":false,"devices":"universal"},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}},"orientation":"portrait-primary"},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"backgroundColor":"#fff","color":"#929292","borderStyle":"rgba(0,0,0,0.4)","list":[{"text":"首页","pagePath":"pages/index/index","iconPath":"static/img/index1.png","selectedIconPath":"static/img/index2.png"},{"text":"我的","pagePath":"pages/my/my","iconPath":"static/img/my1.png","selectedIconPath":"static/img/my2.png"}],"selectedColor":"#0062cc","height":"50px"},"launch_path":"__uniappview.html","adid":"128783290111"}}

BIN
zhgd-app/unpackage/cache/wgt/__UNI__94036B3/static/img/closeDevice.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 507 B

12
zhgd-app/unpackage/dist/build/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

2
zhgd-app/unpackage/dist/build/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
zhgd-app/unpackage/dist/build/app-plus/static/img/closeDevice.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 507 B

4497
zhgd-app/unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long

4538
zhgd-app/unpackage/dist/dev/app-plus/app-view.js vendored
View File

File diff suppressed because one or more lines are too long

2
zhgd-app/unpackage/dist/dev/app-plus/manifest.json vendored
View File

@ -1 +1 @@
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__94036B3","name":"智慧工地","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Barcode":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"C:/Users/yuanzhi/Desktop/logo72px.png","xhdpi":"C:/Users/yuanzhi/Desktop/logo96px.png","xxhdpi":"C:/Users/yuanzhi/Desktop/logo144px.png","xxxhdpi":"C:/Users/yuanzhi/Desktop/logo192px.png"}},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{"dSYMs":false},"plugins":{"ad":{},"maps":{},"geolocation":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"backgroundColor":"#fff","color":"#929292","borderStyle":"rgba(0,0,0,0.4)","list":[{"text":"首页","pagePath":"pages/index/index","iconPath":"static/img/index1.png","selectedIconPath":"static/img/index2.png"},{"text":"我的","pagePath":"pages/my/my","iconPath":"static/img/my1.png","selectedIconPath":"static/img/my2.png"}],"selectedColor":"#0062cc","height":"50px"},"launch_path":"__uniappview.html"}}
{"@platforms":["android","iPhone","iPad"],"id":"__UNI__94036B3","name":"智慧工地","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Barcode":{},"Camera":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#fff"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"icons":{"android":{"hdpi":"C:/Users/yuanzhi/Desktop/logo72px.png","xhdpi":"C:/Users/yuanzhi/Desktop/logo96px.png","xxhdpi":"C:/Users/yuanzhi/Desktop/logo144px.png","xxxhdpi":"C:/Users/yuanzhi/Desktop/logo192px.png"}},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{"dSYMs":false},"plugins":{"ad":{},"maps":{},"geolocation":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"uniStatistics":{"enable":false},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"backgroundColor":"#fff","color":"#929292","borderStyle":"rgba(0,0,0,0.4)","list":[{"text":"首页","pagePath":"pages/index/index","iconPath":"static/img/index1.png","selectedIconPath":"static/img/index2.png"},{"text":"我的","pagePath":"pages/my/my","iconPath":"static/img/my1.png","selectedIconPath":"static/img/my2.png"}],"selectedColor":"#0062cc","height":"50px"},"launch_path":"__uniappview.html"}}

BIN
zhgd-app/unpackage/dist/dev/app-plus/static/gif/上.gif vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 65 KiB

BIN
zhgd-app/unpackage/dist/dev/app-plus/static/gif/上下.gif vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 72 KiB

BIN
zhgd-app/unpackage/dist/dev/app-plus/static/gif/上下右.gif vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 80 KiB

BIN
zhgd-app/unpackage/dist/dev/app-plus/static/gif/上下左.gif vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 80 KiB

BIN
zhgd-app/unpackage/dist/dev/app-plus/static/gif/上下左右.gif vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 88 KiB

BIN
zhgd-app/unpackage/dist/dev/app-plus/static/gif/上右.gif vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 73 KiB

BIN
zhgd-app/unpackage/dist/dev/app-plus/static/gif/上左.gif vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 73 KiB

BIN
zhgd-app/unpackage/dist/dev/app-plus/static/gif/上左右.gif vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 79 KiB

BIN
zhgd-app/unpackage/dist/dev/app-plus/static/gif/下.gif vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 64 KiB

BIN
zhgd-app/unpackage/dist/dev/app-plus/static/gif/下右.gif vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 73 KiB

BIN
zhgd-app/unpackage/dist/dev/app-plus/static/gif/下左.gif vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 73 KiB

BIN
zhgd-app/unpackage/dist/dev/app-plus/static/gif/下左右.gif vendored
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 80 KiB

BIN
zhgd-app/unpackage/dist/dev/app-plus/static/img/closeDevice.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 507 B

BIN
zhgd-app/unpackage/release/apk/__UNI__94036B3__20241210093208.apk Normal file
View File

Binary file not shown.