up

src/components/EntGridSelector/index.vue

@@ -1,78 +0,0 @@
-<template>
-  <el-select
-    v-if="multiple"
-    v-model="gridId"
-    value-key="gridId"
-    multiple
-    style="width: 100%"
-    filterable
-    placeholder="请选择网格"
-  >
-    <el-option-group>
-      <el-option
-        v-for="item in gridList"
-        :key="item.gridId"
-        :label="item.gridTitle"
-        :value="item.gridId"
-      />
-    </el-option-group>
-  </el-select>
-  <el-select v-else v-model="gridId" value-key="gridId" style="width: 100%" filterable placeholder="请选择网格">
-    <el-option-group>
-      <el-option
-        v-for="item in gridList"
-        :key="item.gridId"
-        :label="item.gridTitle"
-        :value="item.gridId"
-      />
-    </el-option-group>
-  </el-select>
-</template>
-<script>
-import { getGridByList } from '@/api/system/gridApi'
-
-export default {
-  name: 'GridSelector',
-  components: {},
-  props: {
-    value: {
-      type: [Number, Array],
-      default: undefined
-    },
-    multiple: {
-      type: Boolean,
-      default: false
-    }
-  },
-  data() {
-    return {
-      gridId: undefined,
-      gridList: []
-    }
-  },
-  watch: {
-    value(val) {
-      this.gridId = val
-    },
-    gridId(val) {
-      this.$emit('input', val)
-    }
-  },
-  created() {
-    this.initGridData()
-  },
-  mounted() {
-  },
-  methods: {
-    // 网格列表
-    initGridData() {
-      getGridByList({}).then((resp) => {
-        const { data } = resp
-        this.gridList = data
-      }).catch((error) => {
-        console.log(error)
-      })
-    }
-  }
-}
-</script>

src/layout/components/Navbar.vue

@@ -109,8 +109,8 @@ export default {
       sideMenuTabId: 1,
       sideMenus: [],
       sideMenuTabList: [
-        { name: '数字全景', icon: 'icon-common_panorama1', path: '/hos/satisfy/panorama', permit: 'hos_satisfy_panorama', id: 1 },
-        { name: '工作总览', icon: 'el-icon-s-platform', path: '/hos/satisfy/overview', permit: 'hos_satisfy_overview', id: 0 },
+        { name: '数字全景', icon: 'icon-common_panorama1', path: '/hos/satisfy/panorama', permit: 'hos_satisfy_panorama', id: 0 },
+        { name: '工作总览', icon: 'el-icon-s-platform', path: '/hos/satisfy/overview', permit: 'hos_satisfy_overview', id: 1 },
         { name: '建设计划', icon: 'icon-common_saving', path: '/hos/satisfy/instruction', permit: 'hos_satisfy_instruction', id: 2 },
         { name: '工作动态', icon: 'icon-common_task', path: '/hos/satisfy/task', permit: 'hos_satisfy_task', id: 3 },
         { name: '成果评价', icon: 'icon-common_evaluate', path: '/hos/satisfy/assess', permit: 'hos_satisfy_assess', id: 4 },

src/layout/components/Sidebar/index.vue

@@ -29,6 +29,7 @@ import { openeds } from '@/settings'
 import { mapGetters } from 'vuex'
 import SidebarItem from './SidebarItem'
 import variables from '@/styles/variables.scss'
+
 export default {
   name: 'SidebarIndex',
   components: { SidebarItem },

src/router/modules/csat.js

@@ -2,27 +2,11 @@ import Layout from '@/layout/index'
 
 const csatRouter = [
   {
-    path: '/',
-    component: Layout,
-    name: 'HosSatisfyOverview',
-    redirect: '/hos/satisfy/overview',
-    groupId: [0],
-    children: [
-      {
-        path: '/hos/satisfy/overview',
-        component: () => import('@/views/hos/overview'),
-        name: 'hos_satisfy_overview',
-        meta: { title: '数据总览', noCache: true, icon: 'icon-common_panorama1', permit: 'hos_satisfy_overview' }
-      }
-    ]
-  },
-
-  {
     path: '/hos/satisfy/panorama',
     component: Layout,
     name: 'HosSatisfyPanorama',
     redirect: '/hos/satisfy/monitor/overview',
-    groupId: [1],
+    groupId: [0],
     children: [
       {
         path: '/hos/satisfy/monitor/overview',
@@ -37,7 +21,7 @@ const csatRouter = [
     component: Layout,
     name: 'HosSatisfyData',
     redirect: '/hos/satisfy/data/index',
-    groupId: [1],
+    groupId: [0],
     meta: {
       title: '监测数据',
       icon: 'el-icon-c-scale-to-original',
@@ -63,7 +47,7 @@ const csatRouter = [
     component: Layout,
     name: 'HosSatisfyStatis',
     redirect: '/hos/satisfy/statis/year',
-    groupId: [1],
+    groupId: [0],
     meta: {
       title: '统计分析',
       icon: 'el-icon-s-data',
@@ -110,6 +94,22 @@ const csatRouter = [
   },
 
   {
+    path: '/',
+    component: Layout,
+    name: 'HosSatisfyOverview',
+    redirect: '/hos/satisfy/overview',
+    groupId: [1],
+    children: [
+      {
+        path: '/hos/satisfy/overview',
+        component: () => import('@/views/hos/overview'),
+        name: 'hos_satisfy_overview',
+        meta: { title: '数据总览', noCache: true, icon: 'icon-common_panorama1', permit: 'hos_satisfy_overview' }
+      }
+    ]
+  },
+
+  {
     path: '/hos/satisfy/story',
     component: Layout,
     name: 'HosSatisfyStory',

src/settings.js

@@ -1,5 +1,5 @@
 module.exports = {
-  title: '满意医院管理平台',
+  title: '满意医院数字化管理平台',
 
   /**
    * @type {boolean} true | false
@@ -45,9 +45,9 @@ module.exports = {
   * dev 开发环境
   * pro正式环境
   */
-  appID: '10005',
-  appKey: '82a8bf439373e309',
-  appSecret: '82a8bf439373e309',
+  appID: '10007',
+  appKey: '82a8bf439373e311',
+  appSecret: '82a8bf439373e311',
   permitTplId: 7,
   wsServerUrl: {
     dev: 'ws://ws.58yunkang.com/websocket/link',

src/views/system/group/group/GroupTree.vue

@@ -156,11 +156,11 @@ export default {
 
     .title-bar {
       position: relative;
-      height: 40px;
+      height: 30px;
       font-size: 18px;
       color: #fff;
       font-weight: bold;
-      line-height: 40px;
+      line-height: 30px;
       text-indent: 15px;
       background: #113849;
       margin-bottom: 0;

src/views/system/profile/userProfile.vue

@@ -14,7 +14,8 @@
 
             <div class="box-center">
               <div class="user-name text-center">
-                <i class="el-icon-user" /> {{ viewData.accountName }} [{{ viewData.accountStaffNo }}]
+                <i class="el-icon-user" /> {{ viewData.accountName }}
+                <span v-if="viewData.accountStaffNo">[{{ viewData.accountStaffNo }}]</span>
               </div>
               <div class="user-phone text-center text-muted">
                 <i class="el-icon-mobile-phone" /> {{ viewData.accountPhone }}