四色图修改

package-lock.json

@@ -15659,6 +15659,14 @@
       "resolved": "https://registry.npmmirror.com/vue-draggable-resizable/-/vue-draggable-resizable-2.3.0.tgz",
       "integrity": "sha512-77CLRj1TPwB30pwsjOf3pkd1UzYanCdKXbqhILJ0Oo5QQl50lvBfyQCXxMFzwWwTc3sbBbQH3FfWSV+BkoSElA=="
     },
+    "vue-draggable-resizable-rotatable": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmmirror.com/vue-draggable-resizable-rotatable/-/vue-draggable-resizable-rotatable-1.0.11.tgz",
+      "integrity": "sha512-ekMTKpjLi1VWiia4eCnJsYXsA0yp+/ORGlWGJTb8ckUnAZC8TFpNeOUaz57vpkn7BAzezgGBG2D2LLYGBe21MA==",
+      "requires": {
+        "vue": "^2.5.2"
+      }
+    },
     "vue-esign": {
       "version": "1.0.5",
       "resolved": "https://registry.npm.taobao.org/vue-esign/download/vue-esign-1.0.5.tgz",

package.json

@@ -31,6 +31,7 @@
     "vue-amap": "^0.5.10",
     "vue-awesome-mui": "^1.7.3",
     "vue-draggable-resizable": "^2.3.0",
+    "vue-draggable-resizable-rotatable": "^1.0.11",
     "vue-esign": "^1.0.5",
     "vue-grid-layout": "^2.4.0",
     "vue-html5plus": "^1.0.0",

src/assets/imgs/rotate.svg

+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="40" height="40">
+  <path d="M711.68 512a35.413333 35.413333 0 0 0-34.986667 35.84 164.693333 164.693333 0 1 1-180.906666-168.106667v81.066667l191.146666-113.066667-190.72-113.066666v74.666666A240.64 240.64 0 0 0 512 789.333333a237.653333 237.653333 0 0 0 234.666667-240.213333 35.413333 35.413333 0 0 0-34.986667-37.12z"></path>
+</svg>

src/views/drawCanvas/riskView.vue

@@ -23,7 +23,7 @@
     <!-- @click.native="changeName(item)" -->
     <!-- :static="item.static" -->
 
-    <div :style="{ minHeight: layoutHeight + 'px' }">
+    <div :class="{ 'roomContainerBorder': isViews }" :style="{ minHeight: layoutHeight + 'px' }">
       <vue-draggable-resizable parent ref="dragResizable" v-for="item in layout" :x="(W / 12) * item.x" :y="item.y * 30"
         :w="(W / 12) * item.w" :h="item.h * 30" :i="item.i" :key="item.i" :z="item.zIndex" :draggable="item.isDraggable"
         :resizable="item.isResizable" @resizestop="(x, y, w, h) => resizedEvent(item, x, y, w, h)"
@@ -52,7 +52,8 @@
           border: item.type == 'thorough' ? 'none !important' : '',
         }"
       > -->
-        <span class="text" :class="item.w > item.h * 5 ? '' : 'rowText'">{{
+        <span class="text" :class="item.w > item.h * 5 ? '' : 'rowText'"
+          :style="{ fontSize: Math.min(25, Math.max(item.w * item.h, 12)) + 'px' }">{{
       item.name
     }}</span>
         <span class="remove" @click.stop="removeItem(item.i)" v-if="showHeader">x</span>
@@ -170,6 +171,7 @@ export default {
       },
     };
   },
+
   props: {
     isView: {
       type: Boolean,
@@ -509,6 +511,8 @@ export default {
       item.h = h / 30;
       item.x = (x / this.W) * 12;
       item.y = y / 30;
+      // console.log(item.w, item.h);
+      item.textSize = Math.min(24, Math.max(item.w * 10, 12));
     },
     onResize() {
       debounce(this.updateLayoutHeight)();
@@ -960,4 +964,8 @@ export default {
 .vdr {
   border-style: solid;
 }
+
+.roomContainerBorder {
+  border: 2px solid #b3b3b3;
+}
 </style>

vue.config.js

@@ -10,8 +10,8 @@ module.exports = {
     proxy: {
       //配置跨域
       "/app-api": {
-        // target: "http://192.168.4.232:8080/", //这里是后台的地址
-        target: "http://192.168.15.230:8080/", //这里是晓晋的地址
+        target: "http://192.168.4.232:8080/", //这里是后台的地址
+        // target: "http://192.168.15.230:8080/", //这里是晓晋的地址
         ws: true,
         changOrigin: true, //允许跨域
         // logLevel: 'debug',  // 显示代理调试信息