浏览代码

feat:提交代码

jinx 3 年之前
父节点
当前提交
7c50bb17cd

+ 264 - 191
platform-admin/src/main/webapp/WEB-INF/page/shop/sceneAllocation.html

@@ -1,50 +1,53 @@
 <!DOCTYPE html>
 <html>
-
-<head>
+  <head>
     <title>场景分配</title>
     #parse("sys/header.html")
     <style>
-        .ivu-spin-fix {
-            z-index: 99999999;
-        }
-
-        .demo-spin-icon-load {
-            animation: ani-demo-spin 1s linear infinite;
-        }
+      .ivu-spin-fix {
+        z-index: 99999999;
+      }
 
-        @keyframes ani-demo-spin {
-            from {
-                transform: rotate(0deg);
-            }
+      .demo-spin-icon-load {
+        animation: ani-demo-spin 1s linear infinite;
+      }
 
-            50% {
-                transform: rotate(180deg);
-            }
+      @keyframes ani-demo-spin {
+        from {
+          transform: rotate(0deg);
+        }
 
-            to {
-                transform: rotate(360deg);
-            }
+        50% {
+          transform: rotate(180deg);
         }
 
-        .demo-spin-col {
-            height: 100px;
-            position: relative;
-            border: 1px solid #eee;
+        to {
+          transform: rotate(360deg);
         }
+      }
+
+      .demo-spin-col {
+        height: 100px;
+        position: relative;
+        border: 1px solid #eee;
+      }
     </style>
-</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.name" @on-enter="query" placeholder="场景名称" />
-                        </div>
-                        <!-- <div style="display: inline-block;">
+      <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.name"
+                  @on-enter="query"
+                  placeholder="场景名称"
+                />
+              </div>
+              <!-- <div style="display: inline-block;">
                         <i-input v-model="q.brandName" @on-enter="query" placeholder="VR场景名称"/>
                     </div>
                     <div style="display: inline-block;">
@@ -55,177 +58,247 @@
 
                         </i-select>
                     </div> -->
-                        <div style="display: inline-block;">
-                            <i-button @click="query">查询</i-button>
-                        </div>
-
-                        <!-- <div style="display: inline-block;margin-left: 10px;">可新增数量为 {{lessNum}} 个</div> -->
-                    </i-col>
-
-                </div>
-                <div class="buttons-group">
-                    #if($shiro.hasPermission("brand:list"))
-                    <!-- <i-button v-if="localStorage.getItem('userExpTime') > Date.now()" type="info" @click="open">绑定员工</i-button> -->
-                    <i-button
-                        v-if="localStorage.getItem('userExpTime') > Date.now() || localStorage.getItem('userExpTime') == 'null'"
-                        type="info" @click="showYoN">修改</i-button>
-                    #end
-                </div>
-            </Row>
-            <table id="jqGrid"></table>
-            <div id="jqGridPager"></div>
-        </div>
+              <div style="display: inline-block">
+                <i-button @click="query">查询</i-button>
+              </div>
 
-        <Card v-show="showInApp">
-            <p slot="title">{{title}}</p>
-            <i-form :model="appShow" ref="formValidate1" :rules="ruleValidate1" :label-width="120">
-                <div>
-                    <Form-item label="场景名称:" prop="name">
-                        <!-- <div>{{appShow.name}}</div> -->
-                        <div>
-                            {{appShow.name}}
-                        </div>
-                        <!-- <i-input type="text" maxlength="50" v-model="appShow.name" /> -->
-                    </Form-item>
-                    <Form-item label="封面" prop="appListPicUrl">
-                        <div class="demo-upload-list">
-                            <template>
-                                <img v-if="!appShow.appListPicUrl" style="width: 167px;"
-                                    src="../statics/img/pic_bg@2x.png">
-                                <img v-else style="width: 167px;" :src="appShow.appListPicUrl">
-                                <div class="demo-upload-list-cover">
-                                    <i class="ivu-icon ivu-icon-eye" @click="eyeImage(appShow.appListPicUrl)"></i>
-                                    <i class="ivu-icon ivu-icon-trash-a" @click="appShow.appListPicUrl=''"></i>
-                                </div>
-                            </template>
-                        </div>
-                        <div class="c-btn">
-                            <Upload action="../sys/oss/upload" :format="['jpg','jpeg','png','gif']" :max-size="1024*2"
-                                :on-success="handleSuccessListPicUrl" :on-format-error="handleFormatError"
-                                :show-upload-list="false" :on-exceeded-size="handleMaxSize">
-                                <i-button type="warning" icon="ios-cloud-upload-outline">上传图片</i-button>
-                            </Upload>
-                        </div>
-                        <p>1、支持png、jpg和gif图片格式;</p>
-                        <p>2、最大可上传2M的图片。</p>
-                        <p>3、推荐大小:400 * 400 像素</p>
-                        <div>
-                        </div>
-                    </Form-item>
-                    <Form-item label="是否在小程序里显示" prop="isShow">
-                        <Radio-group v-model="appShow.isShow">
-                            <Radio label="0">
-                                <span>否</span>
-                            </Radio>
-                            <Radio label="1">
-                                <span>是</span>
-                            </Radio>
-                        </Radio-group>
-                    </Form-item>
-                    <Form-item>
-                        <i-button type="primary" @click="handleSubmit1('formValidate1')">提交</i-button>
-                        <i-button type="warning" @click="reload" style="margin-left: 8px">返回</i-button>
-                    </Form-item>
-                </div>
-            </i-form>
-        </Card>
-        <div v-show="loading">
-            <Spin fix>
-                <Icon type="load-c" size=30 class="demo-spin-icon-load"></Icon>
-                <div style="font-size: 20px;">Loading</div>
-            </Spin>
-        </div>
+              <!-- <div style="display: inline-block;margin-left: 10px;">可新增数量为 {{lessNum}} 个</div> -->
+            </i-col>
+          </div>
+          <div class="buttons-group">
+            #if($shiro.hasPermission("brand:list"))
+            <!-- <i-button v-if="localStorage.getItem('userExpTime') > Date.now()" type="info" @click="open">绑定员工</i-button> -->
 
+            <i-button type="info" @click="syncScene">同步场景</i-button>
+            <i-button
+              v-if="localStorage.getItem('userExpTime') > Date.now() || localStorage.getItem('userExpTime') == 'null'"
+              type="info"
+              @click="showYoN"
+              >修改</i-button
+            >
+            #end
+          </div>
+        </Row>
+        <table id="jqGrid"></table>
+        <div id="jqGridPager"></div>
+      </div>
 
+      <Card v-show="showInApp">
+        <p slot="title">{{title}}</p>
+        <i-form
+          :model="appShow"
+          ref="formValidate1"
+          :rules="ruleValidate1"
+          :label-width="120"
+        >
+          <div>
+            <Form-item label="场景名称:" prop="name">
+              <!-- <div>{{appShow.name}}</div> -->
+              <div>{{appShow.name}}</div>
+              <!-- <i-input type="text" maxlength="50" v-model="appShow.name" /> -->
+            </Form-item>
+            <Form-item label="封面" prop="appListPicUrl">
+              <div class="demo-upload-list">
+                <template>
+                  <img
+                    v-if="!appShow.appListPicUrl"
+                    style="width: 167px"
+                    src="../statics/img/pic_bg@2x.png"
+                  />
+                  <img
+                    v-else
+                    style="width: 167px"
+                    :src="appShow.appListPicUrl"
+                  />
+                  <div class="demo-upload-list-cover">
+                    <i
+                      class="ivu-icon ivu-icon-eye"
+                      @click="eyeImage(appShow.appListPicUrl)"
+                    ></i>
+                    <i
+                      class="ivu-icon ivu-icon-trash-a"
+                      @click="appShow.appListPicUrl=''"
+                    ></i>
+                  </div>
+                </template>
+              </div>
+              <div class="c-btn">
+                <Upload
+                  action="../sys/oss/upload"
+                  :format="['jpg','jpeg','png','gif']"
+                  :max-size="1024*2"
+                  :on-success="handleSuccessListPicUrl"
+                  :on-format-error="handleFormatError"
+                  :show-upload-list="false"
+                  :on-exceeded-size="handleMaxSize"
+                >
+                  <i-button type="warning" icon="ios-cloud-upload-outline"
+                    >上传图片</i-button
+                  >
+                </Upload>
+              </div>
+              <p>1、支持png、jpg和gif图片格式;</p>
+              <p>2、最大可上传2M的图片。</p>
+              <p>3、推荐大小:400 * 400 像素</p>
+              <div></div>
+            </Form-item>
+            <Form-item label="是否在小程序里显示" prop="isShow">
+              <Radio-group v-model="appShow.isShow">
+                <Radio label="0">
+                  <span>否</span>
+                </Radio>
+                <Radio label="1">
+                  <span>是</span>
+                </Radio>
+              </Radio-group>
+            </Form-item>
+            <Form-item>
+              <i-button type="primary" @click="handleSubmit1('formValidate1')"
+                >提交</i-button
+              >
+              <i-button type="warning" @click="reload" style="margin-left: 8px"
+                >返回</i-button
+              >
+            </Form-item>
+          </div>
+        </i-form>
+      </Card>
+      <div v-show="loading">
+        <Spin fix>
+          <Icon type="load-c" size="30" class="demo-spin-icon-load"></Icon>
+          <div style="font-size: 20px">Loading</div>
+        </Spin>
+      </div>
 
+      <Card v-show="roleBangding">
+        <p slot="title">{{title}}</p>
+        <i-form
+          ref="formValidate"
+          :model="user"
+          :rules="ruleValidate"
+          :label-width="80"
+        >
+          <div style="width: 100%">
+            <Form-item label="用户名" prop="username">
+              <div class="c-winput">
+                <i-input v-model="user.username" placeholder="登录账号" />
+              </div>
+            </Form-item>
+            <Form-item 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>
 
-        <Card v-show="roleBangding">
-            <p slot="title">{{title}}</p>
-            <i-form ref="formValidate" :model="user" :rules="ruleValidate" :label-width="80">
-                <div style="width: 100%;">
-                    <Form-item label="用户名" prop="username">
-                        <div class="c-winput">
-                            <i-input v-model="user.username" placeholder="登录账号" />
-                        </div>
-                    </Form-item>
-                    <Form-item 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>
-                    </Form-item>
-
-                    <Form-item label="VR场景关联">
-                        <i-button @click="getBrandList">添加VR场景</i-button>
-
-                        <div v-if="user.brandList">
-                            <span style="margin-right: 20px;" v-for="(item,i) in user.brandList"
-                                :key="i">{{item.brandName||item.name}}</span>
-                        </div>
-
-                    </Form-item>
-
-                    <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>
-                    </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="mobile">
+              <div class="c-winput">
+                <i-input v-model="user.mobile" placeholder="手机号" />
+              </div>
+            </Form-item>
+
+            <Form-item label="VR场景关联">
+              <i-button @click="getBrandList">添加VR场景</i-button>
+
+              <div v-if="user.brandList">
+                <span
+                  style="margin-right: 20px"
+                  v-for="(item,i) in user.brandList"
+                  :key="i"
+                  >{{item.brandName||item.name}}</span
+                >
+              </div>
+            </Form-item>
+
+            <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>
+            </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"
+      >
+        <!-- 
        <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'>
-                <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.name}}</span>
-            </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"
+        >
+          <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.name}}</span>
+        </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/shop/sceneAllocation.js?_${date.systemTime}"></script>
-</body>
-
-</html>
+  </body>
+</html>

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

@@ -168,7 +168,7 @@
             </Form-item>
             <Form-item>
               <i-button type="primary" @click="handleSubmit('formValidate')"
-                >提交1</i-button
+                >提交</i-button
               >
               <i-button type="warning" @click="reload" style="margin-left: 8px"
                 >返回</i-button

文件差异内容过多而无法显示
+ 11496 - 10991
platform-admin/src/main/webapp/js/shop/brand.js


文件差异内容过多而无法显示
+ 646 - 622
platform-admin/src/main/webapp/js/shop/sceneAllocation.js