feat: id改为前端输入，优化部分样式

src/components/layouts/UserLayout.vue

@@ -5,26 +5,12 @@
         <div class="header">
           <a href="/">
             <img src="~@/assets/logo.png" class="logo" alt="logo">
-            <span class="title">Jeecg Boot</span>
+            <span class="title">核素监测数据自动处理与交互分析系统</span>
           </a>
         </div>
-        <div class="desc">
-          Jeecg Boot 是中国最具影响力的 企业级 低代码平台
-        </div>
       </div>
 
       <route-view></route-view>
-
-      <div class="footer">
-        <div class="links">
-          <a href="http://doc.jeecg.com" target="_blank">帮助</a>
-          <a href="https://github.com/zhangdaiscott/jeecg-boot" target="_blank">隐私</a>
-          <a href="https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE" target="_blank">条款</a>
-        </div>
-        <div class="copyright">
-          Copyright &copy; 2019 <a href="http://www.jeecg.com" target="_blank">JEECG开源社区</a> 出品
-        </div>
-      </div>
     </div>
   </div>
 </template>

src/components/page/GlobalLayout.vue

@@ -663,14 +663,17 @@
   }
 
   .sub-menus {
+    border-top: 1px solid rgba(12, 235, 201, .3);
+    border-bottom: 1px solid rgba(12, 235, 201, .3);
     margin-bottom: 16px;
+    padding: 5px 10px;
+    background-color: rgba(12, 235, 201, .05);
+    overflow: auto;
     .ant-menu {
-      font-size: 16px;
-      background: rgba(12, 235, 201, .05);
       border-bottom: none;
-      height: 40px;
+      font-size: 16px;
       line-height: normal;
-      padding-top: 5px;
+      background-color: transparent;
       .ant-menu-item {
         background: rgba(58, 236, 240, .22) !important;
         border-bottom: none !important;

src/style.less

@@ -71,7 +71,7 @@ body {
     }
   }
   &-placeholder {
-    background-color: transparent;
+    background-color: @modalBg;
     border-top: none;
     border-bottom: none;
   }
@@ -582,6 +582,15 @@ body {
   background-color: #15494c !important;
 }
 
+#userLayout {
+  .container {
+    background-color: @modalBg !important;
+    .title {
+      color: #fff !important;
+    }
+  }
+}
+
 ::-webkit-scrollbar-track {
   background-color: #15494c !important;
 }

src/views/system/DetectorInfo.vue

@@ -52,8 +52,10 @@
         :colon="false"
         :labelCol="{ style: { width: '115px' } }"
         :wrapperCol="{ style: { width: '300px' } }"
-        autocomplete="off"
       >
+        <a-form-model-item label="Detector Id" prop="detectorId">
+          <a-input v-model="model.detectorId" type="number"></a-input>
+        </a-form-model-item>
         <a-form-model-item label="Detector Code" prop="detectorCode">
           <a-input v-model="model.detectorCode"></a-input>
         </a-form-model-item>
@@ -193,6 +195,7 @@ export default {
     return {
       queryParam: {},
       rules: {
+        detectorId: [{ required: true, message: 'Please Enter Detector Id' }],
         detectorCode: [{ required: true, validator: validateDetectorCode }],
         moddate: [{ required: true, message: 'Please Select Moddate' }]
       },

src/views/system/NuclearFacility.vue

@@ -53,6 +53,9 @@
         :labelCol="{ style: { width: '105px' } }"
         :wrapperCol="{ style: { width: '300px' } }"
       >
+        <a-form-model-item label="Facility Id" prop="facilityId">
+          <a-input v-model="model.facilityId" type="number"></a-input>
+        </a-form-model-item>
         <a-form-model-item label="Facility Name" prop="facilityName">
           <a-input v-model="model.facilityName"></a-input>
         </a-form-model-item>
@@ -145,6 +148,7 @@ export default {
     return {
       queryParam: {},
       rules: {
+        facilityId: [{ required: true, message: 'Please Enter Facility Id' }],
         facilityName: [{ required: true, message: 'Please Enter Facility Name' }]
       },
       url: {
@@ -165,13 +169,26 @@ export default {
       if (this.selectedRowKeys && this.selectedRowKeys.length) {
         this.isAdd = false
         this.visible = true
-        const find = this.dataSource.find(item => item.id === this.selectedRowKeys[0])
+        const find = this.dataSource.find(item => item.facilityId === this.selectedRowKeys[0])
         this.model = cloneDeep(find)
       } else {
         this.$message.warn('Please Select An Item To Edit')
       }
     },
-    onDel() {}
+    onDel() {
+      if (this.selectedRowKeys && this.selectedRowKeys.length) {
+        this.$confirm({
+          title: 'Do You Want To Delete This Item?',
+          okText: 'OK',
+          cancelText: 'Cancel',
+          onOk: () => {
+            this.handleDelete(this.selectedRowKeys[0])
+          }
+        })
+      } else {
+        this.$message.warn('Please Select An Item To Delete')
+      }
+    }
   }
 }
 </script>

src/views/system/stationList.vue

@@ -54,6 +54,9 @@
         :wrapperCol="{ style: { width: '300px' } }"
         autocomplete="off"
       >
+        <a-form-model-item label="Station Id" prop="stationId">
+          <a-input v-model="model.stationId" type="number"></a-input>
+        </a-form-model-item>
         <a-form-model-item label="Station Code" prop="stationCode">
           <a-input v-model="model.stationCode"></a-input>
         </a-form-model-item>
@@ -181,6 +184,7 @@ export default {
     return {
       queryParam: {},
       rules: {
+        stationId: [{ required: true, message: 'Please Enter Station Id' }],
         stationCode: [{ required: true, validator: validateStationCode }],
         countryCode: [{ validator: validateCountryCode }]
       },

src/views/user/Login.vue

@@ -13,12 +13,6 @@
 
       <a-form-model-item>
         <a-checkbox @change="handleRememberMeChange" default-checked>自动登录</a-checkbox>
-        <router-link :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
-          忘记密码
-        </router-link>
-        <router-link :to="{ name: 'register'}" class="forge-password" style="float: right;margin-right: 10px" >
-          注册账户
-        </router-link>
       </a-form-model-item>
 
       <a-form-item style="margin-top:24px">
@@ -27,10 +21,6 @@
       </a-form-item>
 
     </a-form-model>
-
-    <two-step-captcha v-if="requiredTwoStepCaptcha" :visible="stepCaptchaVisible" @success="stepCaptchaSuccess" @cancel="stepCaptchaCancel"></two-step-captcha>
-    <login-select-tenant ref="loginSelect" @success="loginSelectOk"></login-select-tenant>
-    <third-login ref="thirdLogin"></third-login>
   </div>
 </template>