diff --git a/src/api/construction/deviceReceive.js b/src/api/construction/deviceReceive.js new file mode 100644 index 0000000..991fc48 --- /dev/null +++ b/src/api/construction/deviceReceive.js @@ -0,0 +1,37 @@ +import request from '@/utils/request' + +// 查询列表 +export function equipmentReqList(query) { + return request({ + url: '/bracelet/equipmentReq/list', + method: 'get', + params: query + }) +} + +// 新增 +export function addEquipmentData(data) { + return request({ + url: '/bracelet/equipmentReq/addData', + method: 'post', + data: data + }) +} +// 根据设备类型获取设备列表 +export function getUseDevices(query) { + return request({ + url: '/bracelet/equipmentReq/getUseDevices', + method: 'get', + params: query + }) +} + +// 归还设备 +export function returnDevice(data) { + return request({ + url: '/bracelet/equipmentReq/returnDevice', + method: 'post', + data: data + }) +} + diff --git a/src/api/select.js b/src/api/select.js index c474f7f..7e30063 100644 --- a/src/api/select.js +++ b/src/api/select.js @@ -1,6 +1,6 @@ import request from '@/utils/request' //公共下拉选接口集合 - +//工程下拉选 export function getProList(query) { return request({ url: '/system/select/getProList', @@ -8,7 +8,31 @@ export function getProList(query) { params: query }) } - +//班组下拉选 +export function getTeamLists(query) { + return request({ + url: '/system/select/getTeamLists', + method: 'get', + params: query + }) +} +// 根据工程ID获取杆塔下拉选 +export function getPowerLists(query) { + return request({ + url: '/system/select/getPowerLists', + method: 'get', + params: query + }) +} +// 根据设备类型获取设备下拉选 +export function getDeviceLists(query) { + return request({ + url: '/system/select/getPowerLists', + method: 'get', + params: query + }) +} +//杆塔 export function getGtList(query) { return request({ url: '/bracelet/sideband/getGtList', diff --git a/src/utils/request.js b/src/utils/request.js index f3ed4f4..35c956d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -111,7 +111,7 @@ service.interceptors.request.use(config => { // 响应拦截器 service.interceptors.response.use(res => { //自动解密 - console.log("res.data.decrypt=="+res.data.decrypt) + // console.log("res.data.decrypt=="+res.data.decrypt) if(typeof res.data.decrypt!='undefined' && res.data.decrypt){ const resultData=decryptCBC(res.data.data); res.data=JSON.parse(resultData); diff --git a/src/views/base/project/index.vue b/src/views/base/project/index.vue index 3a80a0a..b31ac2b 100644 --- a/src/views/base/project/index.vue +++ b/src/views/base/project/index.vue @@ -77,7 +77,7 @@ @@ -142,9 +142,7 @@ :on-preview="picturePreview" :on-remove="handleRemove" > - + @@ -161,7 +159,18 @@ - +
+
+ +
+
+ +
+
+ +
+
+ @@ -215,6 +224,7 @@ export default { //多图片查看弹窗 dialogImageUrls: [], dialogVisibles: false, + imgIndex:0, // 表单校验 rules: { projectDepartName: [ @@ -243,7 +253,7 @@ export default { computed: { //图片上传1张后，隐藏上传框 uploadDisabled() { - return this.fileList.length > 0 + return this.fileList.length > 4 }, }, methods: { @@ -302,11 +312,9 @@ export default { this.fileList = [] this.reset(); const projectId = row.projectId - getProject(projectId).then(response => { - this.form = response.data; - response.data.fileList.forEach(item => { + this.form.fileList.forEach(item => { this.fileList.push({ fileId: item.filePath, url: item.bast64Image @@ -320,6 +328,13 @@ export default { },100) }); + fileId: item.filePath, + url: item.bast64Image + }) + }); + this.open = true; + this.title = "修改项目"; + }); }, // 图片上传 handleChange(file, fileList) { @@ -345,10 +360,19 @@ export default { this.dialogVisible = true }, //多图片查看 - picturesPreview(fileList) { - console.log(fileList) - this.dialogImageUrls = fileList; - this.dialogVisibles = true; + picturesPreview(row) { + getProject(row.projectId).then(response => { + response.data.fileList.forEach(item => { + this.dialogImageUrls.push({ + fileId: item.filePath, + url: item.bast64Image + }) + }); + this.imgIndex=0 + this.dialogVisibles = true; + + }); + }, //提交时循环fileList 获取raw文件 getFileData() { @@ -413,4 +437,17 @@ export default { } } }; - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/views/base/staff/index.vue b/src/views/base/staff/index.vue index 3cd6c2f..0cd63dc 100644 --- a/src/views/base/staff/index.vue +++ b/src/views/base/staff/index.vue @@ -562,7 +562,7 @@ url: response.data.base64Url }) - this.form.fileName = response.data.fileId; + // this.form.fileName = response.data.fileId; setTimeout(()=>{ this.open = true; this.title = "修改人员"; diff --git a/src/views/components/qrCodeUpload.vue b/src/views/components/qrCodeUpload.vue index 0d732ad..3b11f85 100644 --- a/src/views/components/qrCodeUpload.vue +++ b/src/views/components/qrCodeUpload.vue @@ -78,15 +78,16 @@ export default { maCodeText.style = 'font-size=18px; width:100%;text-align:center;margin:10px;' shareContent.appendChild(maCodeText) + console.log(element) new QRCode(captureId[i], { width: width, height: height, - text: element, + text: element+'', colorDark: '#000', colorLight: '#fff', }) let canvas = document.createElement('canvas'), - scale = 1 + scale = 1.2 canvas.width = width * scale canvas.height = height * scale canvas.style.width = diff --git a/src/views/construction/deviceReceive/index.vue b/src/views/construction/deviceReceive/index.vue new file mode 100644 index 0000000..51455b5 --- /dev/null +++ b/src/views/construction/deviceReceive/index.vue @@ -0,0 +1,518 @@ + + + + + \ No newline at end of file