Pārlūkot izejas kodu

新增机检功能-基础字段展示优化

mxs 1 gadu atpakaļ
vecāks
revīzija
0add7ad83a

+ 3 - 0
src/web/staticres/js/common.js

@@ -435,6 +435,9 @@ common.spider.setModel=function(name,p){
 			var div=$("<div class='form-group'></div>");
 			var label=$("<label class='col-sm-4 control-label'>"+model[k]+"</label>");
 			var c_div=$("<div class='col-md-7'></div>");
+			if(model[k] == "发布单位" || model[k] == "公告类型"){
+				div = $("<div class='form-group' style='display: none'></div>");
+			}
 			if(model[k]=="省份"){
 				var select=$("<select class='form-control' onchange='getcity($(this).val())'></select>")
 				select.attr("name",k);

+ 1 - 1
src/web/templates/bottom.html

@@ -1,5 +1,5 @@
 <footer class="main-footer">
-    <strong>Power by 企明星</strong>
+    <strong>Power by 剑鱼</strong>
   </footer>
 </div>
 

+ 15 - 14
src/web/templates/spiderbase.html

@@ -9,6 +9,7 @@
 		margin-top: -10px;
 		width: max-content;
 		box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+		z-index: 9999;
 	}
 	.chrome-actions{
 		display: flex;
@@ -148,7 +149,7 @@
 						placeholder="爬虫栏目" value="{{if .T.lua.param_common}}{{index .T.lua.param_common 2}}{{end}}">
 					</div>
 				</div>
-        		<div class="form-group">
+        		<div class="form-group" style="display: none">
 					<label for="isflow" class="col-sm-6 control-label text-right">
 						是否是流程爬虫 
 					</label>
@@ -168,7 +169,7 @@
 						});
 					</script>
 				</div>
-				<div class="form-group">
+				<div class="form-group" style="display: none">
 					<label for="spiderDownDetailPage" class="col-sm-6 control-label text-right">
 						是否下载三级页 
 					</label>
@@ -200,15 +201,15 @@
 					</div>
 				</div>
         		<div class="form-group" id="historymaxpage">
-					<label for="spiderHistoryMaxPage" class="col-sm-5 control-label">
+					<label for="spiderHistoryMaxPage" class="col-sm-4 control-label">
 						&nbsp&nbsp&nbsp历史最大页 
 					</label>
 					<div class="col-sm-4 checkbox-inputs">
-						<input type="text" style="background:red;color:#fff;" class="form-control" id="spiderHistoryMaxPage" name="OtherBase.SpiderHistoryMaxPage"
+						<input type="text" style="background:red;color:#fff;margin-left: 29px;" class="form-control" id="spiderHistoryMaxPage" name="OtherBase.SpiderHistoryMaxPage"
 						value="{{if .T.spiderhistorymaxpage}}{{.T.spiderhistorymaxpage}}{{else}}1{{end}}"
 						/>
 					</div>
-          			<label class="col-sm-1 control-label " style="margin-left: -30px;">
+          			<label class="col-sm-1 control-label ">
 					</label>
 					</div>
@@ -335,7 +336,7 @@
 							</script>
 						</div>
 					</div>
-        <div class="form-group">
+       			 <div class="form-group"  style="display: none">
 					<label for="spider2Collection" class="col-sm-4 control-label ">
 						存入表名
 					</label>
@@ -345,12 +346,12 @@
 						/>
 					</div>
 				</div>
-				<div class="form-group">
+				<div class="form-group" >
 					<label for="spiderPageEncoding" class="col-sm-4 control-label ">
 						页面编码
 					</label>
 					<div class="col-sm-7">
-						<select name="Base.SpiderPageEncoding" id="spiderPageEncoding" class="form-control">
+						<select name="Base.SpiderPageEncoding" disabled id="spiderPageEncoding" class="form-control">
 							<option value="gbk">
 								GBK
 							</option>
@@ -368,7 +369,7 @@
 						</script>
 					</div>
 				</div>
-				<div class="form-group">
+				<div class="form-group"  style="display: none">
 					<label for="spiderName" class="col-sm-4 control-label ">
 						&nbsp&nbsp&nbsp&nbsp&nbsp最后一次下载时间
 					</label>
@@ -385,7 +386,7 @@
 						})
 					</script>
 				</div>
-				<div class="form-group">
+				<div class="form-group"  style="display: none">
 					<label for="spiderStoreMode" class="col-sm-6 control-label ">
 						调用消息总线  
 					</label>
@@ -403,7 +404,7 @@
 				<input type="hidden" class="form-control" name="Base.SpiderStoreToMsgEvent" id="spiderStoreToMsgEvent" placeholder="传送代码" value="4002"  />
 				{{end}}
 				-->
-				<div class="form-group spiderStoreToMsgEvent">
+				<div class="form-group spiderStoreToMsgEvent"  style="display: none">
 					<label for="spiderStoreToMsgEvent" class="col-sm-4 control-label ">
 						传送代码
 					</label>
@@ -460,7 +461,7 @@
 						});
 					</script>
 				</div>
-				<div  class="form-group">
+				<div  class="form-group" style="display: none">
 					<label for="spiderIsMustDownload" class="col-sm-6 control-label text-right">
 						是否强制下载 &nbsp&nbsp&nbsp 
 					</label>
@@ -493,10 +494,10 @@
 			</div>
 			<div class="box-body" id="model-body">
 				<div class="form-group">
-					<label for="model" class="col-sm-4 control-label ">
+					<label for="model" class="col-sm-4 control-label" style="display: none">
 						选择模板
 					</label>
-					<div class="col-md-7">
+					<div class="col-md-7" style="display: none">
 						<select class="form-control" id="model" name="model">
 						</select>
 						<script>

+ 19 - 19
src/web/templates/spideredit.html

@@ -454,10 +454,10 @@
 		{{if eq (session "auth") 1}}
 			if(state=="2" || state=="0"){
 				var reason={{.T.lua.reason}};
-        if(reason!=""&&reason!=null){
-          $("#errortips").text("打回信息:"+reason);
-				  $("#errortips").removeClass("hide");
-        }
+				if(reason!=""&&reason!=null){
+				  $("#errortips").text("打回信息:"+reason);
+						  $("#errortips").removeClass("hide");
+				}
 			}else if(state=="4"){
 				var disablereason="{{.T.lua.disablereason}}";
 				if(disablereason!=""){
@@ -527,13 +527,13 @@
 			})
 		}
 	}
-  function submitrepair(code,info,restate){
-    if(restate==1 && !issave){
+    function submitrepair(code,info,restate){
+      if(restate==1 && !issave){
       alert("请保存爬虫!")
 			return
-    }
-    showConfirm("确定"+info+"?", function() {
-      $.ajax({
+      }
+      showConfirm("确定"+info+"?", function() {
+        $.ajax({
 				url:"/center/errorData/updateRestate",
 				type:"post",
 				data:{"code":code,"restate":restate},
@@ -544,10 +544,10 @@
           //}
 				}
 			})      
-    });
-  }
-  //编辑js
-  function editJs(step) {
+      });
+    }
+    //编辑js
+    function editJs(step) {
 	  if (step == "list"){//list
 		  $("#Step2_js_pre").removeClass("hide")
 		  $("#Step3_js_pre").addClass("hide")
@@ -565,9 +565,9 @@
 	  }
 	  $("#savejs").attr("step",step)
 	  common.spider.editjs(step);
-  }
-  //保存js
-  function saveJs() {
+    }
+    //保存js
+    function saveJs() {
 	  var step = $("#savejs").attr("step");
 	  var jstext = ""
 	  if (step == "list"){
@@ -603,9 +603,9 @@
 			  }, 1000);
 		  }
 	  })
-  }
-  //添加chrome动作
-  function addChromeAction(a,actionType){
+    }
+    //添加chrome动作
+    function addChromeAction(a,actionType){
 	  // return [{name:'切换IP(changeip)',value:'changeip'},{name:'链接地址(navigate)',value:'navigate'},{name:'点击(click)',value:'click'},{name:'元素加载完毕(waitready)',value:'waitready'},{name:'元素可见(waitvisible)',value:'waitvisible'},{name:'等待休息(wait)',value:'wait'},{name:'执行JS(evaluate)',value:'evaluate'},{name:'获取HTML(outerhtml)',value:'outerhtml'},{name:'匹配列表链接(listhref)',value:'listhref'},{name:'获取列表HTML(listhtml)',value:'listhtml'}];
 	  var actionData = [{name:'切换IP(changeip)',value:'changeip'},{name:'链接地址(navigate)',value:'navigate'},{name:'点击(click)',value:'click'},{name:'元素加载完毕(waitready)',value:'waitready'},{name:'等待休息(wait)',value:'wait'},{name:'执行JS(evaluate)',value:'evaluate'},{name:'获取HTML(outerhtml)',value:'outerhtml'}];
 	  var actionMap = baseActionHtmlMap;