|
@@ -58,6 +58,9 @@
|
|
|
<template #type="{row}">
|
|
|
{{getTypeName(row?.type)}}
|
|
|
</template>
|
|
|
+ <!-- <template #angle="{row}">
|
|
|
+ {{row['du']}}°{{row['fen']}}′{{row['miao']}}″
|
|
|
+ </template> -->
|
|
|
<template #action="{row}">
|
|
|
<HcTooltip keys="gauge-station-edit">
|
|
|
<el-button type="primary" size="small" text @click="handleTableEdit(row)">编辑</el-button>
|
|
@@ -345,7 +348,7 @@ const tableColumn = ref([
|
|
|
{key:'name', name: '里程'},
|
|
|
{key:'orderNum', name: '排序'},
|
|
|
{key:'l', name: '长度'},
|
|
|
- {key:'angle', name: '方位角'},
|
|
|
+ {key:'angleStr', name: '方位角'},
|
|
|
{key:'type', name: '类型'},
|
|
|
{key:'swing', name: '转向'},
|
|
|
{key:'xxStr', name: 'X'},
|
|
@@ -707,10 +710,12 @@ const handleAdminPartEdit = (row) => {
|
|
|
|
|
|
//保存
|
|
|
const handleAdminPartSave = async (row) => {
|
|
|
- const reg = /^[A-Z]+$/
|
|
|
+ //严格模式/^[A-Z]+((#\d+)?|\d+)$/
|
|
|
+ const reg = /^[A-Z#-\d]+$/
|
|
|
if (!row.name) {
|
|
|
window?.$message?.warning('请输入名称')
|
|
|
- } else if (!row.prefix) {
|
|
|
+ } else if (!row.prefix&&row.name.indexOf('主线')<0) {
|
|
|
+ //没有前缀,且片段名称中不包含‘主线’
|
|
|
window?.$message?.warning('请输入桩号前缀')
|
|
|
} else if (!reg.test(row.prefix)) {
|
|
|
window?.$message?.warning('桩号前缀,只允许输入大写的英文字母')
|
|
@@ -726,7 +731,7 @@ const handleAdminPartSave = async (row) => {
|
|
|
queryPartList()
|
|
|
}
|
|
|
} else if (!row.id) {
|
|
|
- const { error, code } = await bezierApi.savePartAdd({
|
|
|
+ const { error, code ,data} = await bezierApi.savePartAdd({
|
|
|
...row,
|
|
|
projectId: projectId.value,
|
|
|
contractId: contractId.value
|
|
@@ -734,26 +739,44 @@ const handleAdminPartSave = async (row) => {
|
|
|
if (!error && code === 200) {
|
|
|
window?.$message?.success('保存成功')
|
|
|
row.isEdit = false
|
|
|
- queryPartList()
|
|
|
+ alert(222);
|
|
|
+ row.id=data.id
|
|
|
+ partData.value.push(data)
|
|
|
+ //queryPartList()不要刷新
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
//删除
|
|
|
-const handleAdminPartDelete = async (row, index) => {
|
|
|
+const handleAdminPartDelete = (row, index) => {
|
|
|
if (!!row.id) {
|
|
|
- const { error, code } = await bezierApi.delPartData({
|
|
|
+ window?.$messageBox?.alert('关联平曲线一起删除', '是否删除当前数据?', {
|
|
|
+ showCancelButton: true,
|
|
|
+ confirmButtonText: '确定删除',
|
|
|
+ cancelButtonText: '取消',
|
|
|
+ callback: (action) => {
|
|
|
+ if (action === 'confirm') {
|
|
|
+ handleAdminPartDeleteSub(row, index)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ AdminPartTableData.value.splice(index, 1)
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+const handleAdminPartDeleteSub = async (row, index) => {
|
|
|
+ const { error, code } = await bezierApi.delPartData({
|
|
|
ids: row.id
|
|
|
})
|
|
|
if (!error && code === 200) {
|
|
|
window?.$message?.success('删除成功')
|
|
|
queryPartList()
|
|
|
}
|
|
|
- } else {
|
|
|
- AdminPartTableData.value.splice(index, 1)
|
|
|
- }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
+
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|