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
Inline Side-by-side
Showing with 264 additions and 146 deletions
src/api/dataMapping.js
import { post } from '@/utils/http' import { post } from '@/utils/http'
import { import {
EADC_ARRCHITECTURE, EADC_ARRCHITECTURE,
...@@ -33,21 +32,38 @@ export function removeEleRelation(params) { ...@@ -33,21 +32,38 @@ export function removeEleRelation(params) {
} }
// 资产关系新增 // 资产关系新增
export function createAssetRelation(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) { 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) { 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) { 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) { export function pAssetRelation(params) {
return post(EADC_ARRCHITECTURE + '/archi-asset-relation/pAssetRelation', params) return post(
EADC_ARRCHITECTURE + '/archi-asset-relation/pAssetRelation',
params,
)
} }
src/components/ChoosePrjDialog.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Autor: pan * @Autor: pan
* @Date: 2024-05-29 16:57:25 * @Date: 2024-05-29 16:57:25
* @LastEditors: pan * @LastEditors: pan
* @LastEditTime: 2024-06-05 19:46:56 * @LastEditTime: 2024-06-19 17:59:48
--> -->
<template> <template>
<el-dialog <el-dialog
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
</list-page> </list-page>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button> <el-button @click="handleClose()">取 消</el-button>
<el-button type="primary" v-preventReClick @click="handleConfirm()" size="mini" <el-button type="primary" v-preventReClick @click="handleConfirm()"
>确 定</el-button >确 定</el-button
> >
</span></el-dialog </span></el-dialog
......
src/views/architectureInspectionAnalysis/Add.vue
...@@ -7,51 +7,133 @@ ...@@ -7,51 +7,133 @@
@close="handleClose()" @close="handleClose()"
@open="handleOpen" @open="handleOpen"
> >
<el-form :inline="true" id="addForm" ref="addForm" :rules="rules" :model="formInfo" label-width="auto" style="text-align: left;"> <el-form
:inline="true"
id="addForm"
ref="addForm"
:rules="rules"
:model="formInfo"
label-width="auto"
style="text-align: left"
>
<template v-if="title == '新增督查指标' || rowData.tab == 'one'"> <template v-if="title == '新增督查指标' || rowData.tab == 'one'">
<el-form-item label="督查方案" prop="supervCode"> <el-form-item label="督查方案" prop="supervCode">
<el-select v-model="formInfo.supervCode" size="small" placeholder="请选择" @change="changeSupervCode" :disabled='!display' clearable> <el-select
<el-option v-for="item in supervNameList" :key="item.text" :label="item.value" :value="item.text"> v-model="formInfo.supervCode"
size="small"
placeholder="请选择"
@change="changeSupervCode"
:disabled="!display"
clearable
>
<el-option
v-for="item in supervNameList"
:key="item.text"
:label="item.value"
:value="item.text"
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="权重" prop="weight"> <el-form-item label="权重" prop="weight">
<el-input type="number" min="0" v-model="formInfo.weight" size="small" placeholder="请输入内容" > </el-input> <el-input
type="number"
min="0"
v-model="formInfo.weight"
size="small"
placeholder="请输入内容"
>
</el-input>
</el-form-item> </el-form-item>
<br /> <br />
<el-form-item label="督查指标" prop="indexName"> <el-form-item label="督查指标" prop="indexName">
<el-radio-group v-model="formInfo.indexLevel" @change="changeRadio" > <el-radio-group v-model="formInfo.indexLevel" @change="changeRadio">
<el-radio v-for="item in radioList" :key="item.value" :label="item.value" :disabled='!display'>{{ item.label }}</el-radio > <el-radio
v-for="item in radioList"
:key="item.value"
:label="item.value"
:disabled="!display"
>{{ item.label }}</el-radio
>
</el-radio-group> </el-radio-group>
<br /> <br />
<el-select v-if="(formInfo.indexLevel == '2' || formInfo.indexLevel == '3') && display" v-model="formInfo.zhibiao1" size="small" placeholder="请选择" clearable @change="getZhibiaoList('3')"> <el-select
<el-option v-for="item in zhibiaoList1" :key="item.text" :label="item.value" :value="item.text"> v-if="
(formInfo.indexLevel == '2' || formInfo.indexLevel == '3') &&
display
"
v-model="formInfo.zhibiao1"
size="small"
placeholder="请选择"
clearable
@change="getZhibiaoList('3')"
>
<el-option
v-for="item in zhibiaoList1"
:key="item.text"
:label="item.value"
:value="item.text"
>
</el-option> </el-option>
</el-select> </el-select>
<el-select v-if="formInfo.indexLevel == '3' && display" v-model="formInfo.zhibiao2" size="small" placeholder="请选择" clearable> <el-select
<el-option v-for="item in zhibiaoList2" :key="item.text" :label="item.value" :value="item.text"> v-if="formInfo.indexLevel == '3' && display"
v-model="formInfo.zhibiao2"
size="small"
placeholder="请选择"
clearable
>
<el-option
v-for="item in zhibiaoList2"
:key="item.text"
:label="item.value"
:value="item.text"
>
</el-option> </el-option>
</el-select> </el-select>
<el-input v-model="formInfo.indexName" size="small" placeholder="请输入内容" > </el-input> <el-input
v-model="formInfo.indexName"
size="small"
placeholder="请输入内容"
>
</el-input>
</el-form-item> </el-form-item>
</template> </template>
<template v-if="rowData.tab == 'two'"> <template v-if="rowData.tab == 'two'">
<el-form-item label="督查指标名称" prop="indexName"> <el-form-item label="督查指标名称" prop="indexName">
<el-input v-model="formInfo.indexName" size="small" placeholder="请输入内容" > </el-input> <el-input
v-model="formInfo.indexName"
size="small"
placeholder="请输入内容"
>
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="评分" prop="score" class="scoreClass"> <el-form-item label="评分" prop="score" class="scoreClass">
<el-input type="number" min="1" max='5' v-model="formInfo.score" size="small" placeholder="请输入内容" > </el-input> <el-input
type="number"
min="1"
max="5"
v-model="formInfo.score"
size="small"
placeholder="请输入内容"
>
</el-input>
</el-form-item> </el-form-item>
<br /> <br />
<el-form-item label="评审意见" prop="opinion" class="textarea"> <el-form-item label="评审意见" prop="opinion" class="textarea">
<el-input type="textarea" v-model="formInfo.opinion" :rows="3" show-word-limit placeholder="请输入内容" ></el-input> <el-input
type="textarea"
v-model="formInfo.opinion"
:rows="3"
show-word-limit
placeholder="请输入内容"
></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleSubmit" size="mini" >保 存</el-button > <el-button type="primary" @click="handleSubmit">保 存</el-button>
<el-button @click="handleClose()" size="mini">取 消</el-button> <el-button @click="handleClose()">取 消</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
...@@ -74,10 +156,10 @@ export default { ...@@ -74,10 +156,10 @@ export default {
type: Object, type: Object,
default: () => {}, default: () => {},
}, },
edit:{ edit: {
type: Boolean, type: Boolean,
default: false default: false,
} },
}, },
computed: { computed: {
showDialog: { showDialog: {
...@@ -89,7 +171,7 @@ export default { ...@@ -89,7 +171,7 @@ export default {
}, },
}, },
}, },
data(){ data() {
return { return {
supervNameList: [], supervNameList: [],
formInfo: {}, formInfo: {},
...@@ -106,12 +188,12 @@ export default { ...@@ -106,12 +188,12 @@ export default {
weight: [{ required: true, message: '必填项', trigger: 'blur' }], weight: [{ required: true, message: '必填项', trigger: 'blur' }],
indexName: [{ required: true, message: '必填项', trigger: 'blur' }], indexName: [{ required: true, message: '必填项', trigger: 'blur' }],
score: [{ required: true, message: '必填项', trigger: 'blur' }], score: [{ required: true, message: '必填项', trigger: 'blur' }],
} },
} }
}, },
methods: { methods: {
getSupervNameList(){ getSupervNameList() {
this.$postRequest('/supervIndex/selectDrop', {}).then(res => { this.$postRequest('/supervIndex/selectDrop', {}).then((res) => {
if (res.code === 200) { if (res.code === 200) {
this.supervNameList = res.data this.supervNameList = res.data
} else { } else {
...@@ -119,26 +201,29 @@ export default { ...@@ -119,26 +201,29 @@ export default {
} }
}) })
}, },
changeSupervCode(){ changeSupervCode() {
// this.changeRadio(this.selectRadio) // this.changeRadio(this.selectRadio)
this.formInfo.indexLevel = '1' this.formInfo.indexLevel = '1'
}, },
changeRadio(v){ changeRadio(v) {
this.selectRadio = v this.selectRadio = v
if(v != '1'){ if (v != '1') {
if(!!this.formInfo.supervCode){ if (!!this.formInfo.supervCode) {
this.getZhibiaoList('2') this.getZhibiaoList('2')
}else{ } else {
this.$message.warning('请选择督查方案') this.$message.warning('请选择督查方案')
} }
} }
}, },
getZhibiaoList(level){ getZhibiaoList(level) {
this.$postRequest('/supervIndex/selectIndexLevelDrop', {indexLevel: level, supervCode: this.formInfo.supervCode}).then(res => { this.$postRequest('/supervIndex/selectIndexLevelDrop', {
indexLevel: level,
supervCode: this.formInfo.supervCode,
}).then((res) => {
if (res.code === 200) { if (res.code === 200) {
if(level == '2'){ if (level == '2') {
this.zhibiaoList1 = res.data this.zhibiaoList1 = res.data
}else{ } else {
this.zhibiaoList2 = res.data this.zhibiaoList2 = res.data
} }
} else { } else {
...@@ -155,21 +240,33 @@ export default { ...@@ -155,21 +240,33 @@ export default {
text: '保存中', text: '保存中',
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
}) })
let supervName = this.supervNameList.find(item => item.text == this.formInfo.supervCode).value let supervName = this.supervNameList.find(
let upIndex = this.formInfo.indexLevel - 1 == 0 ? '' : this.formInfo.indexLevel - 1 + '' (item) => item.text == this.formInfo.supervCode,
let params = this.rowData.tab == 'two' ? { ).value
let upIndex =
this.formInfo.indexLevel - 1 == 0
? ''
: this.formInfo.indexLevel - 1 + ''
let params =
this.rowData.tab == 'two'
? {
supervCode: this.formInfo.supervCode, supervCode: this.formInfo.supervCode,
opinion: this.formInfo.opinion, opinion: this.formInfo.opinion,
score: this.formInfo.score, score: this.formInfo.score,
id: this.formInfo.id id: this.formInfo.id,
} : { }
: {
...this.formInfo, ...this.formInfo,
supervName, supervName,
upIndex upIndex,
} }
let url = this.display ? '/supervIndex/ad' : this.rowData.tab == 'two' ? '/supervIndex/updPf' : '/supervIndex/upd' // 编辑 let url = this.display
console.log(params, 'params', url); ? '/supervIndex/ad'
this.$postRequest(url, params).then(res => { : this.rowData.tab == 'two'
? '/supervIndex/updPf'
: '/supervIndex/upd' // 编辑
console.log(params, 'params', url)
this.$postRequest(url, params).then((res) => {
if (res.code === 200) { if (res.code === 200) {
loading.close() loading.close()
this.$message.success('保存成功') this.$message.success('保存成功')
...@@ -207,7 +304,7 @@ export default { ...@@ -207,7 +304,7 @@ export default {
indexName: '', indexName: '',
} }
}, },
} },
} }
</script> </script>
...@@ -216,17 +313,17 @@ export default { ...@@ -216,17 +313,17 @@ export default {
/deep/ .scoreClass { /deep/ .scoreClass {
.el-input { .el-input {
width: 160px ; width: 160px;
} }
} }
/deep/ .textarea{ /deep/ .textarea {
width: 60%; width: 60%;
white-space: nowrap; white-space: nowrap;
.el-form-item__content{ .el-form-item__content {
width: 100%; width: 100%;
} }
} }
.zhibiao1{ .zhibiao1 {
float: left; float: left;
} }
</style> </style>
src/views/batchPlanManagement/ApprovalDialog.vue
...@@ -19,10 +19,8 @@ ...@@ -19,10 +19,8 @@
></Form> ></Form>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button> <el-button @click="handleClose()">取 消</el-button>
<el-button type="primary" @click="handleSubmit" size="mini" <el-button type="primary" @click="handleSubmit">提 交</el-button>
>提 交</el-button
>
</span></el-dialog </span></el-dialog
> >
</template> </template>
...@@ -30,7 +28,7 @@ ...@@ -30,7 +28,7 @@
<script> <script>
import Form from '@/components/Form.vue' import Form from '@/components/Form.vue'
import {approveBatchPlan, editBatchPlan} from '@/api/index.js' import { approveBatchPlan, editBatchPlan } from '@/api/index.js'
export default { export default {
props: { props: {
title: { title: {
......
src/views/bigScreen/architectureBlueprintAnalysis/index.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Autor: pan * @Autor: pan
* @Date: 2024-05-28 18:59:07 * @Date: 2024-05-28 18:59:07
* @LastEditors: pan * @LastEditors: pan
* @LastEditTime: 2024-06-03 08:28:59 * @LastEditTime: 2024-06-19 18:25:31
--> -->
<template> <template>
<div class="w-100 h-100 p-10 architectureBlueprintAnalysis"> <div class="w-100 h-100 p-10 architectureBlueprintAnalysis">
...@@ -111,18 +111,24 @@ export default { ...@@ -111,18 +111,24 @@ export default {
countItems: [ countItems: [
{ {
title: '业务域', title: '业务域',
count1: ARCHI_BUSINESS && ARCHI_BUSINESS['busDomainNum-sys'], count1: ARCHI_BUSINESS && ARCHI_BUSINESS['busDomainNum'],
count2: ARCHI_BUSINESS && ARCHI_BUSINESS['busDomainNum'], count2: ARCHI_BUSINESS && ARCHI_BUSINESS['busDomainNum-sys'],
}, },
{ {
title: '业务职能', title: '业务职能',
count1: 595, count1: ARCHI_BUSINESS
count2: 624, ? (ARCHI_BUSINESS['oneLevelBusFuncNum'] || 0) +
(ARCHI_BUSINESS['twoLevelBusFuncNum'] || 0)
: 0,
count2: ARCHI_BUSINESS
? (ARCHI_BUSINESS['oneLevelBusFuncNum-sys'] || 0) +
(ARCHI_BUSINESS['twoLevelBusFuncNum-sys'] || 0)
: 0,
}, },
{ {
title: '业务流程', title: '业务流程',
count1: ARCHI_BUSINESS && ARCHI_BUSINESS['busProcessNum-sys'], count1: ARCHI_BUSINESS && ARCHI_BUSINESS['busProcessNum'],
count2: ARCHI_BUSINESS && ARCHI_BUSINESS['busProcessNum'], count2: ARCHI_BUSINESS && ARCHI_BUSINESS['busProcessNum-sys'],
}, },
], ],
}, },
...@@ -132,22 +138,23 @@ export default { ...@@ -132,22 +138,23 @@ export default {
countItems: [ countItems: [
{ {
title: '应用', title: '应用',
count1: 12, count1: ARCHI_APPLICATION && ARCHI_APPLICATION['appDomainNum'],
count2: 14, count2:
ARCHI_APPLICATION && ARCHI_APPLICATION['appDomainNum-sys'],
}, },
{ {
title: '一级功能', title: '一级功能',
count1: count1:
ARCHI_APPLICATION && ARCHI_APPLICATION['oneLevelAppCount-sys'],
count2:
ARCHI_APPLICATION && ARCHI_APPLICATION['oneLevelAppCount'], ARCHI_APPLICATION && ARCHI_APPLICATION['oneLevelAppCount'],
count2:
ARCHI_APPLICATION && ARCHI_APPLICATION['oneLevelAppCount-sys'],
}, },
{ {
title: '二级功能', title: '二级功能',
count1: count1:
ARCHI_APPLICATION && ARCHI_APPLICATION['twoLevelAppCount-sys'],
count2:
ARCHI_APPLICATION && ARCHI_APPLICATION['twoLevelAppCount'], ARCHI_APPLICATION && ARCHI_APPLICATION['twoLevelAppCount'],
count2:
ARCHI_APPLICATION && ARCHI_APPLICATION['twoLevelAppCount-sys'],
}, },
], ],
}, },
...@@ -157,13 +164,13 @@ export default { ...@@ -157,13 +164,13 @@ export default {
countItems: [ countItems: [
{ {
title: '一级主题域', title: '一级主题域',
count1: ARCHI_DATA && ARCHI_DATA['oneLevelDataCount-sys'], count1: ARCHI_DATA && ARCHI_DATA['oneLevelDataCount'],
count2: ARCHI_DATA && ARCHI_DATA['oneLevelDataCount'], count2: ARCHI_DATA && ARCHI_DATA['oneLevelDataCount-sys'],
}, },
{ {
title: '二级主题域', title: '二级主题域',
count1: ARCHI_DATA && ARCHI_DATA['twoLevelDataCount-sys'], count1: ARCHI_DATA && ARCHI_DATA['twoLevelDataCount'],
count2: ARCHI_DATA && ARCHI_DATA['twoLevelDataCount'], count2: ARCHI_DATA && ARCHI_DATA['twoLevelDataCount-sys'],
}, },
{ {
title: '概念实体', title: '概念实体',
...@@ -178,18 +185,18 @@ export default { ...@@ -178,18 +185,18 @@ export default {
countItems: [ countItems: [
{ {
title: '技术域', title: '技术域',
count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecDomainNum-sys'], count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecDomainNum'],
count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecDomainNum'], count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecDomainNum-sys'],
}, },
{ {
title: '技术能力', title: '技术能力',
count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecAbilityNum-sys'], count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecAbilityNum'],
count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecAbilityNum'], count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecAbilityNum-sys'],
}, },
{ {
title: '技术组件', title: '技术组件',
count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecModulNum-sys'], count1: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecModulNum'],
count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecModulNum'], count2: ARCHI_TECHNOLOGY && ARCHI_TECHNOLOGY['tecModulNum-sys'],
}, },
], ],
}, },
...@@ -198,19 +205,19 @@ export default { ...@@ -198,19 +205,19 @@ export default {
bgColor: '#a4ebaf', bgColor: '#a4ebaf',
countItems: [ countItems: [
{ {
title: '防护对象', title: '安全管理体系',
count1: 12, count1: ARCHI_SAFE && ARCHI_SAFE['safeManageNum'],
count2: 14, count2: ARCHI_SAFE && ARCHI_SAFE['safeManageNum-sys'],
}, },
{ {
title: '防护要求', title: '安全主题域',
count1: 595, count1: ARCHI_SAFE && ARCHI_SAFE['safeThemeNum'],
count2: 624, count2: ARCHI_SAFE && ARCHI_SAFE['safeThemeNum-sys'],
}, },
{ {
title: '防护措施', title: '安全策略',
count1: 2869, count1: ARCHI_SAFE && ARCHI_SAFE['safePlicyNum'],
count2: 2967, count2: ARCHI_SAFE && ARCHI_SAFE['safePlicyNum-sys'],
}, },
], ],
}, },
......
src/views/busi-assets-list/RelationChildAdd.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Autor: pan * @Autor: pan
* @Date: 2024-05-10 18:41:29 * @Date: 2024-05-10 18:41:29
* @LastEditors: pan * @LastEditors: pan
* @LastEditTime: 2024-06-19 17:40:54 * @LastEditTime: 2024-06-19 18:33:03
--> -->
<template> <template>
<el-dialog <el-dialog
...@@ -239,26 +239,22 @@ export default { ...@@ -239,26 +239,22 @@ export default {
}, },
handleSubmit() { handleSubmit() {
this.$refs['addForm'].onValidate(() => { this.$refs['addForm'].onValidate(() => {
const loading = this.$loading({
lock: true,
text: '保存中',
spinner: 'el-icon-loading',
})
const formInfo = this.$refs['addForm'].getData() const formInfo = this.$refs['addForm'].getData()
const typeApi = this.isEdit ? updAssetRelation : createAssetRelation const typeApi = this.isEdit ? updAssetRelation : createAssetRelation
const params = { const params = {
...this.rowData, ...this.rowData,
...formInfo, ...formInfo,
state: 2, state: 2,
assetRelaId: this.relationData.assetRelaId assetRelaId: this.relationData.assetRelaId,
} }
typeApi(params).then((res) => { typeApi(params).then((res) => {
if (res.code === 200) { if (res.code === 200) {
loading.close()
this.$message.success('保存成功') this.$message.success('保存成功')
this.showDialog = false this.showDialog = false
this.handleClose() this.handleClose()
this.$emit('querySearch') this.$emit('querySearch')
} else {
this.$messsage.warning(res.msg)
} }
}) })
}) })
......
src/views/collectDataConfiguration/SearchFormItem.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Autor: pan * @Autor: pan
* @Date: 2024-03-12 15:11:47 * @Date: 2024-03-12 15:11:47
* @LastEditors: pan * @LastEditors: pan
* @LastEditTime: 2024-04-01 17:08:42 * @LastEditTime: 2024-06-19 18:07:17
--> -->
<template> <template>
<div class="form-item"> <div class="form-item">
...@@ -105,7 +105,6 @@ ...@@ -105,7 +105,6 @@
v-model="currentVal" v-model="currentVal"
v-bind="bindProps" v-bind="bindProps"
v-on="bindEvents" v-on="bindEvents"
size="mini"
clearable clearable
></el-cascader> ></el-cascader>
</div> </div>
...@@ -150,9 +149,9 @@ export default { ...@@ -150,9 +149,9 @@ export default {
currentVal: { currentVal: {
get() { get() {
if (this.isSelect) { if (this.isSelect) {
if(this.value == 0){ if (this.value == 0) {
return this.value + '' return this.value + ''
}else{ } else {
return this.value && this.value + '' return this.value && this.value + ''
} }
} else { } else {
......
src/views/conceptualBaseManagement/AddOrg.vue
...@@ -15,8 +15,11 @@ ...@@ -15,8 +15,11 @@
></Form> ></Form>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button> <el-button @click="handleClose()">取 消</el-button>
<el-button type="primary" @click="handleSubmit()" size="mini" v-if="this.title != '详情'" <el-button
type="primary"
@click="handleSubmit()"
v-if="this.title != '详情'"
>提 交</el-button >提 交</el-button
> >
</span></el-dialog </span></el-dialog
......
src/views/conceptualReview/AnalysisContent.vue
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</el-tabs> </el-tabs>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">关 闭</el-button> <el-button @click="handleClose()">关 闭</el-button>
</span></el-dialog </span></el-dialog
> >
</template> </template>
......
src/views/conceptualViewOrg/Detail.vue
...@@ -15,16 +15,21 @@ ...@@ -15,16 +15,21 @@
></Form> ></Form>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="showDialog = false" size="mini">取 消</el-button> <el-button @click="showDialog = false">取 消</el-button>
</span> </span>
</el-dialog > </el-dialog>
</template> </template>
<script> <script>
import Form from '@/components/Form.vue' import Form from '@/components/Form.vue'
import { buildType, pushStateOptions, onlineApprovalStatusOptions, sendStateOptions } from '@/utils/dictionary' import {
buildType,
pushStateOptions,
onlineApprovalStatusOptions,
sendStateOptions,
} from '@/utils/dictionary'
export default { export default {
components: { Form, }, components: { Form },
props: { props: {
visible: { visible: {
type: Boolean, type: Boolean,
...@@ -41,7 +46,7 @@ export default { ...@@ -41,7 +46,7 @@ export default {
activeName2: { activeName2: {
type: String, type: String,
default: '1', default: '1',
} },
}, },
computed: { computed: {
formOptions() { formOptions() {
...@@ -107,7 +112,7 @@ export default { ...@@ -107,7 +112,7 @@ export default {
disabled: true, disabled: true,
}, },
] ]
}else{ } else {
arr = [ arr = [
...arr, ...arr,
{ {
...@@ -155,6 +160,6 @@ export default { ...@@ -155,6 +160,6 @@ export default {
}) })
} }
}, },
} },
} }
</script> </script>
src/views/conceptualViewOrg/MaterialFeedback.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Autor: pan * @Autor: pan
* @Date: 2024-03-21 14:29:32 * @Date: 2024-03-21 14:29:32
* @LastEditors: pan * @LastEditors: pan
* @LastEditTime: 2024-03-24 19:05:44 * @LastEditTime: 2024-06-19 18:08:08
--> -->
<template> <template>
...@@ -54,10 +54,8 @@ ...@@ -54,10 +54,8 @@
</el-table> </el-table>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button> <el-button @click="handleClose()">取 消</el-button>
<el-button @click="fnOperation()" type="primary" size="mini" <el-button @click="fnOperation()" type="primary">反馈</el-button>
>反馈</el-button
>
</span></el-dialog </span></el-dialog
> >
</div> </div>
......
src/views/conceptualViewOrg/MaterialPush.vue
...@@ -14,10 +14,8 @@ ...@@ -14,10 +14,8 @@
></Form> ></Form>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button> <el-button @click="handleClose()">取 消</el-button>
<el-button type="primary" @click="handleSubmit()" size="mini" <el-button type="primary" @click="handleSubmit()">反 馈</el-button>
>反 馈</el-button
>
</span></el-dialog </span></el-dialog
> >
</template> </template>
......
src/views/dictionaryManagement/AddMaintenance.vue
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
> >
</Form> </Form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleSubmit" size="mini" >保 存</el-button > <el-button type="primary" @click="handleSubmit">保 存</el-button>
<el-button @click="handleClose()" size="mini">取 消</el-button> <el-button @click="handleClose()">取 消</el-button>
</span> </span>
</el-dialog> </el-dialog>
</template> </template>
...@@ -43,7 +43,7 @@ export default { ...@@ -43,7 +43,7 @@ export default {
dictId: { dictId: {
type: Number, type: Number,
default: 0, default: 0,
} },
}, },
data() { data() {
return { return {
...@@ -122,16 +122,20 @@ export default { ...@@ -122,16 +122,20 @@ export default {
spinner: 'el-icon-loading', spinner: 'el-icon-loading',
}) })
const formInfo = this.$refs['addForm'].getData() const formInfo = this.$refs['addForm'].getData()
let params = Object.keys(this.rowData).length ? { let params = Object.keys(this.rowData).length
? {
...this.rowData, ...this.rowData,
...formInfo, ...formInfo,
dictId: this.dictId dictId: this.dictId,
} : { }
: {
...formInfo, ...formInfo,
dictId: this.dictId dictId: this.dictId,
} }
let url = Object.keys(this.rowData).length ? '/dictDetail/update' : '/dictDetail/create' let url = Object.keys(this.rowData).length
this.$postRequestShared(url, params).then(res => { ? '/dictDetail/update'
: '/dictDetail/create'
this.$postRequestShared(url, params).then((res) => {
if (res.code === 200) { if (res.code === 200) {
loading.close() loading.close()
this.$message.success('保存成功') this.$message.success('保存成功')
...@@ -165,16 +169,17 @@ export default { ...@@ -165,16 +169,17 @@ export default {
}) })
} }
}, },
} },
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
// @import '@/styles/elementui.scss'; // @import '@/styles/elementui.scss';
/deep/ #addForm { /deep/ #addForm {
.el-select, .el-input{ .el-select,
.el-input {
width: 60% !important; width: 60% !important;
>.el-input{ > .el-input {
width: 100% !important; width: 100% !important;
} }
} }
......
src/views/etpManage/AddExpert.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Autor: pan * @Autor: pan
* @Date: 2024-04-01 14:39:48 * @Date: 2024-04-01 14:39:48
* @LastEditors: pan * @LastEditors: pan
* @LastEditTime: 2024-04-02 13:55:25 * @LastEditTime: 2024-06-19 18:08:49
--> -->
<template> <template>
<el-dialog <el-dialog
...@@ -38,10 +38,8 @@ ...@@ -38,10 +38,8 @@
</Form> </Form>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button> <el-button @click="handleClose()">取 消</el-button>
<el-button type="primary" @click="handleSubmit" size="mini" <el-button type="primary" @click="handleSubmit">确 定</el-button>
>确 定</el-button
>
</span></el-dialog </span></el-dialog
> >
</template> </template>
......
src/views/etpManage/AddTalent.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* @Autor: pan * @Autor: pan
* @Date: 2024-04-01 14:38:41 * @Date: 2024-04-01 14:38:41
* @LastEditors: pan * @LastEditors: pan
* @LastEditTime: 2024-04-02 13:55:40 * @LastEditTime: 2024-06-19 18:08:45
--> -->
<template> <template>
<el-dialog <el-dialog
...@@ -20,10 +20,8 @@ ...@@ -20,10 +20,8 @@
</Form> </Form>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="handleClose()" size="mini">取 消</el-button> <el-button @click="handleClose()">取 消</el-button>
<el-button type="primary" @click="handleSubmit" size="mini" <el-button type="primary" @click="handleSubmit">确 定</el-button>
>确 定</el-button
>
</span></el-dialog </span></el-dialog
> >
</template> </template>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!