设备日历

itdmWeb/src/views/module-iTDM/itdmGongdanMaster/uGantt.vue

@@ -609,7 +609,7 @@ export default {
   }
   .eq-rili-view{
     .el-select{
-      ::v-deep .el-input__inner{
+      .el-input__inner{
         border-top-right-radius: 0;
         border-bottom-right-radius: 0;
         border-right: 0;

itdmWeb/src/views/module-iTDM/itdmGongdanMaster/uGantt2.vue

@@ -52,14 +52,17 @@
             </el-select>
           </el-form-item>
           <el-form-item label="试验设备" prop="shebeiId">
-            <el-select v-model="currentDbEdit.shebeiId" placeholder="请选择试验设备" style="width: 100%;">
-              <el-option
-                v-for="item in deviceOption"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
+            <div class="eq-rili-view" style="display: flex;">
+              <el-select v-model="currentDbEdit.shebeiId" placeholder="请选择试验设备" style="width: 100%;">
+                <el-option
+                  v-for="item in deviceOption"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+              <div class="search-btn" @click="handleEqCalendar">{{openRl == 1 ? '收起': '展开'}}</div>
+            </div>
           </el-form-item>
           <el-calendar v-if="openRl == 1">
             <template slot="dateCell" slot-scope="{date, data}">
@@ -550,6 +553,24 @@ export default {
     padding-left: 0;
     padding-right: 0;
   }
+  .eq-rili-view{
+    .el-select{
+      .el-input__inner{
+        border-top-right-radius: 0 !important;
+        border-bottom-right-radius: 0 !important;
+        border-right: 0 !important;
+      }
+    }
+    .search-btn{
+      width: 60px;
+      background-color: #1890ff;
+      // padding: 0 22px;
+      color: #fff;
+      border-top-right-radius: 4px;
+      border-bottom-right-radius: 4px;
+      text-align: center;
+    }
+  }
   // 日历
   .el-calendar{
     .el-calendar-table .el-calendar-day{