智能门锁配置文件修改

.env.development

@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 智能化衣柜
+VUE_APP_TITLE = 智能门锁
 
 # 开发环境配置
 ENV = 'development'
 
-# 智能化衣柜/开发环境
+# 智能门锁/开发环境
 VUE_APP_BASE_API = '/dev-api'
 VUE_APP_IMG_URL = 'https://test.tall.wiki/commen/'
 VUE_APP_API_QZURL = 'https://test.tall.wiki/commen/'

.env.production

@@ -1,16 +1,16 @@
 # 页面标题
-VUE_APP_TITLE = 智能化衣柜
+VUE_APP_TITLE = 智能门锁
 
 # 生产环境配置
 NODE_ENV = 'production'
 
 
 # 大唐
-VUE_APP_BASE_API = '/commen_api/'
+VUE_APP_BASE_API = '/multimodal/'
-VUE_APP_IMG_URL = '/commen_api/'
+VUE_APP_IMG_URL = '/multimodal/'
-VUE_APP_API_QZURL = '/commen_api/'
+VUE_APP_API_QZURL = '/multimodal/'
 
 # 访问路径
-VUE_APP_PUBLIC_PATH = '/commen/'
+VUE_APP_PUBLIC_PATH = '/multimodal_yf/dlock/'
 
 

.env.staging

@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 智能化衣柜
+VUE_APP_TITLE = 智能门锁
 
 # 生产环境配置
 NODE_ENV = 'production'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ruoyi",
   "version": "3.8.9",
-  "description": "智能化衣柜",
+  "description": "智能门锁",
   "author": "若依",
   "license": "MIT",
   "scripts": {

src/api/login.js

@@ -9,7 +9,7 @@ export function login(username, password, code, uuid) {
     uuid,
   };
   return request({
-    url: "/login",
+    url: "/app/user/login",
     headers: {
       isToken: false,
       repeatSubmit: false,

src/api/school.js

@@ -1,115 +1,49 @@
 import request from "@/utils/request";
-// ------ 教务处学校管理 ------
 
-// 学校列表
+// 根据项目key查找项目id
-export function schoolList(data) {
+export function queryProjectInfoByKey(data) {
   return request({
-    url: "/school/list",
+    url: "/app/device/queryProjectInfoByKey",
-    method: "post",
+    method: "get",
-    data: data,
+    params: data,
-  });
-}
-// 新增/修改学校
-export function schoolAdd(data) {
-  return request({
-    url: "/school/add",
-    method: "post",
-    data: data,
-  });
-}
-// 新增/修改学校
-export function schoolDel(data) {
-  return request({
-    url: "/school/del",
-    method: "post",
-    data: data,
-  });
-}
-
-// ------ 教务处评审管理 ------
-// 评审列表
-export function commentList(data) {
-  return request({
-    url: "/come/list",
-    method: "post",
-    data: data,
-  });
-}
-// 评审详情
-export function reviewDetails(data) {
-  return request({
-    url: "/come/detail",
-    method: "post",
-    data: data,
   });
 }
-// ------ 专家评审 ------
+// 根据项目id查找设备列表
-// 学校列表
+export function deviceList(data) {
-
-export function expertschoolist(data) {
-  return request({
-    url: "/expert/school/list",
-    method: "post",
-    data: data,
-  });
-}
-// 评审详情
-export function expertReviewDetails(data) {
   return request({
-    url: "/expert/comment/list",
+    url: "/app/device/list",
-    method: "post",
+    method: "get",
-    data: data,
+    params: data,
   });
 }
-// 评审
+// 设备日志
-export function expertReviewAdd(data) {
+export function attributesRecord(data) {
   return request({
-    url: "/expert/comment/add",
+    url: "/app/device/attributes/record",
-    method: "post",
+    method: "get",
-    data: data,
+    params: data,
   });
 }
-// ------ 分片相关接口 ------
+// 获取设备信息
-
+export function attributes(data) {
-// 校验文件是否已上传
-export function register(data) {
   return request({
-    url: "/mediaUpload/register",
+    url: "/app/device/attributes",
-    method: "post",
+    method: "get",
-    data: data,
+    params: data,
-  });
-}
-// 校验分片是否已上传
-export function checkchunk(data) {
-  return request({
-    url: "/mediaUpload/checkchunk",
-    method: "post",
-    data: data,
-  });
-}
-// 循环上传分片
-export function uploadchunk(data) {
-  return request({
-    url: "/mediaUpload/uploadchunk",
-    method: "post",
-    data: data,
-    headers: {
-      "Content-Type": "multipart/form-data",
-    },
   });
 }
-// 合并分片
+// 下发属性
-export function mergechunks(data) {
+export function sendAttribute(data) {
   return request({
-    url: "/mediaUpload/mergechunks",
+    url: "/app/device/sendAttribute",
     method: "post",
     data: data,
   });
 }
-// 合并后上传文件
+// 下发命令
-export function addFile(data) {
+export function sendCommand(data) {
   return request({
-    url: "/netdisk/file/add",
+    url: "/app/device/sendCommand",
     method: "post",
     data: data,
   });

src/store/modules/permission.js

@@ -34,8 +34,8 @@ const permission = {
       return new Promise(resolve => {
         // 向后端请求路由数据
         getRouters().then(res => {
-          const sdata = JSON.parse(JSON.stringify(res.data))
+          const sdata = JSON.parse(JSON.stringify([]))
-          const rdata = JSON.parse(JSON.stringify(res.data))
+          const rdata = JSON.parse(JSON.stringify([]))
           const sidebarRoutes = filterAsyncRouter(sdata)
           const rewriteRoutes = filterAsyncRouter(rdata, false, true)
           const asyncRoutes = filterDynamicRoutes(dynamicRoutes);

src/store/modules/user.js

@@ -43,8 +43,10 @@ const user = {
       const uuid = userInfo.uuid
       return new Promise((resolve, reject) => {
         login(username, password, code, uuid).then(res => {
-          setToken(res.token)
+          console.log('res.data',res.data);
-          commit('SET_TOKEN', res.token)
+          
+          setToken(res.data.token)
+          commit('SET_TOKEN', res.data.token)
           resolve()
         }).catch(error => {
           reject(error)
@@ -56,14 +58,15 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
-          const user = res.user
+          console.log('获取用户信息',res);
+          const user = res.data.user
           let avatar = user.avatar || ""
           if (!isHttp(avatar)) {
             avatar = (isEmpty(avatar)) ? defAva : process.env.VUE_APP_BASE_API + avatar
           }
-          if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+          if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
-            commit('SET_ROLES', res.roles)
+            commit('SET_ROLES', res.data.roles)
-            commit('SET_PERMISSIONS', res.permissions)
+            commit('SET_PERMISSIONS', res.data.permissions)
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }

src/views/index.vue

@@ -1,86 +1,183 @@
 <template>
-  <div style="padding: 16px">
+  <div class="app-container">
-    <!-- <img src="./welcome.5e305008.png" style="" /> -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleSendCommand"
+        >远程开锁</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getAttributes(deviceId)"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="tableList" max-height="600">
+      <el-table-column label="序号" align="center" prop="noticeId" width="100" >
+        <template slot-scope="scope">
+          {{ scope.$index + 1 + (queryParams.pageNum - 1) * queryParams.pageSize }}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="时间"
+        align="center"
+        prop="reportTime"
+        :show-overflow-tooltip="true"
+        min-width="100"
+      />
+      <el-table-column
+        label="类型"
+        align="center"
+        prop="tips"
+        :show-overflow-tooltip="true"
+        min-width="100"
+      />
+    
+    </el-table>
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getAttributes(deviceId)"
+    />
   </div>
 </template>
 
 <script>
+import { queryProjectInfoByKey, deviceList, attributes, sendAttribute, sendCommand,attributesRecord } from "@/api/school";
+
 export default {
-  name: "Index",
+  name: "Notice",
   data() {
     return {
-      // 版本号
+      deviceId: "", // 设备id
-      version: "3.8.9",
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 公告表格数据
+      tableList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        noticeTitle: [
+          { required: true, message: "公告标题不能为空", trigger: "blur" }
+        ],
+        noticeType: [
+          { required: true, message: "公告类型不能为空", trigger: "change" }
+        ]
+      }
     };
   },
-  methods: {
+  created() {
-    goTarget(href) {
+    this.getqueryProjectInfoByKey();
-      window.open(href, "_blank");
   },
+  methods: {
+    handleSendCommand(){
+      sendCommand({
+        "commandId": "447242774207233", // 命令ID, 
+        "commandParams": 1, // 命令参数,
+        "deviceId":  this.deviceId
+      }).then(res => {
+        this.$message.success('操作成功');
+        this.getAttributes(this.deviceId) // 根据项目id查找设备列表
+      });
     },
+    // 阈值设定弹窗
+    handleSettings() {
+      this.open = true;
+      this.form = {
+        threshold: this.deviceInfo.threshold,
       };
-</script>
+      // this.$message.success('');
-
+    },
-<style scoped lang="scss">
-.home {
-  blockquote {
-    padding: 10px 20px;
-    margin: 0 0 20px;
-    font-size: 17.5px;
-    border-left: 5px solid #eee;
-  }
-  hr {
-    margin-top: 20px;
-    margin-bottom: 20px;
-    border: 0;
-    border-top: 1px solid #eee;
-  }
-  .col-item {
-    margin-bottom: 20px;
-  }
-
-  ul {
-    padding: 0;
-    margin: 0;
-  }
-
-  font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  color: #676a6c;
-  overflow-x: hidden;
-
-  ul {
-    list-style-type: none;
-  }
-
-  h4 {
-    margin-top: 0px;
-  }
-
-  h2 {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 100;
-  }
 
-  p {
+    // 根据项目key查找项目id
-    margin-top: 10px;
+    getqueryProjectInfoByKey() {
+      this.loading = true;
+      queryProjectInfoByKey({
+        projectKey: "qKStHKKt"
+      }).then(res => {
+        this.getDeviceList(res.data.id) // 根据项目id查找设备列表
+      });
+    },
+    // 根据项目id查找设备列表
+    getDeviceList(_id) {
+      deviceList({
+        projectId: _id
+      }).then(res => {
+        const w2Device = res.rows.find(device => device.deviceName === "D1");
+        this.deviceId = w2Device.id;
+        this.getAttributes(this.deviceId); // 根据设备id查找设备信息
+      })
+    },
 
-    b {
+    // 根据设备id查找设备信息
-      font-weight: 700;
+    getAttributes(_id) {
+      attributesRecord({
+        pageNum: this.queryParams.pageNum,
+        pageSize: this.queryParams.pageSize,
+        deviceId: _id,
+      }).then(res => {
+        this.loading = false;
+        let isOpenValue = {
+          0 : "开锁失败",
+          1 : "开锁成功",
         }
+        let typeValue = {
+          'A1': '指纹',
+          'A2': '刷卡',
+          'A3': '密码',
         }
+        res.rows.forEach(item => {
+          item.attributeValue = JSON.parse(item.attributeValue)
+          console.log('item.attributeValue',item.attributeValue);
+          item.tips = `${typeValue[item.attributeValue.type]}${isOpenValue[item.attributeValue.isOpen]}` 
+        })
+        this.tableList = res.rows;
+        this.total = res.total;
+      });
+    },
+    /** 下发属性 */
+    submitForm: function () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let param = {"Wen":`#${this.form.threshold}`} // 阈值
+          sendAttribute({
+            "attributeParams": JSON.stringify(param), // 阈值JSON字符串
+            "deviceId": this.deviceId // 设备id
+          }).then(response => {
+            this.getAttributes(this.deviceId); // 根据设备id查找设备信息
+            this.$modal.msgSuccess("操作成功");
+            this.open = false;
             
-  .update-log {
+          });
-    ol {
-      display: block;
-      list-style-type: decimal;
-      margin-block-start: 1em;
-      margin-block-end: 1em;
-      margin-inline-start: 0;
-      margin-inline-end: 0;
-      padding-inline-start: 40px;
-    }
         }
+      });
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$message.success('操作成功');
+    },
   }
-</style>
+};
+</script>

src/views/login.vue

@@ -8,7 +8,7 @@
     >
       <h3 class="title" style="margin-bottom: 0">
       </h3>
-      <h3 class="title">智能化衣柜</h3>
+      <h3 class="title">智能门锁</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"
@@ -81,7 +81,6 @@
     </el-form>
     <!--  底部  -->
     <div class="el-login-footer">
-      <div>山西经济管理干部学院教务部</div>
       <div>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</div>
     </div>
   </div>
@@ -139,7 +138,7 @@ export default {
         this.captchaEnabled =
           res.captchaEnabled === undefined ? true : res.captchaEnabled;
         if (this.captchaEnabled) {
-          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.codeUrl = "data:image/gif;base64," + res.data.img;
           this.loginForm.uuid = res.uuid;
         }
       });

src/views/register.vue

@@ -6,7 +6,7 @@
       :rules="registerRules"
       class="register-form"
     >
-      <h3 class="title">智能化衣柜</h3>
+      <h3 class="title">智能门锁</h3>
       <el-form-item prop="username">
         <el-input
           v-model="registerForm.username"

vue.config.js

@@ -8,7 +8,7 @@ function resolve(dir) {
 const CompressionPlugin = require("compression-webpack-plugin");
 
 const name =
-  process.env.VUE_APP_TITLE || "智能化衣柜"; // 网页标题
+  process.env.VUE_APP_TITLE || "智能门锁"; // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80; // 端口
 
@@ -40,7 +40,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `https://test.tall.wiki/commen/`,
+        target: `http://121.37.81.216/multimodal/`,
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",