diff --git a/src/components/GdMap/mapUtil.js b/src/components/GdMap/mapUtil.js
index 9acd24b..6839581 100644
--- a/src/components/GdMap/mapUtil.js
+++ b/src/components/GdMap/mapUtil.js
@@ -188,8 +188,6 @@ export function MapUtil(map) {
}
// 弹窗自定义标签内容
function zdyContentHtml(flag, item) {
- console.log(item);
-
let html = ''
switch (flag) {
case 'hm_pop':
diff --git a/src/components/aboutTable/DarkTable.vue b/src/components/aboutTable/DarkTable.vue
index 1a2c51b..6c23f3a 100644
--- a/src/components/aboutTable/DarkTable.vue
+++ b/src/components/aboutTable/DarkTable.vue
@@ -132,10 +132,18 @@ const props = defineProps({
tableHeight: {
type: Number || String,
},
+ // 在自动滚动中,想滚动到底部,是否请求下一页
+ hasNext: {
+ type: Number,
+ default: false
+ },
+
+ // 自动滚动
isScroll: {
type: Number,
default: false
},
+
customClass: {
type: String
},
@@ -333,6 +341,8 @@ const createScroll = () => {
timer.value = setInterval(() => {
target.scrollTop += 1;
if (target.scrollTop >= originalBodyHeight.value) {
+ // 滚动到底部没有下一页了,循环滚动 ,
+ if(props.hasNext) emit("changePage");
target.scrollTop -= originalBodyHeight.value;
}
}, 20);
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 9263aa7..9012c49 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -10,11 +10,18 @@
-
+
@@ -155,12 +161,14 @@ import GeneralWindow from './model/generalWindow.vue'
import WebSoketClass from '@/utils/webSocket.js'
import { timeValidate } from '@/utils/tools.js'
import Statistics from './model/statistics.vue'
+import MyCase from './model/myCase.vue'
// 导入音频播放器工具类
import audioPlayer from '@/utils/audioPlayer'
const { proxy } = getCurrentInstance();
const { D_BZ_JQDJ } = proxy.$dict('D_BZ_JQDJ')
const webSoket = new WebSoketClass()
const modelWarning = ref(true)
+const modelQbsb = ref(true)
const searchText = ref('')
const peoDialogRef = ref()
const showSeatch = ref(false)
diff --git a/src/views/home/model/myCase.vue b/src/views/home/model/myCase.vue
new file mode 100644
index 0000000..7e6d6c8
--- /dev/null
+++ b/src/views/home/model/myCase.vue
@@ -0,0 +1,108 @@
+
+
+ 我的关注
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/home/model/qbsbCount.vue b/src/views/home/model/qbsbCount.vue
index 199cec9..3723086 100644
--- a/src/views/home/model/qbsbCount.vue
+++ b/src/views/home/model/qbsbCount.vue
@@ -1,6 +1,6 @@
-
情报上报统计
+
情报上报统计切换
查看列表
@@ -26,8 +26,9 @@
import { qcckPost } from "@/api/qcckApi.js";
import LineEcharts from "../echarts/moreLineEcharts.vue";
import Intelligence from "@/views/home/model/mesgSwitch/intelligence.vue";
-import { reactive, onMounted, ref, } from 'vue';
+import { defineEmits, onMounted, ref, } from 'vue';
// import TimeData from '@/views/home/model/mesgSwitch/timeData.vue'
+const emit = defineEmits(['change'])
const dataList = ref({
xData: [],
@@ -64,6 +65,10 @@ const changeTime = (val) => {
const close = () => {
visible.value = false
}
+
+const reversalPush = () => {
+ emit('change')
+}
diff --git a/src/views/home/model/statistics.vue b/src/views/home/model/statistics.vue
index 15dcd2a..f615b4a 100644
--- a/src/views/home/model/statistics.vue
+++ b/src/views/home/model/statistics.vue
@@ -1,6 +1,6 @@
-
+
返回
切换
@@ -14,9 +14,10 @@