朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 7bd696dc0edaec31897076d64b973a68f2b5b38b 1 个父辈 0b9329a5

针对多式联运业务需求做一些修改

内嵌 并排对比
正在显示 3 个修改的文件 包含 32 行增加 和 20 行删除
@@ -1364,7 +1364,7 @@ @@ -1364,7 +1364,7 @@
1364 // 刷新列表 1364 // 刷新列表
1365 // this.messageNote_getList(); 1365 // this.messageNote_getList();
1366 // 获取删除时间 1366 // 获取删除时间
1367 - this.selectDeleteTime(); 1367 + // this.selectDeleteTime();
1368 let _this = this; 1368 let _this = this;
1369 document.onkeyup= e =>{ 1369 document.onkeyup= e =>{
1370 if (e.code === "Enter" || e.code === "enter") { 1370 if (e.code === "Enter" || e.code === "enter") {
@@ -1376,7 +1376,7 @@ @@ -1376,7 +1376,7 @@
1376 this.messageNote_selectServerList(); 1376 this.messageNote_selectServerList();
1377 // this.note_getUserInfoList(); 1377 // this.note_getUserInfoList();
1378 // 获取用户中心的用户列表 1378 // 获取用户中心的用户列表
1379 - this.getCloudUser(); 1379 + //this.getCloudUser();
1380 }, 1380 },
1381 computed: {}, 1381 computed: {},
1382 } 1382 }
@@ -164,6 +164,9 @@ @@ -164,6 +164,9 @@
164 </el-input> 164 </el-input>
165 </el-form-item> 165 </el-form-item>
166 </el-form> 166 </el-form>
  167 + <User
  168 + v-on:getUserMessageEvent="getUserInfo">
  169 + </User>
167 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px"> 170 <div slot="footer" class="dialog-footer" style="text-align: center;margin-top: -20px">
168 <el-button type="info" @click="queue_dialog.addDialog = false" size="medium" 171 <el-button type="info" @click="queue_dialog.addDialog = false" size="medium"
169 style="width: 100px;background-color: #6F8294;color: #ffffff">取消 172 style="width: 100px;background-color: #6F8294;color: #ffffff">取消
@@ -172,9 +175,7 @@ @@ -172,9 +175,7 @@
172 size="medium" style="width: 100px">提交 175 size="medium" style="width: 100px">提交
173 </el-button> 176 </el-button>
174 </div> 177 </div>
175 - <User  
176 - v-on:getUserMessageEvent="getUserInfo">  
177 - </User> 178 +
178 </el-dialog> 179 </el-dialog>
179 </div> 180 </div>
180 </el-main> 181 </el-main>
@@ -591,6 +592,7 @@ @@ -591,6 +592,7 @@
591 * queue，批量删除---选中 592 * queue，批量删除---选中
592 */ 593 */
593 queue_selectChange: function (selectList) { 594 queue_selectChange: function (selectList) {
  595 + this.$emit("getQueueListEvent",selectList);
594 this.queue_page.selectList = selectList; 596 this.queue_page.selectList = selectList;
595 }, 597 },
596 /** 598 /**
@@ -64,7 +64,7 @@ @@ -64,7 +64,7 @@
64 </el-table-column> 64 </el-table-column>
65 <el-table-column 65 <el-table-column
66 prop="rcvr_topic" 66 prop="rcvr_topic"
67 - label="订阅主题" 67 + label="订阅者"
68 width="250" 68 width="250"
69 align="center" 69 align="center"
70 > 70 >
@@ -128,22 +128,14 @@ @@ -128,22 +128,14 @@
128 <template slot="prepend" >消息子类</template> 128 <template slot="prepend" >消息子类</template>
129 </el-input> 129 </el-input>
130 </el-form-item> 130 </el-form-item>
131 - <el-form-item label="">  
132 - <el-input v-model="ruleForm.reciver.rcvrTopic" style="width:300px" size="small">  
133 - <template slot="prepend" >订阅主题</template>  
134 - </el-input>  
135 - </el-form-item>  
136 - <el-form-item label="">  
137 - <el-input v-model="ruleForm.reciver.reciverFilter.filter" style="width:300px" size="small">  
138 - <template slot="prepend" >过滤规则</template>  
139 - </el-input>  
140 - </el-form-item>  
141 </el-form> 131 </el-form>
  132 + <Queue v-on:getQueueListEvent="getQueueInfo"></Queue>
142 <div slot="footer" class="dialog-footer" align="center"> 133 <div slot="footer" class="dialog-footer" align="center">
143 <el-button @click="dialogFormVisible = false" size="medium" 134 <el-button @click="dialogFormVisible = false" size="medium"
144 style="width: 100px;background-color: #6F8294;color: #ffffff">取 消</el-button> 135 style="width: 100px;background-color: #6F8294;color: #ffffff">取 消</el-button>
145 <el-button type="primary" size="medium" style="width: 100px" @click="submitForm('ruleForm')">确 定</el-button> 136 <el-button type="primary" size="medium" style="width: 100px" @click="submitForm('ruleForm')">确 定</el-button>
146 </div> 137 </div>
  138 +
147 </el-dialog> 139 </el-dialog>
148 </el-row> 140 </el-row>
149 </el-card> 141 </el-card>
@@ -152,7 +144,9 @@ @@ -152,7 +144,9 @@
152 </template> 144 </template>
153 <script> 145 <script>
154 import {queRouter, deleteRouter, addRouter} from "../../api/message_bus"; 146 import {queRouter, deleteRouter, addRouter} from "../../api/message_bus";
  147 + import Queue from "@/views/bus/Queue";
155 export default { 148 export default {
  149 + components: { Queue },
156 data(){ 150 data(){
157 return{ 151 return{
158 dialogFormVisible:false, 152 dialogFormVisible:false,
@@ -160,12 +154,15 @@ @@ -160,12 +154,15 @@
160 sndr:undefined, 154 sndr:undefined,
161 btype:undefined, 155 btype:undefined,
162 stype:undefined, 156 stype:undefined,
163 - reciver:{ 157 + rcvrList:[
  158 + {
164 rcvrTopic:undefined, 159 rcvrTopic:undefined,
165 - reciverFilter:{  
166 - filter:undefined 160 + filterList:{
  161 + filter: undefined,
  162 + filterValue: undefined
167 } 163 }
168 - }, 164 + }
  165 + ],
169 166
170 167
171 }, 168 },
@@ -260,6 +257,19 @@ @@ -260,6 +257,19 @@
260 return false; 257 return false;
261 } 258 }
262 }); 259 });
  260 + },
  261 + getQueueInfo:function (queueInfo) {
  262 + let _this = this;
  263 + _this.ruleForm.rcvrList =[];
  264 + let reciverList = queueInfo;
  265 + if (reciverList.length>0){
  266 + reciverList.forEach(function (queue) {
  267 + let selectQueue = {};
  268 + selectQueue.rcvrTopic = queue.queueName
  269 + _this.ruleForm.rcvrList.push(selectQueue);
  270 + })
  271 + }
  272 + console.log(_this.ruleForm.rcvrList);
263 } 273 }
264 } 274 }
265 } 275 }