四色图修改

src/views/risk/drawCanvas/index.vue

@@ -20,24 +20,27 @@
       </el-row>
       <!-- <el-button @click="editItem" type="default"  v-if="!isViews">修改</el-button> -->
 
-      <div id="printDiv" :style="{ minHeight: layoutHeight + 'px', padding: '20px' }" class="vue-grid-layout">
+      <div id="printDiv" :style="{ minHeight: layoutHeight + 'px', padding: '20px' }"
+        :class="{ 'roomContainerBorder': isViews }" class="vue-grid-layout">
         <div class="north" style="margin-right: 20px">
           <img src="../../../assets/images/north.png" alt="" />
         </div>
-        <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"
+        <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 && !isViews" :resizable="item.isResizable && !isViews"
-          @resizestop="(x, y, w, h) => resizedEvent(item, x, y, w, h)" @dragging="(x, y) => onDrag(item, x, y)" @dragstop="(x, y) => {
-            movedEvent(item, x, y);
-          }
-            " @resizing="(x, y, w, h) => onResize(item, x, y, w, h)" @activated="onActivated(item)"
+          @resizestop="(x, y, w, h) => resizedEvent(item, x, y, w, h)" @dragging="(x, y) => onDrag(item, x, y)"
+          @dragstop="(x, y) => {
+        movedEvent(item, x, y);
+      }
+        " @resizing="(x, y, w, h) => onResize(item, x, y, w, h)" @activated="onActivated(item)"
           @click.native="dbClickEvent($event, item)" :style="{
-            backgroundColor: item.c,
-            border: item.type == 'thorough' ? 'none !important' : '',
-          }">
-          <span class="text" :class="item.w > item.h * 5 ? '' : 'rowText'">{{
-            item.name
-          }}</span>
+        backgroundColor: item.c,
+        border: item.type == 'thorough' ? 'none !important' : '',
+      }">
+          <span class="text" :class="item.w > item.h * 5 ? '' : 'rowText'"
+            :style="{ fontSize: Math.min(28, Math.max(item.w * item.h, 14)) + 'px' }">{{
+        item.name
+      }}</span>
           <span class="remove" @click.stop="removeItem(item.i)" v-if="!isViews">x</span>
         </vue-draggable-resizable>
       </div>
@@ -75,13 +78,14 @@
             </el-select> -->
             <!-- v-model="copyRoom.floor.name" -->
             <el-cascader :options="copyRoom.floorData" :props="{
-              label: 'name',
-              value: 'id',
-            }" @change="handleChange"></el-cascader>
+        label: 'name',
+        value: 'id',
+      }" @change="handleChange"></el-cascader>
           </el-form-item>
           <el-form-item label="房间" prop="copyRoomName">
             <el-select v-model="copyRoom.room.id" @visible-change="seletRoom" placeholder="选择房间">
-              <el-option v-for="item in copyRoom.roomData" :key="item.id" :label="item.name" :value="item.id"></el-option>
+              <el-option v-for="item in copyRoom.roomData" :key="item.id" :label="item.name"
+                :value="item.id"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="房间名称">
@@ -821,13 +825,18 @@ export default {
 </script>
 
 <style scoped>
+.roomContainerBorder {
+  border: 2px solid rgb(160, 160, 160);
+  margin: 10px;
+}
+
 .router-view {
   padding-bottom: 0px !important;
 }
 
 .wrap {
   /* height: 100vh; */
-  width: 105%;
+  /* width: 105%; ？？ */
   position: relative;
 }
 

vue.config.js

@@ -37,8 +37,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: "http://192.168.10.137:8080/",
-        // 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`, //晓晋本地地址
         // target: `http://192.168.15.152:8081`, //鲍德本地地址
         // target: `http://127.0.0.1:8080`, //本地地址
         changeOrigin: true,