Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

src/pages/bsmanager/patrolMaintenance/maintenance/components/QRCodeDesign/index.js

@@ -44,7 +44,9 @@ const QRCodeView = (props) => {
         </div>
       </div>
       <div className={styles.pandaLogo} active={`${active === 'IsPandaLogo'}`}>
-        <div className={styles.pandaLogoC} style={{ display: values.IsPandaLogo ? 'block' : 'none' }}></div>
+        <div className={styles.pandaLogoC} style={{ display: values.IsPandaLogo ? 'block' : 'none' }}>
+          <img style={{ width: '100%', height: '100%' }} src={require('@/assets/images/bsmanager/patrolMaintenance/maintenance/熊猫logo.png')} />
+        </div>
       </div>
       <div className={styles.info}>
         {isBatch ? <span className={styles.tag} type={'设备名称'}>【设备名称】</span> : <div className={styles.DeviceName}>{values.DeviceName}</div>}

src/pages/bsmanager/patrolMaintenance/maintenance/components/QRCodeDesign/index.less

 @imgSrc: '@/assets/images/bsmanager/patrolMaintenance/maintenance';
+
 .QRCodeModal {
   .ant-modal-header {
     padding: 0
   }
+
   .ant-modal-content {
     border-radius: 25px;
     overflow: hidden;
   }
+
   .ant-modal-close-x {
     width: 50px;
     height: 50px;
     line-height: 56px;
   }
+
   .qrCodeCell {
     &:hover {
       cursor: pointer;
     }
   }
+
   .QRCodeTitle {
     width: 100%;
     height: 57px;
@@ -28,14 +33,17 @@
     padding-left: 20px;
     font-size: 20px;
   }
+
   .QRCodeList {
     width: 100%;
     height: 100%;
+
     .table {
       .ant-table-thead {
         .ant-table-cell {
           background: linear-gradient(to bottom, #FEFEFF, #D5E9FF);
         }
+
         th {
           border-bottom: 2px solid #DBE7FB;
           text-align: center;
@@ -43,9 +51,11 @@
           text-overflow: ellipsis;
         }
       }
+
       .ant-pro-table-list-toolbar-container {
         padding: 10px 0;
       }
+
       .ant-table-body {
         tr {
           td {
@@ -53,15 +63,19 @@
             border-right: 1px solid #DBE7FB;
           }
         }
+
         .ant-table-row {
           padding: 4px;
         }
+
         tr:nth-child(even) {
           background: #F3F9FF;
+
           .panda-civ-workflow-table-cell-fix-right {
             background-color: #F3F9FF;
           }
         }
+
         &::-webkit-scrollbar {
           width: 0;
           height: 6px;
@@ -69,10 +83,12 @@
       }
     }
   }
+
   .QRCodeDesign {
     width: 100%;
     height: 100%;
     display: flex;
+
     .left {
       flex: 1;
       width: 100%;
@@ -80,6 +96,7 @@
       border-radius: 5px;
       border: 1px solid #BCDEFF;
       overflow: hidden;
+
       .header {
         position: relative;
         width: 100%;
@@ -89,22 +106,26 @@
         background: linear-gradient(to right, #EEF6FF, #FBFDFF);
         padding: 0 10px 0 10px;
         border-bottom: 1px solid #BCDEFF;
+
         .h-icon {
           width: 4px;
           height: 15px;
           border-radius: 3px;
           background: #1685FF;
         }
+
         .h-text {
           font-weight: bold;
           margin-left: 5px;
         }
+
         .h-background {
           width: 50%;
           height: 100%;
           background: url('@{imgSrc}/编辑字段背景.png');
           background-size: 100% 100%;
         }
+
         .h-bgArrow {
           position: absolute;
           right: 5%;
@@ -114,27 +135,33 @@
           background-size: 100% 100%;
         }
       }
+
       .content {
         width: 100%;
         height: calc(100% - 42px);
         background: white;
+
         .gName {
           padding: 10px;
           font-weight: 700;
           border-bottom: 1px solid #EEEEEE;
         }
+
         .tag {
           padding: 2px 10px;
           border-radius: 1px;
+
           &[type='设备名称'] {
             background: rgb(205 235 221);
             color: rgb(42 91 68);
           }
+
           &[type='设备编号'] {
             color: rgb(224, 95, 66);
             background: rgb(224 201 196);
           }
         }
+
         .uploadIcon {
           width: 30px;
           height: 32px;
@@ -142,6 +169,7 @@
           background: url('@{imgSrc}/上传文件.png');
           background-size: 100% 100%;
         }
+
         .uploadBtn {
           width: 75px;
           height: 28px;
@@ -153,12 +181,14 @@
         }
       }
     }
+
     .right {
       width: 500px;
       height: 100%;
       display: flex;
       justify-content: center;
       align-items: center;
+
       .box {
         width: 620px;
         height: 980px;
@@ -166,6 +196,7 @@
       }
     }
   }
+
   .downIcon {
     width: 15px;
     height: 15px;
@@ -184,26 +215,31 @@
   background: url('@{imgSrc}/二维码背景.png');
   background-size: 100% 100%;
   position: relative;
+
   .company {
     height: 100px;
     color: white;
     padding: 3%;
     text-align: center;
     font-size: 40px;
+
     &[active='true'] {
       border: 1.5px solid #f57c00;
     }
   }
+
   .title {
     text-align: center;
     font-size: 52px;
     color: white;
     font-weight: 700;
     font-style: italic;
+
     &[active='true'] {
       border: 1.5px solid #f57c00;
     }
   }
+
   .QR {
     position: absolute;
     top: 37.5%;
@@ -211,6 +247,7 @@
     width: 47.3%;
     height: 29.7%;
     overflow: hidden;
+
     .QRLogo {
       z-index: 99;
       position: absolute;
@@ -219,9 +256,11 @@
       transform: translate(-50%, -50%);
       width: 86px;
       height: 86px;
+
       &[active='true'] {
         border: 1.5px solid #f57c00;
       }
+
       .systemLogo {
         width: 100%;
         height: 100%;
@@ -230,6 +269,7 @@
       }
     }
   }
+
   .pandaLogo {
     position: absolute;
     left: 50%;
@@ -237,16 +277,19 @@
     bottom: 22%;
     width: 47%;
     height: 5%;
+
     .pandaLogoC {
-      width: 100%;
-      height: 100%;
-      background: url('@{imgSrc}/熊猫logo.png');
-      background-size: 100% 100%;
+      // width: 100%;
+      // height: 100%;
+      // background: url('@{imgSrc}/熊猫logo.png');
+      // background-size: 100% 100%;
     }
+
     &[active='true'] {
       border: 1.5px solid #f57c00;
     }
   }
+
   .info {
     position: absolute;
     left: 50%;
@@ -254,25 +297,30 @@
     transform: translateX(-50%);
     width: 84%;
     height: 10%;
+
     .tag {
       margin-left: 29%;
       padding: 4px 20px;
       border-radius: 2px;
       font-size: 26px;
+
       &[type='设备名称'] {
         background: rgb(205 235 221);
         color: rgb(42 91 68);
       }
+
       &[type='设备编号'] {
         color: rgb(224, 95, 66);
         background: rgb(224 201 196);
       }
     }
+
     .DeviceName {
       text-align: center;
       font-size: 30px;
       font-weight: bold;
     }
+
     .DeviceCode {
       text-align: center;
       font-size: 30px;
@@ -285,6 +333,7 @@
   .ant-modal {
     zoom: 0.5;
   }
+
   .ant-modal-close-x {
     width: 40px;
     height: 40px;