diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/EntrustController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/EntrustController.php index 69fb911..2534886 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/EntrustController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/EntrustController.php @@ -131,7 +131,7 @@ public function getMainDetail_duoren() } if(!!$ii){ if(empty($ii->device_id)){ - $msg="检查项目未关联服务组"; + $msg="检查项目未关联排班"; } $qudaos = explode(',', $ii->reservation_method); diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php index 5bd36c2..3e14450 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php @@ -64,7 +64,7 @@ public function getMainDetail() } if(count($ii)>0 ){ if(empty($ii[0]->device_id)){ - $msg="检查项目未关联服务组"; + $msg="检查项目未关联排班"; } $qudaos = explode(',', $ii[0]->reservation_method); diff --git a/YiJi-admin/.env.production b/YiJi-admin/.env.production index 443bab1..cdef114 100644 --- a/YiJi-admin/.env.production +++ b/YiJi-admin/.env.production @@ -5,6 +5,5 @@ VITE_APP_FILE = 'http://192.168.80.76/' VITE_APP_API_66666666 = 'http://192.168.1.42:8844/api/' VITE_APP_FILE_66666666 = 'http://192.168.1.42:8844/' - -VITE_APP_API_aa = 'https://qhdzyyyiji.cjy.net.cn/api/' -VITE_APP_FILE_aa = 'https://qhdzyyyiji.cjy.net.cn/' \ No newline at end of file +VITE_APP_API_aa = 'https://yj.dev.cjy.net.cn/api/' +VITE_APP_FILE_aa = 'https://yj.dev.cjy.net.cn/' \ No newline at end of file diff --git a/YiJi-admin/src/components/Yewu/YuYue202506.vue b/YiJi-admin/src/components/Yewu/YuYue202506.vue index 74f3b19..b417610 100644 --- a/YiJi-admin/src/components/Yewu/YuYue202506.vue +++ b/YiJi-admin/src/components/Yewu/YuYue202506.vue @@ -44,7 +44,7 @@ 否 - + diff --git a/YiJi-admin/src/views/YeWu/MainList.vue b/YiJi-admin/src/views/YeWu/MainList.vue index 54c028c..5f85978 100644 --- a/YiJi-admin/src/views/YeWu/MainList.vue +++ b/YiJi-admin/src/views/YeWu/MainList.vue @@ -41,13 +41,6 @@ :label="item.department_resources_name" :value="item.id" /> - - - - - @@ -118,16 +111,7 @@ v-if="scope.row.period_begin_time && scope.row.period_end_time ">{{scope.row.period_begin_time.substring(0, 5)}}~{{scope.row.period_end_time.substring(0, 5)}} - - - - - - {{ item.device_name+ ' ' }} - - - - + @@ -191,7 +175,7 @@ 可一起预约项目 - 关联的服务组 + 关联的排班