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

自测问题

This commit is contained in:
jjLv 2024-08-21 15:24:55 +08:00
parent 42c8148326
commit 8f9fca171d
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/base/device/index.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item prop="deviceTypeName"> <el-form-item prop="deviceType">
<el-select v-model="queryParams.deviceTypeName" placeholder="设备类型" clearable style="width: 100%;"> <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable style="width: 100%;">
<el-option <el-option
v-for="dict in dict.type.sys_device_type" v-for="dict in dict.type.sys_device_type"
v-if = "dict.value != 'shx'" v-if = "dict.value != 'shx'"

46
src/views/base/engineering/index.vue
View File

@ -86,16 +86,16 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="工程id" align="center" prop="proId" v-if="false" /> <el-table-column label="工程id" align="center" prop="proId" v-if="false" />
<el-table-column label="所属项目部" align="center" prop="departName" /> <el-table-column label="所属项目部" align="center" prop="departName" sortable/>
<el-table-column label="工程名称" align="center" prop="proName" /> <el-table-column label="工程名称" align="center" prop="proName" sortable/>
<el-table-column label="电压等级" align="center" prop="vlevel" /> <el-table-column label="电压等级" align="center" prop="vlevel" sortable/>
<el-table-column label="建管单位" align="center" prop="orgName" /> <el-table-column label="建管单位" align="center" prop="orgName" sortable/>
<el-table-column label="工程类型" align="center" prop="proType" /> <el-table-column label="工程类型" align="center" prop="proType" sortable/>
<el-table-column label="工程状态" align="center" prop="proStatus" /> <el-table-column label="工程状态" align="center" prop="proStatus" sortable/>
<el-table-column label="业主项目经理" align="center" prop="yzManage" /> <el-table-column label="业主项目经理" align="center" prop="yzManage" sortable/>
<el-table-column label="施工项目经理" align="center" prop="sgManage" /> <el-table-column label="施工项目经理" align="center" prop="sgManage" sortable/>
<el-table-column label="总监理项目经理" align="center" prop="jlManage" /> <el-table-column label="总监理项目经理" align="center" prop="jlManage" sortable/>
<el-table-column label="杆塔数量" align="center" prop="gtNum"> <el-table-column label="杆塔数量" align="center" prop="gtNum" sortable>
<template slot-scope="scope"> <template slot-scope="scope">
<div @click="openGt(scope.row)" style="color: #02a7f0; cursor: pointer"> <div @click="openGt(scope.row)" style="color: #02a7f0; cursor: pointer">
{{ scope.row.gtNum}} {{ scope.row.gtNum}}
@ -197,9 +197,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="杆塔id" align="center" prop="gtId" v-if="false" /> <el-table-column label="杆塔id" align="center" prop="gtId" v-if="false" />
<el-table-column label="杆塔编号" align="center" prop="gtCode" /> <el-table-column label="杆塔编号" align="center" prop="gtCode" sortable/>
<el-table-column label="杆塔经度" align="center" prop="lon" /> <el-table-column label="杆塔经度" align="center" prop="lon" sortable/>
<el-table-column label="杆塔纬度" align="center" prop="lat" /> <el-table-column label="杆塔纬度" align="center" prop="lat" sortable/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -240,7 +240,7 @@
<el-input v-model="form.lon" placeholder="请输入杆塔经度" maxlength="20"/> <el-input v-model="form.lon" placeholder="请输入杆塔经度" maxlength="20"/>
</el-form-item> </el-form-item>
<el-form-item label="杆塔纬度" prop="lat"> <el-form-item label="杆塔纬度" prop="lat">
<el-input v-model="form.lat" placeholder="请输入杆塔纬度" /> <el-input v-model="form.lat" placeholder="请输入杆塔纬度" maxlength="20"/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -512,11 +512,14 @@
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
if (value === '' || value === null) { if (value === '' || value === null) {
return callback(new Error('请必须输入-180 ~ 180内的数据')); return callback(new Error('请必须输入-180 ~ 180内的数据且小数点后最多保留六位'));
}
if(/[\u4e00-\u9fff]/.test(value)){
return callback(new Error('请勿输入非数字'));
} }
const longitude = parseFloat(value); const longitude = parseFloat(value);
if (longitude <-180 || longitude > 180) { if (longitude <-180 || longitude > 180 ||longitude.toString().split(".")[1].length>6) {
callback(new Error('请必须输入-180 ~ 180内的数据')); callback(new Error('请必须输入-180 ~ 180内的数据且小数点后最多保留六位'));
} else { } else {
callback(); callback();
} }
@ -529,11 +532,14 @@
{ {
validator: (rule, value, callback) => { validator: (rule, value, callback) => {
if (value === '' || value === null) { if (value === '' || value === null) {
return callback(new Error('请必须输入-90 ~ 90内的数据')); return callback(new Error('请必须输入-90 ~ 90内的数据且小数点后最多保留六位'));
}
if(/[\u4e00-\u9fff]/.test(value)){
return callback(new Error('请勿输入非数字'));
} }
const latitude = parseFloat(value); const latitude = parseFloat(value);
if (latitude <-90 || latitude > 90) { if (latitude <-90 || latitude > 90 ||latitude.toString().split(".")[1].length>6) {
callback(new Error('请必须输入-90 ~ 90内的数据')); callback(new Error('请必须输入-90 ~ 90内的数据且小数点后最多保留六位'));
} else { } else {
callback(); callback();
} }