From 1c277f366576dba85432b316117250d2bf1fc35b Mon Sep 17 00:00:00 2001
From: Dai <risin9@foxmail.com>
Date: Thu, 8 Aug 2024 16:35:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0=E6=95=99?=
 =?UTF-8?q?=E5=B8=88=E6=96=B0=E5=A2=9E=E3=80=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/TeacherController.php      | 15 ++++--
 plugin/admin/app/view/teacher/insert.html     | 46 +++++++++++++------
 plugin/admin/app/view/teacher/update.html     | 25 ++++++++--
 3 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/plugin/admin/app/controller/TeacherController.php b/plugin/admin/app/controller/TeacherController.php
index a24105d..0dc87f1 100644
--- a/plugin/admin/app/controller/TeacherController.php
+++ b/plugin/admin/app/controller/TeacherController.php
@@ -62,6 +62,7 @@ class TeacherController extends Crud
             try {
                 $request_data = $request->post();
 
+
                 $salt = random_str(16);
                 if (empty($request_data['password'])) {
                     $password = 'YD' . $request_data['account'] . '123';
@@ -69,13 +70,18 @@ class TeacherController extends Crud
                     $password = $request_data['password'];
                 }
                 $password = md5($password . $salt);
+
+                $timezone = TimeZone::where(['id' => $request_data['time_zone_id']])->findOrEmpty();
+
                 $data = [
                     'account' => $request_data['account'],
                     'password' => $password,
                     'slat' => $salt,
                     'teacher_name' => $request_data['teacher_name'],
-                    'time_zone_name' => $request_data['time_zone_name'],
-                    'time_zone' => $request_data['time_zone'],
+                    'time_zone_id' =>$timezone->id,
+                    'time_zone_name' => $timezone->name,
+                    'time_zone_abbr' => $timezone->abbr,
+                    'time_zone_offset' => $timezone->offset,
                 ];
                 $res = \app\common\model\Teacher::create($data);
                 if (!$res) {
@@ -96,7 +102,10 @@ class TeacherController extends Crud
 
             return parent::insert($data);
         }
-        return view('teacher/insert');
+
+        $timezone = TimeZone::order('id asc')->select()->toArray();
+
+        return view('teacher/insert', ['timezone' => $timezone]);
     }
 
     /**
diff --git a/plugin/admin/app/view/teacher/insert.html b/plugin/admin/app/view/teacher/insert.html
index bc2436e..54d6ecb 100644
--- a/plugin/admin/app/view/teacher/insert.html
+++ b/plugin/admin/app/view/teacher/insert.html
@@ -13,63 +13,68 @@
 
             <div class="mainBox">
                 <div class="main-container mr-5">
-                    
+
                     <div class="layui-form-item">
                         <label class="layui-form-label required">账号</label>
                         <div class="layui-input-block">
                             <input type="text" name="account" value=""  required lay-verify="required" class="layui-input">
                         </div>
                     </div>
-                    
+
                     <div class="layui-form-item">
                         <label class="layui-form-label">密码</label>
                         <div class="layui-input-block">
                             <input type="text" name="password" value="" class="layui-input">
                         </div>
                     </div>
-                    
+
 <!--                    <div class="layui-form-item">-->
 <!--                        <label class="layui-form-label required">密码盐</label>-->
 <!--                        <div class="layui-input-block">-->
 <!--                            <input type="text" name="slat" value="" required lay-verify="required" class="layui-input">-->
 <!--                        </div>-->
 <!--                    </div>-->
-                    
+
                     <div class="layui-form-item">
                         <label class="layui-form-label required">教师姓名</label>
                         <div class="layui-input-block">
                             <input type="text" name="teacher_name" value="" required lay-verify="required" class="layui-input">
                         </div>
                     </div>
-                    
+
 <!--                    <div class="layui-form-item">-->
 <!--                        <label class="layui-form-label">年龄</label>-->
 <!--                        <div class="layui-input-block">-->
 <!--                            <input type="number" name="age" value="0" class="layui-input">-->
 <!--                        </div>-->
 <!--                    </div>-->
-                    
+
 <!--                    <div class="layui-form-item">-->
 <!--                        <label class="layui-form-label">Openid</label>-->
 <!--                        <div class="layui-input-block">-->
 <!--                            <input type="text" name="openid" value="" class="layui-input">-->
 <!--                        </div>-->
 <!--                    </div>-->
-                    
+
                     <div class="layui-form-item">
                         <label class="layui-form-label">时区名称</label>
                         <div class="layui-input-block">
-                            <input type="text" name="time_zone_name" value="" class="layui-input">
+                            <select lay-search="" name="time_zone_id" required lay-verify="required" lay-filter="selectTimezone">
+                                <option value="">请选择或搜索</option>
+                                {foreach $timezone as $item}
+                                <option value="{$item['id']}" timezone-offset="{$item['offset']}">{$item['name']}</option>
+                                {/foreach}
+                            </select>
                         </div>
                     </div>
-                    
+
                     <div class="layui-form-item">
-                        <label class="layui-form-label">时差</label>
+                        <label class="layui-form-label required">时差</label>
                         <div class="layui-input-block">
-                            <input type="text" name="time_zone" value="" class="layui-input">
+                            <input type="text" name="time_zone_offset" id="time_zone_offset"  value="" required lay-verify="required" readonly class="layui-input">
                         </div>
                     </div>
-                    
+
                 </div>
             </div>
 
@@ -84,21 +89,32 @@
                     </button>
                 </div>
             </div>
-            
+
         </form>
 
         <script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
         <script src="/app/admin/component/pear/pear.js"></script>
         <script src="/app/admin/component/jsoneditor/jsoneditor.js"></script>
         <script src="/app/admin/admin/js/permission.js"></script>
-        
+
         <script>
 
             // 相关接口
             const INSERT_API = "/app/admin/teacher/insert";
-            
+
             //提交事件
             layui.use(["form", "popup"], function () {
+
+                layui.form.on('select(selectTimezone)', function(data){
+                    var elem = data.elem; // 获得 select 原始 DOM 对象
+                    var value = data.value; // 获得被选中的值
+                    var othis = data.othis; // 获得 select 元素被替换后的 jQuery 对象
+                    let offset = layui.$(elem).find("option:selected").attr("timezone-offset");
+                    layui.$('#time_zone_offset').val(offset);
+                });
+
+
+
                 // 字段验证允许为空
                 layui.form.verify({
                     phone: [/(^$)|^1\d{10}$/, "请输入正确的手机号"],
diff --git a/plugin/admin/app/view/teacher/update.html b/plugin/admin/app/view/teacher/update.html
index 5d21c81..5c3af3b 100644
--- a/plugin/admin/app/view/teacher/update.html
+++ b/plugin/admin/app/view/teacher/update.html
@@ -59,18 +59,24 @@
 <!--            </div>-->
 
             <div class="layui-form-item">
-                <label class="layui-form-label required">时差</label>
+                <label class="layui-form-label required">时区</label>
                 <div class="layui-input-block">
-<!--                    <input type="text" name="time_zone" value="" required lay-verify="required" class="layui-input">-->
-                    <select lay-search="" name="time_zone_id" required lay-verify="required">
+                    <select lay-search="" name="time_zone_id" required lay-verify="required" lay-filter="selectTimezone">
                         <option value="">请选择或搜索时区</option>
                         {foreach $time_zone as $item}
-                        <option value="{$item['id']}" {if $teacher['time_zone_id'] == $item['id']}selected{/if}>{$item['name']}</option>
+                        <option value="{$item['id']}" timezone-offset="{$item['offset']}" {if $teacher['time_zone_id'] == $item['id']}selected{/if}>{$item['name']}</option>
                         {/foreach}
                     </select>
                 </div>
             </div>
 
+            <div class="layui-form-item">
+                <label class="layui-form-label required">时差</label>
+                <div class="layui-input-block">
+                    <input type="text" name="time_zone_offset" id="time_zone_offset"  value="{$teacher['time_zone_offset']}" required lay-verify="required" readonly class="layui-input">
+                </div>
+            </div>
+
         </div>
     </div>
 
@@ -102,6 +108,17 @@
     // 获取数据库记录
     layui.use(["form", "util", "popup"], function () {
         let $ = layui.$;
+
+        layui.form.on('select(selectTimezone)', function(data){
+            var elem = data.elem; // 获得 select 原始 DOM 对象
+            var value = data.value; // 获得被选中的值
+            var othis = data.othis; // 获得 select 元素被替换后的 jQuery 对象
+            let offset = layui.$(elem).find("option:selected").attr("timezone-offset");
+            layui.$('#time_zone_offset').val(offset);
+        });
+
+
+
         $.ajax({
             url: SELECT_API,
             dataType: "json",