更新

dist/static/css/chunk-98c0eeec.0258d01c.css

@@ -0,0 +1 @@
+.el-button--primary[data-v-7d774266],.el-button--primary[data-v-7d774266]:active,.el-button--primary[data-v-7d774266]:focus,.el-button--primary[data-v-7d774266]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-7d774266] .el-image-viewer__close{color:#fff;opacity:1}[data-v-7d774266] .el-date-editor.el-input,[data-v-7d774266] .el-select{width:100%!important}[data-v-7d774266] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}

dist/static/css/chunk-acc4506c.2ae8b912.css

@@ -1 +0,0 @@
-.m-container .m-core[data-v-3b8f1e3e]{margin-top:20px}.m-container .m-core .m-wrap[data-v-3b8f1e3e]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.m-container .m-core .m-wrap .newBand[data-v-3b8f1e3e]{margin:0 5px 0 10px}.m-container .m-core .m-wrap .title[data-v-3b8f1e3e]{width:150px;height:40px;line-height:40px;text-align:right;color:#606266}.m-container .m-core .m-wrap .organSelect[data-v-3b8f1e3e]{width:220px!important}.m-container .m-core .m-wrap .el-tooltip.micon[data-v-3b8f1e3e]{width:20px;height:20px;position:relative;top:12px}[data-v-3b8f1e3e] .el-input__icon.el-icon-date{height:40px!important}

dist/static/css/chunk-b0bbf3f8.866e1837.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-e4c873b8],.el-button--primary[data-v-e4c873b8]:active,.el-button--primary[data-v-e4c873b8]:focus,.el-button--primary[data-v-e4c873b8]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-e4c873b8] .el-image-viewer__close{color:#fff;opacity:1}[data-v-e4c873b8] .el-date-editor.el-input,[data-v-e4c873b8] .el-select{width:100%!important}[data-v-e4c873b8] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}

dist/static/css/chunk-d3849260.d0041dbf.css

@@ -0,0 +1 @@
+.m-container .m-core[data-v-72640207]{margin-top:20px}.m-container .m-core .m-wrap[data-v-72640207]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.m-container .m-core .m-wrap .newBand[data-v-72640207]{margin:0 5px 0 10px}.m-container .m-core .m-wrap .title[data-v-72640207]{width:150px;height:40px;line-height:40px;text-align:right;color:#606266}.m-container .m-core .m-wrap .organSelect[data-v-72640207]{width:220px!important}.m-container .m-core .m-wrap .el-tooltip.micon[data-v-72640207]{width:20px;height:20px;position:relative;top:12px}[data-v-72640207] .el-input__icon.el-icon-date{height:40px!important}

src/views/levelManager/levelManager.vue

@@ -170,7 +170,7 @@
           <el-table-column
             align="center"
             prop="idcard"
-            label="身份证号"
+            label="证件号码"
           ></el-table-column>
           <el-table-column
             align="center"

src/views/reportForm/index.vue

@@ -449,6 +449,48 @@
           >
         </div>
       </div>
+      <el-divider></el-divider>
+      <div class="m-core">
+        <div class="m-wrap">
+          <div class="title">服务指标明细导出：</div>
+          <select-all
+            v-model.trim="serviceOrganId"
+            class="organSelect"
+            style="width: 100%"
+            filterable
+            multiple
+            placeholder="请选择分部"
+            clearable
+          >
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </select-all>
+          <el-date-picker
+            v-model.trim="serviceTimer"
+            style="width: 420px; margin-left: 15px"
+            type="daterange"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            @change="getWeekTime"
+            :picker-options="{
+              firstDayOfWeek: 1,
+            }"
+          ></el-date-picker>
+          <el-button
+            style="margin-left: 10px"
+            type="primary"
+            @click="exportDetailService"
+            v-permission="'export/exercisesSituation'"
+            >导出</el-button
+          >
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -486,6 +528,8 @@ export default {
       trainOrganId: null,
       questionActiveType: "CLOUD_TEACHER_FEEDBACK",
       vipOrganId: [],
+      serviceOrganId: [], // 服务报表
+      serviceTimer: []
     };
   },
   mounted() {
@@ -992,6 +1036,88 @@ export default {
       //   "您确定导出vip网管课?"
       // );
     },
+    exportDetailService() {
+      let sunday, monday;
+      if (this.serviceTimer && this.serviceTimer.length > 1) {
+        monday = this.serviceTimer[0];
+        sunday = this.serviceTimer[1];
+      } else {
+        monday = null;
+        sunday = null;
+      }
+      Export(
+        this,
+        {
+          url: "/api-web/export/exercisesSituation",
+          fileName: "服务指标明细.xls",
+          method: "post",
+          params: qs.stringify({
+            monday: monday,
+            sunday: sunday,
+            organId: this.serviceOrganId.join(","),
+          }),
+        },
+        "您确定导出服务指标明细?"
+      );
+    },
+    getNowDateAndMonday(time) {
+      let timestamp = new Date(time.replace(/-/g, "/")).getTime();
+      let serverDate = new Date(time);
+      if (serverDate.getDay() == 0) {
+        timestamp -= 7 * 24 * 60 * 60 * 1000;
+      }
+      let mondayTime =
+        timestamp - (serverDate.getDay() - 1) * 24 * 60 * 60 * 1000;
+
+      let mondayData = new Date(mondayTime);
+      //年
+      let mondayY = mondayData.getFullYear();
+      //月
+      let mondayM =
+        mondayData.getMonth() + 1 < 10
+          ? "0" + (mondayData.getMonth() + 1)
+          : mondayData.getMonth() + 1;
+      //日
+      let mondayD =
+        mondayData.getDate() < 10
+          ? "0" + mondayData.getDate()
+          : mondayData.getDate();
+
+      let str = mondayY + "-" + mondayM + "-" + mondayD;
+      return str;
+    },
+    getNowDateAndSunday(time) {
+      let timestamp = new Date(time.replace(/-/g, "/")).getTime();
+      let serverDate = new Date(time);
+
+      let num = 7 - serverDate.getDay();
+      if (num == 7) {
+        num = 0;
+      }
+      let sundayTiem = timestamp + num * 24 * 60 * 60 * 1000;
+      let SundayData = new Date(sundayTiem);
+      //年
+      let tomorrowY = SundayData.getFullYear(); //月
+      let tomorrowM =
+        SundayData.getMonth() + 1 < 10
+          ? "0" + (SundayData.getMonth() + 1)
+          : SundayData.getMonth() + 1;
+      //日
+      let tomorrowD =
+        SundayData.getDate() < 10
+          ? "0" + SundayData.getDate()
+          : SundayData.getDate();
+      let str = tomorrowY + "-" + tomorrowM + "-" + tomorrowD;
+      return str;
+    },
+    getWeekTime(val) {
+      if (val && val.length > 0) {
+        let start = this.getNowDateAndMonday(val[0]);
+        let end = this.getNowDateAndSunday(val[1]);
+        this.serviceTimer.splice(0, 1, start);
+        this.serviceTimer.splice(1, 1, end);
+      }
+    },
   },
   // AccountDetailTimer
 };

src/views/serverDetail/index.vue

@@ -205,7 +205,7 @@
           </el-table-column>
            <el-table-column align="center" label="预期训练布置">
             <template slot-scope="scope">
-              <div>{{ scope.row.expectExercisesNum + "次" }}</div>
+              <div>{{ scope.row.expectExercisesNum + "人次" }}</div>
             </template>
           </el-table-column>
           <el-table-column align="center" width="120" prop>
@@ -232,7 +232,7 @@
                   scope.row.actualExercisesNum < scope.row.expectExercisesNum
                     ? 'color:red'
                     : ''
-                ">{{ scope.row.actualExercisesNum + "次" }}</div>
+                ">{{ scope.row.actualExercisesNum + "人次" }}</div>
             </template>
           </el-table-column>
           <el-table-column align="center" prop label="提交次数">

vue.config.js

@@ -16,10 +16,17 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // http://47.99.212.176:8000
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
+<<<<<<< HEAD
 // let target = 'http://192.168.3.227:8000' // 何国威
 // let target = 'http://192.168.3.250:8000' //邹璇
 // let target = 'http://192.168.3.112:8000' //勇哥
 let target = 'http://dev.dayaedu.com' // 开发环境
+=======
+// let target = 'http://192.168.3.139:8000' // 箭河
+// let target = 'http://192.168.3.124:8000' //邹璇
+let target = 'http://192.168.3.119:8000' //勇哥
+// let target = 'http://dev.dayaedu.com' // 开发环境
+>>>>>>> master
 // let target = 'https://test.dayaedu.com' //测试环境
 // let target = 'http://192.168.3.134:8000' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/