| xqd
@@ -94,8 +94,10 @@ class InnerDeviceController extends BaseController
|
|
|
list($model, $model_name, $pre_uri) = array($this->model, $this->model_name, $this->pre_uri);
|
|
|
$options = $this->device_name->getNameSpecOptions();
|
|
|
$status_options = Option::get('inner_devices', 'status');
|
|
|
- $project_work_point_options = (new Project())->getTwoLevelOptions();
|
|
|
- return view($this->view_path . 'create', compact('model', 'model_name','pre_uri', 'options', 'status_options', 'project_work_point_options'));
|
|
|
+// $project_work_point_options = (new Project())->getTwoLevelOptions();
|
|
|
+ $project_options = Project::getNotOneProjectOptions();
|
|
|
+
|
|
|
+ return view($this->view_path . 'create', compact('model', 'model_name','pre_uri', 'options', 'status_options', 'project_options'));
|
|
|
}
|
|
|
|
|
|
public function transObject($items)
|
| xqd
@@ -129,9 +131,10 @@ class InnerDeviceController extends BaseController
|
|
|
if(empty($request->input('id')) || empty($item = $this->model->find($request->input('id')))) return back()->withErrors(['sg_error_info' => '找不到要编辑的数据']);
|
|
|
$options = $this->device_name->getNameSpecOptions();
|
|
|
$status_options = Option::get('inner_devices', 'status');
|
|
|
- $project_work_point_options = (new Project())->getTwoLevelOptions();
|
|
|
+// $project_work_point_options = (new Project())->getTwoLevelOptions();
|
|
|
+ $project_options = Project::getNotOneProjectOptions();
|
|
|
list($model, $model_name, $pre_uri) = array($this->model, $this->model_name, $this->pre_uri);
|
|
|
- return view($this->view_path . 'edit', compact('model', 'model_name', 'pre_uri', 'item', 'options', 'status_options', 'project_work_point_options'));
|
|
|
+ return view($this->view_path . 'edit', compact('model', 'model_name', 'pre_uri', 'item', 'options', 'status_options', 'project_options'));
|
|
|
}
|
|
|
|
|
|
public function update(Request $request)
|