This commit is contained in:
parent
441ddd816f
commit
4374511cb2
|
|
@ -207,7 +207,7 @@ import eselect from '@/components/tree-select/eselect.vue'
|
||||||
import { onLoad, onReady } from '@dcloudio/uni-app'
|
import { onLoad, onReady } from '@dcloudio/uni-app'
|
||||||
import {
|
import {
|
||||||
getUnitList,
|
getUnitList,
|
||||||
getProjectList,
|
getLeaseProjectListApi,
|
||||||
getConfigList,
|
getConfigList,
|
||||||
getLevelThreeType,
|
getLevelThreeType,
|
||||||
insertApp,
|
insertApp,
|
||||||
|
|
@ -356,7 +356,7 @@ const getProject = async (e) => {
|
||||||
// "isApp":true
|
// "isApp":true
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const res = await getProjectList(obj)
|
const res = await getLeaseProjectListApi(obj)
|
||||||
proList.value = res.data
|
proList.value = res.data
|
||||||
// proId.value=""
|
// proId.value=""
|
||||||
// treeSelect2.value.clearInput();
|
// treeSelect2.value.clearInput();
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,9 @@ onShow(() => {
|
||||||
|
|
||||||
onLoad((opt) => {
|
onLoad((opt) => {
|
||||||
console.log('🚀 ~ onLoad ~ opt:', opt)
|
console.log('🚀 ~ onLoad ~ opt:', opt)
|
||||||
itemId.value = opt.id
|
itemId.value = JSON.parse(opt.id)
|
||||||
publishTask.value = opt.publishTask
|
publishTask.value = JSON.parse(opt.publishTask)
|
||||||
|
console.log('🚀 ~ publishTask.value:', publishTask.value)
|
||||||
console.log('🚀 ~ itemId.value:', itemId.value)
|
console.log('🚀 ~ itemId.value:', itemId.value)
|
||||||
// getList()
|
// getList()
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -142,6 +142,8 @@ export default {
|
||||||
focusTimeout: null,
|
focusTimeout: null,
|
||||||
// 设备信息
|
// 设备信息
|
||||||
systemInfo: null,
|
systemInfo: null,
|
||||||
|
screenHeight: null,
|
||||||
|
screenWidth: null,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onBackPress(options) {
|
onBackPress(options) {
|
||||||
|
|
@ -211,6 +213,10 @@ export default {
|
||||||
const systemInfo = uni.getSystemInfoSync()
|
const systemInfo = uni.getSystemInfoSync()
|
||||||
console.log('设备信息:', systemInfo)
|
console.log('设备信息:', systemInfo)
|
||||||
this.systemInfo = systemInfo
|
this.systemInfo = systemInfo
|
||||||
|
const screenHeight = systemInfo.screenHeight; // 屏幕高度:1000
|
||||||
|
const screenWidth = systemInfo.screenWidth; // 屏幕宽度:600
|
||||||
|
this.screenHeight = screenHeight;
|
||||||
|
this.screenWidth = screenWidth;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('获取设备信息失败:', error)
|
console.error('获取设备信息失败:', error)
|
||||||
}
|
}
|
||||||
|
|
@ -488,7 +494,7 @@ export default {
|
||||||
console.log('拍照前聚焦...')
|
console.log('拍照前聚焦...')
|
||||||
console.log('开始拍照...')
|
console.log('开始拍照...')
|
||||||
CameraPreview.takePicture(
|
CameraPreview.takePicture(
|
||||||
{ width: 640, height: 540, quality: 50 },
|
{ width: this.screenWidth, height: this.screenHeight, quality: 50 },
|
||||||
async (base64PictureData) => {
|
async (base64PictureData) => {
|
||||||
console.log('拍照返回数据', base64PictureData)
|
console.log('拍照返回数据', base64PictureData)
|
||||||
await this.processImage(base64PictureData)
|
await this.processImage(base64PictureData)
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,14 @@ export const getBackInfo = (id,keyWord) => {
|
||||||
url: '/material/select/getUnitList',
|
url: '/material/select/getUnitList',
|
||||||
data:data,
|
data:data,
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
// 领用工程下拉
|
||||||
|
export const getLeaseProjectListApi = (data) => {
|
||||||
|
return http({
|
||||||
|
method: 'POST',
|
||||||
|
url: '/material/select/getLeaseProjectList',
|
||||||
|
data,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
// 工程下拉选
|
// 工程下拉选
|
||||||
export const getProjectList = (data) => {
|
export const getProjectList = (data) => {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue