Skip to content

liangzhen / framework-tools-web

Go to a project
Commit ecbe8d8f by xiehao
Options

Merge remote-tracking branch 'origin/master'

2 parents e933a4dd 66ad51a3
Expand all
Inline Side-by-side
Showing with 235 additions and 221 deletions
src/api/dataMapping.js
import { post } from '@/utils/http'
import {
EADC_ARRCHITECTURE,
......@@ -33,21 +32,38 @@ export function removeEleRelation(params) {
}
// 资产关系新增
export function createAssetRelation(params) {
return post(EADC_ARRCHITECTURE + '/archi-asset-relation/cAssetRelation', params)
return post(
EADC_ARRCHITECTURE + '/archi-asset-relation/cAssetRelation',
params,
true,
)
}
// 资产关系修改
export function updAssetRelation(params) {
return post(EADC_ARRCHITECTURE + '/archi-asset-relation/uAssetRelation', params)
return post(
EADC_ARRCHITECTURE + '/archi-asset-relation/uAssetRelation',
params,
true,
)
}
// 根据元素查资产
export function queryAssetByEle(params) {
return post(EADC_ARRCHITECTURE + '/archi-asset-relation/queryAssetByEle', params)
return post(
EADC_ARRCHITECTURE + '/archi-asset-relation/queryAssetByEle',
params,
)
}
// 资产关系删除
export function removeAssetRelation(params) {
return post(EADC_ARRCHITECTURE + '/archi-asset-relation/rAssetRelation', params)
return post(
EADC_ARRCHITECTURE + '/archi-asset-relation/rAssetRelation',
params,
)
}
// 资产关系发布/停用
export function pAssetRelation(params) {
return post(EADC_ARRCHITECTURE + '/archi-asset-relation/pAssetRelation', params)
}
\ No newline at end of file
return post(
EADC_ARRCHITECTURE + '/archi-asset-relation/pAssetRelation',
params,
)
}
src/components/ChoosePrjDialog.vue
......@@ -4,7 +4,7 @@
* @Autor: pan
* @Date: 2024-05-29 16:57:25
* @LastEditors: pan
* @LastEditTime: 2024-06-05 19:46:56
* @LastEditTime: 2024-06-19 17:59:48
-->
<template>
<el-dialog
......@@ -33,8 +33,8 @@
</list-page>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button>
<el-button type="primary" v-preventReClick @click="handleConfirm()" size="mini"
<el-button @click="handleClose()">取 消</el-button>
<el-button type="primary" v-preventReClick @click="handleConfirm()"
>确 定</el-button
>
</span></el-dialog
......
src/views/batchPlanManagement/ApprovalDialog.vue
......@@ -19,10 +19,8 @@
></Form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button>
<el-button type="primary" @click="handleSubmit" size="mini"
>提 交</el-button
>
<el-button @click="handleClose()">取 消</el-button>
<el-button type="primary" @click="handleSubmit">提 交</el-button>
</span></el-dialog
>
</template>
......@@ -30,7 +28,7 @@
<script>
import Form from '@/components/Form.vue'
import {approveBatchPlan, editBatchPlan} from '@/api/index.js'
import { approveBatchPlan, editBatchPlan } from '@/api/index.js'
export default {
props: {
title: {
......
src/views/bigScreen/architectureBlueprintAnalysis/index.vue
......@@ -4,7 +4,7 @@
* @Autor: pan
* @Date: 2024-05-28 18:59:07
* @LastEditors: pan
* @LastEditTime: 2024-06-03 08:28:59
* @LastEditTime: 2024-06-19 18:25:31
-->
<template>
<div class="w-100 h-100 p-10 architectureBlueprintAnalysis">
......@@ -111,18 +111,24 @@ export default {
countItems: [
{
title: '业务域',
count1: ARCHI_BUSINESS && ARCHI_BUSINESS['busDomainNum-sys'],
count2: ARCHI_BUSINESS && ARCHI_BUSINESS['busDomainNum'],
count1: ARCHI_BUSINESS && ARCHI_BUSINESS['busDomainNum'],
count2: ARCHI_BUSINESS && ARCHI_BUSINESS['busDomainNum-sys'],
},
{
title: '业务职能',
count1: 595,
count2: 624,
count1: ARCHI_BUSINESS
? (ARCHI_BUSINESS['oneLevelBusFuncNum'] || 0) +
(ARCHI_BUSINESS['twoLevelBusFuncNum'] || 0)
: 0,
count2: ARCHI_BUSINESS
? (ARCHI_BUSINESS['oneLevelBusFuncNum-sys'] || 0) +
(ARCHI_BUSINESS['twoLevelBusFuncNum-sys'] || 0)
: 0,
},
{
title: '业务流程',
count1: ARCHI_BUSINESS && ARCHI_BUSINESS['busProcessNum-sys'],
count2: ARCHI_BUSINESS && ARCHI_BUSINESS['busProcessNum'],
count1: ARCHI_BUSINESS && ARCHI_BUSINESS['busProcessNum'],
count2: ARCHI_BUSINESS && ARCHI_BUSINESS['busProcessNum-sys'],
},
],
},
......@@ -132,22 +138,23 @@ export default {
countItems: [
{
title: '应用',
count1: 12,
count2: 14,
count1: ARCHI_APPLICATION && ARCHI_APPLICATION['appDomainNum'],
count2:
ARCHI_APPLICATION && ARCHI_APPLICATION['appDomainNum-sys'],
},
{
title: '一级功能',
count1:
ARCHI_APPLICATION && ARCHI_APPLICATION['oneLevelAppCount-sys'],
count2:
ARCHI_APPLICATION && ARCHI_APPLICATION['oneLevelAppCount'],
count2:
ARCHI_APPLICATION && ARCHI_APPLICATION['oneLevelAppCount-sys'],
},
{
title: '二级功能',
count1:
ARCHI_APPLICATION && ARCHI_APPLICATION['twoLevelAppCount-sys'],
count2:
ARCHI_APPLICATION && ARCHI_APPLICATION['twoLevelAppCount'],
count2:
ARCHI_APPLICATION && ARCHI_APPLICATION['twoLevelAppCount-sys'],
},
],
},
......@@ -157,13 +164,13 @@ export default {
countItems: [
{
title: '一级主题域',
count1: ARCHI_DATA && ARCHI_DATA['oneLevelDataCount-sys'],
count2: ARCHI_DATA && ARCHI_DATA['oneLevelDataCount'],
count1: ARCHI_DATA && ARCHI_DATA['oneLevelDataCount'],
count2: ARCHI_DATA && ARCHI_DATA['oneLevelDataCount-sys'],
},
{
title: '二级主题域',
count1: ARCHI_DATA && ARCHI_DATA['twoLevelDataCount-sys'],
count2: ARCHI_DATA && ARCHI_DATA['twoLevelDataCount'],
count1: ARCHI_DATA && ARCHI_DATA['twoLevelDataCount'],
count2: ARCHI_DATA && ARCHI_DATA['twoLevelDataCount-sys'],
},
{
title: '概念实体',
......@@ -178,18 +185,18 @@ export default {
countItems: [
{
title: '技术域',
count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecDomainNum-sys'],
count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecDomainNum'],
count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecDomainNum'],
count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecDomainNum-sys'],
},
{
title: '技术能力',
count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecAbilityNum-sys'],
count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecAbilityNum'],
count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecAbilityNum'],
count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecAbilityNum-sys'],
},
{
title: '技术组件',
count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecModulNum-sys'],
count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecModulNum'],
count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecModulNum'],
count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecModulNum-sys'],
},
],
},
......@@ -198,19 +205,19 @@ export default {
bgColor: '#a4ebaf',
countItems: [
{
title: '防护对象',
count1: 12,
count2: 14,
title: '安全管理体系',
count1: ARCHI_SAFE && ARCHI_SAFE['safeManageNum'],
count2: ARCHI_SAFE && ARCHI_SAFE['safeManageNum-sys'],
},
{
title: '防护要求',
count1: 595,
count2: 624,
title: '安全主题域',
count1: ARCHI_SAFE && ARCHI_SAFE['safeThemeNum'],
count2: ARCHI_SAFE && ARCHI_SAFE['safeThemeNum-sys'],
},
{
title: '防护措施',
count1: 2869,
count2: 2967,
title: '安全策略',
count1: ARCHI_SAFE && ARCHI_SAFE['safePlicyNum'],
count2: ARCHI_SAFE && ARCHI_SAFE['safePlicyNum-sys'],
},
],
},
......
src/views/busi-assets-list/RelationChildAdd.vue
......@@ -4,7 +4,7 @@
* @Autor: pan
* @Date: 2024-05-10 18:41:29
* @LastEditors: pan
* @LastEditTime: 2024-06-19 17:40:54
* @LastEditTime: 2024-06-19 18:33:03
-->
<template>
<el-dialog
......@@ -239,26 +239,22 @@ export default {
},
handleSubmit() {
this.$refs['addForm'].onValidate(() => {
const loading = this.$loading({
lock: true,
text: '保存中',
spinner: 'el-icon-loading',
})
const formInfo = this.$refs['addForm'].getData()
const typeApi = this.isEdit ? updAssetRelation : createAssetRelation
const params = {
...this.rowData,
...formInfo,
state: 2,
assetRelaId: this.relationData.assetRelaId
assetRelaId: this.relationData.assetRelaId,
}
typeApi(params).then((res) => {
if (res.code === 200) {
loading.close()
this.$message.success('保存成功')
this.showDialog = false
this.handleClose()
this.$emit('querySearch')
} else {
this.$messsage.warning(res.msg)
}
})
})
......
src/views/collectDataConfiguration/SearchFormItem.vue
......@@ -4,7 +4,7 @@
* @Autor: pan
* @Date: 2024-03-12 15:11:47
* @LastEditors: pan
* @LastEditTime: 2024-04-01 17:08:42
* @LastEditTime: 2024-06-19 18:07:17
-->
<template>
<div class="form-item">
......@@ -105,7 +105,6 @@
v-model="currentVal"
v-bind="bindProps"
v-on="bindEvents"
size="mini"
clearable
></el-cascader>
</div>
......@@ -150,9 +149,9 @@ export default {
currentVal: {
get() {
if (this.isSelect) {
if(this.value == 0){
if (this.value == 0) {
return this.value + ''
}else{
} else {
return this.value && this.value + ''
}
} else {
......
src/views/conceptualBaseManagement/AddOrg.vue
......@@ -15,8 +15,11 @@
></Form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button>
<el-button type="primary" @click="handleSubmit()" size="mini" v-if="this.title != '详情'"
<el-button @click="handleClose()">取 消</el-button>
<el-button
type="primary"
@click="handleSubmit()"
v-if="this.title != '详情'"
>提 交</el-button
>
</span></el-dialog
......
src/views/conceptualReview/AnalysisContent.vue
......@@ -19,7 +19,7 @@
</el-tabs>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">关 闭</el-button>
<el-button @click="handleClose()">关 闭</el-button>
</span></el-dialog
>
</template>
......
src/views/conceptualViewOrg/Detail.vue
<template>
<el-dialog
:title="'详情'"
:visible.sync="showDialog"
:close-on-click-modal="false"
width="66%"
@close="showDialog = false"
@open="handleOpen"
>
<el-dialog
:title="'详情'"
:visible.sync="showDialog"
:close-on-click-modal="false"
width="66%"
@close="showDialog = false"
@open="handleOpen"
>
<div>
<Form
ref="addForm"
......@@ -15,146 +15,151 @@
></Form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="showDialog = false" size="mini">取 消</el-button>
<el-button @click="showDialog = false">取 消</el-button>
</span>
</el-dialog >
</el-dialog>
</template>
<script>
import Form from '@/components/Form.vue'
import { buildType, pushStateOptions, onlineApprovalStatusOptions, sendStateOptions } from '@/utils/dictionary'
import {
buildType,
pushStateOptions,
onlineApprovalStatusOptions,
sendStateOptions,
} from '@/utils/dictionary'
export default {
components: { Form, },
props: {
visible: {
type: Boolean,
default: false,
components: { Form },
props: {
visible: {
type: Boolean,
default: false,
},
rowData: {
type: Object,
default: () => {},
},
activeName: {
type: String,
default: '1',
},
activeName2: {
type: String,
default: '1',
},
},
computed: {
formOptions() {
let arr = [
{
label: '批次名称', // label文字
prop: 'batName', // 字段名
element: 'el-input', // 指定elementui组件
disabled: true,
},
rowData: {
type: Object,
default: () => {},
{
label: '需求名称', // label文字
prop: 'needName', // 字段名
element: 'el-input', // 指定elementui组件
disabled: true,
},
activeName: {
type: String,
default: '1',
{
label: '项目名称', // label文字
prop: 'prjName', // 字段名
element: 'el-input', // 指定elementui组件
disabled: true,
},
activeName2: {
type: String,
default: '1',
}
},
computed: {
formOptions() {
let arr = [
{
label: '批次名称', // label文字
prop: 'batName', // 字段名
element: 'el-input', // 指定elementui组件
disabled: true,
},
{
label: '需求名称', // label文字
prop: 'needName', // 字段名
element: 'el-input', // 指定elementui组件
disabled: true,
},
{
label: '项目名称', // label文字
prop: 'prjName', // 字段名
element: 'el-input', // 指定elementui组件
disabled: true,
},
{
label: '关联机构', // label文字
prop: 'orgName', // 字段名
element: 'el-input', // 指定elementui组件
disabled: true,
},
{
label: '材料', // label文字
prop: 'fileList', // 字段名
element: 'el-input', // 指定elementui组件
disabled: true,
},
]
if (this.activeName === '1') {
arr = [
...arr,
{
label: '推送状态',
prop: 'state',
element: 'el-select', // 指定elementui组件
options: pushStateOptions,
options: [
{ label: '已反馈', value: '1' },
{ label: '未反馈', value: '0' },
],
placeholder: '',
disabled: true,
},
{
label: '修改剩余时间',
prop: 'createTime',
element: 'el-input', // 指定elementui组件
disabled: true,
},
{
label: '在线评审状态',
prop: 'onlineReviewState',
element: 'el-select', // 指定elementui组件
options: onlineApprovalStatusOptions,
placeholder: '',
disabled: true,
},
]
}else{
arr = [
...arr,
{
label: '发送状态',
prop: 'sendState',
element: 'el-select', // 指定elementui组件
options: sendStateOptions,
placeholder: '',
disabled: true,
},
]
}
return [
...arr,
{
label: '意见内容',
prop: 'remark',
element: 'el-input', // 指定elementui组件
disabled: true,
},
]
{
label: '关联机构', // label文字
prop: 'orgName', // 字段名
element: 'el-input', // 指定elementui组件
disabled: true,
},
showDialog: {
get() {
return this.visible
},
set(value) {
this.$emit('update:visible', value)
},
{
label: '材料', // label文字
prop: 'fileList', // 字段名
element: 'el-input', // 指定elementui组件
disabled: true,
},
},
methods: {
handleOpen() {
if (Object.keys(this.rowData).length) {
this.formOptions.forEach((v) => {
v.initValue = this.rowData[v.prop]
})
this.$nextTick(() => {
this.$refs['addForm'].addInitValue()
})
} else {
this.$nextTick(() => {
this.$refs['addForm'].addInitValue()
this.$refs['addForm'].onReset()
})
}
]
if (this.activeName === '1') {
arr = [
...arr,
{
label: '推送状态',
prop: 'state',
element: 'el-select', // 指定elementui组件
options: pushStateOptions,
options: [
{ label: '已反馈', value: '1' },
{ label: '未反馈', value: '0' },
],
placeholder: '',
disabled: true,
},
{
label: '修改剩余时间',
prop: 'createTime',
element: 'el-input', // 指定elementui组件
disabled: true,
},
{
label: '在线评审状态',
prop: 'onlineReviewState',
element: 'el-select', // 指定elementui组件
options: onlineApprovalStatusOptions,
placeholder: '',
disabled: true,
},
]
} else {
arr = [
...arr,
{
label: '发送状态',
prop: 'sendState',
element: 'el-select', // 指定elementui组件
options: sendStateOptions,
placeholder: '',
disabled: true,
},
]
}
return [
...arr,
{
label: '意见内容',
prop: 'remark',
element: 'el-input', // 指定elementui组件
disabled: true,
},
}
]
},
showDialog: {
get() {
return this.visible
},
set(value) {
this.$emit('update:visible', value)
},
},
},
methods: {
handleOpen() {
if (Object.keys(this.rowData).length) {
this.formOptions.forEach((v) => {
v.initValue = this.rowData[v.prop]
})
this.$nextTick(() => {
this.$refs['addForm'].addInitValue()
})
} else {
this.$nextTick(() => {
this.$refs['addForm'].addInitValue()
this.$refs['addForm'].onReset()
})
}
},
},
}
</script>
\ No newline at end of file
</script>
src/views/conceptualViewOrg/MaterialFeedback.vue
......@@ -4,7 +4,7 @@
* @Autor: pan
* @Date: 2024-03-21 14:29:32
* @LastEditors: pan
* @LastEditTime: 2024-03-24 19:05:44
* @LastEditTime: 2024-06-19 18:08:08
-->
<template>
......@@ -54,10 +54,8 @@
</el-table>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button>
<el-button @click="fnOperation()" type="primary" size="mini"
>反馈</el-button
>
<el-button @click="handleClose()">取 消</el-button>
<el-button @click="fnOperation()" type="primary">反馈</el-button>
</span></el-dialog
>
</div>
......
src/views/conceptualViewOrg/MaterialPush.vue
......@@ -14,10 +14,8 @@
></Form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button>
<el-button type="primary" @click="handleSubmit()" size="mini"
>反 馈</el-button
>
<el-button @click="handleClose()">取 消</el-button>
<el-button type="primary" @click="handleSubmit()">反 馈</el-button>
</span></el-dialog
>
</template>
......
src/views/etpManage/AddExpert.vue
......@@ -4,7 +4,7 @@
* @Autor: pan
* @Date: 2024-04-01 14:39:48
* @LastEditors: pan
* @LastEditTime: 2024-04-02 13:55:25
* @LastEditTime: 2024-06-19 18:08:49
-->
<template>
<el-dialog
......@@ -38,10 +38,8 @@
</Form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button>
<el-button type="primary" @click="handleSubmit" size="mini"
>确 定</el-button
>
<el-button @click="handleClose()">取 消</el-button>
<el-button type="primary" @click="handleSubmit">确 定</el-button>
</span></el-dialog
>
</template>
......
src/views/etpManage/AddTalent.vue
......@@ -4,7 +4,7 @@
* @Autor: pan
* @Date: 2024-04-01 14:38:41
* @LastEditors: pan
* @LastEditTime: 2024-04-02 13:55:40
* @LastEditTime: 2024-06-19 18:08:45
-->
<template>
<el-dialog
......@@ -20,10 +20,8 @@
</Form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button>
<el-button type="primary" @click="handleSubmit" size="mini"
>确 定</el-button
>
<el-button @click="handleClose()">取 消</el-button>
<el-button type="primary" @click="handleSubmit">确 定</el-button>
</span></el-dialog
>
</template>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!