游泳馆监控接口对接

.env.production

@@ -6,11 +6,11 @@ NODE_ENV = 'production'
 
 
 # 大唐
-VUE_APP_BASE_API = '/commen_api/'
-VUE_APP_IMG_URL = '/commen_api/'
-VUE_APP_API_QZURL = '/commen_api/'
+VUE_APP_BASE_API = '/multimodal/'
+VUE_APP_IMG_URL = '/multimodal/'
+VUE_APP_API_QZURL = '/multimodal/'
 
 # 访问路径
-VUE_APP_PUBLIC_PATH = '/commen/'
+VUE_APP_PUBLIC_PATH = '/multimodal_yf/natatorium/'
 
 

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,116 +1,41 @@
 import request from "@/utils/request";
-// ------ 教务处学校管理 ------
-
-// 学校列表
-export function schoolList(data) {
+// 获取设备信息
+export function attributes(data) {
   return request({
-    url: "/school/list",
-    method: "post",
-    data: 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,
+    url: "/app/device/attributes",
+    method: "get",
+    params: data,
   });
 }
-
-// ------ 教务处评审管理 ------
-// 评审列表
-export function commentList(data) {
+// 根据项目key查找项目id
+export function queryProjectInfoByKey(data) {
   return request({
-    url: "/come/list",
-    method: "post",
-    data: data,
-  });
-}
-// 评审详情
-export function reviewDetails(data) {
-  return request({
-    url: "/come/detail",
-    method: "post",
-    data: data,
+    url: "/app/device/queryProjectInfoByKey",
+    method: "get",
+    params: data,
   });
 }
-// ------ 专家评审 ------
-// 学校列表
-
-export function expertschoolist(data) {
+// 根据项目id查找设备列表
+export function deviceList(data) {
   return request({
-    url: "/expert/school/list",
-    method: "post",
-    data: data,
+    url: "/app/device/list",
+    method: "get",
+    params: data,
   });
 }
-// 评审详情
-export function expertReviewDetails(data) {
+// 下发属性
+export function sendAttribute(data) {
   return request({
-    url: "/expert/comment/list",
+    url: "/app/device/sendAttribute",
     method: "post",
     data: data,
   });
 }
-// 评审
-export function expertReviewAdd(data) {
+// 下发命令
+export function sendCommand(data) {
   return request({
-    url: "/expert/comment/add",
+    url: "/app/device/sendCommand",
     method: "post",
     data: data,
   });
-}
-// ------ 分片相关接口 ------
-
-// 校验文件是否已上传
-export function register(data) {
-  return request({
-    url: "/mediaUpload/register",
-    method: "post",
-    data: 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) {
-  return request({
-    url: "/mediaUpload/mergechunks",
-    method: "post",
-    data: data,
-  });
-}
-// 合并后上传文件
-export function addFile(data) {
-  return request({
-    url: "/netdisk/file/add",
-    method: "post",
-    data: data,
-  });
-}
+}

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)
-          commit('SET_TOKEN', res.token)
+          console.log('res.data',res.data);
+          
+          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是否是一个非空数组
-            commit('SET_ROLES', res.roles)
-            commit('SET_PERMISSIONS', res.permissions)
+          if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
+            commit('SET_ROLES', res.data.roles)
+            commit('SET_PERMISSIONS', res.data.permissions)
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }

src/views/index.vue

@@ -6,20 +6,20 @@
         <div class="div-li">
           <div>
             <span>温度：</span>
-            22.2℃
+            {{ deviceInfo.temperature || '-'}}℃
           </div>
           <div> <span>湿度：</span>
-            50%</div>
+            {{ deviceInfo.humidity || '-'}}%</div>
         </div>
         <!--   ON：开启 OFF：关闭 -->
         <div class="div-li">
           <div>
             <span>TVOC：</span>
-            236
+            {{ deviceInfo.tvoc || '-'}}
           </div>
           <div>
             <span>TDS：</span>
-            200
+            {{ deviceInfo.tds || '-'}}
           </div>
         </div>
       </div>
@@ -29,18 +29,97 @@
 </template>
 
 <script>
+import { queryProjectInfoByKey, deviceList, attributes, sendAttribute, sendCommand } from "@/api/school";
 export default {
   name: "Index",
   data() {
     return {
+      deviceId: "", // 设备id 
+      deviceInfo: {
+        temperature: 0, // 温度
+        threshold: 0, // 阈值
+      },
+      open: false,
       value2: false,
+      loading: false,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        threshold: [
+          { required: true, message: "阈值不能为空", trigger: "blur" }
+        ],
+      },
       // 版本号
       version: "3.8.9",
     };
   },
+  created() {
+    this.getqueryProjectInfoByKey() // 根据项目key查找项目id
+  },
   methods: {
-    goTarget(href) {
-      window.open(href, "_blank");
+    // 阈值设定弹窗
+    handleSettings() {
+      this.open = true;
+      this.form = {
+        threshold: this.deviceInfo.threshold,
+      };
+      // this.$message.success('');
+    },
+
+    // 根据项目key查找项目id
+    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 === "N1");
+        this.deviceId = w2Device.id;
+        this.getAttributes(this.deviceId); // 根据设备id查找设备信息
+      })
+    },
+
+    // 根据设备id查找设备信息
+    getAttributes(_id) {
+      attributes({
+        deviceId: _id,
+      }).then(({ data: { deviceAttributesList: records } }) => {
+        this.loading = false;
+        
+        const findAttr = (id, defaultValue = '0') => 
+          records.find(row => row.id === id)?.attributeValue ;
+        this.deviceInfo = {
+          temperature: findAttr(447173913707267), // 温度
+          humidity: findAttr(447173913707268),    // 湿度
+          tvoc: findAttr(447173913707266),       // TVOC
+          tds: findAttr(447173913707269),        // TDS
+        };
+      });
+    },
+    /** 下发属性 */
+    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;
+            
+          });
+        }
+      });
     },
   },
 };
@@ -48,6 +127,7 @@ export default {
 
 <style scoped lang="scss">
 .div-box {
+  transform: scale(1.4);
   width: 500px;
   box-sizing: border-box;
   padding: 16px;

src/views/login.vue

@@ -139,7 +139,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;
         }
       });

vue.config.js

@@ -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]: "",