monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 31003c88b86505f9677056164c93a8973a88c45c 1 parent 2e782ece

【#1162】 变更负责人相关业务-资源类型、业务负责人、角色权限接口联调，树表格权全选切换页码后清空全选 #1

Inline Side-by-side
Showing 9 changed files with 11 additions and 101 deletions
@@ -155,6 +155,7 @@ export default { @@ -155,6 +155,7 @@ export default {
155 let params = { 155 let params = {
156 page: currentPage.value, limit: pageSize.value 156 page: currentPage.value, limit: pageSize.value
157 } 157 }
  158 + proxy.$refs.multipleTable.clearSelection();
158 159
159 emit('loaddata', params) 160 emit('loaddata', params)
160 } 161 }
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 :dataList="resourceData" 34 :dataList="resourceData"
35 :total="count" 35 :total="count"
36 :layout="'total, prev,pager,next,sizes, jumper'" 36 :layout="'total, prev,pager,next,sizes, jumper'"
37 - :pageSize="pageSize" 37 + :pageSize="search.limit"
38 @loaddata="loadTableDataList" 38 @loaddata="loadTableDataList"
39 @selectionChange="selectionChange" 39 @selectionChange="selectionChange"
40 :showIndex="true" 40 :showIndex="true"
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 :showTools="false" 45 :showTools="false"
46 :height="(height - 200)"> 46 :height="(height - 200)">
47 <template #default="{row,prop,column}"> 47 <template #default="{row,prop,column}">
48 - <div v-if="prop == 'paramDesc'"> 48 + <div v-if="prop == 'showType'">
49 <el-select v-if="row.resType == 'HOST_X86SERVER'" v-model="row.showType" placeholder=""> 49 <el-select v-if="row.resType == 'HOST_X86SERVER'" v-model="row.showType" placeholder="">
50 <el-option 50 <el-option
51 v-for="item in showTypeList" 51 v-for="item in showTypeList"
@@ -147,23 +147,6 @@ export default { @@ -147,23 +147,6 @@ export default {
147 arr.push(item.busId) 147 arr.push(item.busId)
148 }) 148 })
149 busIds.value=arr.join(",");//选中的值 149 busIds.value=arr.join(",");//选中的值
150 - /*proxy.resourceData.map((v, i) => {  
151 - v.checked = false;  
152 - });  
153 - let selectData = val;  
154 - if (selectData.length > 0) {  
155 - selectData.map((item, index) => {  
156 - proxy.resourceData.map((v, i) => {  
157 - if (item.id == v.id) {  
158 - v.checked = true;  
159 - }  
160 - })  
161 - })  
162 - } else {  
163 - proxy.resourceData.map((v, i) => {  
164 - v.checked = false;  
165 - })  
166 - }*/  
167 } 150 }
168 //获取资源类型数据 151 //获取资源类型数据
169 let getResourceTypoe=()=>{ 152 let getResourceTypoe=()=>{
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class="condition" > 3 <div class="condition" >
4 <el-form ref=“form” style="display: flex;"> 4 <el-form ref=“form” style="display: flex;">
5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
6 - <el-input v-model="search.keyword" placeholder="请输入资源名称/ip/端口号"></el-input> 6 + <el-input v-model="search.keyword" placeholder="请输入资源名称/ip"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
9 <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型"> 9 <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型">
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 :dataList="resourceData" 34 :dataList="resourceData"
35 :total="count" 35 :total="count"
36 :layout="'total, prev,pager,next,sizes, jumper'" 36 :layout="'total, prev,pager,next,sizes, jumper'"
37 - :pageSize="pageSize" 37 + :pageSize="search.limit"
38 @loaddata="loadTableDataList" 38 @loaddata="loadTableDataList"
39 @selectionChange="selectionChange" 39 @selectionChange="selectionChange"
40 :showIndex="true" 40 :showIndex="true"
@@ -108,7 +108,6 @@ export default { @@ -108,7 +108,6 @@ export default {
108 let resourceData = Vue.ref([]); 108 let resourceData = Vue.ref([]);
109 //获取列表数据 109 //获取列表数据
110 const getListData = () => { 110 const getListData = () => {
111 - // resourceData.value=[];  
112 loading.value = true; 111 loading.value = true;
113 //定义列表参数 112 //定义列表参数
114 let getParams = { 113 let getParams = {
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <div class="condition" > 3 <div class="condition" >
4 <el-form ref=“form” style="display: flex;"> 4 <el-form ref=“form” style="display: flex;">
5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
6 - <el-input v-model="search.keyword" placeholder="请输入资源名称/ip/端口号"></el-input> 6 + <el-input v-model="search.keyword" placeholder="请输入资源名称/ip"></el-input>
7 </el-form-item> 7 </el-form-item>
8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
9 <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型"> 9 <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型">
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 :dataList="resourceData" 34 :dataList="resourceData"
35 :total="count" 35 :total="count"
36 :layout="'total, prev,pager,next,sizes, jumper'" 36 :layout="'total, prev,pager,next,sizes, jumper'"
37 - :pageSize="pageSize" 37 + :pageSize="search.limit"
38 @loaddata="loadTableDataList" 38 @loaddata="loadTableDataList"
39 @selectionChange="selectionChange" 39 @selectionChange="selectionChange"
40 :showIndex="true" 40 :showIndex="true"
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 :dataList="resourceData" 34 :dataList="resourceData"
35 :total="count" 35 :total="count"
36 :layout="'total, prev,pager,next,sizes, jumper'" 36 :layout="'total, prev,pager,next,sizes, jumper'"
37 - :pageSize="pageSize" 37 + :pageSize="search.limit"
38 @loaddata="loadTableDataList" 38 @loaddata="loadTableDataList"
39 @selectionChange="selectionChange" 39 @selectionChange="selectionChange"
40 :showIndex="true" 40 :showIndex="true"
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 :defaultExpand="true" 47 :defaultExpand="true"
48 :height="(height - 200)"> 48 :height="(height - 200)">
49 <template #default="{row,prop,column}"> 49 <template #default="{row,prop,column}">
50 - <div v-if="prop == 'paramDesc'"> 50 + <div v-if="prop == 'showType'">
51 <el-select v-if="row.resType == 'HOST_X86SERVER'" v-model="row.showType" placeholder=""> 51 <el-select v-if="row.resType == 'HOST_X86SERVER'" v-model="row.showType" placeholder="">
52 <el-option 52 <el-option
53 v-for="item in showTypeList" 53 v-for="item in showTypeList"
@@ -3,18 +3,8 @@ @@ -3,18 +3,8 @@
3 <div class="condition" > 3 <div class="condition" >
4 <el-form ref=“form” style="display: flex;"> 4 <el-form ref=“form” style="display: flex;">
5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 5 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
6 - <el-input v-model="search.keyword" placeholder="请输入业务名称"></el-input> 6 + <el-input v-model="search.keyword" placeholder="请输入角色名称"></el-input>
7 </el-form-item> 7 </el-form-item>
8 - <!--<el-form-item style="margin-right: 6px;margin-bottom: 10px;">  
9 - <el-select filterable clearable v-model="search.resType" placeholder="请选择资源类型">  
10 - <el-option  
11 - v-for="item in resTypeOptions"  
12 - :key="item.resTypeCode"  
13 - :label="item.resTypeName"  
14 - :value="item.resTypeCode">  
15 - </el-option>  
16 - </el-select>  
17 - </el-form-item>-->  
18 <el-form-item style="margin-right: 6px;margin-bottom: 10px;"> 8 <el-form-item style="margin-right: 6px;margin-bottom: 10px;">
19 <el-button @click="getListData" type="primary">查询</el-button> 9 <el-button @click="getListData" type="primary">查询</el-button>
20 </el-form-item> 10 </el-form-item>
@@ -34,7 +24,7 @@ @@ -34,7 +24,7 @@
34 :dataList="resourceData" 24 :dataList="resourceData"
35 :total="count" 25 :total="count"
36 :layout="'total, prev,pager,next,sizes, jumper'" 26 :layout="'total, prev,pager,next,sizes, jumper'"
37 - :pageSize="pageSize" 27 + :pageSize="search.limit"
38 @loaddata="loadTableDataList" 28 @loaddata="loadTableDataList"
39 @selectionChange="selectionChange" 29 @selectionChange="selectionChange"
40 :showIndex="true" 30 :showIndex="true"
@@ -45,17 +35,6 @@ @@ -45,17 +35,6 @@
45 :showTools="false" 35 :showTools="false"
46 :height="(height - 200)"> 36 :height="(height - 200)">
47 <template #default="{row,prop,column}"> 37 <template #default="{row,prop,column}">
48 - <div v-if="prop == 'paramDesc'">  
49 - <el-select v-if="row.resType == 'HOST_X86SERVER'" v-model="row.showType" placeholder="">  
50 - <el-option  
51 - v-for="item in showTypeList"  
52 - :key="item.value"  
53 - :label="item.name"  
54 - :value="item.value"  
55 - >  
56 - </el-option>  
57 - </el-select>  
58 - </div>  
59 </template> 38 </template>
60 </cm-table-page> 39 </cm-table-page>
61 </el-col> 40 </el-col>
@@ -30,14 +30,12 @@ export default { @@ -30,14 +30,12 @@ export default {
30 let loading = Vue.ref(true); 30 let loading = Vue.ref(true);
31 //选中数据 31 //选中数据
32 let pitch = Vue.ref([]); 32 let pitch = Vue.ref([]);
33 - let showTypeList=Vue.ref([]);  
34 let search = Vue.ref({ 33 let search = Vue.ref({
35 resType: '', 34 resType: '',
36 keyword: '', 35 keyword: '',
37 page: 1, 36 page: 1,
38 limit: 20, 37 limit: 20,
39 }); 38 });
40 - let resTypeOptions=Vue.ref([])  
41 const columns = [ 39 const columns = [
42 { 40 {
43 prop: 'name', 41 prop: 'name',
@@ -84,49 +82,8 @@ export default { @@ -84,49 +82,8 @@ export default {
84 arr.push(item.id) 82 arr.push(item.id)
85 }) 83 })
86 roleIds.value=arr.join(",");//选中的值 84 roleIds.value=arr.join(",");//选中的值
87 - /*proxy.resourceData.map((v, i) => {  
88 - v.checked = false;  
89 - });  
90 - let selectData = val;  
91 - if (selectData.length > 0) {  
92 - selectData.map((item, index) => {  
93 - proxy.resourceData.map((v, i) => {  
94 - if (item.id == v.id) {  
95 - v.checked = true;  
96 - }  
97 - })  
98 - })  
99 - } else {  
100 - proxy.resourceData.map((v, i) => {  
101 - v.checked = false;  
102 - })  
103 - }*/  
104 - }  
105 - //获取资源类型数据  
106 - let getResourceTypoe=()=>{  
107 - proxy.$http.get(`/api-web/manage/restype/list`, {}, function (res) {  
108 - if (res && res.data) {  
109 - resTypeOptions.value=res.data  
110 - }  
111 - })  
112 - }  
113 - //获取展示类型的字典数据  
114 - let initShowType=()=>{  
115 - proxy.$http.post("/api-web/manage/ddic/findSucDdics/DETAILS_POWER", {}, function (res) {  
116 - if (res && res.data) {  
117 - let arr=res.data;  
118 - if(arr && arr.length>0){  
119 - arr.map(v=>{  
120 - showTypeList.value.push({  
121 - name: v.ddicName  
122 - ,value: v.ddicCode.substring(v.ddicCode.lastIndexOf("_")+1,v.ddicCode.length)  
123 - });  
124 - })  
125 } 85 }
126 86
127 - }  
128 - })  
129 - }  
130 //批量取消相关资源 87 //批量取消相关资源
131 let changeCancel = () => { 88 let changeCancel = () => {
132 if(pitch.value.length<1){ 89 if(pitch.value.length<1){
@@ -182,32 +139,23 @@ export default { @@ -182,32 +139,23 @@ export default {
182 } 139 }
183 // 挂载完 140 // 挂载完
184 Vue.onMounted(() => { 141 Vue.onMounted(() => {
185 - initShowType();  
186 - getResourceTypoe();  
187 getListData(); 142 getListData();
188 }) 143 })
189 return { 144 return {
190 isMulti, 145 isMulti,
191 isTwoGroup, 146 isTwoGroup,
192 show, 147 show,
193 - initShowType,  
194 - showTypeList,  
195 search, 148 search,
196 - resTypeOptions,  
197 changeCancel, 149 changeCancel,
198 count, 150 count,
199 hideDialog, 151 hideDialog,
200 savebtn, 152 savebtn,
201 changeAdmin, 153 changeAdmin,
202 - getResourceTypoe,  
203 -  
204 resourceData, 154 resourceData,
205 columns, 155 columns,
206 height, 156 height,
207 loading, 157 loading,
208 -  
209 selectionChange, 158 selectionChange,
210 -  
211 getListData, 159 getListData,
212 loadTableDataList, 160 loadTableDataList,
213 userName 161 userName