Merge branch 'master' of http://47.110.251.215:3000/web/saber into master

src/views/manager/projectinfo/tree.vue

@@ -973,6 +973,7 @@
           prop="eType"
           label="数据类型"
           width="120"
+          :formatter="eTypeFormatter"
         >
         </el-table-column>
         <el-table-column
@@ -1929,6 +1930,18 @@ export default {
       })
     },
 
+    //解析元素数据类型
+    eTypeFormatter(row){
+      let text = '';
+      for (let i = 0; i < this.dataTypeList.length; i++) {
+        if(this.dataTypeList[i].dictKey == row.eType){
+          text = this.dataTypeList[i].dictValue;
+          break;
+        }
+      }
+      return text;
+    },
+
     getDeptCategorylist () {
       if (this.deptCategorylist.length > 1) {
         return;