zhangyu 4 anni fa
parent
commit
9828fab96b

+ 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", {

+ 10 - 10
src/utils/handsontable/notShow.js

@@ -1125,7 +1125,7 @@ const showTools = {
             return {
                 data: item.Path,
                 renderer: text.lookQRCode,
-                readOnly: !item.Editable
+                readOnly: onlyRead
             }
         }
 
@@ -1138,7 +1138,7 @@ const showTools = {
             return {
                 data: item.Path,
                 renderer: text.picType,
-                readOnly: !item.Editable
+                readOnly: onlyRead
             }
         }
 
@@ -1163,7 +1163,7 @@ const showTools = {
             return {
                 data: item.Path,
                 renderer: text.fileType,
-                readOnly: !item.Editable
+                readOnly: onlyRead
             }
         }
 
@@ -1177,7 +1177,7 @@ const showTools = {
             return {
                 data: item.Path,
                 renderer: text.idType,
-                readOnly: !item.Editable
+                readOnly: onlyRead
             }
         }
 
@@ -1186,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) : ""
                 }
@@ -1196,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) : ""
@@ -1206,7 +1206,7 @@ const showTools = {
             return {
                 data: item.Path,
                 type: "numeric",
-                readOnly: !item.Editable,
+                readOnly: onlyRead,
                 numericFormat: {
                     pattern: "0,0.00"
                 }
@@ -1216,7 +1216,7 @@ const showTools = {
                 data: item.Path,
                 type: "date",
                 dateFormat: "YYYYMMDDHHmmss",
-                readOnly: !item.Editable,
+                readOnly: onlyRead,
                 correctFormat: true
             };
         } else if (item.InputMode == "B1" ||
@@ -1229,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>

+ 1 - 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>

+ 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;

+ 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>

+ 1 - 1
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>

+ 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()
     }
   },