Merge branch 'master' of http://ver.wh613.com:3000/shentun/peisweb

package-lock.json

@@ -16,6 +16,7 @@
         "sortablejs": "^1.15.0",
         "vue": "^2.6.14",
         "vue-json-excel": "^0.3.0",
+        "vue-meta": "^2.4.0",
         "vue-print-nb": "^1.7.5",
         "vue-router": "^3.5.1",
         "vuex": "^3.6.2"
@@ -10992,6 +10993,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/vue-meta": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmmirror.com/vue-meta/-/vue-meta-2.4.0.tgz",
+      "integrity": "sha512-XEeZUmlVeODclAjCNpWDnjgw+t3WA6gdzs6ENoIAgwO1J1d5p1tezDhtteLUFwcaQaTtayRrsx7GL6oXp/m2Jw==",
+      "dependencies": {
+        "deepmerge": "^4.2.2"
+      }
+    },
+    "node_modules/vue-meta/node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmmirror.com/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/vue-print-nb": {
       "version": "1.7.5",
       "resolved": "https://registry.npmjs.org/vue-print-nb/-/vue-print-nb-1.7.5.tgz",

package.json

@@ -19,6 +19,7 @@
     "sortablejs": "^1.15.0",
     "vue": "^2.6.14",
     "vue-json-excel": "^0.3.0",
+    "vue-meta": "^2.4.0",
     "vue-print-nb": "^1.7.5",
     "vue-router": "^3.5.1",
     "vuex": "^3.6.2"

src/components/patientRegister/PatientRegisterList.vue

@@ -166,7 +166,10 @@
         <el-button type="primary" class="btnClass">调整项目</el-button>
       </div>
       <div class="listBtn">
-        <el-button id="btn" type="primary" class="btnClass">打指引单</el-button>
+        <el-button type="primary" class="btnClass" @click="guidePrint">打指引单</el-button>
+      </div>
+      <div class="listBtn">
+        <el-button id="btntyfghkjhjhgfyudhfsojkafa" type="primary" data-parms="{'title':'electron'}" class="btnClass">electron</el-button>
       </div>
     </div>
 
@@ -181,6 +184,12 @@
       :append-to-body="true" :close-on-click-modal="false">
       <Camera :id="patientRegister.patientRegisterId" />
     </el-dialog>
+
+    <!-- 指引单 -->
+    <el-dialog title="指引单" :visible.sync="dialogGuide" width="400" height="800" 
+      :append-to-body="true" :close-on-click-modal="false">
+      <div>{{ guideMsg }}</div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -205,6 +214,8 @@ export default {
       multipleSelection: [], //选中的数据列表
       dialogVisible: false,
       dialogCamera: false,
+      dialogGuide:false,
+      guideMsg:'guideMsg',
       tabChoosed: "1",
       formInitData: {},      //体检登记初始表单数据
       editTimes: 0,
@@ -221,6 +232,17 @@ export default {
   methods: {
     ...mapActions(["getCustomerOrgGroup", "getPatientRegisterAbs"]), 
     
+    async guidePrint(){
+      console.log('点击指引单按钮')
+      this.dialogGuide = true;
+      try{
+        console.log('window.electronApI',window.electronApI)
+        this.guideMsg = await window.electronApI.printPre("print parameters");
+      }catch(err){
+        console.log('点击指引单按钮错误：',err)
+      }            
+    },
+
     handleSelectionChange(val) {
       this.multipleSelection = val;
       //console.log('this.multipleSelection',this.multipleSelection)

src/main.js

@@ -4,13 +4,19 @@ import router from "./router";
 import store from "./store";
 import ElementUI from "element-ui";
 import "element-ui/lib/theme-chalk/index.css";
-Vue.use(ElementUI);
 import axios from "axios";
+import JsonExcel from "vue-json-excel"; //vue全局导入导出excel
+import Print from "vue-print-nb";
+import Meta from 'vue-meta'
+
+
+Vue.use(Meta);
+Vue.use(ElementUI);
+
 
 console.log('vue',Vue.prototype)
 Vue.prototype.$axios = axios;
-import JsonExcel from "vue-json-excel"; //vue全局导入导出excel
-import Print from "vue-print-nb";
+
 Vue.use(Print);
 Vue.component("downloadExcel", JsonExcel);
 Vue.config.productionTip = false;
@@ -62,7 +68,22 @@ Vue.filter("dateFormat", (dataStr) => {
 new Vue({
   router,
   store,
+  metaInfo(){
+    return {
+        title: '神豚体检管理系统',
+        meta: [
+            {
+                name:"http-equiv",
+                content: "Content-Security-Policy", //http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline';">
+            },{
+                name:"content",
+                content: "default-src 'self' 'unsafe-inline';",  //指向data的数据
+            }
+        ]
+    }
+  },
   render: (h) => h(App),
+
 }).$mount("#app");
 
 

src/views/login/Login.vue

@@ -29,6 +29,9 @@
             <el-button type="primary" class="btn" @click="onSubmit(form)"
               >用户登录</el-button
             >
+            <!--
+            <el-button  id="btn" type="primary" data-parms="11111111" class="btn">测试</el-button>
+            -->
           </el-form>
         </div>
       </div>

vue.config.js

@@ -15,4 +15,16 @@ module.exports = defineConfig({
       },
     },
   },
+  // pages: {
+  //   index: {
+  //     entry: 'src/main.js',
+  //     template: 'src/App.vue',
+  //     filname: 'index.html'
+  //   },
+  //   about: {
+  //     entry: 'src/main.js',
+  //     template: 'src/App.vue',
+  //     filname: 'about.html'
+  //   },
+  // }
 });