|
@@ -519,15 +519,9 @@
|
|
|
<li v-for="item in imgList.video" style="border: 1px solid #ccc;">
|
|
|
<video
|
|
|
style="width:100%;height:100%;"
|
|
|
-<<<<<<< HEAD
|
|
|
:src="'image-service/common/file_get/'+ item.key + '?systemId=dataPlatform'"
|
|
|
controls
|
|
|
:poster="'image-service/common/image_get?systemId=dataPlatform&key='+ delVideo(item.key) +'&width=200'"
|
|
|
-=======
|
|
|
- :src="'/image-service/common/file_get/'+ item.key + '?systemId=dataPlatform'"
|
|
|
- controls
|
|
|
- :poster="'/image-service/common/image_get?systemId=dataPlatform&key='+ delVideo(item.key) +'&width=200'"
|
|
|
->>>>>>> 0b3fe5f67feb014201756c0d8520ffb3557fef6b
|
|
|
></video>
|
|
|
</li>
|
|
|
</ul>
|
|
@@ -575,8 +569,10 @@ 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 Handsontable from "handsontable-pro"
|
|
|
+import 'handsontable-pro/dist/handsontable.full.css'
|
|
|
+import zhCN from 'handsontable-pro/languages/zh-CN';
|
|
|
//接口
|
|
|
import {
|
|
|
getBuildSelect, //根据项目ID获得建筑列表
|