Commit b2c3847b authored by 周昊's avatar 周昊
Browse files

Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into develop

parents 0b221a89 d6cb64da

package-lock.json

+5 −0
Original line number Original line Diff line number Diff line
@@ -35579,6 +35579,11 @@ 
        "swiper": "^3.4.2"

        "swiper": "^3.4.2"

      }

      }

    },

    },

    "vue-draggable-resizable": {

      "version": "2.3.0",

      "resolved": "https://registry.npmmirror.com/vue-draggable-resizable/-/vue-draggable-resizable-2.3.0.tgz",

      "integrity": "sha512-77CLRj1TPwB30pwsjOf3pkd1UzYanCdKXbqhILJ0Oo5QQl50lvBfyQCXxMFzwWwTc3sbBbQH3FfWSV+BkoSElA=="

    },

    "vue-esign": {

    "vue-esign": {

      "version": "1.0.5",

      "version": "1.0.5",

      "resolved": "https://registry.npm.taobao.org/vue-esign/download/vue-esign-1.0.5.tgz",

      "resolved": "https://registry.npm.taobao.org/vue-esign/download/vue-esign-1.0.5.tgz",

package.json

+1 −0
Original line number Original line Diff line number Diff line
@@ -28,6 +28,7 @@ 
    "vue": "^2.6.10",

    "vue": "^2.6.10",

    "vue-amap": "^0.5.10",

    "vue-amap": "^0.5.10",

    "vue-awesome-mui": "^1.7.3",

    "vue-awesome-mui": "^1.7.3",

    "vue-draggable-resizable": "^2.3.0",

    "vue-esign": "^1.0.5",

    "vue-esign": "^1.0.5",

    "vue-grid-layout": "^2.4.0",

    "vue-grid-layout": "^2.4.0",

    "vue-html5plus": "^1.0.0",

    "vue-html5plus": "^1.0.0",

src/views/drawCanvas/riskView.vue

+38 −35
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ 
    <div class="north">

    <div class="north">

      <img src="../../assets/imgs/north.png" alt="" />

      <img src="../../assets/imgs/north.png" alt="" />

    </div>

    </div>

    <grid-layout

    <!-- <grid-layout

      :layout.sync="layout"

      :layout.sync="layout"

      :col-num="colNum"

      :col-num="colNum"

      :row-height="30"

      :row-height="30"
@@ -19,21 +19,21 @@ 
      :use-css-transforms="true"

      :use-css-transforms="true"

      :prevent-collision="false"

      :prevent-collision="false"

      :preventCollision="true"

      :preventCollision="true"

    >

    > -->

      <grid-item

    <!-- @click.native="changeName(item)" -->

    <!-- :static="item.static" -->

    <vue-draggable-resizable

      v-for="item in layout"

      v-for="item in layout"

        :static="item.static"

      :x="(375 / 12) * item.x"

        :x="item.x"

      :y="item.y * 30"

        :y="item.y"

      :w="(375 / 12) * item.w"

        :w="item.w"

      :h="item.h * 30"

        :h="item.h"

      :i="item.i"

      :i="item.i"

      :key="item.i"

      :key="item.i"

        :isDraggable="item.isDraggable"

      :draggable="item.isDraggable"

        :isResizable="item.isResizable"

      :resizable="item.isResizable"

      @resized="resizedEvent"

      @resized="resizedEvent"

      @moved="movedEvent"

      @moved="movedEvent"

        @click.native="changeName(item)"

      :style="{

      :style="{

        backgroundColor: item.c,

        backgroundColor: item.c,

        border: item.type == 'thorough' ? 'none !important' : '',

        border: item.type == 'thorough' ? 'none !important' : '',
@@ -46,8 +46,8 @@ 
        >x</span

        >x</span

      >

      >

      <!-- <span class="remove" @click="removeItem(item.i)" v-if="item.i && isEdit">x</span> -->

      <!-- <span class="remove" @click="removeItem(item.i)" v-if="item.i && isEdit">x</span> -->

      </grid-item>

    </vue-draggable-resizable>

    </grid-layout>

    <!-- </grid-layout> -->

    <div class="setBtns">

    <div class="setBtns">

      <van-button @click="addItem" type="info" size="mini" v-if="!isViews"

      <van-button @click="addItem" type="info" size="mini" v-if="!isViews"

        >添加房间</van-button

        >添加房间</van-button
@@ -164,17 +164,20 @@ 
</template>

</template>





<script>

<script>

import { GridLayout, GridItem } from "vue-grid-layout";

// import { GridLayout, GridItem } from "vue-grid-layout";

import screenfull from "screenfull";

import screenfull from "screenfull";

import { Toast, Dialog } from "vant";

import { Toast, Dialog } from "vant";

import { debounce } from "@/utils/common.js";

import { debounce } from "@/utils/common.js";

import { getFun, postFun } from "@/service/table.js";

import { getFun, postFun } from "@/service/table.js";

import VueDraggableResizable from "vue-draggable-resizable";

import "vue-draggable-resizable/dist/VueDraggableResizable.css";

// 动态添加/删除

// 动态添加/删除

export default {

export default {

  name: "riskView",

  name: "riskView",

  components: {

  components: {

    GridLayout,

    // GridLayout,

    GridItem,

    // GridItem,

    VueDraggableResizable,

  },

  },

  data() {

  data() {

    return {

    return {
@@ -661,7 +664,7 @@ export default { 
          : "9999",

          : "9999",

      };

      };

      if (this.copyRoom.isCopy) {

      if (this.copyRoom.isCopy) {

        data.id = this.copyRoom.id 

        data.id = this.copyRoom.id;

      }

      }





      this.layoutData.push(data);

      this.layoutData.push(data);