Merge branch 'dev' of http://git.dnzc.vip:3000/yangqishu/tmzn-weihe into dev

package.json

@@ -10,12 +10,10 @@
   "dependencies": {
     "@ct/iframe-connect-sdk": "^1.0.17",
     "@turf/turf": "^7.2.0",
-    "artplayer": "^5.3.0",
     "axios": "^1.11.0",
     "core-js": "^3.8.3",
     "echarts": "^5.5.1",
     "element-ui": "^2.15.14",
-    "flv.js": "^1.6.2",
     "js-cookie": "3.0.5",
     "lodash-es": "^4.17.21",
     "mars3d": "3.8.0",

src/components/video-player/video-player.vue

@@ -1,37 +0,0 @@
-<template>
-  <div ref="videoPlayer"></div>
-</template>
-
-<script>
-import Artplayer from 'artplayer'
-export default {
-  name: 'ArtPlayer',
-  props: {
-    option: {
-      type: Object,
-      required: true
-    }
-  },
-  data() {
-    return {
-      artPlayer: null
-    }
-  },
-  methods: {
-    initPlayer() {
-      this.artPlayer = new Artplayer({
-        ...this.option,
-        container: this.$refs.videoPlayer
-      })
-    }
-  },
-  mounted() {
-    this.initPlayer()
-  },
-  beforeDestroy() {
-    if (this.artPlayer) {
-      this.artPlayer.destroy(false)
-    }
-  }
-}
-</script>

src/views/comprehensive-overview/left.vue

@@ -7,12 +7,22 @@
             <div class="main-container h380">
               <template v-if="noticeList.length > 0">
               <div class="img-txt" v-if="noticeList.length > 0" @click="toSee(noticeList[0])">
-                <el-image class="img" :src="noticeList[0].images"></el-image>
+                <template v-if="noticeList[0].images != null">
+                  <el-image class="img" :src="noticeList[0].images"></el-image>
+                </template>
+                <template v-else>
+                  <el-image class="img" :src="defaultImg" ></el-image>
+                </template>
                 <div class="txt">{{ noticeList[0].announcementName }}</div>
               </div>
               <div class="list" v-for="item in noticeDataList" :key="item.id">
                 <div class="left">
-                  <el-image :src="item.images" class="img"></el-image>
+                  <template v-if="item.images != null">
+                    <el-image :src="item.images" class="img"></el-image>
+                  </template>
+                  <template v-else>
+                    <el-image :src="defaultSmallImg" class="img"></el-image>
+                  </template>
                 </div>
                 <div class="right">
                   <div class="title">{{ item.announcementName }}</div>
@@ -118,6 +128,8 @@ import moment from 'moment'
 import BasePanelLeft from '@/components/base-panel/base-panel-left'
 import BaseMain from '@/components/base-main/base-main.vue'
 import {getAnnouncementList} from '@/api/announcementApi'
+import ImgUrl from '@/assets/image/comprehensive/bg1.png'
+import ImgUrl2 from '@/assets/image/comprehensive/bg2.png'
 export default {
   components: {
     BaseMain,
@@ -127,6 +139,8 @@ export default {
     return {
       noticeList: [],
       noticeDataList: [],
+      defaultImg:ImgUrl,
+      defaultSmallImg:ImgUrl2,
       tableInfo: [
         {
           id: 1,

vue.config.js

@@ -56,7 +56,7 @@ module.exports = defineConfig({
       },
       '/api': {
         //测试环境
-        target: 'http://192.168.1.185:28131',//http://192.168.1.185:28131
+        target: 'http://10.157.200.5:28132',//http://192.168.1.185:28131
         changOrigin: true
       }
     }