Browse Source

平台-设备导入添加备注

gzb
wangzhonglu 8 months ago
parent
commit
f4fc693b70

+ 15
- 4
src/views/platformSection/deviceManage/deviceManageImport/detail.vue View File

111
             <Radio :label="1">注销</Radio>
111
             <Radio :label="1">注销</Radio>
112
           </RadioGroup>
112
           </RadioGroup>
113
         </FormItem>
113
         </FormItem>
114
+        <FormItem label="备注" prop="comm">
115
+          <Input
116
+            type="textarea"
117
+            v-model="addInfo.comm"
118
+            placeholder="请输入备注"
119
+          ></Input>
120
+        </FormItem>
114
       </Form>
121
       </Form>
115
       <div slot="footer">
122
       <div slot="footer">
116
         <Button @click="addInfo.show = false">取消</Button>
123
         <Button @click="addInfo.show = false">取消</Button>
165
         show: false,
172
         show: false,
166
         regionid: null,
173
         regionid: null,
167
         sn: null,
174
         sn: null,
168
-        snState: null
175
+        snState: null,
176
+        comm: ""
169
       },
177
       },
170
       searchForm: {
178
       searchForm: {
171
         regionid: 0,
179
         regionid: 0,
314
         show: true,
322
         show: true,
315
         regionid: null,
323
         regionid: null,
316
         sn: null,
324
         sn: null,
317
-        snState: null
325
+        snState: null,
326
+        comm: ""
318
       };
327
       };
319
     },
328
     },
320
     saveAddInfo() {
329
     saveAddInfo() {
329
             rtype: this.powerParams.rtype,
338
             rtype: this.powerParams.rtype,
330
             objectid: this.powerParams.objectid,
339
             objectid: this.powerParams.objectid,
331
             regionid: this.addInfo.regionid,
340
             regionid: this.addInfo.regionid,
332
-            sn: this.addInfo.sn
341
+            sn: this.addInfo.sn,
342
+            comm: this.addInfo.comm
333
           };
343
           };
334
           if (this.addInfo.daid && this.addInfo.rversion) {
344
           if (this.addInfo.daid && this.addInfo.rversion) {
335
             form.daid = this.addInfo.daid;
345
             form.daid = this.addInfo.daid;
354
         show: true,
364
         show: true,
355
         regionid: row.regionid,
365
         regionid: row.regionid,
356
         sn: row.sn,
366
         sn: row.sn,
357
-        snState: row.snState
367
+        snState: row.snState,
368
+        comm: row.comm
358
       };
369
       };
359
     },
370
     },
360
     // 删除
371
     // 删除

+ 13
- 13
src/views/schoolSection/home/index.vue View File

44
             >
44
             >
45
               <div>
45
               <div>
46
                 {{
46
                 {{
47
-                  onlineDeviceList[0].tatalnum > 0
47
+                  onlineDeviceList[0].totalnum > 0
48
                     ? Math.floor(
48
                     ? Math.floor(
49
                         (onlineDeviceList[0].num /
49
                         (onlineDeviceList[0].num /
50
-                          onlineDeviceList[0].tatalnum) *
50
+                          onlineDeviceList[0].totalnum) *
51
                           10000
51
                           10000
52
                       ) / 100
52
                       ) / 100
53
                     : 0
53
                     : 0
67
             >
67
             >
68
               <div>
68
               <div>
69
                 {{
69
                 {{
70
-                  onlineDeviceList[1].tatalnum > 0
70
+                  onlineDeviceList[1].totalnum > 0
71
                     ? Math.floor(
71
                     ? Math.floor(
72
                         (onlineDeviceList[1].num /
72
                         (onlineDeviceList[1].num /
73
-                          onlineDeviceList[1].tatalnum) *
73
+                          onlineDeviceList[1].totalnum) *
74
                           10000
74
                           10000
75
                       ) / 100
75
                       ) / 100
76
                     : 0
76
                     : 0
90
             >
90
             >
91
               <div>
91
               <div>
92
                 {{
92
                 {{
93
-                  onlineDeviceList[2].tatalnum > 0
93
+                  onlineDeviceList[2].totalnum > 0
94
                     ? Math.floor(
94
                     ? Math.floor(
95
                         (onlineDeviceList[2].num /
95
                         (onlineDeviceList[2].num /
96
-                          onlineDeviceList[2].tatalnum) *
96
+                          onlineDeviceList[2].totalnum) *
97
                           10000
97
                           10000
98
                       ) / 100
98
                       ) / 100
99
                     : 0
99
                     : 0
643
           this.initOnlineEcharts({
643
           this.initOnlineEcharts({
644
             domId: "onlineEcharts1",
644
             domId: "onlineEcharts1",
645
             onlineNum: this.onlineDeviceList[0].num,
645
             onlineNum: this.onlineDeviceList[0].num,
646
-            onlineTatalNum: this.onlineDeviceList[0].tatalnum || 1,
646
+            onlineTotalNum: this.onlineDeviceList[0].totalnum || 1,
647
             onlineColor: ["#ABD5FF", "#339CFF", "#E2EEFE"],
647
             onlineColor: ["#ABD5FF", "#339CFF", "#E2EEFE"],
648
             subtext: "最近1小时"
648
             subtext: "最近1小时"
649
           });
649
           });
650
           this.initOnlineEcharts({
650
           this.initOnlineEcharts({
651
             domId: "onlineEcharts2",
651
             domId: "onlineEcharts2",
652
             onlineNum: this.onlineDeviceList[1].num,
652
             onlineNum: this.onlineDeviceList[1].num,
653
-            onlineTatalNum: this.onlineDeviceList[1].tatalnum || 1,
653
+            onlineTotalNum: this.onlineDeviceList[1].totalnum || 1,
654
             onlineColor: ["#D3F6C1", "#52C41A", "#E9FFDE"],
654
             onlineColor: ["#D3F6C1", "#52C41A", "#E9FFDE"],
655
             subtext: "最近48小时"
655
             subtext: "最近48小时"
656
           });
656
           });
657
           this.initOnlineEcharts({
657
           this.initOnlineEcharts({
658
             domId: "onlineEcharts3",
658
             domId: "onlineEcharts3",
659
             onlineNum: this.onlineDeviceList[2].num,
659
             onlineNum: this.onlineDeviceList[2].num,
660
-            onlineTatalNum: this.onlineDeviceList[2].tatalnum || 1,
660
+            onlineTotalNum: this.onlineDeviceList[2].totalnum || 1,
661
             onlineColor: ["#FCC9E3", "#ED4A99", "#FFE0EF"],
661
             onlineColor: ["#FCC9E3", "#ED4A99", "#FFE0EF"],
662
             subtext: "最近7天"
662
             subtext: "最近7天"
663
           });
663
           });
666
         }
666
         }
667
       });
667
       });
668
     },
668
     },
669
-    initOnlineEcharts({ onlineNum, onlineTatalNum, onlineColor, domId }) {
669
+    initOnlineEcharts({ onlineNum, onlineTotalNum, onlineColor, domId }) {
670
       let options = {
670
       let options = {
671
         tooltip: {
671
         tooltip: {
672
           show: false
672
           show: false
720
                 }
720
                 }
721
               },
721
               },
722
               {
722
               {
723
-                value: onlineTatalNum - onlineNum,
723
+                value: onlineTotalNum - onlineNum,
724
                 name: "离线",
724
                 name: "离线",
725
                 itemStyle: {
725
                 itemStyle: {
726
                   color: "rgba(255,255,255,0)",
726
                   color: "rgba(255,255,255,0)",
743
             center: ["50%", "45%"],
743
             center: ["50%", "45%"],
744
             silent: true,
744
             silent: true,
745
             startAngle:
745
             startAngle:
746
-              108 + ((onlineTatalNum - onlineNum) / onlineTatalNum) * 360,
746
+              108 + ((onlineTotalNum - onlineNum) / onlineTotalNum) * 360,
747
             itemStyle: {
747
             itemStyle: {
748
               borderRadius: "50%",
748
               borderRadius: "50%",
749
               borderColor: "none",
749
               borderColor: "none",
798
             label: {
798
             label: {
799
               show: false
799
               show: false
800
             },
800
             },
801
-            data: [onlineTatalNum]
801
+            data: [onlineTotalNum]
802
           }
802
           }
803
         ]
803
         ]
804
       };
804
       };

Loading…
Cancel
Save