ソースを参照

Merge branch 'dev' of git.sagacloud.cn:web/ibms into dev

zhangyu 4 年 前
コミット
5cc0427b4a

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

@@ -44,10 +44,10 @@
           <div v-for="(pic,index) in value.Value">
             <div>图纸名称:{{pic.Name}}
               <!--              <el-button style="" type="text" size="mini" @click="downloadFile(pic.Key)">下载</el-button>-->
-              <a
+           <a
                 style="cursor: pointer;color: #409eff"
-                :href="`/image-service/common/file_get/${pic.Key}?systemId=dataPlatform`"
-                :download="pic.Name"
+                :href="`/image-service/common/image_get?systemId=dataPlatform&key=${pic.key}`"
+                :download="pic.name"
               >下载</a>
             </div>
           </div>

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

+ 14 - 3
src/components/relation/relationShip/Modal/addRelationShip.vue

@@ -65,7 +65,7 @@
               :key="index"
               :prop="`codeList.${index}.value`"
               :rules="rules.codeList"
-              :error="fromError"
+              :error="item.fromError"
             >
               <el-input
                 v-model="item.value"
@@ -157,7 +157,9 @@
         ruleForm: {
           main: '',
           codeList: [{
-            value: ''
+            value: '',
+            fromError: '',
+            key: +new Date()
           }]
         },
         rules: {
@@ -202,6 +204,7 @@
           if (valid) {
             let arr = []
             for(let item  of this.ruleForm.codeList) {
+              item.fromError = ''
               if(item.value) {
                 arr = arr.concat(item.value)
               }
@@ -220,7 +223,15 @@
                   // this.mainError = res.data.Message
                   this.$nextTick(()=>{this.mainError = res.data.Message})
                 } else if(res.data.ErrorType == 2) {
-                  this.$nextTick(()=>{this.fromError = res.data.Message})
+                  const str = res.data.Message.split(':')
+                  this.$nextTick(()=>{
+                    this.ruleForm.codeList.forEach(t => {
+                      if (str.length > 1 && t.value == str[0]) {
+                        t.fromError = res.data.Message;
+                        t.key = +new Date()
+                      }
+                    })
+                  })
                 } else {
                   this.$message.error(res.data.Message);
                 }

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