Selaa lähdekoodia

消息绑定全部优化完成 2020年7月11日11:11:34

linan-0110 5 vuotta sitten
vanhempi
commit
f3d4089ab2

+ 1 - 7
src/App.vue

@@ -1,18 +1,12 @@
 <template>
     <div id="app">
         <router-view />
-        <!-- <Login v-if="$route.meta.isLogin"/> -->
     </div>
 </template>
 
 <script>
-// import Login from "./views/Login/Login";
 export default {
-    components: {
-        // Login
-    },
-    created() {
-    }
+    created() {}
 };
 </script>
 

+ 3 - 7
src/router/index.js

@@ -13,7 +13,6 @@ Vue.use(VueRouter)
 const routes = [
 	{
 		path: '/',
-		name: 'app',
 		component: App,
 		children: [
 			{
@@ -34,15 +33,12 @@ const routes = [
 	},
 	{
 		path: '/home',
-		name: 'home',
-		component: Home,
-		children: []
+		component: Home
 	},
 	{
 		path: '*',
-		name: 'home',
-		component: Home
-		
+		name: '*',
+		component: Login
 	},
 ]
 

+ 0 - 1
src/router/routes.js

@@ -29,7 +29,6 @@ export default [
   },
   {
 		path: '/home',
-		name: 'home',
 		component: Home,
 		children: [
 			// 设备管理

+ 2 - 3
src/views/Home/Home.vue

@@ -77,7 +77,6 @@
                             >
                                 <i :class="item.iconClassName"></i>
                                 <span slot="title">{{ !menuCollapse? item.oneMenuName : '' }}</span>
-                                <!-- <span slot="title">{{ item.oneMenuName}}</span> -->
                             </el-menu-item>
                         </div>
                     </el-menu>
@@ -98,7 +97,6 @@
 import { menuData } from "./mencCofig.js";
 
 export default {
-    name: "home",
     data() {
         return {
             // 菜单配置
@@ -139,7 +137,8 @@ export default {
                 return;
 
             this.$router.push({
-                path: "/" + e.$attrs.routerName
+                // path: "/" + e.$attrs.routerName
+                name: e.$attrs.routerName
             });
         }
     }

+ 0 - 6
src/views/Home/mencCofig.js

@@ -29,12 +29,6 @@ export const menuData = [
                 optionName: '区域信息',
                 index: '2-1',
                 routerName: "areaInfo"
-            },
-            
-            {
-                optionName: '选项2',
-                index: '2-2',
-                routerName: "home1_4"
             }
         ]
     },

+ 1 - 1
src/views/Login/Login.vue

@@ -123,7 +123,7 @@ export default {
                 success: res => {
                     this.isShowDialog = false;
                     //导航到 正式页面
-                    this.$router.replace("/home");
+                    this.$router.replace("/deviceType");
                 },
                 fail: err => {
                     if (err.errMsg) this.$message.error(err.errMsg);

+ 37 - 35
src/views/messageManagement/MessageBind.vue

@@ -66,12 +66,9 @@
             <el-row type="flex">
                 <el-col :span="14">
                     <el-form ref="dyForm" :model="dyForm" label-width="140px">
-                        <!-- <el-form-item label="消息点编码:" prop="point">
-                            <el-input v-model="dyForm.code"></el-input>
-                        </el-form-item>-->
 
                         <el-form-item label="发送方式">
-                            <el-select v-model="dyForm.methodCode" placeholder="请选择发送方式">
+                            <el-select v-model="dyForm.methodCode" placeholder="请选择发送方式" @change="methodCodeChange">
                                 <el-option
                                     v-for="item in sendMethodList"
                                     :label="item.description"
@@ -182,7 +179,6 @@ export default {
                     this.tableData = res;
                 },
                 fail: err => {
-                    console.log(err);
                     if (err.errMsg) this.$message.error(err.errMsg);
                     else this.$message.error("服务器发生异常");
                 }
@@ -206,7 +202,6 @@ export default {
                     this.comparisonTable = comparisonTable;
                 },
                 fail: err => {
-                    console.log(err);
                     if (err.errMsg) this.$message.error(err.errMsg);
                     else this.$message.error("服务器发生异常");
                 }
@@ -219,12 +214,10 @@ export default {
                 method: "GET",
                 data: {},
                 success: res => {
-                    console.log(res);
                     this.messagePointList = res;
                     this.dyForm.pointCode = res[0].code;
                 },
                 fail: err => {
-                    console.log(err);
                     if (err.errMsg) this.$message.error(err.errMsg);
                     else this.$message.error("服务器发生异常");
                 }
@@ -243,7 +236,6 @@ export default {
                     this.getMessageTemplateFinish = true
                 },
                 fail: err => {
-                    console.log(err);
                     if (err.errMsg) this.$message.error(err.errMsg);
                     else this.$message.error("服务器发生异常");
                 }
@@ -256,22 +248,31 @@ export default {
                 method: "GET",
                 data: {},
                 success: res => {
-                    console.log(res);
                     this.messageServicMerList = res;
                     this.ServicMerList = res;
                     this.dyForm.providerId = res[0].name;
                     this.getMessageServicMerFinish = true
                 },
                 fail: err => {
-                    console.log(err);
                     if (err.errMsg) this.$message.error(err.errMsg);
                     else this.$message.error("服务器发生异常");
                 }
             });
         },
         add() {
+            // 添加时都给两数组赋初始化时的值
+            this.TemplateList = JSON.parse(JSON.stringify(this.messageTemplateList))
+            this.ServicMerList = JSON.parse(JSON.stringify(this.messageServicMerList))
+
             this.isAdd = true;
             this.showDialog = true;
+            this.dyForm = {
+                methodCode: null,
+                pointCode: null,
+                templateCode: null,
+                providerId: null,
+            };
+            // 设置每个多选框的默认值为 其数组第一个值
             // this.dyForm = {
             //     methodCode: this.sendMethodList[0].code,
             //     pointCode: this.messagePointList[0].code,
@@ -280,7 +281,6 @@ export default {
             // };
         },
         edit(row) {
-            console.log(row);
             this.isAdd = false;
             this.showDialog = true;
             this.dyForm = row;
@@ -291,12 +291,10 @@ export default {
                 method: "POST",
                 data: { id: row.id },
                 success: res => {
-                    console.log(res);
                     this.getMessageBind();
                     this.$message, success("删除成功!");
                 },
                 fail: err => {
-                    console.log(err);
                     if (err.errMsg) this.$message.error(err.errMsg);
                     else this.$message.error("服务器发生异常");
                 }
@@ -305,7 +303,6 @@ export default {
         submitForm(formName) {
             this.$refs[formName].validate(valid => {
                 if (valid) {
-                    console.log(this.dyForm);
                     this.isAdd
                         ? this.reqSave("/message/bind/add")
                         : this.reqSave("/message/bind/update");
@@ -321,7 +318,6 @@ export default {
                 method: "POST",
                 data: this.dyForm,
                 success: res => {
-                    console.log(res);
                     this.getMessageBind();
                     this.$message.success("添加消息模板成功!");
                     this.showDialog = false;
@@ -333,38 +329,44 @@ export default {
                 }
             });
         },
+        // 发送方式改变时
+        methodCodeChange(methodCode) {
+            // 过滤 messageServicMerList 
+            let arr1 = this.messageServicMerList.filter(item => {
+                return item.methodCode == methodCode
+            })
+            this.ServicMerList = arr1
+            // 过滤 messageTemplateList 
+            let arr2 = this.messageTemplateList.filter(item => {
+                return item.methodCode == methodCode
+            })
+            this.TemplateList = arr2
+        },
+        // 模板改变时
         templateInputChange(value) {
-            console.log('templateInputChange')
-            console.log(value)
-            console.log(this.dyForm.templateCode)
-            let filterCondition = this.findSendMethodName(this.messageTemplateList, value, "code", "methodCode")
-            console.log(filterCondition)
-            let arr = this.messageTemplateList.filter(item => {
+            let filterCondition = this.findSendMethodCode(this.messageTemplateList, value, "code", "methodCode")
+            let arr = this.messageServicMerList.filter(item => {
                 return item.methodCode == filterCondition
             })
-            console.log(arr)
             this.ServicMerList = arr
         },
-
+        // 服务商改变时
         providerIdChange(value) {
-            console.log('providerIdChange')
-            console.log(value)
-            console.log(this.dyForm.providerId)
-            let filterCondition = this.findSendMethodName(this.messageServicMerList, this.dyForm.providerId, "id", "methodCode")
-            console.log(filterCondition)
-            let arr = this.messageServicMerList.filter(item => {
+            let filterCondition = this.findSendMethodCode(this.messageServicMerList, this.dyForm.providerId, "id", "methodCode")
+            let arr = this.messageTemplateList.filter(item => {
                 return item.methodCode == filterCondition
             })
             this.TemplateList = arr
         },
-        // 根据code查找name
-        findSendMethodName(arr, code, iName, oName) {
-            let a = arr.find(item => {
+        // 在arr中根据item.iName = code查找item.oName的值
+        findSendMethodCode(arr, code, iName, oName) {
+            let findedItem = arr.find(item => {
                 return item[iName] == code;
             });
-            if(a) {
-                return a[oName];
+            if(findedItem) {
+                return findedItem[oName];
             } else {
+                console.warn(`传入的数组中没有找到 item.${iName} == ${code} 时 item.${oName}的值`)
                 return undefined
             }
         }