GuoYuFu123 5 years ago
parent
commit
d4fe272518
29 changed files with 124 additions and 83 deletions
  1. 4 2
      src/components/business_space/dialogs/list/filesDialog.vue
  2. 1 1
      src/components/business_space/dialogs/list/picDialog.vue
  3. 5 2
      src/components/business_space/dialogs/list/uploadImgDialog.vue
  4. 1 1
      src/components/business_space/lib/cascaders/assets.vue
  5. 1 1
      src/components/business_space/lib/cascaders/system.vue
  6. 1 1
      src/components/business_space/lib/floorCascader.vue
  7. 4 4
      src/components/business_space/lib/lookImages.vue
  8. 11 10
      src/components/business_space/lib/uploadFiles.vue
  9. 4 2
      src/components/dialogs/addDialog/dialogAssets.vue
  10. 7 6
      src/components/dialogs/addDialog/dialogDevice.vue
  11. 4 2
      src/components/dialogs/list/filesDialog.vue
  12. 1 1
      src/components/dialogs/list/picDialog.vue
  13. 4 2
      src/components/dialogs/list/uploadImgDialog.vue
  14. 20 0
      src/components/ledger/addDialog/dialogAssets.vue
  15. 5 5
      src/components/ledger/addDialog/dialogDevice.vue
  16. 8 6
      src/components/ledger/handsontables/assets.vue
  17. 5 5
      src/components/ledger/handsontables/device.vue
  18. 9 6
      src/components/ledger/handsontables/system.vue
  19. 1 1
      src/components/ledger/lib/assets.vue
  20. 1 1
      src/components/ledger/lib/cascader.vue
  21. 1 1
      src/components/ledger/lib/floorCascader.vue
  22. 3 3
      src/components/ledger/lib/lookImages.vue
  23. 1 1
      src/components/ledger/lib/qrcode.vue
  24. 1 1
      src/components/ledger/lib/system.vue
  25. 1 1
      src/components/ledger/lib/title.vue
  26. 12 12
      src/components/ledger/lib/uploadFiles.vue
  27. 0 1
      src/views/data_admin/buildAssets/Noverify.vue
  28. 5 1
      src/views/data_admin/buildAssets/index.vue
  29. 3 3
      src/views/data_admin/buildLog/index.vue

+ 4 - 2
src/components/business_space/dialogs/list/filesDialog.vue

@@ -3,8 +3,10 @@
 -->
 
 <template>
-  <el-dialog title="上传文件" :visible.sync="dialog.uploadFiles" width="30%">
-    <upload-files :readOnly="read" :keysArr="keysArr" @change="changeItem" max="2"></upload-files>
+  <el-dialog title="上传文件" :visible.sync="dialog.uploadFiles" width="500px">
+    <div class='max-height: 500px; overflow-y: auto;'>
+        <upload-files :readOnly="read" :keysArr="keysArr" @change="changeItem" max="2"></upload-files>
+    </div>
   </el-dialog>
 </template>
 <script>

+ 1 - 1
src/components/business_space/dialogs/list/picDialog.vue

@@ -3,7 +3,7 @@
 -->
 
 <template>
-  <el-dialog title="上传图片" :visible.sync="dialog.pic" width="40%">
+  <el-dialog title="上传图片" :visible.sync="dialog.pic" width="500px">
     <div style="max-height:500px;overflow-y:auto;">
       <div>
         <h3>设备图片</h3>

+ 5 - 2
src/components/business_space/dialogs/list/uploadImgDialog.vue

@@ -3,8 +3,11 @@
 -->
 
 <template>
-  <el-dialog title="上传图片" :visible.sync="dialog.uploadImgs" width="460px">
-    <upload-imgs :readOnly="read" :keysArr="deepcopy(keysArr)" @change="changeItem" max="2"></upload-imgs>
+  <el-dialog title="上传图片" :visible.sync="dialog.uploadImgs" width="500px">
+      <div class="max-height: 500px; overflow-y: auto;">
+          <upload-imgs :readOnly="read" :keysArr="deepcopy(keysArr)" @change="changeItem" max="2"></upload-imgs>
+      </div>
+    
   </el-dialog>
 </template>
 <script>

+ 1 - 1
src/components/business_space/lib/cascaders/assets.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="cascaderMap">
-    <span class="buildFloor">设备族</span>
+    <span class="buildFloor" style="padding-right: 12px;">设备族</span>
     <el-cascader
       placeholder="请选择"
       :options="options"

+ 1 - 1
src/components/business_space/lib/cascaders/system.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="cascaderMap">
-    <span class="buildFloor">所属专业系统类型</span>
+    <span class="buildFloor" style="padding-right: 12px;">所属专业系统类型</span>
     <el-cascader
       placeholder="请选择"
       :options="options"

+ 1 - 1
src/components/business_space/lib/floorCascader.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="buildFloor">
-    <span class="buildFloor">所属建筑楼层</span>
+    <span class="buildFloor" style="padding-right: 12px;">所属建筑楼层</span>
     <el-cascader
       placeholder="请选择建筑楼层"
       :options="options"

+ 4 - 4
src/components/business_space/lib/lookImages.vue

@@ -3,8 +3,8 @@
 -->
 
 <template>
-  <el-dialog title="上传图片" :visible.sync="dialog.lookPic" v-if="dialog.lookPic" width="600px">
-    <div style="max-height:700px;overflow-y:auto;">
+  <el-dialog title="上传图片" :visible.sync="dialog.lookPic" v-if="dialog.lookPic" width="500px">
+    <div style="max-height:500px;overflow-y:auto;">
       <el-tabs type="border-card">
         <el-tab-pane>
           <span slot="label">图片</span>
@@ -41,9 +41,9 @@
                 width="100%"
                 height="100%"
                 :src="
-                '/img/image-service/common/image_get?systemId=dataPlatform&key='+item.key"
+                '/image-service/common/image_get?systemId=dataPlatform&key='+item.key"
                 controls
-                :poster="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
+                :poster="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
               ></video>
             </div>
           </div>

+ 11 - 10
src/components/business_space/lib/uploadFiles.vue

@@ -10,15 +10,7 @@
 <template>
   <div id="saga-upload">
     <div id="uploadFile">
-      <div v-if="item && filesArr.length" v-for="(item,index) in filesArr">
-        <el-button type="text" @click="download(item)">{{delFile(item)}}</el-button>
-        <i
-          v-if="!readOnly"
-          class="el-icon-close delete-icon"
-          style="margin-left:10px; cursor:pointer"
-          @click="deleteFile(index,item)"
-        ></i>
-      </div>
+
       <el-upload
         v-if="filesArr.length < max"
         class="upload-file"
@@ -30,6 +22,15 @@
         <el-button size="small" type="primary" v-if="!readOnly">点击上传</el-button>
         <div slot="tip" class="el-upload__tip" v-if="!readOnly">请上传文件</div>
       </el-upload>
+            <div v-if="item && filesArr.length" v-for="(item,index) in filesArr">
+        <el-button type="text" @click="download(item)">{{delFile(item)}}</el-button>
+        <i
+          v-if="!readOnly"
+          class="el-icon-close delete-icon"
+          style="margin-left:10px; cursor:pointer"
+          @click="deleteFile(index,item)"
+        ></i>
+      </div>
     </div>
   </div>
 </template>
@@ -140,7 +141,7 @@ export default {
             /* method */
             "POST",
             /* target url */
-            "/img/image-service/common/file_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true" + key
+            "/image-service/common/file_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true" + key
             /*, async, default to true */
           );
           //xhr.overrideMimeType("application/octet-stream");

+ 4 - 2
src/components/dialogs/addDialog/dialogAssets.vue

@@ -416,8 +416,8 @@ export default {
       this.ajaxResult = true
       let param = {
         FmList: data,
-        ProjId: this.$route.query.projId,
-        UserId: this.$route.query.userId
+        ProjId: this.projectId,
+        UserId: this.userId
       }
       await this.createAssetId(param)
     },
@@ -804,12 +804,14 @@ export default {
 
     //上传图片弹窗触发事件
     imgChange(keys) {
+       console.log(keys, "keys", this.messKey.split("."), this.row,'22222222222222')
       this.setDataToMain(keys[0], this.messKey.split("."), this.row)
       tools.setItem(this.deviceType.code, this.main)
     },
 
     //设备图片弹窗改变事件
     changePics(keys) {
+        console.log(keys, "keys", this.messKey.split("."), this.row,'22222222222222')
       this.setDataToMain(keys, this.messKey.split("."), this.row)
       tools.setItem(this.deviceType.code, this.main)
     },

+ 7 - 6
src/components/dialogs/addDialog/dialogDevice.vue

@@ -422,8 +422,8 @@ export default {
     async createJson(data) {
       let param = {
         data: { criterias: data },
-        ProjId: this.$route.query.projId,
-        secret: this.$route.query.secret
+        ProjId: this.projectId,
+        secret: this.secret
       }
       param.data.criterias.map(item => {
         if (!!item.infos.DPSupplierID && !!item.infos.DPSupplierID[0].value) {
@@ -488,8 +488,8 @@ export default {
     async EqCreateAs(list) {
       let param = {
         FmList: [],
-        ProjId: this.$route.query.projId,
-        UserId: this.$route.query.userId
+        ProjId: this.projectId,
+        UserId: this.userId
       }
       list.map(item => {
         param.FmList.push({
@@ -498,7 +498,7 @@ export default {
           FmName: item.EquipLocalName || "",
           Family: this.deviceType.assetType,
           FamilyName: this.deviceType.assetName,
-          ProjId: this.$route.query.projId,
+          ProjId: this.projectId,
           Inofs: {
             DPManufacturerID: item.infos.DPManufacturerID ? item.infos.DPManufacturerID[0].value : null,
             DPSpecificationID: item.infos.DPSpecificationID ? item.infos.DPSpecificationID[0].value : null,
@@ -915,13 +915,14 @@ export default {
 
     //上传图片弹窗触发事件
     imgChange(keys) {
-      console.log(keys, "keys", this.messKey.split("."), this.row)
+      console.log(keys, "keys", this.messKey.split("."), this.row,'22222222222222')
       this.setDataToMain(keys, this.messKey.split(".")[1], this.row)
       tools.setItem(this.deviceType.code, this.main)
     },
 
     //设备图片弹窗改变事件
     changePics(keys) {
+        console.log(keys, "keys", this.messKey.split("."), this.row,'22222222222222')
       this.setDataToMain(keys, this.messKey.split(".")[1], this.row)
       tools.setItem(this.deviceType.code, this.main)
     },

+ 4 - 2
src/components/dialogs/list/filesDialog.vue

@@ -3,8 +3,10 @@
 -->
 
 <template>
-  <el-dialog title="上传文件" :visible.sync="dialog.uploadFiles" width="30%">
-    <upload-files :readOnly="read" :keysArr="keysArr" @change="changeItem" max="2"></upload-files>
+  <el-dialog title="上传文件" :visible.sync="dialog.uploadFiles" width="500px">
+      <div class='max-height: 500px; overflow-y: auto;'>
+        <upload-files :readOnly="read" :keysArr="keysArr" @change="changeItem" max="2"></upload-files>
+      </div>
   </el-dialog>
 </template>
 <script>

+ 1 - 1
src/components/dialogs/list/picDialog.vue

@@ -3,7 +3,7 @@
 -->
 
 <template>
-  <el-dialog title="上传图片" :visible.sync="dialog.pic" width="40%">
+  <el-dialog title="上传图片" :visible.sync="dialog.pic" width="500px;">
     <div style="max-height:500px;overflow-y:auto;">
       <div>
         <h3>设备图片</h3>

+ 4 - 2
src/components/dialogs/list/uploadImgDialog.vue

@@ -3,8 +3,10 @@
 -->
 
 <template>
-  <el-dialog title="上传图片" :visible.sync="dialog.uploadImgs" width="460px">
-    <upload-imgs :readOnly="read" :keysArr="deepcopy(keysArr)" @change="changeItem" max="2"></upload-imgs>
+  <el-dialog title="上传图片" :visible.sync="dialog.uploadImgs" width="500px">
+    <div style="max-height: 500px; overflow-y: auto;">
+        <upload-imgs :readOnly="read" :keysArr="deepcopy(keysArr)" @change="changeItem" max="2"></upload-imgs>
+    </div>
   </el-dialog>
 </template>
 <script>

+ 20 - 0
src/components/ledger/addDialog/dialogAssets.vue

@@ -804,6 +804,7 @@ export default {
 
     //上传图片弹窗触发事件
     imgChange(keys) {
+    console.log(keys,'keys')
       this.setDataToMain(keys[0], this.messKey.split("."), this.row)
       tools.setItem(this.deviceType.code, this.main)
     },
@@ -815,6 +816,25 @@ export default {
     },
 
     //判断是否有值,有值赋值
+    // setDataToMain(data, key, row) {
+    //     console.log(data, key, row)
+    //   if (!!data && data != '--') {
+    //       console.log("data存在")
+    //     if (!!this.main[row].infos) {
+    //       //铭牌照片特殊处理
+    //       console.log("处理保存",key)
+    //       this.main[row][key[0]][key[1]] = data
+    //       console.log(this.main)
+    //     } else {
+    //         console.log("存储已保存")
+    //       this.main[row][key[0]] = {}
+    //       this.main[row][key[0]][key[1]] = data
+    //     }
+    //   } else {
+    //     this.main[row].infos[key] = ''
+    //   }
+    // },
+    //判断是否有值,有值赋值
     setDataToMain(data, key, row) {
       if (!!data && data != '--') {
         if (!!this.main[row].infos) {

+ 5 - 5
src/components/ledger/addDialog/dialogDevice.vue

@@ -413,8 +413,8 @@ export default {
     async createJson(data) {
       let param = {
         data: { criterias: data },
-        ProjId: this.$route.query.projId,
-        secret: this.$route.query.secret
+        ProjId: this.projectId,
+        secret: this.secret
       }
       param.data.criterias.map(item => {
         if (!!item.infos.DPSupplierID && !!item.infos.DPSupplierID[0].value) {
@@ -479,8 +479,8 @@ export default {
     async EqCreateAs(list) {
       let param = {
         FmList: [],
-        ProjId: this.$route.query.projId,
-        UserId: this.$route.query.userId
+        ProjId: this.projectId,
+        UserId: this.userId
       }
       list.map(item => {
         param.FmList.push({
@@ -489,7 +489,7 @@ export default {
           FmName: item.EquipLocalName || "",
           Family: this.deviceType.assetType,
           FamilyName: this.deviceType.assetName,
-          ProjId: this.$route.query.projId,
+          ProjId: this.projectId,
           Inofs: {
             DPManufacturerID: item.infos.DPManufacturerID ? item.infos.DPManufacturerID[0].value : null,
             DPSpecificationID: item.infos.DPSpecificationID ? item.infos.DPSpecificationID[0].value : null,

+ 8 - 6
src/components/ledger/handsontables/assets.vue

@@ -11,11 +11,11 @@
     <div class="hanson-bar">
       <span>当前筛选条件下共{{page.total || '--'}}资产</span>
       <div style="width:300px;float:right;overflow:hidden;">
-        <el-button size="small" @click="addDevice" icon="iconfont icon-tianjia">添加资产</el-button>
-        <el-button size="small" @click="reset" icon="iconfont icon-shuaxin">&nbsp;&nbsp;&nbsp;刷新&nbsp;&nbsp;&nbsp;</el-button>
-        <el-button size="small" @click="undo" icon="iconfont icon-undo">&nbsp;&nbsp;&nbsp;撤销&nbsp;&nbsp;&nbsp;</el-button>
+        <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>
       </div>
-      <div style="width:200px;color:gray;float:right;padding-top:7px;font-size:10px;">
+      <div style="width:200px;color:gray;float:right;font-size:10px;">
         <span v-if="!onlyRead">隐藏自动填充的信息点:</span>
         <el-tooltip v-if="!onlyRead" :content="'' + (isWatch ? '隐藏' : '不隐藏')" placement="top">
           <el-switch
@@ -36,7 +36,7 @@
         </el-tooltip>
       </div>
       <div
-        style="width:90px;cursor: pointer;color:gray;float:right; font-size:10px;padding-top:7px;"
+        style="width:90px;cursor: pointer;color:gray;float:right; font-size:10px;"
       >
         <p v-if="onlyRead" @click="changeRead">
           <i class="iconfont icon-yulan"></i>
@@ -79,7 +79,9 @@
       style="width:100%;text-align:center;font-size:30px;color:gray;"
     >请选择设备族</div>
     <div v-show="main && main.length" v-loading="loading" id="handsontable" ref="handsontable"></div>
-    <my-pagination v-show="main && main.length" @change="getMain" :page="page"></my-pagination>
+    <div class='right'>
+        <my-pagination v-show="main && main.length" @change="getMain" :page="page"></my-pagination>
+    </div>
     <dialog-assets
       :assetType="[this.mess.deviceId]"
       @close="closeDialog"

+ 5 - 5
src/components/ledger/handsontables/device.vue

@@ -9,10 +9,10 @@
       </span>
       <span>当前筛选条件下共{{page.total || '--'}}设备</span>
       <div style="width:390px;float:right;overflow:hidden;">
-        <el-button size="small" @click="download" icon="iconfont icon-xiazai">&nbsp;&nbsp;&nbsp;下载&nbsp;&nbsp;&nbsp;</el-button>
-        <el-button size="small" @click="addDevice" icon="iconfont icon-tianjia">添加设备</el-button>
-        <el-button size="small" @click="reset" icon="iconfont icon-shuaxin">&nbsp;&nbsp;&nbsp;刷新&nbsp;&nbsp;&nbsp;</el-button>
-        <el-button size="small" @click="undo" icon="iconfont icon-undo">&nbsp;&nbsp;&nbsp;撤销&nbsp;&nbsp;&nbsp;</el-button>
+        <el-button size="small" style='width: 80px;' @click="download" icon="iconfont icon-xiazai">下载</el-button>
+        <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>
       </div>
       <div style="width:200px;color:gray;float:right;font-size:10px;">
         <span v-if="!onlyRead">隐藏自动填充的信息点:</span>
@@ -35,7 +35,7 @@
         </el-tooltip>
       </div>
       <div
-        style="width:90px;cursor: pointer;color:gray;float:right; font-size:10px;padding-top:7px;"
+        style="width:90px;cursor: pointer;color:gray;float:right; font-size:10px;"
       >
         <p v-if="onlyRead" @click="changeRead">
           <i class="iconfont icon-yulan"></i>

+ 9 - 6
src/components/ledger/handsontables/system.vue

@@ -3,11 +3,11 @@
     <div class="hanson-bar">
       <span>当前筛选条件下共{{page.total || '--'}}系统</span>
       <div style="width:300px;float:right;overflow:hidden;">
-        <el-button size="small" @click="addDevice" icon="iconfont icon-tianjia">添加系统</el-button>
-        <el-button size="small" @click="reset" icon="iconfont icon-shuaxin">&nbsp;&nbsp;&nbsp;刷新&nbsp;&nbsp;&nbsp;</el-button>
-        <el-button size="small" @click="undo" icon="iconfont icon-undo">&nbsp;&nbsp;&nbsp;撤销&nbsp;&nbsp;&nbsp;</el-button>
+        <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>
       </div>
-      <div style="width:200px;color:gray;float:right;padding-top:7px;font-size:10px;">
+      <div style="width:200px;color:gray;float:right;font-size:10px;">
         <span v-if="!onlyRead">隐藏自动填充的信息点:</span>
         <el-tooltip v-if="!onlyRead" :content="'' + (isWatch ? '隐藏' : '不隐藏')" placement="top">
           <el-switch
@@ -28,7 +28,7 @@
         </el-tooltip>
       </div>
       <div
-        style="width:90px;cursor: pointer;color:gray;float:right; font-size:10px;padding-top:7px;"
+        style="width:90px;cursor: pointer;color:gray;float:right; font-size:10px;"
       >
         <p v-if="onlyRead" @click="changeRead">
           <i class="iconfont icon-yulan"></i>
@@ -55,7 +55,9 @@
       style="width:100%;text-align:center;font-size:30px;color:gray;"
     >请选择系统类型</div>
     <div v-show="main && main.length" v-loading="loading" id="handsontable" ref="handsontable"></div>
-    <my-pagination v-show="main && main.length" @change="getMain" :page="page"></my-pagination>
+    <div class="right">
+        <my-pagination v-show="main && main.length" @change="getMain" :page="page"></my-pagination>
+    </div>
     <dialog-assets
       :assetType="[this.mess.deviceId]"
       @close="getClose"
@@ -1034,6 +1036,7 @@ export default {
   font-size: 14px;
   overflow: hidden;
   margin-top: 10px;
+  line-height: 40px;
   .iconfont {
     font-size: 12px;
   }

+ 1 - 1
src/components/ledger/lib/assets.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="cascaderMap">
-    <span class="buildFloor">设备族</span>
+    <span class="buildFloor" style="padding-right: 12px;">设备族</span>
     <el-cascader
       placeholder="请选择"
       :options="options"

+ 1 - 1
src/components/ledger/lib/cascader.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="cascaderMap">
-    <span class="buildFloor">设备类别</span>
+    <span class="buildFloor" style="margin-right: 12px;">设备类别</span>
     <el-cascader
       placeholder="请选择"
       :options="options"

+ 1 - 1
src/components/ledger/lib/floorCascader.vue

@@ -1,6 +1,6 @@
 <template>
     <div id="buildFloor">
-        <span class="buildFloor">所属建筑楼层</span>
+        <span class="buildFloor" style="margin-right: 12px;">所属建筑楼层</span>
         <el-cascader placeholder="请选择建筑楼层" :options="options" v-model="value" filterable size="small" :style="isWidth ? '' : 'width:160px;'" @change="changeCascader"></el-cascader>
     </div>
 </template>

+ 3 - 3
src/components/ledger/lib/lookImages.vue

@@ -3,7 +3,7 @@
 -->
 
 <template>
-  <el-dialog title="上传图片" :visible.sync="dialog.lookPic" v-if="dialog.lookPic" width="600px">
+  <el-dialog title="上传图片" :visible.sync="dialog.lookPic" v-if="dialog.lookPic" width="500px">
     <div style="max-height:500px;overflow-y:auto;">
       <el-tabs type="border-card">
         <el-tab-pane>
@@ -41,9 +41,9 @@
                 width="100%"
                 height="100%"
                 :src="
-                '/img/image-service/common/image_get?systemId=dataPlatform&key='+item.key"
+                '/image-service/common/image_get?systemId=dataPlatform&key='+item.key"
                 controls
-                :poster="'img/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
+                :poster="'/image-service/common/image_get?systemId=dataPlatform&key='+ item.key +'&width=200'"
               ></video>
             </div>
           </div>

+ 1 - 1
src/components/ledger/lib/qrcode.vue

@@ -10,7 +10,7 @@
       <div id="qrcode">
         <img
           style="width:200px;height:200px;margin:auto;display:block;"
-          :src="'img/image-service/common/file_get/'+ qrcodeUrl +'?systemId=dataPlatform'"
+          :src="'/image-service/common/file_get/'+ qrcodeUrl +'?systemId=dataPlatform'"
           alt="二维码"
         >
       </div>

+ 1 - 1
src/components/ledger/lib/system.vue

@@ -1,6 +1,6 @@
 <template>
   <div id="cascaderMap">
-    <span class="buildFloor">所属专业系统类型</span>
+    <span class="buildFloor" style="padding-right: 12px;">所属专业系统类型</span>
     <el-cascader
       placeholder="请选择"
       :options="options"

+ 1 - 1
src/components/ledger/lib/title.vue

@@ -4,7 +4,7 @@
 <template>
     <div id="listHeader">
         <div class="border-main">
-            <p class="list-name">项目名称: {{mess.perjectName}}</p>
+            <p class="list-name"><span style="padding-right: 12px;">项目名称</span>{{mess.perjectName}}</p>
             <div class="card-view">
                 <div class="card" v-for="(i,index) in mess.name" :key="index">
                     <p>{{index == 1 ? "已对应" : "全部"}}{{i.key}}</p>

+ 12 - 12
src/components/ledger/lib/uploadFiles.vue

@@ -10,26 +10,26 @@
 <template>
   <div id="saga-upload">
     <div id="uploadFile">
-      <div v-if="item && filesArr.length" v-for="(item,index) in filesArr">
-        <el-button type="text" @click="download(item)">{{delFile(item)}}</el-button>
-        <i
-          v-if="!readOnly"
-          class="el-icon-close delete-icon"
-          style="margin-left:10px; cursor:pointer"
-          @click="deleteFile(index,item)"
-        ></i>
-      </div>
+
       <el-upload
         v-if="filesArr.length < max"
         class="upload-file"
         action
         :http-request="uploadAndSubmit"
-        :show-file-list="false"
         drag
       >
         <el-button size="small" type="primary" v-if="!readOnly">点击上传</el-button>
         <div slot="tip" class="el-upload__tip" v-if="!readOnly">请上传文件</div>
       </el-upload>
+            <div v-if="item && filesArr.length" v-for="(item,index) in filesArr">
+        <el-button type="text" @click="download(item)">{{delFile(item)}}</el-button>
+        <i
+          v-if="!readOnly"
+          class="el-icon-close delete-icon"
+          style="margin-left:10px; cursor:pointer"
+          @click="deleteFile(index,item)"
+        ></i>
+      </div>
     </div>
   </div>
 </template>
@@ -92,7 +92,7 @@ export default {
     //点击下载
     download(key) {
       console.log(key)
-      window.open("/img/image-service/common/file_get/" + key + "?systemId=dataPlatform")
+      window.open("/image-service/common/file_get/" + key + "?systemId=dataPlatform")
     },
 
     //删除图片
@@ -140,7 +140,7 @@ export default {
             /* method */
             "POST",
             /* target url */
-            "/img/image-service/common/file_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true" + key
+            "/image-service/common/file_upload?systemId=dataPlatform&secret=9e0891a7a8c8e885&overwrite=true" + key
             /*, async, default to true */
           );
           //xhr.overrideMimeType("application/octet-stream");

+ 0 - 1
src/views/data_admin/buildAssets/Noverify.vue

@@ -311,7 +311,6 @@ export default {
 
 <style scoped lang='less'>
 .btn-box {
-    border: 1px solid #dfe6ec;
     padding: 10px;
 }
 </style>

+ 5 - 1
src/views/data_admin/buildAssets/index.vue

@@ -2,7 +2,7 @@
     <div class='box'>
         <div class='condition'>
             <p>
-                <span>建筑名称</span>
+                <span style="margin-right: 12px">建筑名称</span>
                 <el-select v-model='buildVlaue' placeholder='请选择' clearable>
                     <el-option
                         v-for='item in options'
@@ -142,3 +142,7 @@ export default {
     }
 }
 </style>
+<style>
+.box .el-tabs__nav {margin-left: 10px;}
+</style>
+

+ 3 - 3
src/views/data_admin/buildLog/index.vue

@@ -23,9 +23,9 @@
                     @change='dateChange'
                     value-format='yyyy-MM-dd'
                 ></el-date-picker>
-                <el-button @click='action'>&nbsp;动作说明&nbsp;</el-button>
-                <el-button @click='refresh'>&nbsp;&nbsp;&nbsp;刷新&nbsp;&nbsp;&nbsp;</el-button>
-                <el-button @click='downExcel'>导出到Excel</el-button>
+                <el-button style="width: 96px" @click='action'>动作说明</el-button>
+                <el-button style="width: 96px" @click='refresh'>刷新</el-button>
+                <el-button style="width: 96px" @click='downExcel'>导出到Excel</el-button>
             </div>
             <el-table
                 slot='table'