Quellcode durchsuchen

modify space canvas page css and iconfont

haojianlong vor 5 Jahren
Ursprung
Commit
9880cb8203

Datei-Diff unterdrückt, da er zu groß ist
+ 62 - 6
src/assets/style/iconfont/iconfont.css


BIN
src/assets/style/iconfont/iconfont.eot


Datei-Diff unterdrückt, da er zu groß ist
+ 42 - 0
src/assets/style/iconfont/iconfont.svg


BIN
src/assets/style/iconfont/iconfont.ttf


BIN
src/assets/style/iconfont/iconfont.woff


+ 17 - 5
src/components/business_space/newAddDialogs/addEquipDialog.vue

@@ -25,7 +25,7 @@
         </el-table-column>
         <el-table-column prop="EquipLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="EquipCategory.EquipName" :label="`${inSpaceType}类`" show-overflow-tooltip min-width="100"></el-table-column>
-        <el-table-column prop="EquipLocalID" label="已关联其他业务空间" show-overflow-tooltip min-width="100"></el-table-column>
+        <el-table-column prop="linkOtherSpace" label="已关联其他业务空间" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
             <el-button size="mini" @click="toDetail(scope.$index, scope.row)" type="primary" plain>查看详情</el-button>
@@ -132,7 +132,7 @@ export default {
       let pa = {
         data: {
           Cascade: [{ Name: "equipCategory" }],
-          Filters: `BuildingId="${this.floor[0]}";FloorId="${this.floor[1]}"`,
+          Filters: `BuildingId='${this.floor[0]}';FloorId='${this.floor[1]}'`,
           PageNumber: this.page.pageNumber,
           PageSize: this.page.pageSize,
         },
@@ -143,17 +143,29 @@ export default {
         pa.data.Filters += `;EquipName contain "${this.keycode}" or EquipLocalName contain "${this.keycode}" or EquipLocalID contain "${this.keycode}"`
       }
       if (this.type == "Equipment") {
+        pa.data.Cascade.push({ Name: "zoneSpaceInBase" })
         notEqInSpaceQuery(pa, res => {
-          this.getDataSuc(res)
+          this.getDataSuc(res, 'ZoneSpaceBaseIn')
         })
       } else {
+        pa.data.Cascade.push({ Name: "zoneSpaceForBase" })
         notEqForSpaceQuery(pa, res => {
-          this.getDataSuc(res)
+          this.getDataSuc(res, 'ZoneSpaceBaseFor')
         })
       }
     },
     // 获取列表成功回调
-    getDataSuc(res) {
+    getDataSuc(res, zonespacebase) {
+      let response = res.Content.map(t => {
+        let otherSpace = [];
+        if (t[zonespacebase] && t[zonespacebase].length) {
+          t[zonespacebase].map(item => {
+            otherSpace.push(item.RoomLocalName || item.RoomName)
+          })
+        }
+        t.linkOtherSpace = otherSpace.join(',');
+        return t;
+      })
       this.tableData = res.Content;
       this.page.total = res.Total;
     },

+ 1 - 1
src/components/business_space/newAddDialogs/addSystemDialog.vue

@@ -14,7 +14,7 @@
         <el-table-column prop="SysLocalID" :label="`${inSpaceType}本地编码`" show-overflow-tooltip min-width="100"></el-table-column>
         <el-table-column prop="action" label="操作" min-width="100">
           <template slot-scope="scope">
-            <el-button size="mini" @click="toDetail(scope.$index, scope.row)" type="danger" plain icon="el-icon-delete"></el-button>
+            <el-button size="mini" @click="toDetail(scope.$index, scope.row)" type="primary" plain>查看详情</el-button>
           </template>
         </el-table-column>
       </el-table>

+ 62 - 0
src/components/business_space/newGraphy/canvasFun.vue

@@ -0,0 +1,62 @@
+<template>
+  <el-row id="canvas-actions-box">
+    <div class="active">
+      <i class="iconfont icon-move"></i>
+    </div>
+    <div>
+      <i class="iconfont icon-maximize"></i>
+    </div>
+    <div>
+      <el-dropdown size="mini" placement="top-start">
+        <i class="el-icon-download" style="font-size:20px;color:#fff;"></i>
+        <el-dropdown-menu slot='dropdown'>
+          <el-dropdown-item>保存为png</el-dropdown-item>
+          <el-dropdown-item>保存为svg</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+    <div>
+      <i class="iconfont icon-edit1"></i>
+    </div>
+    <div>
+      <i class="iconfont icon-Erase"></i>
+    </div>
+    <div>
+      <i class="iconfont icon-Cancel"></i>
+    </div>
+    <div>
+      <i class="iconfont icon-Anti-cancel"></i>
+    </div>
+    <div class="line">
+      <el-slider tooltip-class="tooltip-class" v-model="sliderVal" :show-tooltip="false"></el-slider>
+    </div>
+  </el-row>
+</template>
+<script>
+export default {
+  data(){
+    return{
+      sliderVal: '', // 滑块值
+    }
+  }
+}
+</script>
+<style lang="less" scoped>
+#canvas-actions-box {
+  min-width: 490px;
+  & > div {
+    float: left;
+    font-size: 20px;
+    padding: 0 10px;
+    color: #fff;
+    background-color: #6da60f;
+  }
+  & > div.active {
+    background-color: #4b7902;
+  }
+  & > div.line {
+    width: 200px;
+    height: 40px;
+  }
+}
+</style>

+ 27 - 42
src/components/business_space/newGraphy/graphy.vue

@@ -4,7 +4,7 @@
       <canvas id="canvas" :width="canvasWidth" :height="canvasHeight"></canvas>
     </div>
     <!-- 初始两个按钮 -->
-    <div class="buttons-box">
+    <el-row class="buttons-box">
       <div>
         <el-autocomplete popper-class="my-autocomplete" v-model="search" :fetch-suggestions="querySearch" placeholder="输入平面图中已有的业务空间名称进行查找"
           width="180px" @select="handleSelect">
@@ -17,7 +17,7 @@
           </template>
         </el-autocomplete>
       </div>
-      <div>
+      <div class="button-group">
         <!-- 默认操作模式 -->
         <div v-show="type==1">
           <el-button @click="1">创建业务空间</el-button>
@@ -40,40 +40,23 @@
           <el-button type="primary">保存</el-button>
         </div>
       </div>
-      <el-button style="position: absolute;top: 10px;right: 10px;" type="text">未关联元空间的业务空间 {{num}} 条</el-button>
-    </div>
+      <div style="position: absolute;right: 0;">
+        <el-button type="text">未关联元空间的业务空间 {{num}} 条</el-button>
+      </div>
+    </el-row>
     <!-- 底部操作按钮 -->
     <el-row class="canvas-actions-box">
-      <div class="active">
-        <i class="el-icon-rank"></i>
-      </div>
-      <div>
-        <i class="el-icon-rank"></i>
-      </div>
-      <div>
-        <el-dropdown size="mini" placement="top-start">
-          <i class="el-icon-download" style="font-size:20px;color:#fff;"></i>
-          <el-dropdown-menu slot='dropdown'>
-            <el-dropdown-item>保存为png</el-dropdown-item>
-            <el-dropdown-item>保存为svg</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
-      </div>
-      <div>
-        <i class="el-icon-remove-outline"></i>
-      </div>
-      <div class="line">
-        <el-slider tooltip-class="tooltip-class" :max="0.02" :min="0.004"></el-slider>
-      </div>
-      <div>
-        <i class="el-icon-circle-plus-outline"></i>
-      </div>
+      <canvasFun></canvasFun>
     </el-row>
     <!--  -->
   </div>
 </template>
 <script>
+import canvasFun from "./canvasFun"
 export default {
+  components: {
+    canvasFun
+  },
   data() {
     return {
       canvasWidth: 800,
@@ -114,6 +97,21 @@ export default {
   }
   .buttons-box {
     position: absolute;
+    top: 0;
+    width: 100%;
+    z-index: 99999999;
+    & > div {
+      float: left;
+    }
+    /deep/ .el-autocomplete{
+      display: block;
+      width: 320px;
+      margin-right: 10px;
+    }
+    .button-group button{
+      display: block;
+      float: left;
+    }
     .my-autocomplete {
       li {
         line-height: normal;
@@ -137,20 +135,7 @@ export default {
     bottom: 20px;
     left: 50%;
     transform: translateX(-50%);
-    & > div {
-      float: left;
-      font-size: 20px;
-      padding: 0 10px;
-      color: #fff;
-      background-color: #6da60f;
-    }
-    & > div.active {
-      background-color: #4b7902;
-    }
-    & > div.line {
-      width: 200px;
-      height: 40px;
-    }
+    z-index: 99999999;
   }
 }
 </style>