Browse Source

Merge remote-tracking branch 'origin/master'

onlyh 3 years ago
parent
commit
0fdbe1a1ae

File diff suppressed because it is too large
+ 22 - 6
src/assets/iconfont/iconfont.css


BIN
src/assets/iconfont/iconfont.eot


File diff suppressed because it is too large
+ 12 - 0
src/assets/iconfont/iconfont.svg


BIN
src/assets/iconfont/iconfont.ttf


BIN
src/assets/iconfont/iconfont.woff


+ 2 - 2
src/views/maintain/space/components/canvasFun.vue

@@ -27,10 +27,10 @@
             </el-dropdown>
         </div>
         <div v-if="config.isEdit&&config.drawWall" @click="drawWall" :class="{ 'active': active === 'drawWall' }">
-            <i class="el-icon-share"></i>
+            <i class="iconfont icon-mianxingqiqianggongren"></i>
         </div>
         <div v-if="config.isEdit&&config.drawWall" @click="clearWall">
-            <i class="iconfont icon-Erase"></i>
+            <i class="iconfont icon-mianxingzaqiang"></i>
         </div>
         <div v-if="config.isEdit&&config.divide" @click="clearDivide">
             <i class="iconfont icon-Erase"></i>

+ 5 - 1
src/views/maintain/space/components/spaceGraph.vue

@@ -35,7 +35,7 @@
                     <!-- 保存墙 -->
                     <div v-if="type==6">
                         <el-button type="primary" @click="saveMap">保 存</el-button>
-                        <el-button plain @click="cancelGraphy">取 消</el-button>
+                        <el-button plain @click="cancelGraphy2">取 消</el-button>
                     </div>
                     <!-- 删除业务空间 -->
                     <div v-if="type==7">
@@ -374,6 +374,10 @@ export default class spaceGraph extends Vue {
     cancelGraphy() {
         this.init(2);
     }
+    // 绘制墙 取消
+    cancelGraphy2(){
+        this.init(1)
+    }
     // 重新划分业务空间保存
     saveRefactorBSP() {
         let zoneObj = {