wuhongjian
/
hi-ucs
1
0
Fork 0
Code Issues Pull Requests Projects Releases 10 Wiki Activity

Merge branch 'hi-ucs-dev' of http://15.2.21.221:3000/wuhongjian/hi-ucs into hi-ucs-dev

This commit is contained in:
a0049873 2022-07-22 15:46:26 +08:00
parent 795d3e0b56 78a9f22ffb
commit cf0c32979f
7 changed files with 141 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
back/src/views/modules/activiti/demo/putaway-process3.vue
View File

@ -98,7 +98,7 @@
</div>
</div>
</div>
<div class="agreeOr">
<div class="agreeOr" v-if="this.dataForm.taskId">
<div>
<!-- <el-radio-group v-model="agreeOrList" style="width:230px;">
<el-radio-button label="同意" class="blueAll" @click="showDialog('同意')">同意</el-radio-button>
@ -324,6 +324,7 @@ export default {
taskHandleErrorCallback (data) {}
},
created () {
this.dataForm.taskId = this.$route.params.taskId
this.init()
},
mounted () {}

3
back/src/views/modules/myAgent/demo/ability-resource-shelf.vue
View File

@ -33,7 +33,7 @@
ref="renProcessMultiple"
></ren-process-multiple> -->
<!-- 审批 -->
<div class="agreeOr">
<div class="agreeOr" v-if="taskId">
<h3>审批</h3>
<div>
<el-button type="primary" @click="showDialog('同意')">同意</el-button>
@ -129,6 +129,7 @@ export default {
// 将业务KEY赋值给表单
console.log('params=================>', this.$route, this.$route.params)
this.taskId = this.$route.params.taskId
this.dataForm.taskId = this.$route.params.taskId
this.init()
console.log('fromList', this.$router.currentRoute.params.businessKey)
// this.dataForm = this.$router.currentRoute.params.params.params.resourceDTO

169
back/src/views/modules/myAgent/demo/competency-application.vue
View File

@ -86,7 +86,7 @@
></ren-process-multiple> -->
<!-- 审批 -->
<div class="agreeOr">
<div class="agreeOr" v-if="dataForm.taskId">
<h3>审批</h3>
<div>
<!-- <el-radio-group v-model="agreeOrList" style="width:230px;">
@ -167,6 +167,7 @@ export default {
// 将业务KEY赋值给表单
console.log('params=================>', this.$route, this.$route.params)
this.dataForm.taskId = this.$route.params.taskId
this.dataForm.instanceId = this.$route.params.processInstanceId
this.init()
// // 流程回调
var callbacks = {
@ -200,10 +201,10 @@ export default {
// this.visible = true
this.$nextTick(() => {
// this.$refs.dataForm.resetFields()
this.getInfo()
if (this.dataForm.taskId) {
// 如业务KEY已存在，不允许编辑
// this.fieldDisabled = true
this.getInfo()
console.log(this.dataForm, 'init')
}
})
@ -234,65 +235,121 @@ export default {
},
// 获取信息
getInfo () {
this.$http
.get(
`/act/task/getTaskVariables?taskId=${this.dataForm.taskId}&variableName=tAbilityApplicationDTOList`
)
.then(({ data: res }) => {
if (res.code !== 0) {
console.log(res.data)
return this.$message.error(res.msg)
}
console.log(
res.data,
this.dataForm,
'elas============================'
let params = ''
if (this.dataForm.taskId) {
params = `taskId=${this.dataForm.taskId}`
this.$http
.get(
`/act/task/getTaskVariables?${params}&variableName=tAbilityApplicationDTOList`
)
if (res.data.tAbilityApplicationDTOList[0].applicationScene) {
res.data.tAbilityApplicationDTOList[0].applicationSceneStr = ''
res.data.tAbilityApplicationDTOList[0].applicationScene.map(
(val, index) => {
res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
val
if (
index <
res.data.tAbilityApplicationDTOList[0].applicationScene
.length -
1
) {
res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
'、'
}
}
.then(({ data: res }) => {
if (res.code !== 0) {
console.log(res.data)
return this.$message.error(res.msg)
}
console.log(
res.data,
this.dataForm,
'elas============================'
)
}
this.dataForm.content = res.data.tAbilityApplicationDTOList[0]
const obj = {
name: '申请摄像头列表',
type: '基础设施',
describe: ''
}
let flag = false
res.data.tAbilityApplicationDTOList.map((val) => {
if (val.cameraList) {
flag = true
obj.describe += val.system
} else {
this.$http.get('/resource/' + val.resourceId).then((res1) => {
// console.log(res1.data.data, '1111111111111111111111111111111111')
this.dataList.push({
name: res1.data.data.name,
type: res1.data.data.type,
describe: res1.data.data.description
if (res.data.tAbilityApplicationDTOList[0].applicationScene) {
res.data.tAbilityApplicationDTOList[0].applicationSceneStr = ''
res.data.tAbilityApplicationDTOList[0].applicationScene.map(
(val, index) => {
res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
val
if (
index <
res.data.tAbilityApplicationDTOList[0].applicationScene
.length -
1
) {
res.data.tAbilityApplicationDTOList[0].applicationSceneStr +=
'、'
}
}
)
}
this.dataForm.content = res.data.tAbilityApplicationDTOList[0]
const obj = {
name: '申请摄像头列表',
type: '基础设施',
describe: ''
}
let flag = false
res.data.tAbilityApplicationDTOList.map((val) => {
if (val.cameraList) {
flag = true
obj.describe += val.system
} else {
this.$http.get('/resource/' + val.resourceId).then((res1) => {
// console.log(res1.data.data, '1111111111111111111111111111111111')
this.dataList.push({
name: res1.data.data.name,
type: res1.data.data.type,
describe: res1.data.data.description
})
})
})
}
})
if (flag) {
this.dataList.push(obj)
}
})
if (flag) {
this.dataList.push(obj)
}
})
.catch(() => {})
.catch(() => {})
} else {
params = `instanceId=${this.dataForm.instanceId}`
this.$http
.get(
`/act/his/getVariablesByInstanceId?${params}&variableName=tAbilityApplicationDTOList`
)
.then(({ data: res }) => {
if (res.code !== 0) {
console.log(res.data)
return this.$message.error(res.msg)
}
console.log(
res.data,
this.dataForm,
'elas============================'
)
if (res.data[0].applicationScene) {
res.data[0].applicationSceneStr = ''
res.data[0].applicationScene.map((val, index) => {
res.data[0].applicationSceneStr += val
if (index < res.data[0].applicationScene.length - 1) {
res.data[0].applicationSceneStr += '、'
}
})
}
this.dataForm.content = res.data[0]
const obj = {
name: '申请摄像头列表',
type: '基础设施',
describe: ''
}
let flag = false
res.data.tAbilityApplicationDTOList.map((val) => {
if (val.cameraList) {
flag = true
obj.describe += val.system
} else {
this.$http.get('/resource/' + val.resourceId).then((res1) => {
// console.log(res1.data.data, '1111111111111111111111111111111111')
this.dataList.push({
name: res1.data.data.name,
type: res1.data.data.type,
describe: res1.data.data.description
})
})
}
})
if (flag) {
this.dataList.push(obj)
}
})
.catch(() => {})
}
},
// 申请能力
applyData () {

2
back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
View File

@ -199,7 +199,7 @@ export default {
<style lang='scss' scoped>
#inputSelectCheckbox {
// margin-top: 20px;
width: 100%;
width: calc(100% - 105px);
display: flex;
justify-content: flex-start;
align-items: center;

5
back/src/views/modules/putOnTheShelf/components/special.vue
View File

@ -42,6 +42,7 @@
<a-input
v-model:value="val.note1"
:placeholder="'请填写' + val.name"
style="width: calc(100% - 150px);"
/>
<span style="width: 2.5rem; padding-left: 0.1rem">
{{
@ -253,7 +254,7 @@ export default {
align-items: center;
span:first-child {
width: 120px;
width: 105px;
}
:deep(.ant-input-textarea) {
@ -268,7 +269,7 @@ export default {
width: 200px;
}
:deep(.ant-input) {
::v-deep .ant-input {
resize: none;
width: 570px;
}

20
front/src/views/home/DetailsPageconetent.vue
View File

@ -944,9 +944,23 @@
const resourceList = reactive({ data: [] })
const videoList = reactive({ data: [] })
const resourceTotal = ref('')
// 校验
const re = /^[0-9\u4E00-\u9FA5]*$/
const getAppResources = (switchIndex) => {
if (switchIndex) {
if (switchIndex.length > 1) {
if (searchValue.value) {
let str = ''
let r = null
console.log(
'2222222222222222222222222222',
searchValue.value,
searchValue.value.length
)
if (searchValue.value.length >= 2) {
str = searchValue.value.substring(0, 2)
console.log('str================>', str)
r = re.test(str)
}
if (searchValue.value.length > 1 && r) {
//switchIndex这个参数是下面的分页传过来的参数
paramsGetResources.name = searchValue.value
paramsGetResources.type = Cardsname.value
@ -1025,7 +1039,7 @@
})
}
} else {
message.error('请输入一个字以上！')
message.error('请以两位以上汉字或数字开头')
}
} else {
//switchIndex这个参数是下面的分页传过来的参数

3
front/src/views/personalCenter/components/addApplication.vue
View File

@ -353,6 +353,9 @@
if (subimtFlag.value) {
subimtFlag.value = false
formRef.value.validate().then(() => {
const detString = String(formName.detailsField)
formName.detailsField = detString
console.log(detString, formName.detailsField, 'detString')
demandApply(formName).then((res) => {
applySuccess.value = false
message.success('操作成功！')