admin/zhgdyunapp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

需求更新

Browse Source
This commit is contained in:
jiayu 2025-05-16 10:09:07 +08:00
parent 00ecfff5cc
commit 496b389a7a
8 changed files with 57 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main.js
View File

@ -93,11 +93,14 @@ if (process.env.NODE_ENV === 'development') {
} else { } else {
// 生产环境 // 生产环境
console.log('生产环境') console.log('生产环境')
Vue.prototype.url_config = 'http://121.37.106.37:9840/'
// Vue.prototype.url_config = 'http://jxjzw.zhgdyun.com:100/' // 演示平台
// Vue.prototype.work_url = 'http://jxj.zhgdyun.com:33983'// 工作流地址 演示平台
// Vue.prototype.url_config = 'http://117.146.73.156:9809/'// 中新建项目 // Vue.prototype.url_config = 'http://117.146.73.156:9809/'// 中新建项目
// Vue.prototype.work_url = 'http://117.146.73.156:19997'// 工作流地址 通用 // Vue.prototype.work_url = 'http://117.146.73.156:19997'// 工作流地址 通用
// Vue.prototype.url_config = 'http://121.37.106.37:9809/' // 测试环境 // Vue.prototype.url_config = 'http://121.37.106.37:9809/' // 测试环境
Vue.prototype.url_config = 'http://101.43.164.214:11111/' // Vue.prototype.url_config = 'http://101.43.164.214:11111/'
Vue.prototype.work_url = 'http://101.43.164.214:11131'// 工作流地址 通用 // Vue.prototype.work_url = 'http://101.43.164.214:11131'// 工作流地址 通用
// Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址 // Vue.prototype.url_config = 'http://10.168.1.105:11111/' // 线上地址
// Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址 // Vue.prototype.url_config = 'http://10.168.1.104:11111/' // 线上地址
// Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址（弃用） // Vue.prototype.url_config = 'http://47.93.215.234:9809/' // 鞍钢线上地址（弃用）

5
manifest.json
View File

@ -2,9 +2,10 @@
"name" : "智慧安全", //中建四局 "name" : "智慧安全", //中建四局
"appid" : "__UNI__4AA4101", "appid" : "__UNI__4AA4101",
"description" : "", "description" : "",
"versionName" : "1.3.8", "versionName" : "1.4.1",
"versionCode" : 138, "versionCode" : 141,
"transformPx" : false, "transformPx" : false,
"sassImplementationName" : "node-sass",
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
"usingComponents" : true, "usingComponents" : true,

4
pages/projectEnd/laborManage/index.vue
View File

@ -143,14 +143,14 @@
</view> </view>
</view> </view>
<view class="box operateBox"> <view class="box operateBox">
<!-- <view class="item" @click="viewSafeMange"> <view class="item" @click="viewSafeMange">
<view class="imgBox"> <view class="imgBox">
<image src="/static/personManage/aqjy.png" mode="" style="width: 29px;height: 20px;"></image> <image src="/static/personManage/aqjy.png" mode="" style="width: 29px;height: 20px;"></image>
</view> </view>
<view class="txt"> <view class="txt">
安全教育 安全教育
</view> </view>
</view> --> </view>
<view v-if="COMPANY != 'longguang'" class="item" @click="goClockIn" v-show="mobileAttendance==0"> <view v-if="COMPANY != 'longguang'" class="item" @click="goClockIn" v-show="mobileAttendance==0">
<view class="imgBox"> <view class="imgBox">
<image src="/static/personManage/ydkq.png" mode="" style="width: 22px;height: 22px;"></image> <image src="/static/personManage/ydkq.png" mode="" style="width: 22px;height: 22px;"></image>

32
pages/projectEnd/laborManage/queryStaff.vue
View File

@ -49,6 +49,7 @@
</view> </view>
</view> </view>
</view> </view>
<u-select v-model="showSelect" :list="list" @confirm="handleConfirm"></u-select>
</view> </view>
</template> </template>
@ -57,10 +58,19 @@
export default { export default {
data() { data() {
return { return {
list: [{
label: "人员ID",
value: 1,
}, {
label: "定位标签",
value: 2
}],
showSelect: false,
inputVal: "", inputVal: "",
showValue: false, showValue: false,
projectSn: '', projectSn: '',
listData: [], listData: [],
scanId: null
} }
}, },
onLoad() { onLoad() {
@ -101,11 +111,26 @@
uni.scanCode({ uni.scanCode({
onlyFromCamera: true, onlyFromCamera: true,
success: function(res) { success: function(res) {
that.showDetailsBtn(res.result) that.scanId = res.result;
const id = that.scanId.split(':')[1]
// that.showSelect = true;
that.showDetailsBtn('', id)
}, },
fail: function(error) {} fail: function(error) {}
}); });
}, },
handleConfirm(val) {
console.info(val, '======')
let id = '';
let otherId = '';
const value = val[0].value
if(value === 1) {
id = this.scanId
} else {
otherId = this.scanId.split(':')[1]
}
this.showDetailsBtn(id, otherId)
},
//输入框失去焦点时 //输入框失去焦点时
blur() { blur() {
if (this.inputVal == '') { if (this.inputVal == '') {
@ -113,9 +138,10 @@
} }
}, },
showDetailsBtn(id) { showDetailsBtn(id, otherId) {
console.info(id, '=========', otherId)
uni.navigateTo({ uni.navigateTo({
url: './searchTeam/personDetail?id=' + id url: './searchTeam/personDetail?id=' + id + '&otherId=' + otherId
}) })
}, },
} }

5
pages/projectEnd/laborManage/safetyEducationManage/add.vue
View File

@ -54,7 +54,7 @@
<text class="star">*</text>培训人 <text class="star">*</text>培训人
</view> </view>
<view class="uni-form-input"> <view class="uni-form-input">
<input class="uni-input" placeholder-class="cl" name="eduTeacher" :value="form.eduTeacher" <input class="uni-input" placeholder-class="cl" name="eduTeacher" v-model="form.eduTeacher"
placeholder="请输入" /> placeholder="请输入" />
</view> </view>
</view> </view>
@ -105,7 +105,7 @@
培训课时(分钟) 培训课时(分钟)
</view> </view>
<view class="uni-form-input"> <view class="uni-form-input">
<input class="uni-input" placeholder-class="cl" name="eduClasshour" :value="form.eduClasshour" <input class="uni-input" placeholder-class="cl" name="eduClasshour" v-model="form.eduClasshour"
placeholder="请输入" /> placeholder="请输入" />
</view> </view>
</view> </view>
@ -445,7 +445,6 @@
}) })
return false; return false;
} }
if (this.form.eduClasshour==0) { if (this.form.eduClasshour==0) {
uni.showToast({ uni.showToast({
title: '培训课时不能为零', title: '培训课时不能为零',

15
pages/projectEnd/laborManage/searchTeam/personDetail.vue
View File

@ -339,6 +339,7 @@
pdgroundColor: '#000', pdgroundColor: '#000',
qrUrl: '此二维码仅供展示', qrUrl: '此二维码仅供展示',
workerId: 0, workerId: 0,
otherId: null,
operateType: false, operateType: false,
originWorkerInfo: {}, // 原始基本信息 originWorkerInfo: {}, // 原始基本信息
workerInfo: {}, //基本信息 workerInfo: {}, //基本信息
@ -363,15 +364,16 @@
}, },
onLoad(options) { onLoad(options) {
this.workerId = options.id; this.workerId = options.id;
this.otherId = options.otherId;
this.btnAuth = this.checkBtnPermission({ this.btnAuth = this.checkBtnPermission({
key: 'assist_attendance', key: 'assist_attendance',
menuPath: '/project/labor/attendanceManage' menuPath: '/project/labor/attendanceManage'
}) })
// this.getDetailsData(); // this.getDetailsData();
}, },
onShow() { async onShow() {
this.getDetailsData(); await this.getDetailsData();
this.getSafeScoreDetail(); await this.getSafeScoreDetail();
}, },
methods: { methods: {
goTo() { goTo() {
@ -441,18 +443,23 @@
}, },
//获取详情数据 //获取详情数据
getDetailsData() { getDetailsData() {
console.info("otherId", this.otherId)
this.sendRequest({ this.sendRequest({
url: 'xmgl/workerInfo/viewWorkerInfoDetail', url: 'xmgl/workerInfo/viewWorkerInfoDetail',
method: 'post', method: 'post',
data: { data: {
workerId: this.workerId, workerId: this.workerId || undefined,
locationCardno: this.otherId || undefined,
projectSn: JSON.parse(uni.getStorageSync('projectDetail')).projectSn
}, },
success: res => { success: res => {
console.log('res', res)
if (res.code == 200) { if (res.code == 200) {
this.originWorkerInfo = { this.originWorkerInfo = {
...res.result.workerInfo ...res.result.workerInfo
}; };
this.workerInfo = res.result.workerInfo; this.workerInfo = res.result.workerInfo;
this.workerId = this.workerInfo.id;
console.info(res.result) console.info(res.result)
this.productRecord(res.result.workerInfo) this.productRecord(res.result.workerInfo)
//获取证书附件 //获取证书附件

2
pages/projectEnd/projectIndex/projectIndex.vue
View File

@ -149,7 +149,7 @@
closeBle closeBle
} from '@/static/js/BLEConn.js' } from '@/static/js/BLEConn.js'
import { import {
getBottomLevelData getBottomLevelData, exitApp
} from "@/utils/tool.js" } from "@/utils/tool.js"
export default { export default {

7
pages/videoManage/playVideo.vue
View File

@ -6,8 +6,8 @@
</view> </view>
</headers> </headers>
<!-- <video class="videoBox" id="myVideo" :custom-cache="false" :src="url" controls autoplay></video> --> <!-- <video class="videoBox" id="myVideo" :custom-cache="false" :src="url" controls autoplay></video> -->
<!-- 外网IP地址访问视频监控 --> <video v-if="!isYsy" class="videoBox" id="myVideo" :custom-cache="false" :src="playUrlFilter" controls autoplay></video>
<view v-show="isYsy && playUrlFilter && accessToken" :style="{width: '100%', height: '225px'}"> <view v-if="isYsy && playUrlFilter && accessToken" :style="{width: '100%', height: '225px'}">
<!-- H5环境使用ezuikit --> <!-- H5环境使用ezuikit -->
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<iframe :src="ysyPlayUrl" :style="webviewStyles" frameborder="0" :scrolling="'no'"></iframe> <iframe :src="ysyPlayUrl" :style="webviewStyles" frameborder="0" :scrolling="'no'"></iframe>
@ -21,7 +21,6 @@
></web-view> ></web-view>
<!-- #endif --> <!-- #endif -->
</view> </view>
<video v-show="!isYsy" class="videoBox" id="myVideo" :custom-cache="false" :src="playUrlFilter" controls autoplay></video>
<view class="videoName"> <view class="videoName">
{{videoInfo.videoName}} {{videoInfo.videoName}}
<button v-if="videoInfo.videoType==3" type="primary" class="changeBtn btn" @click="changeStreamFn">{{streamType==1?'切换到主码流':'切换到子码流'}}</button> <button v-if="videoInfo.videoType==3" type="primary" class="changeBtn btn" @click="changeStreamFn">{{streamType==1?'切换到主码流':'切换到子码流'}}</button>
@ -72,6 +71,7 @@
}; };
}, },
onLoad(options) { onLoad(options) {
this.projectSn = JSON.parse(uni.getStorageSync('projectDetail')).projectSn;
//videoType 1萤石云，2乐橙，3ISC，4大华，5宇视，6国标 //videoType 1萤石云，2乐橙，3ISC，4大华，5宇视，6国标
// this.url = options.url // this.url = options.url
this.videoInfo=uni.getStorageSync('videoInfo') this.videoInfo=uni.getStorageSync('videoInfo')
@ -100,6 +100,7 @@
return this.url return this.url
}, },
isYsy(){ isYsy(){
console.info(this.videoInfo?.videoType, '======')
return this.videoInfo?.videoType == 1 return this.videoInfo?.videoType == 1
}, },
ysyPlayUrl() { ysyPlayUrl() {