结果确认界面调整
Showing
1 changed file
with
20 additions
and
13 deletions
| ... | @@ -155,7 +155,9 @@ const metadataTableInfo = ref({ | ... | @@ -155,7 +155,9 @@ const metadataTableInfo = ref({ |
| 155 | }) | 155 | }) |
| 156 | 156 | ||
| 157 | const getTaskDetail = (data) => { | 157 | const getTaskDetail = (data) => { |
| 158 | loading.value = true; | ||
| 158 | getCgTaskDetail(data).then((res: any) => { | 159 | getCgTaskDetail(data).then((res: any) => { |
| 160 | loading.value = false; | ||
| 159 | if (res.code == proxy.$passCode) { | 161 | if (res.code == proxy.$passCode) { |
| 160 | const data = res.data || {}; | 162 | const data = res.data || {}; |
| 161 | taskDetail.value = data; | 163 | taskDetail.value = data; |
| ... | @@ -166,6 +168,8 @@ const getTaskDetail = (data) => { | ... | @@ -166,6 +168,8 @@ const getTaskDetail = (data) => { |
| 166 | getPermissionList({}); | 168 | getPermissionList({}); |
| 167 | getMetaTableData(); | 169 | getMetaTableData(); |
| 168 | } | 170 | } |
| 171 | }).catch(() => { | ||
| 172 | loading.value = false; | ||
| 169 | }) | 173 | }) |
| 170 | } | 174 | } |
| 171 | 175 | ||
| ... | @@ -177,14 +181,14 @@ const nodeClick = (data) => { | ... | @@ -177,14 +181,14 @@ const nodeClick = (data) => { |
| 177 | 181 | ||
| 178 | // 获取标签数据 | 182 | // 获取标签数据 |
| 179 | const getTableData = () => { | 183 | const getTableData = () => { |
| 180 | tableInfo.value.loading = true; | 184 | loading.value = true; |
| 181 | getCgLabelPageList( | 185 | getCgLabelPageList( |
| 182 | Object.assign({}, searchItemValue.value, { | 186 | Object.assign({}, searchItemValue.value, { |
| 183 | pageIndex: page.value.curr, | 187 | pageIndex: page.value.curr, |
| 184 | pageSize: page.value.limit, | 188 | pageSize: page.value.limit, |
| 185 | }) | 189 | }) |
| 186 | ).then((res: any) => { | 190 | ).then((res: any) => { |
| 187 | tableInfo.value.loading = false; | 191 | loading.value = false; |
| 188 | if (res.code == proxy.$passCode) { | 192 | if (res.code == proxy.$passCode) { |
| 189 | tableInfo.value.data = res.data.records || []; | 193 | tableInfo.value.data = res.data.records || []; |
| 190 | tableInfo.value.page.curr = res.data.pageIndex; | 194 | tableInfo.value.page.curr = res.data.pageIndex; |
| ... | @@ -193,7 +197,7 @@ const getTableData = () => { | ... | @@ -193,7 +197,7 @@ const getTableData = () => { |
| 193 | } | 197 | } |
| 194 | }) | 198 | }) |
| 195 | .catch((res) => { | 199 | .catch((res) => { |
| 196 | tableInfo.value.loading = false; | 200 | loading.value = false; |
| 197 | }); | 201 | }); |
| 198 | }; | 202 | }; |
| 199 | 203 | ||
| ... | @@ -223,8 +227,9 @@ const tablePageChange = (info) => { | ... | @@ -223,8 +227,9 @@ const tablePageChange = (info) => { |
| 223 | 227 | ||
| 224 | // 获取元数据表格 | 228 | // 获取元数据表格 |
| 225 | const getMetaTableData = () => { | 229 | const getMetaTableData = () => { |
| 230 | loading.value = true; | ||
| 226 | getMetaTableCollectList({}).then((res: any) => { | 231 | getMetaTableCollectList({}).then((res: any) => { |
| 227 | metadataTableInfo.value.loading = false; | 232 | loading.value = false; |
| 228 | if (res.code == proxy.$passCode) { | 233 | if (res.code == proxy.$passCode) { |
| 229 | const data = res.data.records || []; | 234 | const data = res.data.records || []; |
| 230 | metadataTableInfo.value.data = data; | 235 | metadataTableInfo.value.data = data; |
| ... | @@ -236,16 +241,18 @@ const getMetaTableData = () => { | ... | @@ -236,16 +241,18 @@ const getMetaTableData = () => { |
| 236 | }) | 241 | }) |
| 237 | } | 242 | } |
| 238 | } | 243 | } |
| 244 | }).catch(()=> { | ||
| 245 | loading.value = false; | ||
| 239 | }) | 246 | }) |
| 240 | } | 247 | } |
| 241 | 248 | ||
| 242 | const querySearch = (queryString: string) => { | 249 | const querySearch = (queryString: string) => { |
| 243 | listLoading.value = true | 250 | loading.value = true; |
| 244 | const results = queryString | 251 | const results = queryString |
| 245 | ? currpermissionList.value.filter(item => item.dataPermissionName.indexOf(queryString) > -1) | 252 | ? currpermissionList.value.filter(item => item.dataPermissionName.indexOf(queryString) > -1) |
| 246 | : permissionList.value; | 253 | : permissionList.value; |
| 247 | currpermissionList.value = results | 254 | currpermissionList.value = results |
| 248 | listLoading.value = false | 255 | loading.value = false; |
| 249 | } | 256 | } |
| 250 | 257 | ||
| 251 | const btnClick = async (btn, bType = null) => { | 258 | const btnClick = async (btn, bType = null) => { |
| ... | @@ -352,8 +359,9 @@ const getPermissionList = (val, init = true) => { | ... | @@ -352,8 +359,9 @@ const getPermissionList = (val, init = true) => { |
| 352 | params.pageIndex = listPage.value.curr; | 359 | params.pageIndex = listPage.value.curr; |
| 353 | params.pageSize = listPage.value.limit; | 360 | params.pageSize = listPage.value.limit; |
| 354 | params.type = 'C'; | 361 | params.type = 'C'; |
| 355 | listLoading.value = true | 362 | loading.value = true; |
| 356 | getClassifyGradList(params).then((res: any) => { | 363 | getClassifyGradList(params).then((res: any) => { |
| 364 | loading.value = false; | ||
| 357 | if (res.code == proxy.$passCode) { | 365 | if (res.code == proxy.$passCode) { |
| 358 | const data = res.data?.records || [] | 366 | const data = res.data?.records || [] |
| 359 | if (init) { | 367 | if (init) { |
| ... | @@ -375,9 +383,8 @@ const getPermissionList = (val, init = true) => { | ... | @@ -375,9 +383,8 @@ const getPermissionList = (val, init = true) => { |
| 375 | querySearch(asideSearchInput.value) | 383 | querySearch(asideSearchInput.value) |
| 376 | } | 384 | } |
| 377 | } | 385 | } |
| 378 | listLoading.value = false | ||
| 379 | }).catch(() => { | 386 | }).catch(() => { |
| 380 | listLoading.value = false | 387 | loading.value = false; |
| 381 | }) | 388 | }) |
| 382 | } | 389 | } |
| 383 | 390 | ||
| ... | @@ -386,16 +393,16 @@ const getClassifyTree = () => { | ... | @@ -386,16 +393,16 @@ const getClassifyTree = () => { |
| 386 | const params = { | 393 | const params = { |
| 387 | classifyGradeGuid: templateInfo.value.guid | 394 | classifyGradeGuid: templateInfo.value.guid |
| 388 | } | 395 | } |
| 389 | treeInfo.value.loading = true; | 396 | loading.value = true; |
| 390 | getClassifyTreeList(params).then((res: any) => { | 397 | getClassifyTreeList(params).then((res: any) => { |
| 391 | treeInfo.value.loading = false; | 398 | loading.value = false; |
| 392 | if (res.code == proxy.$passCode) { | 399 | if (res.code == proxy.$passCode) { |
| 393 | const data = res.data || []; | 400 | const data = res.data || []; |
| 394 | treeInfo.value.data = data; | 401 | treeInfo.value.data = data; |
| 395 | treeInfoRef.value.setCurrentKey(''); | 402 | treeInfoRef.value.setCurrentKey(''); |
| 396 | } | 403 | } |
| 397 | }).catch(() => { | 404 | }).catch(() => { |
| 398 | treeInfo.value.loading = false; | 405 | loading.value = false; |
| 399 | }) | 406 | }) |
| 400 | } | 407 | } |
| 401 | 408 | ||
| ... | @@ -433,7 +440,7 @@ onMounted(() => { | ... | @@ -433,7 +440,7 @@ onMounted(() => { |
| 433 | <el-input v-model.trim="asideSearchInput" placeholder="请输入关键字" :prefix-icon="Search" clearable | 440 | <el-input v-model.trim="asideSearchInput" placeholder="请输入关键字" :prefix-icon="Search" clearable |
| 434 | @change="querySearch" /> | 441 | @change="querySearch" /> |
| 435 | </div> --> | 442 | </div> --> |
| 436 | <div class="aside_list" v-loading="listLoading" v-infinite-scroll="handleScroll"> | 443 | <div class="aside_list" v-infinite-scroll="handleScroll"> |
| 437 | <div class="list_item" v-for="(item, i) in currpermissionList" :class="{ active: selectIndex == item.guid }" | 444 | <div class="list_item" v-for="(item, i) in currpermissionList" :class="{ active: selectIndex == item.guid }" |
| 438 | @click="listClick(item);" v-preReClick>{{ item.name }}</div> | 445 | @click="listClick(item);" v-preReClick>{{ item.name }}</div> |
| 439 | </div> | 446 | </div> | ... | ... |
-
Please register or sign in to post a comment