소스 검색

no message

Jianghan 5 년 전
부모
커밋
8b564b4edd
5개의 변경된 파일6개의 추가작업 그리고 12개의 파일을 삭제
  1. 1 1
      src/config.json
  2. 0 6
      src/front/front.go
  3. 1 1
      src/web/res/dist/js/dataTables.chinese.lang
  4. 2 2
      src/web/templates/private/rule_create.html
  5. 2 2
      src/web/templates/private/rule_edit.html

+ 1 - 1
src/config.json

@@ -7,7 +7,7 @@
     "dbnameen": "enterprise",
     "mongoenc": "winner_enterprise",
     "subday": 15,
-    "preview_href": "http://192.168.20.216:5500/data-preview/data-preview.html",
+    "preview_href": "http://192.168.20.128:5500/data-preview.html",
     "elasticsearchxs": "http://172.17.145.170:9800",
     "elasticsearch": "http://127.0.0.1:9800",
     "elasticsearch_index": "bidding_v1",

+ 0 - 6
src/front/front.go

@@ -42,12 +42,6 @@ type Front struct {
 	roleDel        xweb.Mapper `xweb:"/front/role/edit/del"`    //权限编辑删除
 	roleSecondEdit xweb.Mapper `xweb:"/front/role/second/edit"` //二级权限编辑
 
-	logicManager xweb.Mapper `xweb:"/front/logic"`          //逻辑管理
-	logicPre     xweb.Mapper `xweb:"/front/logic/pre"`      //预处理逻辑
-	logicMatch   xweb.Mapper `xweb:"/front/logic/match"`    //匹配逻辑
-	logicClean   xweb.Mapper `xweb:"/front/logic/clean"`    //清洗
-	logicPreSav  xweb.Mapper `xweb:"/front/logic/pre/save"` //预处理逻辑保存
-
 }
 
 func (f *Front) Login() {

+ 1 - 1
src/web/res/dist/js/dataTables.chinese.lang

@@ -2,7 +2,7 @@
 	"processing": "处理中...",
 	"lengthMenu": "显示 _MENU_ 项结果",
 	"zeroRecords": "没有找到相应的结果",
-	"info": "第 _START_ 至 _END_ 行,共 _TOTAL_ 行",
+	"info": "第 _START_ 至 _END_ 条,共 _TOTAL_ 条",
 	"infoEmpty": "第 0 至 0 项结果,共 0 项",
 	"infoFiltered": "(由 _MAX_ 项结果过滤)",
 	"infoPostFix": "",

+ 2 - 2
src/web/templates/private/rule_create.html

@@ -946,8 +946,8 @@
                 "columns": [
                     {"data": null, width: "2%"},
                     {"data": function(row) {
-                            if (row.s_keymatch != undefined) {
-                                return row.s_keymatch
+                            if (row.s_matchkey != undefined) {
+                                return row.s_matchkey
                             }else {
                                 return ""
                             }

+ 2 - 2
src/web/templates/private/rule_edit.html

@@ -981,8 +981,8 @@
             "columns": [
                 {"data": null, width: "2%"},
                 {"data": function(row) {
-                        if (row.s_keymatch != undefined) {
-                            return row.s_keymatch
+                        if (row.s_matchkey != undefined) {
+                            return row.s_matchkey
                         }else {
                             return ""
                         }