浏览代码

Merge branch 'dev'

zhangyu 5 年之前
父节点
当前提交
ab7df2f336

+ 2 - 2
package.json

@@ -22,8 +22,8 @@
     "@saga-web/base": "2.1.9",
     "@saga-web/cad-engine": "2.0.548",
     "@saga-web/draw": "2.1.75",
-    "@saga-web/graphy": "2.1.42",
-    "@saga-web/topology": "1.0.41",
+    "@saga-web/graphy": "2.1.45",
+    "@saga-web/topology": "1.0.53",
     "axios": "^0.18.0",
     "echarts": "^4.1.0",
     "el-cascader-multi": "^1.1.8",

+ 32 - 35
src/components/globaluploader/index.vue

@@ -81,6 +81,7 @@ export default {
         target: '/image-service/common/multipart_upload',
         chunkSize: 1*1024*1024,
         fileParameterName: 'file',
+        allowDuplicateUploads: true, //允许重复上传
         maxChunkRetries: 3,
         testChunks: false,   //是否开启服务器分片校验
         // 服务器分片校验函数,秒传及断点续传基础
@@ -119,41 +120,37 @@ export default {
     });
 
     Bus.$on('openUploader', (query, file) => {
-      if(!this.uploaderList.some(item => {return item.name === file.name})){
-        if(query.uploadId){
-        // this.params = query || {};
-          file.uploadId = query.uploadId
-          file.modelId = query.modelId? query.modelId: ''
-          this.uploader.addFile(file)
-          this.setUploaderList(this.uploader.files.map(item => {
-            item.modelId = item.file.modelId?item.file.modelId:''
-            return item
-          }))
-        } else {
-          getUploadId({
-            systemId: query.systemId?query.systemId:'revit', 
-            secret: query.secret?query.secret:'63afbef6906c342b', 
-            overwrite: query.overwrite? query.overwrite: false,
-            key: file.name
-          }, res => {
-            if(res.UploadId){
-              // this.params = Object.assign(query, { uploadId: res.UploadId }) || {};
-              file = Object.assign(file, {
-                ...query,
-                uploadId: res.UploadId 
-              })
-              this.uploader.addFile(file)
-              this.setUploaderList(this.uploader.files.map(item => {
-                item.modelId = item.file.modelId?item.file.modelId:'';
-                return item
-              }))
-            } else {
-              this.$message.error(`请求分片上传接口失败!`);
-            }
-          })
-        }
-      }else {
-        this.$message.error(`该文件在上传列表中已存在!`);
+      if(query.uploadId){
+      // this.params = query || {};
+        file.uploadId = query.uploadId
+        file.modelId = query.modelId? query.modelId: ''
+        this.uploader.addFile(file)
+        this.setUploaderList(this.uploader.files.map(item => {
+          item.modelId = item.file.modelId?item.file.modelId:''
+          return item
+        }))
+      } else {
+        getUploadId({
+          systemId: query.systemId?query.systemId:'revit', 
+          secret: query.secret?query.secret:'63afbef6906c342b', 
+          overwrite: query.overwrite? query.overwrite: false,
+          key: file.name
+        }, res => {
+          if(res.UploadId){
+            // this.params = Object.assign(query, { uploadId: res.UploadId }) || {};
+            file = Object.assign(file, {
+              ...query,
+              uploadId: res.UploadId 
+            })
+            this.uploader.addFile(file)
+            this.setUploaderList(this.uploader.files.map(item => {
+              item.modelId = item.file.modelId?item.file.modelId:'';
+              return item
+            }))
+          } else {
+            this.$message.error(`请求分片上传接口失败!`);
+          }
+        })
       }
 
       // if (this.$refs.uploadBtn) {

+ 15 - 7
src/components/ledger/handsontables/assets.vue

@@ -848,23 +848,31 @@
             }
             return false
           //保险文件--资产文档--安装质检报告
-          case 'LedgerParam.InsuranceDoc.InsuranceFile':
-          case 'LedgerParam.PhotoDoc.Archive':
-          case 'LedgerParam.Siteinstall.CheckReport':
+          case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
+          case 'LedgerParam.PhotoDoc.Archive': //设备文档
+          case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
+          case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+          case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
+          case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
+          case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
+          case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
+          case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+          case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
+          case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
+          case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
+          case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
             let IPSdata = tools.dataForKey(this.tableData[row.row], val);
             this.filesArr = IPSdata ? IPSdata : [];
             this.myDialog.uploadFiles = true;
             return false
-          //安装照片--安装图纸--资产铭牌照片--资产图纸
+          //安装照片--设备铭牌照片
           case 'LedgerParam.Siteinstall.InstallPic':
-          case 'LedgerParam.Siteinstall.InstallDrawing':
           case 'LedgerParam.PhotoDoc.Nameplate':
-          case 'LedgerParam.PhotoDoc.Drawing':
             let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
             this.imgsArr = SSPPdata ? SSPPdata : [];
             this.myDialog.uploadImgs = true;
             return false
-          //资产照片
+          //设备照片
           case 'LedgerParam.PhotoDoc.Pic':
             let Pdata = tools.dataForKey(this.tableData[row.row], val);
             this.picsArr = Pdata ? Pdata : [];

+ 14 - 6
src/components/ledger/handsontables/device.vue

@@ -1076,20 +1076,28 @@
                   }
                   return false
               //保险文件--设备文档--安装质检报告
-              case 'LedgerParam.InsuranceDoc.InsuranceFile':
-              case 'LedgerParam.PhotoDoc.Archive':
-              case 'LedgerParam.Siteinstall.CheckReport':
+              case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
+              case 'LedgerParam.PhotoDoc.Archive': //设备文档
+              case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
+              case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+              case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
+              case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
+              case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
+              case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
+              case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+              case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
+              case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
+              case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
+              case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
                   let IPSdata = tools.dataForKey(this.tableData[row.row], val);
                   this.filesArr = IPSdata ? IPSdata : [];
                   if (!this.onlyRead || this.filesArr.length) {
                       this.myDialog.uploadFiles = true;
                   }
                   return false
-              //安装照片--安装图纸--设备铭牌照片--设备图纸
+              //安装照片--设备铭牌照片
               case 'LedgerParam.Siteinstall.InstallPic':
-              case 'LedgerParam.Siteinstall.InstallDrawing':
               case 'LedgerParam.PhotoDoc.Nameplate':
-              case 'LedgerParam.PhotoDoc.Drawing':
                   let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
                   this.imgsArr = SSPPdata ? SSPPdata : [];
                   if (!this.onlyRead || this.imgsArr.length) {

+ 0 - 2
src/components/model/file/addFloorDialog.vue

@@ -137,8 +137,6 @@ export default {
       let FloorName = null;
       if (this.form.file == null) {
         this.$message.error("模型文件不能为空!");
-      } else if (this.uploaderList.some(item => {return item.name === this.form.file.name})) {
-        this.$message.error("该文件在上传列表中已存在!");
       } else {
         let FloorName = null;
         // 根据是否有夹层拼接楼层名

+ 1 - 1
src/components/model/file/floorTable.vue

@@ -90,7 +90,7 @@ export default {
     },
     // 替换日志
     repliaceModel(item) {
-      if (item.Status != 4 && item.Status != 21) {
+      if (item.Status != 4) {
         this.$alert("正在识别模型对象,请稍后再替换。", "替换模型", {
           confirmButtonText: "确定",
           callback: action => {

+ 1 - 1
src/components/model/file/modelLog.vue

@@ -94,7 +94,7 @@ export default {
      */
     deleteModel(item) {
       this.$confirm(
-        "此操作只可删除楼层模型文件已经识别的对象及关系等,暂不可删除。确定删除?",
+        "此操作只可删除楼层模型文件已经识别的对象及关系等,暂不可删除。确定删除?",
         "提示",
         {
           confirmButtonText: "确定",

+ 0 - 2
src/components/model/file/replaceModelDialog.vue

@@ -74,8 +74,6 @@ export default {
     onSubmit() {
       if (this.form.file == null) {
         this.$message.error("模型文件不能为空!");
-      } else if (this.uploaderList.some(item => {return item.name === this.form.file.name})) {
-        this.$message.error("该文件在上传列表中已存在!");
       } else {
         this.$emit("updataModel", {
           file: this.form.file,

+ 66 - 22
src/utils/handsontable/notShow.js

@@ -463,14 +463,11 @@ const showTools = {
                             readOnly: true
                         }
                     }
-
                     //图片类型
                     if (
                         item.InfoPointCode == "InstallPic" ||
-                        item.InfoPointCode == "InstallDrawing" ||
                         item.InfoPointCode == "Nameplate" ||
-                        item.InfoPointCode == "Pic" ||
-                        item.InfoPointCode == "Drawing"
+                        item.InfoPointCode == "Pic"
                     ) {
                         return {
                             data: "infos." + item.InfoPointCode,
@@ -482,7 +479,19 @@ const showTools = {
                     //文件类型
                     if (item.InfoPointCode == "InsuranceFile" ||
                         item.InfoPointCode == "Archive" ||
-                        item.InfoPointCode == "CheckReport") {
+                        item.InfoPointCode == "CheckReport" ||
+                        item.InfoPointCode == "MaintainManual" ||
+                        item.InfoPointCode == "ApproachingAcceptance" ||
+                        item.InfoPointCode == "AcceptanceReport" ||
+                        item.InfoPointCode == "OperationManual" ||
+                        item.InfoPointCode == "OriginalCertificate" ||
+                        item.InfoPointCode == "TestReport" ||
+                        item.InfoPointCode == "ProductCertification" ||
+                        item.InfoPointCode == "InstallInstruction" ||
+                        item.InfoPointCode == "Drawing" ||
+                        item.InfoPointCode == "InstallDrawing"
+
+                    ) {
                         return {
                             data: "infos." + item.InfoPointCode,
                             renderer: text.fileType,
@@ -640,10 +649,8 @@ const showTools = {
                     //图片类型
                     if (
                         item.InfoPointCode == "InstallPic" ||
-                        item.InfoPointCode == "InstallDrawing" ||
                         item.InfoPointCode == "Nameplate" ||
-                        item.InfoPointCode == "Pic" ||
-                        item.InfoPointCode == "Drawing"
+                        item.InfoPointCode == "Pic"
                     ) {
                         return {
                             data: item.Path,
@@ -655,7 +662,18 @@ const showTools = {
                     //文件类型
                     if (item.InfoPointCode == "InsuranceFile" ||
                         item.InfoPointCode == "Archive" ||
-                        item.InfoPointCode == "CheckReport") {
+                        item.InfoPointCode == "CheckReport" ||
+                        item.InfoPointCode == "MaintainManual" ||
+                        item.InfoPointCode == "ApproachingAcceptance" ||
+                        item.InfoPointCode == "AcceptanceReport" ||
+                        item.InfoPointCode == "OperationManual" ||
+                        item.InfoPointCode == "OriginalCertificate" ||
+                        item.InfoPointCode == "TestReport" ||
+                        item.InfoPointCode == "ProductCertification" ||
+                        item.InfoPointCode == "InstallInstruction" ||
+                        item.InfoPointCode == "Drawing" ||
+                        item.InfoPointCode == "InstallDrawing"
+                    ) {
                         return {
                             data: item.Path,
                             renderer: text.fileType,
@@ -799,10 +817,8 @@ const showTools = {
                     //图片类型
                     if (
                         item.InfoPointCode == "InstallPic" ||
-                        item.InfoPointCode == "InstallDrawing" ||
                         item.InfoPointCode == "Nameplate" ||
-                        item.InfoPointCode == "Pic" ||
-                        item.InfoPointCode == "Drawing"
+                        item.InfoPointCode == "Pic"
                     ) {
                         return {
                             data: item.Path,
@@ -814,7 +830,18 @@ const showTools = {
                     //文件类型
                     if (item.InfoPointCode == "InsuranceFile" ||
                         item.InfoPointCode == "Archive" ||
-                        item.InfoPointCode == "CheckReport") {
+                        item.InfoPointCode == "CheckReport" ||
+                        item.InfoPointCode == "MaintainManual" ||
+                        item.InfoPointCode == "ApproachingAcceptance" ||
+                        item.InfoPointCode == "AcceptanceReport" ||
+                        item.InfoPointCode == "OperationManual" ||
+                        item.InfoPointCode == "OriginalCertificate" ||
+                        item.InfoPointCode == "TestReport" ||
+                        item.InfoPointCode == "ProductCertification" ||
+                        item.InfoPointCode == "InstallInstruction" ||
+                        item.InfoPointCode == "Drawing" ||
+                        item.InfoPointCode == "InstallDrawing"
+                    ) {
                         return {
                             data: item.Path,
                             renderer: text.fileType,
@@ -996,10 +1023,8 @@ const showTools = {
         //图片类型
         if (
             item.InfoPointCode == "InstallPic" ||
-            item.InfoPointCode == "InstallDrawing" ||
             item.InfoPointCode == "Nameplate" ||
-            item.InfoPointCode == "Pic" ||
-            item.InfoPointCode == "Drawing"
+            item.InfoPointCode == "Pic"
         ) {
             return {
                 data: item.Path,
@@ -1007,11 +1032,21 @@ const showTools = {
                 readOnly: onlyRead
             }
         }
-
         //文件类型
         if (item.InfoPointCode == "InsuranceFile" ||
             item.InfoPointCode == "Archive" ||
-            item.InfoPointCode == "CheckReport") {
+            item.InfoPointCode == "CheckReport" ||
+            item.InfoPointCode == "MaintainManual" ||
+            item.InfoPointCode == "ApproachingAcceptance" ||
+            item.InfoPointCode == "AcceptanceReport" ||
+            item.InfoPointCode == "OperationManual" ||
+            item.InfoPointCode == "OriginalCertificate" ||
+            item.InfoPointCode == "TestReport" ||
+            item.InfoPointCode == "ProductCertification" ||
+            item.InfoPointCode == "InstallInstruction" ||
+            item.InfoPointCode == "Drawing" ||
+            item.InfoPointCode == "InstallDrawing"
+        ) {
             return {
                 data: item.Path,
                 renderer: text.fileType,
@@ -1091,10 +1126,8 @@ const showTools = {
         //图片类型
         if (
             item.InfoPointCode == "InstallPic" ||
-            item.InfoPointCode == "InstallDrawing" ||
             item.InfoPointCode == "Nameplate" ||
-            item.InfoPointCode == "Pic" ||
-            item.InfoPointCode == "Drawing"
+            item.InfoPointCode == "Pic"
         ) {
             return {
                 data: item.Path,
@@ -1106,7 +1139,18 @@ const showTools = {
         //文件类型
         if (item.InfoPointCode == "InsuranceFile" ||
             item.InfoPointCode == "Archive" ||
-            item.InfoPointCode == "CheckReport") {
+            item.InfoPointCode == "CheckReport" ||
+            item.InfoPointCode == "MaintainManual" ||
+            item.InfoPointCode == "ApproachingAcceptance" ||
+            item.InfoPointCode == "AcceptanceReport" ||
+            item.InfoPointCode == "OperationManual" ||
+            item.InfoPointCode == "OriginalCertificate" ||
+            item.InfoPointCode == "TestReport" ||
+            item.InfoPointCode == "ProductCertification" ||
+            item.InfoPointCode == "InstallInstruction" ||
+            item.InfoPointCode == "Drawing" ||
+            item.InfoPointCode == "InstallDrawing"
+        ) {
             return {
                 data: item.Path,
                 renderer: text.fileType,

+ 2 - 5
src/views/business_space/dataUtil/topology.vue

@@ -86,13 +86,10 @@ export default {
           Width: 100,
           Height: 50
         },
-        Pos:{},
-        AnchorList: [{ FaceType: 0, Pos: {} }, { FaceType: 1, Pos: {} }, { FaceType: 2, Pos: {} }, { FaceType: 3, Pos: {} }]
+        Pos: {},
+        AnchorList: [{ Pos: { X: 0, Y: -25 } },{ Pos: { X: 0, Y: 25 } },{ Pos: { X: -50, Y: 0 } },{ Pos: { X: 50, Y: 0} }]
       }
       this.scene.createItem(equipdata)
-      this.scene.grabItem.moveable = true
-      console.log(this.scene)
-      console.log(this.view)
     },
     drawline() {
       this.scene.isLining = true;

+ 14 - 6
src/views/ledger/facility/addfacility.vue

@@ -605,18 +605,26 @@ export default {
           }
           break;
         //保险文件--设备文档--安装质检报告
-        case 'LedgerParam.InsuranceDoc.InsuranceFile':
-        case 'LedgerParam.PhotoDoc.Archive':
-        case 'LedgerParam.Siteinstall.CheckReport':
+        case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
+        case 'LedgerParam.PhotoDoc.Archive': //设备文档
+        case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
+        case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+        case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
+        case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
+        case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
+        case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
+        case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+        case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
+        case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
+        case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
+        case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
           let IPSdata = tools.dataForKey(this.tableData[row.row], val);
           this.filesArr = IPSdata ? IPSdata : [];
           this.myDialog.uploadFiles = true;
           break;
-        //安装照片--安装图纸--设备铭牌照片--设备图纸
+        //安装照片--设备铭牌照片
         case 'LedgerParam.Siteinstall.InstallPic':
-        case 'LedgerParam.Siteinstall.InstallDrawing':
         case 'LedgerParam.PhotoDoc.Nameplate':
-        case 'LedgerParam.PhotoDoc.Drawing':
           let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
           this.imgsArr = SSPPdata ? SSPPdata : [];
           this.myDialog.uploadImgs = true;

+ 15 - 7
src/views/ledger/facility/parts/index.vue

@@ -359,20 +359,28 @@ export default {
       }
       //保险文件--设备文档--安装质检报告
       if (
-        val == "LedgerParam.InsuranceDoc.InsuranceFile" ||
-        val == "LedgerParam.PhotoDoc.Archive" ||
-        val == "LedgerParam.Siteinstall.CheckReport"
+        val == "LedgerParam.InsuranceDoc.InsuranceFile" || //保险文件
+        val == "LedgerParam.PhotoDoc.Archive" || //设备文档
+        val == "LedgerParam.Siteinstall.CheckReport" || //安装质检报告
+        val == "LedgerParam.OperationMainte.MaintainManual" || //维修保养手册
+        val == "LedgerParam.SupplyPurchase.ApproachingAcceptance" || //进场验收单
+        val == "LedgerParam.SupplyPurchase.AcceptanceReport" || //验收报告
+        val == "LedgerParam.PhotoDoc.OperationManual" || //操作说明书
+        val == "LedgerParam.EquipManufactor.OriginalCertificate" || //原厂证明
+        val == "LedgerParam.EquipManufactor.TestReport" || //检测报告
+        val == "LedgerParam.PhotoDoc.ProductCertification" || //产品合格证
+        val == "LedgerParam.Siteinstall.InstallInstruction" || //安装说明书
+        val == "LedgerParam.PhotoDoc.Drawing" || //设备图纸
+        val == "LedgerParam.Siteinstall.InstallDrawing" //安装图纸
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val);
         this.filesArr = data ? data : [];
         this.myDialog.uploadFiles = true;
       }
-      //安装照片--安装图纸--设备铭牌照片--设备图纸
+      //安装照片--设备铭牌照片
       if (
         val == "LedgerParam.Siteinstall.InstallPic" ||
-        val == "LedgerParam.Siteinstall.InstallDrawing" ||
-        val == "LedgerParam.PhotoDoc.Nameplate" ||
-        val == "LedgerParam.PhotoDoc.Drawing"
+        val == "LedgerParam.PhotoDoc.Nameplate"
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val);
         this.imgsArr = data ? data : [];

+ 15 - 30
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -504,52 +504,37 @@ export default {
       }
       //保险文件--设备文档--安装质检报告
       if (
-        val == "LedgerParam.InsuranceDoc.InsuranceFile" ||
-        val == "LedgerParam.PhotoDoc.Archive" ||
-        val == "LedgerParam.Siteinstall.CheckReport"
+        val == "LedgerParam.InsuranceDoc.InsuranceFile" || //保险文件
+        val == "LedgerParam.PhotoDoc.Archive" || //设备文档
+        val == "LedgerParam.Siteinstall.CheckReport" || //安装质检报告
+        val == "LedgerParam.OperationMainte.MaintainManual" || //维修保养手册
+        val == "LedgerParam.SupplyPurchase.ApproachingAcceptance" || //进场验收单
+        val == "LedgerParam.SupplyPurchase.AcceptanceReport" || //验收报告
+        val == "LedgerParam.PhotoDoc.OperationManual" || //操作说明书
+        val == "LedgerParam.EquipManufactor.OriginalCertificate" || //原厂证明
+        val == "LedgerParam.EquipManufactor.TestReport" || //检测报告
+        val == "LedgerParam.PhotoDoc.ProductCertification" || //产品合格证
+        val == "LedgerParam.Siteinstall.InstallInstruction" || //安装说明书
+        val == "LedgerParam.PhotoDoc.Drawing" || //设备图纸
+        val == "LedgerParam.Siteinstall.InstallDrawing" //安装图纸
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val)
         this.filesArr = data ? data : []
-        // this.filesArr = this.tableData[row.row].infos
-        //   ? this.tableData[row.row].infos[val.split(".")[1]]
-        //     ? [this.tableData[row.row].infos[val.split(".")[1]]]
-        //     : []
-        //   : [];
         this.myDialog.uploadFiles = true;
       }
-      //安装照片--安装图纸--设备铭牌照片--设备图纸
+      //安装照片--设备铭牌照片
       if (
         val == "LedgerParam.Siteinstall.InstallPic" ||
-        val == "LedgerParam.Siteinstall.InstallDrawing" ||
-        val == "LedgerParam.PhotoDoc.Nameplate" ||
-        val == "LedgerParam.PhotoDoc.Drawing"
+        val == "LedgerParam.PhotoDoc.Nameplate"
       ) {
         let data = tools.dataForKey(this.tableData[row.row], val)
         this.imgsArr = data ? data : []
-        // if (val == "LedgerParam.PhotoDoc.Nameplate") {
-        //   this.imgsArr = this.tableData[row.row].infos
-        //     ? this.tableData[row.row].infos[val.split(".")[1]]
-        //       ? [this.tableData[row.row].infos[val.split(".")[1]].key]
-        //       : []
-        //     : [];
-        // } else {
-        //   this.imgsArr = this.tableData[row.row].infos
-        //     ? this.tableData[row.row].infos[val.split(".")[1]]
-        //       ? [this.tableData[row.row].infos[val.split(".")[1]]]
-        //       : []
-        //     : [];
-        // }
         this.myDialog.uploadImgs = true;
       }
       //设备照片
       if (val == "LedgerParam.PhotoDoc.Pic") {
         let data = tools.dataForKey(this.tableData[row.row], val)
         this.picsArr = data ? data : []
-        // this.picsArr = this.tableData[row.row].infos
-        //   ? this.tableData[row.row].infos[val.split(".")[1]]
-        //     ? this.tableData[row.row].infos[val.split(".")[1]]
-        //     : []
-        //   : [];
         this.myDialog.pic = true;
       }
       this.row = row.row;

+ 14 - 6
src/views/ledger/facility/partsmanage/index.vue

@@ -668,18 +668,26 @@ export default {
           }
           break;
         //保险文件--设备文档--安装质检报告
-        case 'LedgerParam.InsuranceDoc.InsuranceFile':
-        case 'LedgerParam.PhotoDoc.Archive':
-        case 'LedgerParam.Siteinstall.CheckReport':
+        case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
+        case 'LedgerParam.PhotoDoc.Archive': //设备文档
+        case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
+        case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+        case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
+        case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
+        case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
+        case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
+        case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+        case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
+        case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
+        case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
+        case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
           let IPSdata = tools.dataForKey(this.tableData[row.row], val);
           this.filesArr = IPSdata ? IPSdata : [];
           this.myDialog.uploadFiles = true;
           break;
-        //安装照片--安装图纸--设备铭牌照片--设备图纸
+        //安装照片--设备铭牌照片
         case 'LedgerParam.Siteinstall.InstallPic':
-        case 'LedgerParam.Siteinstall.InstallDrawing':
         case 'LedgerParam.PhotoDoc.Nameplate':
-        case 'LedgerParam.PhotoDoc.Drawing':
           let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
           this.imgsArr = SSPPdata ? SSPPdata : [];
           this.myDialog.uploadImgs = true;

+ 14 - 6
src/views/ledger/property/addproperty.vue

@@ -438,18 +438,26 @@ export default {
           }
           break;
         //保险文件--设备文档--安装质检报告
-        case 'LedgerParam.InsuranceDoc.InsuranceFile':
-        case 'LedgerParam.PhotoDoc.Archive':
-        case 'LedgerParam.Siteinstall.CheckReport':
+        case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
+        case 'LedgerParam.PhotoDoc.Archive': //设备文档
+        case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
+        case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+        case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
+        case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
+        case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
+        case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
+        case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+        case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
+        case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
+        case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
+        case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
           let IPSdata = tools.dataForKey(this.tableData[row.row], val);
           this.filesArr = IPSdata ? IPSdata : [];
           this.myDialog.uploadFiles = true;
           break;
-        //安装照片--安装图纸--设备铭牌照片--设备图纸
+        //安装照片--设备铭牌照片
         case 'LedgerParam.Siteinstall.InstallPic':
-        case 'LedgerParam.Siteinstall.InstallDrawing':
         case 'LedgerParam.PhotoDoc.Nameplate':
-        case 'LedgerParam.PhotoDoc.Drawing':
           let SSPPdata = tools.dataForKey(this.tableData[row.row], val);
           this.imgsArr = SSPPdata ? SSPPdata : [];
           this.myDialog.uploadImgs = true;

+ 1 - 1
src/views/ready/buildfloor/drawGraphy/drawFloor.vue

@@ -143,7 +143,7 @@ export default {
           }
         });
         this.drawMainScene.addAllShade(this.shadeList);
-        this.$emit('changeSign', this.shadeList.length > 0);
+        this.$emit('changeSign', res.Content.length > 1);
       });
     },
     // 清空平面图