Skip to content

W
web
Commit 2c7ea38c authored by ztf's avatar ztf
Browse files
Options

合并最新4.1

parent 3f1639b1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 69 additions and 43 deletions
applications/architecture-dee/public/dee-config/main.js
View file @ 2c7ea38c
This source diff could not be displayed because it is too large. You can view the blob instead.
applications/architecture-dee/public/dee-lifecycle/report.html
View file @ 2c7ea38c
......@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>dee-lifecycle [8 Aug 2024 at 10:05]</title>
<title>dee-lifecycle [14 Aug 2024 at 15:37]</title>
<link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAABrVBMVEUAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////+O1foceMD///+J0/qK1Pr7/v8Xdr/9///W8P4UdL7L7P0Scr2r4Pyj3vwad8D5/f/2/f+55f3E6f34+/2H0/ojfMKpzOd0rNgQcb3F3O/j9f7c8v6g3Pz0/P/w+v/q+P7n9v6T1/uQ1vuE0vqLut/y+v+Z2fvt+f+15Pzv9fuc2/vR7v2V2Pvd6/bg9P7I6/285/2y4/yp3/zp8vk8i8kqgMT7/P31+fyv4vxGkcz6/P6/6P3j7vfS5PNnpNUxhcbO7f7F6v3O4vHK3/DA2u631Ouy0eqXweKJud5wqthfoNMMbLvY8f73+v2dxeR8sNtTmdDx9/zX6PSjyeaCtd1YnNGX2PuQveCGt95Nls42h8dLlM3F4vBtAAAAM3RSTlMAAyOx0/sKBvik8opWGBMOAe3l1snDm2E9LSb06eHcu5JpHbarfHZCN9CBb08zzkdNS0kYaptYAAAFV0lEQVRYw92X51/aYBDHHS2O2qqttVbrqNq9m+TJIAYIShBkWwqIiCgoWvfeq7Z2/s29hyQNyUcR7LveGwVyXy6XH8/9rqxglLfUPLxVduUor3h0rfp2TYvpivk37929TkG037hffoX0+peVtZQc1589rigVUdXS/ABSAyEmGIO/1XfvldSK8vs3OqB6u3m0nxmIrvgB0dj7rr7Y9IbuF68hnfFaiHA/sxqm0wciIG43P60qKv9WXWc1RXGh/mFESFABTSBi0sNAKzqet17eCtOb3kZIDwxEEU0oAIJGYxNBDhBND29e0rtXXbcpuPmED9IhEAAQ/AXEaF8EPmnrrKsv0LvWR3fg5sWDNAFZOgAgaKvZDogHNU9MFwnnYROkc56RD5CjAbQX9Ow4g7upCsvYu55aSI/Nj0H1akgKQEUM94dwK65hYRmFU9MIcH/fqJYOZYcnuJSU/waKDgTOEVaVKhwrTRP5XzgSpAITYzom7UvkhFX5VutmxeNnWDjjswTKTyfgluNDGbUpWissXhF3s7mlSml+czWkg3D0l1nNjGNjz3myOQOa1KM/jOS6ebdbAVTCi4gljHSFrviza7tOgRWcS0MOUX9zdNgag5w7rRqA44Lzw0hr1WqES36dFliSJFlh2rXIae3FFcDDgKdxrUIDePr8jGcSClV1u7A9xeN0ModY/pHMxmR1EzRh8TJiwqsHmKW0l4FCEZI+jHio+JdPPE9qwQtTRxku2D8sIeRL2LnxWSllANCQGOIiqVHAz2ye2JR0DcH+HoxDkaADLjgxjKQ+AwCX/g0+DNgdG0ukYCONAe+dbc2IAc6fwt1ARoDSezNHxV2Cmzwv3O6lDMV55edBGwGK9n1+x2F8EDfAGCxug8MhpsMEcTEAWf3rx2vZhe/LAmtIn/6apE6PN0ULKgywD9mmdxbmFl3OvD5AS5fW5zLbv/YHmcsBTjf/afDz3MaZTVCfAP9z6/Bw6ycv8EUBWJIn9zYcoAWWlW9+OzO3vkTy8H+RANLmdrpOuYWdZYEXpo+TlCJrW5EARb7fF+bWdqf3hhyZI1nWJQHgznErZhbjoEsWqi8dQNoE294aldzFurwSABL2XXMf9+H1VQGke9exw5P/AnA5Pv5ngMul7LOvO922iwACu8WkCwLCafvM4CeWPxfA8lNHcWZSoi8EwMAIciKX2Z4SWCMAa3snCZ/G4EA8D6CMLNFsGQhkkz/gQNEBbPCbWsxGUpYVu3z8IyNAknwJkfPMEhLyrdi5RTyUVACkw4GSFRNWJNEW+fgPGwHD8/JxnRuLabN4CGNRkAE23na2+VmEAUmrYymSGjMAYqH84YUIyzgzs3XC7gNgH36Vcc4zKY9o9fgPBXUAiHHwVboBHGLiX6Zcjp1f2wu4tvzZKo0ecPnDtQYDQvJXaBeNzce45Fp28ZQLrEZVuFqgBwOalArKXnW1UzlnSusQKJqKYNuz4tOnI6sZG4zanpemv+7ySU2jbA9h6uhcgpfy6G2PahirDZ6zvq6zDduMVFTKvzw8wgyEdelwY9in3XkEPs3osJuwRQ4qTkfzifndg9Gfc4pdsu82+tTnHZTBa2EAMrqr2t43pguc8tNm7JQVQ2S0ukj2d22dhXYP0/veWtwKrCkNoNimAN5+Xr/oLrxswKbVJjteWrX7eR63o4j9q0GxnaBdWgGA5VStpanIjQmEhV0/nVt5VOFUvix6awJhPcAaTEShgrG+iGyvb5a0Ndb1YGHFPEwoqAinoaykaID1o1pdPNu7XsnCKQ3R+hwWIIhGvORcJUBYXe3Xa3vq/mF/N9V13ugufMkfXn+KHsRD0B8AAAAASUVORK5CYII=" type="image/x-icon" />
<script>
......
applications/architecture-dee/public/dee-model/report.html
View file @ 2c7ea38c
This source diff could not be displayed because it is too large. You can view the blob instead.
applications/architecture-dee/src/commonComponents/components/DeeFolderInfo/index.vue
View file @ 2c7ea38c
......@@ -44,7 +44,7 @@ export default {
immediate: true,
handler({ id, versionId, dxContextId }) {
const objId = this.isValidVal(versionId) ? versionId : id
if (!this.isValidVal(objId)) return
if (!this.isValidVal(objId) || !dxContextId) return
getFolderFullPath({ objId, contextId: dxContextId })
.then(({ items }) => {
this.folders = Array.isArray(items) ? items : []
......
applications/architecture-dee/src/store/modules/user.js
View file @ 2c7ea38c
......@@ -123,15 +123,18 @@ const actions = {
getUserRole(userVO.id)
.then(res => {
const roles = res.items.content || []
const syNames = ['sysadmin', 'audadmin', 'secadmin']
const syNames = ['sysadmin', 'subsysadmin', 'audadmin', 'subaudadmin', 'secadmin', 'subsecadmin']
// 是管理员
let isAdmin = false
// 是系统管理员
let isSysAdmin = false
let isSubSysAdmin = false
// 是审计管理员
let isAudAdmin = false
let isSubAudAdmin = false
// 是安全管理员
let isSecAdmin = false
let isSubSecAdmin = false
roles.forEach(m => {
if (!isAdmin) {
isAdmin = syNames.includes(m.name)
......@@ -139,14 +142,23 @@ const actions = {
if (!isSysAdmin) {
isSysAdmin = m.name === 'sysadmin'
}
if (!isSubSysAdmin) {
isSubSysAdmin = m.name === 'subsysadmin'
}
if (!isAudAdmin) {
isAudAdmin = m.name === 'audadmin'
}
if (!isSubAudAdmin) {
isSubAudAdmin = m.name === 'subaudadmin'
}
if (!isSecAdmin) {
isSecAdmin = m.name === 'secadmin'
}
if (!isSubSecAdmin) {
isSubSecAdmin = m.name === 'subsecadmin'
}
})
commit('SET_TERNARY_USER_INFO', { isAdmin, isSysAdmin, isAudAdmin, isSecAdmin })
commit('SET_TERNARY_USER_INFO', { isAdmin, isSysAdmin, isSubSysAdmin, isAudAdmin, isSubAudAdmin, isSecAdmin, isSubSecAdmin })
})
.catch(() => {
commit('SET_TERNARY_USER_INFO', {})
......
applications/dee-context/src/api/modelApi.js
View file @ 2c7ea38c
......@@ -47,7 +47,7 @@ export function getAttr(params) {
}
// 修改模型属性
export function putAttr(params) {
return put('/ModelAttr', params)
return put('/ModelAttr/updateModelAttr', params)
}
// 新增关联关系
export function postAttrRelation(params) {
......@@ -60,7 +60,7 @@ export function editAttrRelation(params) {
// 添加模型属性
export function postAttr(params) {
params.createType = 'CREATE'
return post('/ModelAttr', params, true)
return post('/ModelAttr/saveModelAttr', params, true)
}
// 修改单个模型信息
export function putDefinition(params) {
......
applications/dee-craft/src/api/workflow/config.js
View file @ 2c7ea38c
......@@ -28,5 +28,5 @@ export function getModelByName(params) {
}
// 查询二级属性
export function getAllAttrByModelName(modelName) {
return get(`/ModelAttr/${modelName}?onlyBase=false`)
return get(`/ModelAttr/findModelAttrByModelName/${modelName}?onlyBase=false`)
}
applications/dee-doc/src/privateComponents/components/ProposedUnit/index.vue
View file @ 2c7ea38c
<template>
<div class="dee-model">
<span v-if="readOnly">
<!-- <span v-if="readOnly">
{{ showValue||'' }}
</span>
<div v-else>
</span> -->
<div>
<el-input
v-if="foreign==='ExtContactList'"
v-model="proposedUnit"
......@@ -37,19 +37,19 @@ export default {
type: Object,
default: null
},
scope: {
type: Object,
default: null
},
disabled: {
type: Boolean,
default: false
// scope: {
// type: Object,
// default: null
// },
// disabled: {
// type: Boolean,
// default: false
},
readOnly: {
type: Boolean,
default: false
},
// },
// readOnly: {
// type: Boolean,
// default: false
// },
value: {
type: [String, Object, Array],
default: () => ''
......@@ -63,9 +63,6 @@ export default {
},
computed: {
showValue() {
console.log('readOnly', this.readOnly)
console.log('操作value', this.value)
console.log('监听value之后赋值', this.proposedUnit)
if (!this.proposedUnit) {
return ''
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment