Showing
4 changed files
with
51 additions
and
15 deletions
@@ -38,11 +38,7 @@ | @@ -38,11 +38,7 @@ | ||
38 | </div> | 38 | </div> |
39 | </template> | 39 | </template> |
40 | <template #tools="{scope}"> | 40 | <template #tools="{scope}"> |
41 | - <div class="list-handle"> | ||
42 | - <span class="icon-bg"> | ||
43 | - <i class="el-icon-delete" title="处理" @click="handleDelete(scope.row)"></i> | ||
44 | - </span> | ||
45 | - </div> | 41 | + <el-button @click="handle(scope.row)" size="mini">处理</el-button> |
46 | </template> | 42 | </template> |
47 | </cm-table-page> | 43 | </cm-table-page> |
48 | </div> | 44 | </div> |
@@ -50,9 +46,9 @@ | @@ -50,9 +46,9 @@ | ||
50 | </div> | 46 | </div> |
51 | 47 | ||
52 | <!--新增编辑弹框--> | 48 | <!--新增编辑弹框--> |
53 | -<cm-dialog :title="titleName" width="40%" :showDialogVisible="cacheVisible" @hidedialog="cancelBtn" :showFooter="false"> | 49 | +<cm-dialog :title="dialog.title" :showDialogVisible="dialog.show" @hidedialog="hideDialog" :showFooter="false"> |
54 | <template v-slot> | 50 | <template v-slot> |
55 | - | 51 | + <alarmsClearEditor :isExamine=true :amId="dialog.amId" /> |
56 | </template> | 52 | </template> |
57 | </cm-dialog> | 53 | </cm-dialog> |
58 | 54 |
@@ -4,6 +4,9 @@ export default { | @@ -4,6 +4,9 @@ export default { | ||
4 | components: { | 4 | components: { |
5 | 'resNameComponents': Vue.defineAsyncComponent( | 5 | 'resNameComponents': Vue.defineAsyncComponent( |
6 | () => myImport('components/page/res/resNameComponents/index') | 6 | () => myImport('components/page/res/resNameComponents/index') |
7 | + ), | ||
8 | + 'alarmsClearEditor': Vue.defineAsyncComponent( | ||
9 | + () => myImport('views/alarmsClearEditor/index') | ||
7 | ) | 10 | ) |
8 | }, | 11 | }, |
9 | props:[], | 12 | props:[], |
@@ -16,6 +19,12 @@ export default { | @@ -16,6 +19,12 @@ export default { | ||
16 | page:1, | 19 | page:1, |
17 | limit:10, | 20 | limit:10, |
18 | }); | 21 | }); |
22 | + let dialog = Vue.ref({ | ||
23 | + title : "处理审批", | ||
24 | + show:false, | ||
25 | + amId : '' | ||
26 | + }); | ||
27 | + | ||
19 | //表格字段 | 28 | //表格字段 |
20 | let tableData = Vue.ref({ | 29 | let tableData = Vue.ref({ |
21 | count:0, | 30 | count:0, |
@@ -69,7 +78,6 @@ export default { | @@ -69,7 +78,6 @@ export default { | ||
69 | let getDataList=(status)=>{ | 78 | let getDataList=(status)=>{ |
70 | if(status == undefined){ | 79 | if(status == undefined){ |
71 | status = 0 | 80 | status = 0 |
72 | - | ||
73 | } | 81 | } |
74 | search.value.status = status; | 82 | search.value.status = status; |
75 | proxy.$http.get(`/api-web/bAlarmManage/page`,{ | 83 | proxy.$http.get(`/api-web/bAlarmManage/page`,{ |
@@ -94,6 +102,17 @@ export default { | @@ -94,6 +102,17 @@ export default { | ||
94 | search.value.limit = limit; | 102 | search.value.limit = limit; |
95 | } | 103 | } |
96 | 104 | ||
105 | + | ||
106 | + let hideDialog = (flg) => { | ||
107 | + dialog.value.show = flg; | ||
108 | + } | ||
109 | + | ||
110 | + // 处理弹框 | ||
111 | + let handle = (row) =>{ | ||
112 | + hideDialog(true); | ||
113 | + dialog.value.amId = row.id; | ||
114 | + } | ||
115 | + | ||
97 | // 挂载完 | 116 | // 挂载完 |
98 | Vue.onMounted(() => { | 117 | Vue.onMounted(() => { |
99 | getDataList(); | 118 | getDataList(); |
@@ -102,10 +121,13 @@ export default { | @@ -102,10 +121,13 @@ export default { | ||
102 | 121 | ||
103 | return { | 122 | return { |
104 | height, | 123 | height, |
124 | + dialog, | ||
125 | + hideDialog, | ||
105 | search, | 126 | search, |
106 | tableData, | 127 | tableData, |
107 | loaddata, | 128 | loaddata, |
108 | - getDataList | 129 | + getDataList, |
130 | + handle | ||
109 | } | 131 | } |
110 | } | 132 | } |
111 | 133 |
@@ -40,10 +40,10 @@ | @@ -40,10 +40,10 @@ | ||
40 | </div> | 40 | </div> |
41 | </div> | 41 | </div> |
42 | 42 | ||
43 | -<!--新增编辑弹框--> | ||
44 | -<cm-dialog :title="titleName" width="40%" :showDialogVisible="cacheVisible" @hidedialog="cancelBtn" :showFooter="false"> | 43 | +<!--弹框--> |
44 | +<cm-dialog :title="dialog.title" width="40%" :showDialogVisible="dialog.show" @hidedialog="hideDialog" :showFooter="false"> | ||
45 | <template v-slot> | 45 | <template v-slot> |
46 | - | 46 | + <alarmsClearEditor :isExamine=true :amId="dialog.adId" /> |
47 | </template> | 47 | </template> |
48 | </cm-dialog> | 48 | </cm-dialog> |
49 | 49 |
@@ -4,6 +4,9 @@ export default { | @@ -4,6 +4,9 @@ export default { | ||
4 | components: { | 4 | components: { |
5 | 'resNameComponents': Vue.defineAsyncComponent( | 5 | 'resNameComponents': Vue.defineAsyncComponent( |
6 | () => myImport('components/page/res/resNameComponents/index') | 6 | () => myImport('components/page/res/resNameComponents/index') |
7 | + ), | ||
8 | + 'alarmsClearEditor': Vue.defineAsyncComponent( | ||
9 | + () => myImport('views/alarmsClearEditor/index') | ||
7 | ) | 10 | ) |
8 | }, | 11 | }, |
9 | props: [], | 12 | props: [], |
@@ -16,6 +19,11 @@ export default { | @@ -16,6 +19,11 @@ export default { | ||
16 | page: 1, | 19 | page: 1, |
17 | limit: 10, | 20 | limit: 10, |
18 | }); | 21 | }); |
22 | + let dialog = Vue.ref({ | ||
23 | + title : "处理审批", | ||
24 | + show:false, | ||
25 | + amId : '' | ||
26 | + }); | ||
19 | //表格字段 | 27 | //表格字段 |
20 | let tableData = Vue.ref({ | 28 | let tableData = Vue.ref({ |
21 | count:0, | 29 | count:0, |
@@ -78,15 +86,13 @@ export default { | @@ -78,15 +86,13 @@ export default { | ||
78 | ] | 86 | ] |
79 | }) | 87 | }) |
80 | 88 | ||
81 | - //获取aj配置信息 | 89 | + // 获取列表 |
82 | let getDataList = () => { | 90 | let getDataList = () => { |
83 | - | ||
84 | proxy.$http.get(`/api-web//bAlarmManageRepository/page`, { | 91 | proxy.$http.get(`/api-web//bAlarmManageRepository/page`, { |
85 | page: search.value.page, | 92 | page: search.value.page, |
86 | limit: search.value.limit, | 93 | limit: search.value.limit, |
87 | keyword: search.value.keyword, | 94 | keyword: search.value.keyword, |
88 | status: search.value.status | 95 | status: search.value.status |
89 | - | ||
90 | }, function (res) { | 96 | }, function (res) { |
91 | if (res && res.data) { | 97 | if (res && res.data) { |
92 | tableData.value.dataList = res.data; | 98 | tableData.value.dataList = res.data; |
@@ -103,6 +109,16 @@ export default { | @@ -103,6 +109,16 @@ export default { | ||
103 | search.value.limit = limit; | 109 | search.value.limit = limit; |
104 | } | 110 | } |
105 | 111 | ||
112 | + let hideDialog = (flg) => { | ||
113 | + dialog.value.show = flg; | ||
114 | + } | ||
115 | + | ||
116 | + // 处理弹框 | ||
117 | + let handle = (row) =>{ | ||
118 | + hideDialog(true); | ||
119 | + dialog.value.amId = row.amId; | ||
120 | + } | ||
121 | + | ||
106 | 122 | ||
107 | // 挂载完 | 123 | // 挂载完 |
108 | Vue.onMounted(() => { | 124 | Vue.onMounted(() => { |
@@ -113,6 +129,8 @@ export default { | @@ -113,6 +129,8 @@ export default { | ||
113 | return { | 129 | return { |
114 | height, | 130 | height, |
115 | search, | 131 | search, |
132 | + hideDialog, | ||
133 | + handle, | ||
116 | loaddata, | 134 | loaddata, |
117 | tableData, | 135 | tableData, |
118 | getDataList | 136 | getDataList |
-
Please register or login to post a comment