策略显示时间

src/views/regionSection/applicationManage/applicationManage.vue

@@ -135,11 +135,7 @@
             </Select>
           </div>
         </div>
-        <Table
-          style="border: 1px solid #e8eaec; border-bottom: none"
-          :columns="installInfo.columns"
-          :data="installInfo.list"
-        ></Table>
+        <Table :columns="installInfo.columns" :data="installInfo.list"></Table>
       </div>
 
       <div slot="footer" style="text-align: center">

src/views/regionSection/search/allApps.vue

@@ -121,11 +121,7 @@
             </Select>
           </div>
         </div>
-        <Table
-          style="border: 1px solid #e8eaec; border-bottom: none"
-          :columns="installInfo.columns"
-          :data="installInfo.list"
-        ></Table>
+        <Table :columns="installInfo.columns" :data="installInfo.list"></Table>
       </div>
 
       <div slot="footer" style="text-align: center">

src/views/schoolSection/applicationManage/applicationList.vue

@@ -632,11 +632,7 @@
             </Select>
           </div>
         </div>
-        <Table
-          style="border: 1px solid #e8eaec; border-bottom: none"
-          :columns="installInfo.columns"
-          :data="installInfo.list"
-        ></Table>
+        <Table :columns="installInfo.columns" :data="installInfo.list"></Table>
       </div>
 
       <div slot="footer" style="text-align: center">

src/views/schoolSection/strategy/personalStrategy.vue

@@ -82,12 +82,12 @@
                 设备生效时间
               </div>
               <div class="week">
-                <div class="day" v-for="item in weeks" :key="item.id">
-                  <div class="day_title">{{ item.title }}</div>
+                <div class="day" v-for="item in weekDay" :key="item.value">
+                  <div class="day_title">{{ item.alias }}</div>
                   <div class="day_content">
                     <div
                       class="time"
-                      v-for="(sitem, index) in getDay(item.id)"
+                      v-for="(sitem, index) in getDay(item.value)"
                       :key="index"
                     >
                       {{ getTime(sitem.starttime) }}-{{
@@ -348,7 +348,7 @@ import {
   stPad_list_user
 } from "@/api/stPad";
 import TimeStrategy from "@/components/TimeStrategy/TimeStrategy";
-import { padDevices, padViolates } from "@/utils";
+import { padDevices, padViolates, weekDay } from "@/utils";
 export default {
   components: {
     TimeStrategy
@@ -356,6 +356,7 @@ export default {
   props: ["curClass"],
   data() {
     return {
+      weekDay,
       showLoading: false,
       stPadInfo: {
         show: false,
@@ -418,36 +419,6 @@ export default {
           align: "center"
         }
       ],
-      weeks: [
-        {
-          title: "星期日",
-          id: 7
-        },
-        {
-          title: "星期一",
-          id: 1
-        },
-        {
-          title: "星期二",
-          id: 2
-        },
-        {
-          title: "星期三",
-          id: 3
-        },
-        {
-          title: "星期四",
-          id: 4
-        },
-        {
-          title: "星期五",
-          id: 5
-        },
-        {
-          title: "星期六",
-          id: 6
-        }
-      ],
       ssidName: "",
       searchForm: {
         name: "",
@@ -681,9 +652,9 @@ export default {
     getTime(time) {
       return time;
     },
-    getDay(id) {
+    getDay(val) {
       //获取当天时间
-      let arr = this.strategyInfo.padTimes.filter((v) => v.week === id);
+      let arr = this.strategyInfo.padTimes.filter((v) => v.week === val);
       return arr;
     },
     timesChange(times) {

src/views/schoolSection/strategy/publicStrategy.vue

@@ -39,12 +39,12 @@
             设备生效时间
           </div>
           <div class="week">
-            <div class="day" v-for="item in weeks" :key="item.id">
-              <div class="day_title">{{ item.title }}</div>
+            <div class="day" v-for="item in weekDay" :key="item.value">
+              <div class="day_title">{{ item.alias }}</div>
               <div class="day_content">
                 <div
                   class="time"
-                  v-for="(sitem, index) in getDay(item.id)"
+                  v-for="(sitem, index) in getDay(item.value)"
                   :key="index"
                 >
                   {{ getTime(sitem.starttime) }}-{{ getTime(sitem.stoptime) }}
@@ -291,7 +291,7 @@ import {
 } from "@/api/stPad";
 import { app_list_sel } from "@/api/appgroup";
 import TimeStrategy from "@/components/TimeStrategy/TimeStrategy";
-import { padDevices, padViolates } from "@/utils";
+import { padDevices, padViolates, weekDay } from "@/utils";
 export default {
   components: {
     TimeStrategy
@@ -299,6 +299,7 @@ export default {
   props: ["curClass"],
   data() {
     return {
+      weekDay,
       showLoading: false,
       stPadInfo: {
         show: false,
@@ -359,36 +360,6 @@ export default {
           align: "center"
         }
       ],
-      weeks: [
-        {
-          title: "星期日",
-          id: 7
-        },
-        {
-          title: "星期一",
-          id: 1
-        },
-        {
-          title: "星期二",
-          id: 2
-        },
-        {
-          title: "星期三",
-          id: 3
-        },
-        {
-          title: "星期四",
-          id: 4
-        },
-        {
-          title: "星期五",
-          id: 5
-        },
-        {
-          title: "星期六",
-          id: 6
-        }
-      ],
       ssidName: ""
     };
   },
@@ -562,9 +533,9 @@ export default {
     getTime(time) {
       return time;
     },
-    getDay(id) {
+    getDay(val) {
       //获取当天时间
-      let arr = this.strategyInfo.padTimes.filter((v) => v.week === id);
+      let arr = this.strategyInfo.padTimes.filter((v) => v.week === val);
       return arr;
     },
     timesChange(times) {

src/views/schoolSection/strategy/strategyTemplate.vue

@@ -118,12 +118,12 @@
                 设备生效时间
               </div>
               <div class="week">
-                <div class="day" v-for="item in weeks" :key="item.id">
-                  <div class="day_title">{{ item.title }}</div>
+                <div class="day" v-for="item in weekDay" :key="item.value">
+                  <div class="day_title">{{ item.alias }}</div>
                   <div class="day_content">
                     <div
                       class="time"
-                      v-for="(sitem, index) in getDay(item.id)"
+                      v-for="(sitem, index) in getDay(item.value)"
                       :key="index"
                     >
                       {{ getTime(sitem.starttime) }}-{{
@@ -362,13 +362,14 @@ import {
 } from "@/api/stPad";
 import { app_list_sel } from "@/api/appgroup";
 import TimeStrategy from "@/components/TimeStrategy/TimeStrategy";
-import { padDevices, padViolates } from "@/utils";
+import {padDevices, padViolates, weekDay} from "@/utils";
 export default {
   components: {
     TimeStrategy
   },
   data() {
     return {
+      weekDay,
       showLoading: false,
       searchForm: {
         name: "",
@@ -441,36 +442,6 @@ export default {
           align: "center"
         }
       ],
-      weeks: [
-        {
-          title: "星期日",
-          id: 7
-        },
-        {
-          title: "星期一",
-          id: 1
-        },
-        {
-          title: "星期二",
-          id: 2
-        },
-        {
-          title: "星期三",
-          id: 3
-        },
-        {
-          title: "星期四",
-          id: 4
-        },
-        {
-          title: "星期五",
-          id: 5
-        },
-        {
-          title: "星期六",
-          id: 6
-        }
-      ],
       ssidName: "",
       columns: [
         {
@@ -558,9 +529,9 @@ export default {
     getTime(time) {
       return time;
     },
-    getDay(id) {
+    getDay(val) {
       //获取当天时间
-      let arr = this.strategyInfo.padTimes.filter((v) => v.week === id);
+      let arr = this.strategyInfo.padTimes.filter((v) => v.week === val);
       return arr;
     },
     timesChange(times) {

src/views/schoolSection/userManage/userManage.vue

@@ -447,7 +447,7 @@ export default {
         { id: 2, title: "不关注" }
       ],
       enabled_list: [
-        { id: 0, title: "启动状态" },
+        { id: 0, title: "启用状态" },
         { id: 1, title: "启用" },
         { id: 2, title: "禁用" }
       ],