This commit is contained in:
cjp 2023-08-28 18:30:17 +08:00
commit e81592eed8
27 changed files with 979 additions and 32 deletions

View File

@ -300,7 +300,9 @@ const baseUrl = import.meta.env.VITE_API_URL;
const props = defineProps({
dialogVisible: Boolean,
relativeId: String,
title: String
title: String,
searchSn: String,
activeValue: String
});
const emits = defineEmits(["update:dialogVisible", "confirm"]);
const visible1 = ref(false);
@ -382,9 +384,13 @@ const confirm = async () => {
let requestData = {
...allForm.value,
detailList: recordData.value,
annexList: documentData.value,
engineeringSn: globalStore.engineeringSn
annexList: documentData.value
};
if (props.activeValue == "eng") {
requestData.engineeringSn = props.searchSn;
} else {
requestData.projectSn = props.searchSn;
}
if (props.title == "重新发起") {
requestData.id = props.relativeId;
}
@ -467,7 +473,13 @@ const confirm = async () => {
visible1.value = false;
};
const getSingleEngineerData = async () => {
const res = await singleEngineer({ engineeringSn: globalStore.engineeringSn });
let requestData = {};
if (props.activeValue == "eng") {
requestData.engineeringSn = props.searchSn;
} else {
requestData.projectSn = props.searchSn;
}
const res = await singleEngineer(requestData);
singleEngineerList.value = res.result;
console.log(res);
};
@ -548,6 +560,7 @@ watch(
(n, o) => {
visible1.value = n;
if (n) {
getSingleEngineerData();
if (props.title == "新增") {
allForm.value = {
stage: "",
@ -571,7 +584,6 @@ watch(visible1, (n, o) => {
});
onMounted(() => {
getDicMainList();
getSingleEngineerData();
});
</script>

View File

@ -487,8 +487,8 @@ onMounted(() => {});
top: 0;
right: -460px;
width: 380px;
height: calc(100% - 31px);
min-width: 420px;
height: calc(100% - 31px);
background: #ffffff;
box-shadow: 0px 4px 8px 0px rgba(48, 62, 100, 0.2);
border-radius: 8px 8px 8px 8px;
@ -502,7 +502,8 @@ onMounted(() => {});
display: flex;
margin-bottom: 12px;
span:nth-child(1) {
width: 56px;
display: inline-block;
width: 60px;
text-align: right;
font-size: 12px;
font-family: Source Han Sans CN-Medium, Source Han Sans CN;
@ -524,11 +525,13 @@ onMounted(() => {});
img {
width: 95px;
height: 53px;
margin-bottom: 10px;
margin-right: 15px;
}
:deep(.el-image) {
width: 95px;
height: 53px;
margin-bottom: 10px;
margin-right: 15px;
}
}
@ -574,10 +577,10 @@ onMounted(() => {});
.situation-step {
margin-top: 20px;
overflow-y: scroll;
height: 300px;
height: 210px;
.row {
span:nth-child(1) {
text-align: left;
text-align: right;
}
}
:deep(.el-timeline-item) {

View File

@ -41,6 +41,8 @@
v-model:dialogVisible="dialogVisible"
:title="newTitle"
:relativeId="relativeId"
:searchSn="searchSn"
:activeValue="activeValue"
@confirm="confirmReform"
></detailsDialog>
</template>

View File

@ -284,6 +284,10 @@ const confirm = async (formEl: FormInstance | undefined) => {
await formEl.validate(async (valid, fields) => {
if (valid) {
planFormData.value.engineeringSn = initParam.engineeringSn;
planFormData.value.fileUrl = planFormData.value.fileUrl ? JSON.stringify(planFormData.value.fileUrl) : "";
if (planFormData.value.state == "0") {
planFormData.value.completeDate = null;
}
if (planFormData.value.id) {
const res = await acceptancePlanEdit({ ...planFormData.value });
ElMessage.success("编辑成功");
@ -345,6 +349,7 @@ const getTableList = (params: any) => {
//
const handleEditItem = async (index: number, row: any) => {
ruleFormRef.value?.resetFields();
if (index === 1) {
newTitle.value = "新增验收计划";
planFormData.value = reactive({

View File

@ -520,11 +520,13 @@ onMounted(() => {});
img {
width: 95px;
height: 53px;
margin-bottom: 10px;
margin-right: 15px;
}
:deep(.el-image) {
width: 95px;
height: 53px;
margin-bottom: 10px;
margin-right: 15px;
}
}

View File

@ -521,11 +521,13 @@ onMounted(() => {});
img {
width: 95px;
height: 53px;
margin-bottom: 10px;
margin-right: 15px;
}
:deep(.el-image) {
width: 95px;
height: 53px;
margin-bottom: 10px;
margin-right: 15px;
}
}

View File

@ -308,6 +308,7 @@ const getEquipList = async () => {
};
//
const getEquipInfo = async (obj: any) => {
equipActive.value = equipList.value.findIndex(item => item.id == obj.id);
let requestData = {
id: obj.id
};

View File

@ -495,11 +495,17 @@ onMounted(() => {});
.imgList {
display: flex;
flex-wrap: wrap;
img {
width: 95px;
height: 53px;
margin-right: 15px;
margin-bottom: 10px;
}
:deep(.el-image) {
width: 95px;
height: 53px;
margin-right: 15px;
margin-bottom: 5px;
margin-bottom: 10px;
}
}
.face-img {
@ -544,7 +550,7 @@ onMounted(() => {});
.situation-step {
margin-top: 20px;
overflow-y: scroll;
height: 300px;
height: 210px;
.row {
span:nth-child(1) {
text-align: left;

View File

@ -16,7 +16,9 @@
<div class="leftMenu_item flx-justify-between">
<div style="margin-top: 5px" class="flx-justify-between">
<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
</el-tooltip>
</div>
</div>
</div>

View File

@ -16,7 +16,9 @@
<div class="leftMenu_item flx-justify-between">
<div style="margin-top: 5px" class="flx-justify-between">
<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
</el-tooltip>
</div>
</div>
</div>

View File

@ -16,7 +16,9 @@
<div class="leftMenu_item flx-justify-between">
<div style="margin-top: 5px" class="flx-justify-between">
<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
</el-tooltip>
</div>
<!-- <div>
<img src="@/assets/images/AIwaring/报警.png" alt="" />

View File

@ -16,7 +16,9 @@
<div class="leftMenu_item flx-justify-between">
<div style="margin-top: 5px" class="flx-justify-between">
<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
</el-tooltip>
</div>
<!-- <div>
<img src="@/assets/images/AIwaring/报警.png" alt="" />

View File

@ -16,7 +16,9 @@
<div class="leftMenu_item flx-justify-between">
<div style="margin-top: 5px" class="flx-justify-between">
<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
</el-tooltip>
</div>
</div>
</div>

View File

@ -16,7 +16,9 @@
<div class="leftMenu_item flx-justify-between">
<div style="margin-top: 5px" class="flx-justify-between">
<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
</el-tooltip>
</div>
</div>
</div>

View File

@ -16,7 +16,9 @@
<div class="leftMenu_item flx-justify-between">
<div style="margin-top: 5px" class="flx-justify-between">
<img style="margin-right: 5px" src="@/assets/images/AIwaring/dustMap.png" alt="" />
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
<el-tooltip effect="dark" :content="data.projectAddress || data.address" placement="top-start">
<span class="middleSize">{{ data.projectAddress || data.address }}</span>
</el-tooltip>
</div>
</div>
</div>

View File

@ -20,6 +20,10 @@
height: 100%;
// 页面的项目工程
.leftProject {
display: flex;
flex-direction: column;
justify-content: space-around;
height: 100%;
border-radius: 8px;
color: #333333;
// background-color: pink;

View File

@ -22,13 +22,11 @@
</div>
<div>
<img src="@/assets/images/AIwaring/报警.png" alt="" />
<span class="middleSize"
>今日报警次数{{ data.aiAlarmStat === null ? 0 : parse(data.aiAlarmStat)?.todayAlarm }}</span
>
<span class="middleSize">今日报警次数{{ data.alarmNum ? data.alarmNum : 0 }}</span>
</div>
</div>
<div class="bottom_item flx-justify-between" style="margin-top: 6px">
<!-- <div class="bottom_item flx-justify-between" style="margin-top: 6px;">
<div>
<span class="bottomSize"
>今日待整改问题{{ data.aiAlarmStat === null ? 0 : parse(data.aiAlarmStat)?.questionNum }}</span
@ -39,7 +37,7 @@
>今日已整改问题{{ data.aiAlarmStat === null ? 0 : parse(data.aiAlarmStat)?.solveQuestionNum }}</span
>
</div>
</div>
</div> -->
</div>
</template>
</LeftMenu>
@ -209,6 +207,7 @@ import {
towerCraneEquipAll,
operationData
} from "@/api/modules/goverment";
const equipActive = ref(0);
const monitorList = ref([]);
const alarmList = ref([]);
const equipList = ref([]);
@ -324,6 +323,7 @@ const getEquipList = async () => {
};
//
const getEquipInfo = async (obj: any) => {
equipActive.value = equipList.value.findIndex(item => item.id == obj.id);
let requestData = {
id: obj.id
};

View File

@ -158,7 +158,7 @@
<el-input v-else class="test" v-model="row.annexName" />
</template>
</el-table-column>
<el-table-column prop="fileList" label="*操作" v-if="title != '详情'">
<el-table-column prop="fileList" label="*操作">
<template #default="{ row, $index }">
<el-button v-if="title != '新增' && title != '重新发起'" type="primary" @click="onDownLoad(row)" link
>下载附件</el-button
@ -282,7 +282,7 @@ import { getDicList } from "@/api/modules/jxjview";
import { singleEngineer } from "@/api/modules/common";
import FilesUploadPlus from "@/components/FilesUploadPlus/FilesUpload.vue";
import transformInfo from "./transformInfo.vue";
import DownLoad from "@/utils/annexDowload";
import DownLoad from "@/utils/annexDowload.ts";
const current = ref({
files: []
});
@ -300,7 +300,9 @@ const baseUrl = import.meta.env.VITE_API_URL;
const props = defineProps({
dialogVisible: Boolean,
relativeId: String,
title: String
title: String,
searchSn: String,
activeValue: String
});
const emits = defineEmits(["update:dialogVisible", "confirm"]);
const visible1 = ref(false);
@ -382,9 +384,13 @@ const confirm = async () => {
let requestData = {
...allForm.value,
detailList: recordData.value,
annexList: documentData.value,
engineeringSn: globalStore.engineeringSn
annexList: documentData.value
};
if (props.activeValue == "eng") {
requestData.engineeringSn = props.searchSn;
} else {
requestData.projectSn = props.searchSn;
}
if (props.title == "重新发起") {
requestData.id = props.relativeId;
}
@ -466,7 +472,13 @@ const confirm = async () => {
visible1.value = false;
};
const getSingleEngineerData = async () => {
const res = await singleEngineer({ engineeringSn: globalStore.engineeringSn });
let requestData = {};
if (props.activeValue == "eng") {
requestData.engineeringSn = props.searchSn;
} else {
requestData.projectSn = props.searchSn;
}
const res = await singleEngineer(requestData);
singleEngineerList.value = res.result;
console.log(res);
};
@ -547,6 +559,7 @@ watch(
(n, o) => {
visible1.value = n;
if (n) {
getSingleEngineerData();
if (props.title == "新增") {
allForm.value = {
stage: "",

View File

@ -519,11 +519,13 @@ onMounted(() => {});
img {
width: 95px;
height: 53px;
margin-bottom: 10px;
margin-right: 15px;
}
:deep(.el-image) {
width: 95px;
height: 53px;
margin-bottom: 10px;
margin-right: 15px;
}
}
@ -569,7 +571,7 @@ onMounted(() => {});
.situation-step {
margin-top: 20px;
overflow-y: scroll;
height: 300px;
height: 210px;
.row {
span:nth-child(1) {
text-align: left;

View File

@ -34,6 +34,8 @@
v-model:dialogVisible="dialogVisible"
:title="newTitle"
:relativeId="relativeId"
:searchSn="searchSn"
:activeValue="activeValue"
@confirm="confirmReform"
></detailsDialog>
<engineeringEngDrawer v-model="engVisable" :active="activeValue" ref="engDrawer" :engList="engList" @select="tabsSelect">

View File

@ -125,7 +125,7 @@
</template>
<script setup lang="tsx" name="acceptancePlan">
import { ref, reactive, onMounted } from "vue";
import { ref, reactive, nextTick, onMounted } from "vue";
import { ElMessage, ElMessageBox, UploadProps } from "element-plus";
import type { FormInstance } from "element-plus";
import { ColumnProps } from "@/components/ProTable/interface";
@ -287,6 +287,10 @@ const confirm = async (formEl: FormInstance | undefined) => {
await formEl.validate(async (valid, fields) => {
if (valid) {
planFormData.value.engineeringSn = searchSn.value;
planFormData.value.fileUrl = planFormData.value.fileUrl ? JSON.stringify(planFormData.value.fileUrl) : "";
if (planFormData.value.state == "0") {
planFormData.value.completeDate = null;
}
if (planFormData.value.id) {
const res = await acceptancePlanEdit({ ...planFormData.value });
ElMessage.success("编辑成功");
@ -352,6 +356,7 @@ const getTableList = (params: any) => {
//
const handleEditItem = async (index: number, row: any) => {
ruleFormRef.value?.resetFields();
if (index === 1) {
newTitle.value = "新增验收计划";
planFormData.value = reactive({

View File

@ -0,0 +1,35 @@
.date-select {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
}
.basic-form {
.face-img {
width: 100%;
align-self: flex-start;
:deep(.face-uploader .el-upload) {
border: 1px dashed #d9d9d9 !important;
border-radius: 6px !important;
cursor: pointer !important;
position: relative !important;
overflow: hidden !important;
}
.face-uploader .el-upload:hover {
border-color: #409eff !important;
}
:deep(.el-icon) {
font-size: 28px;
color: #8c939d;
width: 53px;
height: 53px;
line-height: 53px;
text-align: center;
}
.face-avatar {
width: 53px;
height: 53px;
display: block;
}
}
}

View File

@ -0,0 +1,827 @@
<template>
<div class="table-box">
<ProTable
ref="proTable"
title="设备管理"
:columns="columns"
:requestApi="getTableList"
:dataCallback="dataCallback"
:tool-button="false"
:pagination="true"
background
:isShowSearch="false"
:initParam="initParam"
:onReset="true"
>
<template #formButton="scope">
<el-button class="addButtonStyle" @click="handleAddItem">新增</el-button>
</template>
<template #operation="{ row }">
<el-button type="primary" link @click="handleLookItem(row)">
<img src="@/assets/images/tableIcon/look.png" alt="" class="configureIcon" />
<span>查看</span>
</el-button>
<el-button type="primary" link @click="handleEditItem(row)">
<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
<span>编辑</span>
</el-button>
<el-button type="danger" link :icon="Delete" @click="handleDeleteItem(row)">删除</el-button>
</template>
<template #state="{ row }">
<span :class="row.state === 1 ? '' : 'redText'">{{ row.state == 1 ? "启用" : "禁用" }}</span>
</template>
</ProTable>
<el-dialog :title="title" show-close v-model="newUnitDialog" style="min-width: 1200px">
<el-form ref="formRef" :model="formData" label-width="180px" :rules="rules" class="basic-form" size="default">
<!-- <el-form ref="formDataRef" :model="formData" label-width="150px" class="basic-form"> -->
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="设备名称:" prop="devName">
<el-input v-model="formData.devName" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安装日期:" prop="installTime">
<el-date-picker
:disabled="title == '查看设备'"
style="width: 100%"
v-model="formData.installTime"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
type="date"
placeholder="请选择"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="黑匣子信息:" prop="blackBox">
<el-input v-model="formData.blackBox" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="结构类型:" prop="structureType">
<el-select
v-model="formData.structureType"
:disabled="title == '查看设备'"
placeholder="请选择"
style="width: 100%"
>
<el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="设备使用状态:" prop="useState">
<el-select v-model="formData.useState" :disabled="title == '查看设备'" placeholder="请选择" style="width: 100%">
<el-option v-for="item in stateList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备图片:" prop="installImage">
<div class="face-img">
<el-upload
class="face-uploader"
:action="`${baseUrl}` + '/xmgl/file/upload'"
:show-file-list="false"
:on-success="(response, uploadFile) => handleAvatarSuccess(response, uploadFile)"
accept="image/jpg, image/jpeg, image/png"
>
<img v-if="formData.installImage" :src="formData.installImage" class="face-avatar" />
<el-icon v-else><plus /></el-icon>
</el-upload>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="是否外地设备:" prop="isForeignDev">
<el-radio-group placeholder="请选择" v-model="formData.isForeignDev">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否全新设备:" prop="isNewDev">
<el-radio-group placeholder="请选择" v-model="formData.isNewDev">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="规格型号:" prop="model">
<el-input v-model="formData.model" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="许可证发证机关:" prop="licensingAuthority">
<el-input v-model="formData.licensingAuthority" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="出厂(合格证):" prop="factoryCertificate">
<el-input v-model="formData.factoryCertificate" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="工作幅度(m):" prop="workingRange">
<el-input v-model.number="formData.workingRange" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="最大额定起重量(kg):" prop="maxLiftingCapacity">
<el-input v-model.number="formData.maxLiftingCapacity" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="独立起升高度(m):" prop="independentLiftingHeight">
<el-input v-model.number="formData.independentLiftingHeight" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="购置日期:" prop="acquisitionDate">
<el-date-picker
:disabled="title == '查看设备'"
style="width: 100%"
v-model="formData.acquisitionDate"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
type="date"
placeholder="请选择时间"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="编号有效期:" prop="numberValidityPeriod">
<el-date-picker
:disabled="title == '查看设备'"
style="width: 100%"
v-model="formData.numberValidityPeriod"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
type="date"
placeholder="请选择时间"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="设备原值:" prop="originalValue">
<el-input v-model.number="formData.originalValue" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备改造次数:" prop="renovations">
<el-input v-model.number="formData.renovations" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="发票编码:" prop="invoiceCode">
<el-input v-model="formData.invoiceCode" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="购买合同编码:" prop="contractCode">
<el-input v-model="formData.contractCode" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="生产厂家:" prop="manufacturer">
<el-input v-model="formData.manufacturer" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="出厂日期:" prop="productionDate">
<el-date-picker
:disabled="title == '查看设备'"
style="width: 100%"
v-model="formData.productionDate"
format="YYYY-MM-DD"
value-format="YYYY-MM-DD"
type="date"
placeholder="请选择时间"
/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="制造许可证编号:" prop="manufacturerLicense">
<el-input v-model="formData.manufacturerLicense" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否为原购产品:" prop="isOriginalProduct">
<el-radio-group placeholder="请选择" v-model="formData.isOriginalProduct">
<el-radio :label="1"></el-radio>
<el-radio :label="0"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="设备用途:" prop="useTo">
<el-input v-model="formData.useTo" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="前臂长:" prop="forearmLength">
<el-input v-model.number="formData.forearmLength" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="后臂长:" prop="posteriorArmLength">
<el-input v-model.number="formData.posteriorArmLength" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="塔身高度:" prop="towerHeight">
<el-input v-model.number="formData.towerHeight" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="前臂永久性标识:" prop="forearmFlag">
<el-input v-model="formData.forearmFlag" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="后臂永久性标识:" prop="rearArmFlag">
<el-input v-model="formData.rearArmFlag" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="塔帽永久性标识:" prop="towerCapFlag">
<el-input v-model="formData.towerCapFlag" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="上转台永久性标识:" prop="upwardTurntableFlag">
<el-input v-model="formData.upwardTurntableFlag" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="120">
<el-col :span="12">
<el-form-item label="下转台永久性标识:" prop="lowerTurntableFlag">
<el-input v-model="formData.lowerTurntableFlag" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="标准节点永久性标识:" prop="mastSectionFlag">
<el-input v-model="formData.mastSectionFlag" placeholder="请输入" :disabled="title == '查看设备'" />
</el-form-item>
</el-col>
</el-row>
<footer class="footer flx-center" v-if="title != '查看设备'">
<el-button class="cancelButtonStyle" @click="newUnitDialog = false">取消</el-button>
<el-button type="primary" @click="submitForm(formData)">保存</el-button>
</footer>
</el-form>
</el-dialog>
<!-- 侧边栏选择 -->
<engineeringEngDrawer v-model="engVisable" :active="activeValue" ref="engDrawer" :engList="engList" @select="tabsSelect">
<template #default="{ data }">
<span style="margin-left: 10px" @click="onUpdate(data)">{{
activeValue == "eng" ? data.engineeringName : data.projectName
}}</span>
</template>
</engineeringEngDrawer>
<allEngineering @click="engVisable = true" />
</div>
</template>
<script setup lang="tsx" name="ProjectSupervisionRecord">
import { ref, reactive, nextTick, onMounted } from "vue";
import { ElMessage, ElMessageBox, ElTree, FormInstance } from "element-plus";
import type { UploadProps } from "element-plus";
import { useRouter } from "vue-router";
import { ColumnProps } from "@/components/ProTable/interface";
import { useHandleData } from "@/hooks/useHandleData";
import ProTable from "@/components/ProTable/index.vue";
import { jxj_User } from "@/api/types";
import { getRelevanceList } from "@/api/modules/common";
import engineeringEngDrawer from "@/components/engineeringEngDrawer/index.vue";
import allEngineering from "@/components/allEngineering/index.vue";
import {
towerCraneEquipAdd,
towerCraneEquipEdit,
towerCraneEquipDel,
towerCraneEquipPage,
getEngineeringName
} from "@/api/modules/project";
import { GlobalStore } from "@/stores";
import { Delete } from "@element-plus/icons-vue";
const baseUrl = import.meta.env.VITE_API_URL;
const typeList = ref([
{ label: "尖头塔", value: 1 },
{ label: "平头塔", value: 2 },
{ label: "动臂塔", value: 3 }
]);
const stateList = ref([
{ label: "设备进场", value: 1 },
{ label: "设备安装", value: 2 },
{ label: "设备验收", value: 3 },
{ label: "设备使用", value: 4 },
{ label: "设备拆除", value: 5 },
{ label: "设备退场", value: 6 }
]);
const activeValue = ref("eng");
const engList = ref([]);
const engVisable = ref(false);
const searchSn = ref("");
const changeType = ref(1);
const datas = reactive([]);
const formRef = ref<FormInstance>();
const router = useRouter();
const store = GlobalStore();
const drawerVisible = ref(false);
const title = ref("");
const newUnitDialog = ref(false);
// ProTable()
const initParam = reactive({
engineeringSn: ""
});
const formData = ref({
devName: "",
installTime: "",
blackBox: "",
structureType: "",
useState: "",
installImage: "",
isForeignDev: 0,
isNewDev: 0,
model: "",
licensingAuthority: "",
factoryCertificate: "",
workingRange: "",
maxLiftingCapacity: "",
independentLiftingHeight: "",
acquisitionDate: "",
numberValidityPeriod: "",
originalValue: "",
renovations: "",
invoiceCode: "",
contractCode: "",
manufacturer: "",
productionDate: "",
manufacturerLicense: "",
isOriginalProduct: 0,
useTo: "",
forearmLength: "",
posteriorArmLength: "",
towerHeight: "",
forearmFlag: "",
rearArmFlag: "",
towerCapFlag: "",
upwardTurntableFlag: "",
lowerTurntableFlag: "",
mastSectionFlag: ""
});
// ProTable 便
const proTable = ref();
const getId = ref<number | undefined>(undefined);
//
const columns: ColumnProps[] = [
{ type: "index", label: "序号", width: 80 },
{
prop: "devName",
label: "设备名称",
search: { el: "input" }
},
{
prop: "installTime",
label: "安装时间",
search: {
el: "date-picker",
props: {
type: "daterange",
format: "YYYY-MM-DD",
valueFormat: "YYYY-MM-DD"
// defaultTime: defaultTime2
}
}
},
{ prop: "blackBox", label: "黑匣子信息" },
{ prop: "operation", label: "操作", fixed: "right", width: 260 }
];
const rules = ref({
devName: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
installTime: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
blackBox: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
structureType: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
installImage: [
{
required: true,
message: "请上传",
trigger: "change"
}
],
isForeignDev: [
{
required: true,
message: "请选择",
trigger: "change"
}
],
isNewDev: [
{
required: true,
message: "请选择",
trigger: "change"
}
],
model: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
factoryCertificate: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
workingRange: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
maxLiftingCapacity: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
independentLiftingHeight: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
acquisitionDate: [
{
required: true,
message: "请选择",
trigger: "change"
}
],
numberValidityPeriod: [
{
required: true,
message: "请选择",
trigger: "change"
}
],
originalValue: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
renovations: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
invoiceCode: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
manufacturer: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
productionDate: [
{
required: true,
message: "请选择",
trigger: "change"
}
],
manufacturerLicense: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
isOriginalProduct: [
{
required: true,
message: "请选择",
trigger: "change"
}
],
useTo: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
forearmLength: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
posteriorArmLength: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
towerHeight: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
forearmFlag: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
rearArmFlag: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
towerCapFlag: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
upwardTurntableFlag: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
lowerTurntableFlag: [
{
required: true,
message: "请输入",
trigger: "blur"
}
],
mastSectionFlag: [
{
required: true,
message: "请输入",
trigger: "blur"
}
]
});
//
const handleAvatarSuccess: UploadProps["onSuccess"] = (response, uploadFile) => {
console.log(response.result.url);
console.log(response, uploadFile);
formData.value.installImage = response.result.url;
formRef.value?.validateField("image");
};
//
const handleDeleteItem = async (params: jxj_User.ResUserList) => {
await useHandleData(towerCraneEquipDel, { id: params.id }, `删除【${params.devName}`);
proTable.value.getTableList();
};
// dataCallback list && total && pageNum && pageSize
// hooks/useTable.ts
const dataCallback = (data: any) => {
// console.log(data);
return {
list: data.records,
total: Number(data.total),
pageNo: Number(data.current),
pageSize: Number(data.size)
};
};
const transfrom = (arr: Array<any>) => {
const result: any[] | ConcatArray<{ authorityId: any; roleId: number | undefined; type: any }> = [];
return arr
.map(item => {
if (arr.children && Array.isArray(arr.children)) {
result.concat(transfrom(arr.children));
}
return {
authorityId: item.name,
roleId: getId.value,
type: item.type
};
})
.concat(result);
};
// params
// ProTable :requestApi="getUserList"
const getTableList = (params: any) => {
let newParams = JSON.parse(JSON.stringify(params));
if (newParams.installTime) {
newParams.installTime_begin = newParams.installTime[0];
newParams.installTime_end = newParams.installTime[1];
delete newParams.installTime;
}
if (searchSn.value) {
if (activeValue.value == "eng") {
newParams.engineeringSn = searchSn.value;
} else if (activeValue.value == "project") {
newParams.projectSn = searchSn.value;
}
} else {
return { result: { current: "1", pages: "1", records: [], size: "10", total: "0" } };
}
return towerCraneEquipPage(newParams);
};
//
const handleAddItem = () => {
formRef.value?.resetFields();
title.value = "新增设备";
newUnitDialog.value = true;
};
//
const handleLookItem = (row: any) => {
formRef.value?.resetFields();
title.value = "查看设备";
console.log(row);
formData.value = reactive({ ...row });
changeType.value = formData.value.businessLicenseLifespan ? 1 : 2;
newUnitDialog.value = true;
};
//
const handleEditItem = (row: any) => {
formRef.value?.clearValidate();
title.value = "编辑设备";
console.log(row);
formData.value = reactive({ ...row });
changeType.value = formData.value.businessLicenseLifespan ? 1 : 2;
newUnitDialog.value = true;
};
// TODO:
const submitForm = async (data: any) => {
const formEl = formRef.value;
if (!formEl) return;
await formEl.validate((valid, fields) => {
if (valid) {
if (changeType.value == 2) {
delete data.businessLicenseLifespan;
}
if (activeValue.value == "eng") {
data.engineeringSn = searchSn.value;
} else if (activeValue.value == "project") {
data.projectSn = searchSn.value;
}
saveItem(data);
} else {
console.log("error submit!", fields);
}
});
};
const saveItem = async (form: any) => {
if (form.id) {
// console.log(form.dictCode);
const res = await towerCraneEquipEdit(form);
proTable.value.getTableList();
ElMessage.success("编辑成功");
newUnitDialog.value = false;
} else {
const res = await towerCraneEquipAdd(form);
proTable.value.getTableList();
ElMessage.success("新增成功");
newUnitDialog.value = false;
}
};
// tab
const tabsSelect = val => {
activeValue.value = val;
if (val == "eng") {
getengineering();
} else if (val == "project") {
getProject();
}
};
//
const getProject = async () => {
const res = await getEngineeringName();
engList.value = [res.result];
if (res.result) {
searchSn.value = res.result.projectSn;
}
proTable.value.getTableList();
console.log(res);
};
const getengineering = async () => {
// let newParams = JSON.parse(JSON.stringify(params));
const res = await getRelevanceList();
engList.value = res.result;
if (res.result && res.result.length > 0) {
searchSn.value = res.result[0].engineeringSn;
}
proTable.value.getTableList();
console.log(res);
};
//
const onUpdate = async row => {
if (activeValue.value == "eng") {
searchSn.value = row.engineeringSn;
} else if (activeValue.value == "project") {
searchSn.value = row.projectSn;
}
proTable.value.getTableList();
ElMessage.success("页面已更新");
};
onMounted(() => {
getengineering();
});
</script>
<style scoped lang="scss">
@import "./index.scss";
</style>

View File

@ -520,11 +520,13 @@ onMounted(() => {});
img {
width: 95px;
height: 53px;
margin-bottom: 10px;
margin-right: 15px;
}
:deep(.el-image) {
width: 95px;
height: 53px;
margin-bottom: 10px;
margin-right: 15px;
}
}

View File

@ -520,11 +520,13 @@ onMounted(() => {});
img {
width: 95px;
height: 53px;
margin-bottom: 10px;
margin-right: 15px;
}
:deep(.el-image) {
width: 95px;
height: 53px;
margin-bottom: 10px;
margin-right: 15px;
}
}

View File

@ -280,7 +280,7 @@ const engineeringPurpose = ref<DictDataList>([]);
const structuralStyle = ref<DictDataList>([]);
const validatorNumber = (e: any, index: any, key: string) => {
//
let pattern = /^[1-9][0-9]*$/;
let pattern = /^[0-9][0-9]*$/;
let dataValue = form.value.engineeringSingles[index][key];
if (!pattern.test(dataValue)) {
ElMessage.error("请输入纯数字");
@ -338,6 +338,13 @@ const next = async (formEl: FormInstance | undefined, params: any) => {
});
return;
}
if (form.value.engineeringSingles?.length == 0) {
ElMessage({
message: "请添加单体工程",
type: "error"
});
return;
}
form.value.engineeringSingles?.map(item => {
if (!item.name) {
validatorBool = false;

View File

@ -329,6 +329,7 @@ const getEquipList = async () => {
};
//
const getEquipInfo = async (obj: any) => {
equipActive.value = equipList.value.findIndex(item => item.id == obj.id);
let requestData = {
id: obj.id
};