+
-
+
+ :before-close="handleClose"
+ >
@@ -132,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 = {
@@ -165,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')
}
})
@@ -179,11 +215,11 @@ export default {
},
handleClose (done) {
this.$confirm('确认关闭？')
- .then(_ => {
+ .then((_) => {
this.input = ''
done()
})
- .catch(_ => {})
+ .catch((_) => {})
},
handleClose2 () {
this.dialogVisible = false
@@ -193,56 +229,127 @@ export default {
console.log(window.SITE_CONFIG.previewUrl)
window.open(
window.SITE_CONFIG.previewUrl +
- 'hisense_office/onlinePreview?url=' +
- btoa(encodeURI(url))
+ 'hisense_office/onlinePreview?url=' +
+ btoa(encodeURI(url))
)
},
// 获取信息
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============================')
- 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 += '、'
+ let params = ''
+ if (this.dataForm.taskId) {
+ params = `taskId=${this.dataForm.taskId}`
+ this.$http
+ .get(
+ `/act/task/getTaskVariables?${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.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
+ })
+ })
}
})
- }
- 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 () {
@@ -260,63 +367,73 @@ export default {
.catch(() => {})
},
// 同意与退回
- agreeOrNot: debounce(function (data) {
- if (this.dialogType === '同意') {
- console.log('this.dataForm', this.dataForm)
- const params = qs.stringify({
- taskId: this.dataForm.taskId,
- comment: this.input
- })
- console.log(params)
- this.$http.post('/act/task/complete?' + params).then(({ data: res }) => {
- if (res.code !== 0) {
- this.$message.error(res.msg)
- if (this.callbacks.taskHandleErrorCallback) {
- this.callbacks.taskHandleErrorCallback(res)
- }
- return
- }
- this.$message({
- message: this.$t('prompt.success'),
- type: 'success',
- duration: 500,
- onClose: () => {
- this.visible = false
- if (this.callbacks.taskHandleSuccessCallback) {
- this.callbacks.taskHandleSuccessCallback(res)
- }
- }
+ agreeOrNot: debounce(
+ function (data) {
+ if (this.dialogType === '同意') {
+ console.log('this.dataForm', this.dataForm)
+ const params = qs.stringify({
+ taskId: this.dataForm.taskId,
+ comment: this.input
})
- }).catch(() => {})
- } else if (this.dialogType === '拒绝') {
- const params = qs.stringify({
- taskId: this.dataForm.taskId,
- comment: this.input
- })
- this.$http.post('/act/task/backToFirst?', params).then(({ data: res }) => {
- if (res.code !== 0) {
- this.$message.error(res.msg)
- if (this.callbacks.taskHandleErrorCallback) {
- this.callbacks.taskHandleErrorCallback(res)
- }
- return
- }
- this.$message({
- message: this.$t('prompt.success'),
- type: 'success',
- duration: 500,
- onClose: () => {
- this.visible = false
- if (this.callbacks.taskHandleSuccessCallback) {
- this.callbacks.taskHandleSuccessCallback(res)
+ console.log(params)
+ this.$http
+ .post('/act/task/complete?' + params)
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ this.$message.error(res.msg)
+ if (this.callbacks.taskHandleErrorCallback) {
+ this.callbacks.taskHandleErrorCallback(res)
+ }
+ return
}
- }
+ this.$message({
+ message: this.$t('prompt.success'),
+ type: 'success',
+ duration: 500,
+ onClose: () => {
+ this.visible = false
+ this.dialogVisible = false
+ if (this.callbacks.taskHandleSuccessCallback) {
+ this.callbacks.taskHandleSuccessCallback(res)
+ }
+ }
+ })
+ })
+ .catch(() => {})
+ } else if (this.dialogType === '拒绝') {
+ const params = qs.stringify({
+ taskId: this.dataForm.taskId,
+ comment: this.input
})
- })
- }
- this.tabRemoveHandle(data)
- // this.getDataList(data)
- }, 1000, { leading: true, trailing: false }),
+ this.$http
+ .post('/act/task/endProcess?', params)
+ .then(({ data: res }) => {
+ if (res.code !== 0) {
+ this.$message.error(res.msg)
+ if (this.callbacks.taskHandleErrorCallback) {
+ this.callbacks.taskHandleErrorCallback(res)
+ }
+ return
+ }
+ this.$message({
+ message: this.$t('prompt.success'),
+ type: 'success',
+ duration: 500,
+ onClose: () => {
+ this.visible = false
+ if (this.callbacks.taskHandleSuccessCallback) {
+ this.callbacks.taskHandleSuccessCallback(res)
+ }
+ }
+ })
+ })
+ }
+ this.tabRemoveHandle(data)
+ // this.getDataList(data)
+ },
+ 1000,
+ { leading: true, trailing: false }
+ ),
tabRemoveHandle (tabName) {
console.log(tabName, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
if (tabName === 'home') {
@@ -450,7 +567,7 @@ export default {
}
.clearfix:after {
display: block;
- content: "";
+ content: '';
clear: both;
}
.title {
@@ -460,7 +577,7 @@ export default {
border-bottom: 0;
}
.title:before {
- content: "";
+ content: '';
width: 6px;
height: 6px;
display: inline-block;
diff --git a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
index 380d7837..4f1b9def 100644
--- a/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
+++ b/back/src/views/modules/putOnTheShelf/components/inputSelectCheckbox.vue
@@ -199,7 +199,7 @@ export default {
diff --git a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
index 86ba9469..8ad4b92e 100644
--- a/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
+++ b/front/src/views/detailsAll/components/LayerService/LayerServiceUsageMode.vue
@@ -128,16 +128,7 @@
})
const flag = ref(true)
if (props.dataList.infoList) {
- let obj = props.dataList.infoList.filter(
- (item) =>
- item.attrType === '技术文档' ||
- item.attrType === '服务商' ||
- item.attrType === '服务商联系人' ||
- item.attrType === '使用手册' ||
- item.attrType === '服务地址' ||
- item.attrType === '样式服务地址' ||
- item.attrType === '服务商联系电话'
- )[0]
+ let obj = true
if (!obj) {
flag.value = false
} else {
@@ -168,16 +159,7 @@
() => props.dataList,
(val) => {
if (val) {
- let obj = val.infoList.filter(
- (item) =>
- item.attrType === '技术文档' ||
- item.attrType === '服务商' ||
- item.attrType === '服务商联系人' ||
- item.attrType === '使用手册' ||
- item.attrType === '服务地址' ||
- item.attrType === '样式服务地址' ||
- item.attrType === '服务商联系电话'
- )[0]
+ let obj = true
if (!obj) {
flag.value = false
} else {
diff --git a/front/src/views/developmentGuide/index.vue b/front/src/views/developmentGuide/index.vue
index 20ba196b..2855ee21 100644
--- a/front/src/views/developmentGuide/index.vue
+++ b/front/src/views/developmentGuide/index.vue
@@ -5,7 +5,7 @@
-
开发指南
+
技术文档
{
- 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这个参数是下面的分页传过来的参数
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 8877cfa9..3a488731 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -462,6 +462,13 @@
})
}
})
+ } else {
+ router.push({
+ path: '/DetailsPageconetent',
+ query: {
+ select: '组件服务',
+ },
+ })
}
})
}
@@ -711,86 +718,86 @@
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 934d6595..8e68f09a 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -284,6 +284,8 @@
// getMynotice()
// })
// }
+ // 建立链接 -- 携带cookie参数
+
onMounted(() => {
getSgcTotal().then((res) => {
// console.log('初始化========================>', res.data.data.count)
diff --git a/front/src/views/mynoticeView/components/NoticeList.vue b/front/src/views/mynoticeView/components/NoticeList.vue
index e6029fb4..2003708d 100644
--- a/front/src/views/mynoticeView/components/NoticeList.vue
+++ b/front/src/views/mynoticeView/components/NoticeList.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-21 11:55:07
* @LastEditors: hisense.liangjunhua
- * @LastEditTime: 2022-07-01 17:03:24
+ * @LastEditTime: 2022-07-21 17:05:11
* @Description: 告诉大家这是什么
-->
@@ -111,7 +111,7 @@
diff --git a/front/src/views/personalCenter/components/TheShelvesAbility.vue b/front/src/views/personalCenter/components/TheShelvesAbility.vue
index ce2a5e67..3d335956 100644
--- a/front/src/views/personalCenter/components/TheShelvesAbility.vue
+++ b/front/src/views/personalCenter/components/TheShelvesAbility.vue
@@ -22,7 +22,7 @@
能力使用状态：
- 正在被使用
+ 正在被使用
未使用
-