diff --git a/common/js/config.js b/common/js/config.js
index f35d9c0..443e581 100644
--- a/common/js/config.js
+++ b/common/js/config.js
@@ -1,25 +1,32 @@
const debug = false // true 是连地服务端本地,false 是连接线上
const development = {
- domain: 'http://192.168.1.60:8094',
- STATIC: '',
- tenantId: 'rocanOA',
-
+ DOMAIN: 'http://192.168.1.60:8094',
+ MQTT_OPTIONS: {
+ clientId: '',
+ connectTimeout: 15000,
+ username: 'admin',
+ password: 'admin',
+ }
}
const production = {
- domain: 'http://192.168.1.60:8094',
- STATIC: 'http://192.168.1.60:8094',
- tenantId: 'rocanOA',
+ DOMAIN: 'http://192.168.1.60:8094',
+ MQTT_OPTIONS: {
+ clientId: '',
+ connectTimeout: 15000,
+ username: 'admin',
+ password: 'admin',
+ }
}
const config = debug ? development : production
// #ifdef H5
if (process.env.NODE_ENV === 'development') {
- config.domain = '/api'
+ config.DOMAIN = '/api'
} else {
- config.domain = window.location.origin
+ config.DOMAIN = window.location.origin
}
// #endif
diff --git a/common/js/util.js b/common/js/util.js
index 04aeaa0..1b59732 100644
--- a/common/js/util.js
+++ b/common/js/util.js
@@ -196,54 +196,6 @@ const loadConfig = (call, need_fresh = false) => {
})
}
-
-
-// 获取表单信息
-const getInstanceData = (params) => {
- return new Promise((resolve, reject) => {
- request({
- url: '/bpm/instance/getInstanceData',
- data: params,
- method: 'POST',
- }).then(rs => {
- resolve(rs.data)
- }).catch(err => {
- reject(err)
- })
- })
-
-}
-// 获取表单信息
-const getNextIdByAlias = (alias, call) => {
- return new Promise((resolve, reject) => {
- request({
- url: '/sys/serialNo/getNextIdByAlias',
- data: {
- alias: alias,
- },
- method: 'POST',
- }).then(rs => {
- resolve(rs.data)
- }).catch(err => {
- reject(err)
- })
- })
-}
-// 获取流程信息
-const getFlowImageInfo = (params) => {
- return new Promise((resolve, reject) => {
- request({
- url: '/bpm/instance/getFlowImageInfo',
- data: params,
- method: 'POST',
- }).then(rs => {
- resolve(rs.data)
- }).catch(err => {
- reject(err)
- })
- })
-}
-
export default {
validatePhoneNumber,
toast,
@@ -252,7 +204,4 @@ export default {
h5Helper,
getUserLocation,
loadConfig,
- getNextIdByAlias,
- getInstanceData,
- getFlowImageInfo
}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..5f7c5e1
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+ "dependencies": {
+ "mqtt": "^3.0.0"
+ }
+}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ad0a05c..e285eab 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,52 +1,53 @@
-
-
-
- {{title}}
-
-
+
+
+
+ {{ title }}
+
+