Merge branch 'develop' of http://173.18.12.196:3000/front/toid-client into develop

src/views/login.vue

@@ -37,7 +37,7 @@
           <img :src="codeUrl" @click="getCode" class="login-code-img"/>
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
+      <!-- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox> -->
       <el-form-item style="width:100%;">
         <el-button
           :loading="loading"
@@ -54,10 +54,6 @@
         </div>
       </el-form-item>
     </el-form>
-    <!--  底部  -->
-    <div class="el-login-footer">
-      <span>Copyright © 2021 浙大启真未来城市科技（杭州）有限公司版权所有</span>
-    </div>
   </div>
 </template>
 
@@ -73,8 +69,8 @@ export default {
       title: process.env.VUE_APP_TITLE,
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""

src/views/statistics/popularity-prediction/index.vue

@@ -3,10 +3,9 @@
     <div class="tree-map-container">
           <!-- 筛选条件 -->
     <el-card class="filter-card">
-      <el-form :inline="true" :model="form" size="small">
-
-        <el-form-item label="病原体">
-          <el-select v-model="form.sysPathogenConfigId" placeholder="请选择病原体">
+      <el-form :inline="true" :model="form" size="small">      
+        <el-form-item label="病原体演化配置">
+          <el-select v-model="form.sysPathogenConfigId" placeholder="请选择病原体演化配置">
             <el-option v-for="item in pathogen" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </el-form-item>
@@ -64,8 +63,8 @@ export default {
   name: 'PopularityPrediction',
   data() {
     return {
-        form: {
-        bytName: "",
+      form: {
+        sysPathogenConfigId: "",
         endDate: "",
         startDate: "",
         dateRange: []

src/views/system/role/index.vue

@@ -269,10 +269,6 @@ export default {
           value: "1",
           label: "全部数据权限"
         },
-        {
-          value: "2",
-          label: "自定数据权限"
-        },
         {
           value: "3",
           label: "本机构&科室数据权限"
@@ -280,10 +276,6 @@ export default {
         {
           value: "4",
           label: "本机构&科室及以下数据权限"
-        },
-        {
-          value: "5",
-          label: "仅本人数据权限"
         }
       ],
       // 菜单列表