diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/static/checkIcon/level-line.png b/static/checkIcon/level-line.png new file mode 100644 index 0000000..48978c7 --- /dev/null +++ b/static/checkIcon/level-line.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/static/checkIcon/level-line.png b/static/checkIcon/level-line.png new file mode 100644 index 0000000..48978c7 --- /dev/null +++ b/static/checkIcon/level-line.png Binary files differ diff --git a/static/checkIcon/level-offline.png b/static/checkIcon/level-offline.png new file mode 100644 index 0000000..7583344 --- /dev/null +++ b/static/checkIcon/level-offline.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/static/checkIcon/level-line.png b/static/checkIcon/level-line.png new file mode 100644 index 0000000..48978c7 --- /dev/null +++ b/static/checkIcon/level-line.png Binary files differ diff --git a/static/checkIcon/level-offline.png b/static/checkIcon/level-offline.png new file mode 100644 index 0000000..7583344 --- /dev/null +++ b/static/checkIcon/level-offline.png Binary files differ diff --git a/static/checkIcon/level-report.png b/static/checkIcon/level-report.png new file mode 100644 index 0000000..792ba26 --- /dev/null +++ b/static/checkIcon/level-report.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/static/checkIcon/level-line.png b/static/checkIcon/level-line.png new file mode 100644 index 0000000..48978c7 --- /dev/null +++ b/static/checkIcon/level-line.png Binary files differ diff --git a/static/checkIcon/level-offline.png b/static/checkIcon/level-offline.png new file mode 100644 index 0000000..7583344 --- /dev/null +++ b/static/checkIcon/level-offline.png Binary files differ diff --git a/static/checkIcon/level-report.png b/static/checkIcon/level-report.png new file mode 100644 index 0000000..792ba26 --- /dev/null +++ b/static/checkIcon/level-report.png Binary files differ diff --git a/static/checkIcon/line.png b/static/checkIcon/line.png new file mode 100644 index 0000000..23e4e91 --- /dev/null +++ b/static/checkIcon/line.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/static/checkIcon/level-line.png b/static/checkIcon/level-line.png new file mode 100644 index 0000000..48978c7 --- /dev/null +++ b/static/checkIcon/level-line.png Binary files differ diff --git a/static/checkIcon/level-offline.png b/static/checkIcon/level-offline.png new file mode 100644 index 0000000..7583344 --- /dev/null +++ b/static/checkIcon/level-offline.png Binary files differ diff --git a/static/checkIcon/level-report.png b/static/checkIcon/level-report.png new file mode 100644 index 0000000..792ba26 --- /dev/null +++ b/static/checkIcon/level-report.png Binary files differ diff --git a/static/checkIcon/line.png b/static/checkIcon/line.png new file mode 100644 index 0000000..23e4e91 --- /dev/null +++ b/static/checkIcon/line.png Binary files differ diff --git a/static/checkIcon/manhole-line.png b/static/checkIcon/manhole-line.png new file mode 100644 index 0000000..fa1d26a --- /dev/null +++ b/static/checkIcon/manhole-line.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/static/checkIcon/level-line.png b/static/checkIcon/level-line.png new file mode 100644 index 0000000..48978c7 --- /dev/null +++ b/static/checkIcon/level-line.png Binary files differ diff --git a/static/checkIcon/level-offline.png b/static/checkIcon/level-offline.png new file mode 100644 index 0000000..7583344 --- /dev/null +++ b/static/checkIcon/level-offline.png Binary files differ diff --git a/static/checkIcon/level-report.png b/static/checkIcon/level-report.png new file mode 100644 index 0000000..792ba26 --- /dev/null +++ b/static/checkIcon/level-report.png Binary files differ diff --git a/static/checkIcon/line.png b/static/checkIcon/line.png new file mode 100644 index 0000000..23e4e91 --- /dev/null +++ b/static/checkIcon/line.png Binary files differ diff --git a/static/checkIcon/manhole-line.png b/static/checkIcon/manhole-line.png new file mode 100644 index 0000000..fa1d26a --- /dev/null +++ b/static/checkIcon/manhole-line.png Binary files differ diff --git a/static/checkIcon/manhole-offline.png b/static/checkIcon/manhole-offline.png new file mode 100644 index 0000000..82bd9c3 --- /dev/null +++ b/static/checkIcon/manhole-offline.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/static/checkIcon/level-line.png b/static/checkIcon/level-line.png new file mode 100644 index 0000000..48978c7 --- /dev/null +++ b/static/checkIcon/level-line.png Binary files differ diff --git a/static/checkIcon/level-offline.png b/static/checkIcon/level-offline.png new file mode 100644 index 0000000..7583344 --- /dev/null +++ b/static/checkIcon/level-offline.png Binary files differ diff --git a/static/checkIcon/level-report.png b/static/checkIcon/level-report.png new file mode 100644 index 0000000..792ba26 --- /dev/null +++ b/static/checkIcon/level-report.png Binary files differ diff --git a/static/checkIcon/line.png b/static/checkIcon/line.png new file mode 100644 index 0000000..23e4e91 --- /dev/null +++ b/static/checkIcon/line.png Binary files differ diff --git a/static/checkIcon/manhole-line.png b/static/checkIcon/manhole-line.png new file mode 100644 index 0000000..fa1d26a --- /dev/null +++ b/static/checkIcon/manhole-line.png Binary files differ diff --git a/static/checkIcon/manhole-offline.png b/static/checkIcon/manhole-offline.png new file mode 100644 index 0000000..82bd9c3 --- /dev/null +++ b/static/checkIcon/manhole-offline.png Binary files differ diff --git a/static/checkIcon/manhole-report.png b/static/checkIcon/manhole-report.png new file mode 100644 index 0000000..9eb23fc --- /dev/null +++ b/static/checkIcon/manhole-report.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/static/checkIcon/level-line.png b/static/checkIcon/level-line.png new file mode 100644 index 0000000..48978c7 --- /dev/null +++ b/static/checkIcon/level-line.png Binary files differ diff --git a/static/checkIcon/level-offline.png b/static/checkIcon/level-offline.png new file mode 100644 index 0000000..7583344 --- /dev/null +++ b/static/checkIcon/level-offline.png Binary files differ diff --git a/static/checkIcon/level-report.png b/static/checkIcon/level-report.png new file mode 100644 index 0000000..792ba26 --- /dev/null +++ b/static/checkIcon/level-report.png Binary files differ diff --git a/static/checkIcon/line.png b/static/checkIcon/line.png new file mode 100644 index 0000000..23e4e91 --- /dev/null +++ b/static/checkIcon/line.png Binary files differ diff --git a/static/checkIcon/manhole-line.png b/static/checkIcon/manhole-line.png new file mode 100644 index 0000000..fa1d26a --- /dev/null +++ b/static/checkIcon/manhole-line.png Binary files differ diff --git a/static/checkIcon/manhole-offline.png b/static/checkIcon/manhole-offline.png new file mode 100644 index 0000000..82bd9c3 --- /dev/null +++ b/static/checkIcon/manhole-offline.png Binary files differ diff --git a/static/checkIcon/manhole-report.png b/static/checkIcon/manhole-report.png new file mode 100644 index 0000000..9eb23fc --- /dev/null +++ b/static/checkIcon/manhole-report.png Binary files differ diff --git a/static/checkIcon/offline.png b/static/checkIcon/offline.png new file mode 100644 index 0000000..a9a3df4 --- /dev/null +++ b/static/checkIcon/offline.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/static/checkIcon/level-line.png b/static/checkIcon/level-line.png new file mode 100644 index 0000000..48978c7 --- /dev/null +++ b/static/checkIcon/level-line.png Binary files differ diff --git a/static/checkIcon/level-offline.png b/static/checkIcon/level-offline.png new file mode 100644 index 0000000..7583344 --- /dev/null +++ b/static/checkIcon/level-offline.png Binary files differ diff --git a/static/checkIcon/level-report.png b/static/checkIcon/level-report.png new file mode 100644 index 0000000..792ba26 --- /dev/null +++ b/static/checkIcon/level-report.png Binary files differ diff --git a/static/checkIcon/line.png b/static/checkIcon/line.png new file mode 100644 index 0000000..23e4e91 --- /dev/null +++ b/static/checkIcon/line.png Binary files differ diff --git a/static/checkIcon/manhole-line.png b/static/checkIcon/manhole-line.png new file mode 100644 index 0000000..fa1d26a --- /dev/null +++ b/static/checkIcon/manhole-line.png Binary files differ diff --git a/static/checkIcon/manhole-offline.png b/static/checkIcon/manhole-offline.png new file mode 100644 index 0000000..82bd9c3 --- /dev/null +++ b/static/checkIcon/manhole-offline.png Binary files differ diff --git a/static/checkIcon/manhole-report.png b/static/checkIcon/manhole-report.png new file mode 100644 index 0000000..9eb23fc --- /dev/null +++ b/static/checkIcon/manhole-report.png Binary files differ diff --git a/static/checkIcon/offline.png b/static/checkIcon/offline.png new file mode 100644 index 0000000..a9a3df4 --- /dev/null +++ b/static/checkIcon/offline.png Binary files differ diff --git a/static/checkIcon/report-log.png b/static/checkIcon/report-log.png new file mode 100644 index 0000000..7318479 --- /dev/null +++ b/static/checkIcon/report-log.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/static/checkIcon/level-line.png b/static/checkIcon/level-line.png new file mode 100644 index 0000000..48978c7 --- /dev/null +++ b/static/checkIcon/level-line.png Binary files differ diff --git a/static/checkIcon/level-offline.png b/static/checkIcon/level-offline.png new file mode 100644 index 0000000..7583344 --- /dev/null +++ b/static/checkIcon/level-offline.png Binary files differ diff --git a/static/checkIcon/level-report.png b/static/checkIcon/level-report.png new file mode 100644 index 0000000..792ba26 --- /dev/null +++ b/static/checkIcon/level-report.png Binary files differ diff --git a/static/checkIcon/line.png b/static/checkIcon/line.png new file mode 100644 index 0000000..23e4e91 --- /dev/null +++ b/static/checkIcon/line.png Binary files differ diff --git a/static/checkIcon/manhole-line.png b/static/checkIcon/manhole-line.png new file mode 100644 index 0000000..fa1d26a --- /dev/null +++ b/static/checkIcon/manhole-line.png Binary files differ diff --git a/static/checkIcon/manhole-offline.png b/static/checkIcon/manhole-offline.png new file mode 100644 index 0000000..82bd9c3 --- /dev/null +++ b/static/checkIcon/manhole-offline.png Binary files differ diff --git a/static/checkIcon/manhole-report.png b/static/checkIcon/manhole-report.png new file mode 100644 index 0000000..9eb23fc --- /dev/null +++ b/static/checkIcon/manhole-report.png Binary files differ diff --git a/static/checkIcon/offline.png b/static/checkIcon/offline.png new file mode 100644 index 0000000..a9a3df4 --- /dev/null +++ b/static/checkIcon/offline.png Binary files differ diff --git a/static/checkIcon/report-log.png b/static/checkIcon/report-log.png new file mode 100644 index 0000000..7318479 --- /dev/null +++ b/static/checkIcon/report-log.png Binary files differ diff --git a/static/checkIcon/report.png b/static/checkIcon/report.png new file mode 100644 index 0000000..e03971e --- /dev/null +++ b/static/checkIcon/report.png Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/static/checkIcon/level-line.png b/static/checkIcon/level-line.png new file mode 100644 index 0000000..48978c7 --- /dev/null +++ b/static/checkIcon/level-line.png Binary files differ diff --git a/static/checkIcon/level-offline.png b/static/checkIcon/level-offline.png new file mode 100644 index 0000000..7583344 --- /dev/null +++ b/static/checkIcon/level-offline.png Binary files differ diff --git a/static/checkIcon/level-report.png b/static/checkIcon/level-report.png new file mode 100644 index 0000000..792ba26 --- /dev/null +++ b/static/checkIcon/level-report.png Binary files differ diff --git a/static/checkIcon/line.png b/static/checkIcon/line.png new file mode 100644 index 0000000..23e4e91 --- /dev/null +++ b/static/checkIcon/line.png Binary files differ diff --git a/static/checkIcon/manhole-line.png b/static/checkIcon/manhole-line.png new file mode 100644 index 0000000..fa1d26a --- /dev/null +++ b/static/checkIcon/manhole-line.png Binary files differ diff --git a/static/checkIcon/manhole-offline.png b/static/checkIcon/manhole-offline.png new file mode 100644 index 0000000..82bd9c3 --- /dev/null +++ b/static/checkIcon/manhole-offline.png Binary files differ diff --git a/static/checkIcon/manhole-report.png b/static/checkIcon/manhole-report.png new file mode 100644 index 0000000..9eb23fc --- /dev/null +++ b/static/checkIcon/manhole-report.png Binary files differ diff --git a/static/checkIcon/offline.png b/static/checkIcon/offline.png new file mode 100644 index 0000000..a9a3df4 --- /dev/null +++ b/static/checkIcon/offline.png Binary files differ diff --git a/static/checkIcon/report-log.png b/static/checkIcon/report-log.png new file mode 100644 index 0000000..7318479 --- /dev/null +++ b/static/checkIcon/report-log.png Binary files differ diff --git a/static/checkIcon/report.png b/static/checkIcon/report.png new file mode 100644 index 0000000..e03971e --- /dev/null +++ b/static/checkIcon/report.png Binary files differ diff --git "a/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246.png" "b/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246.png" new file mode 100644 index 0000000..819c0d5 --- /dev/null +++ "b/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246.png" Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/static/checkIcon/level-line.png b/static/checkIcon/level-line.png new file mode 100644 index 0000000..48978c7 --- /dev/null +++ b/static/checkIcon/level-line.png Binary files differ diff --git a/static/checkIcon/level-offline.png b/static/checkIcon/level-offline.png new file mode 100644 index 0000000..7583344 --- /dev/null +++ b/static/checkIcon/level-offline.png Binary files differ diff --git a/static/checkIcon/level-report.png b/static/checkIcon/level-report.png new file mode 100644 index 0000000..792ba26 --- /dev/null +++ b/static/checkIcon/level-report.png Binary files differ diff --git a/static/checkIcon/line.png b/static/checkIcon/line.png new file mode 100644 index 0000000..23e4e91 --- /dev/null +++ b/static/checkIcon/line.png Binary files differ diff --git a/static/checkIcon/manhole-line.png b/static/checkIcon/manhole-line.png new file mode 100644 index 0000000..fa1d26a --- /dev/null +++ b/static/checkIcon/manhole-line.png Binary files differ diff --git a/static/checkIcon/manhole-offline.png b/static/checkIcon/manhole-offline.png new file mode 100644 index 0000000..82bd9c3 --- /dev/null +++ b/static/checkIcon/manhole-offline.png Binary files differ diff --git a/static/checkIcon/manhole-report.png b/static/checkIcon/manhole-report.png new file mode 100644 index 0000000..9eb23fc --- /dev/null +++ b/static/checkIcon/manhole-report.png Binary files differ diff --git a/static/checkIcon/offline.png b/static/checkIcon/offline.png new file mode 100644 index 0000000..a9a3df4 --- /dev/null +++ b/static/checkIcon/offline.png Binary files differ diff --git a/static/checkIcon/report-log.png b/static/checkIcon/report-log.png new file mode 100644 index 0000000..7318479 --- /dev/null +++ b/static/checkIcon/report-log.png Binary files differ diff --git a/static/checkIcon/report.png b/static/checkIcon/report.png new file mode 100644 index 0000000..e03971e --- /dev/null +++ b/static/checkIcon/report.png Binary files differ diff --git "a/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246.png" "b/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246.png" new file mode 100644 index 0000000..819c0d5 --- /dev/null +++ "b/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246.png" Binary files differ diff --git "a/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246\350\223\235.png" "b/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246\350\223\235.png" new file mode 100644 index 0000000..687e0d6 --- /dev/null +++ "b/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246\350\223\235.png" Binary files differ diff --git a/api/check.js b/api/check.js new file mode 100644 index 0000000..417f242 --- /dev/null +++ b/api/check.js @@ -0,0 +1,42 @@ +import fetch from '@/common/fetchs.js'; +import useNetWork from '@/common/useNetWork.js'; + +const visitReason = 'http://111.198.10.15:11406/device/list-page' +const baseConfig = 'http://111.198.10.15:11406/sys/config/baseConfig' +const Login = 'http://111.198.10.15:11406/sys/user/login' +const Alarm = 'http://111.198.10.15:11406/alarm/list' + + +/** + * 获取到报警列表 + * @param {*} + */ +export function getAlarm(params) { + useNetWork(); + return fetch.get(Alarm,params).then(res => res); +} + +/** + * 登录 + * @param {*} + */ +export function getLogin(data) { + useNetWork(); + return fetch.post(Login,data).then(res => res); +} +/** + * 获取baseConfig + * @param {*} + */ +export function getbaseConfig() { + return fetch.get(baseConfig).then(res => res); +} + +/** + * 获取设备数据 + * @param {*} + */ +export function getPageList(params) { + useNetWork(); + return fetch.get(visitReason, params).then(res => res); +} \ No newline at end of file diff --git a/common/fetchs.js b/common/fetchs.js new file mode 100644 index 0000000..b4d63d7 --- /dev/null +++ b/common/fetchs.js @@ -0,0 +1,68 @@ +import useNetWork from "./useNetWork.js"; +import { useStore } from "vuex"; +import { getLogin } from "@/utils/auth.js"; + +function fetch(method) { + return function (url, data, otherParams = {}) { + // if (method === 'POST' || method === 'PUT') { + // data = { + // param: data, + // }; + // } + const sessionId = uni.getStorageSync("token"); + //定时器 + return new Promise((resolve, reject) => { + uni.request({ + url, + method, + data, + header: { + token: sessionId, + }, + success(data) { + if (data.statusCode === 200) { + if (data.data.code === 200) { + resolve(data.data.data); + } else if (data.data.code === 2401) { + uni.showToast({ + title: `登录过期，正在重新登录`, + icon: "none", + duration: 2000, + }); + getLogin(); + resolve(data.data.message); + } else if (data.data.code === 500 && data.data.message === '您的账号未注册，请先注册' || + data.data.code === 2402) { + resolve('用户未注册'); + } else { + uni.showToast({ + // title: "系统异常，请稍后再试！", + title: `${data.data.message}`, + icon: "none", + duration: 2000, + }); + reject(data); + } + } else { + reject(data); + } + }, + fail(err) { + reject(err); + }, + ...otherParams, + }); + }); + }; +} + +export default { + get: fetch("GET"), + post: fetch("POST"), + put: fetch("PUT"), + delete: fetch("DELETE"), + connect: fetch("CONNECT"), + head: fetch("HEAD"), + options: fetch("OPTIONS"), + trace: fetch("TRACE"), +}; diff --git a/manifest.json b/manifest.json index 5bd93d4..c9abad4 100644 --- a/manifest.json +++ b/manifest.json @@ -57,7 +57,16 @@ "postcss" : true, "minified" : true }, - "usingComponents" : true + "usingComponents" : true, + "permission": { + "scope.userLocation": { + "desc": "你的位置信息将用于小程序位置接口的效果展示" + } + }, + "requiredPrivateInfos": ["getLocation", "chooseLocation"], + "optimization":{ + "subPackages":true //是否启用分包优化 + } }, "mp-alipay" : { "usingComponents" : true diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..2a7af6f --- /dev/null +++ b/package-lock.json @@ -0,0 +1,24 @@ +{ + "name": "gdtMimiProgram", + "lockfileVersion": 2, + "requires": true, + "packages": { + "": { + "dependencies": { + "crypto-js": "^4.1.1" + } + }, + "node_modules/crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + }, + "dependencies": { + "crypto-js": { + "version": "4.1.1", + "resolved": "https://registry.npmmirror.com/crypto-js/-/crypto-js-4.1.1.tgz", + "integrity": "sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..f84940e --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "crypto-js": "^4.1.1" + } +} diff --git a/pages.json b/pages.json index 9ed881d..ca9a023 100644 --- a/pages.json +++ b/pages.json @@ -72,14 +72,6 @@ } }, { - "path" : "pages/checkInfo/checkInfo", - "style" : - { - "navigationBarTitleText": "", - "enablePullDownRefresh": false - } - }, - { "path" : "pages/checkTable/checkTable", "style" : { @@ -137,5 +129,27 @@ } ] }, + "subPackages":[ + //分包模块 + { + "root" : "pagesA", + "pages" : [ + { + "path" : "checkInfo/checkInfo", + "style" : + { + "navigationBarTitleText": "", + "enablePullDownRefresh": false + } + } + ] + } + ], + "preloadRule": { + "pagesA/checkInfo/checkInfo": { + "network": "all", + "packages": ["pagesA"] + } + }, "uniIdRouter": {} } diff --git a/pages/check/check.vue b/pages/check/check.vue index 538c21d..07237ef 100644 --- a/pages/check/check.vue +++ b/pages/check/check.vue @@ -5,26 +5,30 @@ placeholder="输入物联设备类型/设备编号进行搜索" prefixIcon="search" prefixIconStyle="font-size: 52rpx;color: #000" + v-model="params.keywords" + @change="inputChage" > - + - {{item.name}} - ({{item.numberNo}}) + {{item.deviceTypeName}} + ({{item.devcode}}) - - - {{item.status}} + + + + + {{item.onlineStateName}} - 图标 - 图标 + + @@ -33,31 +37,67 @@ - - \ No newline at end of file diff --git a/pages/checkTable/checkTable.vue b/pages/checkTable/checkTable.vue index d3dad6d..db45e8d 100644 --- a/pages/checkTable/checkTable.vue +++ b/pages/checkTable/checkTable.vue @@ -6,9 +6,52 @@ }} - + - + + {{item.name}} + + + + + + {{item.name}} + + + {{item.longdu}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + + {{item.name}} + + + + + + {{item.name}} + + + {{item.dianliang}} + + + {{item.time}} + + + + + + + {{item.name}} @@ -82,20 +125,35 @@ isTimeZ: "", isTimeQ: "", isExportShow: false, // 控制导出弹窗 - coums:[ + coumsGas:[ {name: '设备信息', width:'160rpx'}, {name: '燃气浓度(%LEL)', width:'140rpx'}, {name: '电量(%)', width:'160rpx'}, {name: '上传时间', width:'160rpx'}, ], + coumsManhole:[ + {name: '设备信息', width:'160rpx'}, + {name: '状态描述', width:'140rpx'}, + {name: '上传时间', width:'160rpx'}, + ], + coumsLevel:[ + {name: '设备信息', width:'160rpx'}, + {name: '液位值(m)', width:'140rpx'}, + {name: '电量(%)', width:'160rpx'}, + {name: '上传时间', width:'160rpx'}, + ], list: [ {name: '设备信息1', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息2', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息3', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, {name: '设备信息4', longdu: '122', dianliang: '88', time: '2022-10-29 12:25:00'}, - ] + ], + type: '' // 控制表格展示 } }, + onLoad(option){ + this.type = option.type + }, methods: { // 确认导出 exportQr() { diff --git a/pages/reportList/reportList.vue b/pages/reportList/reportList.vue index b8d68f5..55e32bd 100644 --- a/pages/reportList/reportList.vue +++ b/pages/reportList/reportList.vue @@ -24,42 +24,30 @@ - - 设备信息 - - - 告警原因 - - - 告警数值 - - - 告警时间 - - - 操作 + + {{item.name}} - {{item.name}} - ({{item.numberNo}}) + {{item.alarmContentName}} + ({{item.devcode}}) - {{item.yy}} + {{item.alarmMessage}} - {{item.sz}} + {{item.alarmValue}} - {{item.time}} + {{item.alarmTime}} - + + + {{item.status === '1' ? '取消报警' : '已消警'}} @@ -171,34 +159,36 @@ - + + \ No newline at end of file diff --git a/static/checkIcon/cancel-all.png b/static/checkIcon/cancel-all.png new file mode 100644 index 0000000..472a6ae --- /dev/null +++ b/static/checkIcon/cancel-all.png Binary files differ diff --git a/static/checkIcon/equipment-data.png b/static/checkIcon/equipment-data.png new file mode 100644 index 0000000..3508c25 --- /dev/null +++ b/static/checkIcon/equipment-data.png Binary files differ diff --git a/static/checkIcon/equipment-info.png b/static/checkIcon/equipment-info.png new file mode 100644 index 0000000..b953b30 --- /dev/null +++ b/static/checkIcon/equipment-info.png Binary files differ diff --git a/static/checkIcon/gas-line.png b/static/checkIcon/gas-line.png new file mode 100644 index 0000000..68457e5 --- /dev/null +++ b/static/checkIcon/gas-line.png Binary files differ diff --git a/static/checkIcon/gas-offine.png b/static/checkIcon/gas-offine.png new file mode 100644 index 0000000..787aeb5 --- /dev/null +++ b/static/checkIcon/gas-offine.png Binary files differ diff --git a/static/checkIcon/gas-report.png b/static/checkIcon/gas-report.png new file mode 100644 index 0000000..cdccc12 --- /dev/null +++ b/static/checkIcon/gas-report.png Binary files differ diff --git a/static/checkIcon/level-line.png b/static/checkIcon/level-line.png new file mode 100644 index 0000000..48978c7 --- /dev/null +++ b/static/checkIcon/level-line.png Binary files differ diff --git a/static/checkIcon/level-offline.png b/static/checkIcon/level-offline.png new file mode 100644 index 0000000..7583344 --- /dev/null +++ b/static/checkIcon/level-offline.png Binary files differ diff --git a/static/checkIcon/level-report.png b/static/checkIcon/level-report.png new file mode 100644 index 0000000..792ba26 --- /dev/null +++ b/static/checkIcon/level-report.png Binary files differ diff --git a/static/checkIcon/line.png b/static/checkIcon/line.png new file mode 100644 index 0000000..23e4e91 --- /dev/null +++ b/static/checkIcon/line.png Binary files differ diff --git a/static/checkIcon/manhole-line.png b/static/checkIcon/manhole-line.png new file mode 100644 index 0000000..fa1d26a --- /dev/null +++ b/static/checkIcon/manhole-line.png Binary files differ diff --git a/static/checkIcon/manhole-offline.png b/static/checkIcon/manhole-offline.png new file mode 100644 index 0000000..82bd9c3 --- /dev/null +++ b/static/checkIcon/manhole-offline.png Binary files differ diff --git a/static/checkIcon/manhole-report.png b/static/checkIcon/manhole-report.png new file mode 100644 index 0000000..9eb23fc --- /dev/null +++ b/static/checkIcon/manhole-report.png Binary files differ diff --git a/static/checkIcon/offline.png b/static/checkIcon/offline.png new file mode 100644 index 0000000..a9a3df4 --- /dev/null +++ b/static/checkIcon/offline.png Binary files differ diff --git a/static/checkIcon/report-log.png b/static/checkIcon/report-log.png new file mode 100644 index 0000000..7318479 --- /dev/null +++ b/static/checkIcon/report-log.png Binary files differ diff --git a/static/checkIcon/report.png b/static/checkIcon/report.png new file mode 100644 index 0000000..e03971e --- /dev/null +++ b/static/checkIcon/report.png Binary files differ diff --git "a/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246.png" "b/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246.png" new file mode 100644 index 0000000..819c0d5 --- /dev/null +++ "b/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246.png" Binary files differ diff --git "a/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246\350\223\235.png" "b/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246\350\223\235.png" new file mode 100644 index 0000000..687e0d6 --- /dev/null +++ "b/static/checkIcon/\346\270\205\351\231\244\345\221\212\350\255\246\350\223\235.png" Binary files differ diff --git a/utils/check.js b/utils/check.js new file mode 100644 index 0000000..8857ebc --- /dev/null +++ b/utils/check.js @@ -0,0 +1,12 @@ +//引入下载好的js文件 +import CryptoJS from '../node_modules/crypto-js/crypto-js.js' +// 加密 +const keyStr = 'test' // 解密用的key +export function encrypt (word) { + const time = Date.now() + + const key = CryptoJS.enc.Utf8.parse(keyStr) + const srcs = CryptoJS.enc.Utf8.parse(time + word) // 加密方式: 时间戳 + 密文 + const encrypted = CryptoJS.AES.encrypt(srcs, key, {mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7}) + return encrypted.toString() +} \ No newline at end of file