消息管理模块，初始化 搭好 2020年7月9日14:21:08

src/router/routes.js

@@ -1,13 +1,16 @@
 import Home from '../views/Home/Home.vue'
 /* 设备管理 */
-// 设备类型
 import DeviceType from '../views/deviceManagement/DeviceType.vue'
-// 设备信息
 import DeviceInfo from '../views/deviceManagement/DeviceInfo.vue'
 import SubDeviceAdmin from '../views/deviceManagement/SubDeviceAdmin.vue'
 import Ad from '../views/deviceManagement/Ad.vue'
-
+/* 区域管理 */
 import AreaInfo from '../views/areaManagement/AreaInfo.vue'
+/* 消息管理 */
+import MessageMode from '../views/messageManagement/MessageMode.vue'
+import MessagePoint from '../views/messageManagement/MessagePoint.vue'
+import MessageServicMer from '../views/messageManagement/MessageServicMer.vue'
+import MessageTemplate from '../views/messageManagement/MessageTemplate.vue'
 
 export default [
   {
@@ -20,6 +23,7 @@ export default [
 		name: 'home',
 		component: Home,
 		children: [
+			// 设备管理
 			{
 				path: '/deviceType',
 				name: 'deviceType',
@@ -40,11 +44,33 @@ export default [
 				name: 'home1_4',
 				component: Ad
 			},
+			// 区域管理
 			{
 				path: '/areaInfo',
 				name: 'areaInfo',
 				component: AreaInfo
 			},
+			// 消息管理
+			{
+				path: '/messageMode',
+				name: 'messageMode',
+				component: MessageMode
+			},
+			{
+				path: '/messagePoint',
+				name: 'messagePoint',
+				component: MessagePoint
+			},
+			{
+				path: '/messageServicMer',
+				name: 'messageServicMer',
+				component: MessageServicMer
+			},
+			{
+				path: '/messageTemplate',
+				name: 'messageTemplate',
+				component: MessageTemplate
+			}
 		]
 	},
 ]

src/views/Home/mencCofig.js

@@ -6,7 +6,7 @@ export const menuData = [
         iconClassName: "el-icon-monitor",
         index: '1',
         disabled: false, // 是否禁用
-        childList: [ // 不分组的
+        childList: [ 
             {
                 optionName: '设备类型',
                 index: '1-1',
@@ -32,10 +32,9 @@ export const menuData = [
     {
         oneMenuName: "区域管理",
         iconClassName: "el-icon-s-flag",
-        routerName: "home2",
         index: '2',
         disabled: false,
-        childList: [ // 不分组的
+        childList: [ 
             {
                 optionName: '区域信息',
                 index: '2-1',
@@ -51,11 +50,33 @@ export const menuData = [
     },
     // 无子菜单的
     {
-        oneMenuName: "导航三",
-        iconClassName: "el-icon-document",
-        routerName: "home3",
+        oneMenuName: "消息管理",
+        iconClassName: "el-icon-message",
         index: '3',
         disabled: false,
+        childList: [ 
+            {
+                optionName: '消息方式',
+                index: '3-1',
+                routerName: "messageMode"
+            },
+            {
+                optionName: '消息点',
+                index: '3-2',
+                routerName: "messagePoint"
+            },
+            {
+                optionName: '消息模板',
+                index: '3-3',
+                routerName: "messageTemplate"
+            },
+            {
+                optionName: '服务提供商',
+                index: '3-4',
+                routerName: "messageServicMer"
+            }
+            
+        ]
     },
     // 有子菜单 字菜单不分组的
     {
@@ -63,7 +84,7 @@ export const menuData = [
         iconClassName: "el-icon-menu",
         index: '4',
         disabled: false, // 是否禁用
-        childList: [ // 不分组的
+        childList: [ 
             {
                 optionName: '选项1',
                 index: '4-1',
@@ -78,7 +99,7 @@ export const menuData = [
                 optionName: '选项3',
                 index: '4-3',
                 routerName: "home4-3"
-            },
+            }
             
         ]
     },

src/views/deviceManagement/Ad.vue

@@ -24,6 +24,11 @@ export default {
                 success: res => {
                     console.log(res)
                     // this.subDeviceList = res;
+                },
+                fail: err => {
+                    console.log(err);
+                    if (err.errMsg) this.$message.error(err.errMsg);
+                    else this.$message.error("服务器发生异常");
                 }
             });
         }

src/views/deviceManagement/SubDeviceAdmin.vue

@@ -7,11 +7,7 @@
                 <el-page-header @back="goBack" :content="mainDeviceInfo.name" />
             </el-col>
             <el-col :span="4">
-                <el-button
-                    @click="showAddSubDevice=true"
-                    type="primary"
-                    icon="el-icon-document-add"
-                >添加</el-button>
+                <el-button @click="add" type="primary" icon="el-icon-document-add">添加</el-button>
             </el-col>
         </el-row>
 
@@ -48,9 +44,9 @@
                         <!-- <el-form-item label="MAC/SN:">
                             <el-input v-model="form.deviceNo"></el-input>
                         </el-form-item>-->
-                        <el-form-item label="通讯ID:">
+                        <!-- <el-form-item label="通讯ID:">
                             <el-input v-model="form.communicationId"></el-input>
-                        </el-form-item>
+                        </el-form-item>-->
                         <el-form-item label="通道:">
                             <el-input v-model="form.channelNo"></el-input>
                         </el-form-item>
@@ -67,7 +63,7 @@
 
                         <el-form-item>
                             <el-button @click="onCancel">取 消</el-button>
-                            <el-button type="primary" @click="addSubDevice">保 存</el-button>
+                            <el-button type="primary" @click="saveSubDevice()">保 存</el-button>
                         </el-form-item>
                     </el-form>
                 </el-col>
@@ -86,12 +82,11 @@ export default {
             subDeviceList: [], // 子设备信息列表
             showAddSubDevice: false,
             form: {
-                // deviceNo: "",
-                communicationId: '',
                 channelNo: "",
-                // hardTypeId: null,
                 enable: 1
-            }
+            },
+            isAdd: null, // 是添加还是编辑 标识符
+            editParmas: {} // 保存编辑的 请求参数
         };
     },
     created() {
@@ -122,11 +117,16 @@ export default {
                 }
             });
         },
-        // 编辑
-        edit(row) {
-            console.log("编辑", row);
+
+        add() {
             this.showAddSubDevice = true;
+            this.isAdd = true;
+            this.form = {
+                channelNo: "",
+                enable: 1
+            };
         },
+
         // 删除  (接口有问题)
         del(row) {
             console.log("删除 未完成", row);
@@ -143,26 +143,54 @@ export default {
                 },
                 fail: err => {
                     console.log(err);
-                    if (err.errCode == '200') {
+                    if (err.errCode == "200") {
                         this.$message.error(err.errMsg);
                         // 获取子设备信息列表
                         this.doSubDeviceList();
-                    } else if(err.errMsg) {
+                    } else if (err.errMsg) {
                         this.$message.success(err.errMsg);
                     } else this.$message.error("服务器发生异常");
                 }
             });
         },
+        // 编辑 /device-slave/update
+        edit(row) {
+            console.log("编辑", row);
+            this.isAdd = false;
+            this.showAddSubDevice = true;
+            this.form.channelNo = row.channelNo;
+            this.form.enable = row.enable;
+            this.editParmas = {
+                id: row.id,
+                communicationId: row.communicationId,
+                deviceNo: row.deviceNo,
+                hardTypeId: row.hardTypeId
+            };
+        },
         // 保存 添加子设备信息 (接口有问题)
-        addSubDevice() {
-            console.log("保存 添加子设备信息", this.form);
-            let data = Object.assign(this.form, {
-                deviceNo: this.mainDeviceInfo.deviceNo,
-                hardTypeId: this.mainDeviceInfo.hardTypeId
-            });
+        saveSubDevice() {
+            let data, api, method;
+            // 是添加
+            if (this.isAdd) {
+                api = "/device/device-slave/add";
+                method = "POST";
+                data = Object.assign(this.form, {
+                    communicationId: this.mainDeviceInfo.id,
+                    deviceNo: this.mainDeviceInfo.deviceNo,
+                    hardTypeId: this.mainDeviceInfo.hardTypeId
+                });
+            } else {
+                // 是编辑
+                api = "/device/device-slave/update";
+                method = "POST";
+                data = Object.assign(this.form, this.editParmas);
+            }
+
+            console.log(this.isAdd ? "添加" : "编辑");
+
             this.fetch({
-                api: "/device/device-slave/add",
-                method: "POST",
+                api,
+                method,
                 data,
                 success: res => {
                     console.log(res);
@@ -170,11 +198,11 @@ export default {
                     this.doSubDeviceList();
                     this.showAddSubDevice = false;
                     this.form = {
-                        communicationId: null,
+                        communicationId: "",
                         channelNo: "",
                         enable: 1
                     };
-                    this.$message.success("添加子设备信息成功");
+                    this.$message.success(this.isAdd?"添加子设备信息成功！":"编辑子设备信息成功！");
                 },
                 fail: err => {
                     console.log(err);

src/views/messageManagement/MessageMode.vue

@@ -0,0 +1,38 @@
+<template>
+    <div class="MessageMode">
+        <h1>MessageMode MessageMode</h1>
+    </div>
+</template>
+<script>
+import { mapActions } from "vuex";
+
+export default {
+    name: "MessageMode",
+    data() {
+        return {};
+    },
+    created() {},
+    methods: {
+		...mapActions(["fetch"]),
+		doAreaInfo() {
+            this.fetch({
+                api: "/organize-structure/list",
+                method: "GET",
+                data: {
+                    
+                },
+                success: res => {
+                    console.log(res)
+                    // this.subDeviceList = res;
+                },
+                fail: err => {
+                    console.log(err);
+                    if (err.errMsg) this.$message.error(err.errMsg);
+                    else this.$message.error("服务器发生异常");
+                }
+            });
+        }
+    }
+};
+</script>
+

src/views/messageManagement/MessagePoint.vue

@@ -0,0 +1,38 @@
+<template>
+    <div class="MessagePoint">
+        <h1>MessagePoint MessagePoint</h1>
+    </div>
+</template>
+<script>
+import { mapActions } from "vuex";
+
+export default {
+    name: "MessagePoint",
+    data() {
+        return {};
+    },
+    created() {},
+    methods: {
+		...mapActions(["fetch"]),
+		doAreaInfo() {
+            this.fetch({
+                api: "/organize-structure/list",
+                method: "GET",
+                data: {
+                    
+                },
+                success: res => {
+                    console.log(res)
+                    // this.subDeviceList = res;
+                },
+                fail: err => {
+                    console.log(err);
+                    if (err.errMsg) this.$message.error(err.errMsg);
+                    else this.$message.error("服务器发生异常");
+                }
+            });
+        }
+    }
+};
+</script>
+

src/views/messageManagement/MessageServicMer.vue

@@ -0,0 +1,38 @@
+<template>
+    <div class="MessageServicMer">
+        <h1>MessagePoint dddddddddddddddddddd</h1>
+    </div>
+</template>
+<script>
+import { mapActions } from "vuex";
+
+export default {
+    name: "MessageServicMer",
+    data() {
+        return {};
+    },
+    created() {},
+    methods: {
+		...mapActions(["fetch"]),
+		doAreaInfo() {
+            this.fetch({
+                api: "/organize-structure/list",
+                method: "GET",
+                data: {
+                    
+                },
+                success: res => {
+                    console.log(res)
+                    // this.subDeviceList = res;
+                },
+                fail: err => {
+                    console.log(err);
+                    if (err.errMsg) this.$message.error(err.errMsg);
+                    else this.$message.error("服务器发生异常");
+                }
+            });
+        }
+    }
+};
+</script>
+

src/views/messageManagement/MessageTemplate.vue

@@ -0,0 +1,38 @@
+<template>
+    <div class="MessageTemplate">
+        <h1>MessageTemplate dddddddddddddddddddd</h1>
+    </div>
+</template>
+<script>
+import { mapActions } from "vuex";
+
+export default {
+    name: "MessageTemplate",
+    data() {
+        return {};
+    },
+    created() {},
+    methods: {
+		...mapActions(["fetch"]),
+		doAreaInfo() {
+            this.fetch({
+                api: "/organize-structure/list",
+                method: "GET",
+                data: {
+                    
+                },
+                success: res => {
+                    console.log(res)
+                    // this.subDeviceList = res;
+                },
+                fail: err => {
+                    console.log(err);
+                    if (err.errMsg) this.$message.error(err.errMsg);
+                    else this.$message.error("服务器发生异常");
+                }
+            });
+        }
+    }
+};
+</script>
+