首页和大屏代码提交

src/router/index.ts

@@ -172,7 +172,7 @@ export const dynamicRoutes: RouteOption[] = [
     path: '/activity',
     component: Layout,
     hidden: true,
-    permissions: ['scale:SysScale:edit'],
+    permissions: ['scale:publish:query'],
     children: [
       {
         path: 'index/:batchNo/:sessionName',

src/views/activity/component/schedule/index.vue

@@ -124,6 +124,10 @@ const queryParams = ref({
 const getTreeSelect = async () => {
   const res = await deptTreeSelect();
   deptOptions.value = res.data;
+
+  if (res.data && res.data.length > 0) {
+    queryParams.value.deptId = res.data[0].id;
+  }
 }
 
 const info = ref({ sessionName: '', createName: '', expireTime: '', scaleNames: [], deptNames: [] })

src/views/activity/component/statistics/index.vue

@@ -117,60 +117,6 @@ use([
   LegendComponent,
 ]);
 
-const pieOption = ref({
-  title: {
-    text: 'Traffic Sources',
-    left: 'center',
-  },
-  tooltip: {
-    trigger: 'item',
-    formatter: '{a} <br/>{b} : {c} ({d}%)',
-  },
-  legend: {
-    orient: 'vertical',
-    left: 'left',
-    data: ['Direct', 'Email', 'Ad Networks', 'Video Ads', 'Search Engines'],
-  },
-  series: [
-    {
-      name: 'Traffic Sources',
-      type: 'pie',
-      radius: '55%',
-      center: ['50%', '60%'],
-      data: [
-        { value: 335, name: 'Direct' },
-        { value: 310, name: 'Email' },
-        { value: 234, name: 'Ad Networks' },
-        { value: 135, name: 'Video Ads' },
-        { value: 1548, name: 'Search Engines' },
-      ],
-      emphasis: {
-        itemStyle: {
-          shadowBlur: 10,
-          shadowOffsetX: 0,
-          shadowColor: 'rgba(0, 0, 0, 0.5)',
-        },
-      },
-    },
-  ],
-});
-
-const barOption = ref({
-  xAxis: {
-    type: 'category',
-    data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-  },
-  yAxis: {
-    type: 'value'
-  },
-  series: [
-    {
-      data: [120, 200, 150, 80, 70, 110, 130],
-      type: 'bar'
-    }
-  ]
-})
-
 const batchNo = props.batchNo
 const radio = ref(1)
 
@@ -322,6 +268,7 @@ watch([scaleId, radio], ([newVal, oldVal]) => {
   warnTable.value = []
   getwarnData()
 
+  factorDataList.value = []
   getFactoryData()
 })
 

src/views/evaluate/evaluateList/index.vue

@@ -48,8 +48,9 @@
           <template #default="scope">
             <el-tooltip content="查看测评结果" placement="top">
               <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)"
-                v-hasPermi="['evaluation:record:query']">
-                <router-link :to="'/activity/index/' + scope.row.batchNo" class="link-type">
+                v-hasPermi="['scale:publish:query']">
+                <router-link :to="'/activity/index/' + scope.row.batchNo + '/' + scope.row.sessionName"
+                  class="link-type">
                   <span>查看测评结果</span>
                 </router-link>
               </el-button>

src/views/index.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="app-container">
-    <!--    <el-button round>-->
-    <!--      <router-link target="_blank" to="/bigScreen">-->
-    <!--        <el-icon>-->
-    <!--          <FullScreen />-->
-    <!--        </el-icon><span>可视大屏</span>-->
-    <!--      </router-link>-->
-    <!--    </el-button>-->
-
     <div class="item header">
       <el-card>
         <div class="card-header">
           <div class="user-info">
             <div> <img :src="userStore.avatar" /></div>
             <div>上午好，{{ userStore.nickname }}</div>
+
+            <el-button round style="margin-left: 20px;">
+              <router-link target="_blank" to="/bigScreen">
+                <el-icon>
+                  <FullScreen />
+                </el-icon><span>可视大屏</span>
+              </router-link>
+            </el-button>
           </div>
 
           <div class="user-list">

src/views/scale/SysScalePublish/index.vue

@@ -35,7 +35,7 @@
         <el-table-column label="场次名称" align="center" prop="sessionName" />
         <el-table-column label="量表名称 以逗号隔开" align="center" prop="scaleNames" />
 
-        <el-table-column label="部门名称/用户名称" align="center" prop="deptNames">
+        <el-table-column label="班级名称/用户名称" align="center" prop="deptNames">
           <template #default="scope">
             <span>
               {{ scope.row.deptNames.length > 0 ? scope.row.deptNames.join(',') : scope.row.userNames.join(',') }}
@@ -66,7 +66,7 @@
           <template #default="scope">
             <el-tooltip content="查看测评结果" placement="top">
               <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)"
-                v-hasPermi="['evaluation:record:query']">
+                v-hasPermi="['scale:publish:query']">
                 <router-link :to="'/activity/index/' + scope.row.batchNo + '/' + scope.row.sessionName"
                   class="link-type">
                   <span>查看测评结果</span>