|
|
@@ -26,11 +26,7 @@
|
|
|
</h3>
|
|
|
<div class="form-group" style="margin-left: 15px">
|
|
|
<span class="form-inline panel-body">分发总量/数据总量（条）：
|
|
|
-<<<<<<< HEAD
|
|
|
<input type="text" class="form-control" readonly value="{{.T.allGiveDataNum}}/{{.T.allDataNum}}">
|
|
|
-=======
|
|
|
- <input type="text" class="form-control" readonly value="0/0">
|
|
|
->>>>>>> d9e9c3779f98aac0faae325dfdbf3f42c5d679c5
|
|
|
</span>
|
|
|
</div>
|
|
|
<div class="form-group" style="margin-left: 10px">
|
