Browse Source

Merge branch 'dev' of http://39.106.8.246:3003/web/adm into dev

haojianlong 4 years ago
parent
commit
91f1e50913

+ 20 - 20
src/components/business_space/lib/uploadFiles.vue

@@ -18,9 +18,9 @@
         <el-button size="small" :type="isShow ===1 ? 'text':'primary'" v-if="!readOnly">点击上传</el-button>
         <div slot="tip" class="el-upload__tip" v-if="(isShow !== 1 || isShow == undefined) && !readOnly">请上传文件,且不大于50M</div>
       </el-upload>
-      <div v-show="item && filesArr.length" v-for="(item,index) in filesArr" :key="item.Key">
+      <div v-show="item && filesArr.length" v-for="(item,index) in filesArr" :key="item.key">
         <p class="file-list">
-          <span class="file-name" :title="item.Name">{{item.Name}}</span>
+          <span class="file-name" :title="item.name">{{item.name}}</span>
           <i title="下载" class="el-icon-download" style="margin-left:10px; cursor:pointer" @click="download(item)"></i>
           <i v-if="!readOnly" title="删除" class="el-icon-close delete-icon" style="margin-left:10px; cursor:pointer" @click="deleteFile(index,item)"></i>
         </p>
@@ -30,19 +30,19 @@
 </template>
 
 <script>
-  import tools from "@/utils/scan/tools";
-
-  export default {
-    props: {
-      keysArr: {
-        type: [Array, String],
-        default: function () {
-          return []
-        }
-      },
-      readOnly: {
-        type: Boolean,
-        default: false
+import tools from "@/utils/scan/tools";
+
+export default {
+  props: {
+    keysArr: {
+      type: [Array, String],
+      default: function () {
+        return []
+      }
+    },
+    readOnly: {
+      type: Boolean,
+      default: false
       },
       max: {
         type: [Number, String],
@@ -164,11 +164,11 @@
                   console.log(xhr)
                   if (xhr.status == 200) {
                     let fileObject = {
-                      Key: key.split("=")[1],
-                      Type: type,
-                      Name: file.name,
-                      CreateTime,
-                      SystemId: 'dataPlatform'
+                      key: key.split("=")[1],
+                      type,
+                      name: file.name,
+                      createTime: CreateTime,
+                      systemId: 'dataPlatform'
                     }
                     vm.filesArr.push(fileObject);
 

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

@@ -10,10 +10,10 @@
       <div v-if="type != 'video'" class="point-view" v-for="(item,index) in imagesArr">
         <div class="point-image">
           <i v-if="!readOnly" class="el-icon-delete" @click="delImage(index,item)"></i>
-          <img @click="lookImg" :src="imageGetUrl + '&key=' +item.Key" alt v-load>
+          <img @click="lookImg" :src="imageGetUrl + '&key=' +item.key" alt v-load>
         </div>
-        <p v-if="readOnly" >{{item.Name}}</p>
-        <form-input v-else :label="''" @change="getName" :keys="index" :value="item.Name" :width="10"></form-input>
+        <p v-if="readOnly" >{{item.name}}</p>
+        <form-input v-else :label="''" @change="getName" :keys="index" :value="item.name" :width="10"></form-input>
       </div>
       <div v-if="type == 'video'" class="point-view" v-for="(item,index) in imagesArr">
         <div class="point-image">
@@ -21,12 +21,12 @@
           <video
             width="100%"
             height="100%;"
-            :src="imageGetUrl + '&key=' +item.Key"
+            :src="imageGetUrl + '&key=' +item.key"
             controls="controls"
           >您的浏览器不支持 video 标签。</video>
         </div>
-        <p v-if="readOnly" >{{item.Name}}</p>
-        <form-input v-else :label="''" @change="getName" :keys="index" :value="item.Name" :width="10"></form-input>
+        <p v-if="readOnly" >{{item.name}}</p>
+        <form-input v-else :label="''" @change="getName" :keys="index" :value="item.name" :width="10"></form-input>
       </div>
       <div v-if="!readOnly" style="float:left;">
         <el-upload
@@ -47,41 +47,41 @@
   </div>
 </template>
 <script>
-  import tools from "@/utils/scan/tools";
-  import formInput from "@/components/business_space/lib/formInput"
-  import detailsDialog from "@/components/business_space/lib/detailsDia"
+import tools from "@/utils/scan/tools";
+import formInput from "@/components/business_space/lib/formInput"
+import detailsDialog from "@/components/business_space/lib/detailsDia"
 
-  export default {
-    components: {
-      formInput,
-      detailsDialog
+export default {
+  components: {
+    formInput,
+    detailsDialog
+  },
+  props: {
+    keysArr: {
+      type: [Array, String]
+    },
+    readOnly: {
+      type: Boolean,
+      default: false
+    },
+    max: {
+      type: [Number, String],
+      default: 6
+    },
+    accept: {
+      type: String,
+      default: "image/*"
+    },
+    type: {
+      type: String,
+      default: "image"
+    },
+    contextKey: {
+      type: [String, Object]
+    },
+    isShow: {
+      type: [Number, String]
     },
-    props: {
-      keysArr: {
-        type: [Array, String]
-      },
-      readOnly: {
-        type: Boolean,
-        default: false
-      },
-      max: {
-        type: [Number, String],
-        default: 6
-      },
-      accept: {
-        type: String,
-        default: "image/*"
-      },
-      type: {
-        type: String,
-        default: "image"
-      },
-      contextKey: {
-        type: [String, Object]
-      },
-      isShow: {
-        type: [Number, String]
-      },
       defined: null,
       videoPicArr: {
         type: Array,
@@ -208,30 +208,30 @@
               if (xhr.status == 200) {
                 if (vm.type == 'image') {
                   vm.imagesArr.push({
-                      Name: uploadKey + '',
-                      Key: uploadKey + "." + type,
-                      SystemId: "dataPlatform",
-                      Type: "image",
-                      CreateTime
-                    });
+                    name: uploadKey + '',
+                    key: uploadKey + "." + type,
+                    systemId: "dataPlatform",
+                    type: "image",
+                    createTime: CreateTime
+                  });
                 }
                 if (type == 'mp4') {
                   vm.imagesArr.push({
-                      Name: uploadKey + '',
-                      Key: uploadKey + "." + type,
-                      SystemId: "dataPlatform",
-                      Type: "video",
-                      CreateTime
+                    name: uploadKey + '',
+                    key: uploadKey + "." + type,
+                    systemId: "dataPlatform",
+                    type: "video",
+                    createTime: CreateTime
                   });
                   vm.creatImg(vm.imageGetUrl + "&key=" + uploadKey + "." + type, uploadKey)
                 }
                 if (vm.type == "video" && type == "png") {
                   vm.videoPicArr.push({
-                    Name: uploadKey + '',
-                    Key: uploadKey + "." + type,
-                    SystemId: "dataPlatform",
-                    Type: "image_video",
-                    CreateTime
+                    name: uploadKey + '',
+                    key: uploadKey + "." + type,
+                    systemId: "dataPlatform",
+                    type: "image_video",
+                    createTime: CreateTime
                   })
                 }
                 if (vm.isShow === 1) {

+ 3 - 2
src/components/ledger/cenote/dialog/addCenoteDialog.vue

@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import { unshaftThroughShaft, queryShaftType, linkShaft } from "@/api/scan/request";
+import { linkShaft, unshaftThroughShaft } from "@/api/scan/request";
 import { getDataDictionary } from "@/api/dict"
 
 import cenoteType from "@/components/ledger/lib/cenoteType";
@@ -95,7 +95,8 @@ export default {
       "pageNumber": 1,
       "pageSize": 50,
       "filters": "code = 'shaftFuncType'",
-      "type": "shaft"
+      "type": "shaft",
+      "orders": "sort asc, name desc",
     }
     getDataDictionary(param, res => {
       res.content.forEach(item => {

+ 2 - 1
src/components/ledger/cenote/table/cenoteTable.vue

@@ -83,7 +83,8 @@ export default {
       "pageNumber": 1,
       "pageSize": 50,
       "filters": "code = 'shaftFuncType'",
-      "type": "shaft"
+      "type": "shaft",
+      "orders": "sort asc, name desc",
     }
     getDataDictionary(param, res => {
       res.content.forEach(item => {

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

@@ -110,11 +110,11 @@
                 console.log(xhr)
                 if (xhr.status == 200) {
                   let fileObject = {
-                    Key: key.split("=")[1],
-                    Type: type,
-                    Name: file.name,
-                    CreateTime,
-                    SystemId: 'dataPlatform'
+                    key: key.split("=")[1],
+                    type: type,
+                    name: file.name,
+                    createTime: CreateTime,
+                    systemId: 'dataPlatform'
                   }
                   vm.filesArr.push(fileObject);
                   vm.$emit("change", vm.filesArr, vm.defined);

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

@@ -109,20 +109,20 @@ export default {
               if (xhr.status == 200) {
                 if (vm.type == 'image') {
                   vm.imagesArr.push({
-                    Name: uploadKey + '',
-                    Key: uploadKey + "." + type,
-                    SystemId: "dataPlatform",
-                    Type: "image",
-                    CreateTime
+                    name: uploadKey + '',
+                    key: uploadKey + "." + type,
+                    systemId: "dataPlatform",
+                    type: "image",
+                    createTime: CreateTime
                   });
                 }
                 if (type == 'mp4') {
                   vm.videoPicArr.push({
-                    Name: uploadKey + '',
-                    Key: uploadKey + "." + type,
-                    SystemId: "dataPlatform",
-                    Type: "video",
-                    CreateTime
+                    name: uploadKey + '',
+                    key: uploadKey + "." + type,
+                    systemId: "dataPlatform",
+                    type: "video",
+                    createTime: CreateTime
                   });
                   vm.creatImg(vm.imageGetUrl + "&key=" + uploadKey + "." + type, uploadKey)
                 }

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

@@ -89,30 +89,30 @@
                 if (xhr.status == 200) {
                   if (vm.type == 'image') {
                     vm.imagesArr.push({
-                      Name: uploadKey + '',
-                      Key: uploadKey + "." + type,
-                      SystemId: "dataPlatform",
-                      Type: "image",
-                      CreateTime
+                      name: uploadKey + '',
+                      key: uploadKey + "." + type,
+                      systemId: "dataPlatform",
+                      type: "image",
+                      createTime: CreateTime
                     });
                   }
                   if (type == 'mp4') {
                     vm.imagesArr.push({
-                      Name: uploadKey + '',
-                      Key: uploadKey + "." + type,
-                      SystemId: "dataPlatform",
-                      Type: "video",
-                      CreateTime
+                      name: uploadKey + '',
+                      key: uploadKey + "." + type,
+                      systemId: "dataPlatform",
+                      type: "video",
+                      createTime: CreateTime
                     });
                     vm.creatImg(vm.imageGetUrl + "&key=" + uploadKey + "." + type, uploadKey)
                   }
                   if (vm.type == "video" && type == "png") {
                     vm.videoPicArr.push({
-                      Name: uploadKey + '',
-                      Key: uploadKey + "." + type,
-                      SystemId: "dataPlatform",
-                      Type: "image_video",
-                      CreateTime
+                      name: uploadKey + '',
+                      key: uploadKey + "." + type,
+                      systemId: "dataPlatform",
+                      type: "image_video",
+                      createTime: CreateTime
                     })
                   }
                   vm.$emit("change", vm.imagesArr, vm.defined, vm.videoPicArr);

+ 3 - 2
src/components/ledger/handsontables/assets.vue

@@ -147,8 +147,8 @@ import {
   createPropertys,
   deleteProperty,
   propertyLinkEq,
-  queryProperty,
   propertyUpdate,
+  queryProperty,
   updateProperty
 } from "@/api/scan/request";
 import { getDataDictionary } from "@/api/dict";
@@ -317,7 +317,8 @@ export default {
       this.mess = code
       if (this.mess.deviceId) {
         let params = {
-          type: this.mess.deviceId
+          type: this.mess.deviceId,
+          orders: "sort asc, name desc",
         };
         getDataDictionary(params, res => {
           this.tableHeader = res.content;

+ 3 - 8
src/components/ledger/handsontables/device.vue

@@ -266,13 +266,7 @@
   </div>
 </template>
 <script>
-import {
-  BeatchQueryParam,
-  deleteEquip,
-  getEquipBelongs,
-  queryUpdate,
-  updateEquip
-} from "@/api/scan/request";
+import { BeatchQueryParam, deleteEquip, getEquipBelongs, queryUpdate, updateEquip } from "@/api/scan/request";
 import { getEquipTableCon, queryEquip } from "@/api/object/equip";
 import { getDataDictionary } from "@/api/dict";
 
@@ -510,7 +504,8 @@ export default {
       this.changeCader();
       if (this.mess.deviceId) {
         let params = {
-          type: this.mess.deviceId
+          type: this.mess.deviceId,
+          orders: "sort asc, name desc",
         };
         getDataDictionary(params, res => {
           this.tableHeader = res.content;

+ 2 - 1
src/components/ledger/handsontables/system.vue

@@ -187,7 +187,8 @@ export default {
       this.mess = code
       if (this.mess.deviceId) {
         let params = {
-          type: this.mess.deviceId
+          type: this.mess.deviceId,
+          orders: "sort asc, name desc",
         }
         getDataDictionary(params, res => {
           this.tableHeader = res.content;

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

@@ -18,9 +18,9 @@
         <el-button size="small" type="primary" v-if="!readOnly">点击上传</el-button>
         <div slot="tip" class="el-upload__tip" v-if="!readOnly">请上传文件,且不大于50M</div>
       </el-upload>
-      <div v-show="item && filesArr.length"  v-for="(item,index) in filesArr" :key="item.Key">
+      <div v-show="item && filesArr.length"  v-for="(item,index) in filesArr" :key="item.key">
         <p class="file-list">
-          <span class="file-name" :title="item.Name">{{item.Name}}</span>
+          <span class="file-name" :title="item.name">{{item.name}}</span>
           <i title="下载" class="el-icon-download" style="margin-left:10px; cursor:pointer" @click="download(item)"></i>
           <i v-if="!readOnly" title="删除" class="el-icon-close delete-icon" style="margin-left:10px; cursor:pointer" @click="deleteFile(index,item)"></i>
         </p>
@@ -30,19 +30,19 @@
 </template>
 
 <script>
-  import tools from "@/utils/scan/tools";
+import tools from "@/utils/scan/tools";
 
-  export default {
-    props: {
-      keysArr: {
-        type: [Array, String],
-        default: function () {
-          return []
-        }
-      },
-      readOnly: {
-        type: Boolean,
-        default: false
+export default {
+  props: {
+    keysArr: {
+      type: [Array, String],
+      default: function () {
+        return []
+      }
+    },
+    readOnly: {
+      type: Boolean,
+      default: false
       },
       max: {
         type: [Number, String],
@@ -179,11 +179,11 @@
                   console.log(xhr)
                   if (xhr.status == 200) {
                     let fileObject = {
-                      Key: key.split("=")[1],
-                      Type: type,
-                      Name: file.name,
-                      CreateTime,
-                      SystemId: 'dataPlatform'
+                      key: key.split("=")[1],
+                      type,
+                      name: file.name,
+                      createTime: CreateTime,
+                      systemId: 'dataPlatform'
                     }
                     vm.filesArr.push(fileObject);
                     this.loading =false

+ 29 - 29
src/components/ledger/lib/uploadImgs.vue

@@ -9,14 +9,14 @@
     <div class="saga-upload-images">
       <div v-if="type != 'video'" class="point-image" v-for="(item,index) in imagesArr">
         <i v-if="!readOnly" class="el-icon-delete" @click="delImage(index,item)"></i>
-        <img :src="imageGetUrl + '&key=' +item.Key" @click="lookImg" alt v-load>
+        <img :src="imageGetUrl + '&key=' +item.key" @click="lookImg" alt v-load>
       </div>
       <div v-if="type == 'video'" class="point-image" v-for="(item,index) in imagesArr">
         <i v-if="!readOnly" class="el-icon-delete" @click="delImage(index,item)"></i>
         <video
             width="100%"
             height="100%;"
-            :src="imageGetUrl + '&key=' +item.Key"
+            :src="imageGetUrl + '&key=' +item.key"
             controls="controls"
         >您的浏览器不支持 video 标签。
         </video>
@@ -40,20 +40,20 @@
   </div>
 </template>
 <script>
-  import tools from "@/utils/scan/tools";
-  import detailsDialog from "@/components/business_space/lib/detailsDia"
+import tools from "@/utils/scan/tools";
+import detailsDialog from "@/components/business_space/lib/detailsDia"
 
-  export default {
-    components: {
-      detailsDialog
+export default {
+  components: {
+    detailsDialog
+  },
+  props: {
+    keysArr: {
+      type: [Array, String]
     },
-    props: {
-      keysArr: {
-        type: [Array, String]
-      },
-      readOnly: {
-        type: Boolean,
-        default: false
+    readOnly: {
+      type: Boolean,
+      default: false
       },
       max: {
         type: [Number, String],
@@ -178,20 +178,20 @@
                 if (xhr.status == 200) {
                   if (vm.type == 'image') {
                     vm.imagesArr.push({
-                      Name: uploadKey + '',
-                      Key: uploadKey + "." + type,
-                      SystemId: "dataPlatform",
-                      Type: "image",
-                      CreateTime
+                      name: uploadKey + '',
+                      key: uploadKey + "." + type,
+                      systemId: "dataPlatform",
+                      type: "image",
+                      createTime: CreateTime
                     });
                   }
                   if (type == 'mp4') {
                     vm.imagesArr.push({
-                      Name: uploadKey + '',
-                      Key: uploadKey + "." + type,
-                      SystemId: "dataPlatform",
-                      Type: "video",
-                      CreateTime
+                      name: uploadKey + '',
+                      key: uploadKey + "." + type,
+                      systemId: "dataPlatform",
+                      type: "video",
+                      createTime: CreateTime
                     });
                     vm.creatImg(vm.imageGetUrl + "&key=" + uploadKey + "." + type, uploadKey)
                   }
@@ -199,11 +199,11 @@
                   if (vm.type == "video" && type == "png") {
                     console.log("触发时评上传图片回调")
                     vm.videoPicArr.push({
-                      Name: uploadKey + '',
-                      Key: uploadKey + "." + type,
-                      SystemId: "dataPlatform",
-                      Type: "image_video",
-                      CreateTime
+                      name: uploadKey + '',
+                      key: uploadKey + "." + type,
+                      systemId: "dataPlatform",
+                      type: "image_video",
+                      createTime: CreateTime
                     })
                   }
                   vm.$emit("change", vm.imagesArr, vm.defined, vm.videoPicArr);

+ 23 - 23
src/components/ledger/lib/uploadImgsName.vue

@@ -10,9 +10,9 @@
       <div v-if="type != 'video'" class="point-view" v-for="(item,index) in imagesArr">
         <div class="point-image">
           <i v-if="!readOnly" class="el-icon-delete" @click="delImage(index,item)"></i>
-          <img @click="lookImg" :src="imageGetUrl + '&key=' +item.Key" alt v-load>
+          <img @click="lookImg" :src="imageGetUrl + '&key=' +item.key" alt v-load>
         </div>
-        <form-input :label="''" @change="getName" :keys="index" :value="item.Name" :width="10"></form-input>
+        <form-input :label="''" @change="getName" :keys="index" :value="item.name" :width="10"></form-input>
       </div>
       <div v-if="type == 'video'" class="point-view" v-for="(item,index) in imagesArr">
         <div class="point-image">
@@ -20,11 +20,11 @@
           <video
             width="100%"
             height="100%;"
-            :src="imageGetUrl + '&key=' +item.Key"
+            :src="imageGetUrl + '&key=' +item.key"
             controls="controls"
           >您的浏览器不支持 video 标签。</video>
         </div>
-        <form-input :label="''" @change="getName" :keys="index" :value="item.Name" :width="10"></form-input>
+        <form-input :label="''" @change="getName" :keys="index" :value="item.name" :width="10"></form-input>
       </div>
       <!--      v-if="!readOnly && imagesArr.length < max"-->
       <div style="float:left;">
@@ -46,11 +46,11 @@
   </div>
 </template>
 <script>
-  import tools from "@/utils/scan/tools";
-  import formInput from "@/components/business_space/lib/formInput"
-  import detailsDialog from "@/components/business_space/lib/detailsDia"
+import tools from "@/utils/scan/tools";
+import formInput from "@/components/business_space/lib/formInput"
+import detailsDialog from "@/components/business_space/lib/detailsDia"
 
-  export default {
+export default {
   components: {
     formInput,
     detailsDialog
@@ -193,32 +193,32 @@
                 if (vm.type == 'image') {
                   vm.imagesArr.push(
                     {
-                      Name: uploadKey + '',
-                      Key: uploadKey + "." + type,
-                      SystemId: "dataPlatform",
-                      Type: "image",
-                      CreateTime
+                      name: uploadKey + '',
+                      key: uploadKey + "." + type,
+                      systemId: "dataPlatform",
+                      type: "image",
+                      createTime: CreateTime
                     }
                   );
                 }
                 if (type == 'mp4') {
                   vm.imagesArr.push({
-                      Name: uploadKey + '',
-                      Key: uploadKey + "." + type,
-                      SystemId: "dataPlatform",
-                      Type: "video",
-                      CreateTime
+                      name: uploadKey + '',
+                      key: uploadKey + "." + type,
+                      systemId: "dataPlatform",
+                      type: "video",
+                      createTime: CreateTime
                   }
                   );
                   vm.creatImg(vm.imageGetUrl + "&key=" + uploadKey + "." + type, uploadKey)
                 }
                 if (vm.type == "video" && type == "png") {
                   vm.videoPicArr.push({
-                    Name: uploadKey + '',
-                    Key: uploadKey + "." + type,
-                    SystemId: "dataPlatform",
-                    Type: "image_video",
-                    CreateTime
+                    name: uploadKey + '',
+                    key: uploadKey + "." + type,
+                    systemId: "dataPlatform",
+                    type: "image_video",
+                    createTime: CreateTime
                   })
                 }
                 vm.$emit("change", vm.imagesArr, vm.defined, vm.videoPicArr);

+ 3 - 2
src/components/ledger/system/dialog/addCenoteDialog.vue

@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import { unSysShaft, queryShaftType, linkSysSh } from "@/api/scan/request";
+import { linkSysSh, unSysShaft } from "@/api/scan/request";
 import cenoteType from "@/components/ledger/lib/cenoteType";
 import { mapGetters } from "vuex";
 import { getDataDictionary } from "@/api/dict"
@@ -92,7 +92,8 @@ export default {
       "pageNumber": 1,
       "pageSize": 50,
       "filters": "code = 'shaftFuncType'",
-      "type": "shaft"
+      "type": "shaft",
+      "orders": "sort asc, name desc",
     }
     getDataDictionary(param, res => {
       res.content.forEach(item => {

+ 3 - 2
src/components/ledger/system/table/cenoteTable.vue

@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import { queryLinkSys, queryShaftType, syinshUnlink } from "@/api/scan/request";
+import { queryLinkSys, syinshUnlink } from "@/api/scan/request";
 import { mapGetters } from "vuex";
 import { getDataDictionary } from "@/api/dict"
 import addCenoteDialog from "@/components/ledger/system/dialog/addCenoteDialog"
@@ -83,7 +83,8 @@ export default {
       "pageNumber": 1,
       "pageSize": 50,
       "filters": "code = 'shaftFuncType'",
-      "type": "shaft"
+      "type": "shaft",
+      "orders": "sort asc, name desc",
     }
     getDataDictionary(param, res => {
       res.content.forEach(item => {

+ 16 - 8
src/components/point/report/objectInstance.vue

@@ -104,7 +104,8 @@ export default {
                   if (item.InfoList.length && equipMsg.content[0].classCode) {
                     let params = {
                       filters: `code in ${JSON.stringify(item.InfoList)}`,
-                      type: equipMsg.content[0].classCode
+                      type: equipMsg.content[0].classCode,
+                      orders: "sort asc, name desc",
                     }
                     getDataDictionary(params, resp => {
                       that.forms[key].InfomationPointName = resp.content.map(t => t.name).join(',');
@@ -135,7 +136,8 @@ export default {
                     if (item.InfoList.length && zoneMsg.Content[0].ObjectType) {
                       let params = {
                         filters: `code in ${JSON.stringify(item.InfoList)}`,
-                        type: zoneMsg.Content[0].ObjectType
+                        type: zoneMsg.Content[0].ObjectType,
+                        orders: "sort asc, name desc",
                       }
                       getDataDictionary(params, resp => {
                         that.forms[key].InfomationPointName = resp.content.map(t => t.name || '').join(',');
@@ -168,7 +170,8 @@ export default {
                   if (item.InfoList.length && equipMsg.Content[0].Category) {
                     let params = {
                       filters: `code in ${JSON.stringify(item.InfoList)}`,
-                      type: equipMsg.Content[0].Category
+                      type: equipMsg.Content[0].Category,
+                      orders: "sort asc, name desc",
                     }
                     getDataDictionary(params, resp => {
                       that.forms[key].InfomationPointName = resp.content.map(t => t.name || '').join(',');
@@ -187,7 +190,8 @@ export default {
                   if (item.InfoList.length && res.content[0].classCode) {
                     let params = {
                       filters: `code in ${JSON.stringify(item.InfoList)}`,
-                      type: res.content[0].classCode
+                      type: res.content[0].classCode,
+                      orders: "sort asc, name desc",
                     }
                     getDataDictionary(params, resp => {
                       that.forms[key].InfomationPointName = resp.content.map(t => t.name || '').join(',');
@@ -206,7 +210,8 @@ export default {
                   if (item.InfoList.length && res.content[0].objectType) {
                     let params = {
                       filters: `code in ${JSON.stringify(item.InfoList)}`,
-                      type: res.content[0].objectType
+                      type: res.content[0].objectType,
+                      orders: "sort asc, name desc",
                     }
                     getDataDictionary(params, resp => {
                       that.forms[key].InfomationPointName = resp.content.map(t => t.name || '').join(',');
@@ -225,7 +230,8 @@ export default {
                   if (item.InfoList.length && res.content[0].objectType) {
                     let params = {
                       filters: `code in ${JSON.stringify(item.InfoList)}`,
-                      type: res.content[0].objectType
+                      type: res.content[0].objectType,
+                      orders: "sort asc, name desc",
                     }
                     getDataDictionary(params, resp => {
                       that.forms[key].InfomationPointName = resp.content.map(t => t.name || '').join(',');
@@ -244,7 +250,8 @@ export default {
                   if (item.InfoList.length && res.Content[0].ObjectType) {
                     let params = {
                       filters: `code in ${JSON.stringify(item.InfoList)}`,
-                      type: res.Content[0].ObjectType
+                      type: res.Content[0].ObjectType,
+                      orders: "sort asc, name desc",
                     }
                     getDataDictionary(params, resp => {
                       that.forms[key].InfomationPointName = resp.content.map(t => t.name || '').join(',');
@@ -263,7 +270,8 @@ export default {
                   if (item.InfoList.length && res.Content[0].ObjectType) {
                     let params = {
                       filters: `code in ${JSON.stringify(item.InfoList)}`,
-                      type: res.Content[0].ObjectType
+                      type: res.Content[0].ObjectType,
+                      orders: "sort asc, name desc",
                     }
                     getDataDictionary(params, resp => {
                       that.forms[key].InfomationPointName = resp.content.map(t => t.name || '').join(',');

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

@@ -129,7 +129,8 @@ export default {
         type: this.type,
         // orders: "sort asc,infoPointCode asc",
         pageNumber: 1,
-        pageSize: 1000
+        pageSize: 1000,
+        orders: "sort asc, name desc",
       };
       getDataDictionary(params, res => {
         let arr = res.content.map(item => {

+ 18 - 18
src/components/ready/buildfloor/uploadFile.vue

@@ -52,19 +52,19 @@
 </template>
 
 <script>
-  import tools from "@/utils/scan/tools";
-
-  export default {
-    props: {
-      keysArr: {
-        type: [Array, String],
-        default: function () {
-          return []
-        }
-      },
-      readOnly: {
-        type: Boolean,
-        default: false
+import tools from "@/utils/scan/tools";
+
+export default {
+  props: {
+    keysArr: {
+      type: [Array, String],
+      default: function () {
+        return []
+      }
+    },
+    readOnly: {
+      type: Boolean,
+      default: false
       },
       max: {
         type: [Number, String],
@@ -177,11 +177,11 @@
                 console.log(xhr)
                 if (xhr.status == 200) {
                   let fileObject = {
-                    Key: key.split("=")[1],
-                    Type: type,
-                    Name: file.name,
-                    CreateTime,
-                    SystemId: 'dataPlatform'
+                    key: key.split("=")[1],
+                    type,
+                    name: file.name,
+                    createTime: CreateTime,
+                    systemId: 'dataPlatform'
                   }
                   vm.filesArr.push(fileObject);
 

+ 1 - 1
src/views/ledger/facility/parts/index.vue

@@ -166,7 +166,7 @@ export default {
     // 获取表头数据(初始化表格)
     async getTableHeader() {
       let params = {
-        orders: "sort asc, infoPointName desc",
+        orders: "sort asc, name desc",
         pageNumber: 1,
         pageSize: 1000,
         type: this.tabVal

+ 2 - 2
src/views/ledger/report/index.vue

@@ -126,7 +126,6 @@ import {
   countProperty,
   gatherInfoPoint,
   getCenoteType,
-  // getDataDictionary,
   infoPoint,
   notSyncObject,
   notSyncRelationData,
@@ -304,7 +303,8 @@ export default {
       let params = {
         type: "generalZone",
         filters: "code='RoomFuncType'",
-        projection: ["dataSource", "code"]
+        projection: ["dataSource", "code"],
+        orders: "sort asc, name desc",
       }
       getDataDictionary(params, res => {
         if (res.content.length) {

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

@@ -216,7 +216,8 @@ export default {
       let params = {
         type: 'building',
         pageNumber: 1,
-        pageSize: 1000
+        pageSize: 1000,
+        orders: "sort asc, name desc",
       };
       getDataDictionary(params, res => {
         let first = {}

+ 2 - 1
src/views/ready/collectsetting/index.vue

@@ -718,7 +718,8 @@ export default {
       this.code = code
       if (code) {
         let param = {
-          type: code
+          type: code,
+          orders: "sort asc, name desc",
         };
         this.rightLoading = true
         this.tabsFalg = false