فهرست منبع

feat:更新代码

jinx 3 سال پیش
والد
کامیت
d5c621f237

+ 4 - 1
platform-admin/src/main/webapp/WEB-INF/page/sys/bindAccount.html

@@ -7,7 +7,10 @@
 
   <body>
     <div id="rrapp" v-cloak>
-      <div style="padding: 40px 20px; box-sizing: border-box; width: 600px">
+      <div
+        v-if="loading"
+        style="padding: 40px 20px; box-sizing: border-box; width: 600px"
+      >
         <div v-if="info.fdkkUser" style="position: relative">
           <i-form :model="info" :label-width="80">
             <Form-item label="手机号">

+ 198 - 126
platform-admin/src/main/webapp/WEB-INF/page/sys/user.html

@@ -1,104 +1,153 @@
 <!DOCTYPE html>
 <html>
-
-<head>
+  <head>
     <title>管理员列表</title>
     #parse("sys/header.html")
-</head>
+  </head>
 
-<body>
+  <body>
     <div id="rrapp" v-cloak>
-        <div v-show="showList">
-            <Row :gutter="16">
-                <div class="search-group">
-                    <i-col span="8">
-                        <div style="display: inline-block;">
-                            <i-input v-model="q.username" @on-enter="query" placeholder="用户名" />
-                        </div>
-                        <div style="display: inline-block;">
-                            <i-button @click="query">查询</i-button>
-                        </div>
-                    </i-col>
-                </div>
-                <div class="buttons-group">
-                    #if($shiro.hasPermission("sys:user:save"))
-                    <i-button type="info" @click="add"><i class="fa fa-plus"></i>&nbsp;新增</i-button>
-                    #end #if($shiro.hasPermission("sys:user:update"))
-                    <i-button type="warning" @click="update"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button>
-                    #end #if($shiro.hasPermission("sys:user:delete"))
-                    <!-- <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button> -->
-                    <i-button type="error" @click="checkDel"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button>
-                    #end
-                </div>
-            </Row>
-            <table id="jqGrid"></table>
-            <div id="jqGridPager"></div>
+      <div v-show="showList">
+        <Row :gutter="16">
+          <div class="search-group">
+            <i-col span="8">
+              <div style="display: inline-block">
+                <i-input
+                  v-model="q.username"
+                  @on-enter="query"
+                  placeholder="用户名"
+                />
+              </div>
+              <div style="display: inline-block">
+                <i-button @click="query">查询</i-button>
+              </div>
+            </i-col>
+          </div>
+          <div class="buttons-group">
+            #if($shiro.hasPermission("sys:user:save"))
+            <i-button type="info" @click="add"
+              ><i class="fa fa-plus"></i>&nbsp;新增</i-button
+            >
+            #end #if($shiro.hasPermission("sys:user:update"))
+            <i-button type="warning" @click="update"
+              ><i class="fa fa-pencil-square-o"></i>&nbsp;修改</i-button
+            >
+            #end #if($shiro.hasPermission("sys:user:delete"))
+            <!-- <i-button type="error" @click="del"><i class="fa fa-trash-o"></i>&nbsp;删除</i-button> -->
+            <i-button type="error" @click="checkDel"
+              ><i class="fa fa-trash-o"></i>&nbsp;删除</i-button
+            >
+            #end
+          </div>
+        </Row>
+        <table id="jqGrid"></table>
+        <div id="jqGridPager"></div>
+      </div>
+      <Modal v-model="show_delModal" title="删除员工">
+        <p v-if="delInfo.type==1" style="padding: 10px 0 20px 20px">
+          是否确定删除员工?
+        </p>
+        <p v-if="delInfo.type==2" style="padding: 10px 0 20px 20px">
+          删除失败,公司仅剩一名员工,不可进行删除
+        </p>
+        <p v-if="delInfo.type==3" style="padding: 10px 0 20px 20px">
+          请将当前员工的直播间数据进行迁移后,再删除员工
+        </p>
+
+        <div v-if="delInfo.type==3">
+          <i-form
+            :model="delInfo"
+            :label-width="120"
+            ref="formDelValidate"
+            :rules="delValidate"
+          >
+            <Form-item label="选择迁移的员工" prop="select">
+              <i-select v-model="delInfo.select" placeholder="请选择">
+                <i-option :value="i" v-for="i in delInfo.list">{{i}}</i-option>
+              </i-select>
+            </Form-item>
+          </i-form>
         </div>
-        <Modal v-model="show_delModal" title="删除员工">
-            <p v-if="delInfo.type==1" style="padding:10px 0 20px 20px;">是否确定删除员工?</p>
-            <p v-if="delInfo.type==2" style="padding:10px 0 20px 20px;">删除失败,公司仅剩一名员工,不可进行删除</p>
-            <p v-if="delInfo.type==3" style="padding:10px 0 20px 20px;">请将当前员工的直播间数据进行迁移后,再删除员工</p>
-
-            <div v-if="delInfo.type==3">
-                <i-form :model="delInfo" :label-width="120" ref="formDelValidate" :rules="delValidate">
-                    <Form-item label="选择迁移的员工" prop="select">
-                        <i-select v-model="delInfo.select" placeholder="请选择">
-                            <i-option :value="i" v-for="i in delInfo.list">{{i}}</i-option>
-                        </i-select>
-                    </Form-item>
-                </i-form>
-            </div>
 
-            <div slot="footer">
-                <i-button type="primary" size="large" @click="comfirmDel">确定</i-button>
-                <i-button type="text" size="large" v-if="delInfo.type!=2" @click="cancelDel">取消</i-button>
-
-            </div>
-        </Modal>
-        <Card v-show="!showList">
-            <p slot="title">{{title}}</p>
-            <i-form ref="formValidate" :model="user" :rules="ruleValidate" :label-width="80">
-                <div style="width: 100%;">
-                  <Form-item label="角色" prop="roleIdList">
-                    <!-- <Checkbox-group v-model="user.roleIdList">
+        <div slot="footer">
+          <i-button type="primary" size="large" @click="comfirmDel"
+            >确定</i-button
+          >
+          <i-button
+            type="text"
+            size="large"
+            v-if="delInfo.type!=2"
+            @click="cancelDel"
+            >取消</i-button
+          >
+        </div>
+      </Modal>
+      <Card v-show="!showList">
+        <p slot="title">{{title}}</p>
+        <i-form
+          ref="formValidate"
+          :model="user"
+          :rules="ruleValidate"
+          :label-width="80"
+        >
+          <div style="width: 100%">
+            <Form-item label="角色" prop="roleIdList">
+              <!-- <Checkbox-group v-model="user.roleIdList">
                         <Checkbox :label="role.roleId" v-for="role in roleList">{{role.roleName}}</Checkbox>
                     </Checkbox-group> -->
-                    <Radio-group v-model="user.roleIdList" @on-change="change_role">
-                        <Radio :label="role.roleId" v-for="role in roleList">{{role.roleName}}
-                        </Radio>
-                    </Radio-group>
-                </Form-item>
-                    <Form-item label="用户名" prop="username">
-                        <div class="c-winput">
-                            <i-input v-model="user.username" placeholder="登录账号" />
-                        </div>
-                    </Form-item>
-                    <Form-item v-if="user.roleIdList[0]!=9" label="所属公司" prop="deptName">
-                        <div class="c-winput" @click="deptTree">
-                            <i-input type="text" v-model="user.deptName" icon="eye" readonly="readonly"
-                                readonly="readonly" placeholder="所属公司" />
-                        </div>
-                    </Form-item>
-                    <!-- <Form-item label="邮箱" prop="email">
+              <Radio-group v-model="user.roleIdList" @on-change="change_role">
+                <Radio :label="role.roleId" v-for="role in roleList"
+                  >{{role.roleName}}
+                </Radio>
+              </Radio-group>
+            </Form-item>
+            <Form-item label="用户名" prop="username">
+              <div class="c-winput">
+                <i-input v-model="user.username" placeholder="登录账号" />
+              </div>
+            </Form-item>
+            <Form-item
+              v-if="user.roleIdList[0]!=9"
+              label="所属公司"
+              prop="deptName"
+            >
+              <div class="c-winput" @click="deptTree">
+                <i-input
+                  type="text"
+                  v-model="user.deptName"
+                  icon="eye"
+                  readonly="readonly"
+                  readonly="readonly"
+                  placeholder="所属公司"
+                />
+              </div>
+            </Form-item>
+            <!-- <Form-item label="邮箱" prop="email">
                         <div class="c-winput">
                             <i-input v-model="user.email" placeholder="邮箱" />
                         </div>
                     </Form-item> -->
 
-                    <Form-item label="手机号" prop="mobile">
-                        <div class="c-winput">
-                            <i-input v-model="user.mobile" placeholder="手机号" />
-                        </div>
-                        <div class="ivu-form-item-error-tip" style="display: none;" id="isSign1">手机号未在指房宝APP中进行注册</div>
-                        <Tooltip content="" placement="right">
-                            <i class="ivu-icon ivu-icon-help-circled"></i>
-                            <div slot="content">
-                                <p>手机号需在指房宝APP注册后才可新增</p>
-                            </div>
-                        </Tooltip>
-                    </Form-item>
+            <Form-item label="手机号" prop="mobile">
+              <div class="c-winput">
+                <i-input v-model="user.mobile" placeholder="手机号" />
+              </div>
+              <div
+                class="ivu-form-item-error-tip"
+                style="display: none"
+                id="isSign1"
+              >
+                手机号未在指房宝APP中进行注册
+              </div>
+              <Tooltip content="" placement="right">
+                <i class="ivu-icon ivu-icon-help-circled"></i>
+                <div slot="content">
+                  <p>手机号需在指房宝APP注册后才可新增</p>
+                </div>
+              </Tooltip>
+            </Form-item>
 
-                    <!-- <Form-item label="VR场景关联">
+            <!-- <Form-item label="VR场景关联">
                 <i-button  @click="getBrandList">添加VR场景</i-button>
 
                 <div v-if="user.brandList">
@@ -107,55 +156,78 @@
 
             </Form-item> -->
 
-                   
-
-                    <Form-item label="状态" prop="status">
-                        <Radio-group v-model="user.status">
-                            <Radio label="0">
-                                <span>禁用</span>
-                            </Radio>
-                            <Radio label="1">
-                                <span>正常</span>
-                            </Radio>
-                        </Radio-group>
-                    </Form-item>
-                    <Form-item>
-                        <i-button type="primary" @click="handleSubmit('formValidate')">提交</i-button>
-                        <i-button type="warning" @click="reload" style="margin-left: 8px">返回</i-button>
-                        <i-button type="ghost" @click="handleReset('formValidate')" style="margin-left: 8px">重置
-                        </i-button>
-                    </Form-item>
-                </div>
-            </i-form>
-        </Card>
-
-        <Modal v-model="modal1" title="添加VR场景关联" @on-ok="ok" @on-cancel="cancel">
-            <!-- 
+            <Form-item label="状态" prop="status">
+              <Radio-group v-model="user.status">
+                <Radio label="0">
+                  <span>禁用</span>
+                </Radio>
+                <Radio label="1">
+                  <span>正常</span>
+                </Radio>
+              </Radio-group>
+            </Form-item>
+            <Form-item>
+              <i-button type="primary" @click="handleSubmit('formValidate')"
+                >提交1</i-button
+              >
+              <i-button type="warning" @click="reload" style="margin-left: 8px"
+                >返回</i-button
+              >
+              <i-button
+                type="ghost"
+                @click="handleReset('formValidate')"
+                style="margin-left: 8px"
+                >重置
+              </i-button>
+            </Form-item>
+          </div>
+        </i-form>
+      </Card>
+
+      <Modal
+        v-model="modal1"
+        title="添加VR场景关联"
+        @on-ok="ok"
+        @on-cancel="cancel"
+      >
+        <!-- 
        <CheckboxGroup v-model="social" @on-change="checkAllGroupChange">
         <Checkbox  :label="brand.name" v-for="(brand,idx) in brandsList" :key='idx'>
             <span>{{brand.name}}</span>
         </Checkbox>
     </CheckboxGroup> -->
 
-            <div class="checkbox-item" @click="clickCheck(brand,idx)" v-for="(brand,idx) in brandsList" :key='idx'>
-                <div>
-                    <span class="checkbox-kuang"></span>
-                    <img v-if="brand.checked" src="http://4d-tjw.oss-cn-shenzhen.aliyuncs.com/images/fdsq-click.png"
-                        alt="">
-                    <span>{{brand.sceneName}}</span>
-                </div>
-            </div>
-
-            <Page style="margin-top: 20px;" :total="brandTotal" @on-change="pageChange" :page-size='brandPerPage'
-                :current='brandPage' size="small" />
-        </Modal>
+        <div
+          class="checkbox-item"
+          @click="clickCheck(brand,idx)"
+          v-for="(brand,idx) in brandsList"
+          :key="idx"
+        >
+          <div>
+            <span class="checkbox-kuang"></span>
+            <img
+              v-if="brand.checked"
+              src="http://4d-tjw.oss-cn-shenzhen.aliyuncs.com/images/fdsq-click.png"
+              alt=""
+            />
+            <span>{{brand.sceneName}}</span>
+          </div>
+        </div>
 
+        <Page
+          style="margin-top: 20px"
+          :total="brandTotal"
+          @on-change="pageChange"
+          :page-size="brandPerPage"
+          :current="brandPage"
+          size="small"
+        />
+      </Modal>
     </div>
     <!-- 选择公司 -->
-    <div id="deptLayer" style="display: none;padding:10px;">
-        <ul id="deptTree" class="ztree"></ul>
+    <div id="deptLayer" style="display: none; padding: 10px">
+      <ul id="deptTree" class="ztree"></ul>
     </div>
     <script src="${rc.contextPath}/js/sys/user.js?_${date.systemTime}"></script>
-</body>
-
-</html>
+  </body>
+</html>

+ 18 - 9
platform-admin/src/main/webapp/js/sys/bindAccount.js

@@ -10,6 +10,7 @@ const validatePhoneCheck = async function (rule, value, callback) {
 var vm = new Vue({
   el: '#rrapp',
   data: {
+    loading: false,
     show_fdkkUser: '',
     info: {
       fdkkUser: null,
@@ -48,15 +49,20 @@ var vm = new Vue({
           data: data,
           dataType: 'json',
           success: function (result) {
-            console.log(result)
-            alert('操作成功', function (index) {
-              vm.getBindInfo()
-              vm.form = {
-                password: '',
-                mobild: '',
-              }
-            })
+            if (result.code == 0) {
+              console.log(result)
+              alert('操作成功', function (index) {
+                vm.getBindInfo()
+                vm.form = {
+                  password: '',
+                  mobild: '',
+                }
+              })
+            } else {
+              alert(result.msg)
+            }
           },
+          error: function (err) {},
         })
       })
     },
@@ -94,6 +100,7 @@ var vm = new Vue({
         // data: data,
         // dataType: 'json',
         success: function (res) {
+          vm.loading = true
           console.log(res)
 
           vm.info = res.user
@@ -105,7 +112,9 @@ var vm = new Vue({
               res.user.fdkkUser.substring(8, res.user.fdkkUser.length - 1)
           }
         },
-        error: function (err) {},
+        error: function (err) {
+          vm.loading = true
+        },
       })
     },
   },

+ 4 - 1
platform-admin/src/main/webapp/js/sys/user.js

@@ -437,7 +437,10 @@ var vm = new Vue({
       }
       var url =
         vm.user.userId == null ? '../sys/user/save' : '../sys/user/update'
-
+      console.log(vm.user)
+      if (vm.user.roleIdList[0] == 9) {
+        vm.user.deptId = ''
+      }
       Ajax.request({
         url: url,
         params: JSON.stringify(vm.user),