diff --git a/src/api/ranger.js b/src/api/ranger.js
index de90978692d54026dd8138ee2ca01eca3060be1e..0e2754368d95f0dc392b1045423fff636d1eaa44 100644
--- a/src/api/ranger.js
+++ b/src/api/ranger.js
@@ -145,3 +145,19 @@ export function getRouteAssemblesApi(data) {
export function getRouteAssemblesListApi(data) {
return getReq(`/ranger/inspection/api/v1/route/assembles/assembleList`, data);
}
+
+export function addRouteAssemblesListApi(data) {
+ return postReq(`/ranger/inspection/api/v1/route/assembles`, data);
+}
+
+export function getPllaceListApi(data) {
+ return postReq('/ranger/inspection/api/v1/place/page', data);
+}
+
+export function updateRouteAssemblesApi(data) {
+ return putReq('/ranger/inspection/api/v1/route/assembles', data);
+}
+
+export function setRouteAssemblesOrderApi(data) {
+ return putReq('/ranger/inspection/api/v1/route/assembles/assembleOrder', data);
+}
diff --git a/src/components/table/table.vue b/src/components/table/table.vue
index dc767b2dd41a099168031c4f8c48159bc127df03..349c32716f2fda93c24bf36a5b66265aebe801e5 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -16,7 +16,7 @@
更多查询
重置
- 查询
+ 查询
@@ -246,6 +246,11 @@ export default {
this.getData();
},
+ resetGetData() {
+ this.initQuery = { ...initQuery };
+ this.getData();
+ },
+
refreshView() {
this.data = [...this.data];
},
diff --git a/src/pages/ranger/basic/line/Assemble/add.vue b/src/pages/ranger/basic/line/Assemble/add.vue
deleted file mode 100644
index ca83d06ad834859545e8af87febdfdba5cfbe5f3..0000000000000000000000000000000000000000
--- a/src/pages/ranger/basic/line/Assemble/add.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-
-
-
-
-
diff --git a/src/pages/ranger/basic/line/Assemble/addItem.vue b/src/pages/ranger/basic/line/Assemble/addItem.vue
new file mode 100644
index 0000000000000000000000000000000000000000..806aa7db7914824e4ed865dfa63b91952c3ee32e
--- /dev/null
+++ b/src/pages/ranger/basic/line/Assemble/addItem.vue
@@ -0,0 +1,88 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dataType[row.dataType] }}
+
+
+
+
+
+
+
+
diff --git a/src/pages/ranger/basic/line/Assemble/addPlace.vue b/src/pages/ranger/basic/line/Assemble/addPlace.vue
new file mode 100644
index 0000000000000000000000000000000000000000..8fa5af48dd36b8e2d245a1e938b2cbb5a402a203
--- /dev/null
+++ b/src/pages/ranger/basic/line/Assemble/addPlace.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
diff --git a/src/pages/ranger/basic/line/Assemble/addUnit.vue b/src/pages/ranger/basic/line/Assemble/addUnit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..6adadeb71265294e426bbee50ae026d5f34effcf
--- /dev/null
+++ b/src/pages/ranger/basic/line/Assemble/addUnit.vue
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
diff --git a/src/pages/ranger/basic/line/Assemble/index.vue b/src/pages/ranger/basic/line/Assemble/index.vue
index 3742e54c1bebe9db24142298767df5e0047029c6..c9f1498e6775f08017f8a13b64cba57bd6207d87 100644
--- a/src/pages/ranger/basic/line/Assemble/index.vue
+++ b/src/pages/ranger/basic/line/Assemble/index.vue
@@ -4,7 +4,6 @@
url="/ranger/inspection/api/v1/route/assembles"
rowKey="assembleId"
:formatData="formatData"
- addBtn
ref="assembleTable"
:scroll="scroll"
:otherQuery="getDefaultQuery()"
@@ -13,36 +12,44 @@
noPadding
:width="400"
>
+
+ 新增地点
+
-
+
+
+
-
-
+
+
{{ row.assembleOrder }}
-
-
+
地点
单元
项目
-
+
是
否
-
+
有效
无效
-
+
+
+
+
@@ -50,35 +57,88 @@