Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 183d15b9 by liuyong
Options

Merge branch 'master' of http://47.97.176.204:19000/wangwansu/iact_jiagou_drowio

2 parents a80f8c69 941dd4a7
Inline Side-by-side
Showing with 556 additions and 350 deletions
src/views/archiEleRela/index.vue
......@@ -10,12 +10,16 @@
<div class="search_menu_item">
<span class="search_title">适用范围</span>
<el-select v-model="params.scope" placeholder="请选择" clearable class="search_item">
<el-option label="业务架构" value="业务架构"></el-option>
<el-option label="应用架构" value="应用架构"></el-option>
<el-option label="内容架构" value="内容架构"></el-option>
<el-option label="技术架构" value="技术架构"></el-option>
<el-option label="安全架构" value="安全架构"></el-option>
<el-option label="架构之间" value="0"></el-option>
<el-option label="业务架构" value="1"></el-option>
<el-option label="应用架构" value="2"></el-option>
<el-option label="数据架构" value="3"></el-option>
<el-option label="技术架构" value="4"></el-option>
<el-option label="安全架构" value="5"></el-option>
</el-select>
<!-- <el-select v-model="params.scope" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in search_select1" :key="idnex" :label="item.name" :value="item.belongId" ></el-option>
</el-select> -->
</div>
<div class="search_menu_item">
<span class="search_title">状态</span>
......@@ -91,38 +95,36 @@
:title="title"
:visible.sync="add_dialog"
:center="false"
width="50%">
width="60%">
<div class="add_dialog_content">
<div class="dialog_form_item" v-if="openType != 'view'">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>元素关系名称</div>
<el-input placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.rsName"></el-input>
</div>
<div class="dialog_form_item" v-if="openType != 'view'">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>元素关系描述</div>
<el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input>
</div>
<div class="dialog_form_item3" v-if="openType != 'view'">
<div class="dialog_form_item_title">图标设置</div>
<el-form :model="formData" :rules="rules" ref="relaForm">
<div class="form_item_container">
<el-form-item class="cross1" label="元素关系名称:" prop="rsName">
<el-input v-model="formData.rsName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross1" label="描述:" prop="content">
<el-input type="textarea" :rows="3" maxlength="200" show-word-limit placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input>
</el-form-item>
</div>
</el-form>
<div class="dialog_form_item3">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>图标设置</div>
<div>
<div class="dialog_form_item3_content1">
<el-radio v-model="formData.iconId" label="img1">
<!-- <img class="tu_biao_icon2" src="@/assets/archiEleRela/img1.svg" alt="" /> -->
<img class="tu_biao_icon2 srcimg1" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPCEtLSBEbyBub3QgZWRpdCB0aGlzIGZpbGUgd2l0aCBlZGl0b3JzIG90aGVyIHRoYW4gZHJhdy5pbyAtLT4KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSI1MnB4IiBoZWlnaHQ9IjUycHgiIHZpZXdCb3g9Ii0wLjUgLTAuNSA1MiA1MiIgY29udGVudD0iJmx0O214ZmlsZSBob3N0PSZxdW90O2xvY2FsaG9zdCZxdW90OyBtb2RpZmllZD0mcXVvdDsyMDIzLTEyLTExVDA4OjE5OjIzLjA5OFomcXVvdDsgYWdlbnQ9JnF1b3Q7TW96aWxsYS81LjAgKFdpbmRvd3MgTlQgMTAuMDsgV2luNjQ7IHg2NCkgQXBwbGVXZWJLaXQvNTM3LjM2IChLSFRNTCwgbGlrZSBHZWNrbykgQ2hyb21lLzEyMC4wLjAuMCBTYWZhcmkvNTM3LjM2JnF1b3Q7IGV0YWc9JnF1b3Q7TWExc3VrNTRDTl84QVd0UE9Da0smcXVvdDsgdmVyc2lvbj0mcXVvdDtARFJBV0lPLVZFUlNJT05AJnF1b3Q7IHR5cGU9JnF1b3Q7ZGV2aWNlJnF1b3Q7Jmd0OyZsdDtkaWFncmFtIG5hbWU9JnF1b3Q756ysIDEg6aG1JnF1b3Q7IGlkPSZxdW90Oy0wVURfeWZMblg5dVcxaWU0d2NEJnF1b3Q7Jmd0O2paUExic01nRUVXL3hzdEt0a2thZDltazZXTlJLV3FrdEZ0a0pqWXFaaUtNOCtqWEZ4Y3dKbGFrcnN3Y1p1NHdGNXlRVlhOK1VmUlF2eU1Ea2VRcE95ZmtLY256YkphbjV0T1RpeVdMckxDZ1VweTVwQUMyL0FjY2RIVlZ4eG0wVWFKR0ZKb2ZZbGlpbEZEcWlGR2w4QlNuN1ZIRVhRKzBnZ25ZbGxSTTZTZG51cmEweUJlQnZ3S3ZhdDg1dTMrd093MzF5VzZTdHFZTVR5TkUxZ2xaS1VSdFY4MTVCYUkzei90aTY1NXY3QTRIVXlEMWZ3cStPckpmN2xTN2UydXoyV2JlZml6VTk1MVRPVkxSdVlIZFlmWEZPd0NTUGZaR21raWlOSEJaNjBhWUtETkxoWjFrMEhkSVRXUnJnVTBzRFdmTWhzbk5rd0ZzUUt1TFNUa0ZiK2ZPcjNwa3EyY0tCTlg4R010VGQ4WFZJRGQwMkNBM2pmUFVQY2NaY1RydU1SSWZlNGtXTzFXQ3F4cDdlUzFVeEVKNWNTV2txYXBBVDRUTVlqUjJRSDlYNWNQd0pHeDYrTEhJK2hjPSZsdDsvZGlhZ3JhbSZndDsmbHQ7L214ZmlsZSZndDsiIHN0eWxlPSJiYWNrZ3JvdW5kLWNvbG9yOiByZ2IoMjU1LCAyNTUsIDI1NSk7Ij48ZGVmcy8+PGc+PHBhdGggZD0iTSAwIDUwIEwgNTAgMCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSJyZ2IoMCwgMCwgMCkiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgcG9pbnRlci1ldmVudHM9InN0cm9rZSIvPjwvZz48L3N2Zz4=" alt="" />
</el-radio>
<el-radio v-model="formData.iconId" label="img2">
<!-- <img class="tu_biao_icon2" src="@/assets/archiEleRela/img2.svg" alt="" /> -->
<img class="tu_biao_icon2 srcimg2" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPCEtLSBEbyBub3QgZWRpdCB0aGlzIGZpbGUgd2l0aCBlZGl0b3JzIG90aGVyIHRoYW4gZHJhdy5pbyAtLT4KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSI2NnB4IiBoZWlnaHQ9IjY2cHgiIHZpZXdCb3g9Ii0wLjUgLTAuNSA2NiA2NiIgY29udGVudD0iJmx0O214ZmlsZSBob3N0PSZxdW90O2xvY2FsaG9zdCZxdW90OyBtb2RpZmllZD0mcXVvdDsyMDIzLTEyLTExVDA4OjM5OjA3LjU5OFomcXVvdDsgYWdlbnQ9JnF1b3Q7TW96aWxsYS81LjAgKFdpbmRvd3MgTlQgMTAuMDsgV2luNjQ7IHg2NCkgQXBwbGVXZWJLaXQvNTM3LjM2IChLSFRNTCwgbGlrZSBHZWNrbykgQ2hyb21lLzEyMC4wLjAuMCBTYWZhcmkvNTM3LjM2JnF1b3Q7IGV0YWc9JnF1b3Q7UHhDRmVJa2xpVm1XdnBXbVdUN1gmcXVvdDsgdmVyc2lvbj0mcXVvdDtARFJBV0lPLVZFUlNJT05AJnF1b3Q7IHR5cGU9JnF1b3Q7ZGV2aWNlJnF1b3Q7Jmd0OyZsdDtkaWFncmFtIG5hbWU9JnF1b3Q756ysIDEg6aG1JnF1b3Q7IGlkPSZxdW90Oy0wVURfeWZMblg5dVcxaWU0d2NEJnF1b3Q7Jmd0O2paTk5iNE13RElaL0RjZEpRT2hLajJ2WGZSd21WYXZVN1JvUkY2SUZYQ1dodFB2MUMwc2dwR2pTVGlSUDdOZnhHeE9SVFgxNWx2UlV2U0VERWFVeHUwVGtNVXJUSkV0ajgrbkoxWkpsa2x0UVNzNWNrQWQ3L2cwT3VyeXk1UXhVRUtnUmhlYW5FQmJZTkZEb2dGRXBzUXZEamlqQ3FpZGF3Z3pzQ3lybTlJTXpYVm1hcDB2UFg0Q1gxVkE1dVYvWms1b093YTRUVlZHRzNRU1JiVVEyRWxIYlZYM1pnT2pORzN5eGVVOS9uSTRYazlEby95Ujh0dVM0UGtoMWVGVkp0bHVvOTZYOHVuTnRuS2xvWGNQdXN2bzZPQUFOZStpTk5MdENVS1Y0RVpGMXBXdGhRR0tXRXR1R1FWOGtOanViRG16bXFyOW1Nalp2cGdhd0JpMnZKcVR6OWk2Y1pkWEUyWUZKRUZUemN5aFAzU3VYbzl4WVlZZmNGRTVqTjVFa2R6cHVIc2txRGlVVXRySUFselcxODBZb0l6ZEMyWTJRcHJJRVBSTXlpMG5iSHYyKzFyRDFVMkhEL2I5RnRqOD0mbHQ7L2RpYWdyYW0mZ3Q7Jmx0Oy9teGZpbGUmZ3Q7IiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjogcmdiKDI1NSwgMjU1LCAyNTUpOyI+PGRlZnMvPjxnPjxwYXRoIGQ9Ik0gNyA1NyBMIDUyLjUgMTEuNSIgZmlsbD0ibm9uZSIgc3Ryb2tlPSJyZ2IoMCwgMCwgMCkiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgcG9pbnRlci1ldmVudHM9InN0cm9rZSIvPjxwYXRoIGQ9Ik0gNTYuMjEgNy43OSBMIDUzLjczIDE1LjIyIEwgNTIuNSAxMS41IEwgNDguNzggMTAuMjcgWiIgZmlsbD0icmdiKDAsIDAsIDApIiBzdHJva2U9InJnYigwLCAwLCAwKSIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBwb2ludGVyLWV2ZW50cz0iYWxsIi8+PC9nPjwvc3ZnPg==" alt="" />
</el-radio>
<el-radio v-model="formData.iconId" label="img3">
<!-- <img class="tu_biao_icon2" src="@/assets/archiEleRela/img3.svg" alt="" /> -->
<img class="tu_biao_icon2 srcimg3" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPCEtLSBEbyBub3QgZWRpdCB0aGlzIGZpbGUgd2l0aCBlZGl0b3JzIG90aGVyIHRoYW4gZHJhdy5pbyAtLT4KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSI2OHB4IiBoZWlnaHQ9IjY4cHgiIHZpZXdCb3g9Ii0wLjUgLTAuNSA2OCA2OCIgY29udGVudD0iJmx0O214ZmlsZSBob3N0PSZxdW90O2xvY2FsaG9zdCZxdW90OyBtb2RpZmllZD0mcXVvdDsyMDIzLTEyLTExVDA4OjM3OjExLjE3MlomcXVvdDsgYWdlbnQ9JnF1b3Q7TW96aWxsYS81LjAgKFdpbmRvd3MgTlQgMTAuMDsgV2luNjQ7IHg2NCkgQXBwbGVXZWJLaXQvNTM3LjM2IChLSFRNTCwgbGlrZSBHZWNrbykgQ2hyb21lLzEyMC4wLjAuMCBTYWZhcmkvNTM3LjM2JnF1b3Q7IGV0YWc9JnF1b3Q7cGJJZGhlY29zS293VWFCWmJKWksmcXVvdDsgdmVyc2lvbj0mcXVvdDtARFJBV0lPLVZFUlNJT05AJnF1b3Q7IHR5cGU9JnF1b3Q7ZGV2aWNlJnF1b3Q7Jmd0OyZsdDtkaWFncmFtIG5hbWU9JnF1b3Q756ysIDEg6aG1JnF1b3Q7IGlkPSZxdW90Oy0wVURfeWZMblg5dVcxaWU0d2NEJnF1b3Q7Jmd0O2paUExic01nRUVXL3hzdEtOamh4dW16UzlMR29GRFZTMmkweUV4c1Ztd2h3SHYzNjRnTEcyS3JVbGVFd2MyZTRqQk84YWE3UGtwenFOMEdCSnlpbDF3US9KZ2hsT1VyTnB5YzNTNHBzWlVFbEdYVkJBZXpaTnpqbzhxcU9VVkJSb0JhQ2EzYUtZU25hRmtvZE1TS2x1TVJoUjhIanFpZFN3UXpzUzhMbjlJTlJYVnU2UWtYZ0w4Q3EybGZPbHZmMnBDRSsyTjFFMVlTS3l3amhiWUkzVWdodFY4MTFBN3czei90aTg1NytPQjBhazlEcS95Ujhkdmk0UGtoMWVGVlp2bHVvOTBKKzNTMnR5cG53emwzWU5hdHYzZ0ZvNlVOdnBObVZuQ2pGeWdTdmxTWlN6M0d0RzI1QVpwWlNkQzJGdm5acWRsWVY2TXpzMEgwMmVHS0dDVVFEV3Q1TXlDVzR2bkJPMWlQRFBaUEFpV2JuV0o2NHg2OEd1YUhDVGpCVEdLVnVVTEhYY1dPS2l6U1dVS0tUSmJpc3Njc1RvVHlkQ0tHSmtER3VBajBUTW92UnRRUDZmVVMvRGNOaXc4TXZoN2MvJmx0Oy9kaWFncmFtJmd0OyZsdDsvbXhmaWxlJmd0OyIgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6IHJnYigyNTUsIDI1NSwgMjU1KTsiPjxkZWZzLz48Zz48cGF0aCBkPSJNIDEyLjUgNTMuNSBMIDUzLjUgMTIuNSIgZmlsbD0ibm9uZSIgc3Ryb2tlPSJyZ2IoMCwgMCwgMCkiIHN0cm9rZS1taXRlcmxpbWl0PSIxMCIgcG9pbnRlci1ldmVudHM9InN0cm9rZSIvPjxwYXRoIGQ9Ik0gOC43OSA1Ny4yMSBMIDExLjI3IDQ5Ljc4IEwgMTIuNSA1My41IEwgMTYuMjIgNTQuNzMgWiIgZmlsbD0icmdiKDAsIDAsIDApIiBzdHJva2U9InJnYigwLCAwLCAwKSIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBwb2ludGVyLWV2ZW50cz0iYWxsIi8+PHBhdGggZD0iTSA1Ny4yMSA4Ljc5IEwgNTQuNzMgMTYuMjIgTCA1My41IDEyLjUgTCA0OS43OCAxMS4yNyBaIiBmaWxsPSJyZ2IoMCwgMCwgMCkiIHN0cm9rZT0icmdiKDAsIDAsIDApIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHBvaW50ZXItZXZlbnRzPSJhbGwiLz48L2c+PC9zdmc+" alt="" />
</el-radio>
<el-radio v-model="formData.iconId" label="img4">
<!-- <img class="tu_biao_icon2" src="@/assets/archiEleRela/img4.svg" alt="" /> -->
<img class="tu_biao_icon2 srcimg4" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPCEtLSBEbyBub3QgZWRpdCB0aGlzIGZpbGUgd2l0aCBlZGl0b3JzIG90aGVyIHRoYW4gZHJhdy5pbyAtLT4KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSI3MHB4IiBoZWlnaHQ9IjcwcHgiIHZpZXdCb3g9Ii0wLjUgLTAuNSA3MCA3MCIgY29udGVudD0iJmx0O214ZmlsZSBob3N0PSZxdW90O2xvY2FsaG9zdCZxdW90OyBtb2RpZmllZD0mcXVvdDsyMDIzLTEyLTExVDA4OjQ5OjMwLjMzMVomcXVvdDsgYWdlbnQ9JnF1b3Q7TW96aWxsYS81LjAgKFdpbmRvd3MgTlQgMTAuMDsgV2luNjQ7IHg2NCkgQXBwbGVXZWJLaXQvNTM3LjM2IChLSFRNTCwgbGlrZSBHZWNrbykgQ2hyb21lLzEyMC4wLjAuMCBTYWZhcmkvNTM3LjM2JnF1b3Q7IGV0YWc9JnF1b3Q7NXJ5Y1k5X2pldUVsOGJVemhNck4mcXVvdDsgdmVyc2lvbj0mcXVvdDtARFJBV0lPLVZFUlNJT05AJnF1b3Q7IHR5cGU9JnF1b3Q7ZGV2aWNlJnF1b3Q7Jmd0OyZsdDtkaWFncmFtIG5hbWU9JnF1b3Q756ysIDEg6aG1JnF1b3Q7IGlkPSZxdW90Oy0wVURfeWZMblg5dVcxaWU0d2NEJnF1b3Q7Jmd0O2paTmJiNEl3Rk1jL0RZOUxnT0prajFQWjVXR0ptWW5iYTBlUDBLeHdURnRFL2ZRcnRseXFNZGtUUGIrZTY3K0hnQ3lyNDZ1aysvSURHWWdnRHRreElLc2dqcU1rRHMybkl5ZEw1bEZxUVNFNWMwNGoyUEF6T09qaWlvWXpVSjZqUmhTYTczMllZMTFEcmoxR3BjVFdkOXVoOEt2dWFRRTNZSk5UY1V1L09OT2xwV2s4SC9rYjhLTHNLMGVQVC9hbW9yMnptMFNWbEdFN1FTUUx5RklpYW51cWprc1FuWGk5TGpidTVjN3QwSmlFV3Y4bjRMc2h1OFZXcXUyN2lwTDFUSDNPNWU5REwvT0Jpc1pON0xyVnAxNENZRVlSWjRMNHdUWWJ3ZUlDekVXSmtwK3gxbFIwc0diUG5mYUc1NElxeFhNRFMxMlp1MVZram5rakQ5QzFGUnBEWWxPendUS2hiZ2xTWXlsTnBaN1l0cmV1b2JzaVJJTzBaaWNCSzlEeVpGemE4ZkZtYnVaeThtNDlreUNvNWdjL1BYVTdWQXpwaGdwcjVLWndITHA5VDBLWHgyMTdRa0kvaGNKRzV1Q2lwbzkxbldqbUp5THBWU0lqVEFINkpwRTVUTVllMFdVWGVuUGNPZXMrL3Jrayt3TT0mbHQ7L2RpYWdyYW0mZ3Q7Jmx0Oy9teGZpbGUmZ3Q7IiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjogcmdiKDI1NSwgMjU1LCAyNTUpOyI+PGRlZnMvPjxnPjxwYXRoIGQ9Ik0gOSA1OSBMIDM0IDU5IEwgMzQgOSBMIDUxLjEzIDkiIGZpbGw9Im5vbmUiIHN0cm9rZT0icmdiKDAsIDAsIDApIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHBvaW50ZXItZXZlbnRzPSJzdHJva2UiLz48cGF0aCBkPSJNIDU3Ljg4IDkgTCA0OC44OCAxMy41IEwgNTEuMTMgOSBMIDQ4Ljg4IDQuNSBaIiBmaWxsPSJyZ2IoMCwgMCwgMCkiIHN0cm9rZT0icmdiKDAsIDAsIDApIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHBvaW50ZXItZXZlbnRzPSJhbGwiLz48L2c+PC9zdmc+" alt="" />
</el-radio>
<el-radio v-model="formData.iconId" label="img5">
<!-- <img class="tu_biao_icon2" src="@/assets/archiEleRela/img5.svg" alt="" /> -->
<img class="tu_biao_icon2 srcimg5" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPCEtLSBEbyBub3QgZWRpdCB0aGlzIGZpbGUgd2l0aCBlZGl0b3JzIG90aGVyIHRoYW4gZHJhdy5pbyAtLT4KPCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSI1MHB4IiBoZWlnaHQ9IjU1cHgiIHZpZXdCb3g9Ii0wLjUgLTAuNSA1MCA1NSIgY29udGVudD0iJmx0O214ZmlsZSBob3N0PSZxdW90O2xvY2FsaG9zdCZxdW90OyBtb2RpZmllZD0mcXVvdDsyMDIzLTEyLTExVDA4OjQ5OjU1LjkzMFomcXVvdDsgYWdlbnQ9JnF1b3Q7TW96aWxsYS81LjAgKFdpbmRvd3MgTlQgMTAuMDsgV2luNjQ7IHg2NCkgQXBwbGVXZWJLaXQvNTM3LjM2IChLSFRNTCwgbGlrZSBHZWNrbykgQ2hyb21lLzEyMC4wLjAuMCBTYWZhcmkvNTM3LjM2JnF1b3Q7IGV0YWc9JnF1b3Q7ZUhTUFRhNXk3YzA4NzVubFRrRlUmcXVvdDsgdmVyc2lvbj0mcXVvdDtARFJBV0lPLVZFUlNJT05AJnF1b3Q7IHR5cGU9JnF1b3Q7ZGV2aWNlJnF1b3Q7Jmd0OyZsdDtkaWFncmFtIG5hbWU9JnF1b3Q756ysIDEg6aG1JnF1b3Q7IGlkPSZxdW90Oy0wVURfeWZMblg5dVcxaWU0d2NEJnF1b3Q7Jmd0O2pWUExib013RVB3YWpwVXdKazF5Yk5MMGNhZ1VOVkxhcTRVM1lOVmdaSnNrOU90cllodHdVS0tlOEk1blozZkhTNFRYNWZsVmtycjRFQlI0bE1UMEhPSG5LRWxRbXNUbTB5R3RSZVpvWVlGY011cElBN0JqditCQWw1YzNqSUlLaUZvSXJsa2RncG1vS3NoMGdCRXB4U21rSFFRUHE5WWtod213eXdpZm9sK002c0tpaTJRKzRHL0E4c0pYUm85TGUxTVNUM2FUcUlKUWNScEJlQlBodFJSQzIxTjVYZ1B2elBPKzJMeVhHN2Q5WXhJcS9aK0U3d1lmVm51cDl1OEtwZHVaK3B6TG53ZmtaSTZFTjI1aTE2MXV2UVZaSTQvUWlhQUlyNkNpVDUydEpzdzRVWXBsQml4MHlkMjlGRTFGTCt6WVJGWUw2TVRqb1duVVcyRjJDRVFKV3JhR2Nock1uamtEaTVIUEhwUEFpV2JIVUo2NE44OTd1YjdDVmpCVE9JbmRmdUtGMDNIYmlaZHhLS0ZFSXpOd1dXTnpyNFJTZkNXVVhnbHBJblBRRXlIakpXbEh0TG9qcU5zTlQrb3M0N3Q5VFFaTUE3NDUyQTU4TkhxREFib3NrZytIaGJYMDRiZkhtejg9Jmx0Oy9kaWFncmFtJmd0OyZsdDsvbXhmaWxlJmd0OyIgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6IHJnYigyNTUsIDI1NSwgMjU1KTsiPjxkZWZzLz48Zz48cGF0aCBkPSJNIDAgNTQgUSA1MCA1NCAyNSAyOSBRIDAgNCA0My42MyA0IiBmaWxsPSJub25lIiBzdHJva2U9InJnYigwLCAwLCAwKSIgc3Ryb2tlLW1pdGVybGltaXQ9IjEwIiBwb2ludGVyLWV2ZW50cz0ic3Ryb2tlIi8+PHBhdGggZD0iTSA0OC44OCA0IEwgNDEuODggNy41IEwgNDMuNjMgNCBMIDQxLjg4IDAuNSBaIiBmaWxsPSJyZ2IoMCwgMCwgMCkiIHN0cm9rZT0icmdiKDAsIDAsIDApIiBzdHJva2UtbWl0ZXJsaW1pdD0iMTAiIHBvaW50ZXItZXZlbnRzPSJhbGwiLz48L2c+PC9zdmc+" alt="" />
</el-radio>
</div>
......@@ -147,11 +149,11 @@
</div>
<div class="formItem">
<div class="label">适用范围</div>
<el-select v-model="item.scope" placeholder="请选择" :disabled="true" @change="selectChange1(item,index)">
<el-select v-model="item.scope" placeholder="请选择" :disabled="true">
<el-option v-for="(item,idnex) in guishuList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div>
<div class="newBtn" v-if="openType != 'view'">
<div class="newBtn">
<el-button class="addItem" icon="el-icon-plus" circle @click="operateDia('add')" v-if="formData.arrList.length == index+1"></el-button>
<el-button class="addItem" icon="el-icon-minus" circle @click="operateDia('del')" v-else></el-button>
</div>
......@@ -159,7 +161,7 @@
</div>
</div>
</div>
<span slot="footer" class="dialog-footer" v-if="openType != 'view'">
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operate('pushAdd')">发布</el-button>
<el-button class="greenButton" @click="operate('create')">保存</el-button>
<el-button @click="add_dialog = false">取消</el-button>
......@@ -237,6 +239,14 @@ export default {
],
iconId: "",
},
rules: {
rsName: [
{ required: true, message: '请输入元素关系名称', trigger: 'blur' },
],
content: [
{ required: true, message: '请输入描述', trigger: 'blur' },
],
},
params: {
current: 1,
pageSize: 10,
......@@ -315,9 +325,6 @@ export default {
};
},
mounted() {
},
created() {
// 初始化查询列表
this.getList();
// 获取元素列表
......@@ -325,8 +332,11 @@ export default {
this.get_dialog_select2().then(res => {
this.search_select1 = res;
console.log(this.search_select1);
});
},
created() {
},
methods: {
// 查询列表
getList() {
......@@ -345,6 +355,7 @@ export default {
getEleList().then(res => {
if (res.code == 200) {
this.eleList = res.data;
console.log(this.eleList);
this.eleList.forEach(item=>{
this.dicObj.eleLtId[item.elementId] = item.elementName;
})
......@@ -393,6 +404,9 @@ export default {
this.add_dialog = true;
this.title = "新建关系元素";
this.resetForm();
this.$nextTick(() => {
this.$refs.relaForm.resetFields();
});
}else if (type == "edit") {
this.add_dialog = true;
this.title = "编辑关系元素";
......@@ -401,33 +415,45 @@ export default {
this.add_dialog3 = true;
this.formData = item;
}else if (type == "create") {
this.formData.state = 2;
this.formData.icon = $(`.src${this.formData.iconId}`)[0].src;
if (this.formData.eleRelaId) {
// 编辑保存
getJGYSGLUpdate(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
this.getList();
}else{
this.add_dialog = false;
this.$message.error(res.msg);
this.$refs.relaForm.validate(valid => {
if(valid) {
if (this.formData.iconId == "") {
this.$message.error("请选择图标");
return;
}
});
}else{
// 新建保存
getJGYSGLAdd(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
this.getList();
// if (this.formData.arrList.length <= 0) {
// this.$message.error("请选择至少一种约束条件");
// return;
// }
this.formData.state = 2;
this.formData.icon = $(`.src${this.formData.iconId}`)[0].src;
if (this.formData.eleRelaId) {
// 编辑保存
getJGYSGLUpdate(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
this.getList();
}else{
this.add_dialog = false;
this.$message.error(res.msg);
}
});
}else{
this.add_dialog = false;
this.$message.error(res.msg);
// 新建保存
getJGYSGLAdd(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
this.getList();
}else{
this.add_dialog = false;
this.$message.error(res.msg);
}
});
}
});
}
}
});
}else if (type == "pushAdd") {
this.formData.state = 1;
if (this.formData.eleRelaId) {
......@@ -780,6 +806,24 @@ export default {
.el-pagination{
margin-top: 50px;
}
.form_item_container{
display: flex;
flex-wrap: wrap;
.cross1{
width: 100% !important;
margin-left: 27px;
/deep/ .el-form-item__label{
width: 12%;
}
/deep/ .el-form-item__content{
width: 87% !important;
}
}
.el-form-item{
display: flex;
width: 100%;
}
}
.dialog_form_item{
display: flex;
align-items: center;
......@@ -823,10 +867,11 @@ export default {
.dialog_form_item_title{
flex-shrink: 0;
margin-right: 15px;
width: 100px;
width: 140px;
text-align: right;
.reqIcon{
color: red;
color: #F56C6C;
margin-right: 4px;
}
}
/deep/ .el-dialog__header{
......
src/views/archiViewConfig/index.vue
......@@ -90,36 +90,32 @@
<el-dialog
:title="title"
:visible.sync="add_dialog"
top="4%"
:center="false"
width="50%">
width="60%">
<div class="add_dialog_content">
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>架构视图名称</div>
<el-input v-model="formData.viewName" placeholder="请输入内容" class="search_item"></el-input>
<!-- <el-select v-model="formData.viewName" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in viewNameList" :key="idnex" :label="item" :value="item" ></el-option>
</el-select> -->
<el-form :model="formData" :rules="rules" ref="viewForm">
<div class="form_item_container">
<el-form-item class="cross" label="架构视图名称:" prop="viewName">
<el-input v-model="formData.viewName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="架构层次:" prop="archiLevelId">
<el-select v-model="formData.archiLevelId" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</el-form-item>
<el-form-item class="cross" label="架构层次:" prop="archiBelongId">
<el-select v-model="formData.archiBelongId" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in belongList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</el-form-item>
<el-form-item class="cross1" label="视图描述:" prop="content">
<el-input type="textarea" :rows="3" maxlength="200" show-word-limit placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input>
</el-form-item>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>架构层次</div>
<el-select v-model="formData.archiLevelId" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>架构归属</div>
<el-select v-model="formData.archiBelongId" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in belongList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
</div>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>视图描述</div>
<el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.content"></el-input>
</div>
</el-form>
<div class="dialog_form_item">
<div class="dialog_form_item_title">*元素范围</div>
<div class="dialog_form_item_title"><span class="reqIcon">*</span>元素范围</div>
<el-table :data="tableData1" ref="multipleTable1" border height="195" @selection-change="handleSelectionChange1">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
......@@ -127,7 +123,7 @@
</el-table>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title">*元素关系范围</div>
<div class="dialog_form_item_title"><span class="reqIcon">*</span>元素关系范围</div>
<el-table :data="tableData2" ref="multipleTable2" border height="195" @selection-change="handleSelectionChange2">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
......@@ -184,6 +180,20 @@ export default {
archiEleRelId: "",
relName: "",
},
rules: {
viewName: [
{ required: true, message: '请输入架构视图名称', trigger: 'blur' },
],
archiLevelId: [
{ required: true, message: '请选择架构层次', trigger: 'change' },
],
archiBelongId: [
{ required: true, message: '请选择架构归属', trigger: 'change' },
],
content: [
{ required: true, message: '请输入视图描述', trigger: 'blur' },
],
},
params: {
current: 1,
pageSize: 10,
......@@ -356,6 +366,9 @@ export default {
this.add_dialog = true;
this.title = "新建架构视图";
this.resetForm();
this.$nextTick(() => {
this.$refs.viewForm.resetFields();
});
}else if (type == "edit") {
this.add_dialog = true;
this.title = "编辑架构视图";
......@@ -374,10 +387,6 @@ export default {
if (item.archiEleRelId) {
this.selectData4 = item.archiEleRelId.split(",");
}
// this.selectData1 = item.eleName.split(",");
// this.selectData2 = item.archiEleId.split(",");
// this.selectData3 = item.relName.split(",");
// this.selectData4 = item.archiEleRelId.split(",");
this.tableData1.forEach(item => {
this.selectData2.forEach(item2 => {
if (item.elementId == item2) {
......@@ -397,37 +406,49 @@ export default {
});
});
}else if (type == "create") {
this.formData.state = 2;
// 赋值
this.formData.eleName = this.selectData1.join(",");
this.formData.archiEleId = this.selectData2.join(",");
this.formData.relName = this.selectData3.join(",");
this.formData.archiEleRelId = this.selectData4.join(",");
if (this.formData.viewId) {
// 编辑保存
getJGSTPZUpdate(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
this.getList();
}else{
this.add_dialog = false;
this.$message.error(res.msg);
this.$refs.viewForm.validate(valid => {
if(valid) {
if (this.selectData1.length == 0) {
this.$message.error("请勾选元素范围");
return;
}
});
}else{
// 新建保存
getJGSTPZAdd(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
this.getList();
if (this.selectData3.length == 0) {
this.$message.error("请勾选元素关系范围");
return;
}
this.formData.state = 2;
// 赋值
this.formData.eleName = this.selectData1.join(",");
this.formData.archiEleId = this.selectData2.join(",");
this.formData.relName = this.selectData3.join(",");
this.formData.archiEleRelId = this.selectData4.join(",");
if (this.formData.viewId) {
// 编辑保存
getJGSTPZUpdate(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
this.getList();
}else{
this.add_dialog = false;
this.$message.error(res.msg);
}
});
}else{
this.add_dialog = false;
this.$message.error(res.msg);
// 新建保存
getJGSTPZAdd(this.formData).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog = false;
this.getList();
}else{
this.add_dialog = false;
this.$message.error(res.msg);
}
});
}
});
}
}
});
}else if (type == "pushAdd") {
this.formData.state = 1;
this.formData.eleName = this.selectData1.join(",");
......@@ -602,6 +623,32 @@ export default {
justify-content: flex-start;
align-items: center;
}
.form_item_container{
display: flex;
flex-wrap: wrap;
.cross{
width: 32% !important;
/deep/ .el-form-item__label{
width: 40%;
}
/deep/ .el-form-item__content{
width: 60% !important;
}
}
.cross1{
width: 100% !important;
/deep/ .el-form-item__label{
width: 13%;
}
/deep/ .el-form-item__content{
width: 83% !important;
}
}
.el-form-item{
display: flex;
width: 100%;
}
}
.dialog_content_1{
display: flex;
justify-content: space-between;
......@@ -713,6 +760,7 @@ export default {
margin-top: 50px;
}
.dialog_form_item{
width: 96%;
display: flex;
align-items: center;
margin-bottom: 10px;
......@@ -720,10 +768,11 @@ export default {
.dialog_form_item_title{
flex-shrink: 0;
margin-right: 15px;
width: 100px;
width: 130px;
text-align: right;
.reqIcon{
color: red;
color: #F56C6C;
margin-right: 4px;
}
}
/deep/ .el-dialog__header{
......
src/views/metaModelDic/pages/page1.vue
......@@ -48,17 +48,12 @@
</el-table-column>
<el-table-column prop="content" label="描述" align="center"></el-table-column>
<!-- <el-table-column label="图标" align="center">
<template>
<el-button type="text" style="color: #0D867F;">预览</el-button>
</template>
</el-table-column> -->
<el-table-column label="图标" align="center">
<template slot-scope="scope">
<img :src="scope.row.icon" alt="" style="width: 50%;">
</template>
</el-table-column>
<el-table-column prop="version" label="版本" align="center"></el-table-column>
<el-table-column label="状态" align="center">
</el-table-column> -->
<el-table-column prop="version" label="字典版本号" align="center"></el-table-column>
<el-table-column label="字典版本状态" align="center">
<template slot-scope="scope">
<span>{{dicObj.state[scope.row.state]}}</span>
</template>
......@@ -179,34 +174,27 @@
:center="false"
width="40%">
<div class="add_dialog_content">
<div class="dialog_content_1">
<div class="dialog_form_item2">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字段名</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.fieldName" @input="formData2.fieldName=formData2.fieldName.replace(/[^a-zA-Z]/g,'')"></el-input>
</div>
<div class="dialog_form_item2">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>中文名</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.chineseName"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item2">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>排序</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.displayOrder"></el-input>
</div>
<div class="dialog_form_item2">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>长度</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.contentLength"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item2">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>控件</div>
<el-select v-model="formData2.controlType" placeholder="请选择" class="search_item">
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
<el-form :model="formData2" :rules="rules" ref="page1Form">
<div class="form_item_container">
<el-form-item class="cross" label="字段名:" prop="fieldName">
<el-input v-model="formData2.fieldName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="中文名:" prop="chineseName">
<el-input v-model="formData2.chineseName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="排序:" prop="displayOrder">
<el-input v-model="formData2.displayOrder" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="长度:" prop="contentLength">
<el-input v-model="formData2.contentLength" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="控件:" prop="controlType">
<el-select v-model="formData2.controlType" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
</div>
</div>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operateDia('save')">保存</el-button>
......@@ -265,6 +253,23 @@ export default {
contentLength: "",
controlType: "",
},
rules: {
fieldName: [
{ required: true, message: '请输入字段名', trigger: 'blur' },
],
chineseName: [
{ required: true, message: '请输入中文名', trigger: 'blur' },
],
displayOrder: [
{ required: true, message: '请输字段入排序', trigger: 'blur' },
],
contentLength: [
{ required: true, message: '请输入字段长度', trigger: 'blur' },
],
controlType: [
{ required: true, message: '请选择控件类型', trigger: 'change' },
],
},
params: {
current: 1,
pageSize: 10,
......@@ -540,6 +545,9 @@ export default {
this.add_dialog2 = true;
this.title2 = "新建字典属性";
this.resetFormData2();
this.$nextTick(() => {
this.$refs.page1Form.resetFields();
});
break;
// 编辑
case 'edit':
......@@ -549,56 +557,60 @@ export default {
break;
// 保存
case 'save':
if (this.formData2.propertyId) {
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
propertyId: this.formData2.propertyId,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 编辑保存
getYMXZDGLProyUpdate(params).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
this.$refs.page1Form.validate(valid => {
if(valid) {
if (this.formData2.propertyId) {
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
propertyId: this.formData2.propertyId,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 编辑保存
getYMXZDGLProyUpdate(params).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 新建保存
getYMXZDGLProyAdd(params).then(res => {
if (res.code == 200) {
this.$message.success("新建成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}
});
}else{
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 新建保存
getYMXZDGLProyAdd(params).then(res => {
if (res.code == 200) {
this.$message.success("新建成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}
});
break;
// 删除
case 'del':
......@@ -658,6 +670,26 @@ export default {
}
.add_dialog_content{
width: 100%;
.form_item_container{
display: flex;
flex-wrap: wrap;
.cross{
width: 50% !important;
/deep/ .el-form-item__label{
width: 25%;
}
/deep/ .el-form-item__content{
width: 65% !important;
.el-select{
width: 100% !important;
}
}
}
.el-form-item{
display: flex;
width: 100%;
}
}
}
.dialog_content_1{
width: 100%;
......
src/views/metaModelDic/pages/page2.vue
......@@ -41,15 +41,15 @@
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="rsName" label="元素关系名称" align="center"></el-table-column>
<el-table-column prop="content" label="关系描述" align="center"></el-table-column>
<el-table-column label="图标" align="center" width="100">
<!-- <el-table-column label="图标" align="center" width="100">
<template slot-scope="scope">
<div class="tableIcon">
<img class="iconItem" :src="scope.row.icon" alt="">
</div>
</template>
</el-table-column>
<el-table-column prop="version" label="版本" width="250" align="center"></el-table-column>
<el-table-column prop="state" label="状态" width="100" align="center">
</el-table-column> -->
<el-table-column prop="version" label="字典版本号" width="250" align="center"></el-table-column>
<el-table-column prop="state" label="字典版本状态" width="150" align="center">
<template slot-scope="scope">
<span >{{dicObj.state[scope.row.state]}}</span>
</template>
......@@ -174,34 +174,27 @@
:center="false"
width="40%">
<div class="add_dialog_content">
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字段名</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.fieldName" @input="formData2.fieldName=formData2.fieldName.replace(/[^a-zA-Z]/g,'')"></el-input>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>中文名</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.chineseName"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>排序</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.displayOrder"></el-input>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>长度</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.contentLength"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>控件</div>
<el-select v-model="formData2.controlType" placeholder="请选择" class="search_item">
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
<el-form :model="formData2" :rules="rules" ref="page2Form">
<div class="form_item_container">
<el-form-item class="cross" label="字段名:" prop="fieldName">
<el-input v-model="formData2.fieldName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="中文名:" prop="chineseName">
<el-input v-model="formData2.chineseName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="排序:" prop="displayOrder">
<el-input v-model="formData2.displayOrder" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="长度:" prop="contentLength">
<el-input v-model="formData2.contentLength" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="控件:" prop="controlType">
<el-select v-model="formData2.controlType" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
</div>
</div>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operateDia('save')">保存</el-button>
......@@ -266,6 +259,23 @@ export default {
contentLength: "",
controlType: "",
},
rules: {
fieldName: [
{ required: true, message: '请输入字段名', trigger: 'blur' },
],
chineseName: [
{ required: true, message: '请输入中文名', trigger: 'blur' },
],
displayOrder: [
{ required: true, message: '请输字段入排序', trigger: 'blur' },
],
contentLength: [
{ required: true, message: '请输入字段长度', trigger: 'blur' },
],
controlType: [
{ required: true, message: '请选择控件类型', trigger: 'change' },
],
},
params: {
current: 1,
pageSize: 10,
......@@ -496,6 +506,9 @@ export default {
this.add_dialog2 = true;
this.title2 = "新建字典属性";
this.resetFormData2();
this.$nextTick(() => {
this.$refs.page2Form.resetFields();
});
break;
// 编辑
case 'edit':
......@@ -505,56 +518,60 @@ export default {
break;
// 保存
case 'save':
if (this.formData2.propertyId) {
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
propertyId: this.formData2.propertyId,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 编辑保存
getYMXZDGLProyUpdate(params).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
this.$refs.page2Form.validate(valid => {
if(valid) {
if (this.formData2.propertyId) {
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
propertyId: this.formData2.propertyId,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 编辑保存
getYMXZDGLProyUpdate(params).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 新建保存
getYMXZDGLProyAdd(params).then(res => {
if (res.code == 200) {
this.$message.success("新建成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}
});
}else{
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 新建保存
getYMXZDGLProyAdd(params).then(res => {
if (res.code == 200) {
this.$message.success("新建成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}
});
break;
// 删除
case 'del':
......@@ -624,6 +641,29 @@ export default {
width: 260px;
}
}
.add_dialog_content{
width: 100%;
.form_item_container{
display: flex;
flex-wrap: wrap;
.cross{
width: 50% !important;
/deep/ .el-form-item__label{
width: 25%;
}
/deep/ .el-form-item__content{
width: 65% !important;
.el-select{
width: 100% !important;
}
}
}
.el-form-item{
display: flex;
width: 100%;
}
}
}
.search_menu{
display: flex;
justify-content: space-between;
......
src/views/metaModelDic/pages/page3.vue
......@@ -49,8 +49,8 @@
<el-table-column prop="content" label="视图描述" width="150" align="center"></el-table-column>
<el-table-column prop="eleName" label="元素范围" width="150" align="center"></el-table-column>
<el-table-column prop="relName" label="包含元素" width="150" align="center"></el-table-column>
<el-table-column prop="version" label="版本" width="150" align="center"></el-table-column>
<el-table-column prop="state" label="状态" align="center">
<el-table-column prop="version" label="字典版本号" width="150" align="center"></el-table-column>
<el-table-column prop="state" label="字典版本状态" align="center">
<template slot-scope="scope">
<span >{{dicObj.state[scope.row.state]}}</span>
</template>
......@@ -173,34 +173,27 @@
:center="false"
width="40%">
<div class="add_dialog_content">
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>字段名</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.fieldName" @input="formData2.fieldName=formData2.fieldName.replace(/[^a-zA-Z]/g,'')"></el-input>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>中文名</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.chineseName"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>排序</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.displayOrder"></el-input>
</div>
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>长度</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="formData2.contentLength"></el-input>
</div>
</div>
<div class="dialog_content_1">
<div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>控件</div>
<el-select v-model="formData2.controlType" placeholder="请选择" class="search_item">
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select>
<el-form :model="formData2" :rules="rules" ref="page3Form">
<div class="form_item_container">
<el-form-item class="cross" label="字段名:" prop="fieldName">
<el-input v-model="formData2.fieldName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="中文名:" prop="chineseName">
<el-input v-model="formData2.chineseName" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="排序:" prop="displayOrder">
<el-input v-model="formData2.displayOrder" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="长度:" prop="contentLength">
<el-input v-model="formData2.contentLength" maxlength="100"></el-input>
</el-form-item>
<el-form-item class="cross" label="控件:" prop="controlType">
<el-select v-model="formData2.controlType" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in selectTypeList" :key="idnex" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
</div>
</div>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operateDia('save')">保存</el-button>
......@@ -260,6 +253,23 @@ export default {
contentLength: "",
controlType: "",
},
rules: {
fieldName: [
{ required: true, message: '请输入字段名', trigger: 'blur' },
],
chineseName: [
{ required: true, message: '请输入中文名', trigger: 'blur' },
],
displayOrder: [
{ required: true, message: '请输字段入排序', trigger: 'blur' },
],
contentLength: [
{ required: true, message: '请输入字段长度', trigger: 'blur' },
],
controlType: [
{ required: true, message: '请选择控件类型', trigger: 'change' },
],
},
params: {
current: 1,
pageSize: 10,
......@@ -561,6 +571,9 @@ export default {
this.add_dialog2 = true;
this.title2 = "新建字典属性";
this.resetFormData2();
this.$nextTick(() => {
this.$refs.page3Form.resetFields();
});
break;
// 编辑
case 'edit':
......@@ -570,56 +583,60 @@ export default {
break;
// 保存
case 'save':
if (this.formData2.propertyId) {
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
propertyId: this.formData2.propertyId,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 编辑保存
getYMXZDGLProyUpdate(params).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
this.$refs.page3Form.validate(valid => {
if(valid) {
if (this.formData2.propertyId) {
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
propertyId: this.formData2.propertyId,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 编辑保存
getYMXZDGLProyUpdate(params).then(res => {
if (res.code == 200) {
this.$message.success("保存成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 新建保存
getYMXZDGLProyAdd(params).then(res => {
if (res.code == 200) {
this.$message.success("新建成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}
});
}else{
let params = {
fieldName: this.formData2.fieldName,
chineseName: this.formData2.chineseName,
displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType,
type: this.formData.type,
typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
}
// 新建保存
getYMXZDGLProyAdd(params).then(res => {
if (res.code == 200) {
this.$message.success("新建成功");
this.add_dialog2 = false;
this.getProyList(this.formData);
}else{
this.add_dialog2 = false;
this.$message.error(res.msg);
}
});
}
});
break;
// 删除
case 'del':
......@@ -670,6 +687,29 @@ export default {
justify-content: flex-start;
align-items: center;
}
.add_dialog_content{
width: 100%;
.form_item_container{
display: flex;
flex-wrap: wrap;
.cross{
width: 50% !important;
/deep/ .el-form-item__label{
width: 25%;
}
/deep/ .el-form-item__content{
width: 65% !important;
.el-select{
width: 100% !important;
}
}
}
.el-form-item{
display: flex;
width: 100%;
}
}
}
.newBtn{
margin-top: 5px;
.addItem{
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!