Ver código fonte

fix:下拉选择框提示文字颜色修改;网页的上移下移

wangshuang 1 ano atrás
pai
commit
a64eb281af
1 arquivos alterados com 8 adições e 32 exclusões
  1. 8 32
      inspur-ui/src/views/party_work/meeting/info.vue

+ 8 - 32
inspur-ui/src/views/party_work/meeting/info.vue

@@ -31,7 +31,7 @@
       style="width: 85%; display: flex;align-items: center;justify-content: space-between; margin-top: 15px;">
       <div class="display-row" style="display: flex;align-items: center;">
         <div class="text-fontsize-14">请选择会议设备</div>
-        <el-select v-model="deviceId" placeholder="请选择会议设备" style="margin-left: 8px;" :popper-append-to-body="false">
+        <el-select v-model="deviceId" placeholder="请选择会议设备" style="margin-left: 8px;" :popper-append-to-body="false" class="elselect">
           <el-option v-for="device in deviceList" :label="device.deviceName" :value="device.id" />
         </el-select>
       </div>
@@ -66,10 +66,7 @@
           <div class="text-fontsize-18" style="margin-top: 8px;">此处展示投屏画面</div>
         </div>
         <div v-else style="height: 83vh;width: 100%;overflow: hidden;" class="display-center">
-          <div v-if="fileType == 2" ref="scrollContainer" style="width: 100%; height: 83vh;overflow-y: auto;">
-            <iframe :src="material" style="width: 100%;height: 100%; border: none;"></iframe>
-          </div>
-          <!-- <iframe v-if="fileType == 2" :src="material" ref="iframe" style="width: 100%; height: 83vh;"></iframe> -->
+          <iframe v-if="fileType == 2" :src="material" ref="iframe" style="width: 100%; height: 83vh;"></iframe>
           <el-image v-else :src="pageSrc.fileUrl" @load="handleImageLoad"
             :style="{ height: imageHeight +'%',transform: 'translateY(' + imageOffset + 'px)'}" />
           <!-- <div v-else class="image-container" @mousedown="startMove" @mousemove="doMove" @mouseup="endMove"
@@ -1221,18 +1218,7 @@
         }
         imageMove(param).then(response => {
           console.log('上移:', response);
-
-          if (this.fileType == 2) { //浏览器
-            // const iframe = this.$refs.iframe;
-            // const currentTop = parseInt(iframe.style.top || '0', 10);
-            // iframe.style.top = `${currentTop - 10}px`; // 上移10px
-             this.$refs.scrollContainer.scrollTop = 0;
-
-          } else { //文件
-            this.imageOffset = this.imageOffset - ((this.moveId / 100) * this.imageHeightPxChange);
-          }
-
-
+          this.imageOffset = this.imageOffset - ((this.moveId / 100) * this.imageHeightPxChange);
           this.$message({
             message: '上移成功',
             type: 'success'
@@ -1244,7 +1230,6 @@
         if (!this.validDeviceId()) {
           return;
         }
-
         if (this.fileType == 1) {
           if (this.totalPage == null) {
             this.$message({
@@ -1271,20 +1256,7 @@
         }
         imageMove(param).then(response => {
           console.log('下移:', response);
-
-          if (this.fileType == 2) { //浏览器
-            // const iframe = this.$refs.iframe;
-            // const currentTop = parseInt(iframe.style.top || '0', 10);
-            // iframe.style.top = `${currentTop - 10}px`; // 上移10px
-            this.$refs.scrollContainer.scrollTop = 0;
-
-          } else { //文件
-            this.imageOffset = this.imageOffset + (this.moveId / 100) * this.imageHeightPxChange;
-          }
-
-
-
-
+          this.imageOffset = this.imageOffset + (this.moveId / 100) * this.imageHeightPxChange;
           this.$message({
             message: '下移成功',
             type: 'success'
@@ -1737,4 +1709,8 @@
     color: #FFE59E !important;
     border-color: transparent !important;
   }
+
+  .el-select .el-input__inner::placeholder{
+    color: #FFFFFF;
+  }
 </style>