fix:合并冲突问题

ZhangXianQiang

2024-04-11 1e537df7699ddb11f2a08d1116f107b160299ea6

fix:合并冲突问题

 src/views/screen/components/screen-wrapper/index.vue

@@ -12,7 +12,7 @@
        <screen-video class="enter-left animate-delay-2" :class="{ 'animate-enter-x': isEnd }"></screen-video>
      </div>
      <div class="center-container center-wrapper">
        <screen-map></screen-map>
        <screen-map-cover></screen-map-cover>
        <screen-table class="enter-top" :class="{ 'animate-enter-y': isEnd }"></screen-table>
        <!-- <screen-detection></screen-detection> -->

@@ -31,17 +31,16 @@
import ScreenFace from '../screen-face/index';
import ScreenVideo from '../screen-video/index';
import ScreenCar from '../screen-car/index';
import ScreenMap from '../screen-map/index';
import ScreenMapCover from '../screen-map-cover/index';
import ScreenTable from '../screen-table/index';
import ScreenMapThree from '../screen-map-three/index.vue';
import ScreenMapThree from '../screen-map-three/index';
import ScreenData from '../screen-data/index';

export default {
  name: 'ScreenWrapper',
  components: {
    SelectItem,
    ScreenExamine,
    ScreenMap,
    ScreenTable,
    ScreenMapCover,
    ScreenMapThree,