From 205fce9512989159c0072bef9bb5afb5ac1737a5 Mon Sep 17 00:00:00 2001 From: fan Date: Tue, 25 Oct 2022 10:45:23 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 5 ++ .../newMap/display/terminals/bigScreen.vue | 69 +++++++++++++++++++ src/views/newMap/display/terminals/index.vue | 7 +- .../newMap/display/terminals/terminalMenu.vue | 6 ++ src/views/newMap/mapDraftPicture/index.vue | 3 +- src/views/newMap/newDesignUser/demonList.vue | 2 +- 6 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 src/views/newMap/display/terminals/bigScreen.vue diff --git a/src/router/index.js b/src/router/index.js index b510bd9d7..83aca55af 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1768,6 +1768,11 @@ export const asyncRouter = [ path: 'usermap/map/draw/:mapId/:view', component: NewMapDraft, hidden: true + }, + { + path: 'usermap/map/pictureDraw/:mapId/draft', + component: MapDraftPicture, + hidden: true } ] }, diff --git a/src/views/newMap/display/terminals/bigScreen.vue b/src/views/newMap/display/terminals/bigScreen.vue new file mode 100644 index 000000000..e6a762d2f --- /dev/null +++ b/src/views/newMap/display/terminals/bigScreen.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue index 095cf0370..599b02fd1 100644 --- a/src/views/newMap/display/terminals/index.vue +++ b/src/views/newMap/display/terminals/index.vue @@ -16,9 +16,8 @@ - - + Date: Tue, 25 Oct 2022 18:02:23 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/thirdAccountConfig.js | 27 +++++ src/router/index.js | 3 +- src/utils/baseUrl.js | 4 +- src/views/publish/publishMap/copy.vue | 86 ++++++++++++-- src/views/publish/publishMap/exportMap.vue | 12 +- src/views/publish/publishMap/index.vue | 2 +- .../iscsDataManage/addIscsDevice.vue | 34 ++---- .../iscsDataManage/addIscsResources.vue | 15 +-- .../publishMap/iscsDataManage/index.vue | 14 ++- src/views/system/iscsResourcesManage/add.vue | 1 - src/views/thirdPartyAccounts/add.vue | 104 ++++++++++++++++ src/views/thirdPartyAccounts/index.vue | 111 ++++++++++++++++++ 12 files changed, 348 insertions(+), 65 deletions(-) create mode 100644 src/api/thirdAccountConfig.js create mode 100644 src/views/thirdPartyAccounts/add.vue create mode 100644 src/views/thirdPartyAccounts/index.vue diff --git a/src/api/thirdAccountConfig.js b/src/api/thirdAccountConfig.js new file mode 100644 index 000000000..9f178cb06 --- /dev/null +++ b/src/api/thirdAccountConfig.js @@ -0,0 +1,27 @@ +import request from '@/utils/request'; + +/** 删除第三方配置 */ +export function deleteThirdAccountConfig(id) { + return request({ + url: `/api/thirdAccountConfig/${id}`, + method: 'delete' + }); +} + +/** 分页查询所有配置 */ +export function queryThirdAccountConfig(params) { + return request({ + url: `/api/thirdAccountConfig/paged`, + method: 'get', + params + }); +} + +/** 新增或更新第三方配置 */ +export function updateThirdAccountConfig(data) { + return request({ + url: `/api/thirdAccountConfig`, + method: 'post', + data + }); +} diff --git a/src/router/index.js b/src/router/index.js index 83aca55af..5043e9ce9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -222,6 +222,7 @@ const PisScreen = () => import('@/views/pis/index'); const TransitionIndex = () => import('@/views/temporary/transitionIndex'); const Temporary = () => import('@/views/temporary/index'); +const ThirdPartyAccounts = () => import('@/views/thirdPartyAccounts/index'); const FunctionManage = () => import('@/views/functionManage/index'); const PermissionManage = () => import('@/views/permissionManage/index'); @@ -1841,7 +1842,7 @@ export const asyncRouter = [ }, { // 第三方账户配置 path: 'ThirdPartyAccounts', - component: Temporary, + component: ThirdPartyAccounts, meta: { i18n: 'newRouter.ThirdPartyAccounts' } diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index f84210e59..9de79fd8a 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -23,13 +23,13 @@ export function handlerUrl() { let OSS_URL; if (process.env.NODE_ENV === 'development') { // 开发分支 - BASE_API = 'http://192.168.3.233/rtss-server'; + // BASE_API = 'http://192.168.3.233/rtss-server'; // BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.3.90:9000'; // 周寅 // BASE_API = 'http://192.168.3.94:9000'; // 旭强 - // BASE_API = 'http://192.168.3.15:9000'; // 张赛 + BASE_API = 'http://192.168.3.15:9000'; // 张赛 // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬 // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 // BASE_API = 'http://b29z135112.zicp.vip'; diff --git a/src/views/publish/publishMap/copy.vue b/src/views/publish/publishMap/copy.vue index 22a4987fd..cec4a4626 100644 --- a/src/views/publish/publishMap/copy.vue +++ b/src/views/publish/publishMap/copy.vue @@ -1,6 +1,56 @@ - + @@ -105,6 +105,7 @@ export default { amount: formData.amount, score: formData.score, topicNum: formData.topicNum, + tags: formData.tags, } if (isEdit) { this.$set(this.ruleList, this.editingIndex, data) @@ -116,7 +117,7 @@ export default { const index = data.$index this.ruleList.splice(index, 1) }, - + checkTotolScores() { return this.currentTotalScore === this.examData.fullScore }, @@ -124,7 +125,7 @@ export default { this.editingIndex = data.$index const list = JSON.stringify(data.row) const detail = JSON.parse(list) - this.$refs.addRule.show(detail) + this.$refs.addRule.show({ ...detail, index: data.$index }) }, getSummaries({ columns, data }) { const sums = [] @@ -142,9 +143,9 @@ export default { return prev } }, 0) - } else if (index === 4) { + } else if (index === 3) { const values = data.map(item => Number(item.amount) * Number(item.score)) - this.currentTotalScore = sums[4] = values.reduce((prev, curr) => { + this.currentTotalScore = sums[3] = values.reduce((prev, curr) => { const value = Number(curr) if (!isNaN(value)) { return prev + curr From 157e1ed45b8594faf3b04825eb9e1ea112065e27 Mon Sep 17 00:00:00 2001 From: Yuan Date: Wed, 26 Oct 2022 11:25:40 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E8=80=83=E8=AF=95=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=E6=95=B0=E9=87=8F=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/baseUrl.js | 4 ++-- src/views/publish/examRule/draft/rule.vue | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 9de79fd8a..f84210e59 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -23,13 +23,13 @@ export function handlerUrl() { let OSS_URL; if (process.env.NODE_ENV === 'development') { // 开发分支 - // BASE_API = 'http://192.168.3.233/rtss-server'; + BASE_API = 'http://192.168.3.233/rtss-server'; // BASE_API = 'https://joylink.club/jlcloud'; // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://114.116.51.125/jlcloud'; // BASE_API = 'http://192.168.3.90:9000'; // 周寅 // BASE_API = 'http://192.168.3.94:9000'; // 旭强 - BASE_API = 'http://192.168.3.15:9000'; // 张赛 + // BASE_API = 'http://192.168.3.15:9000'; // 张赛 // BASE_API = 'http://192.168.3.5:9000'; // 夏增彬 // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏 // BASE_API = 'http://b29z135112.zicp.vip'; diff --git a/src/views/publish/examRule/draft/rule.vue b/src/views/publish/examRule/draft/rule.vue index 2be6e6f69..2eb7daaae 100644 --- a/src/views/publish/examRule/draft/rule.vue +++ b/src/views/publish/examRule/draft/rule.vue @@ -105,6 +105,7 @@ export default { amount: formData.amount, score: formData.score, topicNum: formData.topicNum, + remainNum: formData.remainNum, tags: formData.tags, } if (isEdit) { From 0936e40deb9ccaf2badd7d9dfeed51f8905e5367 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Wed, 26 Oct 2022 14:48:10 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/QueryListPage/QueryListPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/QueryListPage/QueryListPage.vue b/src/components/QueryListPage/QueryListPage.vue index 43b60a9e0..8bed6bf34 100644 --- a/src/components/QueryListPage/QueryListPage.vue +++ b/src/components/QueryListPage/QueryListPage.vue @@ -93,7 +93,7 @@ :sort-by="column.sortBy" > Date: Wed, 26 Oct 2022 15:31:55 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=88=86=E5=8F=91?= =?UTF-8?q?=E5=92=8C=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/authorityTransfer.js | 53 +++++ src/api/userRulesManage.js | 27 +++ src/router/index.js | 16 +- .../create/addPermission.vue | 30 +++ src/views/authorityTransfer/create/index.vue | 201 +++++++++++++++++ src/views/authorityTransfer/detail.vue | 82 +++++++ .../authorityTransfer/distributePackage.vue | 186 ++++++++++++++++ src/views/authorityTransfer/index.vue | 152 +++++++++++++ src/views/functionManage/index.vue | 4 - src/views/permissionManage/index.vue | 46 +++- src/views/userRulesManage/index.vue | 203 ++++++++++++++++++ src/views/userRulesManage/permissionList.vue | 183 ++++++++++++++++ 12 files changed, 1172 insertions(+), 11 deletions(-) create mode 100644 src/api/authorityTransfer.js create mode 100644 src/api/userRulesManage.js create mode 100644 src/views/authorityTransfer/create/addPermission.vue create mode 100644 src/views/authorityTransfer/create/index.vue create mode 100644 src/views/authorityTransfer/detail.vue create mode 100644 src/views/authorityTransfer/distributePackage.vue create mode 100644 src/views/authorityTransfer/index.vue create mode 100644 src/views/userRulesManage/index.vue create mode 100644 src/views/userRulesManage/permissionList.vue diff --git a/src/api/authorityTransfer.js b/src/api/authorityTransfer.js new file mode 100644 index 000000000..5972ccd7f --- /dev/null +++ b/src/api/authorityTransfer.js @@ -0,0 +1,53 @@ + +import request from '@/utils/request'; + +/** 创建权限分发*/ +export function createDistribute(data) { + return request({ + url: `/api/v3/permission/distribute/create`, + method: 'post', + data + }); +} + +/** 分页获取权限分发列表*/ +export function getDistributeList(data) { + return request({ + url: `/api/v3/permission/distribute/paging`, + method: 'post', + data + }); +} + +// /** 设置权限分发立即失效*/ +// export function setDistributeInvalidate(pdId) { +// return request({ +// url: `/api/v2/permission/distribute/${pdId}/invalidate`, +// method: 'put' +// }); +// } + +/** 获取权限分发明细*/ +export function getDistributeDetail(disId) { + return request({ + url: `/api/v3/permission/distribute/list/distribute/${disId}`, + method: 'get' + }); +} + +/** 从权限分发，直接分发给指定主体*/ +export function setDistributeToSubject(pdId, subjectType, subjectId) { + return request({ + url: `/api/v3/permission/distribute/${pdId}/to/${subjectType}/${subjectId}`, + method: 'post' + }); +} + +/** 生成分发二维码*/ +export function getDistributeQrCode(pdId) { + return request({ + url: `/api/v3/permission/distribute/${pdId}/qrCode`, + method: 'get' + }); +} + diff --git a/src/api/userRulesManage.js b/src/api/userRulesManage.js new file mode 100644 index 000000000..fbaa6aced --- /dev/null +++ b/src/api/userRulesManage.js @@ -0,0 +1,27 @@ + +import request from '@/utils/request'; + +/** 设置权限失效或有效*/ +export function setPermissonInValid(subjectId) { + return request({ + url: `/api/v2/permission/subject/inValid/${subjectId}`, + method: 'get' + }); +} + +/** 用户权限列表*/ +export function listPermision(params) { + return request({ + url: `/api/v2/permission/subject/page`, + method: 'get', + params: params + }); +} + +/** 查看用户分发的下级所有用户权限*/ +export function getPermissonInDistribute(subjectId) { + return request({ + url: `/api/v2/permission/subject/distribute/${subjectId}`, + method: 'get' + }); +} diff --git a/src/router/index.js b/src/router/index.js index 5043e9ce9..220bdca4f 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -226,6 +226,10 @@ const ThirdPartyAccounts = () => import('@/views/thirdPartyAccounts/index'); const FunctionManage = () => import('@/views/functionManage/index'); const PermissionManage = () => import('@/views/permissionManage/index'); +const UserRulesManage = () => import('@/views/userRulesManage/index'); +const AuthorityTransfer = () => import('@/views/authorityTransfer/index'); +const CreateDistribute = () => import('@/views/authorityTransfer/create/index'); +const DistributeDetail = () => import('@/views/authorityTransfer/detail'); // import { GenerateRouteProjectList } from '@/scripts/ProjectConfig'; // import { getSessionStorage } from '@/utils/auth'; @@ -2065,7 +2069,8 @@ export const asyncRouter = [ { // 权限分发管理 path: 'authorityTransferManage', - component: Permission, + component: AuthorityTransfer, + // component: Permission, meta: { i18n: 'newRouter.authorityTransferManage' } @@ -2073,10 +2078,17 @@ export const asyncRouter = [ { // 用户权限管理 path: 'userRulesManage', - component: UserRules, + component: UserRulesManage, + // component: UserRules, meta: { i18n: 'newRouter.userRulesManage' } + }, + { + // 权限分发管理-创建 + path: 'createDistribute', + component: CreateDistribute, + hidden: true } ] }, diff --git a/src/views/authorityTransfer/create/addPermission.vue b/src/views/authorityTransfer/create/addPermission.vue new file mode 100644 index 000000000..935afca13 --- /dev/null +++ b/src/views/authorityTransfer/create/addPermission.vue @@ -0,0 +1,30 @@ + + + + diff --git a/src/views/authorityTransfer/create/index.vue b/src/views/authorityTransfer/create/index.vue new file mode 100644 index 000000000..30f158c80 --- /dev/null +++ b/src/views/authorityTransfer/create/index.vue @@ -0,0 +1,201 @@ + + + + diff --git a/src/views/authorityTransfer/detail.vue b/src/views/authorityTransfer/detail.vue new file mode 100644 index 000000000..daf00b22d --- /dev/null +++ b/src/views/authorityTransfer/detail.vue @@ -0,0 +1,82 @@ + + + + diff --git a/src/views/authorityTransfer/distributePackage.vue b/src/views/authorityTransfer/distributePackage.vue new file mode 100644 index 000000000..7f290f3da --- /dev/null +++ b/src/views/authorityTransfer/distributePackage.vue @@ -0,0 +1,186 @@ + + + diff --git a/src/views/authorityTransfer/index.vue b/src/views/authorityTransfer/index.vue new file mode 100644 index 000000000..a3d319f1e --- /dev/null +++ b/src/views/authorityTransfer/index.vue @@ -0,0 +1,152 @@ + + + diff --git a/src/views/functionManage/index.vue b/src/views/functionManage/index.vue index eed0603e2..a1620711b 100644 --- a/src/views/functionManage/index.vue +++ b/src/views/functionManage/index.vue @@ -119,8 +119,4 @@ export default { }; diff --git a/src/views/permissionManage/index.vue b/src/views/permissionManage/index.vue index d2fb00dd1..137f88bef 100644 --- a/src/views/permissionManage/index.vue +++ b/src/views/permissionManage/index.vue @@ -15,6 +15,22 @@ export default { components: { Create }, + props: { + onlySelect: { + type: Boolean, + default: false + }, + selectIds: { + type: Array, + default: () => { + return []; + } + }, + tableHeight: { + type: String, + default: '' + } + }, data() { return { // PermissionTypeList: [], @@ -82,13 +98,21 @@ export default { { name: this.$t('global.edit'), handleClick: this.handleEdit, + showControl: (row) => { return !this.onlySelect; }, + type: '' + }, + { + name: '选择', + handleClick: this.handleSelect, + showControl: (row) => { return this.onlySelect; }, + isDisabled: this.selectDisabled, type: '' } ] } ], actions: [ - { text: this.$t('orderAuthor.createPermission'), handler: this.create } + { text: this.$t('orderAuthor.createPermission'), handler: this.create, show: !this.onlySelect } ] } }; @@ -96,8 +120,21 @@ export default { created() { this.getAllAbility(); + if (this.tableHeight) { + this.queryList.height = this.tableHeight; + } }, methods: { + selectDisabled(index, row) { + let s = false; + const findObj = this.selectIds.find(item => { + return item.permissionId == row.id; + }); + if (findObj) { + s = true; + } + return s; + }, getAllAbility() { getAllAbility().then(res => { res.data && res.data.forEach(item => { @@ -130,6 +167,9 @@ export default { handleEdit(index, row) { this.$refs.create.doShow(row); }, + handleSelect(index, row) { + this.$emit('handleSelect', row); + }, create() { this.$refs.create.doShow(); } @@ -137,8 +177,4 @@ export default { }; diff --git a/src/views/userRulesManage/index.vue b/src/views/userRulesManage/index.vue new file mode 100644 index 000000000..9b642cba2 --- /dev/null +++ b/src/views/userRulesManage/index.vue @@ -0,0 +1,203 @@ + + + + diff --git a/src/views/userRulesManage/permissionList.vue b/src/views/userRulesManage/permissionList.vue new file mode 100644 index 000000000..2b7f901bd --- /dev/null +++ b/src/views/userRulesManage/permissionList.vue @@ -0,0 +1,183 @@ + + + + From 48fe57cde1d97ffb04c347eda59634cd48d65916 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Wed, 26 Oct 2022 17:08:09 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userRulesManage/index.vue | 2 +- src/views/userRulesManage/permissionList.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/userRulesManage/index.vue b/src/views/userRulesManage/index.vue index 9b642cba2..70fd032d7 100644 --- a/src/views/userRulesManage/index.vue +++ b/src/views/userRulesManage/index.vue @@ -142,7 +142,7 @@ export default { { name: '权限流向', handleClick: this.handleRestoreList, - showControl: (row) => { return row.amount !== row.remains; }, + // showControl: (row) => { return row.amount !== row.remains; }, type: '' } ] diff --git a/src/views/userRulesManage/permissionList.vue b/src/views/userRulesManage/permissionList.vue index 2b7f901bd..fcead905f 100644 --- a/src/views/userRulesManage/permissionList.vue +++ b/src/views/userRulesManage/permissionList.vue @@ -138,8 +138,8 @@ export default { methods: { doShow(index, row) { console.log(row); - if (!row.subjectId) { return; } - this.id = row.subjectId; + if (!row.id) { return; } + this.id = row.id; this.dialogShow = true; this.reloadTable(); }, From a163ba51db0ebf570bccc87ce6deaaf661c27448 Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Wed, 26 Oct 2022 17:25:48 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/userRulesManage/index.vue | 2 +- src/views/userRulesManage/permissionList.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/userRulesManage/index.vue b/src/views/userRulesManage/index.vue index 70fd032d7..9b642cba2 100644 --- a/src/views/userRulesManage/index.vue +++ b/src/views/userRulesManage/index.vue @@ -142,7 +142,7 @@ export default { { name: '权限流向', handleClick: this.handleRestoreList, - // showControl: (row) => { return row.amount !== row.remains; }, + showControl: (row) => { return row.amount !== row.remains; }, type: '' } ] diff --git a/src/views/userRulesManage/permissionList.vue b/src/views/userRulesManage/permissionList.vue index fcead905f..7d5978bd5 100644 --- a/src/views/userRulesManage/permissionList.vue +++ b/src/views/userRulesManage/permissionList.vue @@ -137,7 +137,6 @@ export default { }, methods: { doShow(index, row) { - console.log(row); if (!row.id) { return; } this.id = row.id; this.dialogShow = true;