Browse Source

解决冲突

zhangyu 4 years ago
parent
commit
f27c44c279

+ 7 - 7
src/components/business_space/lib/uploadImgsName.vue

@@ -346,17 +346,17 @@
   overflow: hidden;
 
   .avatar-uploader {
-    height: 180px;
-    width: 180px;
-    overflow: hidden;
+    /*height: 180px;*/
+    /*width: 180px;*/
+    /*overflow: hidden;*/
 
     .el-upload {
-      width: 180px;
-      height: 180px;
+      /*width: 180px;*/
+      /*height: 180px;*/
 
       .el-upload-dragger {
-        width: 180px;
-        height: 180px;
+        width: 180px !important;
+        height: 180px !important;
         .el-icon-plus {
           display: block;
           width: 20px;

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

@@ -113,7 +113,7 @@
       .base {
         margin: 10px;
         font-weight: 600;
-        text-indent: 10px;
+        /*text-indent: 10px;*/
         border-bottom: 1px dashed #eee;
       }
 

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

@@ -133,7 +133,7 @@
       /*border-left: 8px solid black;*/
       margin: 0 20px 0 10px;
       font-weight: 600;
-      text-indent: 10px;
+      /*text-indent: 10px;*/
       display: block;
       overflow: hidden;
 

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

@@ -20,7 +20,7 @@
     .title {
       margin-left: 10px;
       font-weight: 600;
-      text-indent: 10px;
+      /*text-indent: 10px;*/
     }
     .disable{
       color:#ccc;

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

@@ -143,7 +143,7 @@
       /*border-left: 8px solid black;*/
       margin: 10px;
       font-weight: 600;
-      text-indent: 10px;
+      /*text-indent: 10px;*/
       display: block;
       overflow: hidden;
     }

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

@@ -238,7 +238,7 @@
       /*border-left: 8px solid black;*/
       margin: 10px 10px 10px 0;
       font-weight: 600;
-      text-indent: 10px;
+      /*text-indent: 10px;*/
       display: block;
       overflow: hidden;
     }

+ 2 - 2
src/components/ledger/details/detail/lookVideo.vue

@@ -214,10 +214,10 @@
     overflow: hidden;
 
     .title {
-      border-left: 8px solid black;
+      /*border-left: 8px solid black;*/
       margin: 10px;
       font-weight: 600;
-      text-indent: 10px;
+      /*text-indent: 10px;*/
       display: block;
       overflow: hidden;
     }

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

@@ -41,7 +41,7 @@
       /*border-left: 8px solid black;*/
       margin: 10px 40px 10px 10px;
       font-weight: 600;
-      text-indent: 10px;
+      /*text-indent: 10px;*/
       display: inline-block;
 
     }

+ 3 - 2
src/components/ready/buildfloor/formItems.vue

@@ -73,7 +73,7 @@
           </el-input>
 
           <el-input v-model="form[item.Path]" v-else disabled title="暂不支持"></el-input>
-          <!--          <div>{{item.InfoPointCode}}</div>-->
+<!--                    <div>{{item.InfoPointCode}}</div>-->
         </el-form-item>
       </div>
     </el-form>
@@ -157,7 +157,8 @@
                 return item
             }
           })
-          this.InforsList = arr.filter(t => t)
+          //手动删除掉数据字典中不存在的字段,等待后台同步
+          this.InforsList = arr.filter(t => t && t.InfoPointCode != 'FloorQRCode')
         })
       },
       submitForm(call) {

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

@@ -41,10 +41,10 @@
     </div>
     <div class="footer">
       <el-button-group style="float:right;margin:8px 10px 0 0">
-        <el-button 
+        <el-button
           :disabled="list.findIndex(item => item.value == id) == 0"
           @click="handleClickPrev"
-          size="mini" 
+          size="mini"
           icon="el-icon-arrow-left">
           上一页
         </el-button>
@@ -56,7 +56,7 @@
             :value="item.value">
           </el-option>
         </el-select>
-        <el-button 
+        <el-button
           :disabled="list.findIndex(item => item.value == id) == list.length-1"
           @click="handleClickNext"
           size="mini">
@@ -236,10 +236,9 @@
             BeatchQueryParam(params, res => {
               arr = res.Content
               arr && arr.length && arr.map(child => {
-
                 this.pointData.forEach(head => {
                   if (head.InfoPointCode == child.code) {
-                    console.log(head.FirstName,child,'==')
+                    // console.log(head.FirstName,child,'==')
                     this.exhibitionEnergy.firstName = head.FirstName;
                     this.exhibitionEnergy.dynamic.push({
                       FirstName: head.FirstName,
@@ -266,10 +265,8 @@
         let isArr = []
         isList.map(j => {
           if (this.instance.hasOwnProperty(j.Path)) {
-            return {
-              ...j,
-              value: this.instance[j.Path]
-            }
+            j.value = this.instance[j.Path]
+            return j
           }
         })
         isArr = isList.filter(k => k.value)
@@ -370,11 +367,13 @@
         //处理数据格式
         arr.map(i => {
           if (i.InputMode == 'F2') {
+            console.log(i.Path, 'ppp')
             switch (i.Path) {
               case 'LedgerParam.InsuranceDoc.InsuranceFile':
               case 'LedgerParam.PhotoDoc.Archive':
               case 'LedgerParam.Siteinstall.CheckReport':
                 if (this.instance.hasOwnProperty(i.Path)) {
+                  debugger
                   i.fileList = this.instance[i.Path]
                 }
                 if (picObject[i.InfoPointName]) {

+ 2 - 4
src/views/ledger/facility/details/index_old.vue

@@ -251,10 +251,8 @@
         let isArr = []
         isList.map(j => {
           if (this.instance.hasOwnProperty(j.Path)) {
-            return {
-              ...j,
-              value: this.instance[j.Path]
-            }
+            j.value = this.instance[j.Path]
+            return j
           }
         })
         isArr = isList.filter(k => k.value)

+ 6 - 8
src/views/ledger/property/details/index.vue

@@ -35,10 +35,10 @@
     </div>
     <div class="footer">
       <el-button-group style="float:right;margin:8px 10px 0 0">
-        <el-button 
+        <el-button
           :disabled="list.findIndex(item => item.value == id) == 0"
           @click="handleClickPrev"
-          size="mini" 
+          size="mini"
           icon="el-icon-arrow-left">
           上一页
         </el-button>
@@ -50,14 +50,14 @@
             :value="item.value">
           </el-option>
         </el-select>
-        <el-button 
+        <el-button
           :disabled="list.findIndex(item => item.value == id) == list.length-1"
           @click="handleClickNext"
           size="mini">
           下一页
           <i class="el-icon-arrow-right el-icon--right"></i>
         </el-button>
-      </el-button-group> 
+      </el-button-group>
     </div>
   </div>
 </template>
@@ -197,10 +197,8 @@
         let isArr = []
         isList.map(j => {
           if (this.instance.hasOwnProperty(j.Path)) {
-            return {
-              ...j,
-              value: this.instance[j.Path]
-            }
+            j.value = this.instance[j.Path]
+            return j
           }
         })
         isArr = isList.filter(k => k.value)

+ 3 - 5
src/views/ledger/property/details/index_old.vue

@@ -186,10 +186,8 @@
         let isArr = []
         isList.map(j => {
           if (this.instance.hasOwnProperty(j.Path)) {
-            return {
-              ...j,
-              value: this.instance[j.Path]
-            }
+            j.value = this.instance[j.Path]
+            return j
           }
         })
         isArr = isList.filter(k => k.value)
@@ -372,7 +370,7 @@
             }
             source.forEach(j => {
               if (j.Code == this.instance[i.Path]) {
-                console.log(j.Name)
+
                 i.value = j.Name
               }
             })

+ 2 - 4
src/views/ledger/spacelist/spaceDetail/index.vue

@@ -262,10 +262,8 @@
       let isArr = []
       isList.map(j => {
         if (this.instance.hasOwnProperty(j.Path)) {
-          return {
-            ...j,
-            value: this.instance[j.Path]
-          }
+          j.value = this.instance[j.Path]
+          return j
         }
       })
       isArr = isList.filter(k => k.value)

+ 2 - 4
src/views/ledger/system/systemDetail/index.vue

@@ -248,10 +248,8 @@
       let isArr = []
       isList.map(j => {
         if (this.instance.hasOwnProperty(j.Path)) {
-          return {
-            ...j,
-            value: this.instance[j.Path]
-          }
+          j.value = this.instance[j.Path]
+          return j
         }
       })
       isArr = isList.filter(k => k.value)

+ 1 - 0
src/views/ready/buildfloor/addFloor/index.vue

@@ -44,6 +44,7 @@
           this.floorData = tools.desFormatData(this.floorData)
           //===测试代码===
           // this.floorData.DefaultQRCode = 'Eq1101080004a93a45ce15e948dda155e9683803cf46QR'
+          // this.floorData.QRCodePic = 'Eq1101080004a93a45ce15e948dda155e9683803cf46QR'
           //=====
           this.timeoutSetVal()
           this.dialogVisible = true;

+ 4 - 2
src/views/ready/buildfloor/index.vue

@@ -16,8 +16,10 @@
             <!--              </div>-->
             <!--              <el-button slot="reference" icon="el-icon-minus" size="small" type="default"/>-->
             <!--            </el-popover>-->
-            <el-button @click="delBuild" icon="el-icon-minus" size="small" type="default"/>
-            <el-button @click="editBuild" icon="el-icon-edit-outline" size="small" type="default"/>
+            <el-button @click="delBuild" icon="el-icon-minus" size="small" type="default"
+                       :disabled="!buildList.length"/>
+            <el-button @click="editBuild" icon="el-icon-edit-outline" size="small" type="default"
+                       :disabled="!buildList.length"/>
           </div>
         </div>
         <h4>建筑</h4>