Merge branch 'dev_iscs' of https://git.code.tencent.com/lian-cbtc/jl-client into dev_iscs

src/views/system/iscsDesign/demonList.vue

@@ -91,6 +91,12 @@ export default {
                             mode: 'hmi',
                             id: '1',
                             type: 'interface'
+                        },
+                        {
+                            name: 'BAS界面',
+                            mode: 'bas',
+                            id: '2',
+                            type: 'interface'
                         }
                     ]
                 }

src/views/system/iscsDraw/index.vue

@@ -5,7 +5,8 @@
         <iscs-plate ref="iscsPlate" />
       </div>
       <div class="map-draft">
-        <iscs-operate ref="iscsOperate" @iscsChange="iscsChange" />
+        <iscs-operate v-if="iscsMode=='hmi'" ref="iscsOperate" @iscsChange="iscsChange" />
+        <iscs-bas-operate v-else-if="iscsMode=='bas'" ref="iscsBasOperate" @iscsChange="iscsChange" />
       </div>
     </div>
   </transition>
@@ -13,12 +14,13 @@
 <script>
 import IscsPlate from '@/views/iscsSystem/index';
 import IscsOperate from './iscsOperate/index';
-
+import IscsBasOperate from './iscsBasOperate/index';
 export default {
     name: 'IscsView',
     components: {
         IscsPlate,
-        IscsOperate
+        IscsOperate,
+        IscsBasOperate
     },
     data() {
         return {
@@ -28,6 +30,11 @@ export default {
             }
         };
     },
+    computed:{
+        iscsMode() {
+            return this.$route.params.mode;
+        }
+    },
     watch: {
 
     },
@@ -51,11 +58,12 @@ export default {
     @import "src/styles/mixin.scss";
 
     .map-draft{
-    /deep/{
+        height:100%;
-    .v-modal{
+        /deep/{
-        opacity: 0;
+            .v-modal{
-    }
+                opacity: 0;
-    }
+            }
+        }
     }
 
     .map-view {

src/views/system/iscsDraw/iscsBasOperate/index.vue

@@ -0,0 +1,44 @@
+<template>
+  <transition name="el-zoom-in-center">
+    <div class="map-control heightClass">
+      <el-card type="border-card" class="heightClass">
+        <div slot="header" class="clearfix">
+          <div>111111</div>
+          <el-button
+            type="text"
+            style="float: right; padding: 3px 0; margin-right: 5px;"
+            @click="handleSave"
+          >{{ $t('ibp.save') }}</el-button>
+        </div>
+        <el-tabs v-model="enabledTab" class="mapEdit" type="card" @tab-click="handleTabClick">
+          <el-tab-pane label="冷冻泵/冷却泵" name="frozenPump">
+            <manual-alarm-button
+              ref="clock"
+              style="width:90%"
+              @createDataModel="createDataModel"
+              @deleteDataModel="deleteDataModel"
+            />
+          </el-tab-pane>
+        </el-tabs>
+      </el-card>
+    </div>
+  </transition>
+</template>
+<script>
+export default {
+    name: 'IscsOperate',
+    // components: {
+    //     ManualAlarmButton
+    // },
+    mixins: [
+    ],
+    data() {
+        return {
+            enabledTab: 'frozenPump'
+        };
+    }
+};
+</script>
+<style lang="scss" scoped>
+    .heightClass{height:100%;}
+</style>