Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/option/basic/basicPrintTemplate.js

@@ -212,11 +212,11 @@ export default {
       dicData: [
         {
           label: "开启",
-          value: "1",
+          value: true,
         },
         {
           label: "关闭",
-          value: "0",
+          value: false,
         },
       ],
     },

src/views/basic/printTemplate/basicPrintTemplate.vue

@@ -141,6 +141,9 @@
       rowSave(row, done, loading) {
         console.log("row",row);
         row.fileName = this.fileName;
+        if(!row.knifeSwitch){
+          row.knifeSwitch = true;
+        }
         add(row).then(() => {
           this.onLoad(this.page);
           this.$message({

src/views/wel/index.vue

@@ -468,3 +468,23 @@
   user-select: none;
 }
 </style>
+<script>
+import { mapGetters } from 'vuex';
+export default {
+  name: 'wel',
+  data() {
+    return {
+      activeNames: ['1', '2', '3', '5'],
+      logActiveNames: ['29'],
+    };
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+  },
+  methods: {
+    handleChange(val) {
+      window.console.log(val);
+    },
+  },
+};
+</script>