Merge branch 'dev' of http://git.patzn.com/root/patzn-cloud-service-metr-web into dev

pages/meter-certificate/CertificateMakeLook.vue

 <template>
   <div>
-    <Modal v-model="showDiagramModalSampleLook" title="检定（校准）证书" width="100%" class="footer-hidden iframeSampleLookThree">
-      <div id="iframeSampleLookThree" style="text-align:center;align-content:center;width: 100%;height: 790px">
-      </div>
-      <div slot="footer">
-      </div>
-    </Modal>
+<!--    <Modal v-model="showDiagramModalSampleLook" title="检定（校准）证书" width="100%" class="footer-hidden iframeSampleLookThree">-->
+<!--      <div id="iframeSampleLookThree" style="text-align:center;align-content:center;width: 100%;height: 790px">-->
+<!--      </div>-->
+<!--      <div slot="footer">-->
+<!--      </div>-->
+<!--    </Modal>-->
     <div v-show="showDiagramModalSampleLook">
       <RecordIframe ref="iframeModal"></RecordIframe>
     </div>
@@ -79,12 +79,12 @@ export default {
         name !== 'only'
           ? 'http://record.patzn.com:7000/print/v1/eln/form_meter_' + formId
           : 'http://record.patzn.com:7000/print/v1/form/' + formId
-      $('#iframeSampleLookThree').html(
-        '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' +
-          encodeURI(url) +
-          '></iframe>'
-      )
-      // this.$refs.iframeModal._createIframe(url)
+      // $('#iframeSampleLookThree').html(
+      //   '<iframe style="padding: 0px;width:100%;height:100%" frameborder="0" src=' +
+      //     encodeURI(url) +
+      //     '></iframe>'
+      // )
+      this.$refs.iframeModal._createIframe(url)
     }
   }
 }