diff --git a/package.json b/package.json index 71788f1c..1a17ce14 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,8 @@ "babylonjs-gui": "^6.46.0", "babylonjs-loaders": "^6.46.0", "cesium": "1.75", - "codemirror": "5.65.5", + "codemirror": "^5.65.17", + "codemirror-editor-vue3": "^2.7.0", "core-js": "3.29.0", "cropperjs": "1.5.13", "crypto-browserify": "^3.12.0", diff --git a/src/api/model/enm.js b/src/api/model/enm.js index d562fadd..44ef9bae 100644 --- a/src/api/model/enm.js +++ b/src/api/model/enm.js @@ -3,6 +3,64 @@ import http from "@/utils/request" /*EM接口*/ export default { // 测点 + xscript: { + list: { + name: "脚本", + req: async function(data){ + return await http.get( + `${config.API_URL}/enm/xscript/`, + data + ); + } + }, + item: { + name: "获取详情", + req: async function(id){ + return await http.get( + `${config.API_URL}/enm/xscript/${id}/` + ); + } + }, + update: { + name: "更新", + req: async function(id, data){ + return await http.put( + `${config.API_URL}/enm/xscript/${id}/`, + data); + } + }, + create: { + name: "创建", + req: async function(data){ + return await http.post( + `${config.API_URL}/enm/xscript/`, + data); + } + }, + delete: { + name: "删除", + req: async function(id){ + return await http.delete( + `${config.API_URL}/enm/xscript/${id}/`); + } + }, + toggle: { + name: "启用/禁用", + req: async function(id, data){ + return await http.put( + `${config.API_URL}/enm/xscript/${id}/toggle/`, + data); + } + }, + change_data: { + name: "变更数据", + req: async function(id, data){ + return await http.put( + `${config.API_URL}/enm/xscript/${id}/change_data/`, + data); + } + } + }, mpoint: { mplog: { name: "测点原始记录", diff --git a/src/config/route.js b/src/config/route.js index e65b8251..9f1deca1 100644 --- a/src/config/route.js +++ b/src/config/route.js @@ -2721,7 +2721,7 @@ const routes = [ { path: "/fac_cal/mpointstat", meta: { - title: "计算数据", + title: "计算结果", // icon: "el-icon-postcard", type: "menu", perms: ["mpointstat"], diff --git a/src/views/em/mpoint_form.vue b/src/views/em/mpoint_form.vue index 2a999594..ea3b5f15 100644 --- a/src/views/em/mpoint_form.vue +++ b/src/views/em/mpoint_form.vue @@ -161,6 +161,8 @@ diff --git a/src/views/fac_cal/caltask.vue b/src/views/fac_cal/caltask.vue new file mode 100644 index 00000000..371934de --- /dev/null +++ b/src/views/fac_cal/caltask.vue @@ -0,0 +1,40 @@ + + \ No newline at end of file diff --git a/src/views/fac_cal/mpointstat.vue b/src/views/fac_cal/mpointstat.vue new file mode 100644 index 00000000..6f658343 --- /dev/null +++ b/src/views/fac_cal/mpointstat.vue @@ -0,0 +1,222 @@ + + + + diff --git a/src/views/fac_cal/taskresult.vue b/src/views/fac_cal/taskresult.vue new file mode 100644 index 00000000..d63d2f62 --- /dev/null +++ b/src/views/fac_cal/taskresult.vue @@ -0,0 +1,75 @@ + + \ No newline at end of file diff --git a/src/views/fac_cal/xscript.vue b/src/views/fac_cal/xscript.vue new file mode 100644 index 00000000..80fc545e --- /dev/null +++ b/src/views/fac_cal/xscript.vue @@ -0,0 +1,224 @@ + + diff --git a/src/views/home/blank.vue b/src/views/home/blank.vue new file mode 100644 index 00000000..d4b7d494 --- /dev/null +++ b/src/views/home/blank.vue @@ -0,0 +1,5 @@ + diff --git a/src/views/mtm/route_form.vue b/src/views/mtm/route_form.vue index bed5e2ec..1a80117d 100644 --- a/src/views/mtm/route_form.vue +++ b/src/views/mtm/route_form.vue @@ -175,7 +175,7 @@ const defaultForm = { material_out:'', hour_work:0, batch_bind: true, - // is_autotask: true, + is_autotask: true, // is_count_utask: false, }; export default { diff --git a/src/views/sys/myschedule.vue b/src/views/sys/myschedule.vue index 8f29a37d..84e67180 100644 --- a/src/views/sys/myschedule.vue +++ b/src/views/sys/myschedule.vue @@ -1,11 +1,16 @@