diff --git a/src/config/route.js b/src/config/route.js
index 9d3b3a73..3bf60ab7 100644
--- a/src/config/route.js
+++ b/src/config/route.js
@@ -2366,6 +2366,16 @@ const routes = [
"perms": ["enm_base"]
},
"component": "enm_base/material"
+ },
+ {
+ "name": "formula",
+ "path": "/enm_base/formula",
+ "meta": {
+ "title": "计算公式",
+ "icon": "el-icon-grid",
+ "perms": ["enm_base"]
+ },
+ "component": "enm_base/formulaSetting"
}
]
},
diff --git a/src/views/enm_base/formulaSetting.vue b/src/views/enm_base/formulaSetting.vue
new file mode 100644
index 00000000..d208b984
--- /dev/null
+++ b/src/views/enm_base/formulaSetting.vue
@@ -0,0 +1,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/enm_base/settings/calculate.vue b/src/views/enm_base/settings/calculate.vue
new file mode 100644
index 00000000..92788481
--- /dev/null
+++ b/src/views/enm_base/settings/calculate.vue
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
diff --git a/src/views/enm_kilnbase/handoverLog.vue b/src/views/enm_kilnbase/handoverLog.vue
index d40cfbc4..bdb8db27 100644
--- a/src/views/enm_kilnbase/handoverLog.vue
+++ b/src/views/enm_kilnbase/handoverLog.vue
@@ -256,7 +256,7 @@ export default {
name: "sflog",
data() {
return {
- apiObj: this.$API.wpm.sflog.list,
+ apiObj: null,
apiObj2: null,
query: {
shift: "",