Sfoglia il codice sorgente

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

hanchaobo 2 anni fa
parent
commit
44bca173aa

+ 2
- 1
package.json Vedi File

16
   },
16
   },
17
   "dependencies": {
17
   "dependencies": {
18
     "@element-plus/icons-vue": "2.3.1",
18
     "@element-plus/icons-vue": "2.3.1",
19
-    "@qomo-platform/core": "^1.0.65",
19
+    "@qomo-platform/core": "^1.0.94",
20
     "@vueup/vue-quill": "1.2.0",
20
     "@vueup/vue-quill": "1.2.0",
21
     "@vueuse/core": "10.6.1",
21
     "@vueuse/core": "10.6.1",
22
     "axios": "1.6.7",
22
     "axios": "1.6.7",
27
     "jsencrypt": "3.3.2",
27
     "jsencrypt": "3.3.2",
28
     "less": "^4.2.0",
28
     "less": "^4.2.0",
29
     "md5": "^2.3.0",
29
     "md5": "^2.3.0",
30
+    "monaco-editor": "^0.50.0",
30
     "nprogress": "0.2.0",
31
     "nprogress": "0.2.0",
31
     "pinia": "2.1.7",
32
     "pinia": "2.1.7",
32
     "pinia-plugin-persistedstate": "^3.2.1",
33
     "pinia-plugin-persistedstate": "^3.2.1",

+ 12
- 0
src/router/index.js Vedi File

141
       }
141
       }
142
     ]
142
     ]
143
   },
143
   },
144
+  {
145
+    path: '',
146
+    component: Layout,
147
+    children: [
148
+      {
149
+        path: "test/index",
150
+        component: () => import("@/views/test/index"),
151
+        name: "Test",
152
+        meta: { title: "测试组件", icon: "tree", affix: true }
153
+      }
154
+    ]
155
+  },
144
 ];
156
 ];
145
 
157
 
146
 //本地调试默认路由
158
 //本地调试默认路由

+ 3
- 1
src/views/miningAnalysis/statistics/index.vue Vedi File

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

+ 1246
- 0
src/views/test/index.vue
File diff suppressed because it is too large
Vedi File


+ 2
- 0
vite.config.js Vedi File

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