feat:合并

sample-form-client-ui/admin/package.json

@@ -26,6 +26,7 @@
     "moment": "^2.29.4",
     "npm": "^6.13.7",
     "secure-ls": "^1.2.6",
+    "v-scale-screen": "1.0.2",
     "voca": "^1.4.0",
     "vue": "^2.6.14",
     "vue-barcode": "^1.3.0",

sample-form-client-ui/admin/src/App.vue

 <template>
-  <div class="app">
-    <router-view></router-view>
-    <NetworkError :isShowError="isShowError"></NetworkError>
-    <EnabledDev :enabled="enabled"></EnabledDev>
-  </div>
+  <v-scale-screen width="1920" height="1080" :fullScreen="true">
+    <div class="app">
+      <router-view></router-view>
+      <NetworkError :isShowError="isShowError"></NetworkError>
+      <EnabledDev :enabled="enabled"></EnabledDev>
+    </div>
+  </v-scale-screen>
 </template>
 
 <script>

sample-form-client-ui/admin/src/main.js

@@ -30,6 +30,9 @@ Vue.use(scroll);
 // 格式化插件
 import format from "vue-text-format";
 Vue.use(format);
+// 屏幕适配
+import VScaleScreen from "v-scale-screen";
+Vue.use(VScaleScreen);
 
 // 引入数据埋点
 import vueStatistics from "@/utils/vue-statistics";

sample-form-client-ui/admin/yarn.lock

@@ -9448,6 +9448,14 @@ uuid@^8.3.2:
   resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
+<<<<<<< HEAD
+=======
+v-scale-screen@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/v-scale-screen/-/v-scale-screen-1.0.2.tgz#8c911e3dd5ff93f56ff719511e5cafd58f0678a6"
+  integrity sha512-qMXPglHIs8KnhzDBdEBLcIoF3q7jgFCTWNIVPD5M0FGBkD+amYjbFUoLdKol/Xylm+pli4AHOZOqwyL6xX62SA==
+
+>>>>>>> 3c197365888be2d5d4d557ece6830e3655c56d5d
 v8-compile-cache@^2.0.3:
   version "2.3.0"
   resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"