diff --git a/vue/full/src/router/module/index.js b/vue/full/src/router/module/index.js
index 07f877f..1ce1b03 100644
--- a/vue/full/src/router/module/index.js
+++ b/vue/full/src/router/module/index.js
@@ -1,6 +1,4 @@
 import admin from './admin'
 import example from './example'
-import dev from './dev'
-import doc from './doc'
 
-export default [admin, example, dev, doc]
+export default [admin, example]
diff --git a/vue/full/src/view/_app/login/LoginForm.vue b/vue/full/src/view/_app/login/LoginForm.vue
index b4e5cf7..c65a841 100644
--- a/vue/full/src/view/_app/login/LoginForm.vue
+++ b/vue/full/src/view/_app/login/LoginForm.vue
@@ -42,14 +42,6 @@
             {{ loading ? '登 录 中...' : '登 录' }}
         </el-button>
 
-        <div class="flex" style="margin-top: 20px">
-            <p class="other-ways">
-                其他方式登录
-                <v-icon v-for="i in otherWays" :key="i" :icon="`svg-${i}`" @click="() => thirdPartyLogin(i)"/>
-            </p>
-
-            <el-button type="text" @click="register">注册账户</el-button>
-        </div>
     </el-form>
 </template>
 
@@ -110,10 +102,6 @@ export default {
             window.setTimeout(() => this.$router.replace(redirect), 200)
         },
 
-        thirdPartyLogin(channel) {
-            this.$message.info('假装可以第三方登录')
-        },
-
         capsLockTip({keyCode}) {
             if (keyCode === 20) this.capsTooltip = !this.capsTooltip
         },
diff --git a/vue/full/src/view/admin/index/component/PanelGroup/index.vue b/vue/full/src/view/admin/index/component/PanelGroup/index.vue
index fd77739..1310a34 100644
--- a/vue/full/src/view/admin/index/component/PanelGroup/index.vue
+++ b/vue/full/src/view/admin/index/component/PanelGroup/index.vue
@@ -36,7 +36,7 @@ export default {
                     icon: 'svg-shopping',
                     color: cssVar.primary,
                     value: 0,
-                    text: '今日采购额'
+                    text: '昨日使用量'
                 },
                 {
                     id: 'sell',
@@ -44,14 +44,14 @@ export default {
                     icon: 'svg-sell',
                     color: cssVar.warning,
                     value: 0,
-                    text: '今日销售额'
+                    text: '今日使用额'
                 },
                 {
                     id: 'profit',
                     icon: 'svg-money',
                     color: cssVar.success,
                     value: 0,
-                    text: '今日毛利润'
+                    text: '预计明天使用量'
                 },
             ]
         }
diff --git a/vue/full/src/view/admin/system/equipment/indexPage.vue b/vue/full/src/view/admin/system/equipment/indexPage.vue
new file mode 100644
index 0000000..fdc9167
--- /dev/null
+++ b/vue/full/src/view/admin/system/equipment/indexPage.vue
@@ -0,0 +1,205 @@
+<template>
+  <list-page :data="listPageConfig">
+    <template v-slot:searchForm>
+      <el-form-item label="设备名">
+        <el-input v-model="searchForm.name" clearable maxlength="50"/>
+      </el-form-item>
+      <el-form-item label="型 号">
+        <el-input v-model="searchForm.spec" clearable maxlength="202"/>
+      </el-form-item>
+      <el-form-item label="厂 商">
+        <el-input v-model="searchForm.supplier" clearable maxlength="20"/>
+      </el-form-item>
+      <el-form-item label="存放位置">
+        <el-input v-model="searchForm.location" clearable maxlength="50"/>
+      </el-form-item>
+      <el-form-item label="制造日期">
+        <el-date-picker
+            v-model="searchForm.manuDate"
+            type="date"
+            value-format="timestamp"
+            clearable
+        />
+      </el-form-item>
+      <el-form-item label="购买日期">
+        <el-date-picker
+            v-model="searchForm.buyDate"
+            type="date"
+            value-format="timestamp"
+            clearable
+        />
+      </el-form-item>
+      <el-form-item label="状 态">
+        <el-select v-model="searchForm.enable" clearable @clear="searchForm.enable = null">
+          <el-option :value="true" label="启用"/>
+          <el-option :value="false" label="禁用"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间">
+        <el-date-picker
+            v-model="temp.createTime"
+            format="yyyy-MM-dd"
+            range-separator="-"
+            type="daterange"
+            value-format="timestamp"
+        />
+      </el-form-item>
+    </template>
+
+    <template v-slot:tableColumn>
+      <el-table-column align="center" label="#" type="index" width="80"/>
+      <el-table-column align="center" label="设 备" prop="name" show-overflow-tooltip/>
+      <el-table-column align="center" label="型 号" prop="spec" show-overflow-tooltip/>
+      <el-table-column align="center" label="功能简述" prop="introduction" show-overflow-tooltip/>
+      <el-table-column align="center" label="厂商" prop="supplier" show-overflow-tooltip/>
+      <el-table-column align="center" label="制造日期" width="150">
+        <template v-slot="{row}">{{ row.manuDate | timestamp2Date }}</template>
+      </el-table-column>
+      <el-table-column align="center" label="购买日期" width="150">
+        <template v-slot="{row}">{{ row.buyDate | timestamp2Date }}</template>
+      </el-table-column>
+      <el-table-column align="center" label="存放位置" prop="location" show-overflow-tooltip/>
+      <el-table-column align="center" label="创建人" prop="spec" show-overflow-tooltip/>
+      <el-table-column align="center" label="创建时间" width="150">
+        <template v-slot="{row}">{{ row.createTime | timestamp2Date }}</template>
+      </el-table-column>
+      <el-table-column align="center" label="状 态" width="120">
+        <template v-slot="{row}">
+          <span :class="row.enable ? 'success' : 'error'" class="dot"/>
+          <span>{{ row.enable ? '启用' : '禁用' }}</span>
+        </template>
+      </el-table-column>
+    </template>
+    <edit-dialog v-model="editDialog" :data="row" :type="type" @success="success"/>
+  </list-page>
+</template>
+
+<script>
+import tableMixin from '@/mixin/tablePageMixin'
+import ListPage from '@/view/_common/ListPage'
+import EditDialog from './EditDialog'
+import RegionSelector from "@/component/RegionSelector"
+import {add, update, del, search} from "@/api/system/equipment"
+import {isEmpty} from '@/util'
+import {wic} from "@/util/auth"
+import {elConfirm, elError, elSuccess} from "@/util/message"
+
+export default {
+  name: "equipmentManagement",
+
+  mixins: [tableMixin],
+
+  components: {ListPage, EditDialog, RegionSelector},
+
+  data() {
+    return {
+      searchForm: {
+        name: '',
+        spec: '',
+        introduction: '',
+        supplier: '',
+        manuDate: '',
+        buyDate:'',
+        location:'',
+        enable: null
+      },
+      temp: {
+        createTime: []
+      },
+      editDialog: false
+    }
+  },
+
+  computed: {
+    ...wic({add, update, del}),
+
+    listPageConfig() {
+      return {
+        pageLoading: this.config.operating,
+        buttons: [
+          this.canAdd && {icon: 'el-icon-plus', e: this.add, content: '添 加'},
+          {icon: 'el-icon-view', e: this.see, content: '查 看'},
+          this.canUpdate && {icon: 'el-icon-edit', e: this.edit, content: '编 辑'},
+          this.canDel && {icon: 'el-icon-delete', e: this.del, content: '删 除'}
+        ],
+        dataLoading: this.config.loading,
+        search: {
+          props: {model: this.searchForm},
+          on: {search: this.search}
+        },
+        table: {
+          props: {data: this.tableData},
+          on: {'row-click': this.rowClick}
+        },
+        pagination: {
+          props: {model: this.searchForm},
+          on: {'current-change': this.pageChange}
+        }
+      }
+    }
+  },
+
+  methods: {
+    mergeSearchForm() {
+      return {
+        ...this.searchForm,
+        startTime: this.temp.createTime ? this.temp.createTime[0] : null,
+        endTime: this.temp.createTime ? this.temp.createTime[1] + 86400000 : null
+      }
+    },
+
+    search() {
+      if (this.config.loading) return
+      this.config.loading = true
+      this.row = null
+      this.type = 'see'
+      search
+          .request(this.mergeSearchForm())
+          .then(({data: {list, total}}) => {
+            this.searchForm.total = total
+            this.tableData = list
+            console.log(list,total)
+          })
+
+          .finally(() => this.config.loading = false)
+    },
+
+    add() {
+      this.row = null
+      this.type = 'add'
+      this.editDialog = true
+    },
+
+    see() {
+      if (isEmpty(this.row)) return elError('请选择要查看的设备')
+      this.type = 'see'
+      this.editDialog = true
+    },
+
+    edit() {
+      if (isEmpty(this.row)) return elError('请选择要编辑的设备')
+      this.type = 'edit'
+      this.editDialog = true
+    },
+
+    del() {
+      if (isEmpty(this.row)) return elError('请选择要删除的设备')
+      if (this.row.enable) return elError('已启用的设备不能删除')
+      if (this.config.operating) return
+      elConfirm(`确定删除设备【${this.row.name}】？`)
+          .then(() => {
+            this.config.operating = true
+            return del.request({id: this.row.id, name: this.row.name})
+          })
+          .then(() => this.success('删除成功'))
+          .finally(() => this.config.operating = false)
+    },
+
+    success(msg) {
+      elSuccess(msg)
+      this.editDialog = false
+      this.search()
+    }
+  }
+}
+</script>
diff --git a/vue/full/src/view/admin/system/role/EditDialog.vue b/vue/full/src/view/admin/user/role/EditDialog.vue
similarity index 100%
rename from vue/full/src/view/admin/system/role/EditDialog.vue
rename to vue/full/src/view/admin/user/role/EditDialog.vue
diff --git a/vue/full/src/view/admin/system/role/indexPage.vue b/vue/full/src/view/admin/user/role/indexPage.vue
similarity index 100%
rename from vue/full/src/view/admin/system/role/indexPage.vue
rename to vue/full/src/view/admin/user/role/indexPage.vue
diff --git a/vue/full/src/view/admin/system/user/indexPage.vue b/vue/full/src/view/admin/user/userInfo/indexPage.vue
similarity index 100%
rename from vue/full/src/view/admin/system/user/indexPage.vue
rename to vue/full/src/view/admin/user/userInfo/indexPage.vue
diff --git a/vue/full/src/view/dev/index.vue b/vue/full/src/view/dev/index.vue
deleted file mode 100644
index 4e81a68..0000000
--- a/vue/full/src/view/dev/index.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<template>
-    <div>haha</div>
-</template>
-
-<script>
-export default {
-    name: "dev"
-}
-</script>