cfy777/Situation-Awareness-Platform-Frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 冲突

Browse Source
This commit is contained in:
汪少伟
2025-03-16 11:30:21 +08:00
parent d59476543a
commit cbf515d61c
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/Jyh/PersonalCenter/Detail/EarlyWarningPerson.vue
View File

@@ -6,11 +6,7 @@
<d-column field="code" header="时间"></d-column> <d-column field="code" header="时间"></d-column>
<d-column field="name" header="标题"> <d-column field="name" header="标题">
<template #default="scope"> <template #default="scope">
<<<<<<< HEAD <a @click="openWarningDetail(scope.row)">{{ scope.row.name }}</a>
<a @click="openWarningDetail(scope.row)">{{scope.row.name}}</a>
=======
<a>{{ scope.row.name }}</a>
>>>>>>> wsw
</template> </template>
</d-column> </d-column>
<d-column field="detail" header="详情"></d-column> <d-column field="detail" header="详情"></d-column>
@@ -48,7 +44,6 @@ const licenseTableData = ref([
{ code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 2, status: 1 }, { code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 2, status: 1 },
{ code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 1, status: 2 } { code: '05822156', name: 'MIT License', detail: 'integer', owner: 'admin', level: 1, status: 2 }
]); ]);
<<<<<<< HEAD
const warningModalVisable = ref(false); const warningModalVisable = ref(false);
const currentWarning = ref(); const currentWarning = ref();
@@ -59,8 +54,6 @@ const openWarningDetail = (row) => {
const colseWarningDetail = () => { const colseWarningDetail = () => {
warningModalVisable.value = false; warningModalVisable.value = false;
}; };
=======
>>>>>>> wsw
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">