From 25ce610f6ecca7325e7a743dc032c4a76559c63d Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 02 Jul 2021 09:10:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/pyhmap
---
widgets/modelDiagram/Widget.html | 78 +++++++++++++++++++++++++++++++-------
1 files changed, 63 insertions(+), 15 deletions(-)
diff --git a/widgets/modelDiagram/Widget.html b/widgets/modelDiagram/Widget.html
index 1afd03c..07c1c6a 100644
--- a/widgets/modelDiagram/Widget.html
+++ b/widgets/modelDiagram/Widget.html
@@ -1,5 +1,5 @@
-<div>
- <!-- <div id="modelDiagramToolbar" class="param-container tool-bar">
+<div title="先点击单次添加 否则找不到实体">
+ <!-- <div id="modelDiagramToolbar" class="param-container tool-bar">
<div style="width:215px;">
<select id="modelDiagramSelOpt" class="selectpicker show-tick form-control">
<option selected value = "1">实体方式加载</option>
@@ -7,8 +7,8 @@
</select>
</div>
</div> -->
- <!-- <div id="cesiumContainer" class="fullSize"></div> -->
- <!-- <div id="loadingOverlay"><h1>Loading...</h1></div>
+ <!-- <div id="cesiumContainer" class="fullSize"></div> -->
+ <!-- <div id="loadingOverlay"><h1>Loading...</h1></div>
<div id="toolbarcesium">//工具栏
<table>
<tbody>
@@ -43,16 +43,64 @@
</tbody>
</table>
</div> -->
- <div class="modelDiagramMain">
- <input type="number" class="closemodoinput" id="modelDiagramjdu" value="116" placeholder="经度">
- <input type="number" class="closemodoinput" id="modelDiagramwdu" value="29" placeholder="纬度">
- <input type="number" class="closemodoinput" id="modelDiagramgdu" value="1000" placeholder="高度">
- <div class="seemodo">跟踪</div>
- <div class="closemodo">添加/删除</div>
- <div class="beginPlay">自动行走</div>
- <div class="stopPlay">stop</div>
+ <div style="position: relative;left:-400px;background-color: aliceblue;display:none">
+ c<input type="nubmer" id="c">
+ w <input type="nubmer" id="w">
+ g<input type="nubmer" id="g">
+ </div>
+ <div id="modelDiagramCHONGFU" title="建议先点击单次添加">
+ 输入重复多少：
+ <div>
+ <span>宽个数：</span> <input type="number" id="modelDiagramW" value="3" placeholder="经度">
</div>
- <i class="layui-icon closesmodelDiagram">
- ဆ
- </i>
+ <div>
+ <span>宽间距：</span> <input type="number" id="modelDiagramJW" value="1000" placeholder="经度">
+ </div>
+ <div>
+ <span>长个数：</span> <input type="number" id="modelDiagramH" value="3" placeholder="经度">
+ </div>
+ <div>
+ <span>长间距：</span> <input type="number" id="modelDiagramJH" value="1000" placeholder="经度">
+ </div>
+ <div style="position: relative;top:10px;">
+ <button type="button" id="modelDYes" class="layui-btn layui-btn-normal" layui-btn-xs
+ style="border-radius: 5px;height:30px;line-height: 30px;">确定</button>
+ <button type="button" id="modelDNo" class="layui-btn layui-btn-danger" layui-btn-xs
+ style="border-radius: 5px;height:30px;line-height: 30px;">取消</button>
+ </div>
+ </div>
+ <div class="modelDiagramMain">
+ <button class="layui-btn layui-btn-primary models">
+ 人偶
+ <i class="layui-icon layui-icon-down layui-font-12"></i>
+ </button>
+ <div class="inp">
+ <div>
+ <span>经度：</span> <input type="number" class="closemodoinput" id="modelDiagramjdu" value="116.00001"
+ placeholder="经度">
+ </div>
+ <div>
+ <span>纬度：</span> <input type="number" class="closemodoinput" id="modelDiagramwdu" value="28.973468"
+ placeholder="经度">
+ </div>
+ <div>
+ <span>高度：</span> <input type="number" class="closemodoinput" id="modelDiagramgdu" value="1000" placeholder="经度">
+ </div>
+ <div title="倍数小了就找不到了">
+ <span>倍数：</span> <input type="number" class="closemodoinput" id="modelDiagrambeishu" value="1000"
+ placeholder="经度">
+ </div>
+ </div>
+ <div class="seemodo">跟踪</div>
+ <div class="closemodo">添加/删除</div>
+ <div class="beginPlay">自动行走</div>
+ <div class="but">
+ <div class="once buts">单次添加</div>
+ <div class="always buts" title="右键有惊喜">重复添加</div>
+ <div class="stopPlay buts">全部删除</div>
+ </div>
+ </div>
+ <i class="layui-icon closesmodelDiagram">
+ ဆ
+ </i>
</div>
\ No newline at end of file
--
Gitblit v1.9.3