diff --git a/package.json b/package.json
index f4f6111..49a6cbf 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
     "nprogress": "0.2.0",
+    "qrcode": "^1.5.3",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
diff --git a/src/api/base/bracelet.js b/src/api/base/bracelet.js
new file mode 100644
index 0000000..7ad5917
--- /dev/null
+++ b/src/api/base/bracelet.js
@@ -0,0 +1,149 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function listBracelet(query) {
+    return request({
+        url: '/bracelet/bracelet/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询手环箱列表
+export function listShbox(query) {
+    return request({
+        url: '/bracelet/bracelet/listShbox',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询手环箱管理页面手环箱列表
+export function listShboxall(query) {
+    return request({
+        url: '/bracelet/bracelet/listShboxall',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询手环绑定选择列表
+export function listShboxBind(query) {
+    return request({
+        url: '/bracelet/bracelet/listShboxBind',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询手环箱管理页面手环列表
+export function listShBind(query) {
+    return request({
+        url: '/bracelet/bracelet/listShBind',
+        method: 'get',
+        params: query
+    })
+}
+
+// 添加手环
+export function addSh(data) {
+    return request({
+        url: '/bracelet/bracelet/addSh',
+        method: 'post',
+        data: data
+    })
+}
+
+// 手环箱管理页面添加手环箱
+export function addBox(data) {
+    return request({
+        url: '/bracelet/bracelet/addBox',
+        method: 'post',
+        data: data
+    })
+}
+
+// 手环绑定选择页面绑定手环
+export function addShBind(data) {
+    return request({
+        url: '/bracelet/bracelet/addShBind',
+        method: 'post',
+        data: data
+    })
+}
+
+
+
+// 修改
+export function editSh(data) {
+    return request({
+        url: '/bracelet/bracelet/editSh',
+        method: 'post',
+        data: data
+    })
+}
+
+// 手环箱管理页面修改
+export function editBox(data) {
+    return request({
+        url: '/bracelet/bracelet/editBox',
+        method: 'post',
+        data: data
+    })
+}
+
+
+// 解除绑定
+export function delSh(data) {
+    return request({
+        url: '/bracelet/bracelet/delSh',
+       method: 'post',
+       data: data
+    })
+}
+
+
+// 删除
+export function delShById(data) {
+    return request({
+        url: '/bracelet/bracelet/delShById',
+       method: 'post',
+       data: data
+    })
+}
+
+// 删除
+export function delShboxById(data) {
+    return request({
+        url: '/bracelet/bracelet/delShboxById',
+       method: 'post',
+       data: data
+    })
+}
+
+// 详情
+export function getBoxInfo(shboxId) {
+    return request({
+        url: '/bracelet/bracelet/' + shboxId,
+        method: 'get',
+    })
+}
+
+// 导出
+export function exportDevice(query) {
+    return request({
+        url: '/bracelet/export/exportDevice',
+        method: 'get',
+        responseType: 'blob',
+        params: query
+    })
+}
+
+// 查询班组成员列表
+export function getWorkPersonList(query) {
+    return request({
+        url: '/bracelet/team/getWorkPersonList',
+        method: 'get',
+        params: query
+    })
+}
\ No newline at end of file
diff --git a/src/api/base/device.js b/src/api/base/device.js
new file mode 100644
index 0000000..e27f8a6
--- /dev/null
+++ b/src/api/base/device.js
@@ -0,0 +1,75 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function listDevcie(query) {
+    return request({
+        url: '/bracelet/device/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询人员
+export function getPersonList(data) {
+    return request({
+        url: '/bracelet/team/getPersonList',
+        method: 'post',
+        data: data
+    })
+}
+
+// 添加
+export function addDevice(data) {
+    return request({
+        url: '/bracelet/device/addDevice',
+        method: 'post',
+        data: data
+    })
+}
+
+// 详情
+export function getDeviceInfo(deviceId) {
+    return request({
+        url: '/bracelet/device/' + deviceId,
+        method: 'get',
+    })
+}
+
+// 修改
+export function editDevice(data) {
+    return request({
+        url: '/bracelet/device/editDevice',
+        method: 'post',
+        data: data
+    })
+}
+
+// 删除
+export function delDevice(data) {
+    return request({
+        url: '/bracelet/device/delDevice',
+       method: 'post',
+       data: data
+    })
+}
+
+
+
+// 导出
+export function exportDevice(query) {
+    return request({
+        url: '/bracelet/export/exportDevice',
+        method: 'get',
+        responseType: 'blob',
+        params: query
+    })
+}
+
+// 查询班组成员列表
+export function getWorkPersonList(query) {
+    return request({
+        url: '/bracelet/team/getWorkPersonList',
+        method: 'get',
+        params: query
+    })
+}
\ No newline at end of file
diff --git a/src/api/construction/sideband.js b/src/api/construction/sideband.js
new file mode 100644
index 0000000..7eb1210
--- /dev/null
+++ b/src/api/construction/sideband.js
@@ -0,0 +1,95 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function listSideband(query) {
+    return request({
+        url: '/bracelet/sideband/list',
+        method: 'get',
+        params: query
+    })
+}
+
+// 查询杆塔绑定列表
+export function listDevice(query) {
+    return request({
+        url: '/bracelet/sideband/listDevice',
+        method: 'get',
+        params: query
+    })
+}
+
+//查询未绑定杆塔列表
+export function listDeviceNoBind(query) {
+    return request({
+        url: '/bracelet/sideband/listDeviceNoBind',
+        method: 'get',
+        params: query
+    })
+}
+
+// 新增
+export function addSideband(data) {
+    return request({
+        url: '/bracelet/sideband/addSideband',
+        method: 'post',
+        data: data
+    })
+}
+
+// 编辑
+export function editSideband(data) {
+    return request({
+        url: '/bracelet/sideband/editSideband',
+        method: 'post',
+        data: data
+    })
+}
+
+// 详情
+export function getSidebandInfo(sidebandId) {
+    return request({
+        url: '/bracelet/sideband/' + sidebandId,
+        method: 'get'
+      })
+}
+
+// 删除
+export function delSideband(data) {
+    return request({
+        url: '/bracelet/sideband/delSideband',
+        method: 'post',
+        data: data
+    })
+}
+
+// 解除绑定
+export function delDevice(data) {
+    return request({
+        url: '/bracelet/sideband/delDevice',
+        method: 'post',
+        data: data
+    })
+}
+
+//绑定
+export function bindDevice(data) {
+    return request({
+        url: '/bracelet/sideband/bindDevice',
+        method: 'post',
+        data:data
+    })
+}
+
+// 导出
+export function exportPerson(query) {
+    return request({
+        url: '/bracelet/export/exportPerson',
+        method: 'get',
+        responseType: 'blob',
+        params: query
+    })
+}
+
+
+
+
diff --git a/src/api/select.js b/src/api/select.js
index 5eaaa35..c474f7f 100644
--- a/src/api/select.js
+++ b/src/api/select.js
@@ -9,6 +9,14 @@ export function getProList(query) {
     })
 }
 
+export function getGtList(query) {
+    return request({
+        url: '/bracelet/sideband/getGtList',
+        method: 'get',
+        params: query
+    })
+}
+
 
 
 
diff --git a/src/views/base/bracelet/index.vue b/src/views/base/bracelet/index.vue
new file mode 100644
index 0000000..a21cb8d
--- /dev/null
+++ b/src/views/base/bracelet/index.vue
@@ -0,0 +1,1294 @@
+<template>
+  <el-tabs v-model="activeName" @tab-click="handleClick" class="app-container">
+    <el-tab-pane label="手环管理" name="first" onclick="handleQuery">
+    <div class="app-container">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
+        <el-form-item  prop="shCode">
+          <el-input
+            v-model="queryParams.shCode"
+            placeholder="请输入手环编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item  prop="shboxName">
+          <el-input
+            v-model="queryParams.shboxName"
+            placeholder="请输入手环箱名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item  prop="shboxCode">
+          <el-input
+            v-model="queryParams.shboxCode"
+            placeholder="请输入手环箱编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item  prop="shPersonName">
+          <el-input
+            v-model="queryParams.shPersonName"
+            placeholder="请输入使用人"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item prop="shStatus">
+            <el-select v-model="queryParams.shStatus" placeholder="状态" clearable style="width: 100%;">
+                <el-option
+                v-for="dict in dict.type.sys_sh_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+                />
+                </el-select>
+        </el-form-item>
+
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="openShbox"
+            v-hasPermi="['basic:bracelet:add']"
+          >新增手环</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['basic:bracelet:export']"
+          >导出数据</el-button>
+        </el-col>
+        
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+  
+      <el-table v-loading="loading" :data="braceletList">
+        <el-table-column label="手环id" align="center" prop="shId" v-if="false" />
+        <el-table-column label="手环编码" align="center" prop="shCode" />
+        <el-table-column label="所属手环箱" align="center" prop="shboxName" >
+        <template slot-scope="scope">
+                <div v-if="scope.row.shboxName!=boxName" >
+                  {{ scope.row.shboxName }} 
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  style="color: red ;"
+                  @click="handleDelSh(scope.row)"
+                  v-hasPermi="['basic:bracelet:edit']"
+                  >解绑</el-button>
+                </div>
+                <div v-if="scope.row.shboxName==boxName" >
+                  {{ scope.row.shboxName }}
+                  <el-button
+                  size="mini"
+                  type="text"
+                  style="color: green ;"
+                  icon="el-icon-link"
+                  @click="openShboxTemp(scope.row)"
+                  v-hasPermi="['basic:bracelet:edit']"
+                  >绑定</el-button>
+                </div>
+              </template>
+          </el-table-column>
+        <el-table-column label="手环状态" align="center" prop="shStatus" >
+        <template slot-scope="scope">
+                <div v-if="scope.row.shStatus==0" style="color: green;">{{ stateList[Number(scope.row.shStatus)] }}</div>
+                <div v-if="scope.row.shStatus==1" style="color: red;">{{ stateList[Number(scope.row.shStatus)] }}</div>
+            </template>
+          </el-table-column>
+        <el-table-column label="使用人" align="center" prop="shPersonName" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['basic:bracelet:edit']"
+            >编辑</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['basic:bracelet:del']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+  
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+      
+      <!-- 手环弹窗 -->
+      <el-dialog :title="title" :visible.sync="showsh" width="600px" height="600px" append-to-body>
+          <el-form :model="queryshCode" ref="queryshCode" :rules="rules" size="small" :inline="true" v-show="showSearch" label-width="100px">
+            <el-form-item label="手环编码" prop="shCode">
+                <el-input 
+                v-model="queryshCode.shCode" 
+                placeholder="请输入手环编码" 
+                />
+            </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" />
+        <el-table-column label="手环箱名称" align="center" prop="shboxName" />
+        <el-table-column label="手环箱编码" align="center" prop="shboxCode" />
+        <el-table-column label="已绑手环" align="center" prop="shboxBindNum" >
+        <template slot-scope="scope">
+                <div>
+                    <span style="color: green;">{{ scope.row.shboxBindNum }}/</span><span>{{ scope.row.shboxCapacity }}</span>
+                </div>   
+            </template>
+          </el-table-column>
+        <el-table-column label="选择" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <input type="radio" name="radio" value="1" v-model="radio"  @click="getShboxName($event,scope.row)"/>
+              </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      <pagination
+        v-show="totalTwo>0"
+        :total="totalTwo"
+        :page.sync="queryshCode.pageNum"
+        :limit.sync="queryshCode.pageSize"
+        @pagination="getListTemp"
+      />
+
+      </el-dialog>
+
+      <!-- 手环绑定选择弹窗 -->
+      <el-dialog :title="title" :visible.sync="showshBind" width="600px" height="600px" append-to-body>
+          <el-form :model="queryshCodeBind" ref="queryshCodeBind"  size="small" :inline="true" v-show="showSearch" label-width="100px">
+            <el-form-item  prop="keyword">
+          <el-input
+            v-model="queryshCodeBind.keyword"
+            placeholder="请输入关键词"
+            clearable
+            @keyup.enter.native="handleQueryBind"
+          />
+         </el-form-item>
+            <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryBind">查询</el-button>
+         </el-form-item>
+         </el-form>
+      <el-table v-loading="loadingThree" :data="shboxListBind" width="600px" height = "400px" >
+        <el-table-column label="手环箱id" align="center" prop="shboxId" v-if="false" />
+        <el-table-column label="手环箱名称" align="center" prop="shboxName" />
+        <el-table-column label="手环箱编码" align="center" prop="shboxCode" />
+        <el-table-column label="已绑手环" align="center" prop="shboxBindNum" >
+        <template slot-scope="scope">
+                <div>
+                    <span style="color: green;">{{ scope.row.shboxBindNum }}/</span><span>{{ scope.row.shboxCapacity }}</span>
+                </div>   
+            </template>
+          </el-table-column>
+        <el-table-column label="选择" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <input type="radio" name="radio" value="1" v-model="radio"  @click="getShboxBindName($event,scope.row)"/>
+              </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitFormBind">确 定</el-button>
+          <el-button @click="cancelBind">取 消</el-button>
+        </div>
+      <pagination
+        v-show="totalThree>0"
+        :total="totalThree"
+        :page.sync="queryshCodeBind.pageNum"
+        :limit.sync="queryshCodeBind.pageSize"
+        @pagination="getListBind"
+      />
+
+      </el-dialog>
+
+      <!-- 修改手环弹窗 -->
+      <el-dialog :title="title" :visible.sync="showShEdit" width="600px" height="600px" append-to-body>
+          <el-form :model="queryshEdit" ref="queryshEdit" :rules="rules" size="small" :inline="true" v-show="showSearch" label-width="100px">
+            <el-form-item label="手环编码" prop="shCode">
+                <el-input 
+                v-model="queryshEdit.shCode" 
+                placeholder="请输入手环编码" 
+                />
+            </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" />
+        <el-table-column label="手环箱名称" align="center" prop="shboxName" />
+        <el-table-column label="手环箱编码" align="center" prop="shboxCode" />
+        <el-table-column label="已绑手环" align="center" prop="shboxBindNum" >
+          <template slot-scope="scope">
+              <div>
+                  <span style="color: green;">{{ scope.row.shboxBindNum }}/</span><span>{{ scope.row.shboxCapacity }}</span>
+              </div>   
+          </template>
+        </el-table-column>
+        <el-table-column label="选择" align="center"  class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <input type="radio" name="radio"  :checked="shboxId==scope.row.shboxId"   @click="getShboxNameEdit($event,scope.row)"/>
+            </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitFormEdit">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      <pagination
+        v-show="totalTwo>0"
+        :total="totalTwo"
+        :page.sync="queryshEdit.pageNum"
+        :limit.sync="queryshEdit.pageSize"
+        @pagination="getListShEdit"
+      />
+
+      </el-dialog>
+
+    </div>
+  </el-tab-pane>
+
+
+
+    <el-tab-pane label="手环箱管理" name="second" onclick="handleQueryShbox">
+      <div class="app-container">
+      <el-form :model="queryShbox" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
+        <el-form-item  prop="shboxName">
+          <el-input
+            v-model="queryShbox.shboxName"
+            placeholder="请输入手环箱名称"
+            clearable
+            @keyup.enter.native="handleQueryShbox"
+          />
+        </el-form-item>
+        <el-form-item  prop="shboxCode">
+          <el-input
+            v-model="queryShbox.shboxCode"
+            placeholder="请输入手环箱编码"
+            clearable
+            @keyup.enter.native="handleQueryShbox"
+          />
+        </el-form-item>
+        <el-form-item prop="shboxStatus">
+            <el-select v-model="queryShbox.shboxStatus" placeholder="状态" clearable style="width: 100%;">
+                <el-option
+                v-for="dict in dict.type.sys_sh_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+                />
+                </el-select>
+        </el-form-item>
+
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryShbox">查询</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAddbox"
+            v-hasPermi="['basic:bracelet:add']"
+          >新增手环箱</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['basic:bracelet:export']"
+          >导出二维码</el-button>
+        </el-col>
+        
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getboxList"></right-toolbar>
+      </el-row>
+  
+      <el-table v-loading="loadingFive" :data="shboxallList">
+        <el-table-column label="手环箱id" align="center" prop="shboxId" v-if="false" />
+        <el-table-column label="手环箱名称" align="center" prop="shboxName" />
+        <el-table-column label="手环箱编码" align="center" prop="shboxCode" />
+        <el-table-column label="存放手环数量" align="center" prop="shboxBindNum" >
+          <template slot-scope="scope">
+            <div @click="openShall(scope.row)" style="color: #02a7f0; cursor: pointer">
+              <div>
+                    <span style="color: green;">{{ scope.row.shboxBindNum }}/</span><span>{{ scope.row.shboxCapacity }}</span>
+                </div>
+            </div>
+        </template>
+            <!-- <template slot-scope="scope">
+                <div>
+                    <span style="color: green;">{{ scope.row.shboxBindNum }}/</span><span>{{ scope.row.shboxCapacity }}</span>
+                </div>   
+            </template> -->
+          </el-table-column>
+          <el-table-column label="二维码" align="center" class-name="small-padding fixed-width">
+             <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleQuertPage(scope.row)"
+              v-hasPermi="['basic:bracelet:query']"
+            >查看</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="手环箱状态" align="center" prop="shboxStatus" >
+        <template slot-scope="scope">
+                <div v-if="scope.row.shboxStatus==0" style="color: green;">{{ stateList[Number(scope.row.shboxStatus)] }}</div>
+                <div v-if="scope.row.shboxStatus==1" style="color: red;">{{ stateList[Number(scope.row.shboxStatus)] }}</div>
+            </template>
+          </el-table-column>
+        <el-table-column label="领用人" align="center" prop="lyName" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdatebox(scope.row)"
+              v-hasPermi="['basic:bracelet:edit']"
+            >编辑</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDeletebox(scope.row)"
+              v-hasPermi="['basic:bracelet:del']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+  
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryShbox.pageNum"
+        :limit.sync="queryShbox.pageSize"
+        @pagination="getboxList"
+      />
+      
+      <!-- 手环箱管理页面绑定手环弹窗 -->
+      <el-dialog :title="title" :visible.sync="showShall" width="1000px" height="1000px" append-to-body>
+        <el-form :model="queryShBoxall" ref="queryShBoxall"  size="small" :inline="true" v-show="showSearch" label-width="100px">
+        <el-form-item  prop="shCode">
+          <el-input
+            v-model="queryShBoxall.shCode"
+            placeholder="请输入手环编码"
+            clearable
+            @keyup.enter.native="handleQueryShBind"
+          />
+        </el-form-item>
+        <el-form-item  prop="shPersonName">
+          <el-input
+            v-model="queryShBoxall.shPersonName"
+            placeholder="请输入使用人"
+            clearable
+            @keyup.enter.native="handleQueryShBind"
+          />
+        </el-form-item>
+        <el-form-item prop="shStatus">
+            <el-select v-model="queryShBoxall.shStatus" placeholder="状态" clearable style="width: 100%;">
+                <el-option
+                v-for="dict in dict.type.sys_sh_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+                />
+                </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryShBind">查询</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+         </el-form-item>
+      </el-form>
+      <el-table v-loading="loadingSix" :data="shBindList" width="600px" height = "400px" >
+        <el-table-column label="手环id" align="center" prop="shId" v-if="false" />
+        <el-table-column label="手环编码" align="center" prop="shCode" />
+        <el-table-column label="手环状态" align="center" prop="shStatus" >
+        <template slot-scope="scope">
+                <div v-if="scope.row.shStatus==0" style="color: green;">{{ stateList[Number(scope.row.shStatus)] }}</div>
+                <div v-if="scope.row.shStatus==1" style="color: red;">{{ stateList[Number(scope.row.shStatus)] }}</div>
+            </template>
+          </el-table-column>
+        <el-table-column label="使用人" align="center" prop="shPersonName" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              style="color:red"
+              icon="el-icon-edit"
+              @click="handleDelDevice(scope.row)"
+              v-hasPermi="['basic:sideband:edit']"
+            >解除绑定</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      <pagination
+        v-show="totalTwo>0"
+        :total="totalTwo"
+        :page.sync="queryShBoxall.pageNum"
+        :limit.sync="queryShBoxall.pageSize"
+        @pagination="getListBoxall"
+      />
+
+      </el-dialog>
+
+      <!-- 手环绑定选择弹窗 -->
+      <el-dialog :title="title" :visible.sync="showshBind" width="600px" height="600px" append-to-body>
+          <el-form :model="queryshCodeBind" ref="queryshCodeBind"  size="small" :inline="true" v-show="showSearch" label-width="100px">
+            <el-form-item  prop="keyword">
+          <el-input
+            v-model="queryshCodeBind.keyword"
+            placeholder="请输入关键词"
+            clearable
+            @keyup.enter.native="handleQueryBind"
+          />
+         </el-form-item>
+            <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryBind">查询</el-button>
+         </el-form-item>
+         </el-form>
+      <el-table v-loading="loadingThree" :data="shboxListBind" width="600px" height = "400px" >
+        <el-table-column label="手环箱id" align="center" prop="shboxId" v-if="false" />
+        <el-table-column label="手环箱名称" align="center" prop="shboxName" />
+        <el-table-column label="手环箱编码" align="center" prop="shboxCode" />
+        <el-table-column label="已绑手环" align="center" prop="shboxBindNum" >
+        <template slot-scope="scope">
+                <div>
+                    <span style="color: green;">{{ scope.row.shboxBindNum }}/</span><span>{{ scope.row.shboxCapacity }}</span>
+                </div>   
+            </template>
+          </el-table-column>
+        <el-table-column label="选择" align="center" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <input type="radio" name="radio" value="1" v-model="radio"  @click="getShboxBindName($event,scope.row)"/>
+              </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitFormBind">确 定</el-button>
+          <el-button @click="cancelBind">取 消</el-button>
+        </div>
+      <pagination
+        v-show="totalThree>0"
+        :total="totalThree"
+        :page.sync="queryshCodeBind.pageNum"
+        :limit.sync="queryshCodeBind.pageSize"
+        @pagination="getListBind"
+      />
+
+      </el-dialog>
+
+      <!-- 修改手环弹窗 -->
+      <el-dialog :title="title" :visible.sync="showShEdit" width="600px" height="600px" append-to-body>
+          <el-form :model="queryshEdit" ref="queryshEdit" :rules="rules" size="small" :inline="true" v-show="showSearch" label-width="100px">
+            <el-form-item label="手环编码" prop="shCode">
+                <el-input 
+                v-model="queryshEdit.shCode" 
+                placeholder="请输入手环编码" 
+                />
+            </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" />
+        <el-table-column label="手环箱名称" align="center" prop="shboxName" />
+        <el-table-column label="手环箱编码" align="center" prop="shboxCode" />
+        <el-table-column label="已绑手环" align="center" prop="shboxBindNum" >
+          <template slot-scope="scope">
+              <div>
+                  <span style="color: green;">{{ scope.row.shboxBindNum }}/</span><span>{{ scope.row.shboxCapacity }}</span>
+              </div>   
+          </template>
+        </el-table-column>
+        <el-table-column label="选择" align="center"  class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+              <input type="radio" name="radio"  :checked="shboxId==scope.row.shboxId"   @click="getShboxNameEdit($event,scope.row)"/>
+            </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitFormEdit">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      <pagination
+        v-show="totalTwo>0"
+        :total="totalTwo"
+        :page.sync="queryshEdit.pageNum"
+        :limit.sync="queryshEdit.pageSize"
+        @pagination="getListShEdit"
+      />
+
+      </el-dialog>
+
+      <!-- 添加或修改手环箱对话框 -->
+       <el-dialog :title="title" :visible.sync="openbox" width="600px"   append-to-body>
+        <el-form ref="formTwo" :model="formTwo" :rules="rulesbox" label-width="100px" >
+          <el-row :gutter="24">
+            <el-col :span="12">
+                    <el-form-item label="手环箱名称" prop="shboxName">
+                        <el-input v-model="formTwo.shboxName" placeholder="请输入手环箱名称" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="手环箱编码" prop="shboxCode">
+                        <el-input v-model="formTwo.shboxCode" placeholder="请输入手环箱编码" />
+                      </el-form-item>
+                    </el-col>
+          </el-row>
+          <el-row :gutter="24">
+                    <el-col :span="14">
+                    <el-form-item label="手环箱容量" prop="shboxCapacity">
+                        <el-input v-model.number="formTwo.shboxCapacity" placeholder="请输入手环箱容量" >
+                        <template slot="append">个</template>
+                      </el-input>
+                    </el-form-item>      
+                  </el-col>    
+           </el-row>   
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitFormbox">确 定</el-button>
+          <el-button @click="cancelbox">取 消</el-button>
+        </div>
+      </el-dialog>
+
+    </div>
+    </el-tab-pane>
+  </el-tabs>
+  </template>
+  
+  <script>
+  import { listBracelet, listShboxall,delShById, exportDevice,listShbox,addSh,listShboxBind,addShBind,delSh,editSh,
+           getBoxInfo,editBox,addBox,delShboxById,listShBind} from "@/api/base/bracelet";
+
+  import { downloadFile } from '@/utils/download'
+  import { getToken } from '@/utils/auth'
+  import uploadFile from '../../components/uploadFile.vue'
+  export default {
+    name: "Post",
+    dicts: ['sys_normal_disable','sys_sh_status'],
+    components: {
+			uploadFile
+		},
+    data() {
+      return {
+        activeName: 'first',
+        // 遮罩层
+        loading: true,
+        // 遮罩层2
+        loadingTwo:true,
+        // 遮罩层3
+        loadingThree:true,
+        // 遮罩层4
+        loadingFour:true,
+         // 遮罩层5
+        loadingFive:true,
+        // 遮罩层6
+        loadingSix:true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        //绑定设备总条数
+        totalTwo:0,
+        //未绑定设备总条数
+        totalThree:0,
+        // 手环表格数据
+        braceletList: [],
+        // 手环箱表格数据
+        shboxList: [],
+        // 手环箱所有表格数据
+        shboxallList:[],
+        //手环绑定选择表格数据
+        shboxListBind: [],
+        // 绑定设备表格数据
+        bindNoList: [],
+        //手环箱绑定手环表格数据
+        shBindList: [],
+        // 弹出层标题
+        title: "",
+        boxName: "未绑定",
+        bind:"解绑",
+        // 是否显示弹出层
+        open: false,
+        //所属工程
+        proList: [],
+        //状态
+        StatusList:[],
+        selectOption:false,
+        zero:0,
+        Qrcode:"",
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          shId:undefined,
+          shCode:undefined,
+          shboxName: undefined,
+          shboxCode: undefined,
+          shPersonName:undefined,
+          shStatus:undefined,
+        },
+        queryshCode:{
+          pageNum: 1,
+          pageSize: 10,
+          shCode: undefined,
+          shboxName: undefined,
+          shboxId: undefined,
+        },
+        queryshCodeBind:{
+          pageNum: 1,
+          pageSize: 10,
+          shId: undefined,
+          keyword: undefined,
+          shboxName: undefined,
+          shboxId: undefined,
+          shboxCapacity: undefined,
+          shboxBindNum: undefined,
+        },
+        queryshEdit:{
+          pageNum: 1,
+          pageSize: 10,
+          shId: undefined,
+          shCode: undefined,
+          shboxName: undefined,
+          shboxId: undefined,
+        },
+
+        queryShbox: {
+          pageNum: 1,
+          pageSize: 10,
+          shboxId:undefined,
+          shboxCode:undefined,
+          shboxName: undefined,
+          shboxStatus:undefined,
+        },
+
+        queryShBoxall: {
+          pageNum: 1,
+          pageSize: 10,
+          shboxId:undefined,
+          shCode:undefined,
+          shId:undefined,
+          shPersonName: undefined,
+          shStatus:undefined,
+        },
+
+        showsh:false,
+
+        showshBind:false,
+
+        showDevice:false,
+
+        showShEdit:false,
+
+        showShall:false,
+
+        openbox:false,
+
+        stateList:['在用','未用'],
+        accept:'.png, .jpg, .jpeg, .pdf, .doc, .docx',
+        highImgList: [],
+        electricianImgList: [],
+        elseImgList: [],
+        // 表单参数
+        form: {},
+        formTwo: {},
+        //图片上传
+        fileList: [],
+        //图片查看弹窗
+        dialogImageUrl: '',
+        dialogVisible: false,
+        // 用户导入参数
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 是否更新已经存在的用户数据
+          updateSupport: 0,
+          // 设置上传的请求头部
+          headers: { Authorization: "Bearer " + getToken() },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/bracelet/person/excelUpload"
+        },
+        // 表单校验
+        rules: {
+          shCode: [
+            { required: true, message: "手环编码不能为空", trigger: "blur" }
+          ],
+        },
+        rulesbox: {
+          shboxName: [
+            { required: true, message: "手环箱名称不能为空", trigger: "blur" }
+          ],
+          shboxCode: [
+            { required: true, message: "手环箱编码不能为空", trigger: "blur" }
+          ],
+          shboxCapacity: [
+            { required: true, message: "手环箱容量不能为空",trigger: "blur" },
+            {
+            validator: (rule, value, callback) => {
+              if (!value) {
+                return callback(new Error('请必须输入为正整数'));
+              }
+              if (!Number.isInteger(value) || value <= 0) {
+                callback(new Error('请必须输入为正整数'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'blur'
+          }
+          ],
+      }
+      };
+    },
+    computed: {
+        //图片上传1张后，隐藏上传框
+        uploadDisabled() {
+            return this.fileList.length > 0
+        },
+    },
+    created() {
+      this.getList();
+      this.getboxList();
+    },
+    methods: {
+
+        /** 查询设备列表 */
+        getList() {
+            this.loading = true;
+            listBracelet(this.queryParams).then(response => {
+              this.braceletList = response.rows;
+              this.total = response.total;
+              this.loading = false;
+            });
+        },
+
+        // 取消按钮
+        cancel() {
+            this.showsh = false;
+            this.reset();
+        },
+        // 手环绑定选择页面取消按钮
+        cancelBind() {
+            this.showshBind = false;
+            this.resetBind();
+        },
+
+       // 手环箱管理页面取消按钮
+        cancelbox() {
+            this.openbox = false;
+            this.resetbox();
+        },
+        // 表单重置
+        reset() {
+            this.queryParams = {};
+            this.resetForm("queryParams");
+        },
+        resetbox() {
+            this.formTwo = {};
+            this.resetForm("formTwo");
+        },
+        // 手环绑定选择页面表单重置
+        resetBind() {
+            this.queryshCodeBind = {};
+            this.resetForm("queryshCodeBind");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+
+        /** 手环绑定选择搜索按钮操作 */
+        handleQueryBind() {
+            this.queryshCodeBind.pageNum = 1;
+            this.getListBind();
+        },
+        //手环箱管理页面搜索按钮操作
+        handleQueryShbox() {
+          this.queryShbox.pageNum = 1;
+          this.getboxList();
+        },
+
+        //手环箱管理页面搜索按钮操作
+        handleQueryShBind() {
+          this.queryShBoxall.pageNum = 1;
+          this.queryShBoxall.shboxId = this.queryShBoxall.shboxId;
+          this.getListBoxall();
+      
+        },
+
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.deviceId)
+            this.single = selection.length!=1
+            this.multiple = !selection.length
+        },
+        /** 解除绑定操作 */
+        handleDelSh(row) {
+            console.log(row)
+            const param = {
+              shId:row.shId,
+            }
+            this.$modal.confirm('确定把该手环与手环箱解除绑定吗？解绑后重新绑定才能继续使用！').then(function() {
+              return delSh(param);
+            }).then(() => {
+              this.getList();
+              // this.getListTemp();
+              this.$modal.msgSuccess("解除绑定成功");
+            }).catch(() => {});
+        },
+
+        handleQuertPage(row){
+          const qrCodeData = {
+        "设备类型": row.deviceType,
+        "设备名称": row.deviceName,
+        "设备编号": row.deviceCode,
+        "设备状态": row.deviceStatus,
+    };
+        const qrCodeString = JSON.stringify(qrCodeData, null, 2);
+        console.log(qrCodeString);
+        //清空二维码容器
+        // Qrcode = "";
+        // // 生成二维码
+        //  Qrcode.qrcode(utf16to8(qrCodeString));
+        this.open = true;
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "新增手环";
+        },
+
+        /** 手环箱管理页面新增按钮操作 */
+        handleAddbox() {
+          this.resetbox();
+            this.openbox = true;
+            this.title = "新增手环箱";
+        },
+
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+             this.reset();
+            const shPersonName = row.shPersonName;
+            const shId = row.shId;
+            if(shPersonName!=null){
+              this.$alert('手环已绑定使用人，不可修改', '提示', {
+                type: 'warning',
+                confirmButtonText: '确定',
+              });
+              return;
+            }
+          this.shboxId = row.shboxId;
+          this.shId = row.shId;
+          this.title = "修改手环"
+          this.showShEdit = true;
+          this.getListShEdit();
+          this.queryshEdit.pageNum = 1;
+          this.queryshEdit.shId = row.shId;
+          this.queryshEdit.shCode = row.shCode;
+        },
+
+        handleUpdatebox(row) {
+             this.resetbox();
+             const lyName = row.lyName;
+            if(lyName!=null){
+              this.$alert('手环箱已绑定领用人，不可修改', '提示', {
+                type: 'warning',
+                confirmButtonText: '确定',
+              });
+              return;
+            }
+            const shboxId = row.shboxId
+            getBoxInfo(shboxId).then(response => {
+              this.formTwo = response.data;
+              this.$set(this.formTwo,'shboxName',response.data.shboxName+'')
+              this.$set(this.formTwo,'shboxCode',response.data.shboxCode+'')
+              this.$set(this.formTwo,'shboxCapacity',response.data.shboxCapacity)
+              this.formTwo.shboxId = response.data.shboxId;
+              setTimeout(()=>{
+                this.openbox = true;
+                this.title = "修改手环箱";
+              },100)
+             
+            });
+        },
+
+
+        handleClick(tab, event) {
+          this.getList();
+          this.getboxList();
+        console.log(tab, event);
+      },
+      getShboxName(e,row){
+        this.queryshCode.shboxId = row.shboxId;
+        this.queryshCode.shboxName = row.shboxName;
+          if(e.target.value == this[e.target.name]){
+		      e.target.checked = false
+          this.queryshCode.shboxId = null;
+         this.queryshCode.shboxName =null;
+		      this[e.target.name] = ''
+	        }
+      },
+
+      getShboxNameEdit(e,row){
+        this.queryshEdit.shboxId = row.shboxId;
+        this.queryshEdit.shboxName = row.shboxName;
+        if(this.shboxId == row.shboxId){
+          this.shboxId = 0
+          e.target.checked =  false;
+          this.queryshEdit.shboxId = null;
+         this.queryshEdit.shboxName =null;
+        }else{
+          this.shboxId = row.shboxId;
+        }
+        console.log(this.queryshEdit)
+
+      },
+
+      getShboxBindName(e,row){
+          this.queryshCodeBind.shboxId = row.shboxId;
+          this.queryshCodeBind.shboxName = row.shboxName;
+          this.queryshCodeBind.shboxCapacity = row.shboxCapacity;
+          this.queryshCodeBind.shboxBindNum = row.shboxBindNum;
+          if(e.target.value == this[e.target.name]){
+		      e.target.checked = false
+          this.queryshCodeBind.shboxId = null;
+         this.queryshCodeBind.shboxName =null;
+         this.queryshCodeBind.shboxCapacity = null;
+         this.queryshCodeBind.shboxBindNum = null;
+		      this[e.target.name] = ''
+	        }
+      },
+
+
+
+
+        /** 提交按钮 */
+        submitForm() { 
+          this.queryshCode.shCode = this.queryshCode.shCode;
+          console.log(this.queryshCode);
+          this.$refs["queryshCode"].validate(valid => {
+            if (valid) {
+              addSh(this.queryshCode).then(response => {
+               this.$modal.msgSuccess("新增成功");
+                    this.showsh = false;
+                    this.getList();
+               });
+            }
+          })
+        },
+
+        
+        /** 手环绑定选择页面提交按钮 */
+        submitFormBind() { 
+          console.log(this.queryshCodeBind);
+          if(this.queryshCodeBind.shboxId == undefined){
+            this.$modal.msgError("请选择手环箱");
+            return;
+          }
+          this.$refs["queryshCodeBind"].validate(valid => {
+            if (valid) {
+              addShBind(this.queryshCodeBind).then(response => {
+               this.$modal.msgSuccess("绑定成功");
+                    this.showshBind = false;
+                    this.getList();
+               });
+            }
+          })
+        },
+
+         /** 修改手环页面提交按钮 */
+        submitFormEdit() { 
+          console.log(this.queryshEdit);
+          this.queryshEdit.shCode = this.queryshEdit.shCode;
+          this.$refs["queryshEdit"].validate(valid => {
+            if (valid) {
+              editSh(this.queryshEdit).then(response => {
+               this.$modal.msgSuccess("修改成功");
+                    this.showShEdit = false;
+                    this.getList();
+               });
+            }
+          })
+        },
+
+
+        /** 手环箱子管理页面提交按钮 */
+        submitFormbox() { 
+            this.$refs["formTwo"].validate(valid => {
+            if (valid) {
+                if (this.formTwo.shboxId != undefined) {
+                  console.log(this.formTwo)
+                  editBox(this.formTwo).then(response => {
+                    this.$modal.msgSuccess("修改成功");
+                    this.openbox = false;
+                    this.getboxList();
+                  });
+                } else {
+                  console.log(this.formTwo)
+                  addBox(this.formTwo).then(response => {
+                    this.$modal.msgSuccess("新增成功");
+                    this.openbox = false;
+                    this.getboxList();
+                  });
+                }
+            }
+            });
+           
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            console.log(row)
+            if(row.shboxName!=this.boxName){
+              this.$alert('请先解绑手环', '提示', {
+                type: 'warning',
+                confirmButtonText: '确定',
+              });
+              // this.$modal.msgError("请先解绑手环");
+              return;
+            }
+            const  param = {
+              shId:row.shId
+            }
+            this.$modal.confirm('是否确认删除手环编号为"' + row.shCode + '"的数据项？').then(function() {
+              return delShById(param);
+            }).then(() => {
+              this.getList();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+        },
+
+        /** 手环箱子管理页面删除按钮操作 */
+        handleDeletebox(row) {
+            console.log(row)
+            console.log(row.shboxBindNum);
+            if (row.shboxBindNum!=0) {
+              this.$alert('手环箱不为空，还存放有手环，无法删除', '提示', {
+                type: 'warning',
+                confirmButtonText: '确定',
+              });
+              // this.$modal.msgError("请先解绑手环");
+              return;
+            }
+            const  param = {
+              shboxId:row.shboxId
+            }
+            this.$modal.confirm('是否确认删除手环箱编号为"' + row.shboxCode + '"的数据项？').then(function() {
+              return delShboxById(param);
+            }).then(() => {
+              this.getboxList();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+        },
+
+        /** 导出按钮操作 */
+        handleExport() {
+          exportDevice(this.queryParams).then(res => {
+            downloadFile({ fileName: `设备_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+          })
+        },
+
+        /** 导入按钮操作 */
+        handleImport() {
+          this.upload.title = "人员导入";
+          this.upload.open = true;
+        },
+
+        /** 查询手环箱列表 */
+       getListTemp() {
+          this.loadingTwo = true;
+          listShbox(this.queryshCode).then(response => {
+              this.shboxList = response.rows;
+              console.log(this.shboxList)
+              this.totalTwo = response.total;
+              this.loadingTwo = false;
+            });
+        },
+
+       /** 查询手环箱里绑定手环列表 */
+       getListBoxall() {
+            this.loadingSix = true;
+            this.queryShBoxall.shboxId = this.shboxId;
+            listShBind(this.queryShBoxall).then(response => {
+              this.shBindList = response.rows;
+              this.totalTwo = response.total;
+              this.loadingSix = false;
+            });
+        },
+        /** 手环箱管理查询手环箱列表 */
+       getboxList() {
+          this.loadingFive = true;
+          console.log(this.queryShbox);
+          listShboxall(this.queryShbox).then(response => {
+              this.shboxallList = response.rows;
+              console.log(this.shboxallList)
+              this.total = response.total;
+              this.loadingFive = false;
+            });
+        },
+
+       /** 查询修改手环列表 */
+       getListShEdit() {
+          this.loadingFour = true;
+          listShbox(this.queryshEdit).then(response => {
+              this.shboxList = response.rows;
+              console.log(this.shboxList)
+              this.totalTwo = response.total;
+              this.loadingFour = false;
+            });
+        },
+
+       /** 查询手环绑定选择列表 */
+       getListBind() {
+          this.loadingThree = true;
+          listShboxBind(this.queryshCodeBind).then(response => {
+              this.shboxListBind = response.rows;
+              console.log(this.shboxListBind)
+              this.totalThree = response.total;
+              this.loadingThree = false;
+            });
+        },
+
+        //打开手环箱管理页面新增手环页面
+        openShbox(row){
+          // this.sidebandId = row.sidebandId;
+          this.title = "新增手环"
+          this.showsh = true;
+          this.getListTemp();
+          this.queryshCode.pageNum = 1;
+          this.queryshCode.shCode = undefined;
+        },
+
+        //打开手环页面
+        openShbox(row){
+          // this.sidebandId = row.sidebandId;
+          this.title = "新增手环"
+          this.showsh = true;
+          this.getListTemp();
+          this.queryshCode.pageNum = 1;
+          this.queryshCode.shCode = undefined;
+        },
+
+        //打开手环绑定页面
+        openShboxTemp(row){
+          // this.sidebandId = row.sidebandId;
+          this.title = "选择"
+          this.showshBind = true;
+          this.getListBind();
+          this.queryshCodeBind.pageNum = 1;
+          this.queryshCodeBind.shId = row.shId;
+        },
+
+        //打开编辑页面
+        openShEdit(row){
+          this.shId = row.shId;
+          this.title = "修改手环"
+          this.showShEdit = true;
+          this.getListShEdit();
+          this.queryshEdit.pageNum = 1;
+          this.queryshEdit.shCode = row.shCode;
+        },
+
+        //打开手环箱里手环信息页面
+        openShall(row){
+          this.shboxId = row.shboxId;
+          this.title = "绑定的手环信息"
+          this.queryShBoxall.shboxId = row.shboxId;
+          this.showShall = true;
+          this.getListBoxall();
+        },
+
+        //关闭证书上传
+        cancelGt(){
+          this.highImgList = []
+          this.electricianImgList = []
+          this.elseImgList = []
+          this.showsh = false;
+        },
+        //提交证书上传
+        submitCertificate(){
+          console.log(this.highImgList)
+          console.log(this.electricianImgList)
+          console.log(this.elseImgList)
+          // this.highImgList = []
+          // this.electricianImgList = []
+          // this.elseImgList = []
+
+          this.showsh = false;
+        },
+  
+    }
+  };
+  </script>
+
+  <style lang="scss" scoped>
+  ::v-deep.el-table .fixed-width .el-button--mini {
+      width: 60px !important;
+      margin-bottom: 10px;
+  }
+  //隐藏图片上传框的css
+  ::v-deep.disabled {
+      .el-upload--picture-card {
+          display: none;
+      }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/views/base/device/index.vue b/src/views/base/device/index.vue
new file mode 100644
index 0000000..707defc
--- /dev/null
+++ b/src/views/base/device/index.vue
@@ -0,0 +1,572 @@
+<template>
+    <div class="app-container">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item prop="devcieType">
+          <el-select v-model="queryParams.deviceType" placeholder="设备类型" clearable style="width: 100%;">
+            <el-option
+              v-for="dict in dict.type.sys_device_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item  prop="deviceName">
+          <el-input
+            v-model="queryParams.deviceName"
+            placeholder="请输入设备名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item  prop="deviceCode">
+          <el-input
+            v-model="queryParams.deviceCode"
+            placeholder="请输入设备编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item prop="deviceStatus">
+            <el-select v-model="queryParams.deviceStatus" placeholder="状态" clearable style="width: 100%;">
+                <el-option
+                v-for="dict in dict.type.sys_device_status"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+                />
+                </el-select>
+        </el-form-item>
+
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['basic:device:add']"
+          >新增设备</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            @click="handleExport"
+            v-hasPermi="['basic:device:export']"
+          >导出数据</el-button>
+        </el-col>
+        
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+  
+      <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="设备id" align="center" prop="deviceId" v-if="false" />
+        <el-table-column label="设备类型" align="center" prop="deviceType" />
+        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="设备编号" align="center" prop="deviceCode" />
+        <el-table-column label="二维码" align="center" class-name="small-padding fixed-width">
+             <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleQuertPage(scope.row)"
+              v-hasPermi="['basic:device:query']"
+            >查看</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="设备状态" align="center" prop="deviceStatus" >
+        <template slot-scope="scope">
+                <div v-if="scope.row.deviceStatus==0" style="color: green;">{{ stateList[Number(scope.row.deviceStatus)] }}</div>
+                <div v-if="scope.row.deviceStatus==1" style="color: red;">{{ stateList[Number(scope.row.deviceStatus)] }}</div>
+            </template>
+          </el-table-column>
+        <el-table-column label="领用人" align="center" prop="lyName" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['basic:device:edit']"
+            >编辑</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['basic:device:del']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+  
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+      
+      <!-- 杆塔弹窗 -->
+      <el-dialog :title="title" :visible.sync="showGt" width="1000px" height="1000px" append-to-body>
+          <el-form :model="queryKeyword" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item  prop="keyword">
+          <el-input
+            v-model="queryKeyword.keyword"
+            placeholder="请输入关键词"
+            clearable
+            @keyup.enter.native="handleQueryTemp"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryTemp">查询</el-button>
+        </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAddDevice"
+            v-hasPermi="['basic:sideband:add']"
+          >绑定设备</el-button>
+        </el-col>
+        
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getListTemp"></right-toolbar>
+      </el-row>
+
+      <el-table v-loading="loadingTwo" :data="bindList" width="600px" height = "600px" >
+        <el-table-column label="设备id" align="center" prop="deviceId" v-if="false" />
+        <el-table-column label="设备类型" align="center" prop="deviceType" />
+        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="设备编号" align="center" prop="deviceCode" />
+        <el-table-column label="设备状态" align="center" prop="deviceStatus" >
+        <template slot-scope="scope">
+                <div v-if="scope.row.deviceStatus==0" style="color: green;">{{ stateList[Number(scope.row.deviceStatus)] }}</div>
+                <div v-if="scope.row.deviceStatus==1" style="color: red;">{{ stateList[Number(scope.row.deviceStatus)] }}</div>
+            </template>
+          </el-table-column>
+        <el-table-column label="领用人" align="center" prop="lyName" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleDelDevice(scope.row)"
+              v-hasPermi="['basic:sideband:edit']"
+            >解除绑定</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+  
+      <pagination
+        v-show="totalTwo>0"
+        :total="totalTwo"
+        :page.sync="queryKeyword.pageNum"
+        :limit.sync="queryKeyword.pageSize"
+        @pagination="getListTemp"
+      />
+
+      </el-dialog>
+
+      <!-- 选择设备弹窗 -->
+      <el-dialog :title="title" :visible.sync="showDevice" width="800px" height="800px" append-to-body>
+          <el-form :model="queryKeywordTemp" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item  prop="keyword">
+          <el-input
+            v-model="queryKeywordTemp.keyword"
+            placeholder="请输入关键词"
+            clearable
+            @keyup.enter.native="handleQueryDevice"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryDevice">查询</el-button>
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleBindDevice"
+            v-hasPermi="['basic:sideband:add']"
+          >绑定</el-button>
+        </el-form-item>
+        </el-form>
+<!-- 
+        <el-row :gutter="10" class="mb8">
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getListDevice"></right-toolbar>
+      </el-row> -->
+
+      <el-table v-loading="loadingThree" :data="bindNoList" width="600px" height = "600px" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="设备id" align="center" prop="deviceId" v-if="false" />
+        <el-table-column label="设备类型" align="center" prop="deviceType" />
+        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="设备编号" align="center" prop="deviceCode" />
+      </el-table>
+  
+      <pagination
+        v-show="totalThree>0"
+        :total="totalThree"
+        :page.sync="queryKeywordTemp.pageNum"
+        :limit.sync="queryKeywordTemp.pageSize"
+        @pagination="getListDevice"
+      />
+
+      </el-dialog>
+
+      <!-- 添加或修改设备对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="600px"   append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px" >
+                    <el-form-item label="设备类型" prop="devcieType">
+                        <el-select v-model="form.deviceType" placeholder="请输入设备类型" clearable style="width: 100%;">
+                         <el-option
+                           v-for="dict in dict.type.sys_device_type"
+                           :key="dict.value"
+                           :label="dict.label"
+                           :value="dict.value"
+                             />
+                         </el-select>
+                    </el-form-item>
+                    <el-form-item label="设备编码" prop="deviceCode">
+                        <el-input v-model="form.deviceCode" placeholder="请输入设备编码" />
+                    </el-form-item>
+                    <el-form-item label="设备名称" prop="deviceName">
+                        <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+                    </el-form-item>             
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+
+    </div>
+  </template>
+  
+  <script>
+  import { listDevcie, addDevice, editDevice, getDeviceInfo,delDevice,listDeviceNoBind,bindDevice, exportDevice} from "@/api/base/device";
+
+  import { downloadFile } from '@/utils/download'
+  import { getToken } from '@/utils/auth'
+  import uploadFile from '../../components/uploadFile.vue'
+  export default {
+    name: "Post",
+    dicts: ['sys_normal_disable','sys_user_sex','sys_device_type','sys_device_status'],
+    components: {
+			uploadFile
+		},
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 遮罩层2
+        loadingTwo:true,
+        // 遮罩层3
+        loadingThree:true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        //绑定设备总条数
+        totalTwo:0,
+        //未绑定设备总条数
+        totalThree:0,
+        // 设备表格数据
+        deviceList: [],
+        // 绑定设备表格数据
+        bindList: [],
+        // 绑定设备表格数据
+        bindNoList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        //所属工程
+        proList: [],
+        //状态
+        StatusList:[],
+        Qrcode:"",
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          deviceType:undefined,
+          deviceName:undefined,
+          deviceCode: undefined,
+          devcieStatus: undefined,
+        },
+        queryKeyword:{
+          pageNum: 1,
+          pageSize: 10,
+          sidebandId: undefined,
+          keyword: undefined,
+        },
+        queryKeywordTemp:{
+          pageNum: 1,
+          pageSize: 10,
+          sidebandId: undefined,
+          keyword: undefined,
+        },
+        showGt:false,
+
+        showDevice:false,
+
+        stateList:['在用','未用'],
+        accept:'.png, .jpg, .jpeg, .pdf, .doc, .docx',
+        highImgList: [],
+        electricianImgList: [],
+        elseImgList: [],
+        // 表单参数
+        form: {},
+        //图片上传
+        fileList: [],
+        //图片查看弹窗
+        dialogImageUrl: '',
+        dialogVisible: false,
+        // 用户导入参数
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 是否更新已经存在的用户数据
+          updateSupport: 0,
+          // 设置上传的请求头部
+          headers: { Authorization: "Bearer " + getToken() },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/bracelet/person/excelUpload"
+        },
+        // 表单校验
+        rules: {
+          deviceType: [
+            { required: true, message: "设备类型不能为空", trigger: "change" }
+          ],
+          deviceCode: [
+            { required: true, message: "设备编码不能为空", trigger: "blur" }
+          ],
+          deviceName: [
+            { required: true, message: "设备名称不能为空", trigger: "blur" }
+          ]
+        }
+      };
+    },
+    computed: {
+        //图片上传1张后，隐藏上传框
+        uploadDisabled() {
+            return this.fileList.length > 0
+        },
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+
+        /** 查询设备列表 */
+        getList() {
+            this.loading = true;
+            listDevcie(this.queryParams).then(response => {
+              this.deviceList = response.rows;
+              this.total = response.total;
+              this.loading = false;
+            });
+        },
+
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.fileList=[];
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {};
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.deviceId)
+            this.single = selection.length!=1
+            this.multiple = !selection.length
+        },
+
+        handleQuertPage(row){
+          const qrCodeData = {
+        "设备类型": row.deviceType,
+        "设备名称": row.deviceName,
+        "设备编号": row.deviceCode,
+        "设备状态": row.deviceStatus,
+    };
+        const qrCodeString = JSON.stringify(qrCodeData, null, 2);
+        console.log(qrCodeString);
+        //清空二维码容器
+        // Qrcode = "";
+        // // 生成二维码
+        //  Qrcode.qrcode(utf16to8(qrCodeString));
+        this.open = true;
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.reset();
+            this.open = true;
+            this.title = "添加设备";
+        },
+
+
+
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const deviceId = row.deviceId
+            getDeviceInfo(deviceId).then(response => {
+              this.form = response.data;
+              this.$set(this.form,'deviceType',response.data.deviceType)
+              this.$set(this.form,'deviceCode',response.data.deviceCode+'')
+              this.$set(this.form,'deviceName',response.data.deviceName+'')
+              setTimeout(()=>{
+                this.open = true;
+                this.title = "修改设备";
+              },100)
+             
+            });
+        },
+
+        /** 提交按钮 */
+        submitForm() { 
+            this.$refs["form"].validate(valid => {
+            if (valid) {
+                if (this.form.deviceId != undefined) {
+                  console.log(this.form)
+                  editDevice(this.form).then(response => {
+                    this.$modal.msgSuccess("修改成功");
+                    this.open = false;
+                    this.getList();
+                  });
+                } else {
+                  console.log(this.form)
+                  addDevice(this.form).then(response => {
+                    this.$modal.msgSuccess("新增成功");
+                    this.open = false;
+                    this.getList();
+                  });
+                }
+            }
+            });
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            console.log(row)
+            const  param = {
+              deviceId:row.deviceId
+            }
+            this.$modal.confirm('是否确认删除设备名称为"' + row.deviceName + '"的数据项？').then(function() {
+              return delDevice(param);
+            }).then(() => {
+              this.getList();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+          exportDevice(this.queryParams).then(res => {
+            downloadFile({ fileName: `设备_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+          })
+        },
+
+        /** 导入按钮操作 */
+        handleImport() {
+          this.upload.title = "人员导入";
+          this.upload.open = true;
+        },
+
+
+        //打开杆塔页面
+        openGt(row){
+          this.sidebandId = row.sidebandId;
+          this.title = "杆塔"
+          this.showGt = true;
+          this.getListTemp();
+        },
+        //打开设备页面
+        openDevice(row){
+          this.sidebandId = row.sidebandId;
+          this.title = "选择"
+          this.showDevice = true;
+          this.getListDevice();
+        },
+        
+        //关闭证书上传
+        cancelGt(){
+          this.highImgList = []
+          this.electricianImgList = []
+          this.elseImgList = []
+          this.showGt = false;
+        },
+        //提交证书上传
+        submitCertificate(){
+          console.log(this.highImgList)
+          console.log(this.electricianImgList)
+          console.log(this.elseImgList)
+          // this.highImgList = []
+          // this.electricianImgList = []
+          // this.elseImgList = []
+
+          this.showGt = false;
+        },
+  
+    }
+  };
+  </script>
+
+  <style lang="scss" scoped>
+  ::v-deep.el-table .fixed-width .el-button--mini {
+      width: 60px !important;
+      margin-bottom: 10px;
+  }
+  //隐藏图片上传框的css
+  ::v-deep.disabled {
+      .el-upload--picture-card {
+          display: none;
+      }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/views/base/project/index.vue b/src/views/base/project/index.vue
index 282a7a6..3b99743 100644
--- a/src/views/base/project/index.vue
+++ b/src/views/base/project/index.vue
@@ -78,7 +78,7 @@
       <el-table-column label="APP轮播图" align="center" prop="appnum">            
         <template slot-scope="scope">
             <div @click="picturesPreview(scope.row.appnum)" style="color: #02a7f0; cursor: pointer">
-                <!-- {{ scope.row.appnum.length }} -->1
+                {{ scope.row.appnum }}
             </div>
         </template>
       </el-table-column>
diff --git a/src/views/construction/sideband/index.vue b/src/views/construction/sideband/index.vue
new file mode 100644
index 0000000..174f059
--- /dev/null
+++ b/src/views/construction/sideband/index.vue
@@ -0,0 +1,689 @@
+<template>
+    <div class="app-container">
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item  prop="sidebandName">
+          <el-input
+            v-model="queryParams.sidebandName"
+            placeholder="边带名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item  prop="sidebandCode">
+          <el-input
+            v-model="queryParams.sidebandCode"
+            placeholder="边带编号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item  prop="projectName">
+          <el-input
+            v-model="queryParams.projectName"
+            placeholder="工程名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item  prop="gtCode">
+          <el-input
+            v-model="queryParams.gtCode"
+            placeholder="杆塔编号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item prop="bindTime">
+        <el-date-picker
+          v-model="queryParams.bindTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          placeholder="绑定时间"
+          type="date"
+        ></el-date-picker>
+      </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+  
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+            v-hasPermi="['basic:sideband:add']"
+          >新增边带</el-button>
+        </el-col>
+        
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+  
+      <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="边带id" align="center" prop="sidebandId" v-if="false" />
+        <el-table-column label="边带名称" align="center" prop="sidebandName" />
+        <el-table-column label="边带编码" align="center" prop="sidebandCode" />
+        <el-table-column label="所属工程" align="center" prop="projectName" />
+        <el-table-column label="杆塔编号" align="center" prop="gtCode" />
+        <el-table-column label="绑定时间" align="center" prop="bindTime" />
+        <el-table-column label="绑定设备" align="center" prop="bindNum">
+          <template slot-scope="scope">
+            <div @click="openGt(scope.row)" style="color: #02a7f0; cursor: pointer">
+                {{ scope.row.bindNum}}
+            </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remarks" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+              v-hasPermi="['basic:person:edit']"
+            >编辑</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['basic:person:del']"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+  
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+      
+      <!-- 杆塔弹窗 -->
+      <el-dialog :title="title" :visible.sync="showGt" width="1000px" height="1000px" append-to-body>
+          <el-form :model="queryKeyword" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item  prop="keyword">
+          <el-input
+            v-model="queryKeyword.keyword"
+            placeholder="请输入关键词"
+            clearable
+            @keyup.enter.native="handleQueryTemp"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryTemp">查询</el-button>
+        </el-form-item>
+        </el-form>
+
+        <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAddDevice"
+            v-hasPermi="['basic:sideband:add']"
+          >绑定设备</el-button>
+        </el-col>
+        
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getListTemp"></right-toolbar>
+      </el-row>
+
+      <el-table v-loading="loadingTwo" :data="bindList" width="600px" height = "600px" >
+        <el-table-column label="设备id" align="center" prop="deviceId" v-if="false" />
+        <el-table-column label="设备类型" align="center" prop="deviceType" />
+        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="设备编号" align="center" prop="deviceCode" />
+        <el-table-column label="设备状态" align="center" prop="deviceStatus" >
+        <template slot-scope="scope">
+                <div v-if="scope.row.deviceStatus==0" style="color: green;">{{ stateList[Number(scope.row.deviceStatus)] }}</div>
+                <div v-if="scope.row.deviceStatus==1" style="color: red;">{{ stateList[Number(scope.row.deviceStatus)] }}</div>
+            </template>
+          </el-table-column>
+        <el-table-column label="领用人" align="center" prop="lyName" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleDelDevice(scope.row)"
+              v-hasPermi="['basic:sideband:edit']"
+            >解除绑定</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+  
+      <pagination
+        v-show="totalTwo>0"
+        :total="totalTwo"
+        :page.sync="queryKeyword.pageNum"
+        :limit.sync="queryKeyword.pageSize"
+        @pagination="getListTemp"
+      />
+
+      </el-dialog>
+
+      <!-- 选择设备弹窗 -->
+      <el-dialog :title="title" :visible.sync="showDevice" width="800px" height="800px" append-to-body>
+          <el-form :model="queryKeywordTemp" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item  prop="keyword">
+          <el-input
+            v-model="queryKeywordTemp.keyword"
+            placeholder="请输入关键词"
+            clearable
+            @keyup.enter.native="handleQueryDevice"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryDevice">查询</el-button>
+          <el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleBindDevice"
+            v-hasPermi="['basic:sideband:add']"
+          >绑定</el-button>
+        </el-form-item>
+        </el-form>
+<!-- 
+        <el-row :gutter="10" class="mb8">
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getListDevice"></right-toolbar>
+      </el-row> -->
+
+      <el-table v-loading="loadingThree" :data="bindNoList" width="600px" height = "600px" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="设备id" align="center" prop="deviceId" v-if="false" />
+        <el-table-column label="设备类型" align="center" prop="deviceType" />
+        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="设备编号" align="center" prop="deviceCode" />
+      </el-table>
+  
+      <pagination
+        v-show="totalThree>0"
+        :total="totalThree"
+        :page.sync="queryKeywordTemp.pageNum"
+        :limit.sync="queryKeywordTemp.pageSize"
+        @pagination="getListDevice"
+      />
+
+      </el-dialog>
+
+      <!-- 添加或修改边带对话框 -->
+      <el-dialog :title="title" :visible.sync="open" width="850px" append-to-body>
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+          <el-row :gutter="24">
+                <el-col :span="12">
+                    <el-form-item label="边带名称" prop="sidebandName">
+                        <el-input v-model="form.sidebandName" placeholder="请输入边带名称" />
+                    </el-form-item>
+                </el-col>
+
+                <el-col :span="12">
+                    <el-form-item label="边带编码" prop="sidebandCode">
+                        <el-input v-model="form.sidebandCode" placeholder="请选择边带编码" />
+                    </el-form-item>
+                </el-col>
+          </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
+                    <el-form-item label="所属工程" prop="projectName">
+                        <el-select v-model="form.projectName" placeholder="请选择所属工程" clearable style="width: 100%;">
+                            <el-option
+                            v-for="dict in proList"
+                            :key="dict.id"
+                            :label="dict.name"
+                            :value="dict.id"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-col :span="12">
+                    <el-form-item label="施工杆塔" prop="gtCode">
+                        <el-select v-model="form.gtCode" placeholder="请选择施工班组" clearable style="width: 100%;">
+                            <el-option
+                            v-for="dict in GtList"
+                            :key="dict.id+''"
+                            :label="dict.powerName"
+                            :value="dict.id+''"
+                            />
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+        </el-row>
+        <el-col :span="24">
+                    <el-form-item label="备注" prop="remarks">
+                        <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
+                    </el-form-item>
+                </el-col>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
+
+    </div>
+  </template>
+  
+  <script>
+  import { listSideband, addSideband, editSideband, getSidebandInfo, delSideband,listDevice,delDevice,listDeviceNoBind,bindDevice, exportPerson} from "@/api/construction/sideband";
+  import { getProList } from "@/api/select";
+  import { getGtList } from "@/api/select";
+  import { downloadFile } from '@/utils/download'
+  import { getToken } from '@/utils/auth'
+  import uploadFile from '../../components/uploadFile.vue'
+  export default {
+    name: "Post",
+    dicts: ['sys_normal_disable','sys_user_sex'],
+    components: {
+			uploadFile
+		},
+    data() {
+      return {
+        // 遮罩层
+        loading: true,
+        // 遮罩层2
+        loadingTwo:true,
+        // 遮罩层3
+        loadingThree:true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        //绑定设备总条数
+        totalTwo:0,
+        //未绑定设备总条数
+        totalThree:0,
+        // 人员表格数据
+        postList: [],
+        // 绑定设备表格数据
+        bindList: [],
+        // 绑定设备表格数据
+        bindNoList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        open: false,
+        //所属工程
+        proList: [],
+        //施工杆塔
+        GtList:[],
+        // 查询参数
+        queryParams: {
+          pageNum: 1,
+          pageSize: 10,
+          sidebandName: undefined,
+          sidebandCode: undefined,
+          projectName: undefined,
+          gtCode: undefined,
+          bindTime: undefined,
+        },
+        queryKeyword:{
+          pageNum: 1,
+          pageSize: 10,
+          sidebandId: undefined,
+          keyword: undefined,
+        },
+        queryKeywordTemp:{
+          pageNum: 1,
+          pageSize: 10,
+          sidebandId: undefined,
+          keyword: undefined,
+        },
+        showGt:false,
+
+        showDevice:false,
+
+        stateList:['在用','未用'],
+        accept:'.png, .jpg, .jpeg, .pdf, .doc, .docx',
+        highImgList: [],
+        electricianImgList: [],
+        elseImgList: [],
+        // 表单参数
+        form: {},
+        //图片上传
+        fileList: [],
+        //图片查看弹窗
+        dialogImageUrl: '',
+        dialogVisible: false,
+        // 用户导入参数
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 是否更新已经存在的用户数据
+          updateSupport: 0,
+          // 设置上传的请求头部
+          headers: { Authorization: "Bearer " + getToken() },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/bracelet/person/excelUpload"
+        },
+        // 表单校验
+        rules: {
+          sidebandName: [
+            { required: true, message: "边带名称不能为空", trigger: "blur" }
+          ],
+          sidebandCode: [
+            { required: true, message: "边带编码不能为空", trigger: "blur" }
+          ],
+          projectName: [
+            { required: true, message: "所属工程不能为空", trigger: "change" }
+          ],
+          gtCode: [
+            { required: false, trigger: "change" }
+          ],
+          remarks: [
+            { required: false, trigger: "change" }
+          ]
+        }
+      };
+    },
+    computed: {
+        //图片上传1张后，隐藏上传框
+        uploadDisabled() {
+            return this.fileList.length > 0
+        },
+    },
+    created() {
+      this.getProList();
+      this.getGtList();
+      this.getList();
+    },
+    methods: {
+       //获取所属工程
+        getProList(){
+            getProList().then(response => {
+               this.proList = response.data;
+            });
+        },
+
+       //获取施工杆塔
+        getGtList(){
+            getGtList().then(response => {
+               this.GtList = response.data;
+               console.log(this.GtList)
+            });
+        },
+
+        /** 查询边带列表 */
+        getList() {
+            this.loading = true;
+            listSideband(this.queryParams).then(response => {
+              this.postList = response.rows;
+              this.total = response.total;
+              this.loading = false;
+            });
+        },
+        /** 查询杆塔绑定设备列表 */
+        getListTemp() {
+            this.loadingTwo = true;
+            this.queryKeyword.sidebandId = this.sidebandId;
+            listDevice(this.queryKeyword).then(response => {
+              this.bindList = response.rows;
+              this.totalTwo = response.total;
+              this.loadingTwo = false;
+            });
+        },
+        //查询未绑定设备列表
+        getListDevice() {
+            this.loadingThree = true;
+            this.queryKeywordTemp.sidebandId = this.sidebandId;
+            listDeviceNoBind(this.queryKeywordTemp).then(response => {
+              this.bindNoList = response.rows;
+              this.totalThree = response.total;
+              this.loadingThree = false;
+            });
+        },
+        // 取消按钮
+        cancel() {
+            this.open = false;
+            this.fileList=[];
+            this.reset();
+        },
+        // 表单重置
+        reset() {
+            this.form = {};
+            this.resetForm("form");
+        },
+        /** 搜索按钮操作 */
+        handleQuery() {
+            this.queryParams.pageNum = 1;
+            this.getList();
+        },
+        /** 杆塔页面搜索按钮操作 */
+       handleQueryTemp() {
+            this.queryKeyword.pageNum = 1;
+            this.queryKeyword.sidebandId = this.sidebandId;
+            this.getListTemp();
+        },
+        /** 设备页面搜索按钮操作 */
+       handleQueryDevice() {
+            this.queryKeywordTemp.pageNum = 1;
+            this.queryKeywordTemp.sidebandId = this.sidebandId;
+            this.getListDevice();
+        },
+        /** 重置按钮操作 */
+        resetQuery() {
+            this.resetForm("queryForm");
+            this.handleQuery();
+        },
+        // 多选框选中数据
+        handleSelectionChange(selection) {
+            this.ids = selection.map(item => item.deviceId)
+            this.single = selection.length!=1
+            this.multiple = !selection.length
+        },
+        /** 新增按钮操作 */
+        handleAdd() {
+            this.fileList = []
+            this.reset();
+            this.open = true;
+            this.title = "添加边带";
+        },
+        //绑定设备
+        handleAddDevice() {
+            this.showDevice = true;
+            this.title = "选择";
+            this.getListDevice();
+        },
+
+        handleRemove(file, fileList) {
+            let sum = 0
+            console.log(111111)
+            console.log(this.fileList)
+            this.fileList.forEach((item, index) => {
+                if (item.uid == file.uid) {
+                    sum = index
+                }
+            })
+            
+            this.fileList.splice(sum, 1)
+        },
+        //上传组件-图片查看
+        picturePreview(file) {
+            console.log(file)
+            this.dialogImageUrl = file.url
+            this.dialogVisible = true
+        },
+
+
+        /** 修改按钮操作 */
+        handleUpdate(row) {
+            this.reset();
+            const sidebandId = row.sidebandId
+            this.fileList=[];
+            getSidebandInfo(sidebandId).then(response => {
+              this.form = response.data;
+              console.log(response.data.gtCode)
+              this.$set(this.form,'projectName',response.data.projectName+'')
+              this.$set(this.form,'gtCode',response.data.gtCode+'')
+              setTimeout(()=>{
+                this.open = true;
+                this.title = "修改边带";
+              },100)
+             
+            });
+        },
+         /** 解除绑定操作 */
+         handleDelDevice(row) {
+            console.log(row)
+            const param = {
+              sidebandId:row.sidebandId,
+              deviceId:row.deviceId,
+            }
+            this.$modal.confirm('确定当前设备与该边带设备解除绑定吗？').then(function() {
+              return delDevice(param);
+            }).then(() => {
+              this.getList();
+              this.getListTemp();
+              this.$modal.msgSuccess("解除绑定成功");
+            }).catch(() => {});
+        },
+
+        /** 绑定操作 */
+         handleBindDevice(row) {
+            console.log(row)
+            const deviceIds = row.devideId || this.ids;
+            console.log(deviceIds)
+            const param = {
+              sidebandId:this.queryKeywordTemp.sidebandId,
+              deviceIds:deviceIds,
+            }
+            console.log(param)
+            this.$modal.confirm('确定与该边带绑定吗？').then(function() {
+              return bindDevice(param);
+            }).then(() => {
+              this.getList();
+              this.getListTemp();
+              this.getListDevice();
+              this.$modal.msgSuccess("绑定成功");
+            }).catch(() => {});
+        },
+
+        /** 提交按钮 */
+        submitForm() { 
+            this.$refs["form"].validate(valid => {
+            if (valid) {
+                if (this.form.sidebandId != undefined) {
+                  console.log(this.form)
+                  editSideband(this.form).then(response => {
+                    this.$modal.msgSuccess("修改成功");
+                    this.open = false;
+                    // this.fileList=[];
+                    this.getList();
+                  });
+                } else {
+                  console.log(this.form)
+                  addSideband(this.form).then(response => {
+                    this.$modal.msgSuccess("新增成功");
+                    this.open = false;
+                    this.getList();
+                  });
+                }
+            }
+            });
+        },
+
+        /** 删除按钮操作 */
+        handleDelete(row) {
+            console.log(row)
+            const param = {
+              sidebandId:row.sidebandId,
+              bindNum:row.bindNum,
+            }
+            this.$modal.confirm('是否确认删除边带名称为"' + row.sidebandId + '"的数据项？').then(function() {
+              return delSideband(param);
+            }).then(() => {
+              this.getList();
+              this.$modal.msgSuccess("删除成功");
+            }).catch(() => {});
+        },
+        /** 导出按钮操作 */
+        handleExport() {
+          exportPerson(this.queryParams).then(res => {
+            downloadFile({ fileName: `人员_${new Date().getTime()}.xlsx`, fileData: res, fileType: 'application/vnd.ms-excel;charset=utf-8' })
+          })
+        },
+
+        /** 导入按钮操作 */
+        handleImport() {
+          this.upload.title = "人员导入";
+          this.upload.open = true;
+        },
+
+
+        //打开杆塔页面
+        openGt(row){
+          this.sidebandId = row.sidebandId;
+          this.title = "杆塔"
+          this.showGt = true;
+          this.getListTemp();
+        },
+        //打开设备页面
+        openDevice(row){
+          this.sidebandId = row.sidebandId;
+          this.title = "选择"
+          this.showDevice = true;
+          this.getListDevice();
+        },
+        
+        //关闭证书上传
+        cancelGt(){
+          this.highImgList = []
+          this.electricianImgList = []
+          this.elseImgList = []
+          this.showGt = false;
+        },
+        //提交证书上传
+        submitCertificate(){
+          console.log(this.highImgList)
+          console.log(this.electricianImgList)
+          console.log(this.elseImgList)
+          // this.highImgList = []
+          // this.electricianImgList = []
+          // this.elseImgList = []
+
+          this.showGt = false;
+        },
+  
+    }
+  };
+  </script>
+
+  <style lang="scss" scoped>
+  ::v-deep.el-table .fixed-width .el-button--mini {
+      width: 60px !important;
+      margin-bottom: 10px;
+  }
+  //隐藏图片上传框的css
+  ::v-deep.disabled {
+      .el-upload--picture-card {
+          display: none;
+      }
+  }
+  </style>
\ No newline at end of file
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 0b7e8a7..ca301b0 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -100,7 +100,7 @@
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" width="80" type="index">
-        <template scope="scope">
+        <template slot-scope="scope">
           <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
         </template>
       </el-table-column>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 035fdeb..4a653bc 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -68,7 +68,7 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="序号" align="center" width="80" type="index">
-            <template scope="scope">
+            <template slot-scope="scope">
               <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
             </template>
           </el-table-column>