From a61e43fba19089bfd29db6e54575a338a70f4d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=B5=A9=E7=8E=AE?= <chen.haowei@iwhalecloud.com>
Date: Sun, 18 Jul 2021 00:23:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E7=BC=96=E6=8E=92=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ranger.js                             |  16 ++
 src/components/table/table.vue                |   7 +-
 src/pages/ranger/basic/line/Assemble/add.vue  |  57 ------
 .../ranger/basic/line/Assemble/addItem.vue    |  88 +++++++++
 .../ranger/basic/line/Assemble/addPlace.vue   |  84 +++++++++
 .../ranger/basic/line/Assemble/addUnit.vue    |  75 ++++++++
 .../ranger/basic/line/Assemble/index.vue      | 167 ++++++++++++++++--
 .../ranger/basic/line/Assemble/setOrder.vue   |  58 ++++++
 8 files changed, 476 insertions(+), 76 deletions(-)
 delete mode 100644 src/pages/ranger/basic/line/Assemble/add.vue
 create mode 100644 src/pages/ranger/basic/line/Assemble/addItem.vue
 create mode 100644 src/pages/ranger/basic/line/Assemble/addPlace.vue
 create mode 100644 src/pages/ranger/basic/line/Assemble/addUnit.vue
 create mode 100644 src/pages/ranger/basic/line/Assemble/setOrder.vue

diff --git a/src/api/ranger.js b/src/api/ranger.js
index de90978..0e27543 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 dc767b2..349c327 100644
--- a/src/components/table/table.vue
+++ b/src/components/table/table.vue
@@ -16,7 +16,7 @@
                         <a-button>更多查询</a-button>
                     </a-popover>
                     <a-button @click="reset">重置</a-button>
-                    <a-button type="primary" @click="getData">查询</a-button>
+                    <a-button type="primary" @click="resetGetData">查询</a-button>
                 </a-space>
             </div>
         </my-card>
@@ -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 ca83d06..0000000
--- a/src/pages/ranger/basic/line/Assemble/add.vue
+++ /dev/null
@@ -1,57 +0,0 @@
-<template>
-    <Table
-        url="/ranger/inspection/api/v1/place/page"
-        :rowKey="rowKey"
-        :selected.sync="selected"
-        addBtn
-        ref="addTable"
-        :otherQuery="otherQuery"
-    >
-        <template #search="{ query }">
-            <MoreItem label="线路名称">
-                <a-input v-model="query.inputValue" placeholder="请输入" />
-            </MoreItem>
-        </template>
-
-        <a-table-column title="地点名称" data-index="placeName" />
-        <a-table-column title="二维码" data-index="qrCode" />
-        <a-table-column title="电子标签" data-index="electronicTag" />
-    </Table>
-</template>
-
-<script>
-import Table from '@/components/table/table.vue';
-import MoreItem from '@/components/table/more_item.vue';
-import { updateRouteStateApi } from '@/api';
-
-export default {
-    components: { Table, MoreItem },
-    props: {
-        data: Object,
-        row: Object,
-    },
-    watch: {
-        row: {
-            handler(val) {
-                if (val) {
-                    console.log(val);
-                } else {
-                    const { regionId } = this.data;
-                    this.otherQuery = { regionId };
-                    this.rowKey = 'placeId';
-                }
-            },
-            deep: true,
-            immediate: true,
-        },
-    },
-    data() {
-        return {
-            selected: {},
-            otherQuery: {},
-            rowKey: 'regionId',
-        };
-    },
-    methods: {},
-};
-</script>
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 0000000..806aa7d
--- /dev/null
+++ b/src/pages/ranger/basic/line/Assemble/addItem.vue
@@ -0,0 +1,88 @@
+
+<template>
+    <Wraper :hidden="hidden" :refresh="refresh" :onOk="submit">
+        <Table
+            url="/ranger/inspection/api/v1/items"
+            rowKey="itemId"
+            :selected.sync="selected"
+            ref="addTable"
+            :otherQuery="otherQuery"
+            :width="552"
+        >
+            <template #search="{ query }">
+                <MoreItem label="项目名称">
+                    <a-input v-model="query.inputValue" placeholder="请输入" />
+                </MoreItem>
+            </template>
+
+            <a-table-column title="项目名称" data-index="itemName" />
+            <a-table-column title="数据类型">
+                <template #default="row">
+                    <span> {{ dataType[row.dataType] }}</span>
+                </template>
+            </a-table-column>
+            <a-table-column title="项目描述" data-index="equipmentCode" />
+        </Table>
+    </Wraper>
+</template>
+
+<script>
+import Table from '@/components/table/table.vue';
+import MoreItem from '@/components/table/more_item.vue';
+import Wraper from '@/components/table/wraper.vue';
+import { addRouteAssemblesListApi } from '@/api';
+
+export default {
+    components: { Table, MoreItem, Wraper },
+    props: {
+        data: Object,
+        row: Object,
+        hidden: Function,
+        refresh: Function,
+    },
+    watch: {
+        row: {
+            handler(val) {
+                if (val) {
+                    const { assembleObjectId, routeId, parentAssembleObjectId, regionId } = val;
+                    this.otherQuery = { placeId: parentAssembleObjectId, unitId: assembleObjectId, regionId };
+                    this.submitData = {
+                        assembleObjectType: 'ITEM',
+                        parentAssembleObjectType: 'UNIT',
+                        parentAssembleObjectId: assembleObjectId,
+                        routeId,
+                    };
+                }
+            },
+            deep: true,
+            immediate: true,
+        },
+    },
+    data() {
+        return {
+            selected: {
+                keys: [],
+            },
+            otherQuery: {},
+            submitData: {},
+            dataType: {
+                TEXT: '文本类型',
+                OPTION: '选项类型',
+                NUMERIC: '数值类型',
+            },
+        };
+    },
+    methods: {
+        async submit() {
+            if (this.selected?.keys?.length !== 0) {
+                return await addRouteAssemblesListApi({
+                    ...this.submitData,
+                    assembleObjectIdList: this.selected.keys,
+                });
+            }
+            this.$message.warning('请选择');
+            throw new Error('请选择');
+        },
+    },
+};
+</script>
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 0000000..8fa5af4
--- /dev/null
+++ b/src/pages/ranger/basic/line/Assemble/addPlace.vue
@@ -0,0 +1,84 @@
+<template>
+    <Wraper :hidden="hidden" :refresh="refresh" :onOk="submit">
+        <Table
+            url="/ranger/inspection/api/v1/place/page"
+            rowKey="placeId"
+            :selected.sync="selected"
+            :otherQuery="otherQuery"
+            :width="552"
+        >
+            <template #search="{ query }">
+                <MoreItem label="地点名称">
+                    <a-input v-model="query.inputValue" placeholder="请输入" />
+                </MoreItem>
+            </template>
+
+            <a-table-column title="地点名称" data-index="placeName" />
+            <a-table-column title="二维码" data-index="qrCode" />
+            <a-table-column title="电子标签" data-index="electronicTag" />
+
+            <!-- <a-table-column v-if="rowKey === 'unitId'" title="单元名称" data-index="unitName" />
+            <a-table-column v-if="rowKey === 'unitId'" title="设备编号" data-index="equipmentCode" />
+
+            <a-table-column v-if="rowKey === 'itemId'" title="项目名称" data-index="itemName" />
+            <a-table-column v-if="rowKey === 'itemId'" title="数据类型" data-index="dataType" />
+            <a-table-column v-if="rowKey === 'itemId'" title="项目描述" data-index="equipmentCode" /> -->
+        </Table>
+    </Wraper>
+</template>
+
+<script>
+import Table from '@/components/table/table.vue';
+import MoreItem from '@/components/table/more_item.vue';
+import Wraper from '@/components/table/wraper.vue';
+import { addRouteAssemblesListApi } from '@/api';
+
+export default {
+    components: { Table, MoreItem, Wraper },
+    props: {
+        data: Object,
+        row: Object,
+        hidden: Function,
+        refresh: Function,
+    },
+    watch: {
+        row: {
+            handler(val) {
+                if (val) {
+                    const { regionId, routeId } = val;
+                    this.otherQuery = { regionId };
+                    this.submitData = {
+                        assembleObjectType: 'PLACE',
+                        parentAssembleObjectType: 'REGION',
+                        parentAssembleObjectId: regionId,
+                        routeId,
+                    };
+                }
+            },
+            deep: true,
+            immediate: true,
+        },
+    },
+    data() {
+        return {
+            selected: {
+                keys: [],
+            },
+            otherQuery: {},
+            submitData: {},
+        };
+    },
+    methods: {
+        async submit() {
+            if (this.selected?.keys?.length !== 0) {
+                return await addRouteAssemblesListApi({
+                    ...this.submitData,
+                    assembleObjectIdList: this.selected.keys,
+                });
+            }
+            this.$message.warning('请选择');
+            throw new Error('请选择');
+        },
+    },
+};
+</script>
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 0000000..6adadeb
--- /dev/null
+++ b/src/pages/ranger/basic/line/Assemble/addUnit.vue
@@ -0,0 +1,75 @@
+<template>
+    <Wraper :hidden="hidden" :refresh="refresh" :onOk="submit">
+        <Table
+            url="/ranger/inspection/api/v1/units"
+            rowKey="unitId"
+            :selected.sync="selected"
+            :otherQuery="otherQuery"
+            :width="552"
+        >
+            <template #search="{ query }">
+                <MoreItem label="搜索">
+                    <a-input v-model="query.inputValue" placeholder="请输入单元名称/设备编号" />
+                </MoreItem>
+            </template>
+
+            <a-table-column title="单元名称" data-index="unitName" />
+            <a-table-column title="设备编号" data-index="equipmentCode" />
+        </Table>
+    </Wraper>
+</template>
+
+<script>
+import Table from '@/components/table/table.vue';
+import MoreItem from '@/components/table/more_item.vue';
+import Wraper from '@/components/table/wraper.vue';
+import { addRouteAssemblesListApi } from '@/api';
+
+export default {
+    components: { Table, MoreItem, Wraper },
+    props: {
+        row: Object,
+        hidden: Function,
+        refresh: Function,
+    },
+    watch: {
+        row: {
+            handler(val) {
+                if (val) {
+                    const { assembleObjectId, routeId, parentAssembleObjectId } = val;
+                    this.otherQuery = { regionId: parentAssembleObjectId, placeId: assembleObjectId };
+                    this.submitData = {
+                        assembleObjectType: 'UNIT',
+                        parentAssembleObjectType: 'PLACE',
+                        parentAssembleObjectId: assembleObjectId,
+                        routeId,
+                    };
+                }
+            },
+            deep: true,
+            immediate: true,
+        },
+    },
+    data() {
+        return {
+            selected: {
+                keys: [],
+            },
+            otherQuery: {},
+            submitData: {},
+        };
+    },
+    methods: {
+        async submit() {
+            if (this.selected?.keys?.length !== 0) {
+                return await addRouteAssemblesListApi({
+                    ...this.submitData,
+                    assembleObjectIdList: this.selected.keys,
+                });
+            }
+            this.$message.warning('请选择');
+            throw new Error('请选择');
+        },
+    },
+};
+</script>
diff --git a/src/pages/ranger/basic/line/Assemble/index.vue b/src/pages/ranger/basic/line/Assemble/index.vue
index 3742e54..c9f1498 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"
         >
+            <template #operation>
+                <a-button type="primary" @click="addPlace">新增地点</a-button>
+            </template>
             <template #drawer="drawer">
-                <Add v-bind="drawer" :data="row" />
+                <AddPlace v-if="addType === 'PLACE'" v-bind="drawer" :refresh="refresh" />
+                <AddUnit v-if="addType === 'UNIT'" v-bind="drawer" :refresh="refresh" />
+                <AddItem v-if="addType === 'ITEM'" v-bind="drawer" :refresh="refresh" />
             </template>
-            <a-table-column title="名称" data-index="assembleObjectName" />
-            <a-table-column title="顺序">
+            <a-table-column title="名称" :width="150" data-index="assembleObjectName" />
+            <a-table-column title="顺序" :width="60">
                 <template #default="row">
                     <span v-if="row.assembleObjectType === 'PLACE'">{{ row.assembleOrder }}</span>
                     <span v-else>-</span>
                 </template>
             </a-table-column>
-            <a-table-column title="类型">
+            <a-table-column title="类型" :width="60">
                 <template #default="row">
                     <span v-if="row.assembleObjectType === 'PLACE'">地点</span>
                     <span v-if="row.assembleObjectType === 'UNIT'">单元</span>
                     <span v-if="row.assembleObjectType === 'ITEM'">项目</span>
                 </template>
             </a-table-column>
-            <a-table-column title="免检">
+            <a-table-column title="免检" :width="60">
                 <template #default="row">
                     <span :style="{ color: '#2db7f5' }" v-if="row.exemptionState === 'YES'">是</span>
                     <span :style="{ color: '#f5222d' }" v-if="row.exemptionState === 'NO'">否</span>
                 </template>
             </a-table-column>
-            <a-table-column title="状态">
+            <a-table-column title="状态" :width="60">
                 <template #default="row">
                     <span :style="{ color: '#2db7f5' }" v-if="row.assembleState === 'VALID'">有效</span>
                     <span :style="{ color: '#f5222d' }" v-if="row.assembleState === 'INVALID'">无效</span>
                 </template>
             </a-table-column>
-            <a-table-column title="描述" data-index="assembleDesc" />
+            <a-table-column title="描述" data-index="assembleDesc" :width="200" />
+            <template #other>
+                <SetOrder ref="setOrder" :afterSubmit="setRouteAssemblesOrder" />
+            </template>
         </Table>
     </Wraper>
 </template>
@@ -50,35 +57,88 @@
 <script>
 import Table from '@/components/table/table.vue';
 import Wraper from '@/components/table/wraper.vue';
-import { getRouteAssemblesListApi } from '@/api';
-import Add from './add.vue';
+import { getRouteAssemblesListApi, updateRouteAssemblesApi, setRouteAssemblesOrderApi } from '@/api';
+import AddPlace from './addPlace.vue';
+import AddUnit from './addUnit.vue';
+import AddItem from './addItem.vue';
+import SetOrder from './setOrder.vue';
 
 export default {
-    components: { Wraper, Table, Add },
+    components: { Wraper, Table, AddPlace, AddUnit, AddItem, SetOrder },
     props: { hidden: Function, row: Object },
     data() {
         return {
             scroll: { x: 1300, y: 600 },
             buttons: {
-                options: { width: 200, fixed: 'right' },
+                options: { width: 220, fixed: 'right' },
                 title: '操作',
                 data: [
-                    { label: '新增', click: () => {} },
-                    { label: '失效', click: () => {} },
-                    { label: '生效', click: () => {} },
-                    { label: '置顶', click: () => {} },
-                    { label: '排序', click: () => {} },
+                    {
+                        label: '新增单元',
+                        click: this.addUnit,
+                        isHidden: (row) => {
+                            return row.assembleObjectType !== 'PLACE';
+                        },
+                    },
+                    {
+                        label: '新增项目',
+                        click: this.addItem,
+                        isHidden: (row) => {
+                            return row.assembleObjectType !== 'UNIT';
+                        },
+                    },
+                    {
+                        label: '置顶',
+                        click: this.toTop,
+                        isHidden: (row) => {
+                            return row.assembleObjectType !== 'PLACE';
+                        },
+                    },
+                    {
+                        label: '排序',
+                        click: this.setOrder,
+                        isHidden: (row) => {
+                            return row.assembleObjectType !== 'PLACE';
+                        },
+                    },
+                    {
+                        label: '失效',
+                        click: (row) => this.assembleUpdate(row, 'INVALID'),
+                        isHidden: (row) => {
+                            if (row.assembleObjectType === 'ITEM') {
+                                return true;
+                            } else {
+                                return row.assembleState === 'INVALID';
+                            }
+                        },
+                    },
+                    {
+                        label: '生效',
+                        click: (row) => this.assembleUpdate(row, 'VALID'),
+                        isHidden: (row) => {
+                            if (row.assembleObjectType === 'ITEM') {
+                                return true;
+                            } else {
+                                return row.assembleState === 'VALID';
+                            }
+                        },
+                    },
+
                     {
                         type: 'confirm',
-                        url: (row) => `/ranger/inspection/api/v1/routes/${row.routeId}`,
+                        url: (row) => `/ranger/inspection/api/v1/route/assembles/${row.assembleId}`,
                         after: this.refresh,
                     },
                 ],
             },
+            addType: '',
         };
     },
     mounted() {},
     methods: {
+        refresh() {
+            this.$refs.assembleTable.resetGetData();
+        },
         getDefaultQuery() {
             const { routeId, regionId } = this.row;
             return {
@@ -87,6 +147,74 @@ export default {
                 routeId,
             };
         },
+        addPlace() {
+            const row = this.getDefaultQuery();
+            this.addType = 'PLACE';
+            this.$refs.assembleTable.show({ row, title: '新增地点', type: 'add' });
+        },
+        addUnit(row) {
+            this.addType = 'UNIT';
+            this.$refs.assembleTable.show({ row, title: '新增单元', type: 'add' });
+        },
+        addItem(row) {
+            this.addType = 'ITEM';
+            const newRow = { ...row, regionId: this.row.regionId };
+            this.$refs.assembleTable.show({ row: newRow, title: '新增项目', type: 'add' });
+        },
+
+        async assembleUpdate(row, assembleState) {
+            const {
+                assembleId,
+                assembleObjectId,
+                assembleObjectType,
+                parentAssembleObjectId,
+                parentAssembleObjectType,
+                routeId,
+            } = row;
+            const param = {
+                assembleState,
+                assembleId,
+                assembleObjectId,
+                assembleObjectType,
+                parentAssembleObjectId,
+                parentAssembleObjectType,
+                routeId,
+            };
+            const resp = await updateRouteAssemblesApi(param);
+            if (resp) {
+                this.$message.success('操作成功');
+                this.refresh();
+            } else {
+                this.$message.warning('操作失败');
+            }
+        },
+
+        toTop(row) {
+            const { assembleId, routeId } = row;
+            const param = {
+                assembleId,
+                routeId,
+                assembleOrder: 1,
+            };
+            this.setRouteAssemblesOrder(param);
+        },
+
+        setOrder(row) {
+            this.$refs.setOrder.setRow(row);
+            this.$refs.setOrder.showModal();
+        },
+
+        async setRouteAssemblesOrder(param) {
+            const resp = setRouteAssemblesOrderApi(param);
+            if (resp) {
+                this.$message.success('操作成功');
+                setTimeout(() => {
+                    this.refresh();
+                }, 500);
+            } else {
+                this.$message.warning('操作失败');
+            }
+        },
         formatData(list) {
             return list.records.map((i) => {
                 return {
@@ -103,7 +231,9 @@ export default {
                 parentAssembleObjectId: assembleObjectId,
                 assembleObjectType: assembleObjectType === 'PLACE' ? 'UNIT' : 'ITEM',
             };
+
             const resp = await getRouteAssemblesListApi(params);
+
             const newData = resp.map((i) => {
                 return {
                     ...i,
@@ -113,6 +243,7 @@ export default {
                 };
             });
             record.children = newData;
+
             this.$refs.assembleTable?.refreshView();
         },
     },
diff --git a/src/pages/ranger/basic/line/Assemble/setOrder.vue b/src/pages/ranger/basic/line/Assemble/setOrder.vue
new file mode 100644
index 0000000..ad88ef3
--- /dev/null
+++ b/src/pages/ranger/basic/line/Assemble/setOrder.vue
@@ -0,0 +1,58 @@
+<template>
+    <a-modal
+        v-model="visible"
+        :title="`设置排序:${row.assembleObjectName}`"
+        @ok="handleOk"
+        destroyOnClose
+        :zIndex="1010"
+    >
+        <a-form-model layout="vertical" :model="form" :rules="rules" ref="form">
+            <a-form-model-item label="排序" prop="order">
+                <a-input-number :style="{ width: '100%' }" v-model="form.order" :min="1" :max="9999" />
+            </a-form-model-item>
+        </a-form-model>
+    </a-modal>
+</template>
+<script>
+export default {
+    data() {
+        return {
+            visible: false,
+            form: {},
+            rules: {
+                order: [{ required: true }, { pattern: /^(0|[1-9][0-9]*)$/, message: '请输入正确的排序' }],
+            },
+            row: {
+                assembleObjectName: '',
+            },
+        };
+    },
+    props: {
+        afterSubmit: Function,
+    },
+
+    methods: {
+        showModal() {
+            this.form = {};
+            this.visible = true;
+        },
+        async handleOk(e) {
+            await this.$refs.form.validate();
+            const { assembleId, routeId } = this.row;
+            const param = {
+                assembleId,
+                routeId,
+                assembleOrder: this.form.order,
+            };
+            this.afterSubmit && this.afterSubmit(param);
+            this.closeModal();
+        },
+        closeModal() {
+            this.visible = false;
+        },
+        setRow(row) {
+            this.row = row;
+        },
+    },
+};
+</script>
-- 
GitLab