zhangyu hace 4 años
padre
commit
0e01560442

+ 4 - 4
config/index.js

@@ -210,8 +210,8 @@ module.exports = {
         }
         }
       },
       },
       '/api': {
       '/api': {
-        // target: 'http://192.168.64.17:28888/',
-        target: 'http://192.168.64.14:28888/',
+        target: 'http://192.168.64.17:28888/',
+        // target: 'http://192.168.64.14:28888/',
         changeOrigin: true,
         changeOrigin: true,
         pathRewrite: {
         pathRewrite: {
           "^/api": "/"
           "^/api": "/"
@@ -293,8 +293,8 @@ module.exports = {
         // 目标 API 地址
         // 目标 API 地址
         // target: 'http://192.168.12.238:8080/',
         // target: 'http://192.168.12.238:8080/',
         // target: 'http://60.205.177.43:28888',
         // target: 'http://60.205.177.43:28888',
-        target: 'http://192.168.64.14:28888',
-        // target: 'http://192.168.64.17:28888',
+        // target: 'http://192.168.64.14:28888',
+        target: 'http://192.168.64.17:28888',
         // 如果要代理 websockets
         // 如果要代理 websockets
         ws: true,
         ws: true,
         // 将主机标头的原点更改为目标URL
         // 将主机标头的原点更改为目标URL

+ 2 - 2
src/components/data_admin/buildTask/table/assetsTable.vue

@@ -147,7 +147,7 @@ export default {
     handleRegenerate(index, row){
     handleRegenerate(index, row){
       let params = {
       let params = {
         content: [{
         content: [{
-          equipId: row.id,
+          equipId: row.equipId,
           schemeId: row.schemeId,
           schemeId: row.schemeId,
           taskState: -1
           taskState: -1
         }]
         }]
@@ -163,7 +163,7 @@ export default {
         content: [{
         content: [{
           confirmingPersonId: this.userInfo.userId,
           confirmingPersonId: this.userInfo.userId,
           confirmingPersonName: this.userInfo.userName,
           confirmingPersonName: this.userInfo.userName,
-          taskId: row.id,
+          id: row.id,
           taskState: 0
           taskState: 0
         }]
         }]
       }
       }

+ 2 - 2
src/components/data_admin/buildTask/table/deviceTable.vue

@@ -189,7 +189,7 @@ export default {
     handleRegenerate(index, row){
     handleRegenerate(index, row){
       let params = {
       let params = {
         content: [{
         content: [{
-          equipId: row.id,
+          equipId: row.equipId,
           taskState: -1,
           taskState: -1,
           schemeId: row.schemeId
           schemeId: row.schemeId
         }]
         }]
@@ -207,7 +207,7 @@ export default {
         content: [{
         content: [{
           confirmingPersonId: this.userInfo.userId,
           confirmingPersonId: this.userInfo.userId,
           confirmingPersonName: this.userInfo.userName,
           confirmingPersonName: this.userInfo.userName,
-          taskId: row.id,
+          id: row.id,
           taskState: 0
           taskState: 0
         }]
         }]
       }
       }

+ 2 - 2
src/components/data_admin/buildTask/table/modelTable.vue

@@ -164,7 +164,7 @@ export default {
     handleRegenerate(index, row){
     handleRegenerate(index, row){
       let params = {
       let params = {
         content: [{
         content: [{
-          equipId: row.id,
+          equipId: row.equipId,
           fileId: row.fileId,
           fileId: row.fileId,
           fileName: row.fileName,
           fileName: row.fileName,
           folderId: row.folderId,
           folderId: row.folderId,
@@ -184,7 +184,7 @@ export default {
         content: [{
         content: [{
           confirmingPersonId: this.userInfo.userId,
           confirmingPersonId: this.userInfo.userId,
           confirmingPersonName: this.userInfo.userName,
           confirmingPersonName: this.userInfo.userName,
-          taskId: row.id,
+          id: row.id,
           taskState: 0
           taskState: 0
         }]
         }]
       }
       }

+ 8 - 7
src/components/ledger/lib/uploadImgsName.vue

@@ -214,13 +214,14 @@ export default {
                   vm.creatImg(vm.imageGetUrl + "&key=" + uploadKey + "." + type, uploadKey)
                   vm.creatImg(vm.imageGetUrl + "&key=" + uploadKey + "." + type, uploadKey)
                 }
                 }
                 if (vm.type == "video" && type == "png") {
                 if (vm.type == "video" && type == "png") {
-                  vm.videoPicArr.push({
-                    name: uploadKey + '',
-                    key: uploadKey + "." + type,
-                    systemId: "dataPlatform",
-                    type: "image_video",
-                    createTime: CreateTime
-                  })
+                    console.log(vm.videoPicArr)
+                //   vm.videoPicArr.push({
+                //     name: uploadKey + '',
+                //     key: uploadKey + "." + type,
+                //     systemId: "dataPlatform",
+                //     type: "image_video",
+                //     createTime: CreateTime
+                //   })
                 }
                 }
                 vm.$emit("change", vm.imagesArr, vm.defined, vm.videoPicArr);
                 vm.$emit("change", vm.imagesArr, vm.defined, vm.videoPicArr);
               }
               }

+ 7 - 7
src/views/data_admin/buildLog/index.vue

@@ -106,13 +106,13 @@ export default {
         total: 0
         total: 0
       },
       },
       tableHeader: [
       tableHeader: [
-        { fieldName: 'CreateTime', headerName: '时间', width: 150 },
-        { fieldName: 'Comming', headerName: '来源', width: 120 },
-        { fieldName: 'Name', headerName: '操作人', width: 120 },
-        { fieldName: 'Phone', headerName: '手机', width: 150 },
-        { fieldName: 'Action', headerName: '动作', width: 200 },
-        { fieldName: 'UserId', headerName: '对象id', width: 300 },
-        { fieldName: 'Note', headerName: '操作说明', width: 'auto' },
+        { fieldName: 'createTime', headerName: '时间', width: 150 },
+        { fieldName: 'comming', headerName: '来源', width: 120 },
+        { fieldName: 'name', headerName: '操作人', width: 120 },
+        { fieldName: 'phone', headerName: '手机', width: 150 },
+        { fieldName: 'action', headerName: '动作', width: 200 },
+        { fieldName: 'userId', headerName: '对象id', width: 300 },
+        { fieldName: 'note', headerName: '操作说明', width: 'auto' },
       ],
       ],
       exportData: []
       exportData: []
     }
     }

+ 6 - 6
src/views/ledger/cenotelist/relatedSpace.vue

@@ -190,14 +190,14 @@ export default {
     showDefaultSpace() {
     showDefaultSpace() {
       if (this.spaceList.length && this.cenoteObj.onlyRead == 'true') {
       if (this.spaceList.length && this.cenoteObj.onlyRead == 'true') {
         this.space = this.spaceList.find((item) => {
         this.space = this.spaceList.find((item) => {
-          return item.Code == "GeneralZone"
-        }) ? ["GeneralZone"] : [this.spaceList[0].Code];
+          return item.code == "GeneralZone"
+        }) ? ["GeneralZone"] : [this.spaceList[0].code];
         this.ObjectType = this.space[0];
         this.ObjectType = this.space[0];
       }
       }
       //处理空间类型
       //处理空间类型
       this.spaceList.map(item => {
       this.spaceList.map(item => {
-        if (item.Name != "元空间") {
-          this.spaceType[item.Code] = item.Name;
+        if (item.name != "元空间") {
+          this.spaceType[item.code] = item.name;
         }
         }
       });
       });
       //加载楼层信息
       //加载楼层信息
@@ -207,8 +207,8 @@ export default {
     loadBuildingData() {
     loadBuildingData() {
       if (this.cenoteObj.onlyRead == 'true') {
       if (this.cenoteObj.onlyRead == 'true') {
         let param = {
         let param = {
-          ShaftId: this.$route.query.ShaftId,
-          ObjectType: this.ObjectType
+          shaftId: this.$route.query.ShaftId,
+          objectType: this.ObjectType
         };
         };
         this.buildingLoading = true;
         this.buildingLoading = true;
         shaftSpaceBuildingQuery(param, res => {
         shaftSpaceBuildingQuery(param, res => {

+ 19 - 8
src/views/ledger/facility/details/index.vue

@@ -303,18 +303,17 @@ export default {
     },
     },
     handlePicList(arr) {
     handlePicList(arr) {
       let picObject = {}
       let picObject = {}
+      let video = []
       //处理数据格式
       //处理数据格式
       arr.map(i => {
       arr.map(i => {
         if (i.dataType == 'ATTACHMENT') {
         if (i.dataType == 'ATTACHMENT') {
           switch (i.path) {
           switch (i.path) {
-            case 'infos.drawing':
             case 'infos.installPic':
             case 'infos.installPic':
-            case 'infos.installDrawing':
             case 'infos.nameplate':
             case 'infos.nameplate':
             case 'infos.pic':
             case 'infos.pic':
-            case 'pic' :
               if (this.instance.hasOwnProperty(i.path)) {
               if (this.instance.hasOwnProperty(i.path)) {
-                i.PicList = this.instance[i.path]
+                i.PicList = this.instance[i.path].filter(i => i.type === 'image' || i.type === 'panorama')
+                video = video.concat(this.instance[i.path].filter(i => i.type === 'video'))
               }
               }
               if (picObject[i.name]) {
               if (picObject[i.name]) {
               } else {
               } else {
@@ -342,7 +341,6 @@ export default {
       }
       }
       this.exhibitionImage.list = picObject
       this.exhibitionImage.list = picObject
       this.exhibitionImage.arr = isArray
       this.exhibitionImage.arr = isArray
-      let video = isArray.filter(i => i.type === 'video')
       this.exhibitionVideo.list = video
       this.exhibitionVideo.list = video
       //判断是否显示图片组件
       //判断是否显示图片组件
       this.isShowImage = isArray.length ? true : false
       this.isShowImage = isArray.length ? true : false
@@ -356,9 +354,22 @@ export default {
       arr.map(i => {
       arr.map(i => {
         if (i.dataType == 'ATTACHMENT') {
         if (i.dataType == 'ATTACHMENT') {
           switch (i.path) {
           switch (i.path) {
-            case 'infos.insuranceFile':
-            case 'infos.archive':
-            case 'infos.checkReport':
+            case 'infos.originalCertificate': //原厂证明
+            case 'infos.acceptanceReport': //验收报告
+            case 'infos.maintainManual': //维修保养手册
+            case 'infos.archive': //设备文档
+            case 'infos.drawing': //设备图纸
+            case 'infos.approachingAcceptance': //进场验收单
+            case 'infos.testReport': //检测报告
+            case 'infos.supplierContract': //供应合同
+            case 'infos.productCertification': //产品合格证
+            case 'infos.operationManual': //操作说明书
+            case 'infos.insuranceFile': //保险文件
+            case 'infos.checkReport': //安装质检报告
+            case 'infos.installDrawing': //安装图纸
+            case 'infos.installInstruction': //安装说明书
+            case 'infos.designIDGraph': //设计工况空调机组处理过程焓湿图
+            case 'infos.fanCharacterCurve': //风机性能曲线
               if (this.instance.hasOwnProperty(i.path)) {
               if (this.instance.hasOwnProperty(i.path)) {
                 i.fileList = this.instance[i.path]
                 i.fileList = this.instance[i.path]
               }
               }

+ 1 - 0
src/views/ready/collectsetting/index.vue

@@ -682,6 +682,7 @@ export default {
           visible: detail.Visible,
           visible: detail.Visible,
           groupCode: detail.groupCode,
           groupCode: detail.groupCode,
           id: detail.id,
           id: detail.id,
+          projectId: detail.projectId,
           type: detail.type
           type: detail.type
         }]
         }]
       }
       }

+ 1 - 1
src/views/relation/relationShip/index.vue

@@ -457,7 +457,7 @@
           param = {
           param = {
             objectType: 2,
             objectType: 2,
             relType,
             relType,
-            vague: this.formValue
+            vagueTo: this.formValue
           }
           }
         }
         }
         relQuery(param, res => {
         relQuery(param, res => {