From 677dc094ce10869bf9b0c465baf766ea9a84aedf Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Wed, 7 Aug 2024 10:12:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4zzy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/construction/deviceReceive.js | 37 ++ src/api/select.js | 28 +- src/utils/request.js | 2 +- src/views/base/project/index.vue | 77 ++- src/views/base/staff/index.vue | 2 +- src/views/components/qrCodeUpload.vue | 7 +- .../construction/deviceReceive/index.vue | 514 ++++++++++++++++++ 7 files changed, 634 insertions(+), 33 deletions(-) create mode 100644 src/api/construction/deviceReceive.js create mode 100644 src/views/construction/deviceReceive/index.vue 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 3b99743..5850bfb 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,24 +312,17 @@ 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 - }) - }); - response.data.fileList = []; - - setTimeout(()=>{ - this.open = true; - this.title = "修改项目"; - },100) - - }); + fileId: item.filePath, + url: item.bast64Image + }) + }); + this.open = true; + this.title = "修改项目"; + }); }, // 图片上传 handleChange(file, fileList) { @@ -345,10 +348,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 +425,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 9557be6..4a8ad05 100644 --- a/src/views/base/staff/index.vue +++ b/src/views/base/staff/index.vue @@ -566,7 +566,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 0be2312..3b11f85 100644 --- a/src/views/components/qrCodeUpload.vue +++ b/src/views/components/qrCodeUpload.vue @@ -74,19 +74,20 @@ export default { width = shareContent.offsetWidth, height = shareContent.offsetHeight const maCodeText = document.createElement('div') - maCodeText.innerHTML = '设备编码:' + element + maCodeText.innerHTML = '编码:' + element 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..fa88407 --- /dev/null +++ b/src/views/construction/deviceReceive/index.vue @@ -0,0 +1,514 @@ + + + + + \ No newline at end of file From fc505d661c6697c8f26b1cc3c27e28ec181fb27e Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Wed, 7 Aug 2024 10:19:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=A2=86=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/construction/deviceReceive/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/construction/deviceReceive/index.vue b/src/views/construction/deviceReceive/index.vue index fa88407..1b7e11f 100644 --- a/src/views/construction/deviceReceive/index.vue +++ b/src/views/construction/deviceReceive/index.vue @@ -94,6 +94,7 @@ + @@ -119,7 +120,7 @@ 归还 From 0d1417644aaed4eabc62a9f796b971f142b459c3 Mon Sep 17 00:00:00 2001 From: zzyuan <781948537@qq.com> Date: Wed, 7 Aug 2024 10:24:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=A2=86=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/construction/deviceReceive/index.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/construction/deviceReceive/index.vue b/src/views/construction/deviceReceive/index.vue index 1b7e11f..a316a55 100644 --- a/src/views/construction/deviceReceive/index.vue +++ b/src/views/construction/deviceReceive/index.vue @@ -85,6 +85,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" + v-hasPermi="['basic:equipmentReq:addData']" >设备领用 @@ -120,7 +121,9 @@ 归还 From 57dcfed4504a3b79de04f13f7bd6dca0e9cef48e Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Wed, 7 Aug 2024 15:13:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=A2=86=E7=94=A8=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/construction/deviceReceive/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/construction/deviceReceive/index.vue b/src/views/construction/deviceReceive/index.vue index a316a55..51455b5 100644 --- a/src/views/construction/deviceReceive/index.vue +++ b/src/views/construction/deviceReceive/index.vue @@ -98,7 +98,7 @@ - +