Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 06db696a by 史敦盼
Options

修改

1 parent aa9243bc
Inline Side-by-side
Showing with 78 additions and 77 deletions
src/main.js
...@@ -6,6 +6,7 @@ import * as echarts from 'echarts' ...@@ -6,6 +6,7 @@ import * as echarts from 'echarts'
import ElementUI from 'element-ui' import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css' import 'element-ui/lib/theme-chalk/index.css'
import './styles/element-variables.scss' import './styles/element-variables.scss'
import './styles/common.scss'
import initDirective from './directive' import initDirective from './directive'
import { postRequest, postRequestShared } from '@/api/index' import { postRequest, postRequestShared } from '@/api/index'
......
src/views/archi-ele-list/index.vue
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="元素层级:" prop="let5"> <!-- <el-form-item label="元素层级:" prop="let5">
<el-select <el-select
clearable clearable
placeholder="请选择" placeholder="请选择"
...@@ -306,7 +306,7 @@ ...@@ -306,7 +306,7 @@
<el-option label="L4" :value="4"></el-option> <el-option label="L4" :value="4"></el-option>
<el-option label="L5" :value="5"></el-option> <el-option label="L5" :value="5"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="适用范围:" prop="scope"> <el-form-item label="适用范围:" prop="scope">
<el-select <el-select
clearable clearable
...@@ -322,67 +322,9 @@ ...@@ -322,67 +322,9 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="cross1" label="描述:" prop="let4"> <div class="dialog_form_item3 m-b-20">
<el-input
v-no-backslash
:disabled="is_add_edit == 'view' ? true : false"
type="textarea"
:rows="3"
maxlength="200"
show-word-limit
placeholder="请输入内容"
class="dialog_form_item_content"
v-model="ruleForm.let4"
></el-input>
</el-form-item>
<el-form-item class="cross1" label="定义:" prop="definition">
<el-input
v-no-backslash
:disabled="is_add_edit == 'view' ? true : false"
type="textarea"
:rows="3"
maxlength="200"
show-word-limit
placeholder="请输入内容"
class="dialog_form_item_content"
v-model="ruleForm.definition"
></el-input>
</el-form-item>
<el-form-item
class="cross1"
label="引用关系:"
prop="referenceRelationship"
>
<el-input
v-no-backslash
:disabled="is_add_edit == 'view' ? true : false"
type="textarea"
:rows="3"
maxlength="200"
show-word-limit
placeholder="请输入内容"
class="dialog_form_item_content"
v-model="ruleForm.referenceRelationship"
></el-input>
</el-form-item>
<el-form-item class="cross1" label="示例:" prop="example">
<el-input
v-no-backslash
:disabled="is_add_edit == 'view' ? true : false"
type="textarea"
:rows="3"
maxlength="200"
show-word-limit
placeholder="请输入内容"
class="dialog_form_item_content"
v-model="ruleForm.example"
></el-input>
</el-form-item>
<div class="dialog_form_item3">
<div class="dialog_form_item_title">图标设置:</div> <div class="dialog_form_item_title">图标设置:</div>
<div> <div class="flex">
<div style="text-align: left; margin-bottom: 10px">
<img <img
:style="{ :style="{
width: selectGraphSrc.length > 0 ? '80px' : 0, width: selectGraphSrc.length > 0 ? '80px' : 0,
...@@ -391,7 +333,6 @@ ...@@ -391,7 +333,6 @@
:src="selectGraphSrc" :src="selectGraphSrc"
alt="" alt=""
/> />
</div>
<div <div
style="display: flex" style="display: flex"
v-if="is_add_edit == 'view' ? false : true" v-if="is_add_edit == 'view' ? false : true"
...@@ -428,6 +369,63 @@ ...@@ -428,6 +369,63 @@
</el-radio> </el-radio>
</el-radio-group> --> </el-radio-group> -->
</div> </div>
<el-form-item class="cross1" label="定义:" prop="definition">
<el-input
v-no-backslash
:disabled="is_add_edit == 'view' ? true : false"
type="textarea"
:rows="3"
maxlength="200"
show-word-limit
placeholder="请输入内容"
class="dialog_form_item_content"
v-model="ruleForm.definition"
></el-input>
</el-form-item>
<el-form-item
class="cross1"
label="引用关系:"
prop="referenceRelationship"
>
<el-input
v-no-backslash
:disabled="is_add_edit == 'view' ? true : false"
type="textarea"
:rows="3"
maxlength="200"
show-word-limit
placeholder="请输入内容"
class="dialog_form_item_content"
v-model="ruleForm.referenceRelationship"
></el-input>
</el-form-item>
<el-form-item class="cross1" label="示例:" prop="example">
<el-input
v-no-backslash
:disabled="is_add_edit == 'view' ? true : false"
type="textarea"
:rows="3"
maxlength="200"
show-word-limit
placeholder="请输入内容"
class="dialog_form_item_content"
v-model="ruleForm.example"
></el-input>
</el-form-item>
<el-form-item class="cross1" label="备注:" prop="let4">
<el-input
v-no-backslash
:disabled="is_add_edit == 'view' ? true : false"
type="textarea"
:rows="3"
maxlength="200"
show-word-limit
placeholder="请输入内容"
class="dialog_form_item_content"
v-model="ruleForm.let4"
></el-input>
</el-form-item>
</div> </div>
</el-form> </el-form>
<div <div
...@@ -796,7 +794,7 @@ export default { ...@@ -796,7 +794,7 @@ export default {
let2: null, let2: null,
let3: null, let3: null,
let4: null, let4: null,
let5: null, // let5: null,
let6: '#FF3B30', let6: '#FF3B30',
definition: null, definition: null,
referenceRelationship: null, referenceRelationship: null,
...@@ -812,9 +810,9 @@ export default { ...@@ -812,9 +810,9 @@ export default {
{ required: true, message: '请选择架构归属', trigger: 'change' }, { required: true, message: '请选择架构归属', trigger: 'change' },
], ],
let4: [{ required: true, message: '请输入描述', trigger: 'blur' }], let4: [{ required: true, message: '请输入描述', trigger: 'blur' }],
let5: [ // let5: [
{ required: true, message: '请选择元素层级', trigger: 'change' }, // { required: true, message: '请选择元素层级', trigger: 'change' },
], // ],
scope: [ scope: [
{ required: true, message: '请选择适用范围', trigger: 'change' }, { required: true, message: '请选择适用范围', trigger: 'change' },
], ],
...@@ -1732,6 +1730,7 @@ export default { ...@@ -1732,6 +1730,7 @@ export default {
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '@/styles/common.scss';
.archiEleList { .archiEleList {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -1917,7 +1916,7 @@ export default { ...@@ -1917,7 +1916,7 @@ export default {
} }
.dialog_form_item3 { .dialog_form_item3 {
width: 100%; width: 100%;
margin-top: 20px; // margin-top: 20px;
margin-left: 9px; margin-left: 9px;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -1941,7 +1940,8 @@ export default { ...@@ -1941,7 +1940,8 @@ export default {
} }
.dialog_form_item_title { .dialog_form_item_title {
flex-shrink: 0; flex-shrink: 0;
margin-right: 15px; width: 92px;
// margin-right: 15px;
} }
/deep/ .el-pagination.is-background .el-pager li:not(.disabled).active { /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #0d867f; background-color: #0d867f;
......
src/views/archiEleRela/index.vue
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
</el-form> </el-form>
<div class="dialog_form_item3"> <div class="dialog_form_item3">
<div class="dialog_form_item_title"> <div class="dialog_form_item_title">
<span class="reqIcon">*</span>图标设置 <span class="reqIcon">*</span>元素连线设置
</div> </div>
<div> <div>
<div class="dialog_form_item3_content1"> <div class="dialog_form_item3_content1">
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
</div> </div>
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item">
<div class="dialog_form_item_title">约束条件</div> <div class="dialog_form_item_title">元素关系</div>
<div class="formArea"> <div class="formArea">
<div <div
class="formLine" class="formLine"
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
> >
情况{{ index + 1 }} 情况{{ index + 1 }}
<div class="formItem"> <div class="formItem">
<div class="label">对象1</div> <div class="label">起点元素1</div>
<el-select <el-select
filterable filterable
v-model="item.eleGtId" v-model="item.eleGtId"
...@@ -322,7 +322,7 @@ ...@@ -322,7 +322,7 @@
</el-select> </el-select>
</div> </div>
<div class="formItem"> <div class="formItem">
<div class="label">对象2</div> <div class="label">终点元素2</div>
<el-select <el-select
filterable filterable
v-model="item.eleLtId" v-model="item.eleLtId"
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
</div> </div>
<div <div
style="text-align: right; margin: 20px 0 10px 0" style="text-align: right; margin: 20px 0 10px 0"
v-if="title != '新建关系元素'" v-if="title != '新建元素关系'"
> >
<el-button type="primary" size="mini" @click="openDicyDialog" <el-button type="primary" size="mini" @click="openDicyDialog"
>新增</el-button >新增</el-button
...@@ -386,7 +386,7 @@ ...@@ -386,7 +386,7 @@
:data="tableData2" :data="tableData2"
stripe stripe
border border
v-if="title != '新建关系元素'" v-if="title != '新建元素关系'"
> >
<el-table-column <el-table-column
type="index" type="index"
...@@ -946,14 +946,14 @@ export default { ...@@ -946,14 +946,14 @@ export default {
this.openType = type this.openType = type
if (type == 'add') { if (type == 'add') {
this.add_dialog = true this.add_dialog = true
this.title = '新建关系元素' this.title = '新建元素关系'
this.resetForm() this.resetForm()
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.relaForm.resetFields() this.$refs.relaForm.resetFields()
}) })
} else if (type == 'edit') { } else if (type == 'edit') {
this.add_dialog = true this.add_dialog = true
this.title = '编辑关系元素' this.title = '编辑元素关系'
this.formData = item this.formData = item
this.getDicyTable() this.getDicyTable()
} else if (type == 'view') { } else if (type == 'view') {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!