no message

src/front/remark.go

@@ -526,7 +526,7 @@ func DealData(tmpLen int, publishtime float64, tmp []map[string]interface{}, mor
 // GetNextDataId 获取当前数据下一条的id
 func GetNextDataId(id, coll, tid string) string {
 	nextIdQuery := map[string]interface{}{
-		"i_ckdata": 0,
+		"b_istag": false,
 		"_id": map[string]interface{}{
 			"$gt": mgo.StringTOBsonId(id),
 		},
@@ -534,7 +534,9 @@ func GetNextDataId(id, coll, tid string) string {
 	if tid != "" {
 		nextIdQuery["s_usertaskid"] = tid
 	}
+	qu.Debug(nextIdQuery)
 	one, _ := util.Mgo.Find(coll, nextIdQuery, `{"_id":1}`, `{"_id":1}`, true, 0, 1)
+	qu.Debug((*one)[0])
 	if len(*one) == 1 && len((*one)[0]) > 0 {
 		return mgo.BsonIdToSId((*one)[0]["_id"])
 	} else {

src/web/templates/project/check_data_list.html

@@ -71,7 +71,7 @@
             "lengthChange": false,
             "searching": true,
             "processing": true,
-            "pageLength": 20,
+            // "pageLength": 20,
             "ordering": false,
             "info": true,
             "autoWidth": false,

src/web/templates/project/project_list.html

@@ -231,9 +231,9 @@
 
 <div class="modal fade" id="loadingModal" backdrop="static" keyboard="false">
     <div style="width: 200px;height:100px; z-index: 20000; position: absolute; text-align: center; left: 50%; top: 50%;margin-left:-100px;margin-top:-10px">
-        <div class="progress progress-striped active"
+        <div id="loadText" class="progress progress-striped active"
              style="margin-bottom: 0;height:50px; text-align:center;line-height: 50px;font-size:large;padding-left: 10px">
-            数据加载中,请稍候......　　　　
+            loading......　　　　
         </div>
     </div>
 </div>
@@ -248,7 +248,10 @@
     let existName = false
 
     //展示loading框
-    showLoading = function (){
+    showLoading = function (text){
+        if(text){
+            $("#loadText").html(text)
+        }
         $('#loadingModal').modal({backdrop: 'static', keyboard: false});
     }
     //隐藏掉loading框
@@ -327,10 +330,10 @@
                 }
             ],
             "columnDefs": [{
-                "targets": [2],
+                "targets": [4],
                 "render": function (data, type, full, meta) {
-                    if (data && data.length > 24) {
-                        return "<a title='" + data + "' href='#' style='text-decoration: none;'>" + data.trim().substr(0, 24) + "..." + "</a>";
+                    if (data && data.length > 44) {
+                        return "<a title='" + data + "' href='#' style='text-decoration: none;color: black'>" + data.trim().substr(0, 44) + "..." + "</a>";
                     }else {
                         return data
                     }
@@ -421,7 +424,7 @@
                 return;
             }
             projectmap["s_type"] = stype
-            showLoading()
+            showLoading("正在加载数据，请稍候...")
             $.ajax({
                 url: "/front/project/save",
                 type: 'POST',
@@ -449,7 +452,7 @@
             let file = $('#uploadfile')[0].files[0]
             if (file) {
                 formData.append("xlsx", file)
-                showLoading()
+                showLoading("正在加载数据，请稍候...")
                 $.ajax({
                     url: "/front/project/save",
                     type: 'POST',
@@ -541,7 +544,7 @@
         if (tmp["v_fields"] === undefined || Object.keys(tmp["v_fields"]).length === 0) {
             showTip("请设置标注字段")
         }else {
-            showLoading()
+            showLoading("数据清洗中，请稍候...")
             $.ajax({
                 url: "/front/project/qualityAssessment",
                 type: 'POST',

src/web/templates/project/remark_detail.html

@@ -171,7 +171,8 @@
 
                 <el-radio-group v-model="activeLabel" v-for="(item, index) in otherInfo" size="mini">
                     <el-radio-button class="success" :label="item.id">[[item.subtype]]</el-radio-button>
-                    <el-radio-button class="success" :label="item.id + '-附件'">附件</el-radio-button>
+                    <el-radio-button v-if="item.filetext && item.filetext.length > 10" class="success" :label="item.id + '-附件'">附件</el-radio-button>
+<!--                    <el-radio-button class="success" :label="item.id + '-附件'">附件</el-radio-button>-->
                 </el-radio-group>
 
                 <el-radio-group v-if="moreInfo&&moreInfo.length > 0" size="mini">
@@ -371,7 +372,7 @@
                 </div>
             </div>
             <div class="save-box">
-                                 <button  class="code" @click.stop="showPop = true" style="width:100px">源码</button>&nbsp;&nbsp;
+<!--                 <button  class="code" @click.stop="showPop = true" style="width:100px">源码</button>&nbsp;&nbsp;-->
                 <!--                 <button  class="code" @click.stop="open(1)" style="width:100px">全部验证</button> -->
                 <button class="code" @click.stop="open(2)" style="width:100px">字段验证</button>
                 <!--            <button  class="code" @click.stop="open('', false)" style="width:100px">保存</button>&nbsp;&nbsp;-->

src/web/templates/project/remark_jy_list.html

@@ -85,7 +85,7 @@
             "paging": true,
             "lengthChange": false,
             "processing": true,
-            "pageLength": 20,
+            // "pageLength": 20,
             "searching": false,
             "ordering": false,
             "info": true,

src/web/templates/project/remark_list.html

@@ -56,7 +56,7 @@
             "paging": true,
             "lengthChange": false,
             "processing": true,
-            "pageLength": 20,
+            // "pageLength": 20,
             "searching": true,
             "ordering": false,
             "info": true,

src/web/templates/project/task_list.html

@@ -145,6 +145,16 @@
                     }
                 }
             ],
+            "columnDefs": [{
+                "targets": [3],
+                "render": function (data, type, full, meta) {
+                    if (data && data.length > 34) {
+                        return "<a title='" + data + "' href='#' style='text-decoration: none;color: black'>" + data.trim().substr(0, 34) + "..." + "</a>";
+                    }else {
+                        return data
+                    }
+                }}
+            ],
             "initComplete": function () {
                 $("#dataTable_filter").append($('#status-div'))
                 $("#dataTable_wrapper .col-sm-6").css({width:"100%"});

src/web/templates/user/user_group.html

@@ -55,7 +55,7 @@
 
 
 <div class="modal fade" id="modal-modify-group" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog" style="width: 30%">
+    <div class="modal-dialog" style="width: 40%">
         <div class="modal-content">
             <div class="modal-header">
                 <div class="modal-header">

src/web/templates/user/user_list.html

@@ -59,7 +59,7 @@
 {{include "com/footer.html"}}
 
 <div class="modal fade" id="modal-modify-user" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog" style="width: 30%">
+    <div class="modal-dialog" style="width: 40%">
         <div class="modal-content">
             <div class="modal-header">
                 <div class="modal-header">