添加新的模块 设备和用户

resources/js/icons/svg/devicestutus.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1588736146111" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6102" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M773.906442 33.343399h-523.812884c-119.66415 0-216.750159 97.086009-216.750159 216.750159v523.812884c0 119.7364 97.086009 216.750159 216.750159 216.750159h523.812884c119.7364 0 216.750159-97.013759 216.750159-216.750159v-523.812884c0-119.66415-97.013759-216.750159-216.750159-216.750159z m24.203768 344.950653l-308.688352 308.688351c-11.148183 11.148183-29.564722 11.148183-41.204205 0l-222.678275-150.428223c-11.148183-11.148183-11.148183-29.564722 0-41.207817 11.148183-11.148183 29.633359-11.148183 41.204205 0l202.357948 130.039258 288.295774-288.368024c11.148183-11.148183 29.564722-11.148183 41.204205 0 11.148183 11.148183 11.148183 29.636972-0.4913 41.276455z" p-id="6103"></path></svg>
\ No newline at end of file

resources/js/icons/svg/feizhilou.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1588661664805" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1151" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M724.9 952.2h-423c-22.1 0-40.4-17.1-41.9-39.2l-36.3-539.6c-1.6-24.3 17.6-44.8 41.9-44.8h495.6c24.3 0 43.5 20.6 41.9 44.8L766.8 913c-1.5 22.1-19.8 39.2-41.9 39.2zM844.5 249.9h-657c-0.6 0-1-0.4-1-1V134c0-0.6 0.4-1 1-1h657c0.6 0 1 0.4 1 1v114.8c0 0.6-0.4 1.1-1 1.1z" p-id="1152"></path><path d="M690.9 189.5H339.8c-0.6 0-1-0.4-1-1V57.9c0-0.6 0.4-1 1-1h351.1c0.6 0 1 0.4 1 1v130.6c0 0.5-0.4 1-1 1z" p-id="1153"></path></svg>
\ No newline at end of file

resources/js/icons/svg/userstutus.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1588663812608" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4334" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M210.84463 162.334118a337.016471 337.016471 0 0 1 240.941177-102.098824 342.136471 342.136471 0 0 1 301.17647 184.922353l-101.195294-24.395294a30.208 30.208 0 1 0-14.155294 58.729412l147.576471 35.538823a60.235294 60.235294 0 0 0 13.854117 1.807059 60.235294 60.235294 0 0 0 57.524706-45.778823l35.538824-147.576471a30.208 30.208 0 0 0-58.729412-14.155294l-25.6 110.531765A402.070588 402.070588 0 0 0 451.785807 0a396.950588 396.950588 0 0 0-284.009412 120.470588A30.117647 30.117647 0 1 0 210.84463 162.334118z" fill="" p-id="4335"></path><path d="M882.46816 636.385882a150.588235 150.588235 0 1 0-199.077647 0 240.941176 240.941176 0 0 0-34.635294 19.275294 399.962353 399.962353 0 0 0-122.277647-65.054117 195.764706 195.764706 0 1 0-240.941177 0A421.647059 421.647059 0 0 0 0.021101 993.882353a30.117647 30.117647 0 0 0 60.235294 0 354.484706 354.484706 0 0 1 346.352941-361.411765 354.484706 354.484706 0 0 1 346.352941 361.411765 30.117647 30.117647 0 0 0 60.235295 0 428.272941 428.272941 0 0 0-117.157647-295.755294A180.705882 180.705882 0 0 1 963.785807 855.341176a30.117647 30.117647 0 0 0 60.235294 0 240.941176 240.941176 0 0 0-141.552941-218.955294zM271.079925 436.404706a135.529412 135.529412 0 1 1 135.529411 135.830588A135.529412 135.529412 0 0 1 271.079925 436.404706z m421.647058 87.642353a90.352941 90.352941 0 1 1 90.352942 90.352941 90.352941 90.352941 0 0 1-90.352942-90.352941z" fill="" p-id="4336"></path></svg>
\ No newline at end of file

resources/js/views/device/devicedtutus.vue

+<template>
+  <div class="app-container">
+    <el-tabs :tab-position="tabPosition" style="height:100%;">
+      <el-tab-pane label="废纸篓">
+        <el-table :data="paperData" style="width: 100%">
+          <el-table-column prop="username" label="设备编号" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.devicenum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="nickname" label="设备名称" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.username }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="email" label="设备备注" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.deviceremark }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="创建时间" width="170">
+            <template slot-scope="scope">
+              <span>{{ scope.row.deviceaddtime | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="state" label="状态">
+            <template slot-scope="scope">
+              <el-switch :v-model="scope.row.delete == 2" active-color="#13ce66" inactive-color="#ff4949" @change="UpPaperBasket(scope.row.id)"></el-switch>
+              <span>废纸篓用户</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { deviceBasketList, UpPaperBasket } from '@/api/device';
+export default {
+  data() {
+    return {
+      tabPosition: 'top',
+      paperData: [], // 废纸篓
+      value1: false,
+      value2: false,
+    };
+  },
+  created() {
+    this.deviceBasketList();
+  },
+  methods: {
+    deviceBasketList() {
+      deviceBasketList()
+        .then(response => {
+          this.paperData = response.data;
+        })
+        .catch(err => {
+          console.log(err);
+        });
+    },
+    UpPaperBasket(id) {
+      this.$confirm('是否将设备恢复', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        UpPaperBasket(id)
+          .then(response => {
+            this.deviceBasketList();
+          })
+          .catch(err => {
+            console.log(err);
+          });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消',
+        });
+      });
+    },
+  },
+};
+</script>
+
+<style>
+</style>

resources/js/views/user/userStatus.vue

+<template>
+  <div class="app-container">
+    <el-tabs :tab-position="tabPosition" style="height:100%;">
+      <el-tab-pane label="用户状态">
+        <el-table :data="tableData" style="width: 100%">
+          <el-table-column prop="username" label="账号名称" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.username }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="nickname" label="用户名称" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.nickname }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="email" label="用户邮箱" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.email }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="创建时间" width="170">
+            <template slot-scope="scope">
+              <span>{{ scope.row.add_time | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="state" label="状态">
+            <template slot-scope="scope">
+              <el-switch :v-model="scope.row.state == 3" active-color="#13ce66" inactive-color="#ff4949" @change="UpPaperBasket(scope.row.id)"></el-switch>
+              <span>禁用用户</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane label="废纸篓">
+        <el-table :data="paperData" style="width: 100%">
+          <el-table-column prop="username" label="账号名称" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.username }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="nickname" label="用户名称" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.nickname }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="email" label="用户邮箱" width="180">
+            <template slot-scope="scope">
+              <span>{{ scope.row.email }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="创建时间" width="170">
+            <template slot-scope="scope">
+              <span>{{ scope.row.add_time | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="state" label="状态">
+            <template slot-scope="scope">
+              <el-switch :v-model="scope.row.state == 1" active-color="#13ce66" inactive-color="#ff4949" @change="UpPaperBasket(scope.row.id)"></el-switch>
+              <span>废纸篓用户</span>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { paperBasketList, UpPaperBasket } from '@/api/users';
+export default {
+  data() {
+    return {
+      tabPosition: 'top',
+      tableData: [], // 用户状态
+      paperData: [], // 废纸篓
+      value1: false,
+      value2: false,
+    };
+  },
+  created() {
+    this.paperBasketList();
+  },
+  methods: {
+    paperBasketList() {
+      paperBasketList()
+        .then(response => {
+          this.tableData = response.data.stutus;
+          this.paperData = response.data.paper;
+        })
+        .catch(err => {
+          console.log(err);
+        });
+    },
+    UpPaperBasket(id) {
+      this.$confirm('是否将用户恢复', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        UpPaperBasket(id)
+          .then(response => {
+            this.paperBasketList();
+          })
+          .catch(err => {
+            console.log(err);
+          });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消',
+        });
+      });
+    },
+  },
+};
+</script>
+
+<style>
+</style>