Merge branch 'Inspection' into online

dist/static/css/chunk-22a2a10e.753ee7da.css

@@ -0,0 +1 @@
+.v-charts-component-loading{position:absolute;left:0;right:0;top:0;bottom:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background-color:hsla(0,0%,100%,.9)}.v-charts-mask-status{-webkit-filter:blur(1px);filter:blur(1px)}.v-charts-component-loading .circular{width:42px;height:42px;-webkit-animation:loading-rotate 2s linear infinite;animation:loading-rotate 2s linear infinite}.v-charts-component-loading .path{-webkit-animation:loading-dash 1.5s ease-in-out infinite;animation:loading-dash 1.5s ease-in-out infinite;stroke-dasharray:90,150;stroke-dashoffset:0;stroke-width:2;stroke:#20a0ff;stroke-linecap:round}@-webkit-keyframes loading-rotate{to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes loading-rotate{to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@-webkit-keyframes loading-dash{0%{stroke-dasharray:1,200;stroke-dashoffset:0}50%{stroke-dasharray:90,150;stroke-dashoffset:-40px}to{stroke-dasharray:90,150;stroke-dashoffset:-120px}}@keyframes loading-dash{0%{stroke-dasharray:1,200;stroke-dashoffset:0}50%{stroke-dasharray:90,150;stroke-dashoffset:-40px}to{stroke-dasharray:90,150;stroke-dashoffset:-120px}}.v-charts-data-empty{position:absolute;left:0;right:0;top:0;bottom:0;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background-color:hsla(0,0%,100%,.9);color:#888;font-size:14px}

dist/static/css/chunk-37308713.f0e7ce48.css

@@ -0,0 +1 @@
+.number-input[data-v-5ec13f8a]{width:100%}.number-input[data-v-5c1918b2] .el-input__inner,.number-input[data-v-5ec13f8a] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}

dist/static/css/chunk-68fb5342.e29003cb.css

@@ -0,0 +1 @@
+.newBand[data-v-729706a0]{display:inline-block}[data-v-729706a0] .el-input-number.is-controls-right .el-input__inner{text-align:left}.setWidth[data-v-729706a0]{display:inline-block}.lookTitle[data-v-729706a0]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.showShop[data-v-729706a0]{height:40px;line-height:40px;width:150px;background-color:#f5f7fa;border-color:#e4e7ed;color:#c0c4cc;cursor:not-allowed;color:#333;opacity:1;border-radius:4px;border:1px solid #dcdfe6;padding:0 15px;margin-right:10px}.shopListWrap[data-v-729706a0]{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}

dist/static/css/chunk-e0eff046.5e07fd38.css

@@ -0,0 +1 @@
+.container[data-v-24cd2a96]{overflow:hidden}.container .rows>div[data-v-24cd2a96]{margin-bottom:20px}.container[data-v-24cd2a96] .el-card__body .statistic{margin-bottom:15px}.title[data-v-3d6ebe51]{height:48px;line-height:48px;background-color:rgba(0,0,0,.02);overflow:hidden;margin-bottom:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding-right:10px;font-weight:700}.title b[data-v-3d6ebe51]{font-size:18px}.title.error b[data-v-3d6ebe51]{color:#ed6f62}.title.error[data-v-3d6ebe51]:before{background-color:#ed6f62}.title.warning b[data-v-3d6ebe51]{color:#f2a24a}.title.warning[data-v-3d6ebe51]:before{background-color:#f2a24a}.title[data-v-3d6ebe51]:before{content:"";display:block;position:absolute;width:7px;height:48px;left:0}.title>div[data-v-3d6ebe51]{position:relative;padding-left:20px;font-size:14px}.title>div>span[data-v-3d6ebe51]{margin-right:10px;display:inline-block}.group[data-v-439542a6]{background-color:rgba(0,0,0,.05);padding:10px;border-radius:3px;margin-bottom:10px}.ctrl[data-v-439542a6]{margin-top:45px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.ctrl i[data-v-439542a6]{font-size:24px}

src/constant/index.js

@@ -206,3 +206,8 @@ export const musicClassType = {
   HIGH_ONLINE:'线上基础技能班',
   MUSIC_NETWORK:"乐团网管课"
 }
+
+export const inspectionItem = {
+  INSPECT:'下校巡查',
+  VISIT:'学员回访'
+}

src/utils/vueFilter.js

@@ -139,6 +139,13 @@ Vue.filter('dayjsFormat', (value) => {
     return value
   }
 })
+Vue.filter('dayjsFormatWeek', (value) => {
+  if (value) {
+    return dayjs(value).format('YYYY-MM')
+  } else {
+    return value
+  }
+})
 
 Vue.filter('dayjsFormatMinute', (value) => {
   if (value) {
@@ -707,3 +714,8 @@ Vue.filter('rewardModeTypeFormat', value => {
 Vue.filter('journalTypeFormat', value => {
   return constant.journalType[value]
 })
+
+// 日程安排 inspectionItem
+Vue.filter('inspectionItemFormat', value => {
+  return constant.inspectionItem[value]
+})

src/views/main/abnormal/index.vue

@@ -18,6 +18,9 @@
       <el-button native-type="submit" type="primary">搜索</el-button>
       <el-button native-type="reset" type="danger">重置</el-button>
     </save-form>
+    <div class="tags">
+      <el-tag v-for="(item, index) in tags" :key="index">{{item.name}}</el-tag>
+    </div>
     <title-item
       type="error"
       :data="[
@@ -62,6 +65,12 @@ export default {
       search: {
         organIds: []
       },
+      list: [],
+    }
+  },
+  computed: {
+    tags() {
+      return this.list.map(item => ({name: item.desc, type: item.errorType}))
     }
   },
   mounted() {
@@ -75,6 +84,7 @@ export default {
           ...this.search,
           organIds: this.search.organIds.join(',')
         })
+        this.list = res.data.data
       } catch (error) {}
     },
     send() {

src/views/main/api.js

@@ -6,7 +6,11 @@ export const getIndex = data => request2({
   params: data,
   method: 'get',
 })
-
+export const getInspectionItem = data => request2({
+  url: '/api-web/inspectionItem/queryPage',
+  params: data,
+  method: 'get',
+})
 // 获取异常处理
 export const getIndexError = data => request2({
   url: '/api-web/getIndexErrData',

src/views/main/index.vue

@@ -11,6 +11,9 @@
         <el-tab-pane lazy label="异常处理" name="abnormal">
           <abnormal/>
         </el-tab-pane>
+        <el-tab-pane lazy label="【乐团主管】日程安排" name="teamSchedule">
+          <teamSchedule />
+        </el-tab-pane>
         <el-tab-pane lazy label="【分部经理】日程安排" name="ScheduleBranch">
           <ScheduleBranch/>
         </el-tab-pane>
@@ -21,12 +24,14 @@
 <script>
 import baseinfo from './baseinfo'
 import abnormal from './abnormal'
+import teamSchedule from './teamSchedule'
 import ScheduleBranch from './schedule-branch'
 export default {
   name: 'Main',
   components: {
     baseinfo,
     abnormal,
+    teamSchedule,
     ScheduleBranch,
   },
 }

src/views/main/schedule-branch/index.vue

@@ -43,7 +43,7 @@
     <el-button type="primary" @click="visible = true">添加任务</el-button>
     <el-table
       :data="list"
-      style="width: 100%"
+      style="width: 100%;margin-top: 20px;"
       :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
     >
       <el-table-column

src/views/main/schedule-branch/modals/create.vue

@@ -166,8 +166,13 @@ export default {
     removeMatter(matter, index) {
       matter.splice(index, 1)
     },
-    removeGroup(group, index) {
-      group.splice(index, 1)
+    async removeGroup(group, index) {
+      try {
+        await this.$confirm('是否确认删除此乐团主管?', '提示', {
+          type: 'warning'
+        })
+        group.splice(index, 1)
+      } catch (error) {}
     },
     async submit() {
       try {

src/views/main/teamSchedule/index.vue

@@ -0,0 +1,214 @@
+<template>
+  <div>
+    <save-form
+      :inline="true"
+      :model="searchForm"
+      ref="searchForm"
+      @submit="search"
+      @reset="onReSet"
+      save-key="teamSchedule"
+    >
+      <el-form-item prop="organId">
+        <el-select
+          class="multiple"
+          v-model.trim="searchForm.organId"
+          filterable
+          clearable
+          placeholder="请选择分部"
+        >
+          <el-option
+            v-for="(item, index) in selects.branchs"
+            :key="index"
+            :label="item.name"
+            :value="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="userId">
+        <remote-search :commit="'setEducations'" v-model="searchForm.userId" />
+      </el-form-item>
+      <el-form-item prop="month">
+        <el-date-picker
+          v-model="searchForm.month"
+          value-format="yyyy-MM"
+          type="month"
+          placeholder="请选择月"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button native-type="submit" type="primary">搜索</el-button>
+        <el-button native-type="reset" type="danger">重置</el-button>
+      </el-form-item>
+    </save-form>
+    <el-table
+      style="width: 100%"
+      :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+      :data="tableList"
+    >
+      <el-table-column align="center" prop="organName" label="分部">
+        <template slot-scope="scope">
+          <div>
+            <copy-text>{{ scope.row.organName }}</copy-text>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="month" label="工作周期">
+        <template slot-scope="scope">
+          <div>
+            {{ scope.row.month | dayjsFormatWeek }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="userName" label="乐团主管">
+        <template slot-scope="scope">
+          <div>
+            <copy-text>{{ scope.row.userName }}</copy-text>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="item" label="任务事项">
+        <template slot-scope="scope">
+          <div>
+            {{ scope.row.item | inspectionItemFormat }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        prop="times"
+        label="任务次数"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="plannedTimes"
+        label="已安排日程次数"
+      ></el-table-column>
+      <el-table-column
+        align="center"
+        prop="submittedTimes"
+        label="已提交任务数"
+      >
+        <template slot-scope="scope">
+          <div
+            :style="
+              scope.row.times > scope.row.submittedTimes ? 'color:red' : ''
+            "
+          >
+            {{ scope.row.submittedTimes }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="memo" label="处理意见">
+        <template slot-scope="scope">
+          <overflow-text :text="scope.row.linkUrl"></overflow-text>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" prop="studentId" label="操作">
+        <template slot-scope="scope">
+          <div>
+            <el-button type="text">安排日程</el-button>
+            <auth :auths="['inspectionItem/update']">
+              <el-button
+                type="text"
+                :disabled="scope.row.times < scope.row.submittedTimes"
+                @click="resetLine(scope.row)"
+                >处理方式</el-button
+              >
+            </auth>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination
+      sync
+      :total.sync="rules.total"
+      save-key="teamSchedule"
+      :page.sync="rules.page"
+      :limit.sync="rules.limit"
+      :page-sizes="rules.page_size"
+      @pagination="getList"
+    />
+    <el-dialog title="处理方式" width="700px" :visible.sync="handleVisible">
+      <el-form :model="handleForm">
+        <el-form-item label="请填写处理方式" prop="memo">
+          <el-input
+            type="textarea"
+            :rows="3"
+            v-model="handleForm.memo"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="handleVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitHandle">确 定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getInspectionItem } from "../api";
+import { permission } from "@/utils/directivePage";
+import pagination from "@/components/Pagination/index";
+export default {
+  components: { pagination },
+  data() {
+    return {
+      searchForm: {
+        userId: "",
+        organId: "",
+        month: "",
+      },
+      handleForm: {
+        memo: "",
+        id: "",
+      },
+      tableList: [],
+      handleVisible: false,
+      rules: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50], // 选择限制显示条数
+      },
+    };
+  },
+  mounted() {
+    this.$store.dispatch("setBranchs");
+    this.getList();
+  },
+  methods: {
+    permission(str) {
+      return permission(str);
+    },
+    onReSet() {
+      this.rules.page = 1;
+      this.$refs.searchForm.resetFields();
+    },
+    search() {
+      this.rules.page = 1;
+      this.getList();
+    },
+    async getList() {
+      try {
+        this.searchForm.page = this.rules.page;
+        this.searchForm.rows = this.rules.limit;
+        const res = await getInspectionItem(this.searchForm);
+        this.tableList = res.data.rows;
+        this.rules.total = res.data.total;
+      } catch (e) {
+        console.log(e);
+      }
+    },
+    resetLine(row) {
+      let { id, memo } = row;
+      this.handleForm = { id, memo };
+      this.handleVisible = true;
+    },
+    submitHandle() {},
+  },
+};
+</script>
+<style lang="scss" scoped>
+</style>

vue.config.js

@@ -18,10 +18,10 @@ const name = defaultSettings.title || '管乐迷后台管理系统' // page titl
 // //  https://online.dayaedu.com
 // let target = 'https://online.dayaedu.com' //线上
 // let target = 'http://dyme.utools.club' //test环境
-// let target = 'http://192.168.3.139:8000' // 箭河
+let target = 'http://192.168.3.139:8000' // 箭河
 // let target = 'http://192.168.3.38:8000' //邹璇
 // let target = 'http://192.168.3.57:8000' //勇哥
-let target = 'http://dev.dayaedu.com' // 测试服
+// let target = 'http://dev.dayaedu.com' // 测试服
 // let target = 'http://192.168.3.196' // 乔
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {