Merge branch 'master' into develop

TEAMModelOS/ClientApp/src/view/dashboard/Index.vue

@@ -105,8 +105,7 @@ export default {
     onSelect(item) {
       if (item.path === 'researchDashboard') {
         this.$router.push('/researchDashboard')
-      } else if (item.path === 'moral' && localStorage.getItem('srvAdr') === 'China') {
-        // window.open(this.isOfficialSite ? 'https://school.xydaa.com/#/db-login' : 'http://paas-admin.husiwei.com/GkI043vXpK9sat5yDW008oaWt9yZ1dwIIq7rdiUywbU4HgI656W2cIbzOWRzoI93vzv82l28DyQKxVVd9qPqFkLLmrlCkIvDlWecschool-datawuhZVGb2K8KM5hlGfU0123tKhKd6b5f84EPUOcszar3ltNpImTPa8BeQtVbcuUtdWUL0zmRaUJRHOlYRVbDofmn9K7XTNwf4Q9mh')
+      } else if (item.path === 'moral' && localStorage.getItem('srvAdr') === 'China' && ['habook', 'ydzt', 'hbcn'].includes(this.$store.state.userInfo.schoolCode)) {
         window.open('http://paas-admin.husiwei.com/GkI043vXpK9sat5yDW008oaWt9yZ1dwIIq7rdiUywbU4HgI656W2cIbzOWRzoI93vzv82l28DyQKxVVd9qPqFkLLmrlCkIvDlWecschool-datawuhZVGb2K8KM5hlGfU0123tKhKd6b5f84EPUOcszar3ltNpImTPa8BeQtVbcuUtdWUL0zmRaUJRHOlYRVbDofmn9K7XTNwf4Q9mh')
       } else if (item.path === 'art' && localStorage.getItem('srvAdr') === 'China' && ['habook', 'ydzt', 'hbcn'].includes(this.$store.state.userInfo.schoolCode)) {
         this.$router.push('/artDashboard')