Explorar el Código

Merge branch 'dev' of http://39.106.8.246:3003/web/ibms into dev

haojianlong hace 4 años
padre
commit
df817f9eca

+ 1 - 1
src/components/ledger/details/detail/exhibitionBaseInformation.vue

@@ -34,7 +34,7 @@
 <!--        <el-button slot="reference" type="text">{{value.Value ? '有' :'-'}}</el-button>-->
         <el-button slot="reference" type="text">有</el-button>
       </el-popover>
-      <span  v-else-if="Array.isArray(value.Value) && value.InputMode== 'F2' ">
+      <span  v-else-if="Array.isArray(value.Value) && (value.InputMode == 'F2' || value.InputMode == 'F1') ">
         <el-popover
           v-if="value.Value.length "
           placement="right"

+ 5 - 1
src/components/ledger/handsontables/device.vue

@@ -420,7 +420,7 @@ export default {
     //获取主体数据
     getTableData() {
       //type存在发送请求
-      if (!!this.mess.deviceId) {
+      if (this.mess.deviceId) {
         this.loading = true
         let param = {
           PageSize: this.page.size,
@@ -460,6 +460,8 @@ export default {
             this.initTable()
           }
         })
+      } else {
+          this.$message.info("请选择设备类别!")
       }
     },
     //获取所以主体数据---用于维护信息
@@ -1222,6 +1224,8 @@ export default {
         case 'LedgerParam.SupplyPurchase.SupplierContract': //供应合同
         case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
         case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
+        case 'TechParam.CompleteMachine.DesignIDGraph': //设计工况空调机组处理过程焓湿图
+        case 'TechParam.AirSupply.FanCharacterCurve': //风机性能曲线
           let IPSdata = tools.dataForKey(this.tableData[row.row], val)
           this.filesArr = IPSdata ? IPSdata : []
           if (!this.onlyRead || this.filesArr.length) {

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

@@ -13,7 +13,7 @@
       </el-select>
       <el-button size="small" style="width: 80px" @click="addDevice" icon="iconfont icon-tianjia">添加系统</el-button>
       <el-button size="small" style="width: 80px" @click="reset" icon="iconfont icon-shuaxin">刷新</el-button>
-      <el-button size="small" style="width: 80px" @click="undo" icon="iconfont icon-undo">撤销</el-button>
+      <el-button v-show="onlyRead" size="small" style="width: 80px" @click="undo" icon="iconfont icon-undo">撤销</el-button>
     </div>
     <qrcode :dialog="myDialog" :addBody="true" ref="qrcode"></qrcode>
     <upload-files-dialog ref="upload" @changeFile="fileChange" :keysArr="filesArr"

+ 1 - 1
src/components/ledger/system/table/spaceTable.vue

@@ -29,7 +29,7 @@
         <template slot="empty">
           <div style="height: 60%;transform: translateY(50%);">
             <i class="icon-wushuju iconfont"></i>
-            可前往“全部关系总览”中计算竖井内系统
+              可前往“全部关系总览”中按系统内包含的设备和业务空间关系计算
           </div>
         </template>
       </el-table>

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

@@ -199,7 +199,6 @@
             UserName: this.userInfo.userName,
             UserId: this.userInfo.userId
           };
-          debugger
         //   request.modelFileUpload(data, res => {
         //     //  创建成功
         //     this.$emit("finishCreateFloor", {

+ 16 - 12
src/utils/handsontable/notShow.js

@@ -1049,7 +1049,9 @@ const showTools = {
             item.InfoPointCode == "InstallInstruction" ||
             item.InfoPointCode == "SupplierContract" ||
             item.InfoPointCode == "Drawing" ||
-            item.InfoPointCode == "InstallDrawing"
+            item.InfoPointCode == "InstallDrawing" ||
+            item.InfoPointCode == "DesignIDGraph" ||
+            item.InfoPointCode == "FanCharacterCurve"
         ) {
             return {
                 data: item.Path,
@@ -1123,7 +1125,7 @@ const showTools = {
             return {
                 data: item.Path,
                 renderer: text.lookQRCode,
-                readOnly: !item.Editable
+                readOnly: onlyRead
             }
         }
 
@@ -1136,7 +1138,7 @@ const showTools = {
             return {
                 data: item.Path,
                 renderer: text.picType,
-                readOnly: !item.Editable
+                readOnly: onlyRead
             }
         }
 
@@ -1154,12 +1156,14 @@ const showTools = {
             item.InfoPointCode == "InstallInstruction" ||
             item.InfoPointCode == "SupplierContract" ||
             item.InfoPointCode == "Drawing" ||
-            item.InfoPointCode == "InstallDrawing"
+            item.InfoPointCode == "InstallDrawing" ||
+            item.InfoPointCode == "DesignIDGraph" ||
+            item.InfoPointCode == "FanCharacterCurve"
         ) {
             return {
                 data: item.Path,
                 renderer: text.fileType,
-                readOnly: !item.Editable
+                readOnly: onlyRead
             }
         }
 
@@ -1173,7 +1177,7 @@ const showTools = {
             return {
                 data: item.Path,
                 renderer: text.idType,
-                readOnly: !item.Editable
+                readOnly: onlyRead
             }
         }
 
@@ -1182,7 +1186,7 @@ const showTools = {
                 data: item.Path,
                 renderer: tools.customDropdownRenderer,
                 editor: "chosen",
-                readOnly: !item.Editable,
+                readOnly: onlyRead,
                 chosenOptions: {
                     data: item.DataSource ? tools.formatDataSource(item.DataSource) : ""
                 }
@@ -1192,7 +1196,7 @@ const showTools = {
                 data: item.Path,
                 renderer: tools.customDropdownRenderer,
                 editor: "chosen",
-                readOnly: !item.Editable,
+                readOnly: onlyRead,
                 chosenOptions: {
                     multiple: true, //多选
                     data: item.DataSource ? tools.formatDataSource(item.DataSource) : ""
@@ -1202,7 +1206,7 @@ const showTools = {
             return {
                 data: item.Path,
                 type: "numeric",
-                readOnly: !item.Editable,
+                readOnly: onlyRead,
                 numericFormat: {
                     pattern: "0,0.00"
                 }
@@ -1212,7 +1216,7 @@ const showTools = {
                 data: item.Path,
                 type: "date",
                 dateFormat: "YYYYMMDDHHmmss",
-                readOnly: !item.Editable,
+                readOnly: onlyRead,
                 correctFormat: true
             };
         } else if (item.InputMode == "B1" ||
@@ -1225,12 +1229,12 @@ const showTools = {
             item.InputMode == "M") { //文本输入
             return {
                 data: item.Path,
-                readOnly: !item.Editable
+                readOnly: onlyRead
             }
         } else { //(未支持的输入方式)暂不支持编辑
             return {
                 data: item.Path,
-                readOnly: !item.Editable
+                readOnly: onlyReadc
             }
         }
     },

+ 1 - 1
src/views/ledger/cenotelist/cenoteadd/index.vue

@@ -6,7 +6,7 @@
         <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个竖井</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>

+ 3 - 1
src/views/ledger/facility/addfacility.vue

@@ -9,7 +9,7 @@
         <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个{{category.name}}</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>
@@ -695,6 +695,8 @@ export default {
         case 'LedgerParam.SupplyPurchase.SupplierContract': //供应合同
         case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
         case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
+        case 'TechParam.CompleteMachine.DesignIDGraph': //设计工况空调机组处理过程焓湿图
+        case 'TechParam.AirSupply.FanCharacterCurve': //风机性能曲线
           let IPSdata = tools.dataForKey(this.tableData[row.row], val);
           this.filesArr = IPSdata ? IPSdata : [];
           this.myDialog.uploadFiles = true;

+ 4 - 1
src/views/ledger/facility/batchPoint.vue

@@ -77,7 +77,7 @@
                 <p>距地面高度:{{equipZ}}mm</p>
             </el-row>
             <div class="elSlider">
-                <el-slider v-model="equipZ" :max="maxHeight" :step="1" :marks="marks"></el-slider>
+                <el-slider v-model="equipZ" :min="mimHeight" :max="maxHeight" :step="1" :marks="marks"></el-slider>
             </div>
             <el-row style="text-align: right;">
                 <el-button size="mini" @click="visible = false">取消</el-button>
@@ -105,6 +105,7 @@ export default {
         visible: false,
         equipZ: 0,
         maxHeight: 99000,
+        mimHeight: -99000,
         popoverPosition: {
             top: 0,
             left: 0,
@@ -441,8 +442,10 @@ export default {
             }
             if (this.floorData.StructureInfo && this.floorData.StructureInfo.Height) {
                 this.maxHeight = this.floorData.StructureInfo.Height;
+                this.minHeight = -(this.floorData.StructureInfo.Height);
             } else {
                 this.maxHeight = 99000;
+                this.minHeight = -99000;
             }
             if (this.floorData.Outline && this.floorData.Outline.length) {
                 this.floorOutline = this.floorData.Outline;

+ 20 - 9
src/views/ledger/facility/details/index.vue

@@ -294,18 +294,17 @@ export default {
     },
     handlePicList(arr) {
       let picObject = {}
+      let video = []
       //处理数据格式
       arr.map(i => {
-        if (i.InputMode == 'F2') {
+        if (i.InputMode == 'F2' || i.InputMode == 'F1') {
           switch (i.Path) {
-            case 'LedgerParam.PhotoDoc.Drawing':
             case 'LedgerParam.Siteinstall.InstallPic':
-            case 'LedgerParam.Siteinstall.InstallDrawing':
             case 'LedgerParam.PhotoDoc.Nameplate':
             case 'LedgerParam.PhotoDoc.Pic':
-            case 'Pic' :
               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.InfoPointName]) {
               } else {
@@ -333,7 +332,6 @@ export default {
         }
       }
       this.exhibitionImage.arr = isArray
-      let video = isArray.filter(i => i.Type != 'image' && i.type != 'image')
       this.exhibitionVideo.list = video
       //判断是否显示图片组件
       this.isShowImage = isArray.length ? true : false
@@ -347,9 +345,22 @@ export default {
       arr.map(i => {
         if (i.InputMode == 'F2') {
           switch (i.Path) {
-            case 'LedgerParam.InsuranceDoc.InsuranceFile':
-            case 'LedgerParam.PhotoDoc.Archive':
-            case 'LedgerParam.Siteinstall.CheckReport':
+            case 'LedgerParam.EquipManufactor.OriginalCertificate': //原厂证明
+            case 'LedgerParam.SupplyPurchase.AcceptanceReport': //验收报告
+            case 'LedgerParam.OperationMainte.MaintainManual': //维修保养手册
+            case 'LedgerParam.PhotoDoc.Archive': //设备文档
+            case 'LedgerParam.PhotoDoc.Drawing': //设备图纸
+            case 'LedgerParam.SupplyPurchase.ApproachingAcceptance': //进场验收单
+            case 'LedgerParam.EquipManufactor.TestReport': //检测报告
+            case 'LedgerParam.SupplyPurchase.SupplierContract': //供应合同
+            case 'LedgerParam.PhotoDoc.ProductCertification': //产品合格证
+            case 'LedgerParam.PhotoDoc.OperationManual': //操作说明书
+            case 'LedgerParam.InsuranceDoc.InsuranceFile': //保险文件
+            case 'LedgerParam.Siteinstall.CheckReport': //安装质检报告
+            case 'LedgerParam.Siteinstall.InstallDrawing': //安装图纸
+            case 'LedgerParam.Siteinstall.InstallInstruction': //安装说明书
+            case 'TechParam.CompleteMachine.DesignIDGraph': //设计工况空调机组处理过程焓湿图
+            case 'TechParam.AirSupply.FanCharacterCurve': //风机性能曲线
               if (this.instance.hasOwnProperty(i.Path)) {
                 i.fileList = this.instance[i.Path]
               }

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

@@ -11,7 +11,7 @@
         </el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个{{category.Name}}</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>

+ 1 - 1
src/views/ledger/property/addproperty.vue

@@ -6,7 +6,7 @@
         <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个{{category.name}}</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>

+ 1 - 1
src/views/ledger/rentlist/rentadd/index.vue

@@ -6,7 +6,7 @@
         <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个租户</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>

+ 1 - 1
src/views/ledger/spacelist/spaceadd/index.vue

@@ -6,7 +6,7 @@
         <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个{{space.spaceName}}</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>

+ 6 - 4
src/views/ledger/system/addsystem.vue

@@ -9,7 +9,7 @@
         <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
       </el-select>
       <span>增加</span>
-      <el-input v-model="addNum" style="width:50px;" size="small"></el-input>
+      <el-input-number v-model="addNum" :controls="false" style="width:50px;" :min="1" :max="50"></el-input-number>
       <span>个{{category.CategoryName}}</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>
@@ -221,9 +221,11 @@ export default {
       })
     },
     // 删除表格行
-    handleDeleteTableRow() {
-      this.$message.success("删除成功");
-      this.formaTableData();
+    handleDeleteTableRow(a,b,c,d) {
+      if (d && d === 'ContextMenu.removeRow') {
+				this.$message.success("删除成功");
+      	this.formaTableData();
+			}
     },
     // 添加行
     handleAddTableRow() {

+ 36 - 24
src/views/model/file/index.vue

@@ -163,34 +163,42 @@ export default {
     },
     //删除模型文件夹
     removeFolder() {
-      this.$alert(`确定要删除文件夹 <${this.currentFolderName}> 吗?`, "提示", {
+			if (this.currentFolderId) {
+				this.$alert(`确定要删除文件夹 <${this.currentFolderName}> 吗?`, "提示", {
         confirmButtonText: "确定",
-        callback: action => {
-          if (action == "confirm") {
-            let params = {
-              Id: this.currentFolderId,
-              ProjectId: this.projectId
-            };
-            request.deleteModel(params, res => {
-              this.$message({
-                message: "删除成功!",
-                type: "success"
-              });
-              this.queryModel();
-            });
-          } else {
-            this.$message({
-              type: "info",
-              message: `取消操作`
-            });
-          }
-        }
-      });
+					callback: action => {
+						if (action == "confirm") {
+							let params = {
+								Id: this.currentFolderId,
+								ProjectId: this.projectId
+							};
+							request.deleteModel(params, res => {
+								this.$message({
+									message: "删除成功!",
+									type: "success"
+								});
+								this.queryModel();
+							});
+						} else {
+							this.$message({
+								type: "info",
+								message: `取消操作`
+							});
+						}
+					}
+				});
+			} else {
+				this.$message.info("请选择模型文件夹!")
+			}
     },
     //编辑文件夹
     editFolder() {
-      this.folderName = this.currentFolderName;
-      this.changeFolderNameVisible = true;
+			if (this.currentFolderId) {
+				this.folderName = this.currentFolderName;
+      	this.changeFolderNameVisible = true;
+			} else {
+				this.$message.info("请选择模型文件夹!");
+			}
     },
     // 查询所有文件夹模型
     queryModel() {
@@ -344,6 +352,10 @@ export default {
   },
   watch: {
     projectId() {
+      this.choiceIndex = 0;
+      this.currentFolderId = "";
+      this.currentFolderName = "";
+      this.currentFloorModelId = "";
       this.queryModel()
     }
   },

+ 5 - 9
src/views/model/report/deleted.vue

@@ -11,12 +11,8 @@
             {{ `${item.BuildingName}建筑模型` }}-{{
               `${item.FloorName}层`
             }}-{{ `${item.EquipLocalName ? item.EquipLocalName : item.EquipName}` }}</h4>
-          <b>BIM ID:<span @dblclick="copyContent"
-                          id="copy">{{
-              item.ScanTaskBase && item.ScanTaskBase[0] ? item.ScanTaskBase[0].BIMID : '' | bimIdTransformation
-            }}</span></b><span
-          class="copy"
-          @click="clickCopy">点击复制</span>
+          <b>BIM ID:<span @dblclick="copyContent" :id="`copy${index}`">{{ item.BIMID ? item.BIMID : '' | bimIdTransformation }}</span></b>
+          <span class="copy" :bim="item.BIMID ? item.BIMID : '' | bimIdTransformation" @click="clickCopy">点击复制</span>
           <input id="copyContent" type="text" @dblclick="copyContent"
                  style="border:none;opacity:0;position:absolute;top:0;left:0;">
           <p style="margin-top:30px;">Revit族:{{ item.BIMFamilyName }}</p>
@@ -156,10 +152,10 @@ export default {
         duration: 1000
       });
     },
-    clickCopy() {
+    clickCopy(e) {
       // 点击复制
-      let target = document.getElementById('copy');
-      let content = target.innerText;
+      let target = e.target;
+      let content = target.getAttribute('bim');
       let inputObj = document.getElementById('copyContent');
       inputObj.value = content;
       inputObj.select();