Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 0a118f14 by 史敦盼
Options

Merge branch 'sdp-v1'

2 parents f5949104 10e735dc
Inline Side-by-side
Showing with 36 additions and 22 deletions
public/drawio/extention/js/exFormat.js
......@@ -135,10 +135,10 @@ const addListPanel = function(that, originAttr, attrName_, attrValue_, controlTy
//属性名--------------------------------------------------------------------
const item_left_container = document.createElement('div');
item_left_container.style.cssText = 'display: flex;justify-content: center;width: 30%;';
item_left_container.style.cssText = 'display: flex;width: 100%;';
const item_left_span = document.createElement('span');
item_left_span.innerHTML = attrName_ + ': ';
item_left_span.innerHTML = attrName_;// + ': ';
// const item_left_input = document.createElement('input');
// item_left_input.type = "text";
......@@ -162,17 +162,17 @@ const addListPanel = function(that, originAttr, attrName_, attrValue_, controlTy
// const item_right_span = document.createElement('span');
// item_right_span.innerHTML = '属性值: ';
const item_right_input = document.createElement('input');
item_right_input.type = "text";
item_right_input.value = attrValue_;
item_right_input.readOnly = true;
item_right_input.style.cssText = 'width: 100%;';
item_right_input.className = 'attrValue';
item_right_input.oninput = function (e) {
const res = originAttr.find(item => item.name == attrName_);
res.value = e.data;
}
item_right_container.appendChild(item_right_input);
// const item_right_input = document.createElement('input');
// item_right_input.type = "text";
// item_right_input.value = attrValue_;
// item_right_input.readOnly = true;
// item_right_input.style.cssText = 'width: 100%;';
// item_right_input.className = 'attrValue';
// item_right_input.oninput = function (e) {
// const res = originAttr.find(item => item.name == attrName_);
// res.value = e.data;
// }
// item_right_container.appendChild(item_right_input);
// switch(controlType){
......
public/drawio/extention/js/exGraph.js
......@@ -71,10 +71,10 @@
// if(item2.assets && item2.dicys) {
let attr_ = [];
item2.dicys && item2.dicys.forEach(res => {
if(res.fieldName) {
if(res.cnName) {
attr_.push(
{
name: res.fieldName,
name: res.cnName,
value: res.propertyValue,
id: res.propertyId,
controlType: res.controlType,
......@@ -85,7 +85,7 @@
fns.push(
this.createVertexTemplateEntry(
// 'html=1;outlineConnect=0;whiteSpace=wrap;fillColor=#d2edfd;shape=mxgraph.archimate3.application;appType=rightTopCircleHasLeft;archiType=rounded',
item2.iconName + ';attr=' + JSON.stringify(attr_),
item2.iconName + ';attr=' + JSON.stringify(attr_) + ';fillColor=' + item2.color + ';',
item2.shapeWidth ? item2.shapeWidth : 71,
item2.shapeHeight ? item2.shapeHeight : 41,
null,
......@@ -127,10 +127,10 @@
let fns = [];
let attr_ = [];
item2.dicys && item2.dicys.forEach(res => {
if(res.fieldName) {
if(res.cnName) {
attr_.push(
{
name: res.fieldName,
name: res.cnName,
value: res.propertyValue,
id: res.propertyId,
controlType: res.controlType,
......@@ -144,7 +144,7 @@
fns.push(
this.createVertexTemplateEntry(
// 'html=1;outlineConnect=0;whiteSpace=wrap;fillColor=#99ffff;shape=mxgraph.archimate3.application;appType=rightTopTriangle;archiType=rounded',
item3.iconName + ';fillColor=' + item2.color + ';' + 'attr=' + JSON.stringify(attr_) + ';assetId=' + item3.assetId + ';archiBelongId=' + item3.archiBelongId + ';assetName=[' + item3.assetName + '];eleName=' + item2.eleName +';elementId=' + item2.elementId + ';eaLevel=' + item2.eaLevel + ';',
item3.iconName + ';fillColor=' + item3.color + ';' + 'attr=' + JSON.stringify(attr_) + ';assetId=' + item3.assetId + ';archiBelongId=' + item3.archiBelongId + ';assetName=[' + item3.assetName + '];eleName=' + item2.eleName +';elementId=' + item2.elementId + ';eaLevel=' + item2.eaLevel + ';',
item2.shapeWidth ? item2.shapeWidth : 150,
item2.shapeHeight ? item2.shapeHeight : 75,
null,
......
src/views/systemInfoManage/SystemInfoDetail.vue
......@@ -4,7 +4,7 @@
* @Autor: pan
* @Date: 2024-03-29 11:44:57
* @LastEditors: pan
* @LastEditTime: 2024-04-01 15:34:42
* @LastEditTime: 2024-04-17 16:12:21
-->
<template>
<div>
......@@ -66,7 +66,14 @@
<el-row class="m-t-20">
<el-col :span="6" class="flex">
<div class="label">承建单位</div>
<div class="value">{{ systemInfoDetail.buildOrg }}</div>
<div class="value">
{{
codeToName(
systemInfoDetail.buildOrg,
'sysBuildOrgOptions',
)
}}
</div>
</el-col>
<el-col :span="6" class="flex">
<div class="label">项目经理</div>
......@@ -156,6 +163,10 @@ export default {
type: Array,
default: () => [],
},
sysBuildOrgOptions: {
type: Array,
default: () => [],
},
},
data() {
return {
......@@ -181,6 +192,7 @@ export default {
mounted() {},
methods: {
codeToName(code, options) {
console.log(code, options)
const obj = this[options]?.find((v) => v.value == code) || {}
return obj.label
},
......
src/views/systemInfoManage/index.vue
......@@ -162,6 +162,7 @@
prop="buildOrg"
label="承建单位"
align="center"
show-overflow-tooltip
:formatter="
(row, column, cellValue, index) =>
formatterDept(row, column, cellValue, index, 'sysBuildOrgOptions')
......@@ -291,7 +292,7 @@
v-model="ruleForm.let5"
maxlength="100"
></el-input> -->
<el-select v-model="ruleForm.let5" placeholder="请选择">
<el-select v-model="ruleForm.let5" filterable placeholder="请选择">
<el-option
v-for="item in sysBuildOrgOptions"
:key="item.value"
......@@ -321,6 +322,7 @@
:sysOrgOptions="sysOrgOptions"
:sysDeptOptions="sysDeptOptions"
:buildTypeOptins="jianSheLeiXingSelect"
:sysBuildOrgOptions="sysBuildOrgOptions"
:row-data="rowData"
:visible.sync="appDetailVisible"
/>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!