-
@@ -93,10 +98,17 @@
import CaseRecord from "./caseCommon/caseRecord";
import caseImgShow from "./caseCommon/caseImgShow";
import caseProcessTable from "./caseCommon/caseProcessTable.vue";
-import { caseDetail, eventStepList, eventCenterList } from "@/api/callCase";
+import {
+ caseDetail,
+ eventStepList,
+ eventCenterList,
+ socialDetail,
+ processPicture
+} from "@/api/callCase";
import FMap from "../../components/fMap/components/fMap";
-import process from "./caseCommon/process.json";
-import process2 from "./caseCommon/process2.json";
+// import process from "./caseCommon/process.json";
+// import process2 from "./caseCommon/process2.json";
+// import mockData from "./caseCommon/data.json";
export default {
name: "CaseDetail",
components: {
@@ -118,6 +130,7 @@
// "https://t7.baidu.com/it/u=1742010762,3975931984&fm=193&f=GIF",
// "https://t7.baidu.com/it/u=1302518827,2012573433&fm=193&f=GIF",
], // 事件流程图片
+ processStatus: false, // 是否存在事件流程(运维事件)
processList: [], // 事件流程信息
showProcess: false,
wholeLoading: false,
@@ -128,7 +141,6 @@
let caseTypeMap = {
2: "应急事件",
3: "运维事件",
- // 3: "精细化管理事件",
4: "精细化管理事件",
};
let caseType = caseTypeMap[this.$route.query.caseType];
@@ -151,77 +163,94 @@
this.wholeLoading = true;
caseDetail(this.id).then((response) => {
this.caseDetail = response.data;
+ let caseStateNameList = ["协同申请","处理/回访完成"]
+ if (
+ this.caseDetail.eorcName == "精细化管理事件" &&
+ caseStateNameList.includes(this.caseDetail.caseStateName)
+ ) {
+ socialDetail({ caseId: this.id }).then((res) => {
+ this.$set(this.caseDetail, "caseNumber", res.data.caseNumber);
+ this.caseDetail.externalEventId = res.data.externalEventId;
+ // // 测试接口调取
+ // processPicture({ caseId: res.data.externalEventId }).then((res) => {
+ // console.log(res)
+ // })
+ });
+ }
this.wholeLoading = false;
this.$refs.mapDetail.initMap(true, this.caseDetail);
});
// 通过类型判断传递内容
- // id为caseId
- if (this.caseType == "运维事件") {
+ if (this.caseType == "精细化管理事件") {
// 获取返回的数据
this.$nextTick(async () => {
- // 运维
- eventCenterList({ caseId: this.id }).then((res) => {
- this.processList = this.treeDataToCompressed([
- ...res.data,
- ]).reverse();
- });
- // this.processList = this.treeDataToCompressed([
- // ...process,
- // ]).reverse();
- let propsMap = {
- processTitle: "processStepTitle",
- time: "createTime",
- sender: "processAssigneeName",
- incept: "processNextAssigneeName",
- detail: "approveMsg",
- nextId: "processNextAssigneeId",
- };
- this.processList = await this.handlePropstoArray(
- this.processList,
- propsMap
- );
- });
- } else if (this.caseType == "精细化管理事件") {
- // 精细化
- this.$nextTick(async () => {
- // this.processList = process2.data.replyDatas;
- eventStepList({ caseId: this.id }).then((res) => {
- this.processList = res.data;
- });
- let statusMap = {
- 1: "成功",
- "-1": "驳回",
- 0: "处置中",
- 2: "结束",
- 3: "撤案",
- };
- let replyStatusMap = {
- 11: "事件撤案",
- 31: "事件驳回",
- 40: "已接收",
- 41: "立案中",
- 42: "待分拨",
- 43: "分拨中",
- 44: "处置中",
- 45: "待审核",
- 46: "审核驳回",
- 49: "指派",
- 51: "已办结",
- 52: "已评价",
- 53: "已接收待审核",
- 54: "审核不通过",
- 55: "审核通过",
- };
- this.processList = this.processList.map((item) => {
- return {
- processTitle:
- replyStatusMap[item.status] + " " + item.statusDesc,
- time: item.time,
- sender: item.name,
- incept: null,
- detail: item.content,
- nextId: 1,
+ eventStepList({ caseId: this.id }).then(async (res) => {
+ this.processList = this.treeDataToCompressed(res.data).reverse();
+ this.processList = this.processList.filter(
+ (item) => item != undefined
+ );
+ let propsMap = {
+ processTitle: "processStepTitle",
+ time: "createTime",
+ sender: "processAssigneeName",
+ incept: "processNextAssigneeName",
+ detail: "approveMsg",
+ nextId: "processNextAssigneeId",
};
+ this.processList = await this.handlePropstoArray(
+ this.processList,
+ propsMap
+ );
+ });
+ });
+ } else if (this.caseType == "运维事件") {
+ this.$nextTick(async () => {
+ eventCenterList({ caseId: this.id }).then((res) => {
+ if (res.data.record.assignList.length >= 1) {
+ this.processStatus = true;
+ } else {
+ this.processStatus = false;
+ }
+ this.processList = res.data.record.assignList;
+ this.caseDetail.externalEventId = res.data.record.eventId;
+ // this.processList = process2.data.record.assignList;
+ let statusMap = {
+ 1: "成功",
+ "-1": "驳回",
+ 0: "处置中",
+ 2: "结束",
+ 3: "撤案",
+ };
+ let replyStatusMap = {
+ 11: "事件撤案",
+ 31: "事件驳回",
+ 40: "已接收",
+ 41: "立案中",
+ 42: "待分拨",
+ 43: "分拨中",
+ 44: "处置中",
+ 45: "待审核",
+ 46: "审核驳回",
+ 49: "指派",
+ 51: "已办结",
+ 52: "已评价",
+ 53: "已接收待审核",
+ 54: "审核不通过",
+ 55: "审核通过",
+ 20: "",
+ };
+ this.processList = this.processList.map((item) => {
+ return {
+ processTitle:
+ replyStatusMap[item.status] + " " + item.statusDesc,
+ time: item.time,
+ sender: item.name,
+ incept: null,
+ detail: item.content,
+ nextId: 1,
+ imgs: item.attachments,
+ };
+ });
});
});
}
@@ -244,6 +273,7 @@
target.push(source[i].info);
if (
Array.isArray(source[i].children) &&
+ source[i].children &&
source[i].children.length > 0
) {
target = [
diff --git a/src/views/caseManage/waitForCreate.vue b/src/views/caseManage/waitForCreate.vue
index e722d22..c091388 100644
--- a/src/views/caseManage/waitForCreate.vue
+++ b/src/views/caseManage/waitForCreate.vue
@@ -75,7 +75,6 @@
import { getUserSimpleList } from '@/api/system/user'
import { getSoundList } from '@/api/sound'
import { isOnlyReceiver } from '@/utils/permission'
-
export default {
name: 'WaitForCreate',
components: { AudioPlayer, SearchItem, SearchArea, AppContainer, NormalTable, CreateCase },
diff --git a/src/views/knowledgeManage/editKnowledge.vue b/src/views/knowledgeManage/editKnowledge.vue
index 38918cc..82282d4 100644
--- a/src/views/knowledgeManage/editKnowledge.vue
+++ b/src/views/knowledgeManage/editKnowledge.vue
@@ -21,7 +21,7 @@
-
+
@@ -146,7 +146,7 @@
// this.$refs.editor.initEditor()
knowledgeDetail(id).then(response => {
if (response.data) {
- debugger
+ // debugger
// 处理fileList
if (response.data.file && response.data.file !== '') {
const file_strs = response.data.file.split(';')
@@ -166,8 +166,10 @@
type: response.data.kType, // 类型
name: response.data.kName, // 类别名
keywords: response.data.keywords, // 关键词
- info: response.data.kInfo // 内容
+ info: response.data.kInfo, // 内容
+ deptId:response.data.deptId
}
+ this.$set(this.knowledgeForm,'deptId',response.data.deptId)
}
if (!this.knowledgeForm.deptId) {
this.knowledgeForm.deptId = this.$store.state.user.deptId
@@ -231,6 +233,8 @@
},
// 修改数据
updateData: function() {
+ console.log(this.knowledgeForm)
+ // return
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.btnLoading = true
diff --git a/src/views/statistic/callStatistic/logStatistic.vue b/src/views/statistic/callStatistic/logStatistic.vue
index 3345556..43889c4 100644
--- a/src/views/statistic/callStatistic/logStatistic.vue
+++ b/src/views/statistic/callStatistic/logStatistic.vue
@@ -146,6 +146,7 @@
},
fetchData() {
this.listLoading = true
+ this.data = [];
this.listQuery.workStartTime = this.workTime[0]
this.listQuery.workEndTime = this.workTime[1]
this.listQuery.breakStartTime = this.breakTime[0]
@@ -157,7 +158,7 @@
outBusyStatistics(this.listQuery).then(response => {
if (response.code === 200) {
this.listLoading = false
- this.list = response.data
+ this.data = response.data
this.total = response.data.length
// this.data = [
// { 'date': '2020-04-24', 'outRecords': '07:00-07:05;07:10-07:15;', 'busyRecords': '07:00-07:05;07:10-07:15;', 'outTime': '124', 'busyTime': '15' },