Merge remote-tracking branch 'origin/master'

src/views/xjc-integratedmachine/components/dialog_component.vue

@@ -1,63 +0,0 @@
-<template>
-  <div>
-    <el-dialog v-model="centerDialogVisible" :show-close="false" width="500" center>
-      <div class="dialog-box">
-        {{ dialogInfo.content }}
-      </div>
-      <div class="footer-box">
-        <el-button type="primary" @click=""handClick>
-          {{dialogInfo.confirm}}
-        </el-button>
-        <el-button type="primary" @click="centerDialogVisible = false">
-          关闭
-        </el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup>
-import { defineEmit } from 'vue';
-const centerDialogVisible = ref(false)
-const props = defineProps({
-  dialogInfo: {}
-})
-function handClick(){
-  emit('notify');
-}
-const emit = defineEmit(['notify']);
-</script>
-
-
-
-<style scoped lang="scss">
-.dialog-box{
-  width: 463px;
-  height: 188px;
-  font-weight: bold;
-  font-size: 32px;
-  color: #000000;
-  text-align: center;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.footer-box{
-  width: 100%;
-  display: flex;
-  justify-content: space-around;
-  ::v-deep .el-button:nth-child(1){
-    width: 136px;
-    height: 60px;
-    background: #2BC17B;
-  }
-  ::v-deep .el-button:nth-child(2){
-    width: 136px;
-    height: 60px;
-    background: #FB5451;
-  }
-  ::v-deep .el-button>span{
-    font-size: 24px;
-  }
-}
-</style>

src/views/xjc-integratedmachine/environment/pro_details_video.vue

@@ -193,8 +193,6 @@ function detail(id) {
   })
 setTimeout(() => {
     setCollection_data()
-    collectionRef.value.isContrast(entity.value);
-    collectionRef.value.getSource('pro_details_video');
   }, 500);
 }