测试问题修改06-12

src/api/healthCenter/index.js

@@ -94,9 +94,9 @@ export function editChronicApi(data) {
     })
 }
 // 慢性病-更新
-export function delChronicApi(Id) {
+export function delChronicApi(chronicId) {
     return request({
-        url: '/smart-canteen/health_chronic/del/'+Id,
+        url: '/smart-canteen/health_chronic/del/'+chronicId,
         method: 'post',
         headers: {
             "merchant-id":"378915229716713472",

src/router/index.js

@@ -64,13 +64,27 @@ export const constantRoutes = [
   {
     path: '',
     component: Layout,
-    redirect: '/index',
+    redirect: '/canteen/index',
+    // children: [
+    //   {
+    //     path: 'index',
+    //     component: () => import('@/views/index'),
+    //     name: 'Index',
+    //     meta: { title: '首页', icon: 'dashboard', affix: true }
+    //   }
+    // ]
+  },
+  {
+    path: '/canteen',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
     children: [
       {
         path: 'index',
-        component: () => import('@/views/index'),
+        component: () => import('@/views/index_v1'),
-        name: 'Index',
+        name: 'Profile',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
+        meta: { title: '食堂数据总览', icon: 'dashboard' }
       }
     ]
   },

src/views/healthCenter/chronicDisease/index.vue

@@ -63,7 +63,7 @@
                 <el-row>
                     <el-col :span="24">
                         <el-form-item label="慢性病名称" prop="chronicName">
-                            <el-input v-model="form.chronicName" placeholder="请输入慢性病名称" />
+                            <el-input v-model="form.chronicName" maxlength="30" placeholder="请输入慢性病名称" />
                         </el-form-item>
                     </el-col> 
                 </el-row>
@@ -74,9 +74,9 @@
             </div>
         </el-dialog>
 
-        <el-dialog :visible.sync="dialogVisible" width="700px">
+        <!-- <el-dialog :visible.sync="dialogVisible" width="700px">
             <img style="width: 100%;height: 100%;" :src="dialogImageUrl" alt="">
-        </el-dialog>
+        </el-dialog> -->
     </div>
 </template>
 
@@ -197,7 +197,7 @@ export default {
         },
         handleDelete(row) {  
             this.$modal.confirm('是否确认删除数据项？').then(function() {
-                return delChronicApi(row.id);
+                return delChronicApi(row.chronicId);
             }).then(() => {
                 this.getList();
                 this.$modal.msgSuccess("删除成功");

src/views/healthCenter/healthRecords/index.vue

@@ -456,6 +456,7 @@ export default {
                 pageNum: 1,
                 pageSize: 10,
                 articleTitle: "",//标题
+                deptIdList:[],
                 chronicList:[],  //慢性病
                 placeIdList:[], //位置
                 doctorAdvice:[],

src/views/login1.vue

@@ -263,14 +263,14 @@ export default {
               if (res.code===200){
                 if (res.isLogin){
                   this.$modal.confirm('账号已在其他地方登录是否继续登录！！！！').then(function() {
-                    return this.$router.push({ path: this.redirect || '/' });
+                    return this.$router.push({ path: this.redirect || '/canteen/index' });
                   }).then(() => {
                     this.loading = false
                   }).catch(() => {
                     this.loading = false
                   })
                 }else {
-                  this.$router.push({ path: this.redirect || '/' });
+                  this.$router.push({ path: this.redirect || '/canteen/index' });
                 }
               }
             })

src/views/system/user/index.vue

@@ -261,7 +261,8 @@
                     >
                         <template slot-scope="scope">
                             <img :src="scope.row.photoUrl" v-if="scope.row.photoUrl" alt="" style="width: 60px;height: 60px;" @click="openImg(scope.row)">
-                            <span v-else>无</span>
+                            <span v-if="scope.row.faceStatus==0">未上传</span>
+                            <span v-if="scope.row.faceStatus==2">上传失败</span>
                         </template>
                     </el-table-column>
                     <el-table-column label="账号时效" align="center">