Browse Source

Merge branch 'master' of http://39.106.8.246:3003/web/wanda-adm

YaolongHan 3 years ago
parent
commit
4b28a3e134

+ 6 - 0
public/index.html

@@ -38,5 +38,11 @@
         background-color: #dddee0;
         border-radius: 4px;
     }
+
+
+    /*.el-menu-item.is-active {*/
+    /*    color: #FFFFFF;*/
+    /*    background-color: #36c6d3 !important;*/
+    /*}*/
 </style>
 </html>

+ 22 - 18
src/components/public/adm-multi-table.vue

@@ -12,41 +12,45 @@
         >
             <el-table-column prop="date" label="编辑" width="80" align="center" fixed>
                 <template slot-scope="scope">
-                    <span class="el-icon-edit el-input__icon" style="cursor: pointer" @click="handleEdit(scope.$index, scope.row)"> </span>
+                    <span class="el-icon-edit el-input__icon" style="cursor: pointer"
+                          @click="handleEdit(scope.$index, scope.row)"> </span>
                 </template>
             </el-table-column>
-            <el-table-column v-for="item in headersStage" :key="item.name" :label="item.name" align="center">
-                <el-table-column
-                    v-for="(child, index) in item.data"
-                    :key="index"
-                    :label="child.unit ? child.aliasName + ' (' + child.unit + ')' : child.aliasName"
-                    :prop="child.path"
-                    :formatter="formatContent"
-                    align="center"
-                >
+            <template v-for="item in headersStage">
+                <el-table-column v-if="item.data.length > 0" :key="item.name" :label="item.name" align="center">
+                    <el-table-column
+                        v-for="(child, index) in item.data"
+                        :key="index"
+                        :label="child.unit ? child.aliasName + ' (' + child.unit + ')' : child.aliasName"
+                        :prop="child.path"
+                        :formatter="formatContent"
+                        align="center"
+                    >
+                    </el-table-column>
                 </el-table-column>
-            </el-table-column>
+            </template>
         </el-table>
         <div v-else class="center">暂无数据</div>
     </div>
 </template>
 
 <script lang="ts">
-import { ElTable } from "element-ui/types/table";
-import { Component, Emit, Prop, Ref, Vue, Watch } from "vue-property-decorator";
+import {ElTable} from "element-ui/types/table";
+import {Component, Emit, Prop, Ref, Vue, Watch} from "vue-property-decorator";
+
 @Component({
     name: "adm-multi-table",
 })
 export default class extends Vue {
     @Ref("tableDom") readonly tableDom!: ElTable;
     // 表格数据
-    @Prop({ default: Array }) tableData?: [];
+    @Prop({default: Array}) tableData?: [];
     // 表头数据
-    @Prop({ default: Object }) headersStage?: any;
+    @Prop({default: Object}) headersStage?: any;
     // 当前页头文字
-    @Prop({ default: "" }) currentHeader?: string;
+    @Prop({default: ""}) currentHeader?: string;
     // 动态数据是否对表号-功能号做枚举转换
-    @Prop({ default: true }) isDynamicMap?: boolean;
+    @Prop({default: true}) isDynamicMap?: boolean;
 
     @Emit("handleCurrentEdit")
     handleEdit(index: number, row: any) {
@@ -106,7 +110,7 @@ export default class extends Vue {
         return cellValue;
     }
 
-    @Watch("headersStage", { immediate: true, deep: true })
+    @Watch("headersStage", {immediate: true, deep: true})
     onCurrentHeaderChange() {
         this.$nextTick(() => {
             if (this.tableDom?.doLayout) this.tableDom.doLayout();

+ 3 - 3
src/layout/components/Sidebar/index.vue

@@ -17,8 +17,8 @@
 </template>
 
 <script lang="ts">
-import { Component, Vue } from "vue-property-decorator";
-import { AppModule } from "@/store/modules/app";
+import {Component, Vue} from "vue-property-decorator";
+import {AppModule} from "@/store/modules/app";
 import SidebarItem from "./SidebarItem.vue";
 import variables from "@/styles/_variables.scss";
 
@@ -43,7 +43,7 @@ export default class extends Vue {
 
     get activeMenu() {
         const route = this.$route;
-        const { meta, path } = route;
+        const {meta, path} = route;
         if (meta.activeMenu) {
             return meta.activeMenu;
         }

+ 1 - 1
src/views/maintain/space/index.vue

@@ -383,7 +383,7 @@ export default class spaceIndex extends Vue {
                 zoneType: this.zoneTypeValue[this.zoneTypeValue.length - 1],
                 pageNumber: this.paginationList.page,
                 pageSize: this.paginationList.size,
-                orders: "createTime asc, localName asc, localId desc, id asc",
+                orders: "createTime desc, localName asc, localId desc, id asc",
             };
             let search = this.inputSearch ? `;localName contain '${this.inputSearch}' or localId contain '${this.inputSearch}'` : ''
             if (this.building.length === 1) {

+ 2 - 1
src/views/maintain/system/index.vue

@@ -270,6 +270,7 @@ export default class extends Vue {
 
     // 编辑当前行
     handleCurrentEdit(val: any) {
+        this.isWidth = true
         this.next = false
         this.systemMsg = '编辑系统'
         this.currRowContent = val
@@ -279,7 +280,7 @@ export default class extends Vue {
 
     //信息点重组
     informationArrangement(arr: []): any {
-        let basicInfos = [{ path: "classification", name: "系统分类" }],
+        let basicInfos = [{ path: "classification", aliasName: "系统分类" }],
             dictStages: any[] = [];
         this.all = arr;
         arr.forEach((item: any) => {

+ 4 - 4
src/views/scene/tiepoint/components/systemTab/index.vue

@@ -156,7 +156,7 @@ export default class SystemTab extends Vue {
                 filters: `classCode='${this.systemType}'`,
                 pageNumber: this.paginationList.page,
                 pageSize: this.paginationList.size,
-                orders: "createTime asc, id asc",
+                orders: "createTime desc, id asc",
                 projectId: this.projectId,
             };
             if (this.keyWord != "") {
@@ -212,7 +212,7 @@ export default class SystemTab extends Vue {
                 filters: `classCode='${this.systemType}'`,
                 pageNumber: this.paginationList.page,
                 pageSize: this.paginationList.size,
-                orders: "createTime asc, id asc",
+                orders: "createTime desc, id asc",
                 projectId: this.projectId,
             };
             if (this.keyWord != "") {
@@ -241,7 +241,7 @@ export default class SystemTab extends Vue {
      * 信息点重组
      */
     private informationArrangement(arr: []): any {
-        let basicInfos = [{ path: "classification", name: "系统分类" }],
+        let basicInfos = [{ path: "classification", aliasName: "系统分类" }],
             dictStages: any[] = [];
         this.all = arr;
         arr.forEach((item: any) => {
@@ -387,4 +387,4 @@ export default class SystemTab extends Vue {
 ::v-deep .el-dialog__header {
     border-bottom: 1px solid #d8d8d8;
 }
-</style>
+</style>