zhangyu 4 роки тому
батько
коміт
51f249f12d

+ 4 - 4
config/index.js

@@ -210,8 +210,8 @@ module.exports = {
         }
       },
       '/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,
         pathRewrite: {
           "^/api": "/"
@@ -293,8 +293,8 @@ module.exports = {
         // 目标 API 地址
         // target: 'http://192.168.12.238:8080/',
         // 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
         ws: true,
         // 将主机标头的原点更改为目标URL

+ 16 - 16
src/components/ledger/lib/linkassets.vue

@@ -15,7 +15,7 @@
     <el-row style="margin-top:30px;" v-show="spaceShow">
       <span class="condition-title">分区类型:</span>
       <el-select v-model="zone" filterable size="small" @change="handleChangeZone" style="width:350px;">
-        <el-option v-for="item in zoneList" :key="item.Code" :label="item.Name" :value="item.Code"></el-option>
+        <el-option v-for="item in zoneList" :key="item.code" :label="item.name" :value="item.code"></el-option>
       </el-select>
     </el-row>
     <el-row style="margin-top:30px;" v-show="spaceShow && zone != 'all' && zone != 'noKnow'">
@@ -86,7 +86,7 @@ export default {
     //获取未关联资产的设备或部件类型
     getPartsDieType() {
       let _this = this
-      TypePartsDie(res => {
+      TypePartsDie(res => {       
         _this.deviceTypeList = res.content
       })
     },
@@ -204,7 +204,7 @@ export default {
     //判断是否显示空间分区选择
     zoneListIsShow() {
       let lastVal = this.buildFloor.slice(-1)[0]
-      if (!lastVal || lastVal == 'noKnow' || this.buildFloor[0] == 'all' || this.deviceType.length != 4) {
+      if (!lastVal || lastVal == 'noKnow' || this.buildFloor[0] == 'all' || this.deviceType.length != 6) {
         this.spaceShow = false
       } else {
         this.spaceShow = true
@@ -224,27 +224,27 @@ export default {
         let recursionGetData = (pageNum, zone) => {
           pageNum = pageNum ? pageNum : 1
           let params = {
-            Orders: "CreateTime desc, id asc",
-            PageNumber: pageNum,
-            PageSize: 1000,
-            Projection: ["id", "RoomName", "RoomLocalName", "CreateTime"],
-            ZoneType: zone
+            orders: "createTime desc, id asc",
+            pageNumber: pageNum,
+            pageSize: 1000,
+            projection: ["id", "name", "localName", "createTime"],
+            zoneType: zone
           }
           if (this.spaceShow) {
             if (this.buildFloor.length == 2 && this.buildFloor[1] != 'all') {
-              pa.BuildingId = this.buildFloor[0];
-              pa.FloorId = this.buildFloor[1];
+              params.buildingId = this.buildFloor[0];
+              params.floorId = this.buildFloor[1];
             } else {
-              pa.BuildingId = this.buildFloor[0];
+              params.buildingId = this.buildFloor[0];
             }
           }
           zoneQuery(params, res => {
-            nodes = nodes.concat(res.Content.map(item => ({
-              value: item.RoomID,
-              label: item.RoomLocalName ? item.RoomLocalName : item.RoomName
+            nodes = nodes.concat(res.content.map(item => ({
+              value: item.id,
+              label: item.localName ? item.localName : item.name
             })))
-            if (res.Total / (res.PageSize * res.PageNumber) > 1) {
-              recursionGetData(res.PageNumber + 1, zone)
+            if (res.total / (res.pageSize * res.pageNumber) > 1) {
+              recursionGetData(res.pageNumber + 1, zone)
             } else {
               this.spaceList = nodes
             }

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

@@ -196,7 +196,7 @@
             ProjectId: this.projectId,
             ReplaceReason: null,
             Size: this.form.file.size,
-            UserName: this.userInfo.username,
+            UserName: this.userInfo.userName,
             UserId: this.userInfo.userId
           };
           request.modelFileUpload(data, res => {

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

@@ -12,7 +12,7 @@ export default {
       props: {
         multiple: true,
         value: 'id',
-        label: 'name',
+        label: 'localName',
         children: 'floor'
       },
       options: []

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

@@ -435,10 +435,9 @@ const showTools = {
         }
       }
     } else {// 动态信息点
-      // console.log(`%c${item.category}-${item.dataType}`,`color:#c215e1;font-size: 20px;background:#434101`);
       return {
         data: item.path,
-        readOnly: !item.editable
+        readOnly: onlyRead
       }
     }
   },
@@ -451,7 +450,7 @@ const showTools = {
       return {
         data: item.path,
         renderer: text.lookQRCode,
-        readOnly: !item.editable
+        readOnly: onlyRead
       }
     }
 
@@ -464,7 +463,7 @@ const showTools = {
       return {
         data: item.path,
         renderer: text.picType,
-        readOnly: !item.editable
+        readOnly: onlyRead
       }
     }
 
@@ -489,7 +488,7 @@ const showTools = {
       return {
         data: item.path,
         renderer: text.fileType,
-        readOnly: !item.editable
+        readOnly: onlyRead
       }
     }
 
@@ -503,7 +502,7 @@ const showTools = {
     //   return {
     //     data: item.path,
     //     renderer: text.idType,
-    //     readOnly: !item.editable
+    //     readOnly: onlyRead
     //   }
     // }
     if (!item.category) {
@@ -515,7 +514,7 @@ const showTools = {
           data: item.path,
           renderer: tools.customDropdownRenderer,
           editor: "chosen",
-          readOnly: !item.editable,
+          readOnly: onlyRead,
           chosenOptions: {
             data: item.dataSource ? tools.formatDataSource(item.dataSource) : ""
           }
@@ -525,7 +524,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) : ""
@@ -535,7 +534,7 @@ const showTools = {
         return {
           data: item.path,
           type: "numeric",
-          readOnly: !item.editable,
+          readOnly: onlyRead,
           numericFormat: {
             pattern: "0,0.00"
           }
@@ -545,25 +544,24 @@ const showTools = {
           data: item.path,
           type: "date",
           dateFormat: item.formater || "YYYYMMDDHHmmss",
-          readOnly: !item.editable,
+          readOnly: onlyRead,
           correctFormat: true
         };
       } else if (item.dataType == dataTypeMap.STRING) { // 文本输入
         return {
           data: item.path,
-          readOnly: !item.editable
+          readOnly: onlyRead
         }
       } else { // (未支持的输入方式)暂不支持编辑
         return {
           data: item.path,
-          readOnly: !item.editable
+          readOnly: onlyRead
         }
       }
     } else { // 动态信息点
-      // console.log(`%c${item.category}-${item.dataType}`,`color:#c215e1;font-size: 20px;background:#434101`);
       return {
         data: item.path,
-        readOnly: !item.editable
+        readOnly: onlyRead
       }
     }
   },

+ 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

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

+ 7 - 4
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="minHeight" :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,
+        minHeight: -99000,
         popoverPosition: {
             top: 0,
             left: 0,
@@ -117,7 +118,7 @@ export default {
 		classCode: "", //设备类别
 		isPoint: "all", //是否有坐标(全部-all、有坐标-yes、无坐标-no)
 		keyword: "", //设备标识关键字
-		showName: "EquipLocalName", //显示名称
+		showName: "localName", //显示名称
 		isIndeterminate: false, //全选样式显示
 		checkAll: false, //是否全选
 		checkedEquip: [], //选中的设备
@@ -138,10 +139,10 @@ export default {
           label: "无坐标"
 		}],
 		showNameOptions: [{
-          value: "EquipLocalName",
+          value: "localName",
           label: "显示设备本地名称"
         }, {
-          value: "EquipLocalID",
+          value: "localId",
           label: "显示设备本地编码"
         }, {
           value: "cADID",
@@ -431,8 +432,10 @@ export default {
         }
         if (this.floorData.infos && this.floorData.infos.height) {
             this.maxHeight = this.floorData.infos.height;
+            this.minHeight = -(this.floorData.infos.height);
         } else {
             this.maxHeight = 99000;
+            this.minHeight = -99000;
         }
 		if (this.floorData.outline && this.floorData.outline.length) {
 			this.floorOutline = this.floorData.outline;

+ 1 - 15
src/views/ledger/facility/batchlink.vue

@@ -118,6 +118,7 @@ export default {
       let param = {
         category: fl.category || undefined,
         spaceIdList: fl.spaceIdList || undefined,
+        
         orders: "createTime desc",
         pageNumber: 1,
         pageSize: 1000
@@ -125,7 +126,6 @@ export default {
       equipCategoryProperty(param, res => {
         this.unlinkNumber = res.total
         this.linkNumber += res.content.length
-        // this.page.total = res.Total
         this.contentData = this.contentData.concat(res.content)
         if (res.total / (res.pageSize * res.pageNumber) > 1) {
           this.getTableData(res.pageNumber + 1)
@@ -153,20 +153,6 @@ export default {
       pageNum = pageNum ? pageNum : 1
       let param = {
         data: {
-          //   Cascade: [
-          //   {
-          //     Name: "equipCategory",
-          //     Projection: ["EquipCode", "EquipName"]
-          //   },
-          //   {
-          //     Name: "building",
-          //     Projection: [ "BuildLocalName", "BuildName", "BuildID" ]
-          //   },
-          //   {
-          //     Name: "floor",
-          //     Projection: [ "FloorLocalName", "FloorName", "FloorID" ]
-          //   }
-          // ],
           orders: "createTime desc, id asc",
           pageNumber: pageNum,
           pageSize: 1000

+ 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

@@ -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.CategoryName }}</span>
       <el-button @click="handleAddTableRow">增加</el-button>
     </el-row>

+ 38 - 26
src/views/model/file/index.vue

@@ -156,34 +156,42 @@ export default {
     },
     //删除模型文件夹
     removeFolder() {
-      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: `取消操作`
-            });
-          }
-        }
-      });
+			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: `取消操作`
+							});
+						}
+					}
+				});
+			} 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() {
@@ -294,7 +302,7 @@ export default {
         ProjectId: this.projectId,
         ReplaceReason: 0,
         Size: data.file.size,
-        UserName: this.userInfo.username,
+        UserName: this.userInfo.userName,
         UserId: this.userInfo.userId
       };
       //  替换模型文件
@@ -337,6 +345,10 @@ export default {
   },
   watch: {
     projectId() {
+      this.choiceIndex = 0;
+      this.currentFolderId = "";
+      this.currentFolderName = "";
+      this.currentFloorModelId = "";
       this.queryModel()
     }
   },