Merge branch 'dev-ent' of http://192.168.3.207:10080/qmx/datatag into dev-ent

src/service/private_rule.go

@@ -26,7 +26,7 @@ type Rule struct {
 	history xweb.Mapper `xweb:"/service/rule/history"` //变更列表
 
 	downloadData     xweb.Mapper `xweb:"/service/cuser/rule/downloadata"`      //下载数据
-	downloadRule     xweb.Mapper `xweb:"/service//cuser/rule/downloadrule"`     //下载标签
+	downloadRule     xweb.Mapper `xweb:"/service/cuser/rule/downloadrule"`     //下载标签
 	demoData         xweb.Mapper `xweb:"/service/rule/preview"`          //预览数据
 	exportEs         xweb.Mapper `xweb:"/service/rule/exportes"`         //导出es
 }

src/web/templates/com/user.html

@@ -144,7 +144,7 @@
         email = $("#email").val();
         s_name = $("#name").val();
         pwd = $("#pwd").val();
-        if (email == "" || name == "" || role == "" || pwd == "") {
+        if (email == "" || s_name == "" || role == "" || pwd == "") {
             alert("表单填写不完整！")
             return false;
         }

src/web/templates/private/cuser_rule_list.html

@@ -127,7 +127,7 @@
                     var s = [val, row.s_dataid];
                       tmp = '<div>' +
                           '<a class="btn btn-sm btn-primary" href="/service/cuser/rule/downloadrule?id='+val+'">导出标签</a>&nbsp;&nbsp;'+
-                          '<a class="btn btn-sm btn-info" href="/service/rule/cuser/downloadata?s_dataid='+val+'">导出数据</a>&nbsp;&nbsp;'+
+                          '<a class="btn btn-sm btn-info" href="/service/cuser/rule/downloadata?s_dataid='+val+'">导出数据</a>&nbsp;&nbsp;'+
                           '<a class="btn btn-sm btn-warning" onclick="archive(\'' + val + '\')">存档</a>&nbsp;&nbsp;'+
                           '</div>';
                       return tmp