Bläddra i källkod

Merge branch 'dataType' of git.sagacloud.cn:web/adm into dataType

zhangyu 4 år sedan
förälder
incheckning
47951a9aee

+ 1 - 1
src/api/scan/request.js

@@ -1382,7 +1382,7 @@ export function countProperty(param, success) {
 
 //根据id删除资产信息
 export function deleteProperty(param, success) {
-  let url = `${baseUrl}${dataCenter}/property/delete`;
+  let url = `${baseUrl}${object}/property/delete`;
   http.postJson(url, param, success)
 }
 

+ 6 - 2
src/components/ledger/details/detail/exhibitionBaseInformation.vue

@@ -91,8 +91,12 @@ export default {
       oInput.remove()
     },
     handleName(infoPoint, val) {
-      let text = `${infoPoint}:${val}`;
-      return text.length > 21 ? val.substring(0, 21 - `${infoPoint}:`.length) + '...' : val;
+        let value = val;
+        if (Array.isArray(value)) {
+          value = JSON.stringify(val)
+        }
+      let text = `${infoPoint}:${value}`;
+      return text.length > 21 ? value.substring(0, 21 - `${infoPoint}:`.length) + '...' : value;
     }
   }
 }

+ 6 - 2
src/components/ledger/details/detail/exhibitionCrux.vue

@@ -103,8 +103,12 @@ export default {
         oInput.remove()
       },
       handleName(infoPoint, val) {
-        let text = `${infoPoint}:${val}`;
-        return text.length > 21 ? val.substring(0, 21-`${infoPoint}:`.length) + '...' : val;
+        let value = val;
+        if (Array.isArray(value)) {
+          value = JSON.stringify(val)
+        }
+        let text = `${infoPoint}:${value}`;
+        return text.length > 21 ? value.substring(0, 21-`${infoPoint}:`.length) + '...' : value;
       }
     }
   }

+ 1 - 1
src/components/ledger/handsontables/assets.vue

@@ -729,7 +729,7 @@ export default {
       }
       let param = []
       params.map(item => {
-        param.push({ EquipID: item.EquipID })
+        param.push({ id: item.id })
       })
       this.$confirm("此操作将删除资产,是否继续?", "提示", {
         confirmButtonText: '确定',

+ 1 - 1
src/components/ready/buildfloor/formItems.vue

@@ -120,7 +120,7 @@ export default {
       getDataDictionary(params, res => {
         let arr = res.content.map(item => {
           const category = ['ENUM', 'MENUM', 'BOOLEAN']
-          if (item.category == 'STATIC' && item.dataType.includes(category) && item.dataSource) {
+          if (item.category == 'STATIC' && category.includes(item.dataType) && item.dataSource) {
             item.options = item.dataSource
             if (item.options[0]) {
               item.props = {