调整菜单与数据字典

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-		"target": "http://192.168.3.108",
+		"target": "http://192.168.4.105",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/views/configuration-center/configuration-center.component.html

@@ -143,11 +143,21 @@
         <div class="addressAssign">
           <div class="contentBody">
             <div class="dictionaryRow">
+              <div class="orders">排序号</div>
               <div class="name">键</div>
               <div class="value">值</div>
             </div>
             <form nz-form [formGroup]="validateDictionaryForm" class="w100">
               <div class="dictionaryRow" *ngFor="let data of dictionaryList;let i = index;">
+                <div class="orders">
+                  <nz-form-item>
+                    <nz-form-control [nzSpan]="24" nzErrorTip="请输入排序号!">
+                      <nz-input-group>
+                        <nz-input-number [formControlName]="'orders_' + data.id" class="ordersInput"></nz-input-number>
+                      </nz-input-group>
+                    </nz-form-control>
+                  </nz-form-item>
+                </div>
                 <div class="name">
                   <nz-form-item>
                     <nz-form-control [nzSpan]="24" nzErrorTip="请输入键!">
@@ -165,8 +175,15 @@
                       </nz-input-group>
                     </nz-form-control>
                   </nz-form-item>
+                  <!-- <nz-form-item class="ml8">
+                    <nz-form-control [nzSpan]="24" nzErrorTip="请输入排序号!">
+                      <nz-input-group>
+                        <nz-input-number [formControlName]="'orders_' + data.id" class="nameInput"></nz-input-number>
+                      </nz-input-group>
+                    </nz-form-control>
+                  </nz-form-item> -->
                   <i class="icon_transport transport-tag27fuben ml8" (click)="addField(i)"></i>
-                  <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1" (click)="removeField(data, i)"></i>
+                  <i class="icon_transport transport-shanchu1 ml8" *ngIf="dictionaryList.length > 1 && !data.system" (click)="removeField(data, i)"></i>
                 </div>
               </div>
             </form>

src/app/views/configuration-center/configuration-center.component.less

@@ -37,14 +37,17 @@
       align-items: center;
       justify-content: center;
       gap: 16px;
-      .name{
+      .orders{
         flex: 1;
         display: flex;
         justify-content: flex-end;
         align-items: center;
-        .nameInput{
-          width: 100px;
-        }
+      }
+      .name{
+        width: 100px;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
       }
       .value{
         flex: 3;
@@ -59,6 +62,7 @@
           cursor: pointer;
         }
       }
+
     }
   }
   .configurationCenter{

src/app/views/configuration-center/configuration-center.component.ts

@@ -681,6 +681,7 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
     this.validateDictionaryForm = this.fb.group({
       // name: [null, [Validators.required]],//键
       // value: [null, [Validators.required]],//值
+      // orders: [null, [Validators.required]],//排序号
     });
     console.log(this.validateDictionaryForm.controls)
   }
@@ -707,6 +708,8 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
             id: v.id,
             name: v.name || null,
             value: v.value || null,
+            orders: v.orders || null,
+            system: v.system || false,
           }
         });
       }else{
@@ -715,6 +718,8 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
             id: uuidv4(),
             name: null,
             value: null,
+            orders: null,
+            system: false,
           }
         ];
       }
@@ -723,7 +728,7 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
       // 动态添加表单
       this.dictionaryList.forEach((obj, i) => {
         for (const key in obj) {
-          if(key !== 'id'){
+          if(key !== 'id' && key !== 'system'){
             this.validateDictionaryForm.addControl(key + '_' + obj.id, new FormControl(obj[key], [Validators.required]))
           }
         }
@@ -737,6 +742,7 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
       id: uuidv4(),
       name: null,
       value: null,
+      orders: null,
     };
 
     // 动态添加表单
@@ -784,7 +790,8 @@ export class ConfigurationCenterComponent implements OnInit, AfterViewInit {
         id: uuidValidate(this.dictionaryList[i].id) ? undefined : this.dictionaryList[i].id,
         name: this.validateDictionaryForm.value['name_' + this.dictionaryList[i].id],
         value: this.validateDictionaryForm.value['value_' + this.dictionaryList[i].id],
-        orders: i + 1,
+        orders: this.validateDictionaryForm.value['orders_' + this.dictionaryList[i].id],
+        system: !uuidValidate(this.dictionaryList[i].id),
         key: 'incident_category_score',
       })
     }

src/app/views/main/main.component.ts

@@ -67,8 +67,12 @@ export class MainComponent implements OnInit {
   }
 
   // 菜单图标名称是否包含transport-
-  isTransportIcon(icon:string) {
-    return icon.indexOf("transport-") > -1;
+  isTransportIcon(icon:any) {
+    if(icon){
+      return icon.indexOf("transport-") > -1;
+    }else{
+      return false;
+    }
   }
 
   //上下班
@@ -301,7 +305,7 @@ export class MainComponent implements OnInit {
         arr.push(e);
       }
     });
-    this.menus = arr;
+    this.menus = arr.filter(v => v.type === 'default');
   }
 
   // 判断登录是否已失效