邓洁: 修复bug

This commit is contained in:
邓洁
2023-12-28 23:00:52 +08:00
parent 50270cddd3
commit 6dde5ccbc8
11 changed files with 274 additions and 111 deletions

View File

@@ -6,7 +6,7 @@
<span>返回</span>
</div>
<div class="site-name">
{{siteName}}
{{ siteName }}
</div>
<div class="tunnel-title"></div>
<div class="all-del-btn">
@@ -26,7 +26,8 @@
<div class="top">
<span>{{ item.tunnelName }}</span>
<span>施工长度{{ item.constructionLength }} 隧道长度{{ item.totalLength }}</span>
<el-checkbox v-model="item.checked" size="large" @change="handleClickSite(item)"/>
<el-checkbox v-if="!item.isDefault" v-model="item.checked" size="large" @change="handleClickSite(item)"/>
<span v-else>默认</span>
</div>
<div class="box-center">
<div>
@@ -106,13 +107,14 @@
<script setup>
import {ElMessage, ElMessageBox} from "element-plus";
import {getTunnelList,addTunnel, deleteTunnel} from "@/api/tunnelManage";
import {getTunnelList, addTunnel, deleteTunnel} from "@/api/tunnelManage";
import {onMounted} from "vue";
import { getSiteDetail} from "@/api/site";
import {getSiteDetail} from "@/api/site";
const router = useRouter()
const showAddIcon = ref(true)
const siteId = reactive(router.currentRoute.value.params.siteId)
const userId = reactive(router.currentRoute.value.params.userId)
const type = reactive(router.currentRoute.value.params.type)
const formRules = ref({
tunnelName: [{required: true, message: '请输入隧道名称', trigger: 'blur'}],
@@ -247,7 +249,7 @@ const form = ref({
serialNumber: '',
totalLength: '',
remarks: '',
isDefault:false
isDefault: false
});
const isEdit = ref(false)
const pageInfo = reactive({
@@ -255,22 +257,22 @@ const pageInfo = reactive({
pageSize: 12
});
const total = ref(10);
onMounted(()=>{
onMounted(() => {
getSiteDetail(siteId).then((res) => {
siteName.value = res.data.siteName
});
})
const handleGoSiteOrIndex=()=>{
if(type==='s'){
router.push('/site')
}else if(type==='i'){
const handleGoSiteOrIndex = () => {
if (type === 's') {
router.push('/site/'+userId)
} else if (type === 'i') {
router.push('/')
}
}
const getList = () => {
getTunnelList({
siteId:siteId,
siteId: siteId,
...pageInfo
}).then(res => {
if (res.code === 1000) {
@@ -291,30 +293,29 @@ const handleSubmit = (instance) => {
// instance.validate(async (valid) => {
// console.log('valid',valid)
// if (!valid) return
const data={
siteId:siteId,
tunnelId:12,
...form.value
}
if(form.value.tunnelName&&form.value.serialNumber&&form.value.totalLength){
addTunnel(data).then(res => {
if (res.code === 1000) {
ElMessage.success('新增成功')
getList()
isVisited.value = false
}
})
}else {
ElMessage.warning('请先完善信息再新增')
}
const data = {
siteId: siteId,
...form.value
}
if (form.value.tunnelName && form.value.serialNumber && form.value.totalLength) {
addTunnel(data).then(res => {
if (res.code === 1000) {
ElMessage.success('新增成功')
getList()
isVisited.value = false
}
})
} else {
ElMessage.warning('请先完善信息再新增')
}
// })
}
const handleGoToEditTunnel = (tunnelId) => {
isEdit.value = true
if(type==='s'){
router.push('/edit/' + tunnelId+'/s')
}else if(type==='i'){
router.push('/edit/' + tunnelId+'/i')
if (type === 's') {
router.push('/edit/' + tunnelId + '/s/'+userId)
} else if (type === 'i') {
router.push('/edit/' + tunnelId + '/i/'+userId)
}
}
const handleChooseAll = () => {
@@ -323,10 +324,10 @@ const handleChooseAll = () => {
})
}
const handleEditDevice = (tunnelId) => {
if(type==='s'){
router.push('/device/' + tunnelId+'/s')
}else if(type==='i'){
router.push('/device/' + tunnelId+'/i')
if (type === 's') {
router.push('/device/' + tunnelId + '/s/'+userId)
} else if (type === 'i') {
router.push('/device/' + tunnelId + '/i/'+userId)
}
}
const restFrom = () => {
@@ -335,7 +336,7 @@ const restFrom = () => {
serialNumber: '',
totalLength: '',
remarks: '',
isDefault:false
isDefault: false
}
}
const handleAdd = () => {
@@ -367,21 +368,6 @@ const handleMoreDelete = () => {
if (tunnelIds.value.length === 0) {
ElMessage.warning('请先选择隧道进行删除')
} else {
let flag=false
siteList.value.map(item=>{
siteIds.value.map(siteItem=>{
if(item.siteId===siteItem){
console.log('item.tunnelList',item.tunnelList)
if(item.tunnelList.length!==0){
ElMessage.error('该站点下存在隧道,不能删除!')
flag=false
}else {
flag=true
}
}
})
})
if(flag){
ElMessageBox.confirm(`是否确定删除该隧道`, '系统提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -399,7 +385,6 @@ const handleMoreDelete = () => {
}
})
})
}
}
}
@@ -417,6 +402,7 @@ const handleMoreDelete = () => {
color: #FFFFFF;
line-height: 61px;
}
:deep(.el-radio-group) {
margin-top: 10px;
}
@@ -448,6 +434,7 @@ const handleMoreDelete = () => {
height: 18px;
background: #05FEFF;
}
:deep(.el-dialog) {
border: 2px solid #05FEFF;
background: #0D6578;
@@ -619,23 +606,13 @@ const handleMoreDelete = () => {
color: #5CE4F2;
}
> div:last-child {
cursor: pointer;
width: 40px;
height: 40px;
border: 2px solid #05FEFF;
border-radius: 25px;
position: relative;
.clickColor {
position: absolute;
top: 7px;
left: 6.5px;
width: 25px;
height: 25px;
background-color: #05FEFF;
border-radius: 25px;
}
> span:last-child {
padding:1px 8px;
font-size: 32px;
border: 2px solid #05FEFF;
border-radius:10px;
position: relative;
}
}