字段元

src/api/emport/DataField.js

-import request from "@/utils/request";
+import request from '@/utils/request'
 
 const prefix = '/data/field'
 
@@ -67,3 +67,68 @@ export function resetField(excelId){
         params:{excelId}
     })
 }
+
+
+/**
+ * 元字段查询
+ * @param params
+ * @returns {*}
+ */
+export function queryMetaField(params) {
+    return request({
+        url: `${prefix}/meta`,
+        method: 'get',
+        params
+    })
+}
+
+/**
+ * 新增字段
+ * @param data
+ * @returns {*}
+ */
+export function addMetaField(data) {
+    return request({
+        url: `${prefix}/meta`,
+        method: 'post',
+        data
+    })
+}
+
+/**
+ * 修改字段
+ * @param data
+ * @returns {*}
+ */
+export function updateMetaField(data) {
+    return request({
+        url: `${prefix}/meta/update`,
+        method: 'post',
+        data
+    })
+}
+
+
+/**
+ * 删除字段
+ * @param fieldId
+ * @returns {*}
+ */
+export function deleteMetaField(fieldId) {
+    return request({
+        url: `${prefix}/meta/delete`,
+        method: 'get',
+        params:{fieldId}
+    })
+}
+
+/**
+ * 查询元字段字典
+ * @returns {*}
+ */
+export function getMetaFieldDict() {
+    return request({
+        url: `${prefix}/meta/dict`,
+        method: 'get',
+    })
+}

src/views/emport/emport/index.vue

@@ -211,12 +211,12 @@
                     <el-input-number v-model="fieldDialog.data.sort" :min="0" :precision="0"/>
                 </el-form-item>
                 <el-form-item label="数据库字段" prop="field">
-                    <el-select v-if="false" v-model="fieldDialog.data.field" :popper-append-to-body="false">
-                        <el-option v-for="item in fieldDict" :key="item.id" :label="item.label" :value="item.value"
+                    <el-select v-model="fieldDialog.data.field" :popper-append-to-body="false" filterable>
+                        <el-option v-for="item in metaFieldDict" :key="item.value" :label="item.label" :value="item.value"
                         ></el-option>
                     </el-select>
-                    <el-autocomplete v-model="fieldDialog.data.field" :fetch-suggestions="fetchSuggestions">
-                    </el-autocomplete>
+<!--                    <el-autocomplete v-model="fieldDialog.data.field" :fetch-suggestions="fetchSuggestions">
+                    </el-autocomplete>-->
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -261,10 +261,11 @@
             <el-table v-loading="fieldDrawer.queryFieldLoading" :data="fieldDrawer.fieldList"
                       border stripe style="margin-left:6px;"
             >
-                <el-table-column align="center" label="代码" prop="code" show-overflow-tooltip/>
-                <el-table-column align="center" label="指标名称" prop="title" show-overflow-tooltip/>
-                <el-table-column align="center" label="数据坐标" prop="coordinate" show-overflow-tooltip/>
-                <el-table-column align="center" label="数据库字段名" prop="field" show-overflow-tooltip/>
+                <el-table-column align="center" label="代码" prop="code" show-overflow-tooltip width="120"/>
+                <el-table-column align="center" label="指标名称" min-width="200" prop="title" show-overflow-tooltip/>
+                <el-table-column align="center" label="数据坐标" prop="coordinate" show-overflow-tooltip width="100"/>
+                <el-table-column align="center" label="数据库字段名" min-width="150" prop="fieldName" show-overflow-tooltip/>
+                <el-table-column align="center" label="计量单位" prop="unit" show-overflow-tooltip width="90"/>
                 <el-table-column align="center" label="操作" width="150">
                     <template slot-scope="scope">
                         <el-button plain size="small" @click.stop="openRuleBindDialog(scope.row)">规则</el-button>
@@ -497,6 +498,7 @@ export default {
             dataSourceList: [], // 数据源列表
             tableList: [], // 表列表
             fieldDict: [], // 字段字典
+            metaFieldDict:[], // 元字段字典
             yearDialog: { // 年份dialog
                 title: '',
                 show: false,
@@ -600,6 +602,7 @@ export default {
         })
         this.initDataSource()
         this.initRuleDict()
+        this.initMetaFieldDict()
     },
     methods: {
         // 初始化年份字典
@@ -645,6 +648,17 @@ export default {
                 })
             })
         },
+        // 初始化元字段字典
+        initMetaFieldDict(){
+            DataField.getMetaFieldDict().then(res=>{
+                this.metaFieldDict = res.data.map(item=>{
+                    return {
+                        value: item.id,
+                        label: StringUtil.mergeStr(item.fieldName,item.fieldComment)
+                    }
+                })
+            })
+        },
         // 初始化数据表列表
         initTable(datasourceId, callback) {
             this.queryTableLoading = true
@@ -967,7 +981,13 @@ export default {
             this.fieldDrawer.fieldList = []
             this.fieldDrawer.show = true
             this.queryFieldList()
-            this.initFieldDict()
+            //this.initFieldDict()
+        },
+        // 重置分页再查询字段列表
+        clearPageToSearch() {
+            this.fieldDrawer.queryForm.total = 0
+            this.fieldDrawer.queryForm.pageNum = 1
+            this.queryFieldList()
         },
         // 查询字段列表
         queryFieldList() {