Merge branch 'hcb' of kn-cost/cost-frontend into dev

package.json

@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "2.3.1",
-    "@qomo-platform/core": "^1.0.65",
+    "@qomo-platform/core": "^1.0.94",
     "@vueup/vue-quill": "1.2.0",
     "@vueuse/core": "10.6.1",
     "axios": "1.6.7",
@@ -27,6 +27,7 @@
     "jsencrypt": "3.3.2",
     "less": "^4.2.0",
     "md5": "^2.3.0",
+    "monaco-editor": "^0.50.0",
     "nprogress": "0.2.0",
     "pinia": "2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",

src/router/index.js

@@ -141,6 +141,18 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '',
+    component: Layout,
+    children: [
+      {
+        path: "test/index",
+        component: () => import("@/views/test/index"),
+        name: "Test",
+        meta: { title: "测试组件", icon: "tree", affix: true }
+      }
+    ]
+  },
 ];
 
 //本地调试默认路由

src/views/miningAnalysis/statistics/index.vue

@@ -3,13 +3,14 @@
 import { defineComponent, ref } from "vue";
 import { ElMessage } from "element-plus";
 import Echarts from "@/components/Echarts/index.vue";
+import { tr } from "element-plus/es/locale";
 export default defineComponent({
   setup() {
     const tableRef = ref();
     const tableRef1 = ref();
     //列
     const columns1 = ref([
-      { prop: "districtName", label: "物料编号", hideInAddOrEditForm: true, hideInSearchForm: true },
+      { prop: "districtName", label: "物料编号"},
       { label: "版本号", prop: "name" },
       { label: "实际总成本", prop: "date123" },
       { label: "标准总成本", prop: "date123" },
@@ -102,6 +103,7 @@ export default defineComponent({
             columns={columns.value}
             queryParamsToUrl
             ref={tableRef}
+            request={true}
             curdConfig={{
 
             }}

vite.config.js

@@ -3,6 +3,7 @@ import path from "path";
 import createVitePlugins from "./vite/plugins";
 import tailwindcss from "tailwindcss";
 import autoprefixer from "autoprefixer";
+import { monacoAlias } from "@qomo-platform/vite-plugin"
 const { networkInterfaces } = require("os");
 
 /** 获取本地IP地址 */
@@ -35,6 +36,7 @@ export default defineConfig(({ mode, command }) => {
         "~": path.resolve(__dirname, "./"),
         // 设置别名
         "@": path.resolve(__dirname, "./src"),
+        ...monacoAlias
       },
       // https://cn.vitejs.dev/config/#resolve-extensions
       extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue"],