chuwu před 6 roky
rodič
revize
1e5940b468

+ 1 - 1
src/components/data_admin/buildData/style.less

@@ -73,7 +73,7 @@
       width: 100%;
       overflow: hidden;
       top: 3.1rem;
-      z-index: 2000;
+      z-index: 500;
       background-color: #fff;
     }
     .build_label {

+ 1 - 0
src/main.js

@@ -11,6 +11,7 @@ import './framework/style/awesome.less'
 Vue.use(ElementUI, { size: "mini", zIndex: 1000 })
 
 import './framework/style/layout.scss'
+import './utils/scan/directive' //自定义指令
 
 import componentsPlugin from '@/plugins/components'
 Vue.use(componentsPlugin)

+ 65 - 0
src/utils/scan/directive.js

@@ -0,0 +1,65 @@
+import Vue from 'vue'
+//图片裁剪vue指令
+Vue.directive('load', function(el, binding) {
+    let imgDom = document.createElement('img')
+    imgDom.style.position = 'absolute'
+    imgDom.style.top = '-999px'
+    imgDom.style.opacity = 0
+    imgDom.src = el.src
+    el.src = ''
+    imgDom.onload = () => {
+        let width = imgDom.width
+        let height = imgDom.height
+        if (width > height) {
+            el.style.height = '100%'
+            el.style.width = 'auto'
+            el.style.position = 'absolute'
+            el.style.left = '50%'
+            el.style.top = '0'
+            el.style.transform = 'translateX(-50%)'
+            el.style.webkitTransform = "translateX(-50%) translateY(0)";
+            el.style.MozTransform = "translateX(-50%) translateY(0)";
+            el.style.msTransform = "translateX(-50%) translateY(0)";
+            el.style.OTransform = "translateX(-50%) translateY(0)";
+        } else if (width < height) {
+            el.src = imgDom.src
+            el.style.width = '100%'
+            el.style.height = 'auto'
+            el.style.position = 'absolute'
+            el.style.top = '50%'
+            el.style.left = '0'
+            el.style.transform = 'translateY(-50%) translateX(0)'
+            el.style.webkitTransform = "translateY(-50%) translateX(0)";
+            el.style.MozTransform = "translateY(-50%) translateX(0)";
+            el.style.msTransform = "translateY(-50%) translateX(0)";
+            el.style.OTransform = "translateY(-50%) translateX(0)";
+        } else {
+            el.style.width = '100%'
+            el.style.height = '100%'
+            el.style.position = 'absolute'
+            el.style.top = '0'
+            el.style.left = '0'
+            el.style.transform = 'translateY(0) translateX(0)'
+            el.style.webkitTransform = "translateY(0) translateX(0)";
+            el.style.MozTransform = "translateY(0) translateX(0)";
+            el.style.msTransform = "translateY(0) translateX(0)";
+            el.style.OTransform = "translateY(0) translateX(0)";
+        }
+        // if (el.alt == '视频资料' || el.alt == '视频') {
+        //     el.style.width = '52px'
+        //     el.style.height = '42px'
+        //     el.style.display = 'block'
+        //     el.style.margin = 'auto'
+        //     el.style.marginTop = '60px'
+        //     el.style.position = 'initial'
+        //     el.style.top = '0'
+        //     el.style.left = '0'
+        //     el.style.transform = 'translateY(0) translateX(0)'
+        //     el.style.webkitTransform = "translateY(0) translateX(0)";
+        //     el.style.MozTransform = "translateY(0) translateX(0)";
+        //     el.style.msTransform = "translateY(0) translateX(0)";
+        //     el.style.OTransform = "translateY(0) translateX(0)";
+        // }
+        el.src = imgDom.src
+    }
+})

+ 34 - 30
src/views/data_admin/buildData/index.vue

@@ -73,7 +73,7 @@
                         v-if="index != 0"
                         v-load
                         @error="setErrorImg"
-                        :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.Image +'&width=200'"
+                        :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.Image +'&width=200'"
                         :alt="item.Name"
                       >
                       <p v-if="index != 0" class="btn" @click.stop="getTable(item.Id,index)">查看详情</p>
@@ -172,7 +172,7 @@
                       v-load
                       @error="setErrorImg"
                       @click="seeBig(item.key,item.name,item.type)"
-                      :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
+                      :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
                       :title="item.name"
                       :alt="item.name"
                     >
@@ -193,7 +193,7 @@
                       @error="setErrorImg"
                       @click="seeBig(item.key,item.name,item.type)"
                       v-if="item.name == '铭牌照片'"
-                      :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
+                      :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
                       :title="item.name"
                       :alt="item.name"
                     >
@@ -202,7 +202,7 @@
                       @error="setErrorImg"
                       @click="seeBig(item.key,item.name,item.type)"
                       v-if="item.name == '设备正面照片'"
-                      :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
+                      :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
                       :title="item.name"
                       :alt="item.name"
                     >
@@ -211,7 +211,7 @@
                       @error="setErrorImg"
                       @click="seeBig(item.key,item.name,item.type)"
                       v-if="item.name == '带二维码的设备远景照片'"
-                      :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
+                      :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
                       :title="item.name"
                       :alt="item.name"
                     >
@@ -220,7 +220,7 @@
                       @error="setErrorImg"
                       @click="seeBig(item.key,item.name,item.type)"
                       v-if="item.name == '设备左侧照片'"
-                      :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
+                      :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
                       :title="item.name"
                       :alt="item.name"
                     >
@@ -229,7 +229,7 @@
                       @error="setErrorImg"
                       @click="seeBig(item.key,item.name,item.type)"
                       v-if="item.name == '设备右侧照片'"
-                      :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
+                      :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
                       :title="item.name"
                       :alt="item.name"
                     >
@@ -238,7 +238,7 @@
                       @error="setErrorImg"
                       @click="seeBig(item.key,item.name,item.type)"
                       v-if="item.name == '设备背面照片'"
-                      :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
+                      :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
                       :title="item.name"
                       :alt="item.name"
                     >
@@ -247,7 +247,7 @@
                       @error="setErrorImg"
                       @click="seeBig(item.key,item.name,item.type)"
                       v-if="item.name == '带二维码的设备近景照片'"
-                      :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
+                      :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
                       :title="item.name"
                       :alt="item.name"
                     >
@@ -256,16 +256,16 @@
                       @error="setErrorImg"
                       @click="seeBig(item.key,item.name,item.type)"
                       v-if="item.name == '视频资料' && item.type == 'image'"
-                      :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
+                      :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
                       :title="item.name"
                       :alt="item.name"
                     >
                     <div v-if="item.type == 'video'" style="width:100%;height:100%;">
                       <video
                         style="width:100%;height:100%;"
-                        :src="'img/image-service/common/file_get/'+ item.key + '?systemId=dataPlatform'"
+                        :src="'image-service/common/file_get/'+ item.key + '?systemId=dataPlatform'"
                         controls
-                        :poster="'img/image-service/common/image_get?systemId=dataPlatform&key='+ delVideo(item.key) +'&width=200'"
+                        :poster="'image-service/common/image_get?systemId=dataPlatform&key='+ delVideo(item.key) +'&width=200'"
                       ></video>
                     </div>
                     <img
@@ -273,7 +273,7 @@
                       @error="setErrorImg"
                       @click="seeBig(item.key,item.name,item.type)"
                       v-if="item.name == '其他照片'"
-                      :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
+                      :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
                       :title="item.name"
                       :alt="item.name"
                     >
@@ -282,7 +282,7 @@
                       @error="setErrorImg"
                       @click="seeBig(item.key,item.name,item.type)"
                       v-if="item.name == '全景照片'"
-                      :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
+                      :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key"
                       :title="item.name"
                       :alt="item.name"
                     >
@@ -397,7 +397,7 @@
                     >
                       <img
                         @click="seeBig(item.key,item.name,item.type)"
-                        :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
+                        :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
                         alt
                       >
                       <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
@@ -409,7 +409,7 @@
                     >
                       <img
                         @click="seeBig(item.key,item.name,item.type)"
-                        :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
+                        :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
                         alt
                       >
                       <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
@@ -421,7 +421,7 @@
                     >
                       <img
                         @click="seeBig(item.key,item.name,item.type)"
-                        :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
+                        :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
                         alt
                       >
                       <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
@@ -433,7 +433,7 @@
                     >
                       <img
                         @click="seeBig(item.key,item.name,item.type)"
-                        :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
+                        :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
                         alt
                       >
                       <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
@@ -445,7 +445,7 @@
                     >
                       <img
                         @click="seeBig(item.key,item.name,item.type)"
-                        :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
+                        :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
                         alt
                       >
                       <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
@@ -457,7 +457,7 @@
                     >
                       <img
                         @click="seeBig(item.key,item.name,item.type)"
-                        :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
+                        :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
                         alt
                       >
                       <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
@@ -469,7 +469,7 @@
                     >
                       <img
                         @click="seeBig(item.key,item.name,item.type)"
-                        :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
+                        :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
                         alt
                       >
                       <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
@@ -481,7 +481,7 @@
                     >
                       <img
                         @click="seeBig(item.key,item.name,item.type)"
-                        :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
+                        :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
                         alt
                       >
                       <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
@@ -493,7 +493,7 @@
                     >
                       <img
                         @click="seeBig(item.key,item.name,item.type)"
-                        :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
+                        :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
                         alt
                       >
                       <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
@@ -505,7 +505,7 @@
                      >
                       <img
                         @click="seeBig(item.key,item.name,item.type)"
-                        :src="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
+                        :src="'image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
                         alt
                       >
                       <i class="iconfont icon-shuaxin icon" @click.stop="changeImage(index)"></i>
@@ -513,9 +513,9 @@
                     <li v-for="item in imgList.video" style="border: 1px solid #ccc;">
                       <video
                         style="width:100%;height:100%;"
-                        :src="'img/image-service/common/file_get/'+ item.key + '?systemId=dataPlatform'"
+                        :src="'image-service/common/file_get/'+ item.key + '?systemId=dataPlatform'"
                         controls
-                        :poster="'img/image-service/common/image_get?systemId=dataPlatform&key='+ delVideo(item.key) +'&width=200'"
+                        :poster="'image-service/common/image_get?systemId=dataPlatform&key='+ delVideo(item.key) +'&width=200'"
                       ></video>
                     </li>
                   </ul>
@@ -563,7 +563,8 @@ import text from "@/utils/handsontable/mainText"
 import "@/assets/js/chosen.jquery.min";
 import "@/assets/js/handsontable-chosen-editor";
 import handsonUtils from "@/utils/scan/hasontableUtils"
-
+console.log(Swiper)
+import 'swiper/dist/css/swiper.min.css'
 //接口
 import {
   getBuildSelect, //根据项目ID获得建筑列表
@@ -720,6 +721,9 @@ export default {
             this.myHotArr[this.tabChecked].loadData(data)
             this.myHotMainArr[this.tabChecked] = data
           } else {
+              console.log("创建实例",this.tabChecked,
+              data,
+              this.myHotHeaderArr[this.tabChecked])
             this.createHot(
               this.tabChecked,
               data,
@@ -738,7 +742,7 @@ export default {
     delPic(index) {
       let param = {}
       if (!!this.tablePicArr && this.tablePicArr.Pic.length) {
-        this.$confirm("<p>你确定删除此照片吗?</p><div style='height:200px;'><img style='display: block;margin: auto;' src='img/image-service/common/image_get?systemId=dataPlatform&width=200&height=200&key=" + this.tablePicArr.Pic[index].key + "' /></div>",
+        this.$confirm("<p>你确定删除此照片吗?</p><div style='height:200px;'><img style='display: block;margin: auto;' src='image-service/common/image_get?systemId=dataPlatform&width=200&height=200&key=" + this.tablePicArr.Pic[index].key + "' /></div>",
           "删除图片", {
             dangerouslyUseHTMLString: true
           }).then(() => {
@@ -1855,7 +1859,7 @@ export default {
             }
           }
         },
-        customBorders: customBorders,
+        // customBorders: customBorders,
         columns: this.getType(headerArr),
         afterOnCellMouseDown: this.tableDown, //鼠标单击
         afterChange: this.tdChange, //修改后
@@ -1869,7 +1873,7 @@ export default {
         afterFilter: this.trimmedRows,
         afterDocumentKeyDown: this.afterDocumentKeyDown
       };
-      console.log(options)
+      console.log(options,variableNum)
       this.myHotArr[variableNum] = new Handsontable(containter, options);
       //存在点击tab后分页不正确的问题,使用0转换
       this.tabChecked = 0;

+ 18 - 0
src/views/rent/rentlist/index.vue

@@ -0,0 +1,18 @@
+<template>
+    <div>
+        租户清单
+    </div>
+</template>
+<script>
+    export default {
+        data() {
+            return {}
+        },
+        created() {},
+        mounted() {},
+        methods: {}
+    }
+</script>
+<style>
+
+</style>