From 7e674db4da9776905231ced40043aab630cc0a28 Mon Sep 17 00:00:00 2001
From: Caozhenhui <823914102@qq.com>
Date: Fri, 14 Jan 2022 00:46:10 +0800
Subject: [PATCH 1/2] adjust qrcode size

---
 admin/views/settings/meter/meter.model.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/views/settings/meter/meter.model.html b/admin/views/settings/meter/meter.model.html
index dc19440c..22dd9df3 100644
--- a/admin/views/settings/meter/meter.model.html
+++ b/admin/views/settings/meter/meter.model.html
@@ -101,10 +101,10 @@
                   </div>
               </div>
             </div>
-            <div class="form-group"><label class="col-sm-4 control-label">{{'METER.QR_CODE' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
+            <div class="form-group"><label class="col-sm-4 control-label">{{'METER.QR_CODE' | translate}} </label>
              <div class="col-sm-8">
                   <div>
-                       <qrcode data="{{meter.qrcode}}" version="1" error-correction-level="L" size="200" color="#fff" background="#000" download></qrcode>
+                       <qrcode data="{{meter.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
                   </div>
               </div>
             </div>

From 79896499cb563c7539369ae638b168e33fa994bc Mon Sep 17 00:00:00 2001
From: Caozhenhui <823914102@qq.com>
Date: Sat, 15 Jan 2022 02:08:47 +0800
Subject: [PATCH 2/2] added qrcode

---
 admin/app/translations.js                            | 12 +++++++-----
 .../combinedequipment/combinedequipment.model.html   |  7 +++++++
 admin/views/settings/equipment/equipment.model.html  |  7 +++++++
 admin/views/settings/meter/meter.model.html          |  2 +-
 admin/views/settings/shopfloor/shopfloor.model.html  |  7 +++++++
 admin/views/settings/space/space.model.html          |  8 +++++++-
 admin/views/settings/store/store.model.html          |  7 +++++++
 admin/views/settings/tenant/tenant.model.html        |  7 +++++++
 8 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/admin/app/translations.js b/admin/app/translations.js
index 04b37e08..c37a090e 100644
--- a/admin/app/translations.js
+++ b/admin/app/translations.js
@@ -30,7 +30,8 @@ function config($translateProvider) {
                     ONPEAK: 'On-peak',
                     OFFPEAK: 'Off-peak',
                     MIDPEAK: 'Mid-peak'
-                }
+                },
+                QR_CODE: 'QR Code'
             },
             FDD: {
                 ID: 'ID',
@@ -1015,7 +1016,8 @@ function config($translateProvider) {
                     ONPEAK: '峰',
                     OFFPEAK: '谷',
                     MIDPEAK: '平'
-                }
+                },
+                QR_CODE:"二维码"
             },
             FDD: {
                 ID: 'ID',
@@ -2007,7 +2009,8 @@ function config($translateProvider) {
                     ONPEAK: 'Gipfel',
                     OFFPEAK: 'Senke',
                     MIDPEAK: 'Niveau'
-                }
+                },
+                QR_CODE: 'QR Code'
             },
             FDD: {
                 ID: 'ID',
@@ -2491,8 +2494,7 @@ function config($translateProvider) {
                 MASTER_METER: 'Überlegenes Messgerät',
                 SELECT_MASTER_METER: 'Wählen Sie das übergeordnete Messgerät aus',
                 TREE_VIEW: 'Baumsicht',
-                CHILD_METERS: 'Unterer Füllstandsmesser',
-                QR_CODE: 'QR Code'
+                CHILD_METERS: 'Unterer Füllstandsmesser'
             },
             SENSOR: {
                 ADD_SENSOR: 'Sensor hinzufügen',
diff --git a/admin/views/settings/combinedequipment/combinedequipment.model.html b/admin/views/settings/combinedequipment/combinedequipment.model.html
index 420c5299..f437994f 100644
--- a/admin/views/settings/combinedequipment/combinedequipment.model.html
+++ b/admin/views/settings/combinedequipment/combinedequipment.model.html
@@ -49,6 +49,13 @@
                   </div>
               </div>
           </div>
+          <div class="form-group"><label class="col-sm-4 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+          <div class="col-sm-8">
+              <div>
+                   <qrcode data="{{combinedequipment.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+              </div>
+          </div>
+        </div>
         </form>
     </div>
     <div class="modal-footer">
diff --git a/admin/views/settings/equipment/equipment.model.html b/admin/views/settings/equipment/equipment.model.html
index 2f448f8b..89f6f817 100644
--- a/admin/views/settings/equipment/equipment.model.html
+++ b/admin/views/settings/equipment/equipment.model.html
@@ -49,6 +49,13 @@
                   </div>
               </div>
           </div>
+          <div class="form-group"><label class="col-sm-4 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+              <div class="col-sm-8">
+                  <div>
+                       <qrcode data="{{equipment.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+                  </div>
+              </div>
+          </div>
         </form>
     </div>
     <div class="modal-footer">
diff --git a/admin/views/settings/meter/meter.model.html b/admin/views/settings/meter/meter.model.html
index 22dd9df3..9371006e 100644
--- a/admin/views/settings/meter/meter.model.html
+++ b/admin/views/settings/meter/meter.model.html
@@ -101,7 +101,7 @@
                   </div>
               </div>
             </div>
-            <div class="form-group"><label class="col-sm-4 control-label">{{'METER.QR_CODE' | translate}} </label>
+            <div class="form-group"><label class="col-sm-4 control-label">{{'COMMON.QR_CODE' | translate}} </label>
              <div class="col-sm-8">
                   <div>
                        <qrcode data="{{meter.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
diff --git a/admin/views/settings/shopfloor/shopfloor.model.html b/admin/views/settings/shopfloor/shopfloor.model.html
index 8951b162..2313665a 100644
--- a/admin/views/settings/shopfloor/shopfloor.model.html
+++ b/admin/views/settings/shopfloor/shopfloor.model.html
@@ -62,6 +62,13 @@
                   </div>
               </div>
             </div>
+            <div class="form-group"><label class="col-sm-2 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+             <div class="col-sm-10">
+                  <div>
+                       <qrcode data="{{shopfloor.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+                  </div>
+              </div>
+            </div>
         </form>
     </div>
     <div class="modal-footer">
diff --git a/admin/views/settings/space/space.model.html b/admin/views/settings/space/space.model.html
index ad044385..b26a5031 100644
--- a/admin/views/settings/space/space.model.html
+++ b/admin/views/settings/space/space.model.html
@@ -111,7 +111,13 @@
                     </div>
                 </div>
             </div>
-
+            <div class="form-group"><label class="col-sm-4 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+             <div class="col-sm-8">
+                  <div>
+                       <qrcode data="{{space.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+                  </div>
+              </div>
+            </div>
         </form>
     </div>
     <div class="modal-footer">
diff --git a/admin/views/settings/store/store.model.html b/admin/views/settings/store/store.model.html
index 2c535c1b..6a166bf6 100644
--- a/admin/views/settings/store/store.model.html
+++ b/admin/views/settings/store/store.model.html
@@ -98,6 +98,13 @@
                   </div>
               </div>
             </div>
+            <div class="form-group"><label class="col-sm-2 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+             <div class="col-sm-10">
+                  <div>
+                       <qrcode data="{{store.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+                  </div>
+              </div>
+            </div>
         </form>
     </div>
     <div class="modal-footer">
diff --git a/admin/views/settings/tenant/tenant.model.html b/admin/views/settings/tenant/tenant.model.html
index cc69506b..1f7fd40a 100644
--- a/admin/views/settings/tenant/tenant.model.html
+++ b/admin/views/settings/tenant/tenant.model.html
@@ -132,6 +132,13 @@
                   </div>
               </div>
             </div>
+            <div class="form-group"><label class="col-sm-2 control-label">{{'COMMON.QR_CODE' | translate}} </label>
+              <div class="col-sm-10">
+                  <div>
+                       <qrcode data="{{tenant.qrcode}}" version="1" error-correction-level="L" size="100" color="#fff" background="#000" download></qrcode>
+                  </div>
+              </div>
+            </div>
         </form>
     </div>
     <div class="modal-footer">