Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-ui into dev

src/views/mes/md/workstation/index.vue

@@ -463,9 +463,9 @@
         ref="machinerySelect"
         @onSelected="onMachineryAdd"
       ></MachinerySelectSingle> -->
-      <el-row v-if="form.workstationId != null">
-        <el-col :span="24">
-          <el-carousel trigger="click" type="card" :autoplay="false">
+      <div v-if="form.workstationId">
+        <!-- <el-col :span="24"> -->
+          <!-- <el-carousel trigger="click" type="card" :autoplay="false"> -->
             <!-- <el-carousel-item>
               <el-card shadow="always" style="width: 450px">
                 <div slot="header">
@@ -486,8 +486,8 @@
                 ></WorkStationMachine>
               </el-card>
             </el-carousel-item> -->
-            <el-carousel-item>
-              <el-card shadow="always" style="width: 400px">
+            <!-- <el-carousel-item> -->
+              <el-card shadow="always">
                 <div slot="header">
                   <span>人力资源</span>
                   <el-button
@@ -504,7 +504,7 @@
                   :workstationId="form.workstationId"
                 ></Workstationworker>
               </el-card>
-            </el-carousel-item>
+            <!-- </el-carousel-item> -->
             <!-- <el-carousel-item>
               <el-card shadow="always" style="width: 400px">
                 <div slot="header">
@@ -524,9 +524,9 @@
                 ></WorkStationTool>
               </el-card>
             </el-carousel-item> -->
-          </el-carousel>
-        </el-col>
-      </el-row>
+          <!-- </el-carousel> -->
+        <!-- </el-col> -->
+      </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="cancel" v-if="optType == 'view'"
           >返回</el-button