更新

src/views/home/dialog/leftDialog.vue

@@ -1,5 +1,7 @@
 <template>
   <div class="noScollLine">
+    <!-- 情报上报列表 -->
+    <Intelligence v-model="isShow.showQbsb" v-if="isShow.showQbsb" />
     <!-- 预警信息弹框 -->
     <Home_YJ v-if="isShow.showYj" :show="isShow.showYj" :data="list.Info_YJ" />
     <PopupWarning v-if="isShow.showWarning" :show="isShow.showWarning" :data="list.Info_Warning" />
@@ -10,11 +12,13 @@
 import emitter from "@/utils/eventBus.js";
 import Home_YJ from "./components/home_yj.vue";
 import PopupWarning from './components/popupWarning'
+import Intelligence from "@/views/home/model/mesgSwitch/intelligence.vue";
 import { ref, onMounted, onUnmounted, reactive, getCurrentInstance } from "vue";
 const { proxy } = getCurrentInstance();
 const isShow = ref({
   showYj: false, //预警弹窗
-  showWarning: false
+  showWarning: false, //预警弹窗
+  showQbsb: false, //情报上报列表弹窗
 });
 const list = reactive({
   Info_YJ: [], //预警数据
@@ -32,6 +36,10 @@ onMounted(() => {
     isShow.value.showWarning = res ? true : false;
     if (res) list.Info_Warning = res;
   });
+  // 展示情报上报列表
+  emitter.on("lookQbsbList", (res) => {
+    isShow.value.showQbsb = res ? true : false;
+  });
 });
 onUnmounted(() => {
   emitter.off("showHomeYJ");

src/views/home/model/mesgSwitch/intelligence.vue

@@ -40,7 +40,7 @@ import Pages from "@/components/aboutTable/Pages.vue";
 import Xq from "./xq.vue";
 import { qbcjSelectPage } from "@/api/Intelligence.js";
 import {xxcjSelectPage,xxcjXxzsx} from '@/api/xxcj.js'
-import { ref, reactive, getCurrentInstance, watch } from "vue";
+import { ref, reactive, getCurrentInstance, watch, onMounted } from "vue";
 import { useRoute,useRouter } from 'vue-router'
 const route = useRoute()
 const router = useRouter()
@@ -102,29 +102,26 @@ const pageData = reactive({
     { label: "上报人姓名", prop: "xssbr" },
     { label: "情报编号", prop: "xsBh" },
     { label: "情报标题", prop: "qbmc" },
-    // { label: "情报类型", prop: "qblx", showSolt: true },
-    // { label: "情报来源", prop: "qbly", showSolt: true },
     { label: "情报上报时间", prop: "sxsbsj" ,watch:'300'},
-    // { label: "指向地点", prop: "zxdz" },
     { label: "情报内容", prop: "qbnr" },
   ],
-  tableHeight: "50vh",
+  tableHeight: "45vh",
 });
 const parameter = ref()
+
+onMounted(() => {
+  changePage()
+})
+
 const onSearch = (val) => {
   const promes = {
-    startTime: val.startTime && val.startTime.length > 0 ? val.startTime[0] : '',
+    startTime: val.startTime ? val.startTime[0] : '',
-    endTime: val.startTime && val.startTime.length > 0 ? val.startTime[1] : '',
+    endTime: val.endTime ? val.endTime[1] : '',
   }
   parameter.value = { ...val, ...promes }
   pageData.pageConfiger.pageCurrent = 1;
   changePage()
 }
-watch(() => props.modelValue, (val) => {
-  if (val) {
-    changePage()
-  }
-})
 const changePage = () => {
   pageData.tableConfiger.loading = true;
   let data = { ...pageData.pageConfiger, ...parameter.value,qbjb:'01' };

src/views/home/model/qbsbCount.vue

@@ -1,33 +1,18 @@
 <template>
   <div class="comom-title">
     <span class="title">情报上报统计<span class="titleFz ml18" @click.stop="reversalPush">切换</span></span>
-     <div class="title titleFz" @click="visible = true">
+     <div class="title titleFz" @click="lookList">查看列表</div>
-      查看列表
-     </div>
-    <!-- <el-popover placement="right" :width="430"  :visible="visible">
-      <template #reference>
-      </template>
-      <div>
-        <div class="qbltData">
-          <div>查询</div>
-          <div class="close" @click.stop="close()">X</div>
-        </div>
-        <TimeData v-if="visible" @changeTime="changeTime" />
-      </div>
-    </el-popover> -->
   </div>
   <div class="comom-cnt qxsbBox">
     <LineEcharts echartsId="qbsbEcharts" :data="dataList" :dataZoom="false" :rotate="-25"></LineEcharts >
   </div>
-  <Intelligence v-model="visible" :dict="{D_BZ_QBSBLY}"/>
 </template>
 
 <script setup>
+import emitter from "@/utils/eventBus.js";
 import { qcckPost } from "@/api/qcckApi.js";
 import LineEcharts from "../echarts/moreLineEcharts.vue";
-import Intelligence from "@/views/home/model/mesgSwitch/intelligence.vue";
 import { defineEmits, onMounted, ref, } from 'vue';
-// import TimeData from '@/views/home/model/mesgSwitch/timeData.vue'
 const emit = defineEmits(['change'])
 
 const dataList = ref({
@@ -55,15 +40,8 @@ const getCount = () => {
   })
 }
 
-const visible = ref(false)
+const lookList = () => {
-const changeTime = (val) => {
+  emitter.emit('lookQbsbList',true)
-  listQuery.value = {
-    ...val
-  }
-  getCount()
-}
-const close = () => {
-  visible.value = false
 }
 
 const reversalPush = () => {