Merge branch 'jia' into 'master'

修正图标位置



See merge request !27

src/views/docker/envDetail.vue

@@ -39,10 +39,10 @@
           v-if="serviceName!=='rabbitmq'"
           label="服务名">
           <template slot-scope="scope">
-            <span v-if="scope.row.serviceName !== 'rabbitmq'">{{ scope.row.serviceName }}</span>
-            <span v-if="scope.row.serviceName === 'rabbitmq'" class="link-type" @click="openRabbitmq(scope.row)">{{ scope.row.serviceName }}</span>
             <i v-if="scope.row.status == 'Normal'" class="el-icon-success" style="color: #67c23a"/>
             <i v-else class="el-icon-error" style="color: #f56c6c"/>
+            <span v-if="scope.row.serviceName !== 'rabbitmq'">{{ scope.row.serviceName }}</span>
+            <span v-if="scope.row.serviceName === 'rabbitmq'" class="link-type" @click="openRabbitmq(scope.row)">{{ scope.row.serviceName }}</span>
           </template>
         </el-table-column>
         <el-table-column