Merge branch 'master' of http://git.xt.wenhq.top:8083/wenhongquan/khyznh-ui

# Conflicts:
#	vite.config.ts

src/components/Public/table.vue

@@ -107,7 +107,8 @@ const getJsonDataFormat = (str, data, prop, pprop) =>{
 
 const getObjectData = (data, prop) => {
     var obj = JSON.parse(data);
-    return eval("obj." + prop)
+  // return eval("obj." + prop)
+  return obj[prop];
 }
 
 const getJsonData = (data, pprop, prop) => {
@@ -144,4 +145,4 @@ defineExpose({
 onMounted(() => {
 
 });
-</script>
+</script>

vite.config.ts

@@ -26,8 +26,8 @@ export default defineConfig(({ mode, command }: ConfigEnv): UserConfig => {
       open: true,
       proxy: {
         [env.VITE_APP_BASE_API]: {
-          target: 'http://localhost:8080',
-          // target: 'http://47.104.97.60/api',
+          // target: 'http://localhost:8080',
+          target: 'http://47.104.97.60/api',
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')