haozq
/
lj-zhgd-htweb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修改，设备领用记录

This commit is contained in:
jjLv 2024-08-07 19:29:57 +08:00
parent 896d60bbfa 57dcfed450
commit 56b8659c7a
7 changed files with 637 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/api/construction/deviceReceive.js Normal file
View File

@ -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
})
}

28
src/api/select.js
View File

@ -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',

2
src/utils/request.js
View File

@ -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);

65
src/views/base/project/index.vue
View File

@ -77,7 +77,7 @@
<el-table-column label="电话" align="center" prop="contactInformation" />
<el-table-column label="APP轮播图" align="center" prop="appnum">
<template slot-scope="scope">
<div @click="picturesPreview(scope.row.appnum)" style="color: #02a7f0; cursor: pointer">
<div @click="picturesPreview(scope.row)" style="color: #02a7f0; cursor: pointer">
{{ scope.row.appnum }}
</div>
</template>
@ -142,9 +142,7 @@
:on-preview="picturePreview"
:on-remove="handleRemove"
>
<i
class="el-icon-plus avatar-uploader-icon"
></i>
<i class="el-icon-plus avatar-uploader-icon"></i>
</el-upload>
</el-form-item>
</el-form>
@ -161,7 +159,18 @@
</el-dialog>
<!--多图片查看弹窗 -->
<el-dialog :visible.sync="dialogVisibles">
<img v-for="(item,index) of dialogImageUrls" :key="index" width="100%" height="650px" :src="item" alt />
<div style="width: 100%;height: 600px;display: flex;justify-content: space-between;align-items: center;">
<div style="width: 5%;height: 100%;display: flex;align-items: center;justify-content: center;" >
<i class="el-icon-caret-left" style="font-size: 32px;" @click="imgIndex=imgIndex-1" v-show="imgIndex>0"></i>
</div>
<div style="width: 90%;height: 100%;overflow: hidden;">
<img v-for="(item,index) of dialogImageUrls" :key="index" v-show="imgIndex==index" width="100%" height="500px" :src="item.url" alt />
</div>
<div style="width: 5%;height: 100%;display: flex;align-items: center;" >
<i class="el-icon-caret-right" style="font-size: 32px;" @click="imgIndex=imgIndex+1" v-show="(imgIndex+1)<(dialogImageUrls.length)"></i>
</div>
</div>
</el-dialog>
</div>
</template>
@ -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 {
}
}
};
</script>
</script>
<style lang="scss" scoped>
::v-deep.el-table .fixed-width .el-button--mini {
width: 60px !important;
margin-bottom: 10px;
}
//隐藏图片上传框的css
::v-deep.disabled {
.el-upload--picture-card {
display: none;
}
}
</style>

2
src/views/base/staff/index.vue
View File

@ -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 = "修改人员";

5
src/views/components/qrCodeUpload.vue
View File

@ -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 =

518
src/views/construction/deviceReceive/index.vue Normal file
View File

@ -0,0 +1,518 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item prop="proName">
<el-input
v-model="queryParams.proName"
placeholder="工程名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="powerName">
<el-input
v-model="queryParams.powerName"
placeholder="杆塔编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="teamName">
<el-input
v-model="queryParams.teamName"
placeholder="领用班组"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="devName">
<el-input
v-model="queryParams.devName"
placeholder="设备名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="devCode">
<el-input
v-model="queryParams.devCode"
placeholder="设备编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item prop="devType">
<el-select v-model="queryParams.devType" placeholder="设备类型" clearable style="width: 100%;">
<el-option
v-for="dict in dict.type.sys_device_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item prop="lyTime">
<el-date-picker
v-model="queryParams.lyTime"
style="width: 240px"
value-format="yyyy-MM-dd"
placeholder="领用时间"
type="date"
></el-date-picker>
</el-form-item>
<el-form-item prop="ghTime">
<el-date-picker
v-model="queryParams.ghTime"
style="width: 240px"
value-format="yyyy-MM-dd"
placeholder="归还时间"
type="date"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['basic:equipmentReq:addData']"
>设备领用</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="工程名称" align="center" prop="proName" />
<el-table-column label="项目部名称" align="center" prop="departName" />
<el-table-column label="作业杆塔名称" align="center" prop="powerName" />
<el-table-column label="领用班组" align="center" prop="teamName" />
<el-table-column label="领用设备类型" align="center" prop="deviceTypeName" />
<el-table-column label="设备名称" align="center" prop="devName" />
<el-table-column label="领用设备编码" align="center" prop="devCode" />
<!-- <el-table-column label="班组负责人" align="center" prop="bindNum"></el-table-column> -->
<el-table-column label="领用时间" align="center" prop="lyTime" />
<el-table-column label="归还时间" align="center" prop="ghTime">
<template slot-scope="scope">
<span v-if="!scope.row.ghTime" style="font-weight: bold;color: green;">在用</span>
<span v-else>{{ scope.row.ghTime }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remarks" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<!-- <el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
>编辑</el-button> -->
<el-button
size="mini"
type="text"
icon="el-icon-delete"
v-hasPermi="['basic:equipmentReq:returnDevice']"
v-if="!scope.row.ghTime"
@click="returnDevice(scope.row)"
>归还</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改对话框 -->
<el-dialog :title="title" :visible.sync="open" width="850px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="领用班组" prop="teamId">
<el-select v-model="form.teamId" placeholder="请选择领用班组" clearable style="width: 100%;" @change="changeTeam">
<el-option
v-for="dict in teamList"
:key="dict.teamId"
:label="dict.teamName"
:value="dict.teamId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="班组长" prop="teamUserName">
<el-input v-model="form.teamUserName" placeholder="班组长" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="所属工程" prop="proName">
<el-input v-model="form.proName" placeholder="所属工程" disabled/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="作业杆塔编号" prop="powerId">
<el-select v-model="form.powerId" placeholder="请选择作业杆塔编号" clearable style="width: 100%;">
<el-option
v-for="dict in GtList"
:key="dict.id+''"
:label="dict.name"
:value="dict.id+''"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<!-- 选择设备 -->
<el-row :gutter="24" style="border: 1px dashed #000;width: 95%;margin: 20px auto;">
<div style="margin: 20px;color: #0068E3;" @click="addDevice">添加</div>
<div v-for="(item,index) in form.list" :key="index">
<el-col :span="11">
<el-form-item label="领用设备类型" :prop="`list[${index}].devType`" :rules="[{ required: true, message: '请选择', trigger: 'change' }]" >
<el-select v-model="item.devType" placeholder="请选择领用设备类型" clearable style="width: 100%;" @change="changeType($event,item)">
<el-option
v-for="dict in dict.type.sys_device_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="11">
<el-form-item label="领用设备编码" :prop="`list[${index}].devCode`" :rules="[{ required: true, message: '请选择', trigger: 'change' }]">
<el-select v-model="item.devCode" placeholder="请选择领用设备编码" filterable clearable style="width: 100%;" @change="changeDevice($event,item)" @focus="focusDevice(item.devType)">
<el-option
v-for="dict in deviceList"
:key="dict.devCode+''"
:label="dict.devName"
:value="dict.devCode+''"
:disabled="dict.disabled"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="2">
<div @click="removeSetting(index)" v-show="index!=0"><i class="el-icon-delete" style="font-size: 18px;color: red;"></i></div>
</el-col>
</div>
</el-row>
<el-col :span="24">
<el-form-item label="备 注" prop="remarks">
<el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-col>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listSideband, addSideband, editSideband, getSidebandInfo, delSideband,listDevice,delDevice,listDeviceNoBind,bindDevice, exportPerson} from "@/api/construction/sideband";
import { equipmentReqList,addEquipmentData,getUseDevices,returnDevice} from "@/api/construction/deviceReceive";
import { getTeamLists,getPowerLists,getDeviceLists } from "@/api/select";
import { downloadFile } from '@/utils/download'
import { getToken } from '@/utils/auth'
import uploadFile from '../../components/uploadFile.vue'
export default {
name: "Post",
dicts: ['sys_device_type'],
components: {
uploadFile
},
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
//绑定设备总条数
totalTwo:0,
//未绑定设备总条数
totalThree:0,
// 人员表格数据
tableList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
//班组下拉数据
teamList: [],
//设备下拉数据
deviceList: [],
//施工杆塔
GtList:[],
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
// sidebandName: undefined,
// sidebandCode: undefined,
// projectName: undefined,
// gtCode: undefined,
// bindTime: undefined,
},
stateList:['在用','未用'],
// 表单参数
form: {
list:[]
},
// 表单校验
rules: {
teamId: [
{ required: true, message: "请选择领用班组", trigger: "blur" }
],
powerId: [
{ required: true, message: "请选择作业杆塔编号", trigger: "blur" }
],
}
};
},
computed: {
},
created() {
this.getTeamLists();
this.getList();
},
mounted(){
console.log(this.dict.type.sys_device_type)
},
methods: {
/** 查询列表 */
getList() {
this.loading = true;
equipmentReqList(this.queryParams).then(response => {
this.tableList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.fileList=[];
this.reset();
},
// 表单重置
reset() {
this.form = {
list:[{devId:"",devName:"",devCode:"",devType:""}]
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.deviceId)
this.single = selection.length!=1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "设备领用";
},
//获取班组
getTeamLists(){
getTeamLists().then(response => {
this.teamList = response.data;
});
},
changeTeam(val){
let obj = this.teamList.filter(item => {
return item.teamId == val
})
this.form.proId = obj[0].proId;
this.form.teamUserName = obj[0].teamLeader;
this.form.proName = obj[0].proName;
this.getPowerLists(obj[0].proId)
},
//获取杆塔
getPowerLists(proId){
getPowerLists({proId:proId}).then(response => {
this.GtList = response.data;
});
},
//添加设备
addDevice() {
this.form.list.push({
'devId': '',
'devName': '',
'devCode': '',
'devType': '',
})
},
//类型改变
changeType(val,listItem){
this.form.list.forEach(item=>{
if(item.devCode==listItem.devCode){
item.devCode=''
}
})
},
//聚焦设备列表select时根据类型更新下拉数据
focusDevice(type){
this.getDeviceList(type)
},
changeDevice(val,listItem){
for(let i=0;i<this.deviceList.length;i++){//选择设备将form.list中devName和devId赋值
this.form.list.forEach(item=>{
if(item.devCode==this.deviceList[i].devCode){
item.devName=this.deviceList[i].devName;
item.devId=this.deviceList[i].devId;
}
})
}
},
getDeviceList(type){
this.deviceList=[]
getUseDevices({devType:type}).then(response => {
this.deviceList = response.data;
for(let i=0;i<this.deviceList.length;i++){//渲染设备下拉数据时将已选择的设备禁用
this.form.list.forEach(item=>{
if(item.devCode==this.deviceList[i].devCode){
this.deviceList[i].disabled=true
}
})
}
});
},
//删除设备
removeSetting(index) {
if (index !== 0) {
this.form.list.splice(index, 1)
}
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const sidebandId = row.sidebandId
this.fileList=[];
getSidebandInfo(sidebandId).then(response => {
this.form = response.data;
console.log(response.data.gtCode)
this.$set(this.form,'projectName',response.data.projectName+'')
this.$set(this.form,'gtCode',response.data.gtCode+'')
setTimeout(()=>{
this.open = true;
this.title = "设备领用";
},100)
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {//
console.log(this.form)
addEquipmentData(this.form).then(response => {
console.log(response)
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
});
},
/** 删除按钮操作 */
returnDevice(row) {
console.log(row)
const param = {
"id": row.id,
"devId": row.devId,
"devType": row.devType,
"devCode": row.devCode
}
this.$modal.confirm('是否确认归还名称为"' + row.devName + '"的数据项？').then(function() {
return returnDevice(param);
}).then(() => {
this.getList();
this.$modal.msgSuccess("归还成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
exportPerson(this.queryParams).then(res => {
downloadFile({ fileName: `人员_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
})
},
/** 导入按钮操作 */
handleImport() {
this.upload.title = "导入";
this.upload.open = true;
},
}
};
</script>
<style lang="scss" scoped>
::v-deep.el-table .fixed-width .el-button--mini {
width: 60px !important;
margin-bottom: 10px;
}
//隐藏图片上传框的css
::v-deep.disabled {
.el-upload--picture-card {
display: none;
}
}
</style>