diff --git a/back/application/api/controller/Contract.php b/back/application/api/controller/Contract.php index 6b90f30..49d591c 100644 --- a/back/application/api/controller/Contract.php +++ b/back/application/api/controller/Contract.php @@ -291,7 +291,12 @@ class Contract extends Common $update['contract_name'] = $param['contract_name']; $update['contract_category'] = $param['contract_category']; $update['contract_number'] = $param['contract_number']; - $update['contract_des'] = $param['contract_des']; + + // Check if contract_des exists before using it + if (isset($param['contract_des'])) { + $update['contract_des'] = $param['contract_des']; + } + if($param['contract_url'] != '') { $update['contract_url'] = $param['contract_url']; diff --git a/back/application/database.php b/back/application/database.php index 8163f85..10ea0ca 100644 --- a/back/application/database.php +++ b/back/application/database.php @@ -13,15 +13,15 @@ return [ // 数据库类型 'type' => 'mysql', // 服务器地址 - 'hostname' => '192.168.81.251', + 'hostname' => '127.0.0.1', // 数据库名 'database' => 'oms', // 用户名 'username' => 'root', // 密码 - 'password' => 'P@ssw0rd.', + 'password' => '12356', // 端口 - 'hostport' => '', + 'hostport' => '3306', // 连接dsn 'dsn' => '', // 数据库连接参数 diff --git a/front/config/dev.env.js b/front/config/dev.env.js index ec8b85c..57b2ddf 100644 --- a/front/config/dev.env.js +++ b/front/config/dev.env.js @@ -1,7 +1,9 @@ module.exports = { NODE_ENV: '"development"', ENV_CONFIG: '"dev"', - BASE_WMS_API: '"http://127.0.0.1:8011/api"', - BASE_WMS_FILE: '"http://127.0.0.1:8011/"' + // BASE_WMS_API: '"http://127.0.0.1:8011/api"', + // BASE_WMS_FILE: '"http://127.0.0.1:8011/"' + BASE_WMS_API: '"http://47.111.78.178:8011/api"', + BASE_WMS_FILE: '"http://47.111.78.178:8011/"' // 47.101.147.253 } diff --git a/front/config/prod.env.js b/front/config/prod.env.js index 7fd7bf4..9e60f51 100644 --- a/front/config/prod.env.js +++ b/front/config/prod.env.js @@ -1,8 +1,10 @@ module.exports = { NODE_ENV: '"production"', ENV_CONFIG: '"prod"', - BASE_WMS_API: '"http://127.0.0.1:8011/api"', - BASE_WMS_FILE: '"http://127.0.0.1:8011/"' + // BASE_WMS_API: '"http://127.0.0.1:8011/api"', + // BASE_WMS_FILE: '"http://127.0.0.1:8011/"' + BASE_WMS_API: '"http://47.111.78.178:8011/api"', + BASE_WMS_FILE: '"http://47.111.78.178:8011/"' ////BASE_AGV_API: '"http://192.168.3.223:55200/v1"', //BASE_WMS_API: '"http://169.254.71.103/api"', //BASE_AGV_API: '"http://127.0.0.1:55200/v1"', diff --git a/front/src/views/contract-mgr/projectcontract.vue b/front/src/views/contract-mgr/projectcontract.vue index ad3c36e..bbd77f3 100644 --- a/front/src/views/contract-mgr/projectcontract.vue +++ b/front/src/views/contract-mgr/projectcontract.vue @@ -1,24 +1,38 @@