注册页面修改80%

.env.production.ins

@@ -4,6 +4,6 @@ VUE_APP_NODE_ENV=prod:ins
 # 版本标识 public 公网， institution 机构版， lan局域网版
 VUE_APP_VERSION = institution
 # 默认机构编号
-VUE_APP_INSNO = ''
+VUE_APP_INSNO = 'LAN001'
 # 是否是群体
 VUE_APP_GROUP = false

src/components/login/Login.vue

@@ -31,7 +31,7 @@
         </el-input>
         <el-input
           v-model="userName"
-          :placeholder="userType === '1' ? '请输入身份证号' : '请输入账号'"
+          :placeholder="userType === '1' ? '请输入账号' : '请输入账号'"
         >
           <template slot="prefix">
             <img src="@/assets/images/icon-user.png" alt="" class="img1" />
@@ -166,7 +166,7 @@
           </el-col>
         </el-row>
 
-        <el-row v-if="systemVersion !== 'lan'" :gutter="10">
+        <el-row  :gutter="10">
           <el-col :span="12">
             <el-form-item label="密码：" prop="password">
               <el-input
@@ -342,7 +342,7 @@
         <!--        </el-form-item>-->
       </el-form>
       <div class="grid-content bg-purple-dark account-style-button">
-        <div v-if="systemVersion === 'institution' && false">
+        <div >
           <el-radio v-model="userInfo.roleType" label="1"> 普通用户 </el-radio>
           <el-radio v-model="userInfo.roleType" label="2"> 管理员 </el-radio>
         </div>
@@ -763,6 +763,7 @@ export default {
     },
     loginHandle() {
       this.setTagActive(0);
+      this.institutionNo ='LAN001'
       // console.log('this.institutionNo: ', this.institutionNo)
       if (!this.userType) {
         this.$message.warning("请选择用户类型");
@@ -782,7 +783,9 @@ export default {
         this.$message.warning("请输入密码");
         return;
       }
-
+      console.log(this.userName,'this.userName')
+      console.log(this.institutionNo,'this.institutionNo')
+      console.log( this.userType,' this.userType')
       this.$http.post(
         "system/login",
         {

src/components/manage/ContainerSys.vue

@@ -1,12 +1,13 @@
 <template>
   <div class="content-container sys-container">
     <el-header class="admin-header-content flex-row">
-      <el-image :src="require('@/assets/image/icon-sys-heng.png')" fit="fill" alt=""/>
+      <el-image :src="require('@/assets/images/icon-sys2.png')" fit="fill" alt=""/>
+<!--      <img src="@/assets/images/bg-1.png" alt/>-->
       <el-menu
         :default-active="activeIndex"
         class="el-menu-demo"
         mode="horizontal"
-        background-color="#007EFF"
+        background-color="#259a07"
         text-color="#fff"
         active-text-color="#fff"
       >
@@ -675,7 +676,7 @@ export default {
   font-size: 0.086rem;
 
   .admin-header-content {
-    background: #007EFF;
+    background: #259a07;
     justify-content: space-between;
     height: 60px !important;
 
@@ -774,11 +775,11 @@ export default {
 }
 
 .aside-menu .el-menu-item.is-active {
-  background: #007EFF !important;
+  background: #259a07 !important;
 }
 
 .el-menu-item-group .el-menu-item.is-active {
-  background: #007EFF !important;
+  background: #259a07 !important;
 }
 
 .fade-enter {

src/views/CognitiveAbility.vue

@@ -25,7 +25,7 @@
         </div>
       </div>
     </div>
-    <el-pagination v-if="false" class="paginSty" background layout="total,prev, pager, next,jumper"
+    <el-pagination v-if="true" class="paginSty" background layout="total,prev, pager, next,jumper"
       :page-size="pageSize" :total="totalNum" :current-page.sync="pageNum" @current-change="handleCurrentChange" />
   </div>
 </template>
@@ -137,7 +137,7 @@ export default {
     loadData() {
       this.loading = true
       this.$http.get(
-        `subjectInfo/getCognizeListByAuth?scaleName=${this.$root.search}&pageNum=1&pageSize=${this.pageSize}&categoryEname=${this.activeName}&uId=${this.uId}&institutionNo=${this.institutionNo}`,
+        `subjectInfo/getCognizeListByAuth?scaleName=${this.$root.search}&pageNum=${this.pageNum}&pageSize=${this.pageSize}&categoryEname=${this.activeName}&uId=${this.uId}&institutionNo=${this.institutionNo}`,
         {},
         (msg) => {
           this.subjectInfos = msg.data.data;
@@ -204,7 +204,7 @@ export default {
 
   .cardList {
     width: 100%;
-    height: calc(100% - 16px);
+    height: calc(100% - 66px);
     overflow-y: auto;
     display: flex;
     flex-direction: row;
@@ -313,8 +313,8 @@ export default {
 }
 
 .tabs ul li.active {
-  color: #1da1f2;
-  border-bottom: 2px solid #1da1f2;
+  color: #259a07;
+  border-bottom: 2px solid #259a07;
 }
 
 .cardList ul {
@@ -334,6 +334,20 @@ export default {
   cursor: pointer;
 }
 
+::v-deep {
+  .el-pagination.is-background .el-pager li:not(.disabled) {
+    background-color: #fff; // 进行修改未选中背景和字体
+    // color: #fff;
+  }
+
+  .el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color: #26B600;; // 进行修改选中项背景和字体
+    color: #fff;
+  }
+
+}
+
+
 @media screen and (max-width: 1024px) {
   .cardList ul li {
     margin: 30px 10px;

src/views/Welcome.vue

@@ -74,7 +74,7 @@
       >
         <el-row :gutter="10">
           <el-col :span="12">
-            <el-form-item label="身份证号：" prop="phone">
+            <el-form-item label="账号：" prop="phone">
               <el-input
                   v-model="userRuleForm.phone"
                   @change="onCardNoChange"
@@ -120,22 +120,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="军衔：" prop="military">
-              <el-select v-model="userRuleForm.military" placeholder="请选择军衔">
-                <el-option
-                    v-for="item in militaries"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="10">
-          <el-col :span="12">
-            <el-form-item label="职务：" prop="profession">
+            <el-form-item label="职业：" prop="profession">
               <el-input
                   type="text"
                   :maxlength="30"
@@ -143,120 +128,144 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="飞行等级：" prop="fightRegistration">
-              <el-select v-model="userRuleForm.fightRegistration" placeholder="请选择飞行等级">
-                <el-option
-                    v-for="item in fightRegistrations"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="军衔：" prop="military">-->
+<!--              <el-select v-model="userRuleForm.military" placeholder="请选择军衔">-->
+<!--                <el-option-->
+<!--                    v-for="item in militaries"-->
+<!--                    :key="item.value"-->
+<!--                    :label="item.label"-->
+<!--                    :value="item.value">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
 
         <el-row :gutter="10">
-          <el-col :span="12">
-            <el-form-item label="单位：" prop="brigade">
-              <el-input
-                  v-if="isOtherDepartment"
-                  type="text"
-                  :maxLength="50"
-                  v-model="userRuleForm.brigade"
-              >
-              </el-input>
-
-              <el-input
-                  v-else
-                  type="number"
-                  :min="1"
-                  :max="100"
-                  v-model.number="userRuleForm.brigade"
-              >
-                <template slot="suffix"><span class="suffix">旅</span></template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="3">
-            <el-form-item prop="" label-width="0">
-              <el-checkbox v-model="isOtherDepartment" @change="onDepartmentChange">其他单位</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col :span="9">
-            <el-form-item prop="detachment" label-width="0">
-              <el-input
-                  type="number"
-                  :min="1"
-                  :max="9999"
-                  v-model.number="userRuleForm.detachment"
-              >
-                <template slot="suffix"><span class="suffix">大队</span></template>
-              </el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="职业：" prop="profession">-->
+<!--              <el-input-->
+<!--                  type="text"-->
+<!--                  :maxlength="30"-->
+<!--                  v-model="userRuleForm.profession"-->
+<!--              ></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="飞行等级：" prop="fightRegistration">-->
+<!--              <el-select v-model="userRuleForm.fightRegistration" placeholder="请选择飞行等级">-->
+<!--                <el-option-->
+<!--                    v-for="item in fightRegistrations"-->
+<!--                    :key="item.value"-->
+<!--                    :label="item.label"-->
+<!--                    :value="item.value">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
 
-        <el-row :gutter="10">
-          <el-col :span="12">
-            <el-form-item label="总飞行时间：" prop="flightDuration">
-              <el-input
-                  type="number"
-                  :min="1"
-                  :max="9999"
-                  v-model="userRuleForm.flightDuration"
-                  planceholder="请输入总飞行时间"
-              >
-                <template slot="suffix"><span class="suffix">小时</span></template>
-              </el-input>
-            </el-form-item>
-            <el-form-item label="飞过机型：" prop="flyingModels">
-              <el-select
-                  v-model="userRuleForm.flyingModels"
-                  multiple
-                  filterable
-                  allow-create
-                  default-first-option
-                  placeholder="请选择机型，可多选">
-                <el-option
-                    v-for="item in fightTypes"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="现机型飞行时间：" prop="currentTypeFlightDuration">
-              <el-input
-                  type="number"
-                  :min="1"
-                  :max="9999"
-                  v-model="userRuleForm.currentTypeFlightDuration"
-                  planceholder="请输入现机型飞行时间"
-              >
-                <template slot="suffix"><span class="suffix">小时</span></template>
-              </el-input>
-            </el-form-item>
-            <el-form-item label="现飞机型：" prop="currentFlyingModels">
-              <el-select
-                  v-model="userRuleForm.currentFlyingModels"
-                  filterable
-                  allow-create
-                  default-first-option
-                  placeholder="请选择机型">
-                <el-option
-                    v-for="item in fightTypes"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+<!--        <el-row :gutter="10">-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="单位：" prop="brigade">-->
+<!--              <el-input-->
+<!--                  v-if="isOtherDepartment"-->
+<!--                  type="text"-->
+<!--                  :maxLength="50"-->
+<!--                  v-model="userRuleForm.brigade"-->
+<!--              >-->
+<!--              </el-input>-->
+
+<!--              <el-input-->
+<!--                  v-else-->
+<!--                  type="number"-->
+<!--                  :min="1"-->
+<!--                  :max="100"-->
+<!--                  v-model.number="userRuleForm.brigade"-->
+<!--              >-->
+<!--                <template slot="suffix"><span class="suffix">旅</span></template>-->
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="3">-->
+<!--            <el-form-item prop="" label-width="0">-->
+<!--              <el-checkbox v-model="isOtherDepartment" @change="onDepartmentChange">其他单位</el-checkbox>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="9">-->
+<!--            <el-form-item prop="detachment" label-width="0">-->
+<!--              <el-input-->
+<!--                  type="number"-->
+<!--                  :min="1"-->
+<!--                  :max="9999"-->
+<!--                  v-model.number="userRuleForm.detachment"-->
+<!--              >-->
+<!--                <template slot="suffix"><span class="suffix">大队</span></template>-->
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+
+<!--        <el-row :gutter="10">-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="总飞行时间：" prop="flightDuration">-->
+<!--              <el-input-->
+<!--                  type="number"-->
+<!--                  :min="1"-->
+<!--                  :max="9999"-->
+<!--                  v-model="userRuleForm.flightDuration"-->
+<!--                  planceholder="请输入总飞行时间"-->
+<!--              >-->
+<!--                <template slot="suffix"><span class="suffix">小时</span></template>-->
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="飞过机型：" prop="flyingModels">-->
+<!--              <el-select-->
+<!--                  v-model="userRuleForm.flyingModels"-->
+<!--                  multiple-->
+<!--                  filterable-->
+<!--                  allow-create-->
+<!--                  default-first-option-->
+<!--                  placeholder="请选择机型，可多选">-->
+<!--                <el-option-->
+<!--                    v-for="item in fightTypes"-->
+<!--                    :key="item.value"-->
+<!--                    :label="item.label"-->
+<!--                    :value="item.value">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="现机型飞行时间：" prop="currentTypeFlightDuration">-->
+<!--              <el-input-->
+<!--                  type="number"-->
+<!--                  :min="1"-->
+<!--                  :max="9999"-->
+<!--                  v-model="userRuleForm.currentTypeFlightDuration"-->
+<!--                  planceholder="请输入现机型飞行时间"-->
+<!--              >-->
+<!--                <template slot="suffix"><span class="suffix">小时</span></template>-->
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--            <el-form-item label="现飞机型：" prop="currentFlyingModels">-->
+<!--              <el-select-->
+<!--                  v-model="userRuleForm.currentFlyingModels"-->
+<!--                  filterable-->
+<!--                  allow-create-->
+<!--                  default-first-option-->
+<!--                  placeholder="请选择机型">-->
+<!--                <el-option-->
+<!--                    v-for="item in fightTypes"-->
+<!--                    :key="item.value"-->
+<!--                    :label="item.label"-->
+<!--                    :value="item.value">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="success" size="small" @click="submitUserForm(10)">提交</el-button>
@@ -816,18 +825,18 @@ export default {
     this.userType = sessionStorage.getItem("f7a42fe7211f98ac7a60a285ac3a9528");
 
     // 校验用户其他元素信息 先检测用户单位信息 若没有则弹出完善信息框
-    setTimeout(() => {
-      this.userRuleForm = JSON.parse(sessionStorage.getItem("user-all-info"))
-      console.log(' ------------------------------- this.userRuleForm: ', this.userRuleForm)
-      if (!this.userRuleForm || !this.userRuleForm.brigade || this.userRuleForm.brigade === '') {
-        this.dialogTitle = "完善信息"
-        this.userDialogVisiblephone1 = true
-      } else {
-        const currentFlyingModels = JSON.parse(this.userRuleForm.currentFlyingModels)
-        this.userRuleForm.currentFlyingModels = currentFlyingModels.length ? currentFlyingModels[0] : ''
-        this.userRuleForm.flyingModels = JSON.parse(this.userRuleForm.flyingModels)
-      }
-    }, 1100)
+    // setTimeout(() => {
+    //   this.userRuleForm = JSON.parse(sessionStorage.getItem("user-all-info"))
+    //   console.log(' ------------------------------- this.userRuleForm: ', this.userRuleForm)
+    //   if (!this.userRuleForm || !this.userRuleForm.brigade || this.userRuleForm.brigade === '') {
+    //     this.dialogTitle = "完善信息"
+    //     this.userDialogVisiblephone1 = true
+    //   } else {
+    //     const currentFlyingModels = JSON.parse(this.userRuleForm.currentFlyingModels)
+    //     this.userRuleForm.currentFlyingModels = currentFlyingModels.length ? currentFlyingModels[0] : ''
+    //     this.userRuleForm.flyingModels = JSON.parse(this.userRuleForm.flyingModels)
+    //   }
+    // }, 1100)
 
     // 配合公网版游客模式改造
     if (this.userId) {