Browse Source

redmine问题处理

zhangyu 5 years ago
parent
commit
847ff231e5

+ 14 - 0
src/components/globaluploader/index.vue

@@ -105,6 +105,20 @@ export default {
     }
   },
   mounted() {
+    // 刷新或关闭浏览器提示
+    window.addEventListener('beforeunload', event => {
+      if(this.uploader.isUploading()) { // 判断是否有文件正在上传
+        event.preventDefault();
+        e = event || window.event;
+        // 兼容IE8和Firefox之前的版本
+        if (e) {
+          e.returnValue = "您有文件正在上传,关闭会中断上传,是否继续?";
+        }
+        // Chrome, Safari, Firefox 4+, Opera 12+ , IE 9+
+        return "您有文件正在上传,关闭会中断上传,是否继续?";
+      }
+    });
+
     Bus.$on('openUploader', (query, file) => {
       if(!this.uploaderList.some(item => {return item.name === file.name})){
         if(query.uploadId){

+ 25 - 17
src/components/model/file/versionDialog.vue

@@ -5,26 +5,34 @@
         <span>上传人:{{versionData.userName}}</span>
         <span style="marginLeft:30px;">上传时间:{{versionData.acceptTime}}</span>
         <p style="marginTop:15px;">更新内容:</p>
-        <el-divider>新增设备概要内容</el-divider>
-        <p style="marginBottom:10px;">于【{{versionData.acceptTime}}】上传模型文件,新增设备实例如下:</p>
-        <p v-for="(item, key) in versionData.createData" :key="'C'+key">【{{mapType[key]}}】:【{{item.length}}】个</p>
-        <el-divider>删除设备概要内容</el-divider>
-        <p style="marginBottom:10px;">于【{{versionData.acceptTime}}】上传模型文件,删除设备实例如下:</p>
-        <p v-for="(item, key) in versionData.deleteData" :key="'D'+key">【{{mapType[key]}}】:【{{item.length}}】个</p>
-        <el-divider>新增设备</el-divider>
-        <div v-for="(item, key) in versionData.createData" :key="'CL'+key">
-          <p>【{{mapType[key]}}】</p>
-          <p v-for="(obj, i) in item" :key="obj.Id">【{{i+1}}】、建筑:【{{obj.BuildingName || "无"}}】;楼层:【{{obj.FloorName || "无"}}】;设备全局id:【{{obj.ObjId || "无"}}】;BIMID:【{{obj.BimId || "无"}}】;设备本地编码:【{{obj.LocalId || "无"}}】;设备本地名称:【{{obj.LocalName || "无"}}】;CADID:【{{obj.CadId || "无"}}】;</p>
-        </div>
-        <el-divider>删除设备</el-divider>
-        <div v-for="(item, key) in versionData.deleteData" :key="'DL'+key">
-          <p>【{{mapType[key]}}】</p>
-          <p v-for="(obj, i) in item" :key="obj.Id">【{{i+1}}】、建筑:【{{obj.BuildingName || "无"}}】;楼层:【{{obj.FloorName || "无"}}】;设备全局id:【{{obj.ObjId || "无"}}】;BIMID:【{{obj.BimId || "无"}}】;设备本地编码:【{{obj.LocalId || "无"}}】;设备本地名称:【{{obj.LocalName || "无"}}】;CADID:【{{obj.CadId || "无"}}】;</p>
-        </div>
+        <!-- <div v-if="Object.keys(versionData.createData).length || Object.keys(versionData.deleteData).length"> -->
+          <el-divider v-if="Object.keys(versionData.createData).length">新增设备概要内容</el-divider>
+          <p v-if="Object.keys(versionData.createData).length" style="marginBottom:10px;">于【{{versionData.acceptTime}}】上传模型文件,新增设备实例如下:</p>
+          <p v-for="(item, key) in versionData.createData" :key="'C'+key">【{{mapType[key]}}】:【{{item.length}}】个</p>
+          <el-divider v-if="Object.keys(versionData.deleteData).length">[{{Object.keys(versionData.deleteData).length}}]删除设备概要内容</el-divider>
+          <p v-if="Object.keys(versionData.deleteData).length" style="marginBottom:10px;">于【{{versionData.acceptTime}}】上传模型文件,删除设备实例如下:</p>
+          <p v-for="(item, key) in versionData.deleteData" :key="'D'+key">【{{mapType[key]}}】:【{{item.length}}】个</p>
+          <el-divider v-if="Object.keys(versionData.createData).length">新增设备</el-divider>
+          <div v-for="(item, key) in versionData.createData" :key="'CL'+key">
+            <p>【{{mapType[key]}}】</p>
+            <p v-for="(obj, i) in item" :key="obj.Id">【{{i+1}}】、建筑:【{{obj.BuildingName || "无"}}】;楼层:【{{obj.FloorName || "无"}}】;设备全局id:【{{obj.ObjId || "无"}}】;BIMID:【{{obj.BimId || "无"}}】;设备本地编码:【{{obj.LocalId || "无"}}】;设备本地名称:【{{obj.LocalName || "无"}}】;CADID:【{{obj.CadId || "无"}}】;</p>
+          </div>
+          <el-divider v-if="Object.keys(versionData.deleteData).length">删除设备</el-divider>
+          <div v-for="(item, key) in versionData.deleteData" :key="'DL'+key">
+            <p>【{{mapType[key]}}】</p>
+            <p v-for="(obj, i) in item" :key="obj.Id">【{{i+1}}】、建筑:【{{obj.BuildingName || "无"}}】;楼层:【{{obj.FloorName || "无"}}】;设备全局id:【{{obj.ObjId || "无"}}】;BIMID:【{{obj.BimId || "无"}}】;设备本地编码:【{{obj.LocalId || "无"}}】;设备本地名称:【{{obj.LocalName || "无"}}】;CADID:【{{obj.CadId || "无"}}】;</p>
+          </div>
+        <!-- </div> -->
+        <!-- <div v-else>
+          <div style="height: 60%;transform: translateY(50%);font-weight: normal;font-size: 12px;text-align: center;color: #909399;">
+            <i class="icon-wushuju iconfont"></i>
+            数据暂无
+          </div>
+        </div> -->
       </el-scrollbar>
     </div>
     <span slot="footer" class="dialog-footer">
-      <el-button size="small" type="primary" @click="handleClose">确认创建</el-button>
+      <el-button size="small" type="primary" @click="handleClose">关闭</el-button>
       <!-- <el-button size="small" type="primary">确 定</el-button> -->
     </span>
   </el-dialog>

+ 1 - 2
src/views/ledger/cenotelist/relatedSpace.vue

@@ -136,7 +136,7 @@ export default {
     //默认显示第一个空间
     showDefaultSpace() {
       if (this.spaceList.length) {
-        this.space = this.spaceList[0].Code;
+        this.space = this.spaceList.find((item) => {return item.Code == "GeneralZone"})? "GeneralZone": this.spaceList[0].Code;
         if (this.spaceList.length > 1 && this.cenoteObj.onlyRead) {
           this.showSpaceDot = true;
         }
@@ -247,7 +247,6 @@ export default {
     //更换楼层
     changeFloor(fid) {
       this.floor = fid;
-      this.isEdit = false;
       let buildfloor = [this.building, fid]
       this.$refs.cenotegraphy.getFloorMap(buildfloor, this.space)
     },

+ 21 - 20
src/views/ledger/facility/addfacility.vue

@@ -1,9 +1,9 @@
 <template>
   <div id="deviceList">
     <el-row class="right">
-      <span style="width:20px;float:left;display:block;height:20px;cursor: pointer;" @click="changeAssetsFalg">
+      <!-- <span style="width:20px;float:left;display:block;height:20px;cursor: pointer;" @click="changeAssetsFalg">
         <i class="el-icon-fa  el-icon-fa-compass"></i>
-      </span>
+      </span> -->
       <span style="float:left;">当前选择的设备类型:{{category.name}}</span>
       <el-select v-model="showType" @change="initTable" style="width:125px;margin-right:10px;vertical-align:bottom;">
         <el-option v-for="item in showTypes" :key="item.value" :label="item.label" :value="item.value"></el-option>
@@ -132,6 +132,7 @@ export default {
       EquipmentList: [],
       firmId: "", //品牌型号所需字段--族id三位编码(传设备类id或部件类id)
       buildFloorData: [],
+      floorFlag: true,
     };
   },
   computed: {
@@ -158,24 +159,24 @@ export default {
       })
     },
     //维护建筑
-    changeAssetsFalg() {
-      if (this.floorFlag) {
-        this.floorFlag = false
-      } else {
-        this.$confirm('<p>维护设备所在建筑楼层后,对后续数据影响较大,如业务空间中的所在关系or其他?暂未梳理明白……</p><p>后续要修改设备所属建筑楼层,只能通过模型中的待建模清单操作</p>', '提示', {
-          dangerouslyUseHTMLString: true,
-          confirmButtonText: '就要维护设备所属建筑楼层',
-          cancelButtonText: '暂时不搞了',
-          confirmButtonClass: 'confirmButtonClass',
-          cancelButtonClass: 'cancelButtonClass'
-        }).then(_ => {
-          this.floorFlag = true
-          this.getTableHeader()
-        }).catch(_ => {
-          this.$message("取消")
-        })
-      }
-    },
+    // changeAssetsFalg() {
+    //   if (this.floorFlag) {
+    //     this.floorFlag = false
+    //   } else {
+    //     this.$confirm('<p>维护设备所在建筑楼层后,对后续数据影响较大,如业务空间中的所在关系or其他?暂未梳理明白……</p><p>后续要修改设备所属建筑楼层,只能通过模型中的待建模清单操作</p>', '提示', {
+    //       dangerouslyUseHTMLString: true,
+    //       confirmButtonText: '就要维护设备所属建筑楼层',
+    //       cancelButtonText: '暂时不搞了',
+    //       confirmButtonClass: 'confirmButtonClass',
+    //       cancelButtonClass: 'cancelButtonClass'
+    //     }).then(_ => {
+    //       this.floorFlag = true
+    //       this.getTableHeader()
+    //     }).catch(_ => {
+    //       this.$message("取消")
+    //     })
+    //   }
+    // },
     //将数组转换成optiosn格式
     changeArr(arr) {
       return arr.map(item => {

+ 6 - 2
src/views/ledger/rentlist/rentadd/index.vue

@@ -46,8 +46,12 @@ export default {
       isTableRightShow: false,
       relationids: "",
       onlyRead: false,
-      showTypes: [{ value: "partInfo", label: '隐藏信息点' }, { value: "all", label: '全部' }, { value: "Visible", label: '只看采集信息' }],
-      showType: "partInfo",
+      showTypes: [
+        // { value: "partInfo", label: '隐藏信息点' }, 
+        { value: "all", label: '全部' }, 
+        { value: "Visible", label: '只看采集信息' }
+      ],
+      showType: "Visible",
       tableHeader: [],
       tableData: session.get("rentAddData")? session.get("rentAddData").length? session.get("rentAddData"): [{}]: [{}],
       copyTableData: []

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

@@ -58,7 +58,11 @@ export default {
     return {
       addNum: 1,
       onlyRead: false,
-      showTypes: [{ value: "partInfo", label: '隐藏信息点' }, { value: "all", label: '全部' }, { value: "Visible", label: '只看采集信息' }],
+      showTypes: [
+        // { value: "partInfo", label: '隐藏信息点' }, 
+        { value: "all", label: '全部' }, 
+        { value: "Visible", label: '只看采集信息' }
+      ],
       tableHeader: [],
       tableData: session.get("systemAddData")
         ? session.get("systemAddData").length
@@ -91,7 +95,7 @@ export default {
       systemId: null,
       graphyId: null,
       id: 0,
-      showType: 'partInfo',
+      showType: 'Visible',
       EquipmentList: [],
     };
   },