dever 4 lat temu
rodzic
commit
58a90dbbe6
7 zmienionych plików z 14 dodań i 13 usunięć
  1. 4 4
      database/col.php
  2. 2 2
      database/data.php
  3. 4 4
      database/project.php
  4. 1 0
      index.php
  5. 1 1
      lib/Api.php
  6. 1 1
      lib/Cron.php
  7. 1 1
      lib/Parse.php

+ 4 - 4
database/col.php

@@ -17,7 +17,7 @@ return array
 	'order' => 6,
 	'desc' => '字段唯一标识符:如果用逗号隔开,则前面的是dever公共函数,如maketime.date,则会调用Dever::maketime()来处理date的数据
 	<br />
-	<a href="'.Dever::url('spider/lib/api.test?id=' . Dever::input('search_option_project_id', -1)).'" target="_blank">点此进行测试</a>:请按住ctrl打开新页面并查看源代码',
+	<a href="'.Dever::url('spider/lib/api.test?id=' . Dever::input('search_option_pid', -1)).'" target="_blank">点此进行测试</a>:请按住ctrl打开新页面并查看源代码',
 	# 数据结构
 	'struct' => array
 	(
@@ -60,11 +60,11 @@ return array
 			'edit'		=> true,
 		),
 
-		'project_id'		=> array
+		'pid'		=> array
 		(
 			'type' 		=> 'int-11',
 			'name' 		=> '项目id',
-			'default' 	=> Dever::input('search_option_project_id', -1),
+			'default' 	=> Dever::input('search_option_pid', -1),
 			'desc' 		=> '请选择项目id',
 			'match' 	=> 'is_numeric',
 			'search'	=> 'order',
@@ -140,7 +140,7 @@ return array
 		(
 			'where' => array
 			(
-				'project_id' => 'yes',
+				'pid' => 'yes',
 				'state' => 1,
 			),
 			'type' => 'all',

+ 2 - 2
database/data.php

@@ -31,14 +31,14 @@ return array
 			'order'		=> 'desc',
 		),
 
-		'project_id'		=> array
+		'pid'		=> array
 		(
 			'type' 		=> 'int-11',
 			'name' 		=> '项目',
 			'default' 	=> '1',
 			'desc' 		=> '请选择项目id',
 			'match' 	=> 'is_numeric',
-			'list'		=> '{project_id} > 0 ? Dever::load("spider/project-one#name", {project_id}) : "无"',
+			'list'		=> '{pid} > 0 ? Dever::load("spider/project-one#name", {pid}) : "无"',
 			# 开启显示控制,可以控制下边的表单
 			//'show'		=> 'cate_id',
 		),

+ 4 - 4
database/project.php

@@ -58,7 +58,7 @@ $project = function()
 	return $array;
 };
 
-$id = Dever::input('search_option_project_id', -1);
+$id = Dever::input('search_option_pid', -1);
 
 return array
 (
@@ -275,9 +275,9 @@ return array
 		# 可以删除
 		'list_button' => array
 		(
-			'list_col' => array('字段设置', '"col&search_option_project_id={id}&oper_parent=project"'),
-			'add' => array('新增子项目', '"project&search_option_project_id={id}&oper_parent=project&oper_save_jump=project"'),
-			//'list_data' => array('数据列表', '"data&search_option_project_id={id}&oper_save_jump=project&oper_parent=project"'),
+			'list_col' => array('字段设置', '"col&search_option_pid={id}&oper_parent=project"'),
+			'add' => array('新增子项目', '"project&search_option_pid={id}&oper_parent=project&oper_save_jump=project"'),
+			'list_data' => array('数据列表', '"data&search_option_pid={id}&oper_save_jump=project&oper_parent=project"'),
 			//'delete' => array('采集数据', 'Dever::url("spider/data.daemon?id={id}&")'),
 		),
 		

+ 1 - 0
index.php

@@ -4,4 +4,5 @@ define('DEVER_APP_NAME', 'spider');
 define('DEVER_APP_LANG', '采集工具');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 define('DEVER_MANAGE_ORDER', 10);
+define('DEVER_MANAGE_ICON', 'layui-icon-survey');
 include(DEVER_APP_PATH . '../boot.php');

+ 1 - 1
lib/Api.php

@@ -65,7 +65,7 @@ class Api
 
 	private function col($project)
 	{
-		return Dever::db('spider/col')->getList(['where_project_id' => $project]);
+		return Dever::db('spider/col')->getList(['where_pid' => $project]);
 	}
 
 	private function parse($url, $project, $rule, $col)

+ 1 - 1
lib/Cron.php

@@ -51,7 +51,7 @@ class Cron
 
 	private function col($project)
 	{
-		return Dever::db('spider/col')->getList(['where_project_id' => $project]);
+		return Dever::db('spider/col')->getList(['where_pid' => $project]);
 	}
 
 	private function parse($url, $project, $rule, $col)

+ 1 - 1
lib/Parse.php

@@ -68,7 +68,7 @@ class Parse
 
 	private function update($data, $project)
 	{
-		$param['option_project_id'] = $project;
+		$param['option_pid'] = $project;
 		$param['option_value'] = json_encode($data);
 		$info = Dever::db('spider/data')->one($param);
 		if ($info) {