fix: BUG修改
This commit is contained in:
kun
parent
f3b2ba4fff
commit
da82193ac9
@ -2,9 +2,9 @@
|
||||
NODE_ENV = 'development'
|
||||
|
||||
# 本地环境接口地址(/api/index.ts文件中使用)
|
||||
VITE_API_URL = 'http://192.168.34.155:6688'
|
||||
# VITE_API_URL = 'http://192.168.34.155:6688'
|
||||
VITE_WPAPI_URL = "http://182.90.224.147:8081"
|
||||
# VITE_API_URL = "http://182.90.224.147:6688"
|
||||
VITE_API_URL = "http://182.90.224.147:6688"
|
||||
|
||||
# 上传
|
||||
# VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url='
|
||||
|
||||
@ -11,20 +11,38 @@
|
||||
</template>
|
||||
<div class="search-select">
|
||||
<span style="margin: 0 10px 2px 0px">验收阶段</span>
|
||||
<el-input style="width: 200px" :disabled="title == '详情'" v-model="allForm.stage" clearable placeholder="请输入" />
|
||||
<el-input
|
||||
style="width: 200px"
|
||||
:disabled="title != '新增' && title != '重新发起'"
|
||||
v-model="allForm.stage"
|
||||
clearable
|
||||
placeholder="请输入"
|
||||
/>
|
||||
<span style="margin: 0 10px 2px 10px">类型</span>
|
||||
<el-select style="width: 200px" v-model="allForm.type" :disabled="title == '详情'" clearable placeholder="请选择">
|
||||
<el-select
|
||||
style="width: 200px"
|
||||
v-model="allForm.type"
|
||||
:disabled="title != '新增' && title != '重新发起'"
|
||||
clearable
|
||||
placeholder="请选择"
|
||||
>
|
||||
<el-option v-for="item in typeList" :key="item.dictLabel" :label="item.dictValue" :value="item.dictLabel" />
|
||||
</el-select>
|
||||
<span style="margin: 0 10px 2px 20px">备注</span>
|
||||
<el-input style="width: 200px" :disabled="title == '详情'" v-model="allForm.remark" clearable placeholder="请输入" />
|
||||
<el-input
|
||||
style="width: 200px"
|
||||
:disabled="title != '新增' && title != '重新发起'"
|
||||
v-model="allForm.remark"
|
||||
clearable
|
||||
placeholder="请输入"
|
||||
/>
|
||||
</div>
|
||||
<!-- 验收内容 -->
|
||||
<div class="detail-table">
|
||||
<div class="content-title">验收内容</div>
|
||||
<div class="content-button">
|
||||
<el-button class="addButtonStyle" v-if="title != '详情'" @click="addPlan">新增</el-button>
|
||||
<span v-if="title == '详情'">{{
|
||||
<el-button class="addButtonStyle" v-if="title == '新增' || title == '重新发起'" @click="addPlan">新增</el-button>
|
||||
<span v-if="title == '详情'" :class="allForm.state == 3 ? 'backStyle' : ''">{{
|
||||
allForm.state == 1
|
||||
? "审批中"
|
||||
: allForm.state == 2
|
||||
@ -107,7 +125,7 @@
|
||||
<span v-else>{{ row.remark }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" width="180" fixed="right" label="操作" v-if="title != '详情'">
|
||||
<el-table-column align="center" width="180" fixed="right" label="操作" v-if="title == '新增' || title == '重新发起'">
|
||||
<template #default="scope">
|
||||
<el-button type="primary" v-if="scope.row.isEdit" link @click="scope.row.isEdit = false">
|
||||
<img src="@/assets/images/tableIcon/save.png" alt="" class="configureIcon" />
|
||||
@ -154,7 +172,7 @@
|
||||
<el-table-column type="index" label="序号" width="200" />
|
||||
<el-table-column prop="annexName" label="*附件名称">
|
||||
<template #default="{ row, $index }">
|
||||
<span v-if="title == '详情'">{{ row.annexName }}</span>
|
||||
<span v-if="title != '新增' && title != '重新发起'">{{ row.annexName }}</span>
|
||||
<el-input v-else class="test" v-model="row.annexName" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -166,7 +184,7 @@
|
||||
<el-button v-else type="primary" @click="onUpload(row, $index)" link>上传附件</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column fixed="right" v-if="title != '详情'">
|
||||
<el-table-column fixed="right" v-if="title == '新增' || title == '重新发起'">
|
||||
<template #header>
|
||||
<el-button type="primary" round @click="addEngineeringSingle"> 添加 </el-button>
|
||||
</template>
|
||||
@ -258,8 +276,8 @@
|
||||
</div>
|
||||
<template #footer>
|
||||
<div>
|
||||
<el-button type="primary" @click="visible1 = false" v-if="title == '详情'">关闭</el-button>
|
||||
<el-button type="primary" @click="confirm()" v-if="title != '详情'">提交申请</el-button>
|
||||
<el-button type="primary" @click="visible1 = false" v-if="title != '新增' && title != '重新发起'">关闭</el-button>
|
||||
<el-button type="primary" @click="confirm()" v-if="title == '新增' || title == '重新发起'">提交申请</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
@ -566,7 +584,8 @@ watch(
|
||||
stage: "",
|
||||
type: null,
|
||||
remark: "",
|
||||
rejectReason: ""
|
||||
rejectReason: "",
|
||||
state: null
|
||||
};
|
||||
recordData.value = [];
|
||||
documentData.value = [];
|
||||
@ -682,5 +701,8 @@ onMounted(() => {
|
||||
margin-top: 20px;
|
||||
}
|
||||
}
|
||||
.backStyle {
|
||||
color: #f64d31 !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -14,3 +14,11 @@
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
:deep() {
|
||||
.el-progress-bar {
|
||||
display: none;
|
||||
}
|
||||
.el-progress__text {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
@ -349,7 +349,6 @@ const getTableList = (params: any) => {
|
||||
|
||||
// 修改数据按钮
|
||||
const handleEditItem = async (index: number, row: any) => {
|
||||
ruleFormRef.value?.resetFields();
|
||||
if (index === 1) {
|
||||
newTitle.value = "新增验收计划";
|
||||
planFormData.value = reactive({
|
||||
@ -376,6 +375,9 @@ const handleEditItem = async (index: number, row: any) => {
|
||||
fileList1.value = row.fileUrl ? [{ ...JSON.parse(row.fileUrl) }] : [];
|
||||
}
|
||||
planVisible.value = true;
|
||||
setTimeout(function () {
|
||||
ruleFormRef.value.clearValidate();
|
||||
}, 50);
|
||||
};
|
||||
|
||||
// 删除用户信息
|
||||
|
||||
@ -116,7 +116,7 @@
|
||||
</div>
|
||||
<br />
|
||||
<div class="table-data">
|
||||
<span>升降机报警时间: {{ row.createTime }}</span>
|
||||
<span>塔吊报警时间: {{ row.createTime }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</ProTable>
|
||||
|
||||
@ -102,7 +102,7 @@
|
||||
<el-row :gutter="120">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否外地设备:" prop="isForeignDev">
|
||||
<el-radio-group placeholder="请选择" v-model="formData.isForeignDev">
|
||||
<el-radio-group placeholder="请选择" v-model="formData.isForeignDev" :disabled="title == '查看设备'">
|
||||
<el-radio :label="1">是</el-radio>
|
||||
<el-radio :label="0">否</el-radio>
|
||||
</el-radio-group>
|
||||
@ -110,7 +110,7 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否全新设备:" prop="isNewDev">
|
||||
<el-radio-group placeholder="请选择" v-model="formData.isNewDev">
|
||||
<el-radio-group placeholder="请选择" v-model="formData.isNewDev" :disabled="title == '查看设备'">
|
||||
<el-radio :label="1">是</el-radio>
|
||||
<el-radio :label="0">否</el-radio>
|
||||
</el-radio-group>
|
||||
@ -137,19 +137,19 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工作幅度(m):" prop="workingRange">
|
||||
<el-input v-model.number="formData.workingRange" placeholder="请输入" :disabled="title == '查看设备'" />
|
||||
<el-input v-model="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-input v-model="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-input v-model="formData.independentLiftingHeight" placeholder="请输入" :disabled="title == '查看设备'" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -233,7 +233,7 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否为原购产品:" prop="isOriginalProduct">
|
||||
<el-radio-group placeholder="请选择" v-model="formData.isOriginalProduct">
|
||||
<el-radio-group placeholder="请选择" v-model="formData.isOriginalProduct" :disabled="title == '查看设备'">
|
||||
<el-radio :label="1">是</el-radio>
|
||||
<el-radio :label="0">否</el-radio>
|
||||
</el-radio-group>
|
||||
@ -248,19 +248,19 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="前臂长:" prop="forearmLength">
|
||||
<el-input v-model.number="formData.forearmLength" placeholder="请输入" :disabled="title == '查看设备'" />
|
||||
<el-input v-model="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-input v-model="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-input v-model="formData.towerHeight" placeholder="请输入" :disabled="title == '查看设备'" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -452,7 +452,7 @@ const rules = ref({
|
||||
{
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
trigger: "change"
|
||||
}
|
||||
],
|
||||
installImage: [
|
||||
@ -495,6 +495,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^\d+(\.\d2)?$/,
|
||||
message: "请输入整数或小数点后两位小数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
maxLiftingCapacity: [
|
||||
@ -502,6 +507,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^\d+(\.\d2)?$/,
|
||||
message: "请输入整数或小数点后两位小数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
independentLiftingHeight: [
|
||||
@ -509,6 +519,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^\d+(\.\d2)?$/,
|
||||
message: "请输入整数或小数点后两位小数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
acquisitionDate: [
|
||||
@ -537,6 +552,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^[0-9]+$/,
|
||||
message: "请输入整数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
|
||||
@ -590,6 +610,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^\d+(\.\d2)?$/,
|
||||
message: "请输入整数或小数点后两位小数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
posteriorArmLength: [
|
||||
@ -597,6 +622,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^\d+(\.\d2)?$/,
|
||||
message: "请输入整数或小数点后两位小数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
towerHeight: [
|
||||
@ -604,6 +634,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^\d+(\.\d2)?$/,
|
||||
message: "请输入整数或小数点后两位小数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
forearmFlag: [
|
||||
@ -655,7 +690,7 @@ 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");
|
||||
formRef.value?.validateField("installImage");
|
||||
};
|
||||
// 删除设备
|
||||
const handleDeleteItem = async (params: jxj_User.ResUserList) => {
|
||||
|
||||
@ -101,7 +101,7 @@
|
||||
</div>
|
||||
<br />
|
||||
<div class="table-data">
|
||||
<span>升降机报警时间: {{ row.createTime }}</span>
|
||||
<span>塔吊报警时间: {{ row.createTime }}</span>
|
||||
</div>
|
||||
</template>
|
||||
</ProTable>
|
||||
|
||||
@ -404,16 +404,16 @@ const columns: ColumnProps[] = [
|
||||
isShow: false,
|
||||
search: { el: "input" }
|
||||
},
|
||||
{
|
||||
prop: "type",
|
||||
label: "报警类型",
|
||||
isShow: false,
|
||||
search: { el: "select" },
|
||||
enum: [
|
||||
{ label: "报警", value: 1 },
|
||||
{ label: "预警", value: 2 }
|
||||
]
|
||||
},
|
||||
// {
|
||||
// prop: "type",
|
||||
// label: "报警类型",
|
||||
// isShow: false,
|
||||
// search: { el: "select" },
|
||||
// enum: [
|
||||
// { label: "报警", value: 1 },
|
||||
// { label: "预警", value: 2 }
|
||||
// ]
|
||||
// },
|
||||
{
|
||||
prop: "createTime",
|
||||
label: "数据接受时间",
|
||||
|
||||
@ -163,7 +163,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
.no-data {
|
||||
> .no-data {
|
||||
@include boxStyle;
|
||||
flex: 1;
|
||||
height: 100%;
|
||||
@ -215,6 +215,16 @@
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
}
|
||||
.no-data {
|
||||
@include boxStyle;
|
||||
flex: 1;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
.info-list {
|
||||
height: calc(100% - 50px);
|
||||
@ -267,6 +277,16 @@
|
||||
margin-top: 5px;
|
||||
}
|
||||
}
|
||||
.no-data {
|
||||
@include boxStyle;
|
||||
flex: 1;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -189,7 +189,7 @@ const aspectList = ref([
|
||||
{
|
||||
name: "载重",
|
||||
value: 10,
|
||||
unit: "T",
|
||||
unit: "kg",
|
||||
img: new URL("@/assets/images/onlineSupervision/载重.png", import.meta.url).href,
|
||||
prop: "loading"
|
||||
},
|
||||
@ -347,6 +347,11 @@ const getengineering = async () => {
|
||||
searchSn.value = res.result[0].engineeringSn;
|
||||
}
|
||||
getEquipList();
|
||||
if (active.value === 0) {
|
||||
getAlarmList();
|
||||
} else {
|
||||
getMonitorList();
|
||||
}
|
||||
console.log(res);
|
||||
};
|
||||
// 点击抽屉的工程名称更新页面
|
||||
|
||||
@ -11,31 +11,13 @@
|
||||
</template>
|
||||
<div class="search-select">
|
||||
<span style="margin: 0 10px 2px 0px">验收阶段</span>
|
||||
<el-input
|
||||
style="width: 200px"
|
||||
:disabled="title == '详情' || title == '资料审批'"
|
||||
v-model="allForm.stage"
|
||||
clearable
|
||||
placeholder="请输入"
|
||||
/>
|
||||
<el-input style="width: 200px" :disabled="true" v-model="allForm.stage" clearable placeholder="请输入" />
|
||||
<span style="margin: 0 10px 2px 10px">类型</span>
|
||||
<el-select
|
||||
style="width: 200px"
|
||||
:disabled="title == '详情' || title == '资料审批'"
|
||||
v-model="allForm.type"
|
||||
clearable
|
||||
placeholder="请选择"
|
||||
>
|
||||
<el-select style="width: 200px" :disabled="true" v-model="allForm.type" clearable placeholder="请选择">
|
||||
<el-option v-for="item in typeList" :key="item.dictLabel" :label="item.dictValue" :value="item.dictLabel" />
|
||||
</el-select>
|
||||
<span style="margin: 0 10px 2px 20px">备注</span>
|
||||
<el-input
|
||||
style="width: 200px"
|
||||
:disabled="title == '详情' || title == '资料审批'"
|
||||
v-model="allForm.remark"
|
||||
clearable
|
||||
placeholder="请输入"
|
||||
/>
|
||||
<el-input style="width: 200px" :disabled="true" v-model="allForm.remark" clearable placeholder="请输入" />
|
||||
</div>
|
||||
<!-- 验收内容 -->
|
||||
<div class="detail-table">
|
||||
|
||||
@ -145,7 +145,7 @@ const onCurChange = async (params: number) => {
|
||||
// 下载
|
||||
const downloadTemp = (row: any) => {
|
||||
if (row.fileUrl) {
|
||||
window.open(baseUrl + "/xmgl/file/preview?fileUrl=" + row.fileUrl);
|
||||
window.open(baseUrl + "/xmgl/file/preview?fileUrl=" + JSON.parse(row.fileUrl).url);
|
||||
} else {
|
||||
ElMessage.error("暂无可下载文件");
|
||||
}
|
||||
|
||||
@ -223,7 +223,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
.no-data {
|
||||
> .no-data {
|
||||
@include boxStyle;
|
||||
flex: 1;
|
||||
height: 100%;
|
||||
@ -274,6 +274,16 @@
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
}
|
||||
.no-data {
|
||||
@include boxStyle;
|
||||
flex: 1;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
.info-list {
|
||||
height: calc(100% - 50px);
|
||||
@ -326,6 +336,16 @@
|
||||
margin-top: 5px;
|
||||
}
|
||||
}
|
||||
.no-data {
|
||||
@include boxStyle;
|
||||
flex: 1;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -103,7 +103,7 @@
|
||||
:tabs="['历史报警', '历史监测信息']"
|
||||
:pageable="pages"
|
||||
class="LeftMenu"
|
||||
@change-page="onCurChange"
|
||||
@change-page="onActiveCurChange"
|
||||
>
|
||||
<template #default>
|
||||
<div class="search-wrapper">
|
||||
@ -242,7 +242,7 @@ const aspectList = ref([
|
||||
{
|
||||
name: "载重",
|
||||
value: 10,
|
||||
unit: "T",
|
||||
unit: "kg",
|
||||
img: new URL("@/assets/images/onlineSupervision/载重.png", import.meta.url).href,
|
||||
prop: "loading"
|
||||
},
|
||||
@ -410,13 +410,22 @@ const onSearchInput = async (params: string) => {
|
||||
};
|
||||
// leftMenu页面的分页
|
||||
const onCurChange = async (params: number) => {
|
||||
alarmPages.value.pageSize = params;
|
||||
alarmPages.value.pageNo = params;
|
||||
if (alarmActive.value === 0) {
|
||||
getProPage();
|
||||
} else {
|
||||
getEngPage();
|
||||
}
|
||||
};
|
||||
// 右侧报警数据分页
|
||||
const onActiveCurChange = async (params: number) => {
|
||||
pages.value.pageNo = params;
|
||||
if (active.value === 0) {
|
||||
getAlarmList();
|
||||
} else {
|
||||
getMonitorList();
|
||||
}
|
||||
};
|
||||
// 右侧报警数据搜索
|
||||
const search = () => {
|
||||
console.log(666);
|
||||
|
||||
@ -11,20 +11,38 @@
|
||||
</template>
|
||||
<div class="search-select">
|
||||
<span style="margin: 0 10px 2px 0px">验收阶段</span>
|
||||
<el-input style="width: 200px" :disabled="title == '详情'" v-model="allForm.stage" clearable placeholder="请输入" />
|
||||
<el-input
|
||||
style="width: 200px"
|
||||
:disabled="title != '新增' && title != '重新发起'"
|
||||
v-model="allForm.stage"
|
||||
clearable
|
||||
placeholder="请输入"
|
||||
/>
|
||||
<span style="margin: 0 10px 2px 10px">类型</span>
|
||||
<el-select style="width: 200px" :disabled="title == '详情'" v-model="allForm.type" clearable placeholder="请选择">
|
||||
<el-select
|
||||
style="width: 200px"
|
||||
:disabled="title != '新增' && title != '重新发起'"
|
||||
v-model="allForm.type"
|
||||
clearable
|
||||
placeholder="请选择"
|
||||
>
|
||||
<el-option v-for="item in typeList" :key="item.dictLabel" :label="item.dictValue" :value="item.dictLabel" />
|
||||
</el-select>
|
||||
<span style="margin: 0 10px 2px 20px">备注</span>
|
||||
<el-input style="width: 200px" :disabled="title == '详情'" v-model="allForm.remark" clearable placeholder="请输入" />
|
||||
<el-input
|
||||
style="width: 200px"
|
||||
:disabled="title != '新增' && title != '重新发起'"
|
||||
v-model="allForm.remark"
|
||||
clearable
|
||||
placeholder="请输入"
|
||||
/>
|
||||
</div>
|
||||
<!-- 验收内容 -->
|
||||
<div class="detail-table">
|
||||
<div class="content-title">验收内容</div>
|
||||
<div class="content-button">
|
||||
<el-button class="addButtonStyle" v-if="title != '详情'" @click="addPlan">新增</el-button>
|
||||
<span v-if="title == '详情'">{{
|
||||
<el-button class="addButtonStyle" v-if="title == '新增' || title == '重新发起'" @click="addPlan">新增</el-button>
|
||||
<span v-if="title == '详情'" :class="allForm.state == 3 ? 'backStyle' : ''">{{
|
||||
allForm.state == 1
|
||||
? "审批中"
|
||||
: allForm.state == 2
|
||||
@ -107,7 +125,7 @@
|
||||
<span v-else>{{ row.remark }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" fixed="right" width="180" label="操作" v-if="title != '详情'">
|
||||
<el-table-column align="center" fixed="right" width="180" label="操作" v-if="title == '新增' || title == '重新发起'">
|
||||
<template #default="scope">
|
||||
<el-button type="primary" v-if="scope.row.isEdit" link @click="scope.row.isEdit = false">
|
||||
<img src="@/assets/images/tableIcon/save.png" alt="" class="configureIcon" />
|
||||
@ -154,7 +172,7 @@
|
||||
<el-table-column type="index" label="序号" width="200" />
|
||||
<el-table-column prop="annexName" label="*附件名称">
|
||||
<template #default="{ row, $index }">
|
||||
<span v-if="title == '详情'">{{ row.annexName }}</span>
|
||||
<span v-if="title != '新增' && title != '重新发起'">{{ row.annexName }}</span>
|
||||
<el-input v-else class="test" v-model="row.annexName" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -166,7 +184,7 @@
|
||||
<el-button v-else type="primary" @click="onUpload(row, $index)" link>上传附件</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column fixed="right" v-if="title != '详情'">
|
||||
<el-table-column fixed="right" v-if="title == '新增' || title == '重新发起'">
|
||||
<template #header>
|
||||
<el-button type="primary" round @click="addEngineeringSingle"> 添加 </el-button>
|
||||
</template>
|
||||
@ -258,8 +276,8 @@
|
||||
</div>
|
||||
<template #footer>
|
||||
<div>
|
||||
<el-button type="primary" @click="visible1 = false" v-if="title == '详情'">关闭</el-button>
|
||||
<el-button type="primary" @click="confirm()" v-if="title != '详情'">提交申请</el-button>
|
||||
<el-button type="primary" @click="visible1 = false" v-if="title != '新增' && title != '重新发起'">关闭</el-button>
|
||||
<el-button type="primary" @click="confirm()" v-if="title == '新增' || title == '重新发起'">提交申请</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
@ -565,7 +583,8 @@ watch(
|
||||
stage: "",
|
||||
type: null,
|
||||
remark: "",
|
||||
rejectReason: ""
|
||||
rejectReason: "",
|
||||
state: null
|
||||
};
|
||||
recordData.value = [];
|
||||
documentData.value = [];
|
||||
@ -682,5 +701,8 @@ onMounted(() => {
|
||||
margin-top: 20px;
|
||||
}
|
||||
}
|
||||
.backStyle {
|
||||
color: #f64d31 !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -356,7 +356,6 @@ const getTableList = (params: any) => {
|
||||
|
||||
// 修改数据按钮
|
||||
const handleEditItem = async (index: number, row: any) => {
|
||||
ruleFormRef.value?.resetFields();
|
||||
if (index === 1) {
|
||||
newTitle.value = "新增验收计划";
|
||||
planFormData.value = reactive({
|
||||
@ -383,6 +382,9 @@ const handleEditItem = async (index: number, row: any) => {
|
||||
fileList1.value = row.fileUrl ? [{ ...JSON.parse(row.fileUrl) }] : [];
|
||||
}
|
||||
planVisible.value = true;
|
||||
setTimeout(function () {
|
||||
ruleFormRef.value.clearValidate();
|
||||
}, 50);
|
||||
};
|
||||
|
||||
// 删除用户信息
|
||||
|
||||
@ -102,7 +102,7 @@
|
||||
<el-row :gutter="120">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否外地设备:" prop="isForeignDev">
|
||||
<el-radio-group placeholder="请选择" v-model="formData.isForeignDev">
|
||||
<el-radio-group placeholder="请选择" v-model="formData.isForeignDev" :disabled="title == '查看设备'">
|
||||
<el-radio :label="1">是</el-radio>
|
||||
<el-radio :label="0">否</el-radio>
|
||||
</el-radio-group>
|
||||
@ -110,7 +110,7 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否全新设备:" prop="isNewDev">
|
||||
<el-radio-group placeholder="请选择" v-model="formData.isNewDev">
|
||||
<el-radio-group placeholder="请选择" v-model="formData.isNewDev" :disabled="title == '查看设备'">
|
||||
<el-radio :label="1">是</el-radio>
|
||||
<el-radio :label="0">否</el-radio>
|
||||
</el-radio-group>
|
||||
@ -137,19 +137,19 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="工作幅度(m):" prop="workingRange">
|
||||
<el-input v-model.number="formData.workingRange" placeholder="请输入" :disabled="title == '查看设备'" />
|
||||
<el-input v-model="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-input v-model="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-input v-model="formData.independentLiftingHeight" placeholder="请输入" :disabled="title == '查看设备'" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -233,7 +233,7 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否为原购产品:" prop="isOriginalProduct">
|
||||
<el-radio-group placeholder="请选择" v-model="formData.isOriginalProduct">
|
||||
<el-radio-group placeholder="请选择" v-model="formData.isOriginalProduct" :disabled="title == '查看设备'">
|
||||
<el-radio :label="1">是</el-radio>
|
||||
<el-radio :label="0">否</el-radio>
|
||||
</el-radio-group>
|
||||
@ -247,20 +247,20 @@
|
||||
</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 label="前臂长(m):" prop="forearmLength">
|
||||
<el-input v-model="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 label="后臂长(m):" prop="posteriorArmLength">
|
||||
<el-input v-model="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 label="塔身高度(m):" prop="towerHeight">
|
||||
<el-input v-model="formData.towerHeight" placeholder="请输入" :disabled="title == '查看设备'" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@ -461,7 +461,7 @@ const rules = ref({
|
||||
{
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
trigger: "change"
|
||||
}
|
||||
],
|
||||
installImage: [
|
||||
@ -504,6 +504,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^\d+(\.\d2)?$/,
|
||||
message: "请输入整数或小数点后两位小数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
maxLiftingCapacity: [
|
||||
@ -511,6 +516,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^\d+(\.\d2)?$/,
|
||||
message: "请输入整数或小数点后两位小数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
independentLiftingHeight: [
|
||||
@ -518,6 +528,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^\d+(\.\d2)?$/,
|
||||
message: "请输入整数或小数点后两位小数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
acquisitionDate: [
|
||||
@ -546,6 +561,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^[0-9]+$/,
|
||||
message: "请输入整数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
|
||||
@ -599,6 +619,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^\d+(\.\d2)?$/,
|
||||
message: "请输入整数或小数点后两位小数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
posteriorArmLength: [
|
||||
@ -606,6 +631,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^\d+(\.\d2)?$/,
|
||||
message: "请输入整数或小数点后两位小数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
towerHeight: [
|
||||
@ -613,6 +643,11 @@ const rules = ref({
|
||||
required: true,
|
||||
message: "请输入",
|
||||
trigger: "blur"
|
||||
},
|
||||
{
|
||||
pattern: /^\d+(\.\d2)?$/,
|
||||
message: "请输入整数或小数点后两位小数",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
forearmFlag: [
|
||||
@ -664,7 +699,7 @@ 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");
|
||||
formRef.value?.validateField("installImage");
|
||||
};
|
||||
// 删除设备
|
||||
const handleDeleteItem = async (params: jxj_User.ResUserList) => {
|
||||
|
||||
@ -407,16 +407,16 @@ const columns: ColumnProps[] = [
|
||||
isShow: false,
|
||||
search: { el: "input" }
|
||||
},
|
||||
{
|
||||
prop: "type",
|
||||
label: "报警类型",
|
||||
isShow: false,
|
||||
search: { el: "select" },
|
||||
enum: [
|
||||
{ label: "报警", value: 1 },
|
||||
{ label: "预警", value: 2 }
|
||||
]
|
||||
},
|
||||
// {
|
||||
// prop: "type",
|
||||
// label: "报警类型",
|
||||
// isShow: false,
|
||||
// search: { el: "select" },
|
||||
// enum: [
|
||||
// { label: "报警", value: 1 },
|
||||
// { label: "预警", value: 2 }
|
||||
// ]
|
||||
// },
|
||||
{
|
||||
prop: "createTime",
|
||||
label: "数据接受时间",
|
||||
|
||||
@ -162,7 +162,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
.no-data {
|
||||
> .no-data {
|
||||
@include boxStyle;
|
||||
flex: 1;
|
||||
height: 100%;
|
||||
@ -214,6 +214,16 @@
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
}
|
||||
.no-data {
|
||||
@include boxStyle;
|
||||
flex: 1;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
.info-list {
|
||||
height: calc(100% - 50px);
|
||||
@ -266,6 +276,16 @@
|
||||
margin-top: 5px;
|
||||
}
|
||||
}
|
||||
.no-data {
|
||||
@include boxStyle;
|
||||
flex: 1;
|
||||
height: 100%;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-direction: column;
|
||||
color: #999;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -96,6 +96,10 @@
|
||||
<span>{{ item.createTime }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="no-data" v-if="alarmList.length == 0">
|
||||
<img src="@/assets/images/notData.png" alt="notData" />
|
||||
<div>暂无数据</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="info-list" v-if="active == 1">
|
||||
<div class="info-list-item" v-for="(item, index) in monitorList" :key="index">
|
||||
@ -142,6 +146,10 @@
|
||||
</div>
|
||||
<div>监测时间: {{ item.createTime ? item.createTime : "" }}</div>
|
||||
</div>
|
||||
<div class="no-data" v-if="monitorList.length == 0">
|
||||
<img src="@/assets/images/notData.png" alt="notData" />
|
||||
<div>暂无数据</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</LeftMenuPlus>
|
||||
@ -197,7 +205,7 @@ const aspectList = ref([
|
||||
{
|
||||
name: "载重",
|
||||
value: 10,
|
||||
unit: "T",
|
||||
unit: "kg",
|
||||
img: new URL("@/assets/images/onlineSupervision/载重.png", import.meta.url).href,
|
||||
prop: "loading"
|
||||
},
|
||||
@ -382,6 +390,11 @@ const getProject = async () => {
|
||||
searchSn.value = res.result.projectSn;
|
||||
}
|
||||
getEquipList();
|
||||
if (active.value === 0) {
|
||||
getAlarmList();
|
||||
} else {
|
||||
getMonitorList();
|
||||
}
|
||||
console.log(res);
|
||||
};
|
||||
const getengineering = async () => {
|
||||
@ -392,6 +405,11 @@ const getengineering = async () => {
|
||||
searchSn.value = res.result[0].engineeringSn;
|
||||
}
|
||||
getEquipList();
|
||||
if (active.value === 0) {
|
||||
getAlarmList();
|
||||
} else {
|
||||
getMonitorList();
|
||||
}
|
||||
console.log(res);
|
||||
};
|
||||
// 点击抽屉的工程名称更新页面
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user