Merge branch 'master-v32-lushangqing' into 'master'
【1596】 故障诊断-故障诊断配置功能优化调整-1、拨测诊断项配置,2、NPM诊断项配置,增加“新增/删除/修改NPM配置功能 3、APM诊断配置-取消资源和指标两个筛选条件 See merge request !866
Showing
6 changed files
with
327 additions
and
19 deletions
@@ -489,3 +489,13 @@ | @@ -489,3 +489,13 @@ | ||
489 | border-top-color:#1ed76d; | 489 | border-top-color:#1ed76d; |
490 | 490 | ||
491 | } | 491 | } |
492 | +/*lsq 故障配置新增功能样式 2022-08-17*/ | ||
493 | +.add-flex-right{ | ||
494 | + align-items: center; | ||
495 | + display: flex; | ||
496 | + justify-content: flex-end; | ||
497 | +} | ||
498 | +.flex-end-button{ | ||
499 | + display: flex; | ||
500 | + justify-content: flex-end; | ||
501 | +} |
@@ -8,22 +8,23 @@ | @@ -8,22 +8,23 @@ | ||
8 | <el-col :span="24"> | 8 | <el-col :span="24"> |
9 | <div class="flex-div-start margin-top-bottom-10"> | 9 | <div class="flex-div-start margin-top-bottom-10"> |
10 | 10 | ||
11 | - <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源"> | 11 | + <!--lsq 取消掉选择资源及选择指标两个筛选条件 2022-08-17--> |
12 | + <!-- <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="resTypeArr" @change="changeRes" filterable clearable collapse-tags placeholder="请选择资源"> | ||
12 | <el-option | 13 | <el-option |
13 | v-for="item in resTypeList" | 14 | v-for="item in resTypeList" |
14 | :label="item.resName" :value="item.resId"></el-option> | 15 | :label="item.resName" :value="item.resId"></el-option> |
15 | - </el-select> | 16 | + </el-select>--> |
16 | 17 | ||
17 | <!-- <el-dropdown class="margin-right-10"> | 18 | <!-- <el-dropdown class="margin-right-10"> |
18 | <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/> | 19 | <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/> |
19 | </el-dropdown>--> | 20 | </el-dropdown>--> |
20 | 21 | ||
21 | 22 | ||
22 | - <el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标"> | 23 | + <!--<el-select :size="$global.elementConfig.size.input" class="margin-right-10" v-model="kpiTypeArr" filterable clearable collapse-tags placeholder="请选择指标"> |
23 | <el-option | 24 | <el-option |
24 | v-for="item in kpiList" | 25 | v-for="item in kpiList" |
25 | :label="item.kpiName" :value="item.kpiId"></el-option> | 26 | :label="item.kpiName" :value="item.kpiId"></el-option> |
26 | - </el-select> | 27 | + </el-select>--> |
27 | 28 | ||
28 | <el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> | 29 | <el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> |
29 | 30 | ||
@@ -42,7 +43,7 @@ | @@ -42,7 +43,7 @@ | ||
42 | <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="apmMonitorListChecked" | 43 | <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="apmMonitorListChecked" |
43 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" | 44 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" |
44 | :showBorder="true" :loading="false" :pageSize="pageSize" | 45 | :showBorder="true" :loading="false" :pageSize="pageSize" |
45 | - :showPage="true" :showTools="true" :height="(height - 300)"> | 46 | + :showPage="true" :showTools="true" :height="(height - 440)"> |
46 | <template #tools="{scope}"> | 47 | <template #tools="{scope}"> |
47 | <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)"> | 48 | <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)"> |
48 | <i class="el-icon-plus"/> 添加 | 49 | <i class="el-icon-plus"/> 添加 |
@@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
5 | 5 | ||
6 | <div class="set-add-div"> | 6 | <div class="set-add-div"> |
7 | <el-row> | 7 | <el-row> |
8 | - <el-col :span="24"> | 8 | + <el-col :span="16"> |
9 | <div class="flex-div-start margin-top-bottom-10"> | 9 | <div class="flex-div-start margin-top-bottom-10"> |
10 | 10 | ||
11 | <!-- <el-select class="margin-right-10" v-model="busTypeArr" filterable clearable collapse-tags placeholder="请选择业务"> | 11 | <!-- <el-select class="margin-right-10" v-model="busTypeArr" filterable clearable collapse-tags placeholder="请选择业务"> |
@@ -30,18 +30,22 @@ | @@ -30,18 +30,22 @@ | ||
30 | <div class="flex-div-start"> | 30 | <div class="flex-div-start"> |
31 | <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button> | 31 | <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button> |
32 | <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> | 32 | <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> |
33 | - <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button> | ||
34 | - <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button> | 33 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="addNPM()">新增NPM配置</el-button> |
34 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="deleteNPM()" style="margin-left: 10px">删除</el-button> | ||
35 | </div> | 35 | </div> |
36 | </div> | 36 | </div> |
37 | </el-col> | 37 | </el-col> |
38 | + <el-col :span="8" class="add-flex-right"> | ||
39 | + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量选择</el-button> | ||
40 | + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部选择</el-button> | ||
41 | + </el-col> | ||
38 | </el-row> | 42 | </el-row> |
39 | <el-row class="margin-bottom-50"> | 43 | <el-row class="margin-bottom-50"> |
40 | <el-col :span="24" class="table-height"> | 44 | <el-col :span="24" class="table-height"> |
41 | <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="applicationMonitorListChecked" | 45 | <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="applicationMonitorListChecked" |
42 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" | 46 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" |
43 | - :showBorder="true" :loading="false" :pageSize="pageSize" | ||
44 | - :showPage="true" :showTools="true" :height="(height - 300)"> | 47 | + :showBorder="true" :loading="false" :pageSize="pageSize" :toolsWith="150" |
48 | + :showPage="true" :showTools="true" :height="(height - 440)"> | ||
45 | <template #default="{row,prop,column}"> | 49 | <template #default="{row,prop,column}"> |
46 | <div v-if="prop == 'url'" class="text-overflow" :title="row.url"> | 50 | <div v-if="prop == 'url'" class="text-overflow" :title="row.url"> |
47 | <span class="">{{row.url }}</span> | 51 | <span class="">{{row.url }}</span> |
@@ -50,7 +54,10 @@ | @@ -50,7 +54,10 @@ | ||
50 | </template> | 54 | </template> |
51 | <template #tools="{scope}"> | 55 | <template #tools="{scope}"> |
52 | <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)"> | 56 | <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)"> |
53 | - <i class="el-icon-plus"/> 添加 | 57 | + <i class="el-icon-plus"/> 选择 |
58 | + </el-button> | ||
59 | + <el-button type="text" size="small" @click.prevent="editNPM(scope.row,scope.$index)"> | ||
60 | + <i class="el-icon-edit"/> 编辑 | ||
54 | </el-button> | 61 | </el-button> |
55 | </template> | 62 | </template> |
56 | </cm-table-page> | 63 | </cm-table-page> |
@@ -72,5 +79,32 @@ | @@ -72,5 +79,32 @@ | ||
72 | </div> | 79 | </div> |
73 | </template> | 80 | </template> |
74 | </cm-dialog> | 81 | </cm-dialog> |
82 | +<cm-dialog :title="NPMTitleName" width="60%" :showDialogVisible="addNPMMonitorVisible" @hidedialog="addCloseDialog" :showFooter="false"> | ||
83 | + <template v-slot> | ||
84 | + <el-row style="min-height: 450px;"> | ||
85 | + <el-col :span="24"> | ||
86 | + <el-form :model="form" label-width="120px"> | ||
87 | + <el-form-item label="流名称"> | ||
88 | + <el-input v-model="form.streamName" /> | ||
89 | + </el-form-item> | ||
90 | + <el-form-item label="流id"> | ||
91 | + <el-input v-model="form.streamId" /> | ||
92 | + </el-form-item> | ||
93 | + <el-form-item label="URL地址"> | ||
94 | + <el-input v-model="form.url" type="textarea" /> | ||
95 | + </el-form-item> | ||
96 | + <el-form-item label="备注"> | ||
97 | + <el-input v-model="form.remark" type="textarea" /> | ||
98 | + </el-form-item> | ||
99 | + | ||
100 | + </el-form> | ||
101 | + </el-col> | ||
75 | 102 | ||
103 | + </el-row> | ||
104 | + <div class="margin-top btn-faultDiagnosis flex-end-button"> | ||
105 | + <el-button @click="addCloseDialog(false)">取消</el-button> | ||
106 | + <el-button @click="saveNPM" type="primary">保存</el-button> | ||
107 | + </div> | ||
108 | + </template> | ||
109 | +</cm-dialog> | ||
76 | 110 |
@@ -50,6 +50,101 @@ export default { | @@ -50,6 +50,101 @@ export default { | ||
50 | let bizName=Vue.ref(); | 50 | let bizName=Vue.ref(); |
51 | let name=Vue.ref(); | 51 | let name=Vue.ref(); |
52 | let applicationMonitorVisible=Vue.ref(false); | 52 | let applicationMonitorVisible=Vue.ref(false); |
53 | + // 新增、修改拨测弹框名称 | ||
54 | + let NPMTitleName=Vue.ref("新增NPM配置"); | ||
55 | + // 新增拨测弹框页面 | ||
56 | + let addNPMMonitorVisible=Vue.ref(false); | ||
57 | + // 新增拨测页面表单 | ||
58 | + let form=Vue.ref({ | ||
59 | + bizId:bizId.value, | ||
60 | + streamId:'', | ||
61 | + streamName:'', | ||
62 | + url:'', | ||
63 | + remark:'', | ||
64 | + }) | ||
65 | + // 清空表单内容 | ||
66 | + let restForm=()=>{ | ||
67 | + form.value={ | ||
68 | + bizId:bizId.value, | ||
69 | + streamId:'', | ||
70 | + streamName:'', | ||
71 | + url:'', | ||
72 | + remark:'', | ||
73 | + } | ||
74 | + } | ||
75 | + // 新增拨测弹框页面关闭 | ||
76 | + let addCloseDialog=(flg)=>{ | ||
77 | + NPMTitleName.value='新增NPM配置'; | ||
78 | + addNPMMonitorVisible.value=flg; | ||
79 | + restForm(); | ||
80 | + | ||
81 | + } | ||
82 | + // 新增拨测点击事件 | ||
83 | + let addNPM=()=>{ | ||
84 | + form.value.bizId=bizId.value; | ||
85 | + addNPMMonitorVisible.value=true; | ||
86 | + } | ||
87 | + // 保存新增拨测 | ||
88 | + let saveNPM=()=>{ | ||
89 | + if(form.value.id){ | ||
90 | + proxy.$http.get("/api-web/fault/conf/npmBase/update", form.value, function(res) { | ||
91 | + if (res && res.success) { | ||
92 | + proxy.$global.showMsg('修改成功','success'); | ||
93 | + addNPMMonitorVisible.value=false; | ||
94 | + getNodeList(); | ||
95 | + }else{ | ||
96 | + proxy.$global.showMsg(res.msg,'warning'); | ||
97 | + } | ||
98 | + }) | ||
99 | + }else{ | ||
100 | + proxy.$http.get("/api-web/fault/conf/npmBase/add", form.value, function(res) { | ||
101 | + if (res && res.success) { | ||
102 | + proxy.$global.showMsg('添加成功','success'); | ||
103 | + addNPMMonitorVisible.value=false; | ||
104 | + getNodeList(); | ||
105 | + }else{ | ||
106 | + proxy.$global.showMsg(res.msg,'warning'); | ||
107 | + } | ||
108 | + }) | ||
109 | + } | ||
110 | + } | ||
111 | + // 修改拨测 | ||
112 | + let editNPM=(row,index)=>{ | ||
113 | + addNPMMonitorVisible.value=true; | ||
114 | + form.value=row; | ||
115 | + NPMTitleName.value='修改NPM配置'; | ||
116 | + } | ||
117 | + // 删除拨测 | ||
118 | + let deleteNPM=()=>{ | ||
119 | + let NPMListSelectData=[]; | ||
120 | + proxy.tableDataList.map(item=>{ | ||
121 | + if(item.checked){ | ||
122 | + NPMListSelectData.push(item.id) | ||
123 | + } | ||
124 | + | ||
125 | + }) | ||
126 | + | ||
127 | + if(NPMListSelectData.length==0){ | ||
128 | + proxy.$global.showMsg('请选择配置','warning'); | ||
129 | + return; | ||
130 | + } | ||
131 | + proxy.$global.confirm("确定删除拨测?", function () { | ||
132 | + let params={ | ||
133 | + idList:NPMListSelectData.join(",") | ||
134 | + } | ||
135 | + proxy.$http.get("/api-web/fault/conf/npmBase/delete", params, function(res) { | ||
136 | + if (res && res.success) { | ||
137 | + proxy.$global.showMsg(res.msg?res.msg:'删除成功','success'); | ||
138 | + }else{ | ||
139 | + proxy.$global.showMsg(res.msg,'warning'); | ||
140 | + | ||
141 | + } | ||
142 | + getNodeList(); | ||
143 | + }) | ||
144 | + | ||
145 | + }); | ||
146 | + | ||
147 | + } | ||
53 | 148 | ||
54 | Vue.watch(()=>props.isDisplay,(newValue, oldValue)=>{ | 149 | Vue.watch(()=>props.isDisplay,(newValue, oldValue)=>{ |
55 | proxy.applicationMonitorVisible=newValue; | 150 | proxy.applicationMonitorVisible=newValue; |
@@ -166,6 +261,7 @@ export default { | @@ -166,6 +261,7 @@ export default { | ||
166 | v.checked=false; | 261 | v.checked=false; |
167 | 262 | ||
168 | }) | 263 | }) |
264 | + setTimeout(function () { | ||
169 | let selectData=val; | 265 | let selectData=val; |
170 | if(selectData.length>0){ | 266 | if(selectData.length>0){ |
171 | selectData.map((item,index)=>{ | 267 | selectData.map((item,index)=>{ |
@@ -181,6 +277,7 @@ export default { | @@ -181,6 +277,7 @@ export default { | ||
181 | v.checked=false; | 277 | v.checked=false; |
182 | }) | 278 | }) |
183 | } | 279 | } |
280 | + },300) | ||
184 | } | 281 | } |
185 | 282 | ||
186 | //添加选中的 | 283 | //添加选中的 |
@@ -307,7 +404,15 @@ export default { | @@ -307,7 +404,15 @@ export default { | ||
307 | init, | 404 | init, |
308 | onReset, | 405 | onReset, |
309 | onBtnSearch, | 406 | onBtnSearch, |
310 | - height | 407 | + height, |
408 | + addNPMMonitorVisible, | ||
409 | + addCloseDialog, | ||
410 | + addNPM, | ||
411 | + form, | ||
412 | + NPMTitleName, | ||
413 | + saveNPM, | ||
414 | + editNPM, | ||
415 | + deleteNPM | ||
311 | } | 416 | } |
312 | 417 | ||
313 | }, | 418 | }, |
@@ -5,25 +5,29 @@ | @@ -5,25 +5,29 @@ | ||
5 | 5 | ||
6 | <div class="set-add-div"> | 6 | <div class="set-add-div"> |
7 | <el-row> | 7 | <el-row> |
8 | - <el-col :span="24"> | 8 | + <el-col :span="16"> |
9 | <div class="flex-div-start margin-top-bottom-10"> | 9 | <div class="flex-div-start margin-top-bottom-10"> |
10 | <el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> | 10 | <el-input :size="$global.elementConfig.size.input" style="width:160px;" class="margin-right-10" v-model="keyWords" placeholder="输入关键字" /> |
11 | 11 | ||
12 | <div class="flex-div-start"> | 12 | <div class="flex-div-start"> |
13 | <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button> | 13 | <el-button :size="$global.elementConfig.size.button" type="primary" @click="onReset()">重置</el-button> |
14 | <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> | 14 | <el-button :size="$global.elementConfig.size.button" type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> |
15 | - <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量添加</el-button> | ||
16 | - <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部添加</el-button> | 15 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="addDialtest()">新增拨测</el-button> |
16 | + <el-button :size="$global.elementConfig.size.button" type="primary" @click="deleteDialtest()" style="margin-left: 10px">删除</el-button> | ||
17 | </div> | 17 | </div> |
18 | </div> | 18 | </div> |
19 | </el-col> | 19 | </el-col> |
20 | + <el-col :span="8" class="add-flex-right"> | ||
21 | + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAll()" style="margin-left: 10px">批量选择</el-button> | ||
22 | + <el-button :size="$global.elementConfig.size.button" type="primary" :disabled="isLoading" @click="saveAlldata()" style="margin-left: 10px">全部选择</el-button> | ||
23 | + </el-col> | ||
20 | </el-row> | 24 | </el-row> |
21 | <el-row class="margin-bottom-50"> | 25 | <el-row class="margin-bottom-50"> |
22 | <el-col :span="24" class="table-height"> | 26 | <el-col :span="24" class="table-height"> |
23 | <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="dialtestMonitorListChecked" | 27 | <cm-table-page v-show="tableDataList" :columns="columns" :dataList="tableDataList" @loaddata="loadTableDataList" :multipleSelection="dialtestMonitorListChecked" |
24 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" | 28 | :showIndex="true" :total="count" :showSelection="true" @selectionChange="selectionChange" |
25 | - :showBorder="true" :loading="false" :pageSize="pageSize" | ||
26 | - :showPage="true" :showTools="true" :height="(height - 300)"> | 29 | + :showBorder="true" :loading="false" :pageSize="pageSize" :toolsWith="150" |
30 | + :showPage="true" :showTools="true" :height="(height - 440)"> | ||
27 | <template #default="{row,prop,column}"> | 31 | <template #default="{row,prop,column}"> |
28 | <div v-if="prop == 'url'" class="text-overflow" :title="row.url"> | 32 | <div v-if="prop == 'url'" class="text-overflow" :title="row.url"> |
29 | <span class="">{{row.url }}</span> | 33 | <span class="">{{row.url }}</span> |
@@ -32,7 +36,10 @@ | @@ -32,7 +36,10 @@ | ||
32 | </template> | 36 | </template> |
33 | <template #tools="{scope}"> | 37 | <template #tools="{scope}"> |
34 | <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)"> | 38 | <el-button type="text" size="small" @click.prevent="addRes(scope.row,scope.$index)"> |
35 | - <i class="el-icon-plus"/> 添加 | 39 | + <i class="el-icon-plus"/> 选择 |
40 | + </el-button> | ||
41 | + <el-button type="text" size="small" @click.prevent="editDialtest(scope.row,scope.$index)"> | ||
42 | + <i class="el-icon-edit"/> 编辑 | ||
36 | </el-button> | 43 | </el-button> |
37 | </template> | 44 | </template> |
38 | </cm-table-page> | 45 | </cm-table-page> |
@@ -48,5 +55,42 @@ | @@ -48,5 +55,42 @@ | ||
48 | </div> | 55 | </div> |
49 | </template> | 56 | </template> |
50 | </cm-dialog> | 57 | </cm-dialog> |
58 | +<cm-dialog :title="dialtestTitleName" width="60%" :showDialogVisible="addDialtestMonitorVisible" @hidedialog="addCloseDialog" :showFooter="false"> | ||
59 | + <template v-slot> | ||
60 | + <el-row style="min-height: 450px;"> | ||
61 | + <el-col :span="24"> | ||
62 | + <el-form :model="form" label-width="120px"> | ||
63 | + <el-form-item label="任务名称"> | ||
64 | + <el-input v-model="form.taskName" /> | ||
65 | + </el-form-item> | ||
66 | + <el-form-item label="任务id"> | ||
67 | + <el-input v-model="form.taskId" /> | ||
68 | + </el-form-item> | ||
69 | + <el-form-item label="拨测简称"> | ||
70 | + <el-input maxlength="5" show-word-limit v-model="form.shortName" /> | ||
71 | + </el-form-item> | ||
72 | + <el-form-item label="任务类型"> | ||
73 | + <el-radio-group v-model="form.taskType"> | ||
74 | + <el-radio label="1">页面拨测</el-radio> | ||
75 | + <el-radio label="2">实物拨测</el-radio> | ||
76 | + </el-radio-group> | ||
77 | + </el-form-item> | ||
78 | + <el-form-item label="URL地址"> | ||
79 | + <el-input v-model="form.url" type="textarea" /> | ||
80 | + </el-form-item> | ||
81 | + <el-form-item label="备注"> | ||
82 | + <el-input v-model="form.remark" type="textarea" /> | ||
83 | + </el-form-item> | ||
84 | + | ||
85 | + </el-form> | ||
86 | + </el-col> | ||
87 | + | ||
88 | + </el-row> | ||
89 | + <div class="margin-top btn-faultDiagnosis flex-end-button"> | ||
90 | + <el-button @click="addCloseDialog(false)">取消</el-button> | ||
91 | + <el-button @click="saveDialtest" type="primary">保存</el-button> | ||
92 | + </div> | ||
93 | + </template> | ||
94 | +</cm-dialog> | ||
51 | 95 | ||
52 | 96 |
@@ -50,7 +50,110 @@ export default { | @@ -50,7 +50,110 @@ export default { | ||
50 | let bizName=Vue.ref(); | 50 | let bizName=Vue.ref(); |
51 | let name=Vue.ref(); | 51 | let name=Vue.ref(); |
52 | let dialtestMonitorVisible=Vue.ref(false); | 52 | let dialtestMonitorVisible=Vue.ref(false); |
53 | + // 新增、修改拨测弹框名称 | ||
54 | + let dialtestTitleName=Vue.ref("新增拨测"); | ||
55 | + // 新增拨测弹框页面 | ||
56 | + let addDialtestMonitorVisible=Vue.ref(false); | ||
57 | + // 新增拨测页面表单 | ||
58 | + let form=Vue.ref({ | ||
59 | + bizId:bizId.value, | ||
60 | + taskId:'', | ||
61 | + taskName:'', | ||
62 | + shortName:'', | ||
63 | + taskType:'1', | ||
64 | + url:'', | ||
65 | + remark:'', | ||
66 | + }) | ||
67 | + // 清空表单内容 | ||
68 | + let restForm=()=>{ | ||
69 | + form.value={ | ||
70 | + bizId:bizId.value, | ||
71 | + taskId:'', | ||
72 | + taskName:'', | ||
73 | + shortName:'', | ||
74 | + taskType:'1', | ||
75 | + url:'', | ||
76 | + remark:'', | ||
77 | + } | ||
78 | + } | ||
79 | + // 新增拨测弹框页面关闭 | ||
80 | + let addCloseDialog=(flg)=>{ | ||
81 | + dialtestTitleName.value='新增拨测'; | ||
82 | + addDialtestMonitorVisible.value=flg; | ||
83 | + restForm(); | ||
84 | + | ||
85 | + } | ||
86 | + // 新增拨测点击事件 | ||
87 | + let addDialtest=()=>{ | ||
88 | + form.value.bizId=bizId.value; | ||
89 | + addDialtestMonitorVisible.value=true; | ||
90 | + } | ||
91 | + // 保存新增拨测 | ||
92 | + let saveDialtest=()=>{ | ||
93 | + if(form.value.id){ | ||
94 | + proxy.$http.get("/api-web/fault/conf/dialtestBase/update", form.value, function(res) { | ||
95 | + if (res && res.success) { | ||
96 | + proxy.$global.showMsg('修改成功','success'); | ||
97 | + addDialtestMonitorVisible.value=false; | ||
98 | + getNodeList(); | ||
99 | + }else{ | ||
100 | + proxy.$global.showMsg(res.msg,'warning'); | ||
101 | + | ||
102 | + } | ||
103 | + | ||
104 | + }) | ||
105 | + }else{ | ||
106 | + proxy.$http.get("/api-web/fault/conf/dialtestBase/add", form.value, function(res) { | ||
107 | + if (res && res.success) { | ||
108 | + proxy.$global.showMsg('添加成功','success'); | ||
109 | + addDialtestMonitorVisible.value=false; | ||
110 | + getNodeList(); | ||
111 | + }else{ | ||
112 | + proxy.$global.showMsg(res.msg,'warning'); | ||
113 | + | ||
114 | + } | ||
115 | + | ||
116 | + }) | ||
117 | + } | ||
118 | + } | ||
119 | + // 修改拨测 | ||
120 | + let editDialtest=(row,index)=>{ | ||
121 | + addDialtestMonitorVisible.value=true; | ||
122 | + form.value=row; | ||
123 | + dialtestTitleName.value='修改拨测'; | ||
124 | + } | ||
125 | + // 删除拨测 | ||
126 | + let deleteDialtest=()=>{ | ||
127 | + let dialtestListSelectData=[]; | ||
128 | + proxy.tableDataList.map(item=>{ | ||
129 | + if(item.checked){ | ||
130 | + dialtestListSelectData.push(item.id) | ||
131 | + } | ||
132 | + | ||
133 | + }) | ||
134 | + | ||
135 | + if(dialtestListSelectData.length==0){ | ||
136 | + proxy.$global.showMsg('请选择配置','warning'); | ||
137 | + return; | ||
138 | + } | ||
139 | + proxy.$global.confirm("确定删除拨测?", function () { | ||
140 | + let params={ | ||
141 | + idList:dialtestListSelectData.join(",") | ||
142 | + } | ||
143 | + proxy.$http.get("/api-web/fault/conf/dialtestBase/delete", params, function(res) { | ||
144 | + if (res && res.success) { | ||
145 | + proxy.$global.showMsg(res.msg?res.msg:'删除成功','success'); | ||
146 | + | ||
147 | + }else{ | ||
148 | + proxy.$global.showMsg(res.msg,'warning'); | ||
53 | 149 | ||
150 | + } | ||
151 | + getNodeList(); | ||
152 | + }) | ||
153 | + | ||
154 | + }); | ||
155 | + | ||
156 | + } | ||
54 | Vue.watch(()=>props.isDisplay,(newValue, oldValue)=>{ | 157 | Vue.watch(()=>props.isDisplay,(newValue, oldValue)=>{ |
55 | proxy.dialtestMonitorVisible=newValue; | 158 | proxy.dialtestMonitorVisible=newValue; |
56 | if(newValue){ | 159 | if(newValue){ |
@@ -162,6 +265,7 @@ export default { | @@ -162,6 +265,7 @@ export default { | ||
162 | v.checked=false; | 265 | v.checked=false; |
163 | 266 | ||
164 | }) | 267 | }) |
268 | + setTimeout(function (){ | ||
165 | let selectData=val; | 269 | let selectData=val; |
166 | if(selectData.length>0){ | 270 | if(selectData.length>0){ |
167 | selectData.map((item,index)=>{ | 271 | selectData.map((item,index)=>{ |
@@ -177,6 +281,8 @@ export default { | @@ -177,6 +281,8 @@ export default { | ||
177 | v.checked=false; | 281 | v.checked=false; |
178 | }) | 282 | }) |
179 | } | 283 | } |
284 | + },300) | ||
285 | + | ||
180 | } | 286 | } |
181 | 287 | ||
182 | //添加选中的 | 288 | //添加选中的 |
@@ -304,7 +410,15 @@ export default { | @@ -304,7 +410,15 @@ export default { | ||
304 | init, | 410 | init, |
305 | onReset, | 411 | onReset, |
306 | onBtnSearch, | 412 | onBtnSearch, |
307 | - height | 413 | + height, |
414 | + addDialtestMonitorVisible, | ||
415 | + addCloseDialog, | ||
416 | + addDialtest, | ||
417 | + form, | ||
418 | + dialtestTitleName, | ||
419 | + saveDialtest, | ||
420 | + editDialtest, | ||
421 | + deleteDialtest | ||
308 | } | 422 | } |
309 | 423 | ||
310 | }, | 424 | }, |
-
Please register or login to post a comment