diff --git a/src/components/echarts/rmsboxi.vue b/src/components/echarts/rmsboxi.vue
index b7b647bc..841a17d5 100644
--- a/src/components/echarts/rmsboxi.vue
+++ b/src/components/echarts/rmsboxi.vue
@@ -1061,7 +1061,7 @@ export default {
type: "line",
smooth: true,
symbol: "none",
- sampling: "lttb",
+ sampling: "average",
itemStyle: {
color: "#FFCC00",
},
@@ -1072,7 +1072,7 @@ export default {
type: "line",
smooth: true,
symbol: "none",
- sampling: "lttb",
+ sampling: "average",
itemStyle: {
color: "#009900",
},
@@ -1083,7 +1083,7 @@ export default {
type: "line",
smooth: true,
symbol: "none",
- sampling: "lttb",
+ sampling: "average",
itemStyle: {
color: "#CC0000",
},
@@ -1479,7 +1479,7 @@ export default {
type: "line",
smooth: true,
symbol: "none",
- sampling: "lttb",
+ sampling: "average",
itemStyle: {
color: "#FFCC00",
},
@@ -1490,7 +1490,7 @@ export default {
type: "line",
smooth: true,
symbol: "none",
- sampling: "lttb",
+ sampling: "average",
itemStyle: {
color: "#009900",
},
@@ -1501,7 +1501,7 @@ export default {
type: "line",
smooth: true,
symbol: "none",
- sampling: "lttb",
+ sampling: "average",
itemStyle: {
color: "#CC0000",
},
diff --git a/src/components/echarts/shushiboxi.vue b/src/components/echarts/shushiboxi.vue
index 9807a4a1..eb6a39b6 100644
--- a/src/components/echarts/shushiboxi.vue
+++ b/src/components/echarts/shushiboxi.vue
@@ -729,7 +729,7 @@ export default {
type: 'line',
smooth: true,
symbol: 'none',
- sampling: 'lttb',
+ sampling: 'average',
itemStyle: {
color: '#FFCC00'
},
@@ -740,7 +740,7 @@ export default {
type: 'line',
smooth: true,
symbol: 'none',
- sampling: 'lttb',
+ sampling: 'average',
itemStyle: {
color: '#009900'
},
@@ -751,7 +751,7 @@ export default {
type: 'line',
smooth: true,
symbol: 'none',
- sampling: 'lttb',
+ sampling: 'average',
itemStyle: {
color: '#CC0000'
},
@@ -1083,7 +1083,7 @@ export default {
type: 'line',
smooth: true,
symbol: 'none',
- sampling: 'lttb',
+ sampling: 'average',
itemStyle: {
color: '#FFCC00'
},
@@ -1094,7 +1094,7 @@ export default {
type: 'line',
smooth: true,
symbol: 'none',
- sampling: 'lttb',
+ sampling: 'average',
itemStyle: {
color: '#009900'
},
@@ -1105,7 +1105,7 @@ export default {
type: 'line',
smooth: true,
symbol: 'none',
- sampling: 'lttb',
+ sampling: 'average',
itemStyle: {
color: '#CC0000'
},
diff --git a/src/views/pqs/database/algorithm/components/form.vue b/src/views/pqs/database/algorithm/components/form.vue
index cee0944f..50c8d756 100644
--- a/src/views/pqs/database/algorithm/components/form.vue
+++ b/src/views/pqs/database/algorithm/components/form.vue
@@ -36,7 +36,7 @@
@@ -51,6 +51,7 @@ const emit = defineEmits(['getTree'])
const dialogVisible = ref(false)
const title = ref('')
const formRef = ref()
+const loading = ref(false)
const dataTree = ref([])
const TreeList: any = ref({})
const List = ref({})
@@ -110,7 +111,8 @@ const open = (row: any) => {
// row.row
}
}
-const submit = () => {
+const submit = async () => {
+ loading.value = true
formRef.value.validate(async (valid: boolean) => {
if (valid) {
if (title.value == '新增算法') {
@@ -121,7 +123,7 @@ const submit = () => {
forms.name = form.name
forms.pid = form.pid
}
- addAlgorithm(forms).then(res => {
+ await addAlgorithm(forms).then(res => {
ElMessage.success('新增成功')
dialogVisible.value = false
emit('getTree')
@@ -135,7 +137,7 @@ const submit = () => {
forms.id = form.id
}
forms.pid = null
- updateAlgorithmLibrary(forms).then(res => {
+ await updateAlgorithmLibrary(forms).then(res => {
ElMessage.success('修改成功')
dialogVisible.value = false
emit('getTree')
@@ -143,6 +145,9 @@ const submit = () => {
}
}
})
+ await setTimeout(() => {
+ loading.value=false
+ },0)
}
const getTheTree = () => {
queryAllAlgorithmLibrary().then(res => {
diff --git a/src/views/pqs/database/case/components/form.vue b/src/views/pqs/database/case/components/form.vue
index 66b8e70a..92f0fa88 100644
--- a/src/views/pqs/database/case/components/form.vue
+++ b/src/views/pqs/database/case/components/form.vue
@@ -1,12 +1,6 @@
-
+
@@ -21,37 +15,21 @@
/>
-->
-
+
-
+
-
+
-
+
@@ -68,7 +46,7 @@
@@ -85,6 +63,7 @@ const emit = defineEmits(['onSubmit'])
const dialogVisible = ref(false)
const title = ref('')
const formRef = ref()
+const loading = ref(false)
const fileList: any = ref([])
// 注意不要和表单ref的命名冲突
const form = reactive({
@@ -135,8 +114,9 @@ const open = (text: string, data?: anyObj) => {
}
}
}
-const submit = () => {
- formRef.value.validate(async (valid: boolean) => {
+const submit = async () => {
+ loading.value = true
+ await formRef.value.validate(async (valid: boolean) => {
if (valid) {
if (fileList.value.length > 0) {
const promises = fileList.value.map(async item => {
@@ -164,21 +144,25 @@ const submit = () => {
form.url = ''
}
- setTimeout(() => {
+ await setTimeout(async () => {
if (title.value === '新增案例') {
- libcaseAdd(form).then(res => {
+ await libcaseAdd(form).then(res => {
ElMessage.success(title.value + '成功!')
handleClose()
})
} else {
- ElMessage.success(title.value + '成功!')
- updateCaseLibrary(form).then(res => {
+ await updateCaseLibrary(form).then(res => {
+ ElMessage.success(title.value + '成功!')
+
handleClose()
})
}
}, 100)
}
})
+ await setTimeout(() => {
+ loading.value = false
+ }, 1000)
}
const handleClose = () => {
diff --git a/src/views/pqs/database/standard/components/addTree.vue b/src/views/pqs/database/standard/components/addTree.vue
index f1854108..105fa679 100644
--- a/src/views/pqs/database/standard/components/addTree.vue
+++ b/src/views/pqs/database/standard/components/addTree.vue
@@ -31,7 +31,7 @@
@@ -57,6 +57,7 @@ const form = reactive({
url: ''
})
const urlList: any = ref([])
+const loading=ref(false)
const defaultProps = {
children: 'children',
label: 'name',
@@ -107,7 +108,8 @@ const getTheTree = () => {
dataTree.value = res.data
})
}
-const submit = () => {
+const submit = async() => {
+ loading.value=true
formRef.value.validate(async (valid: boolean) => {
if (valid) {
if (urlList.value.length > 0 && form.pid != '') {
@@ -162,6 +164,9 @@ const submit = () => {
}, 100)
}
})
+ setTimeout(() => {
+ loading.value=false
+ }, 1000);
}
const handleClose = () => {
urlList.value = []
diff --git a/src/views/pqs/database/stencil/components/form.vue b/src/views/pqs/database/stencil/components/form.vue
index 573bc163..5667ef24 100644
--- a/src/views/pqs/database/stencil/components/form.vue
+++ b/src/views/pqs/database/stencil/components/form.vue
@@ -17,7 +17,7 @@
@@ -42,6 +42,7 @@ const form = reactive({
url: ''
})
const urlList: any = ref([])
+const loading=ref(false)
const defaultProps = {
children: 'children',
label: 'name',
@@ -86,6 +87,7 @@ const handleExceed: UploadProps['onExceed'] = (files) => {
const submit = () => {
+ loading.value = true
formRef.value.validate(async (valid: boolean) => {
if (valid) {
if (urlList.value.length > 0) {
@@ -138,6 +140,9 @@ const submit = () => {
}, 100)
}
})
+ setTimeout(() => {
+ loading.value = false
+ }, 1000)
}
const handleClose = () => {
urlList.value = []