4699e6b0 by lxs

结果确认界面调整

1 parent 470e3796
...@@ -85,11 +85,12 @@ const sheetItemList = ref([ ...@@ -85,11 +85,12 @@ const sheetItemList = ref([
85 value: 'dbGuid' 85 value: 'dbGuid'
86 }, 86 },
87 clearable: true, 87 clearable: true,
88 filterable: true,
88 }, 89 },
89 { 90 {
90 type: "select", 91 type: "select",
91 label: "", 92 label: "",
92 placeholder: '表中文/英文名', 93 placeholder: '表中文名',
93 field: 'tableGuid', 94 field: 'tableGuid',
94 default: '', 95 default: '',
95 options: [], 96 options: [],
...@@ -98,6 +99,7 @@ const sheetItemList = ref([ ...@@ -98,6 +99,7 @@ const sheetItemList = ref([
98 value: 'dbGuid' 99 value: 'dbGuid'
99 }, 100 },
100 clearable: true, 101 clearable: true,
102 filterable: true,
101 disabled: true 103 disabled: true
102 }, 104 },
103 ]); 105 ]);
...@@ -128,11 +130,12 @@ const fieldItemList = ref([ ...@@ -128,11 +130,12 @@ const fieldItemList = ref([
128 value: 'dbGuid' 130 value: 'dbGuid'
129 }, 131 },
130 clearable: true, 132 clearable: true,
133 filterable: true,
131 }, 134 },
132 { 135 {
133 type: "select", 136 type: "select",
134 label: "", 137 label: "",
135 placeholder: '表中文/英文名', 138 placeholder: '表中文名',
136 field: 'tableGuid', 139 field: 'tableGuid',
137 default: '', 140 default: '',
138 options: [], 141 options: [],
...@@ -141,12 +144,13 @@ const fieldItemList = ref([ ...@@ -141,12 +144,13 @@ const fieldItemList = ref([
141 value: 'dbGuid' 144 value: 'dbGuid'
142 }, 145 },
143 clearable: true, 146 clearable: true,
147 filterable: true,
144 disabled: true 148 disabled: true
145 }, 149 },
146 { 150 {
147 type: "select", 151 type: "select",
148 label: "", 152 label: "",
149 placeholder: '字段中文/英文名', 153 placeholder: '字段中文名',
150 field: 'fieldGuid', 154 field: 'fieldGuid',
151 default: '', 155 default: '',
152 options: [], 156 options: [],
...@@ -155,6 +159,7 @@ const fieldItemList = ref([ ...@@ -155,6 +159,7 @@ const fieldItemList = ref([
155 value: 'dbGuid' 159 value: 'dbGuid'
156 }, 160 },
157 clearable: true, 161 clearable: true,
162 filterable: true,
158 disabled: true 163 disabled: true
159 }, 164 },
160 { 165 {
...@@ -235,7 +240,8 @@ const sheetTableInfo = ref({ ...@@ -235,7 +240,8 @@ const sheetTableInfo = ref({
235 { 240 {
236 label: "表英文名", field: "tableName", width: 200, type: "text_btn", value: 'tab' 241 label: "表英文名", field: "tableName", width: 200, type: "text_btn", value: 'tab'
237 }, 242 },
238 { label: "数据库名", field: "database", width: 120 }, 243 { label: "数据库名", field: "databaseChName", width: 120 },
244 { label: "数据库名称", field: "database", width: 200 },
239 { label: "字段数", field: "fieldNum", width: 96, align: 'right' }, 245 { label: "字段数", field: "fieldNum", width: 96, align: 'right' },
240 { label: "已分类字段数", field: "classifyFieldNum", width: 120, align: 'right' }, 246 { label: "已分类字段数", field: "classifyFieldNum", width: 120, align: 'right' },
241 { label: "已分级字段数", field: "gradeFieldNum", width: 120, align: 'right' }, 247 { label: "已分级字段数", field: "gradeFieldNum", width: 120, align: 'right' },
...@@ -298,7 +304,8 @@ const fieldTableInfo = ref({ ...@@ -298,7 +304,8 @@ const fieldTableInfo = ref({
298 { label: "规则", field: "ruleDetail", width: 200 }, 304 { label: "规则", field: "ruleDetail", width: 200 },
299 { label: "表英文名", field: "tableName", width: 200 }, 305 { label: "表英文名", field: "tableName", width: 200 },
300 { label: "表中文名", field: "tableChName", width: 120 }, 306 { label: "表中文名", field: "tableChName", width: 120 },
301 { label: "数据库名", field: "database", width: 120 }, 307 { label: "数据库名", field: "databaseChName", width: 120 },
308 { label: "数据库名称", field: "database", width: 200 },
302 ], 309 ],
303 loading: false, 310 loading: false,
304 data: [], 311 data: [],
...@@ -785,12 +792,15 @@ const selectChange = (val, item, scope = null) => { ...@@ -785,12 +792,15 @@ const selectChange = (val, item, scope = null) => {
785 } else if (item.field == 'databaseGuid' || item.field == 'tableGuid') { 792 } else if (item.field == 'databaseGuid' || item.field == 'tableGuid') {
786 const params: any = scope; 793 const params: any = scope;
787 if (tabsInfo.value.activeName == 'sheet') { 794 if (tabsInfo.value.activeName == 'sheet') {
788 if (!val) { 795 if (item.field == "databaseGuid") {
789 sheetItemList.value[1].default = ''; 796 if (!val) {
790 sheetItemList.value[1].disabled = true; 797 sheetItemList.value[1].default = '';
791 } else { 798 sheetItemList.value[1].disabled = true;
792 sheetItemList.value[1].disabled = false; 799 } else {
800 sheetItemList.value[1].disabled = false;
801 }
793 } 802 }
803
794 item.field == "databaseGuid" && (params.tableGuid = ''); 804 item.field == "databaseGuid" && (params.tableGuid = '');
795 if (val && item.field != "tableGuid") { 805 if (val && item.field != "tableGuid") {
796 const params = { 806 const params = {
...@@ -913,7 +923,7 @@ onMounted(() => { ...@@ -913,7 +923,7 @@ onMounted(() => {
913 </div> 923 </div>
914 <div class="desc_item"> 924 <div class="desc_item">
915 <span class="desc_label">执行时间:</span> 925 <span class="desc_label">执行时间:</span>
916 <span class="desc_value">{{ taskDetail.updateTime || '--' }}</span> 926 <span class="desc_value">{{ taskDetail.execTime || '--' }}</span>
917 </div> 927 </div>
918 </div> 928 </div>
919 <div class="desc_group"> 929 <div class="desc_group">
...@@ -967,20 +977,20 @@ onMounted(() => { ...@@ -967,20 +977,20 @@ onMounted(() => {
967 <div class="table_tool_wrap" ref="tableToolRef"> 977 <div class="table_tool_wrap" ref="tableToolRef">
968 <TableTools ref="fieldSearchRef" :searchItems="fieldItemList" :searchId="'field-search'" :init="false" 978 <TableTools ref="fieldSearchRef" :searchItems="fieldItemList" :searchId="'field-search'" :init="false"
969 @selectChange="selectChange" @cascaderChange="cascaderChange" @search="searchField" /> 979 @selectChange="selectChange" @cascaderChange="cascaderChange" @search="searchField" />
970 <div class="tools_btns"> 980 <div class="tools_btns" v-if="showBtns">
971 <div class="btns" v-if="showBtns" > 981 <div class="btns">
972 <el-button type="primary" plain @click="btnClick({ value: 'batch' })">批量变更分类分级</el-button> 982 <el-button type="primary" plain @click="btnClick({ value: 'batch' })">批量变更分类分级</el-button>
973 <el-button type="primary" plain @click="btnClick({ value: 'status' })">批量确认</el-button> 983 <el-button type="primary" plain @click="btnClick({ value: 'status' })">批量确认</el-button>
974 <!-- <el-button plain @click="btnClick({ value: 'export' })">导出</el-button> --> 984 <!-- <el-button plain @click="btnClick({ value: 'export' })">导出</el-button> -->
975 </div> 985 </div>
976 <!-- <div class="checkboxs"> 986 <div class="checkboxs">
977 <el-checkbox v-model="checked1" @change="getFieldTableData()">仅看多分类</el-checkbox> 987 <el-checkbox v-model="checked1" @change="getFieldTableData()">仅看多分类</el-checkbox>
978 <el-tooltip effect="light" placement="top" content="一个字段只能有一个分类,多分类的字段需要人工确定分类"> 988 <el-tooltip effect="light" placement="top" content="一个字段只能有一个分类,多分类的字段需要人工确定分类">
979 <el-icon style="margin-left: 8px;"> 989 <el-icon style="margin-left: 8px;">
980 <svg-icon name="icon-tip" /> 990 <svg-icon name="icon-tip" />
981 </el-icon> 991 </el-icon>
982 </el-tooltip> 992 </el-tooltip>
983 </div> --> 993 </div>
984 </div> 994 </div>
985 </div> 995 </div>
986 <div class="table_panel_wrap panel" :style="{ height: 'calc(100% - ' + toolH + 'px)' }"> 996 <div class="table_panel_wrap panel" :style="{ height: 'calc(100% - ' + toolH + 'px)' }">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!