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

flx:修改

Browse Source
This commit is contained in:
Rain_ 2025-10-16 09:18:43 +08:00
parent b10a6dd639
commit 6850d543f7
7 changed files with 438 additions and 422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/request.js
View File

@ -3,10 +3,11 @@
// export const BASE_URL = "http://42.180.188.17:11211/" // export const BASE_URL = "http://42.180.188.17:11211/"
//export const BASE_URL = "http://192.168.8.100:10000" //export const BASE_URL = "http://192.168.8.100:10000"
//export const BASE_URL = "http://106.13.16.28:10000" //export const BASE_URL = "http://106.13.16.28:10000"
export const BASE_URL = "http://219.147.96.219:9809" // 包头 // export const BASE_URL = "http://219.147.96.219:9809" // 包头
// export const BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.34.221:9111" : "http://jxj.zhgdyun.com:18000" // 包头 // export const BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.34.221:9111" : "http://jxj.zhgdyun.com:18000" // 包头
// export const BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.34.221:9111" : "http://219.147.96.219:9809" // 包头线上地址(正式) // export const BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.34.221:9111" : "http://219.147.96.219:9809" // 包头线上地址(正式)
export const BASE_URL = process.env.NODE_ENV === 'development' ? "http://192.168.34.221:9111" : "http://192.168.3.9:39809" // 包头线上地址(内网)
//是否已显示未登录弹窗 //是否已显示未登录弹窗
let showNoLoginTip = false let showNoLoginTip = false

11
main.js
View File

@ -88,8 +88,9 @@ export function createApp() {
// app.config.globalProperties.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址 // app.config.globalProperties.url_config = 'http://182.90.224.237:51234/' //雄哥内网穿透地址
// app.config.globalProperties.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 // app.config.globalProperties.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址
// app.config.globalProperties.url_config = 'http://192.168.34.221:28888/' //郭圣雄本地 // app.config.globalProperties.url_config = 'http://192.168.34.221:28888/' //郭圣雄本地
app.config.globalProperties.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地 // app.config.globalProperties.url_config = 'http://192.168.34.221:9111/' //郭圣雄本地
app.config.globalProperties.work_url = 'http://192.168.34.133:5173' // 工作流地址 app.config.globalProperties.url_config = 'http://101.43.164.214:11000/' //包头映射
app.config.globalProperties.work_url = 'http://192.168.34.133:5173/wflowApp/#/' // 工作流地址
// app.config.globalProperties.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地 // app.config.globalProperties.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地
// app.config.globalProperties.url_config = 'http://192.168.34.155:19111/' //彭洁本地 // app.config.globalProperties.url_config = 'http://192.168.34.155:19111/' //彭洁本地
// app.config.globalProperties.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用） // app.config.globalProperties.work_url = 'http://47.93.215.234:19997' // 工作流线上地址（弃用）
@ -138,8 +139,10 @@ export function createApp() {
} else { } else {
// 生产环境 // 生产环境
console.log('生产环境') console.log('生产环境')
app.config.globalProperties.url_config = "http://219.147.96.219:9809/" // 包头(正式) app.config.globalProperties.url_config = "http://192.168.3.9:39809/" // 包头(内网)
app.config.globalProperties.work_url = "http://219.147.96.219:19997" // 包头工作流线上地址(正式) app.config.globalProperties.work_url = "http://192.168.3.9:39809/wflowApp/#/" // 包头工作流线上地址(内网)
// app.config.globalProperties.url_config = "http://219.147.96.219:9809/" // 包头(正式)
// app.config.globalProperties.work_url = "http://219.147.96.219:19997" // 包头工作流线上地址(正式)
// app.config.globalProperties.url_config = "http://jxj.zhgdyun.com:18000/" // 包头 // app.config.globalProperties.url_config = "http://jxj.zhgdyun.com:18000/" // 包头
// app.config.globalProperties.work_url = "http://jxj.zhgdyun.com:18004" // 包头工作流线上地址 // app.config.globalProperties.work_url = "http://jxj.zhgdyun.com:18004" // 包头工作流线上地址
// app.config.globalProperties.url_config = 'http://10.168.1.105:11111/' // 线上地址 // app.config.globalProperties.url_config = 'http://10.168.1.105:11111/' // 线上地址

11
manifest.json
View File

@ -2,8 +2,8 @@
"name" : "智慧工地系统", "name" : "智慧工地系统",
"appid" : "__UNI__4AA4101", "appid" : "__UNI__4AA4101",
"description" : "", "description" : "",
"versionName" : "1.3.2", "versionName" : "1.3.3",
"versionCode" : 132, "versionCode" : 133,
"transformPx" : false, "transformPx" : false,
/* 5+App特有相关 */ /* 5+App特有相关 */
"app-plus" : { "app-plus" : {
@ -36,10 +36,10 @@
"VideoPlayer" : {}, "VideoPlayer" : {},
"Bluetooth" : {}, "Bluetooth" : {},
"SQLite" : {}, "SQLite" : {},
"Push" : {},
"FaceID" : {}, "FaceID" : {},
"Fingerprint" : {}, "Fingerprint" : {},
"Maps" : {} "Maps" : {},
"Push" : {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute" : {
@ -192,7 +192,8 @@
"maps" : {} "maps" : {}
}, },
"router" : { "router" : {
"mode" : "hash" "mode" : "hash",
"base" : "/app/"
}, },
"optimization" : { "optimization" : {
"gpuAccelerated" : true, // 启用GPU加速 "gpuAccelerated" : true, // 启用GPU加速

26
pages/alarmPage/indexTwo.vue
View File

@ -24,7 +24,7 @@
</picker> </picker>
</view> </view>
</view> </view>
<view class="alarm_main" :style="{paddingTop: (mobileTopHeight + 90) * 1.5 + 'rpx'}"> <view class="alarm_main" :style="{paddingTop: (mobileTopHeight + 90) * 1.8 + 'rpx'}">
<!-- <view class="alarm-item" v-for="(item,index) in listData" :key="index" @click="goHiidden()"> --> <!-- <view class="alarm-item" v-for="(item,index) in listData" :key="index" @click="goHiidden()"> -->
<view class="alarm-item" v-for="(item,index) in listData" :key="index"> <view class="alarm-item" v-for="(item,index) in listData" :key="index">
<view class="item-bottom"> <view class="item-bottom">
@ -54,7 +54,7 @@
<!-- <view class="header-info">未戴安全帽</view> --> <!-- <view class="header-info">未戴安全帽</view> -->
<!-- <view class="header-info">{{}}</view> --> <!-- <view class="header-info">{{}}</view> -->
<view class="header-info"> <view class="header-info">
{{ item.alarmType ? showType[item.alarmType].value : '' }} {{ item.alarmType ? (item.alarmType <= showType.length ? showType[item.alarmType].value : '') : '' }}
</view> </view>
<view class="logo"> <view class="logo">
<image src="/static/aiWarn/aiWarn.png"></image> <image src="/static/aiWarn/aiWarn.png"></image>
@ -106,6 +106,7 @@
import { import {
GetDateStr GetDateStr
} from "@/static/js/util.js" } from "@/static/js/util.js"
import dayjs from 'dayjs';
export default { export default {
data() { data() {
return { return {
@ -157,7 +158,7 @@
userInfo: {}, userInfo: {},
personTypeIndex: 0, personTypeIndex: 0,
searchForm: { searchForm: {
personType: 1, //1、施工人员 2、管理人员 personType: '', //1、施工人员 2、管理人员
attendanceDate: '' attendanceDate: ''
}, },
} }
@ -208,12 +209,14 @@
methods: { methods: {
changeDate(e) { changeDate(e) {
this.searchForm.attendanceDate = e.target.value console.log(e)
this.searchForm.attendanceDate = e.detail.value
this.pageNo = 1 this.pageNo = 1
this.getListData() this.getListData()
}, },
changePersonType(e) { changePersonType(e) {
this.personTypeIndex = e.target.value console.log(e)
this.personTypeIndex = e.detail.value
this.searchForm.personType = this.showType[this.personTypeIndex].id this.searchForm.personType = this.showType[this.personTypeIndex].id
this.pageNo = 1 this.pageNo = 1
this.getListData() this.getListData()
@ -227,8 +230,8 @@
projectSn: this.projectSn, projectSn: this.projectSn,
pageNo: this.pageNo, pageNo: this.pageNo,
pageSize: this.pageSize, pageSize: this.pageSize,
startTime: this.searchForm.attendanceDate, startTime: dayjs(this.searchForm.attendanceDate).format('YYYY-MM-DD') + ' 00:00:00',
endTime: this.searchForm.attendanceDate, endTime: dayjs(this.searchForm.attendanceDate).format('YYYY-MM-DD') + ' 23:59:59',
alarmType: this.searchForm.personType, alarmType: this.searchForm.personType,
isPushed: 1 isPushed: 1
}, },
@ -247,7 +250,14 @@
} }
// console.log('--------') // console.log('--------')
// this.listData = res.result.records // this.listData = res.result.records
this.listData = [...this.listData, ...res.result.records] const resultList = res.result.records.map(item => {
return {
...item,
imageUrl: this.url_config.includes("http") ? this.url_config + 'image/' + item.imageUrl : item.imageUrl,
}
})
console.log('resultList', resultList)
this.listData = [...this.listData, ...resultList]
uni.hideLoading() //关闭加载中 uni.hideLoading() //关闭加载中
} }
} }

1
pages/homePage/components/progressCurve.vue
View File

@ -78,6 +78,7 @@
pxToRpx, pxToRpx,
dateformat dateformat
} from "@/utils/tool.js"; } from "@/utils/tool.js";
import dayjs from "dayjs";
export default { export default {
components: { components: {
uCharts, uCharts,

2
pages/projectEnd/purchasingManage/index.vue
View File

@ -62,7 +62,7 @@
}, { }, {
id: 2, id: 2,
urlImage: thematicActivitie, urlImage: thematicActivitie,
appName: "监造日报", appName: "监造周报",
appPath: '/project/purchasingManage/supervisionDaily' appPath: '/project/purchasingManage/supervisionDaily'
}] }]
}; };

2
pages/projectEnd/purchasingManage/supervisionDaily/index.vue
View File

@ -3,7 +3,7 @@
<view class="fixedheader"> <view class="fixedheader">
<headers :showBack="true"> <headers :showBack="true">
<view class="headerName"> <view class="headerName">
监造日报 监造周报
</view> </view>
<view class="right" @click="screenData()"> <view class="right" @click="screenData()">
<image class="scancode" src="@/static/bthgIcon/screen.png" mode=""></image> <image class="scancode" src="@/static/bthgIcon/screen.png" mode=""></image>