refactor(frontend_weixin): 微信端接口调整

backend/src/dashoo.cn/mcs_api_weixin/conf/app.conf

@@ -26,5 +26,4 @@ user = seedadmin
 password = PSjCkI6TNY8R
 token = -cCMKI12TJdVWcPvRvav6bqCb_P9ufgou2AfD5UNkUuY3xnH-RrG3yyaQJsKbHB03DqSRWjRKvxEUP6uHKLdUA==
 
-[wechat]
-
+[wechat]

frontend_web/src/views/main/record_history.vue

@@ -108,7 +108,7 @@ export default {
       // request
       axios.request({
         method: 'get',
-        url: 'http://39.98.34.197:12001/api/remote_control/gettriggerhistory?current=' + this.currentPage + '&size=' + this.size + '&code=' + code
+        url: 'http://iot.labsop.cn:12001/api/remote_control/gettriggerhistory?current=' + this.currentPage + '&size=' + this.size + '&code=' + code
 
       }).then(res => {
         _this.list = res.data.data.records

frontend_weixin/src/App.vue

@@ -153,7 +153,7 @@ export default {
               var result = res.resultStr;
               axios.request({
                 method: 'get',
-                url: 'http://39.98.34.197:12001/api/remote_control/rtuseedcmd?instruction=DO1=1&code=' + result + '&ygnick=' + store.get('ygnick') + '&ygopenid=' + store.get('ygopenid') + '&seriallist=' + seriallist
+                url: 'http://iot.labsop.cn:12001/api/remote_control/rtuseedcmd?instruction=DO1=1&code=' + result + '&ygnick=' + store.get('ygnick') + '&ygopenid=' + store.get('ygopenid') + '&seriallist=' + seriallist
               }).then(resp => {
                 console.log('start -123-->', resp.data);
                 if (resp.data.code !== 0) {

frontend_weixin/src/views/devicelist.vue

@@ -166,7 +166,7 @@ export default {
     openr (b) {
       axios.request({
         method: 'get',
-        url: 'http://39.98.34.197:12001/api/remote_control/rtubuttonseedcmd?instruction=DO1=1&code=' + b + '&ygnick=' + store.get('ygnick') + '&ygopenid=' + store.get('ygopenid')
+        url: 'http://iot.labsop.cn:12001/api/remote_control/rtubuttonseedcmd?instruction=DO1=1&code=' + b + '&ygnick=' + store.get('ygnick') + '&ygopenid=' + store.get('ygopenid')
       }).then(resp => {
         if (resp.data.code !== 0) {
           alert('操作失败')

frontend_weixin/src/views/history.vue

@@ -138,7 +138,7 @@ export default {
       // request
       axios.request({
         method: 'get',
-        url: 'http://39.98.34.197:12001/api/remote_control/gettriggerhistory?current=' + this.currentPage + '&size=' + this.size + '&code=' + code
+        url: 'http://iot.labsop.cn:12001/api/remote_control/gettriggerhistory?current=' + this.currentPage + '&size=' + this.size + '&code=' + code
       }).then(res => {
         _this.devices = res.data.data.records
         _this.currentItemCount = res.data.data.total

frontend_weixin/src/views/login.vue

@@ -70,11 +70,11 @@ export default {
   },
   mounted () {
     // 开发
-    let openid = 'oZ2X-weExJP7jTGlhknsxAnf12r4'
-    let nick = 'All%20is%20Well'
+    // let openid = 'oZ2X-weExJP7jTGlhknsxAnf12r4'
+    // let nick = 'All%20is%20Well'
     // 线上
-    // let openid = this.$route.query.openid
-    // let nick = this.$route.query.nick
+    let openid = this.$route.query.openid
+    let nick = this.$route.query.nick
     if (openid && openid !== '') {
       this.model.openid = openid
       store.set('ygopenid', this.model.openid)

frontend_weixin/src/views/profile.vue

@@ -182,7 +182,7 @@ export default {
           var result = res.resultStr;
           axios.request({
             method: 'get',
-            url: 'http://39.98.34.197:12001/api/remote_control/rtuseedcmd?instruction=DO1=1&code=' + result + '&ygnick=' + store.get('ygnick') + '&ygopenid=' + store.get('ygopenid')
+            url: 'http://iot.labsop.cn:12001/api/remote_control/rtuseedcmd?instruction=DO1=1&code=' + result + '&ygnick=' + store.get('ygnick') + '&ygopenid=' + store.get('ygopenid')
           }).then(resp => {
             console.log('start -123-->', resp.data);
             if (resp.data.code !== 0) {

frontend_wxweb/README.md

@@ -1,3 +1,5 @@
 # Quasar App
 
-> WIP
+quasar dev
+
+quasar build

frontend_wxweb/package-lock.json

@@ -1,89 +1,9 @@
 {
-  "name": "mcs-wx",
+  "name": "mcs_sa",
   "version": "0.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@antv/adjust": {
-      "version": "0.1.1",
-      "resolved": "http://r.cnpmjs.org/@antv/adjust/download/@antv/adjust-0.1.1.tgz",
-      "integrity": "sha1-4mOrDhoZQaZIhC/Ahs9lp+O3Xpg=",
-      "requires": {
-        "@antv/util": "~1.3.1"
-      },
-      "dependencies": {
-        "@antv/util": {
-          "version": "1.3.1",
-          "resolved": "http://r.cnpmjs.org/@antv/util/download/@antv/util-1.3.1.tgz",
-          "integrity": "sha1-MKNLIB/5Em7A1YxyyBZqnD5kTM0=",
-          "requires": {
-            "@antv/gl-matrix": "^2.7.1"
-          }
-        }
-      }
-    },
-    "@antv/attr": {
-      "version": "0.1.2",
-      "resolved": "http://r.cnpmjs.org/@antv/attr/download/@antv/attr-0.1.2.tgz",
-      "integrity": "sha1-LusSL8qvhRoth0mrx8YFGdP3fjc=",
-      "requires": {
-        "@antv/util": "~1.3.1"
-      },
-      "dependencies": {
-        "@antv/util": {
-          "version": "1.3.1",
-          "resolved": "http://r.cnpmjs.org/@antv/util/download/@antv/util-1.3.1.tgz",
-          "integrity": "sha1-MKNLIB/5Em7A1YxyyBZqnD5kTM0=",
-          "requires": {
-            "@antv/gl-matrix": "^2.7.1"
-          }
-        }
-      }
-    },
-    "@antv/f2": {
-      "version": "3.3.9",
-      "resolved": "http://r.cnpmjs.org/@antv/f2/download/@antv/f2-3.3.9.tgz",
-      "integrity": "sha1-N5PaGSWrolzz451whLaSkDMMEQc=",
-      "requires": {
-        "@antv/adjust": "~0.1.1",
-        "@antv/attr": "~0.1.0",
-        "@antv/scale": "~0.1.2",
-        "@antv/util": "~1.2.5",
-        "hammerjs": "^2.0.8"
-      }
-    },
-    "@antv/gl-matrix": {
-      "version": "2.7.1",
-      "resolved": "http://r.cnpmjs.org/@antv/gl-matrix/download/@antv/gl-matrix-2.7.1.tgz",
-      "integrity": "sha1-rLjjf3qz3wE0WrpDcteUK+QuuhQ="
-    },
-    "@antv/scale": {
-      "version": "0.1.2",
-      "resolved": "http://r.cnpmjs.org/@antv/scale/download/@antv/scale-0.1.2.tgz",
-      "integrity": "sha1-vZyzMDPYlEtSw+DkrM/WBUHDwUc=",
-      "requires": {
-        "@antv/util": "~1.3.1",
-        "fecha": "~2.3.3"
-      },
-      "dependencies": {
-        "@antv/util": {
-          "version": "1.3.1",
-          "resolved": "http://r.cnpmjs.org/@antv/util/download/@antv/util-1.3.1.tgz",
-          "integrity": "sha1-MKNLIB/5Em7A1YxyyBZqnD5kTM0=",
-          "requires": {
-            "@antv/gl-matrix": "^2.7.1"
-          }
-        }
-      }
-    },
-    "@antv/util": {
-      "version": "1.2.5",
-      "resolved": "http://r.cnpmjs.org/@antv/util/download/@antv/util-1.2.5.tgz",
-      "integrity": "sha1-iJbFBV7Cnko0S12ql7+CkF99QM0=",
-      "requires": {
-        "@antv/gl-matrix": "^2.7.1"
-      }
-    },
     "@babel/code-frame": {
       "version": "7.12.11",
       "resolved": "https://registry.npm.taobao.org/@babel/code-frame/download/@babel/code-frame-7.12.11.tgz?cache=0&sync_timestamp=1608076799939&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fcode-frame%2Fdownload%2F%40babel%2Fcode-frame-7.12.11.tgz",
@@ -6145,11 +6065,6 @@
         "websocket-driver": ">=0.5.1"
       }
     },
-    "fecha": {
-      "version": "2.3.3",
-      "resolved": "http://r.cnpmjs.org/fecha/download/fecha-2.3.3.tgz",
-      "integrity": "sha1-lI50FX3xoy/RsSw6PDzctuydls0="
-    },
     "figgy-pudding": {
       "version": "3.5.2",
       "resolved": "https://registry.npm.taobao.org/figgy-pudding/download/figgy-pudding-3.5.2.tgz",
@@ -7036,11 +6951,6 @@
         }
       }
     },
-    "hammerjs": {
-      "version": "2.0.8",
-      "resolved": "http://r.cnpmjs.org/hammerjs/download/hammerjs-2.0.8.tgz",
-      "integrity": "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE="
-    },
     "handle-thing": {
       "version": "2.0.1",
       "resolved": "https://registry.npm.taobao.org/handle-thing/download/handle-thing-2.0.1.tgz",
@@ -9146,7 +9056,8 @@
     "moment": {
       "version": "2.29.1",
       "resolved": "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz?cache=0&sync_timestamp=1601983517363&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmoment%2Fdownload%2Fmoment-2.29.1.tgz",
-      "integrity": "sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M="
+      "integrity": "sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M=",
+      "dev": true
     },
     "move-concurrently": {
       "version": "1.0.1",
@@ -12567,7 +12478,7 @@
     },
     "store": {
       "version": "2.0.12",
-      "resolved": "http://r.cnpmjs.org/store/download/store-2.0.12.tgz",
+      "resolved": "https://registry.npm.taobao.org/store/download/store-2.0.12.tgz",
       "integrity": "sha1-jFNOKguDH3K3X8XxEZhXxE711ZM="
     },
     "stream-browserify": {

frontend_wxweb/package.json

@@ -0,0 +1,37 @@
+{
+  "name": "mcs_sa",
+  "version": "0.0.1",
+  "description": "mcs_sa",
+  "productName": "mcs_sa",
+  "cordovaId": "org.cordova.quasar.app",
+  "author": "sunmiao <sunmiao@dashoo.cn>",
+  "private": true,
+  "scripts": {
+    "lint": "eslint --ext .js,.vue src",
+    "test": "echo \"No test specified\" && exit 0"
+  },
+  "dependencies": {
+    "@quasar/extras": "^1.0.0",
+    "axios": "^0.19.0",
+    "echarts": "^4.2.1",
+    "quasar": "^1.0.0-beta.0",
+    "store": "^2.0.12",
+    "v-charts": "^1.19.0"
+  },
+  "devDependencies": {
+    "@quasar/app": "^1.0.0-beta.0",
+    "@vue/eslint-config-standard": "^4.0.0",
+    "babel-eslint": "^10.0.1",
+    "eslint": "^5.10.0",
+    "eslint-loader": "^2.1.1",
+    "eslint-plugin-vue": "^5.0.0"
+  },
+  "engines": {
+    "node": ">= 8.9.0",
+    "npm": ">= 5.6.0",
+    "yarn": ">= 1.6.0"
+  },
+  "browserslist": [
+    "last 1 version, not dead, ie >= 11"
+  ]
+}

frontend_wxweb/quasar.conf.js

@@ -89,12 +89,12 @@ module.exports = function (ctx) {
     build: {
       env: ctx.dev
         ? { // so on dev we'll have
-          API: JSON.stringify('http://localhost:9858')
-          // API: JSON.stringify('http://47.92.238.200:9858')
+          // API: JSON.stringify('http://localhost:9858')
+          API: JSON.stringify('http://1.117.158.212:9858')
         }
         : { // and on build (production):
-          API: JSON.stringify('http://localhost:9858')
-          // API: JSON.stringify('http://47.92.238.200:9858')
+          // API: JSON.stringify('http://localhost:9858')
+          API: JSON.stringify('http://1.117.158.212:9858')
         },
       scopeHoisting: true,
       // vueRouterMode: 'history',