Merge remote-tracking branch 'origin/master' into ljh-sass

src/views/home/navMenu.vue

@@ -119,7 +119,7 @@
                   :disabled="editForm.database.includes('all')"
                   :disabled="editForm.database.includes('all')"
                   v-for="it in dataBase"
                   v-for="it in dataBase"
                   :key="it"
                   :key="it"
-                  :label="`${it.databaseName}(${it.dataHost})`"
+                  :label="`${it.databaseName}`"
                   :value="it.id"></el-option>
                   :value="it.id"></el-option>
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>

vue.config.js

 const { defineConfig } = require('@vue/cli-service')
 const { defineConfig } = require('@vue/cli-service')
 module.exports = defineConfig({
 module.exports = defineConfig({
   transpileDependencies: true,
   transpileDependencies: true,
-  devServer: {
-    port: 8082,
-    host: '',
-    proxy: {
-      '/api': {
-        target: 'http://10.168.31.222:8096',
-
-        changeOrigin: true
-        // pathRewrite: {
-        //   '^/api': '',
-        // },
-      }
-    }
-  }
+  // devServer: {
+  //   port: 8082,
+  //   host: '',
+  // }
 })
 })