钞小赢 3 yıl önce
ebeveyn
işleme
ab35501934

+ 5 - 1
.env

@@ -2,10 +2,14 @@
2
 
2
 
3
 # 页面 title 前缀
3
 # 页面 title 前缀
4
 VUE_APP_TITLE=物联网平台
4
 VUE_APP_TITLE=物联网平台
5
-
5
+# let pubUrl=window.location.href
6
 # 网络请求公用地址
6
 # 网络请求公用地址
7
 VUE_APP_API=/api/
7
 VUE_APP_API=/api/
8
+# 测试
8
 #  VUE_APP_API=http://101.36.160.140:31005/smart-grp-basic
9
 #  VUE_APP_API=http://101.36.160.140:31005/smart-grp-basic
10
+# VUE_APP_API=pubUrl+"smart-grp-basic"
11
+# //正式
12
+# VUE_APP_API=http://23.99.21.201:59887/smart-grp-basic
9
 
13
 
10
 # 仓库地址
14
 # 仓库地址
11
 VUE_APP_REPO=https://github.com/d2-projects/d2-admin-start-kit
15
 VUE_APP_REPO=https://github.com/d2-projects/d2-admin-start-kit

+ 16 - 12
src/views/demo/equipmentManage/compontents/addDialog.vue

@@ -1,8 +1,9 @@
1
 <template>
1
 <template>
2
   <div>
2
   <div>
3
 
3
 
4
-      <el-dialog :title="dialogTitle" @close="addForm={orgCode:orgCode}" :visible.sync="dialogFormVisible" id="dialogStyle">
4
+      <el-dialog :title="dialogTitle" @close="addForm={orgCode:orgCode}" :visible.sync="dialogFormVisible" id="dialogStyle" >
5
         <el-form
5
         <el-form
6
+
6
           :model="addForm"
7
           :model="addForm"
7
           :rules="rules"
8
           :rules="rules"
8
           ref="addForm"
9
           ref="addForm"
@@ -12,7 +13,7 @@
12
 
13
 
13
           <el-form-item label="设备ID:" prop="eqCode">
14
           <el-form-item label="设备ID:" prop="eqCode">
14
             <el-input
15
             <el-input
15
-              style="width: 220px"
16
+            style="width:30%"
16
               v-model.trim="addForm.eqCode"
17
               v-model.trim="addForm.eqCode"
17
               placeholder="请输入"
18
               placeholder="请输入"
18
             ></el-input>
19
             ></el-input>
@@ -22,16 +23,16 @@
22
               <el-option label="区域一" value="shanghai"></el-option>
23
               <el-option label="区域一" value="shanghai"></el-option>
23
               <el-option label="区域二" value="beijing"></el-option>
24
               <el-option label="区域二" value="beijing"></el-option>
24
             </el-select> -->
25
             </el-select> -->
25
-            <el-input v-model="addForm.eqName" placeholder="请输入" style="width:220px"></el-input>
26
+            <el-input v-model="addForm.eqName" placeholder="请输入" style="width:30%"></el-input>
26
           </el-form-item>
27
           </el-form-item>
27
           <el-form-item label="设备标签:">
28
           <el-form-item label="设备标签:">
28
-            <el-select v-model="addForm.labelCode" @change="getTag" placeholder="请选择" >
29
+            <el-select v-model="addForm.labelCode" @change="getTag" placeholder="请选择"  style="width:30%">
29
               <el-option v-for="item in tagLists" :key="item.id" :label="item.labelName" :value="item.labelCode">
30
               <el-option v-for="item in tagLists" :key="item.id" :label="item.labelName" :value="item.labelCode">
30
               </el-option>
31
               </el-option>
31
             </el-select>
32
             </el-select>
32
           </el-form-item>
33
           </el-form-item>
33
           <el-form-item label="所属仓房编码:" >
34
           <el-form-item label="所属仓房编码:" >
34
-            <el-input v-model="addForm.houseCode" placeholder="请输入" style="width:220px"></el-input>
35
+            <el-input v-model="addForm.houseCode" placeholder="请输入" style="width:30%"></el-input>
35
           </el-form-item>
36
           </el-form-item>
36
           <el-form-item label="所属产品:" prop="proName">
37
           <el-form-item label="所属产品:" prop="proName">
37
           <!-- <el-select v-model="addForm.proName" placeholder="请选择" ref="selectTree">
38
           <!-- <el-select v-model="addForm.proName" placeholder="请选择" ref="selectTree">
@@ -50,16 +51,16 @@
50
               @node-click="handleNodeClick"
51
               @node-click="handleNodeClick"
51
             />
52
             />
52
           </el-select> -->
53
           </el-select> -->
53
-                    <el-select  @change="getPro" v-model="addForm.proCode" placeholder="请选择" >
54
+                    <el-select  @change="getPro" v-model="addForm.proCode" placeholder="请选择"  style="width:30%">
54
                       <el-option v-for="item in proLists" :key="item.id" :label="item.proName" :value="item.proCode">
55
                       <el-option v-for="item in proLists" :key="item.id" :label="item.proName" :value="item.proCode">
55
                       </el-option>
56
                       </el-option>
56
                     </el-select>
57
                     </el-select>
57
           </el-form-item>
58
           </el-form-item>
58
-          <el-form-item label="所属组织机构:">
59
-          <el-select disabled v-model="addForm.orgCode" placeholder="请选择">
59
+          <el-form-item label="所属组织机构:" prop="orgCode">
60
+          <el-select  v-model="addForm.orgCode" placeholder="请选择"  style="width:30%">
60
             <el-option
61
             <el-option
61
               v-for="item in ckLists"
62
               v-for="item in ckLists"
62
-              :key="item.id"
63
+              :key="item.orgCode"
63
               :label="item.orgName"
64
               :label="item.orgName"
64
               :value="item.orgCode"
65
               :value="item.orgCode"
65
             >
66
             >
@@ -68,7 +69,7 @@
68
           </el-form-item>
69
           </el-form-item>
69
           <el-form-item label="描述:">
70
           <el-form-item label="描述:">
70
             <el-input
71
             <el-input
71
-              style="width: 80%"
72
+            style="width:30%"
72
               type="textarea"
73
               type="textarea"
73
               v-model.trim="addForm.eqRemark"
74
               v-model.trim="addForm.eqRemark"
74
               placeholder="请输入"
75
               placeholder="请输入"
@@ -109,6 +110,7 @@ export default {
109
         eqCode: [{ required: true, message: "请输入设备ID", trigger: "blur" }],
110
         eqCode: [{ required: true, message: "请输入设备ID", trigger: "blur" }],
110
         eqName: [{ required: true, message: "请选择设备名称", trigger: "blur" }],
111
         eqName: [{ required: true, message: "请选择设备名称", trigger: "blur" }],
111
         name1: [{ required: true, message: "请选择设备标签", trigger: "blur" }],
112
         name1: [{ required: true, message: "请选择设备标签", trigger: "blur" }],
113
+        orgCode:[{ required: true, message: "请选择组织机构", trigger: "blur" }],
112
         proName: [
114
         proName: [
113
           { required: true, message: "请选择所属产品", trigger: "blur" },
115
           { required: true, message: "请选择所属产品", trigger: "blur" },
114
         ],
116
         ],
@@ -117,7 +119,7 @@ export default {
117
   },
119
   },
118
   created(){
120
   created(){
119
     // this.ckList()
121
     // this.ckList()
120
-    this.orgCode=localStorage.getItem("orgCode");
122
+    //this.orgCode=localStorage.getItem("orgCode");
121
   },
123
   },
122
   methods: {
124
   methods: {
123
     getPro(val){
125
     getPro(val){
@@ -163,7 +165,9 @@ export default {
163
         .then((res) => {
165
         .then((res) => {
164
           if (res.code == 200) {
166
           if (res.code == 200) {
165
             this.ckLists = res.data;
167
             this.ckLists = res.data;
166
-            this.addForm.orgCode=localStorage.getItem("orgCode")
168
+            console.log(this.ckLists,"ckLists")
169
+            // this.addForm.orgCode=localStorage.getItem("orgCode")
170
+          
167
           }
171
           }
168
         })
172
         })
169
         .catch((err) => {
173
         .catch((err) => {

+ 13 - 7
src/views/demo/equipmentManage/equipmentInfo/index.vue

@@ -663,11 +663,11 @@ export default {
663
     connect() {
663
     connect() {
664
       let options = {
664
       let options = {
665
         //本地
665
         //本地
666
-        username: "admin",
667
-        password: "public",
666
+        // username: "admin",
667
+        // password: "public",
668
         //测试
668
         //测试
669
-        //    username: "admin",
670
-        // password: "admin@123",
669
+           username: "admin",
670
+        password: "admin@123",
671
         //生产
671
         //生产
672
         // username: "admin",
672
         // username: "admin",
673
         // password: "admin@2Ld&DDrsk",
673
         // password: "admin@2Ld&DDrsk",
@@ -677,9 +677,9 @@ export default {
677
         connectTimeout: 4000,
677
         connectTimeout: 4000,
678
       };
678
       };
679
       //本地开发环境
679
       //本地开发环境
680
-      this.client = mqtt.connect("ws://192.168.50.169:8083/mqtt", options);
680
+      // this.client = mqtt.connect("ws://192.168.50.169:8083/mqtt", options);
681
       //测试环境
681
       //测试环境
682
-      //  this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
682
+       this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
683
       //正式环境
683
       //正式环境
684
       // this.client = mqtt.connect('ws://10.105.101.61:8083/mqtt',options);
684
       // this.client = mqtt.connect('ws://10.105.101.61:8083/mqtt',options);
685
       this.client.on("connect", (e) => {
685
       this.client.on("connect", (e) => {
@@ -690,6 +690,8 @@ export default {
690
             // "/PUSH/c89512024085/DPUT/upload",
690
             // "/PUSH/c89512024085/DPUT/upload",
691
             // "/PUSH/X1XXXQ2206090069/DPUT/upload",
691
             // "/PUSH/X1XXXQ2206090069/DPUT/upload",
692
             "/PUSH/8951DQ2207200018/DPUT/upload",
692
             "/PUSH/8951DQ2207200018/DPUT/upload",
693
+            "/PUSH/8951DQ2207200019/DPUT/upload",
694
+            "/PUSH/8951DQ220700011/DUPT/upload"
693
           ],
695
           ],
694
           { qos: 1 },
696
           { qos: 1 },
695
           (err) => {
697
           (err) => {
@@ -726,11 +728,15 @@ export default {
726
     getMessage() {
728
     getMessage() {
727
       this.client.on("message", (topic, message) => {
729
       this.client.on("message", (topic, message) => {
728
         if (message) {
730
         if (message) {
729
-          console.log("收到来着", topic, "的信息", message.toString());
731
+          let str = "8951DQ220700011";
732
+          if (topic.indexOf(str) != -1) {
733
+            console.log("收到来着", topic, "的信息", message.toString());
730
           const res = JSON.parse(message.toString());
734
           const res = JSON.parse(message.toString());
731
           this.runData = res.data;
735
           this.runData = res.data;
732
           console.log(res, "res", this.runData, "runData");
736
           console.log(res, "res", this.runData, "runData");
733
           this.calcAve(this.runData);
737
           this.calcAve(this.runData);
738
+          }
739
+          
734
           // switch(topic) {
740
           // switch(topic) {
735
           //    case 'top/lll' :
741
           //    case 'top/lll' :
736
           //      this.msg = res.msg
742
           //      this.msg = res.msg

+ 6 - 5
src/views/demo/productManage/compontents/addDialog.vue

@@ -64,11 +64,11 @@
64
             />
64
             />
65
           </el-select>
65
           </el-select>
66
         </el-form-item>
66
         </el-form-item>
67
-        <el-form-item label="所属组织机构:">
68
-          <el-select disabled v-model="addForm.orgCode" placeholder="请选择">
67
+        <el-form-item label="所属组织机构:" prop="orgCode">
68
+          <el-select  v-model="addForm.orgCode" placeholder="请选择">
69
             <el-option
69
             <el-option
70
               v-for="item in ckLists"
70
               v-for="item in ckLists"
71
-              :key="item.id"
71
+              :key="item.orgCode"
72
               :label="item.orgName"
72
               :label="item.orgName"
73
               :value="item.orgCode"
73
               :value="item.orgCode"
74
             >
74
             >
@@ -119,6 +119,7 @@ export default {
119
       dialogFormVisible: false,
119
       dialogFormVisible: false,
120
       rules: {
120
       rules: {
121
         proCode: [{ required: true, message: "请输入产品ID", trigger: "blur" }],
121
         proCode: [{ required: true, message: "请输入产品ID", trigger: "blur" }],
122
+        orgCode: [{ required: true, message: "请选择组织机构", trigger: "blur" }],
122
         proName: [
123
         proName: [
123
           { required: true, message: "请输入产品名称", trigger: "blur" },
124
           { required: true, message: "请输入产品名称", trigger: "blur" },
124
         ],
125
         ],
@@ -133,7 +134,7 @@ export default {
133
   },
134
   },
134
   created() {
135
   created() {
135
     this.ckList();
136
     this.ckList();
136
-    this.orgCode=localStorage.getItem("orgCode");
137
+    //this.orgCode=localStorage.getItem("orgCode");
137
   },
138
   },
138
   methods: {
139
   methods: {
139
     handleAvatarSuccess(res, file) {
140
     handleAvatarSuccess(res, file) {
@@ -168,7 +169,7 @@ export default {
168
         .then((res) => {
169
         .then((res) => {
169
           if (res.code == 200) {
170
           if (res.code == 200) {
170
             this.ckLists = res.data;
171
             this.ckLists = res.data;
171
-            this.addForm.orgCode=localStorage.getItem("orgCode")
172
+            //this.addForm.orgCode=localStorage.getItem("orgCode")
172
           }
173
           }
173
         })
174
         })
174
         .catch((err) => {
175
         .catch((err) => {

+ 1 - 1
src/views/demo/productManage/productInfo/index.vue

@@ -401,7 +401,7 @@
401
        </table>
401
        </table>
402
 
402
 
403
        <div class="sbData"  v-for="(item,index) in sbDetailData" :key="index">
403
        <div class="sbData"  v-for="(item,index) in sbDetailData" :key="index">
404
-        <div class="sbTitle">{{item.sign}}</div>
404
+    <div class="sbTitle">{{item.eqName}} / {{item.device}} / {{item.labelName}}</div>
405
         <div class="sbDetail">
405
         <div class="sbDetail">
406
           <div class="sbDetailDiv">温度(℃)</div>
406
           <div class="sbDetailDiv">温度(℃)</div>
407
           <div class="sbDetailDiv">{{item.tempValue}}</div>
407
           <div class="sbDetailDiv">{{item.tempValue}}</div>

+ 10 - 8
src/views/demo/productManage/productInfo/realTime/index.vue

@@ -112,7 +112,7 @@
112
       <div class="top">
112
       <div class="top">
113
         <div class="deviceName">
113
         <div class="deviceName">
114
           <span class="shu"></span>
114
           <span class="shu"></span>
115
-          {{item.sbName}}/{{item.device}}
115
+          {{item.sbName}} / {{item.device}}
116
         </div>
116
         </div>
117
         <div class="deviceDetail">
117
         <div class="deviceDetail">
118
           <div class="bottom">
118
           <div class="bottom">
@@ -164,11 +164,11 @@ export default {
164
     connect() {
164
     connect() {
165
       let options = {
165
       let options = {
166
         //本地
166
         //本地
167
-        username: "admin",
168
-        password: "public",
169
-        //测试
170
         // username: "admin",
167
         // username: "admin",
171
-        // password: "admin@123",
168
+        // password: "public",
169
+        //测试
170
+        username: "admin",
171
+        password: "admin@123",
172
         //生产
172
         //生产
173
         // username: "admin",
173
         // username: "admin",
174
         // password: "admin@2Ld&DDrsk",
174
         // password: "admin@2Ld&DDrsk",
@@ -178,9 +178,9 @@ export default {
178
         connectTimeout: 4000,
178
         connectTimeout: 4000,
179
       };
179
       };
180
       //本地开发环境
180
       //本地开发环境
181
-      this.client = mqtt.connect("ws://192.168.50.169:8083/mqtt", options);
181
+      // this.client = mqtt.connect("ws://192.168.50.169:8083/mqtt", options);
182
       //测试环境
182
       //测试环境
183
-      // this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
183
+      this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
184
       //正式环境
184
       //正式环境
185
       // this.client = mqtt.connect('ws://10.105.101.61:8083/mqtt',options);
185
       // this.client = mqtt.connect('ws://10.105.101.61:8083/mqtt',options);
186
       this.client.on("connect", (e) => {
186
       this.client.on("connect", (e) => {
@@ -192,6 +192,7 @@ export default {
192
             // "/PUSH/X1XXXQ2206090069/DPUT/upload",
192
             // "/PUSH/X1XXXQ2206090069/DPUT/upload",
193
             "/PUSH/8951DQ2207200018/DPUT/upload",
193
             "/PUSH/8951DQ2207200018/DPUT/upload",
194
             "/PUSH/8951DQ2207200019/DPUT/upload",
194
             "/PUSH/8951DQ2207200019/DPUT/upload",
195
+            "/PUSH/8951DQ220700011/DUPT/upload"
195
           ],
196
           ],
196
           { qos: 1 },
197
           { qos: 1 },
197
           (err) => {
198
           (err) => {
@@ -227,8 +228,9 @@ export default {
227
     //监听接收消息
228
     //监听接收消息
228
     getMessage() {
229
     getMessage() {
229
       this.client.on("message", (topic, message) => {
230
       this.client.on("message", (topic, message) => {
231
+        console.log(topic,message)
230
         if (message) {
232
         if (message) {
231
-          let str = "8951DQ2207200019";
233
+          let str = "8951DQ220700011";
232
           if (topic.indexOf(str) != -1) {
234
           if (topic.indexOf(str) != -1) {
233
             console.log("收到来着", topic, "的信息", message.toString());
235
             console.log("收到来着", topic, "的信息", message.toString());
234
             var res = JSON.parse(message.toString());
236
             var res = JSON.parse(message.toString());

+ 14 - 3
src/views/demo/system/userManagement/index.vue

@@ -39,7 +39,7 @@
39
                       </el-option>
39
                       </el-option>
40
                     </el-select>
40
                     </el-select>
41
                   </el-form-item>
41
                   </el-form-item>
42
-                  <el-form-item label="名">
42
+                  <el-form-item label="用户名">
43
                     <el-input size="mini" placeholder="请输入" v-model="formInline.userName"></el-input>
43
                     <el-input size="mini" placeholder="请输入" v-model="formInline.userName"></el-input>
44
                   </el-form-item>
44
                   </el-form-item>
45
                   <el-form-item>
45
                   <el-form-item>
@@ -62,6 +62,8 @@
62
                 <el-table-column align="center" label="序号" type="index" width="100px" :index="indexMethod"></el-table-column>
62
                 <el-table-column align="center" label="序号" type="index" width="100px" :index="indexMethod"></el-table-column>
63
                 <!-- <el-table-column prop="id" label="用户ID" align="center">
63
                 <!-- <el-table-column prop="id" label="用户ID" align="center">
64
                 </el-table-column> -->
64
                 </el-table-column> -->
65
+                <el-table-column prop="userName" label="用户名" align="center">
66
+                </el-table-column>
65
                 <el-table-column prop="userRealName" label="姓名" align="center">
67
                 <el-table-column prop="userRealName" label="姓名" align="center">
66
                 </el-table-column>
68
                 </el-table-column>
67
 
69
 
@@ -118,9 +120,12 @@
118
           <!-- <el-form-item label="用户ID" :label-width="formLabelWidth" prop="userId">
120
           <!-- <el-form-item label="用户ID" :label-width="formLabelWidth" prop="userId">
119
             <el-input v-model="form.userId" autocomplete="off"></el-input>
121
             <el-input v-model="form.userId" autocomplete="off"></el-input>
120
           </el-form-item> -->
122
           </el-form-item> -->
121
-          <el-form-item label="名" :label-width="formLabelWidth" prop="userName">
123
+          <el-form-item label="用户名" :label-width="formLabelWidth" prop="userName">
122
             <el-input v-model="form.userName" autocomplete="off"></el-input>
124
             <el-input v-model="form.userName" autocomplete="off"></el-input>
123
           </el-form-item>
125
           </el-form-item>
126
+          <el-form-item label="姓名" :label-width="formLabelWidth" prop="userRealName">
127
+            <el-input v-model="form.userRealName" autocomplete="off"></el-input>
128
+          </el-form-item>
124
           <el-form-item label="角色" :label-width="formLabelWidth" prop="userRole">
129
           <el-form-item label="角色" :label-width="formLabelWidth" prop="userRole">
125
             <el-select v-model="form.userRole" placeholder="请选择角色">
130
             <el-select v-model="form.userRole" placeholder="请选择角色">
126
               <el-option v-for="item in roleLists" :key="item.enumCode" :label="item.enumName" :value="item.enumCode">
131
               <el-option v-for="item in roleLists" :key="item.enumCode" :label="item.enumName" :value="item.enumCode">
@@ -129,7 +134,7 @@
129
           </el-form-item>
134
           </el-form-item>
130
           <el-form-item label="所属组织" :label-width="formLabelWidth" prop="orgCode">
135
           <el-form-item label="所属组织" :label-width="formLabelWidth" prop="orgCode">
131
             <el-select v-model="form.orgCode" placeholder="请选择" @change="ckChange">
136
             <el-select v-model="form.orgCode" placeholder="请选择" @change="ckChange">
132
-              <el-option v-for="item in ckLists" :key="item.id" :label="item.orgName" :value="item.id">
137
+              <el-option v-for="item in ckLists" :key="item.orgCode" :label="item.orgName" :value="item.orgCode">
133
               </el-option>
138
               </el-option>
134
             </el-select>
139
             </el-select>
135
           </el-form-item>
140
           </el-form-item>
@@ -187,6 +192,9 @@ export default {
187
       //验证规则
192
       //验证规则
188
       rules: {
193
       rules: {
189
         userId: [{ required: true, message: "请输入用户ID", trigger: "blur" }],
194
         userId: [{ required: true, message: "请输入用户ID", trigger: "blur" }],
195
+        userRealName: [
196
+          { required: true, message: "请输入用户姓名", trigger: "blur" },
197
+        ],
190
         userName: [
198
         userName: [
191
           { required: true, message: "请输入用户姓名", trigger: "blur" },
199
           { required: true, message: "请输入用户姓名", trigger: "blur" },
192
         ],
200
         ],
@@ -218,6 +226,7 @@ export default {
218
       form: {
226
       form: {
219
         userId: "",
227
         userId: "",
220
         userName: "",
228
         userName: "",
229
+        userRealName:'',
221
         userRole: "",
230
         userRole: "",
222
         orgCode: "",
231
         orgCode: "",
223
         manageStore: "",
232
         manageStore: "",
@@ -402,6 +411,7 @@ export default {
402
         // userRoleName: this.userRoleName,
411
         // userRoleName: this.userRoleName,
403
         // manageStoreName: this.manageStoreName,
412
         // manageStoreName: this.manageStoreName,
404
         userId: this.form.userId,
413
         userId: this.form.userId,
414
+        userRealName:this.form.userRealName,
405
         userName: this.form.userName,
415
         userName: this.form.userName,
406
         userPassword: this.form.userPassword,
416
         userPassword: this.form.userPassword,
407
         userRole: this.form.userRole,
417
         userRole: this.form.userRole,
@@ -451,6 +461,7 @@ export default {
451
 
461
 
452
         id: this.rowId,
462
         id: this.rowId,
453
         userId: this.form.userId,
463
         userId: this.form.userId,
464
+        userRealName:this.form.userRealName,
454
         userName: this.form.userName,
465
         userName: this.form.userName,
455
         userPassword: this.form.userPassword,
466
         userPassword: this.form.userPassword,
456
         userRole: this.form.userRole,
467
         userRole: this.form.userRole,

+ 10 - 9
src/views/system/visualized/index.vue

@@ -404,7 +404,7 @@ export default {
404
   computed: {
404
   computed: {
405
     classOption() {
405
     classOption() {
406
       return {
406
       return {
407
-        step: 0.5, // 数值越大速度滚动越快
407
+        step: 0.2, // 数值越大速度滚动越快
408
         limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
408
         limitMoveNum: 5, // 开始无缝滚动的数据量 this.dataList.length
409
         hoverStop: true, // 是否开启鼠标悬停stop
409
         hoverStop: true, // 是否开启鼠标悬停stop
410
         direction: 1, // 0向下 1向上 2向左 3向右
410
         direction: 1, // 0向下 1向上 2向左 3向右
@@ -416,7 +416,7 @@ export default {
416
     },
416
     },
417
     seamlessScrollOption(){
417
     seamlessScrollOption(){
418
       return {
418
       return {
419
-        step: 1.2, // 数值越大速度滚动越快
419
+        step: 0.2, // 数值越大速度滚动越快
420
         limitMoveNum:6, // 开始无缝滚动的数据量 this.dataList.length
420
         limitMoveNum:6, // 开始无缝滚动的数据量 this.dataList.length
421
         hoverStop: true, // 是否开启鼠标悬停stop
421
         hoverStop: true, // 是否开启鼠标悬停stop
422
         direction: 1, // 0向下 1向上 2向左 3向右
422
         direction: 1, // 0向下 1向上 2向左 3向右
@@ -442,11 +442,11 @@ export default {
442
     connect() {
442
     connect() {
443
       let options = {
443
       let options = {
444
         //本地
444
         //本地
445
-        username: "admin",
446
-        password: "public",
447
-        //测试
448
         // username: "admin",
445
         // username: "admin",
449
-        // password: "admin@123",
446
+        // password: "public",
447
+        //测试
448
+        username: "admin",
449
+        password: "admin@123",
450
         //生产
450
         //生产
451
         // username: "admin",
451
         // username: "admin",
452
         // password: "admin@2Ld&DDrsk",
452
         // password: "admin@2Ld&DDrsk",
@@ -456,9 +456,9 @@ export default {
456
         connectTimeout: 4000,
456
         connectTimeout: 4000,
457
       };
457
       };
458
       //本地开发环境
458
       //本地开发环境
459
-      this.client = mqtt.connect("ws://192.168.50.169:8083/mqtt", options);
459
+      // this.client = mqtt.connect("ws://192.168.50.169:8083/mqtt", options);
460
       //测试环境
460
       //测试环境
461
-      // this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
461
+      this.client = mqtt.connect('ws://172.16.0.5:8083/mqtt',options);
462
       //正式环境
462
       //正式环境
463
       // this.client = mqtt.connect('ws://10.105.101.61:8083/mqtt',options);
463
       // this.client = mqtt.connect('ws://10.105.101.61:8083/mqtt',options);
464
       this.client.on("connect", (e) => {
464
       this.client.on("connect", (e) => {
@@ -470,6 +470,7 @@ export default {
470
             // "/PUSH/X1XXXQ2206090069/DPUT/upload",
470
             // "/PUSH/X1XXXQ2206090069/DPUT/upload",
471
             "/PUSH/8951DQ2207200018/DPUT/upload",
471
             "/PUSH/8951DQ2207200018/DPUT/upload",
472
             "/PUSH/8951DQ2207200019/DPUT/upload",
472
             "/PUSH/8951DQ2207200019/DPUT/upload",
473
+            "/PUSH/8951DQ220700011/DUPT/upload"
473
           ],
474
           ],
474
           { qos: 1 },
475
           { qos: 1 },
475
           (err) => {
476
           (err) => {
@@ -506,7 +507,7 @@ export default {
506
     getMessage() {
507
     getMessage() {
507
       this.client.on("message", (topic, message) => {
508
       this.client.on("message", (topic, message) => {
508
         if (message) {
509
         if (message) {
509
-          let str = "8951DQ2207200019";
510
+          let str = "8951DQ220700011";
510
           if (topic.indexOf(str) != -1) {
511
           if (topic.indexOf(str) != -1) {
511
             console.log("收到来着", topic, "的信息", message.toString());
512
             console.log("收到来着", topic, "的信息", message.toString());
512
             var res = JSON.parse(message.toString());
513
             var res = JSON.parse(message.toString());

+ 5 - 1
vue.config.js

@@ -32,6 +32,7 @@ const pages = undefined
32
 //   index: './src/main.js',
32
 //   index: './src/main.js',
33
 //   subpage: './src/subpage.js'
33
 //   subpage: './src/subpage.js'
34
 // }
34
 // }
35
+// console.log(VUE_APP_API,"url...")
35
 
36
 
36
 module.exports = {
37
 module.exports = {
37
   // 根据你的实际情况更改这里
38
   // 根据你的实际情况更改这里
@@ -42,7 +43,10 @@ module.exports = {
42
     disableHostCheck: process.env.NODE_ENV === 'development', // 关闭 host check,方便使用 ngrok 之类的内网转发工具
43
     disableHostCheck: process.env.NODE_ENV === 'development', // 关闭 host check,方便使用 ngrok 之类的内网转发工具
43
     proxy: {
44
     proxy: {
44
       '/api': {
45
       '/api': {
46
+        //测试
45
         target: 'http://101.36.160.140:31005/smart-grp-basic',
47
         target: 'http://101.36.160.140:31005/smart-grp-basic',
48
+        //生产
49
+        // target:"http://23.99.21.201:59887/smart-grp-basic",
46
         // target: 'http://112.51.248.191:7070',
50
         // target: 'http://112.51.248.191:7070',
47
           // target: '192.168.2.6:7070',
51
           // target: '192.168.2.6:7070',
48
        
52
        
@@ -50,7 +54,7 @@ module.exports = {
50
         changeOrigin: true,
54
         changeOrigin: true,
51
         pathRewrite: {
55
         pathRewrite: {
52
           '^/api': ''
56
           '^/api': ''
53
-        }
57
+        } 
54
       }
58
       }
55
     }
59
     }
56
   },
60
   },