Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -1109,6 +1109,16 @@
 											isShow: true
 										},
 										// 校园风采(针对青羊区放出)
+										// {
+										// 	icon: "iconfont icon-k-point",
+										// 	name: this.$t("system.menu.schoolElegant"),
+										// 	router: "/home/schoolElegant",
+										// 	tag: "",
+										// 	role: "admin",
+										// 	permission: "dashboard-read",
+										// 	menuName: "schoolElegant",
+										// 	isShow: this.edition !== "pro" && this.isQingYangArea
+										// },
 										{
 											icon: "iconfont icon-k-point",
 											name: this.$t("system.menu.schoolElegant"),
@@ -1117,7 +1127,7 @@
 											role: "admin",
 											permission: "dashboard-read",
 											menuName: "schoolElegant",
-											isShow: this.edition !== "pro" && this.isQingYangArea
+											isShow: this.hasDashAuth && !this.isGlobalSite && (this.edition === "pro" || this.isQingYangArea)
 										},
 										{
 											icon: "iconfont icon-test",
@@ -1153,16 +1163,7 @@
 									isShow: this.IES5Menu && !this.isGlobalSite && this.edition === "pro" && this.edition !== "artTest",
 									child: [
 										// 校园风采
-										{
-											icon: "iconfont icon-k-point",
-											name: this.$t("system.menu.schoolElegant"),
-											router: "/home/schoolElegant",
-											tag: "",
-											role: "admin",
-											permission: "dashboard-read",
-											menuName: "schoolElegant",
-											isShow: this.hasDashAuth && !this.isGlobalSite && this.edition === "pro"
-										},
+										
 										{
 											icon: "iconfont icon-basic-setting",
 											name: this.$t("system.menu.judgeSettings"),

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

@@ -1,5 +1,6 @@
 <template>
   <div class="dash-setting-container">
+    <p style="margin-top:20px;margin-left:10px;color:#888">提示：本页面用于设置学生五育看板的学生数据评价规则及细节</p>
     <div class="box">
       <p class="title">评价等级分数设置</p>
       <div class="content art-setting-wrap">

TEAMModelOS/ClientApp/src/view/elegant/BaseElegantCloud.vue

@@ -46,7 +46,7 @@
         watch: {
             echartData:{
                 handler(n,o){
-                    let keyCounts = this.echartsId === 'cloud1' ? n[0].keyCounts : n[1].keyCounts
+                    let keyCounts = this.echartsId === 'cloud1' ? n[1].keyCounts : n[0].keyCounts
                     this.chartOption.series[0].data = keyCounts.map(i => {
                         return {
                             name: i.word,

TEAMModelOS/ClientApp/src/view/schoolmgmt/SystemSetting/SystemSetting.vue

@@ -9,6 +9,9 @@
         <span class="pane" @click="tab = 'period'" :class="{ active: tab === 'period' }">
           {{schoolSetting.type == 1 ? $t('schoolBaseInfo.pdMgt') : $t('schoolBaseInfo.cgMgt')}}
         </span>
+        <span class="pane" @click="tab = 'dash-setting'" :class="{ active: tab === 'dash-setting' }">
+          {{ $t("system.menu.judgeSettings") }}
+        </span>
         <!-- #2388 国际站隐藏 -->
         <!-- 接口未配置完整，先隐藏 -->
         <span class="pane" @click="tab = 'third'" :class="{ active: tab === 'third' }" v-if="$store.state.config.srvAdr != 'Global'">
@@ -67,6 +70,10 @@
       </div>
 
     </div>
+    <!-- 通用设置 -->
+    <div class="" v-if="tab === 'dash-setting' && $store.state.config.srvAdr != 'Global'">
+      <DashSettingPage></DashSettingPage>
+    </div>
     <!-- 学段/学院管理 -->
     <div class="sm-system-body custom-iview-split disabled-iview-select text-cursor-disabled" v-show="tab == 'period'">
       <Split v-model="split1">
@@ -484,10 +491,11 @@
 import Draggable from 'vuedraggable'
 import TimeSetting from './TimeSetting.vue'
 import OpenMgmt2 from '@/view/settings/OpenMgmt2.vue'
+import DashSettingPage from '@/view/dashboard/Setting.vue'
 import '@/utils/Math.uuid'
 export default {
   components: {
-    Draggable, TimeSetting, OpenMgmt2
+    Draggable, TimeSetting, OpenMgmt2, DashSettingPage
   },
   data() {
     const validateDate = (rule, value, callback) => {

TEAMModelOS/TEAMModelOS.csproj

@@ -109,7 +109,7 @@
     <!-- Build Target: Restore NPM packages using npm -->
     <Message Importance="high" Text="Restoring dependencies using 'npm'. This may take several minutes..." />
 
-    <Exec WorkingDirectory="$(SpaRoot)" Command="npm install" />
+    <Exec WorkingDirectory="$(SpaRoot)" Command="cnpm install" />
   </Target>
 
   <Target Name="PublishRunWebpack" AfterTargets="ComputeFilesToPublish">