新增字段

src/permission.js

@@ -16,7 +16,7 @@ router.beforeEach((to, from, next) => {
     to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
     /* has token*/
     if (to.path === '/login') {
-      next({ path: '/' })
+      next({ path: '/zhgd-ht/' })
       NProgress.done()
     } else if (whiteList.indexOf(to.path) !== -1) {
       next()
@@ -34,7 +34,7 @@ router.beforeEach((to, from, next) => {
         }).catch(err => {
             store.dispatch('LogOut').then(() => {
               Message.error(err)
-              next({ path: '/zhgd-ht' })
+              next({ path: '/zhgd-ht/' })
             })
           })
       } else {

src/utils/request.js

@@ -136,7 +136,7 @@ service.interceptors.response.use(res => {
         MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
           isRelogin.show = false;
           store.dispatch('LogOut').then(() => {
-            location.href = '/zhgd-ht';
+            location.href = '/zhgd-ht/';
           })
       }).catch(() => {
         isRelogin.show = false;

src/views/base/bracelet/index.vue

@@ -161,6 +161,13 @@
                 maxlength="50"
                 />
             </el-form-item>
+            <el-form-item label="手环名称" prop="shName">
+              <el-input
+                v-model="queryshCode.shName"
+                placeholder="请输入手环名称"
+                maxlength="32"
+              />
+            </el-form-item>
           </el-form>
       <el-table v-loading="loadingTwo" :data="shboxList" width="600px" height = "400px" >
         <el-table-column label="手环箱id" align="center" prop="shboxId" v-if="false" />
@@ -250,6 +257,13 @@
                 maxlength="50"
                 />
             </el-form-item>
+            <el-form-item label="手环名称" prop="shName">
+              <el-input
+                v-model="queryshEdit.shName"
+                placeholder="请输入手环名称"
+                maxlength="20"
+              />
+            </el-form-item>
         </el-form>
       <el-table v-loading="loadingFour" :data="shboxList" width="600px" height = "400px" >
         <el-table-column label="手环箱id" align="center" prop="shboxId" v-if="false" />
@@ -873,6 +887,7 @@
           pageNum: 1,
           pageSize: 10,
           shCode: undefined,
+          shName: undefined,
           shboxName: undefined,
           shboxId: undefined,
         },
@@ -906,6 +921,7 @@
           pageSize: 10,
           shId: undefined,
           shCode: undefined,
+          shName:undefined,
           shboxName: undefined,
           shboxId: undefined,
         },
@@ -987,6 +1003,9 @@
           shCode: [
             { required: true, message: "手环编码不能为空", trigger: "blur" }
           ],
+          shName: [
+            { required: true, message: "手环名称不能为空", trigger: "blur" }
+          ],
         },
         rulesbox: {
           shboxName: [