From 4cf67af090dbed353f1ddf3bd3ba5e0f854c0020 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 28 十一月 2024 12:09:05 +0800
Subject: [PATCH] 业务类型、状态池添加图标，数据授权页面
---
Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue | 416 ++++++++++++++++++++++++++++++++++++++++++++-
Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue | 17 +
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue | 8
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue | 31 ++
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | 25 +-
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue | 12
Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue | 4
7 files changed, 460 insertions(+), 53 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue
index b2eb1c6..d12fd89 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/dataView.vue
@@ -1,27 +1,110 @@
<template>
- <div style="padding: 10px 0">
- <el-tabs tab-position="left" :style="'height: '+height+';'">
- <el-tab-pane label="涓讳綋">
- <fieldset>
- <legend> 涓婚 </legend>
- <div>
- <div v-if="!readOnly">
- <el-button plain size="mini" type="primary" @click="userHandler">閫変腑鐢ㄦ埛</el-button>
- <el-button plain size="mini" type="primary" @click="roleHandler">閫夋嫨瑙掕壊</el-button>
- <el-button plain size="mini" type="primary" @click="deptHandler">閫夋嫨鐢ㄦ埛缁�</el-button>
+ <div>
+ <el-tabs tab-position="left" :style="'height: '+height+'px;'">
+ <el-tab-pane>
+ <span slot="label"><i class="el-icon-s-custom"></i> 涓讳綋</span>
+ <div v-if="!readOnly" style="margin-bottom: 10px;">
+ <el-button plain size="mini" type="primary" @click="userHandler">閫変腑鐢ㄦ埛</el-button>
+ <el-button plain size="mini" type="primary" @click="roleHandler">閫夋嫨瑙掕壊</el-button>
+ <el-button plain size="mini" type="primary" @click="deptHandler">閫夋嫨鐢ㄦ埛缁�</el-button>
+ </div>
+ <div v-if="!readOnly" style="display: flex;justify-content: space-between;align-items: center;">
+ <fieldset style="width: 48%">
+ <legend> 涓讳綋 </legend>
+ <div>
+ <avue-crud ref="mainCrud" :data="mainData" :option="mainOption">
+ <template #type="{ row }">
+ <el-tag v-if="row.type=='鐢ㄦ埛'" :key="row.oid" effect="dark">{{ row.type }}</el-tag>
+ <el-tag v-else-if="row.type=='瑙掕壊'" type="info" :key="row.oid" effect="dark">{{ row.type }}</el-tag>
+ <el-tag v-else="row.type=='閮ㄩ棬'" type="warning" :key="row.oid" effect="dark">{{ row.type }}</el-tag>
+ </template>
+ </avue-crud>
</div>
+ </fieldset>
+ <div style="text-align: center;">
+ <el-button icon="el-icon-arrow-right" size="mini" @click="rightHandler" style="margin-bottom: 50px;"></el-button><br/>
+ <el-button icon="el-icon-arrow-left" size="mini" @click="leftHandler"></el-button>
</div>
- </fieldset>
+ <fieldset style="width: 42%">
+ <legend> 鎺堟潈涓讳綋 </legend>
+ <div>
+ <avue-crud ref="authCrud" :data="authData" :option="authOption" :table-loading="tableLoading">
+ </avue-crud>
+ </div>
+ </fieldset>
+ </div>
+ <div v-else>
+ <fieldset style="width: 99.5%">
+ <legend> 鎺堟潈涓讳綋 </legend>
+ <div>
+ <avue-crud ref="authCrud" :data="authData" :option="authOption" :table-loading="tableLoading">
+ </avue-crud>
+ </div>
+ </fieldset>
+ </div>
</el-tab-pane>
- <el-tab-pane label="瀹綋">瀹綋</el-tab-pane>
- <el-tab-pane label="鎿嶄綔">鎿嶄綔</el-tab-pane>
+ <el-tab-pane>
+ <span slot="label"><i class="el-icon-eleme"></i> 瀹綋</span>
+ <div>
+ <basic-form key="queryForm" style="margin-bottom: 0"
+ ref="form"
+ :span="8"
+ :formItems="formItems"
+ :formData="form"
+ @getFormData="getFormData">
+ </basic-form>
+ <el-container v-if="!readOnly">
+ <el-aside style="width:350px">
+ <fieldset>
+ <legend> 鍊欓�夋潯浠� </legend>
+ <div>
+ <avue-radio v-model="radioForm" :dic="radioDic" style="margin: 0 10px 5px"></avue-radio>
+ <div v-show="radioForm==1">
+ 鏌ヨ妯℃澘瀹氫箟
+ <avue-select @change="linkQueryDefineChange" class="el-input--small" v-model="linkQueryDefineForm" placeholder="璇烽�夋嫨鍐呭" type="tree" :dic="linkQueryDefineDic" style="width:245px"></avue-select>
+ <avue-tree :style="'width:335px;height: '+(height-155)+'px;'" :data="linkTreeData" :option="treeOption" @node-drag-start="handleDragStart" @node-drag-end="handleDragEnd">
+ </avue-tree>
+ </div>
+ <div v-show="radioForm==0">
+ 鏌ヨ妯℃澘瀹氫箟
+ <avue-select @change="businessQueryDefineChange" class="el-input--small" v-model="businessQueryDefineForm" placeholder="璇烽�夋嫨鍐呭" type="tree" :dic="businessQueryDefineDic" style="width: 245px;"></avue-select>
+ <avue-tree :style="'width:335px;height: '+(height-155)+'px;'" :data="businessTreeData" :option="treeOption" @node-drag-start="handleDragStart" @node-drag-end="handleDragEnd">
+ </avue-tree>
+ </div>
+ </div>
+ </fieldset>
+ </el-aside>
+ <el-main>
+ <fieldset style="margin: 0 10px">
+ <legend> 鏌ヨ鏉′欢 </legend>
+ <form-query-dialog ref="formQuery"
+ :style="'height: '+(height-100)+'px;'"
+ :queryCondition="queryCondition"
+ :queryTree="queryTree"
+ :levelFlag.sync="form.levelFlag"
+ @queryHandler="queryHandler"
+ ></form-query-dialog>
+ </fieldset>
+ </el-main>
+ </el-container>
+ </div>
+ </el-tab-pane>
+ <el-tab-pane>
+ <span slot="label"><i class="el-icon-s-tools"></i> 鎿嶄綔</span>
+ </el-tab-pane>
</el-tabs>
</div>
</template>
<script>
+import basicOption from "@/util/basic-option";
+import formQueryDialog from "@/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue";
+import {queryTemplateListByAttr} from "@/api/queryTemplate/queryDefine";
+import {getCriteria} from "@/api/queryTemplate/linkTypeQuery";
+
export default {
name: "dataView",
+ components:{formQueryDialog},
props: {
//閫変腑鐨勪笟鍔＄被鍨嬭妭鐐�
btmNode: {
@@ -38,26 +121,325 @@
default: false
},
height: {
- type: String,
- default: '400px'
+ type: Number,
+ default: 400
},
},
data() {
return {
+ mainData:[],
+ tableLoading: false,
+ mainOption: {
+ ...basicOption,
+ header:false,
+ addBtn: false,
+ editBtn: false,
+ delBtn: false,
+ selection: false,
+ index:false,
+ menu:false,
+ height: this.height-80,
+ tip:false,
+ size:'mini',
+ column: [{
+ label: ' 鍒嗙被',
+ prop: 'type',
+ sortable: true,
+ width:110
+ },{
+ label: '缂栫爜',
+ prop: 'id'
+ },{
+ label: '鍚嶇О',
+ prop: 'name'
+ }]
+ },
+ authData:[],
+ authOption:{
+ ...basicOption,
+ header:false,
+ addBtn: false,
+ editBtn: false,
+ delBtn: false,
+ selection: false,
+ index:false,
+ menu:false,
+ height: this.readOnly?this.height-50:this.height-80,
+ tip:false,
+ showHeader:false,
+ size:'mini',
+ column: [{
+ label: '鍚嶇О',
+ prop: 'name'
+ }]
+ },
+ formItems:[{
+ label: '瑙勫垯鍚嶇О',
+ prop: 'qtName',
+ type: 'input',
+ span:8,
+ labelWidth: 100,
+ disabled:this.readOnly,
+ rules: [{
+ required: true,
+ message: "璇疯緭鍏ヨ鍒欏悕绉�",
+ trigger: "blur"
+ }]
+ }, {
+ label: '瑙勫垯绫诲瀷',
+ prop: 'version',
+ type: 'select',
+ span:6,
+ labelWidth:110,
+ disabled:this.readOnly,
+ dicData: [{
+ label: '鍏ㄩ儴鍏佽',
+ value: 1
+ }, {
+ label: '鍏佽鏉冮檺',
+ value: 2
+ }, {
+ label: '鍏ㄩ儴鎷掔粷',
+ value: 3
+ }, {
+ label: '鎷掔粷鏉冮檺',
+ value: 7
+ }],
+ value: 1
+ }],
+ form:{
+ btmName:'',
+ qtName: '',
+ levelFlag:0,//0:鏅�氭煡璇㈡ā鏉�; 1:楂樼骇鏌ヨ妯℃澘"
+ queryTemplate:{}
+ },
+ radioForm:0,
+ radioDic:[{
+ label:'涓氬姟绫诲瀷 ',
+ value:0
+ },{
+ label:'閾炬帴绫诲瀷',
+ value:1
+ }],
+ treeOption: {
+ defaultExpandAll: true,
+ menu: false,
+ addBtn: false,
+ filter: false,
+ draggable: true,
+ allowDrop: () => {
+ return false;
+ },
+ allowDrag: (dropNode) => {
+ if (dropNode.data.attrs && dropNode.data.attrs.length > 0) {
+ return false;
+ } else {
+ return true;
+ }
+ },
+ props: {
+ label: 'name',
+ value: 'name',
+ children: 'attrs'
+ }
+ },
+ linkQueryDefineForm:'',//閾炬帴绫诲瀷鏌ヨ妯℃澘瀹氫箟閫変腑鍊�
+ linkQueryDefineDic:[],//閾炬帴绫诲瀷鏌ヨ妯℃澘瀹氫箟涓嬫媺鏁版嵁
+ //閾炬帴绫诲瀷鏌ヨ妯℃澘瀹氫箟閫変腑椤瑰睘鎬�
+ linkTreeData: [],
+ businessQueryDefineForm:'',//涓氬姟绫诲瀷鏌ヨ妯℃澘瀹氫箟閫変腑鍊�
+ businessQueryDefineDic:[],//涓氬姟绫诲瀷鏌ヨ妯℃澘瀹氫箟涓嬫媺鏁版嵁
+ //涓氬姟绫诲瀷鏌ヨ妯℃澘瀹氫箟閫変腑椤瑰睘鎬�
+ businessTreeData: [],
+ //楂樼骇鏌ヨ鏉′欢
+ queryTree:{},
+ //鏅�氭煡璇㈡潯浠�
+ queryCondition:[],
}
},
created() {
+
+ },
+ watch: {
+ data:{
+ handler(val) {
+ if(val && val.oid){
+ this.getTemp(true);
+ this.getTemp(false)
+ }
+ },
+ immediate: true,
+ deep: true
+ }
},
methods: {
+ //閫変腑鐢ㄦ埛
+ userHandler(){
+ },
+ //閫夋嫨瑙掕壊
+ roleHandler(){
+
+ },
+ //閫夋嫨鐢ㄦ埛缁�
+ deptHandler(){
+
+ },
+ initFormData() {
+ let formData = {
+ btmName: this.form.btmName,
+ qtName: this.form.qtName,
+ levelFlag: this.form.levelFlag,
+ queryTemplate: {
+ btmType: this.form.btmType,
+ clauseList: ['*'],
+ direction: this.form.direction,
+ id: this.form.qtName,
+ level: this.form.level,
+ linkType: this.form.btmName,
+ orderInfoList: this.orderInfoList,
+ queryISLeaf: this.form.queryISLeaf,
+ recReturnMode: 1,//閫掑綊杩斿洖鏁版嵁妯″紡:1锛歊ECRETURNMODE_FLAT, 2锛歊ECRETURNMODE_FILTER
+ rightFlag: true,
+ secretFlag: true,
+ type: 'link',
+ version: this.form.version
+ }
+ }
+ if (formData.levelFlag == 1) {
+ //楂樼骇
+ let that = this;
+ function initValue(nodeChild) {
+ let children = [];
+ if (nodeChild) {
+ nodeChild.forEach((item, index) => {
+ if (item.label != '骞朵笖' && item.label != '鎴栬��') {
+ children.push(item.label);
+ } else {
+ children.push({
+ connector: item.label,
+ child: initValue(item.children)
+ })
+ }
+ })
+ }
+ return children;
+ }
+
+ let treeData = {
+ connector: this.$refs.formQuery.treeData[0].label
+ };
+ if (this.$refs.formQuery.treeData[0].children) {
+ treeData.child = initValue(this.$refs.formQuery.treeData[0].children);
+ }
+ formData.tree = treeData
+ }
+
+ formData.condition = this.$refs.formQuery.conditionList;
+
+ return formData;
+ },
+ getFormData(form) {
+ this.form = form;
+ },
+ //鑾峰彇鏌ヨ妯℃澘瀹氫箟涓嬫媺
+ getTemp(linkFlag) {
+ if (this.btmNode.attributes) {
+ queryTemplateListByAttr({btmName: this.btmNode.attributes.name, linkFlag: linkFlag,direction:linkFlag?null:this.form.direction}).then(res => {
+ const data = res.data.data.map(item => {
+ item.label = item.name + '-' + (item.linkTypeName || item.btmName);
+ item.value = item.name;
+ return item;
+ });
+ if(linkFlag){
+ this.linkQueryDefineDic=data
+ data.length>0 && (this.linkQueryDefineForm=data[0].value);
+ }else {
+ this.businessQueryDefineDic=data;
+ data.length>0 && (this.businessQueryDefineForm= data[0].value);
+ }
+ })
+ }
+ },
+ //閾炬帴绫诲瀷鏌ヨ妯℃澘鍒囨崲
+ linkQueryDefineChange(data) {
+ if (data.value) {
+ this.linkTreeData = [{
+ name: data.value,
+ attrs: data.item.attrs
+ }]
+ }
+ },
+ //涓氬姟绫诲瀷鏌ヨ妯℃澘鍒囨崲
+ businessQueryDefineChange(data) {
+ if (data.value) {
+ this.businessTreeData = [{
+ name: data.value,
+ attrs: data.item.attrs
+ }]
+ }
+ },
+ // 寮�濮嬫嫋鎷芥爲鑺傜偣浜嬩欢
+ handleDragStart(node, ev) {
+ // 浣跨敤 setData 鏂规硶璁剧疆鏁版嵁
+ ev.dataTransfer.setData('item', JSON.stringify(node.data));
+ if(this.form.levelFlag==1){
+ this.$refs.formQuery.$refs.tree.$emit('tree-node-drag-start', ev,{node:this.$refs.formQuery.initItem(node)});
+ }
+ },
+ handleDragEnd(draggingNode,endNode,position,ev){
+ if(this.form.levelFlag==1) {
+ this.$refs.formQuery.$refs.tree.$emit('tree-node-drag-end', ev);
+ }
+ },
+ //鏌ヨ
+ queryHandler(){
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ this.$refs.formQuery.queryResultDialog.loading=true;
+ const formData=this.initFormData();
+ getCriteria(formData).then(res => {
+ if (res.data.success) {
+ const data = res.data.data;
+ const result = data.map(item => {
+ const filteredAttrs = item.hisAttrValList.filter(attr =>
+ attr.attrName === "OID" || attr.attrName === "CREATOR" || attr.attrName === "CREATETIME"
+ );
+
+ const newObj = filteredAttrs.reduce((acc, attr) => {
+ acc[attr.attrName] = attr.attrVal;
+ return acc;
+ }, {});
+
+ return newObj;
+ });
+
+ this.$refs.formQuery.resultData = result;
+ this.$refs.formQuery.queryResultDialog.showDialog = true;
+ this.$refs.formQuery.queryResultDialog.loading = false;
+ }
+ });
+ } else {
+ return false;
+ }
+ });
+ },
}
}
</script>
-<style scoped>
+<style lang="scss" scoped>
+::v-deep {
+ .el-radio {
+ margin-right: 30px;
+ }
+}
+div{
+ font-size: 14px;
+}
fieldset {
padding: 10px 6px;
- margin: 10px 0 0 0;
+ margin: 0;
border: 1px solid #EBEEF5;
}
</style>
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
index 1412b4f..9334a69 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
@@ -19,7 +19,7 @@
</el-aside>
<el-main>
- <basic-container>
+ <basic-container cardBodyStyle="padding-bottom:0;">
<avue-crud
ref="crud"
:data="data"
@@ -34,8 +34,8 @@
<el-button icon="el-icon-view" plain size="small" type="primary" @click="chekView">鏌ョ湅鎺堟潈缁撴灉</el-button>
</template>
</avue-crud>
- <div>
- <data-view key="dataView" :btmNode="nodeRow" :data="viewData" :readOnly="true" height="400px"></data-view>
+ <div style="margin-top: 15px;">
+ <data-view key="dataView" :btmNode="nodeRow" :data="viewData" :readOnly="true" :height="clientHeight-260-220"></data-view>
</div>
<!-- 鏂板 && 缂栬緫 -->
<el-dialog
@@ -44,10 +44,10 @@
:visible.sync="visible"
append-to-body="true"
class="avue-dialog"
- width="75%"
+ width="70%"
@close="addDialogClose">
<div>
- <data-view key="editView" :btmNode="nodeRow" :data="viewData" :readOnly="false" height="60vh"></data-view>
+ <data-view key="editView" :btmNode="nodeRow" :data="viewData" :readOnly="false" :height="clientHeight-340"></data-view>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" type="primary" @click="addDialogSavaHandler">纭� 瀹�</el-button>
@@ -93,6 +93,7 @@
components:{dataView},
data:function (){
return{
+ clientHeight:Math.max(document.body.clientHeight,700),
treeOption: {
height: 'auto',
defaultExpandAll: true,
@@ -110,7 +111,7 @@
selectList: [],
option: {
...basicOption,
- height:260,
+ height:280,
addBtn: false,
editBtn: false,
delBtn: false,
@@ -194,7 +195,9 @@
},
//鑾峰彇涓嬫柟鏁版嵁
getViewData(row){
- this.viewData={};
+ this.viewData={
+ oid:row.plOId
+ };
},
// 鏌ョ湅鎺堟潈缁撴灉
chekView() {
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
index 92d564f..b041053 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
@@ -55,11 +55,11 @@
<template slot="label">
鍥炬爣
</template>
- <span class="avue-icon avue-icon--small">
- <svg v-if="nodeRow.icon && nodeRow.icon.indexOf('#')==-1" aria-hidden="true">
- <use :xlink:href="nodeRow.icon"></use>
+ <span class="avue-icon avue-icon--small" style="display: block">
+ <svg v-if="nodeRow.imageName && nodeRow.imageName.indexOf('#')==0" aria-hidden="true">
+ <use :xlink:href="nodeRow.imageName"></use>
</svg>
- <i v-else :class="nodeRow.icon"></i>
+ <i v-else :class="nodeRow.imageName"></i>
</span>
</el-descriptions-item>
<el-descriptions-item :span="12" :contentStyle="descriptionOption.contentStyle"
@@ -182,28 +182,28 @@
</el-form-item>
<el-row :span="24">
<el-col :span="12">
- <el-form-item label="鏍囩锛�">
+ <el-form-item label="鏍囩锛�" prop="name">
<el-input v-model="form.name"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鍥炬爣锛�">
- <avue-input-icon v-model="form.icon" :icon-list="iconList" placeholder="璇烽�夋嫨鍥炬爣">
+ <el-form-item label="鍥炬爣锛�" prop="imageName">
+ <avue-input-icon v-model="form.imageName" :icon-list="iconList" placeholder="璇烽�夋嫨鍥炬爣">
</avue-input-icon>
</el-form-item>
</el-col>
</el-row>
- <el-form-item label="缁ф壙鑷細">
+ <el-form-item label="缁ф壙鑷細" prop="fName">
<avue-input-tree :disabled="title === 'add'"
v-model="form.fName"
placeholder="璇烽�夋嫨涓氬姟绫诲瀷"
:props="{label: 'id', value: 'id',children: 'children'}"
:dic="inheritTreeData"></avue-input-tree>
</el-form-item>
- <el-form-item label="瀹炵幇绫伙細">
+ <el-form-item label="瀹炵幇绫伙細" prop="implClass">
<el-input v-model="form.implClass"></el-input>
</el-form-item>
- <el-form-item label="鎻忚堪">
+ <el-form-item label="鎻忚堪" prop="description">
<el-input v-model="form.description" :rows="2" type="textarea"></el-input>
</el-form-item>
</div>
@@ -247,7 +247,7 @@
:props="{label: 'id', value: 'id'}"
:dic="lifeData"></avue-select>
</el-form-item>
- <el-form-item label="澶囬�夌敓鍛藉懆鏈熷垪琛細" label-width="138px">
+ <el-form-item label="澶囬�夌敓鍛藉懆鏈熷垪琛細" label-width="138px" prop="subLifeCycleIdList">
<avue-select multiple
:filterable="true"
v-model="form.subLifeCycleIdList"
@@ -651,6 +651,9 @@
{required: true, message: '璇疯緭绫诲瀷鍚嶇О', trigger: 'blur'},
{validator: this.validateEnglishOnly, trigger: 'blur'}
],
+ imageName:[
+ {required: true, message: '璇烽�夋嫨鍥炬爣', trigger: 'blur'},
+ ],
revLevel: [
{required: true, message: '璇烽�夋嫨鐗堟湰瑙勫垯', trigger: 'blur'},
],
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
index e890aff..40ce6de 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/statusPool/index.vue
@@ -33,11 +33,11 @@
</template>
<template #icon="{ row }">
- <span class="avue-icon avue-icon--small">
- <svg v-if="row.icon && row.icon.indexOf('#')==-1" aria-hidden="true">
- <use :xlink:href="row.icon"></use>
+ <span class="avue-icon avue-icon--small" style="display: block">
+ <svg v-if="row.imagePath && row.imagePath.indexOf('#')==0" aria-hidden="true">
+ <use :xlink:href="row.imagePath"></use>
</svg>
- <i v-else :class="row.icon"></i>
+ <i v-else :class="row.imagePath"></i>
</span>
</template>
</avue-crud>
@@ -65,8 +65,8 @@
</el-form-item>
</el-col>
<el-col :span="24">
- <el-form-item label="鍥炬爣锛�" prop="icon">
- <avue-input-icon v-model="form.icon" :icon-list="iconList" placeholder="璇烽�夋嫨鍥炬爣">
+ <el-form-item label="鍥炬爣锛�" prop="imagePath">
+ <avue-input-icon v-model="form.imagePath" :icon-list="iconList" placeholder="璇烽�夋嫨鍥炬爣">
</avue-input-icon>
</el-form-item>
</el-col>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
index 3533948..3056f86 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/businessTypeQuery/formDialog.vue
@@ -47,9 +47,9 @@
<div>
鏌ヨ妯℃澘瀹氫箟
<avue-select v-model="businessQueryDefineForm" :dic="businessQueryDefineDic" class="el-input--small"
- placeholder="璇烽�夋嫨鍐呭" style="width: 240px;" type="tree"
+ placeholder="璇烽�夋嫨鍐呭" style="width: 245px;" type="tree"
@change="businessQueryDefineChange"></avue-select>
- <avue-tree :data="businessTreeData" :option="treeOption" style="height: 265px"
+ <avue-tree :data="businessTreeData" :option="treeOption" style="width:335px;height: 268px"
@node-drag-start="handleDragStart" @node-drag-end="handleDragEnd">
</avue-tree>
</div>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
index 8c35f7c..4147ca2 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formDialog.vue
@@ -46,8 +46,8 @@
<legend> 閾炬帴绫诲瀷鍊欓�夋潯浠� </legend>
<div>
鏌ヨ妯℃澘瀹氫箟
- <avue-select @change="linkQueryDefineChange" class="el-input--small" v-model="linkQueryDefineForm" placeholder="璇烽�夋嫨鍐呭" type="tree" :dic="linkQueryDefineDic" style="width:240px"></avue-select>
- <avue-tree style="height: 265px" :data="linkTreeData" :option="treeOption" @node-drag-start="handleDragStart" @node-drag-end="handleDragEnd">
+ <avue-select @change="linkQueryDefineChange" class="el-input--small" v-model="linkQueryDefineForm" placeholder="璇烽�夋嫨鍐呭" type="tree" :dic="linkQueryDefineDic" style="width:245px"></avue-select>
+ <avue-tree style="width:335px;height: 268px" :data="linkTreeData" :option="treeOption" @node-drag-start="handleDragStart" @node-drag-end="handleDragEnd">
</avue-tree>
</div>
</fieldset>
@@ -70,8 +70,8 @@
<legend> 涓氬姟绫诲瀷鍊欓�夋潯浠� </legend>
<div>
鏌ヨ妯℃澘瀹氫箟
- <avue-select @change="businessQueryDefineChange" class="el-input--small" v-model="businessQueryDefineForm" placeholder="璇烽�夋嫨鍐呭" type="tree" :dic="businessQueryDefineDic" style="width: 240px;"></avue-select>
- <avue-tree style="height: 265px" :data="businessTreeData" :option="treeOption" @node-drag-start="handleDragStart" @node-drag-end="handleDragEnd">
+ <avue-select @change="businessQueryDefineChange" class="el-input--small" v-model="businessQueryDefineForm" placeholder="璇烽�夋嫨鍐呭" type="tree" :dic="businessQueryDefineDic" style="width: 245px;"></avue-select>
+ <avue-tree style="width:335px;height: 268px" :data="businessTreeData" :option="treeOption" @node-drag-start="handleDragStart" @node-drag-end="handleDragEnd">
</avue-tree>
</div>
</fieldset>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
index bfe46ab..137fb73 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/queryTemplate/linkTypeQuery/formQueryDialog.vue
@@ -6,7 +6,7 @@
<el-button v-if="!readOnly" plain size="mini" type="primary" @click="clearValue">娓呯┖鍊�</el-button>
<el-button v-if="!readOnly" plain size="mini" type="primary" @click="delAll">鍒犻櫎鍏ㄩ儴鏉′欢</el-button>
</div>
- <div v-if="radioForm==0" style="height: 220px;text-align: center;" @drop="drop" @dragover.prevent>
+ <div v-if="radioForm==0" style="height: calc(100% - 75px);text-align: center;" @drop="drop" @dragover.prevent>
<div v-for="(condition,index) in conditionList" :key="index" class="el-input--small"
style="margin-bottom: 5px; text-align:left">
<span :title="condition.clause"
@@ -179,7 +179,20 @@
},
searchColumn: {
type: Array,
- default: []
+ default: [
+ {
+ label: 'OID',
+ prop: 'OID',
+ },
+ {
+ label: 'CREATOR',
+ prop: 'CREATOR'
+ },
+ {
+ label: 'CREATETIME',
+ prop: 'CREATETIME'
+ },
+ ]
},
},
data() {
@@ -759,9 +772,15 @@
}
</script>
-<style scoped>
-::v-deep .el-input--small .el-input__inner {
- height: 28px;
- line-height: 28px;
+<style lang="scss" scoped>
+::v-deep {
+ .el-input--small .el-input__inner {
+ height: 28px;
+ line-height: 28px;
+ }
+
+ .el-radio {
+ margin-right: 30px;
+ }
}
</style>
--
Gitblit v1.9.3