消息点全部完成

src/sdk/index.js

@@ -200,7 +200,6 @@ class SDK {
 		}
 	}
 
-
 	// 检查参数
 	checkParams(params) {
 		// console.log('throw error-------',params)

src/views/deviceManagement/Ad.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="Ad">
-        <h1>Ad dddddddddddddddddddd</h1>
+        <h1>Ad </h1>
     </div>
 </template>
 <script>
@@ -14,16 +14,13 @@ export default {
     created() {},
     methods: {
 		...mapActions(["fetch"]),
-		doAreaInfo() {
+		get() {
             this.fetch({
-                api: "/organize-structure/list",
+                api: "aaa",
                 method: "GET",
-                data: {
-                    
-                },
+                data: {},
                 success: res => {
                     console.log(res)
-                    // this.subDeviceList = res;
                 },
                 fail: err => {
                     console.log(err);

src/views/deviceManagement/SubDeviceAdmin.vue

@@ -37,23 +37,13 @@
         </el-table>
 
         <!-- 添加子设备信息 -->
-        <el-dialog title="添加/编辑子设备信息" :visible.sync="showAddSubDevice">
+        <el-dialog :title="isAdd?'添加子设备信息':'编辑子设备信息'" :visible.sync="showAddSubDevice">
             <el-row type="flex">
                 <el-col :span="14">
                     <el-form ref="form" :model="form" label-width="100px">
-                        <!-- <el-form-item label="MAC/SN:">
-                            <el-input v-model="form.deviceNo"></el-input>
-                        </el-form-item>-->
-                        <!-- <el-form-item label="通讯ID:">
-                            <el-input v-model="form.communicationId"></el-input>
-                        </el-form-item>-->
                         <el-form-item label="通道:">
                             <el-input v-model="form.channelNo"></el-input>
                         </el-form-item>
-                        <!-- <el-form-item label="硬件型号:">
-                            <el-input v-model="form.hardTypeId"></el-input>
-                        </el-form-item>-->
-
                         <el-form-item label="设备是否可用:">
                             <el-radio-group v-model="form.enable">
                                 <el-radio :label="1">可用</el-radio>

src/views/messageManagement/MessageMode.vue

@@ -14,16 +14,13 @@ export default {
     created() {},
     methods: {
 		...mapActions(["fetch"]),
-		doAreaInfo() {
+		getMessageMode() {
             this.fetch({
-                api: "/organize-structure/list",
+                api: "/message/method/list",
                 method: "GET",
-                data: {
-                    
-                },
+                data: {},
                 success: res => {
                     console.log(res)
-                    // this.subDeviceList = res;
                 },
                 fail: err => {
                     console.log(err);

src/views/messageManagement/MessagePoint.vue

@@ -1,28 +1,93 @@
 <template>
     <div class="MessagePoint">
-        <h1>MessagePoint MessagePoint</h1>
+        <h1>MessagePoint MessagePoint 9999</h1>
+        <el-button @click="add" type="primary" icon="el-icon-document-add">添加</el-button>
+        <el-table :data="tableData" border style="width: 40%">
+            <el-table-column prop="id" label="序号" width="180"></el-table-column>
+            <el-table-column prop="code" label="消息点编码" width="180"></el-table-column>
+            <el-table-column label="地址">
+                <template slot-scope="scope">
+                    <p>{{scope.row.description}}</p>
+                </template>
+            </el-table-column>
+            <el-table-column fixed="right" label="操作" width="100">
+                <template slot-scope="scope">
+                    <el-button @click="edit(scope.row)" type="text" size="small">编辑</el-button>
+                    <el-popconfirm title="是否删除此设备的信息？" @onConfirm="del(scope.row)">
+                        <el-button slot="reference" type="text" size="small">删除</el-button>
+                    </el-popconfirm>
+                </template>
+            </el-table-column>
+        </el-table>
+
+        <el-dialog :title="isAdd?'添加消息点':'编辑消息点'" :visible.sync="showDialog">
+            <el-row type="flex">
+                <el-col :span="14">
+                    <el-form
+                        ref="dyForm"
+                        :model="dyForm"
+                        :rules="rules"
+                        label-width="100px"
+                        class="demo-dynamic"
+                    >
+                        <el-form-item label="消息点编码:" prop="code">
+                            <el-input v-model="dyForm.code"></el-input>
+                        </el-form-item>
+                        <el-form-item label="消息点描述:" prop="description">
+                            <el-input v-model="dyForm.description"></el-input>
+                        </el-form-item>
+                        <el-form-item label="消息点描述:">
+                            <el-input type="textarea" v-model="dyForm.remark"></el-input>
+                        </el-form-item>
+                        <el-form-item>
+                            <el-button @click="showDialog=false">取 消</el-button>
+                            <el-button type="primary" @click="submitForm('dyForm')">保 存</el-button>
+                        </el-form-item>
+                    </el-form>
+                </el-col>
+            </el-row>
+        </el-dialog>
     </div>
 </template>
 <script>
 import { mapActions } from "vuex";
+const rules = {
+    code: [{ required: true, message: "请输入消息点编码", trigger: "blur" }],
+    description: [
+        { required: true, message: "请输入消息点描述", trigger: "blur" }
+    ]
+};
 
 export default {
     name: "MessagePoint",
     data() {
-        return {};
+        return {
+            tableData: [],
+            showDialog: false,
+            dyForm: {
+                code: null,
+                description: "",
+                remark: ""
+            },
+            rules,
+            isAdd: true
+        };
     },
     created() {},
+    mounted() {
+        this.getMessagePoint();
+    },
     methods: {
-		...mapActions(["fetch"]),
-		doAreaInfo() {
+        ...mapActions(["fetch"]),
+        // 获取消息点
+        getMessagePoint() {
             this.fetch({
-                api: "/organize-structure/list",
+                api: "/message/point/list",
                 method: "GET",
-                data: {
-                    
-                },
+                data: {},
                 success: res => {
-                    console.log(res)
+                    console.log(res);
+                    this.tableData = res;
                     // this.subDeviceList = res;
                 },
                 fail: err => {
@@ -31,6 +96,63 @@ export default {
                     else this.$message.error("服务器发生异常");
                 }
             });
+        },
+        add() {
+            this.isAdd = true;
+            this.showDialog = true;
+        },
+        edit(row) {
+            this.isAdd = false;
+            this.showDialog = true;
+            this.dyForm.id = row.id;
+        },
+        del(row) {
+            this.fetch({
+                api: "/message/point/delete",
+                method: "POST",
+                data: {id:row.id},
+                success: res => {
+                    console.log(res);
+                    this.getMessagePoint();
+                    this.$message,success("删除成功！")
+                    // this.$message.success(res.msg);
+                },
+                fail: err => {
+                    console.log(err);
+                    if (err.errMsg) this.$message.error(err.errMsg);
+                    else this.$message.error("服务器发生异常");
+                }
+            });
+        },
+        submitForm(formName) {
+            this.$refs[formName].validate(valid => {
+                if (valid) {
+                    console.log(this.dyForm);
+                    this.dyForm
+                        ? this.reqSave("/message/point/add")
+                        : this.reqSave("/message/point/update");
+                } else {
+                    return false;
+                }
+            });
+        },
+        // 请求 保存 （添加 和 更新）
+        reqSave(api) {
+            this.fetch({
+                api,
+                method: "POST",
+                data: this.dyForm,
+                success: res => {
+                    console.log(res);
+                    this.getMessagePoint();
+                    this.$message.success('添加消息点成功！')
+                },
+                fail: err => {
+                    console.log(err);
+                    if (err.errMsg) this.$message.error(err.errMsg);
+                    else this.$message.error("服务器发生异常");
+                }
+            });
         }
     }
 };

src/views/messageManagement/MessageServicMer.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="MessageServicMer">
-        <h1>MessagePoint dddddddddddddddddddd</h1>
+        <h1>MessageServicMer dddddddddddddddddddd</h1>
     </div>
 </template>
 <script>
@@ -12,15 +12,17 @@ export default {
         return {};
     },
     created() {},
+    mounted() {
+        this.getMessageServicMer()
+    },
     methods: {
-		...mapActions(["fetch"]),
-		doAreaInfo() {
+        ...mapActions(["fetch"]),
+        // 获取服务商
+		getMessageServicMer() {
             this.fetch({
-                api: "/organize-structure/list",
+                api: "/message/provider/list",
                 method: "GET",
-                data: {
-                    
-                },
+                // data: {},
                 success: res => {
                     console.log(res)
                     // this.subDeviceList = res;

src/views/messageManagement/MessageTemplate.vue

@@ -14,13 +14,11 @@ export default {
     created() {},
     methods: {
 		...mapActions(["fetch"]),
-		doAreaInfo() {
+		getMessageTemplate() {
             this.fetch({
-                api: "/organize-structure/list",
+                api: "/message/template/list",
                 method: "GET",
-                data: {
-                    
-                },
+                data: {},
                 success: res => {
                     console.log(res)
                     // this.subDeviceList = res;

vue.config.js

@@ -14,18 +14,18 @@ module.exports = {
     }
   },
   devServer: {
-    proxy: {
-      '/api': {                //这里最好有一个 /
-        target: 'http://115.238.57.190:8010',         // 服务器端接口地址
-        ws: true,            //如果要代理 websockets，配置这个参数
-        // 如果是https接口，需要配置这个参数
-        changeOrigin: true,  //是否跨域
-        pathRewrite: {
-          '^/api': ''
-        }
+    // proxy: {
+    //   '/api': {                //这里最好有一个 /
+    //     target: 'http://115.238.57.190:8010',         // 服务器端接口地址
+    //     ws: true,            //如果要代理 websockets，配置这个参数
+    //     // 如果是https接口，需要配置这个参数
+    //     changeOrigin: true,  //是否跨域
+    //     pathRewrite: {
+    //       '^/api': ''
+    //     }
 
-      }
-    }
+    //   }
+    // }
 
   }
 }