|
|
@@ -29,6 +29,26 @@
|
|
|
></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="学习中心" class="pull-left">
|
|
|
+ <el-select
|
|
|
+ v-model="markWorkSearchForm.orgId"
|
|
|
+ clearable
|
|
|
+ filterable
|
|
|
+ :remote-method="getOrg"
|
|
|
+ remote
|
|
|
+ class="input"
|
|
|
+ placeholder="请选择"
|
|
|
+ @change="searchMarkWork"
|
|
|
+ @clear="cleanMarkWork"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="item in orgList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -169,7 +189,11 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { MARKING_API, MARKING_LOGIC_API } from "@/constants/constants";
|
|
|
+import {
|
|
|
+ MARKING_API,
|
|
|
+ MARKING_LOGIC_API,
|
|
|
+ CORE_API,
|
|
|
+} from "@/constants/constants";
|
|
|
import { mapState } from "vuex";
|
|
|
import ECharts from "vue-echarts/components/ECharts";
|
|
|
import "echarts/lib/chart/pie";
|
|
|
@@ -185,6 +209,7 @@ export default {
|
|
|
},
|
|
|
markWorkSearchForm: {
|
|
|
markId: "",
|
|
|
+ orgId: "",
|
|
|
},
|
|
|
tableData: [],
|
|
|
oldData: [],
|
|
|
@@ -196,6 +221,7 @@ export default {
|
|
|
markWorkName: "",
|
|
|
courseList: [],
|
|
|
markWorkList: [],
|
|
|
+ orgList: [],
|
|
|
quertTemp: {},
|
|
|
pie: {
|
|
|
title: {
|
|
|
@@ -322,6 +348,7 @@ export default {
|
|
|
},
|
|
|
created() {
|
|
|
this.getMarkWorks();
|
|
|
+ this.getOrg();
|
|
|
this.backFill();
|
|
|
},
|
|
|
methods: {
|
|
|
@@ -446,6 +473,19 @@ export default {
|
|
|
getMarkWorksByName(name) {
|
|
|
this.getMarkWorks(name);
|
|
|
},
|
|
|
+ getOrg(name = "") {
|
|
|
+ this.$http
|
|
|
+ .get(
|
|
|
+ CORE_API +
|
|
|
+ "/org/subOrgPage/0/20?name=" +
|
|
|
+ name +
|
|
|
+ "&parentId=" +
|
|
|
+ this.user.rootOrgId
|
|
|
+ )
|
|
|
+ .then((response) => {
|
|
|
+ this.orgList = response.data?.list || [];
|
|
|
+ });
|
|
|
+ },
|
|
|
getCourses() {
|
|
|
this.$http
|
|
|
.get(
|
|
|
@@ -488,7 +528,9 @@ export default {
|
|
|
"&$key=" +
|
|
|
this.user.key +
|
|
|
"&$token=" +
|
|
|
- this.user.token
|
|
|
+ this.user.token +
|
|
|
+ "&orgId=" +
|
|
|
+ this.markWorkSearchForm.orgId
|
|
|
);
|
|
|
},
|
|
|
searchSetting() {
|
|
|
@@ -514,7 +556,9 @@ export default {
|
|
|
"/" +
|
|
|
this.pageSize +
|
|
|
"?workId=" +
|
|
|
- this.workId,
|
|
|
+ this.workId +
|
|
|
+ "&orgId=" +
|
|
|
+ this.markWorkSearchForm.orgId,
|
|
|
{ params: this.formSearch }
|
|
|
)
|
|
|
.then((response) => {
|
|
|
@@ -548,7 +592,13 @@ export default {
|
|
|
doPie() {
|
|
|
this.loading = true;
|
|
|
this.$http
|
|
|
- .get(MARKING_API + "/markWorks/" + this.workId)
|
|
|
+ .get(
|
|
|
+ MARKING_API +
|
|
|
+ "/markWorks/" +
|
|
|
+ this.workId +
|
|
|
+ "?orgId=" +
|
|
|
+ this.markWorkSearchForm.orgId
|
|
|
+ )
|
|
|
.then((response) => {
|
|
|
this.pie.series = [
|
|
|
{
|
