@@ -118,6 +101,7 @@ export default {
return {
dutyAgg: [],
//数据统计
+ ep_count_type: true,
userCount: {
total: 0,
count_employee: 0, //内部员工
@@ -125,8 +109,8 @@ export default {
count_visitor: 0, //相关方
},
operationnumber: null,
- rpjnumber:null,
- visitnumber:null
+ rpjnumber: null,
+ visitnumber: null,
};
},
created() {
@@ -175,7 +159,7 @@ export default {
this.operationnumber = res.count;
});
},
- //相关方入场项目
+ //相关方入场项目
getRpj() {
this.$API.rpm.rpj.list
.req({ page: 1, page_size: 1, state: 40 })
@@ -183,7 +167,7 @@ export default {
this.rpjnumber = res.count;
});
},
- //访客
+ //访客
getVisit() {
this.$API.vm.visit.list
.req({ page: 1, page_size: 1, state: 40 })
@@ -276,12 +260,14 @@ export default {
margin: 40px 0 20px 0;
}
.screen-cockpits {
- margin-top: -15px;
+ // margin-top: -15px;
.cockpit-count {
.count-list {
display: flex;
- flex-wrap: wrap;
- margin-left: 30px;
+ // flex-wrap: wrap;
+ justify-content: space-around;
+ align-items: center;
+ height: 80px;
.count-list-item {
width: 33.3333%;
height: 50%;
@@ -486,4 +472,16 @@ export default {
}
}
}
+.card-header {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ height:24px;
+}
+.card-body {
+ display: flex;
+ justify-content: space-around;
+ align-items: center;
+ height:80px;
+}
diff --git a/src/views/home/widgets/index.vue b/src/views/home/widgets/index.vue
index d8f1bf5a..ad8ed038 100644
--- a/src/views/home/widgets/index.vue
+++ b/src/views/home/widgets/index.vue
@@ -13,7 +13,7 @@
-
+
diff --git a/src/views/login/components/passwordForm.vue b/src/views/login/components/passwordForm.vue
index 2e2dd9ce..a0682957 100644
--- a/src/views/login/components/passwordForm.vue
+++ b/src/views/login/components/passwordForm.vue
@@ -13,12 +13,12 @@
clearable
:placeholder="$t('login.userPlaceholder')"
>
-
+
From ca5084d20adaf6ca73578841810be500f85efd8c Mon Sep 17 00:00:00 2001
From: shijing
Date: Thu, 21 Jul 2022 16:01:01 +0800
Subject: [PATCH 5/5] d3&workflow
---
package.json | 4 +-
src/api/model/opm.js | 270 +++++-----
src/components/scOpl/scFire.vue | 387 ++++++++++++++
src/scui.js | 2 +
src/views/opm/operation.vue | 550 ++++++++++----------
src/views/opm/opl.vue | 869 +++++++++++++++++---------------
src/views/wf/allwork.vue | 14 +-
src/views/wf/dutywork.vue | 11 +-
src/views/wf/transform.vue | 14 +-
src/views/wf/visitdetail.vue | 40 ++
src/views/wf/workflow.vue | 190 ++++++-
11 files changed, 1516 insertions(+), 835 deletions(-)
create mode 100644 src/components/scOpl/scFire.vue
diff --git a/package.json b/package.json
index a2a11f57..179ea571 100644
--- a/package.json
+++ b/package.json
@@ -15,15 +15,17 @@
"core-js": "3.22.8",
"cropperjs": "1.5.12",
"crypto-js": "4.1.1",
+ "d3": "^7.6.1",
+ "dagre-d3": "^0.6.4",
"echarts": "5.3.2",
"element-plus": "2.2.3",
+ "json-editor-vue3": "^1.0.6",
"nprogress": "0.2.0",
"qrcodejs2": "0.0.2",
"sortablejs": "1.15.0",
"tinymce": "6.0.3",
"vue": "3.2.36",
"vue-i18n": "9.1.10",
- "vue-json-editor": "^1.4.3",
"vue-router": "4.0.15",
"vuedraggable": "4.0.3",
"vuex": "4.0.2",
diff --git a/src/api/model/opm.js b/src/api/model/opm.js
index 0777dbc2..3323f40b 100644
--- a/src/api/model/opm.js
+++ b/src/api/model/opm.js
@@ -6,7 +6,7 @@ export default {
oplcate: {
list: {
name: "获取",
- req: async function(data){
+ req: async function (data) {
return await http.get(
`${config.API_URL}/opm/opl_cate/`,
data
@@ -15,22 +15,22 @@ export default {
},
update: {
name: "更新",
- req: async function(id, data){
+ req: async function (id, data) {
return await http.put(
`${config.API_URL}/opm/opl_cate/${id}/`,
data);
}
},
- read:{
+ read: {
name: "查询",
- req: async function(id){
+ req: async function (id) {
return await http.get(
`${config.API_URL}/opm/opl_cate/${id}/`);
}
},
- create: {
+ create: {
name: "创建",
- req: async function(data){
+ req: async function (data) {
return await http.post(
`${config.API_URL}/opm/opl_cate/`,
data);
@@ -38,79 +38,75 @@ export default {
},
delete: {
name: "删除",
- req: async function(id){
+ req: async function (id) {
return await http.delete(
`${config.API_URL}/opm/opl_cate/${id}/`);
}
}
},
-
-
-
- /*作业*/
- operation: {
- list: {
- name: "获取",
- req: async function(data){
- return await http.get(
- `${config.API_URL}/opm/operation/`,
- data
- );
- }
- },
- read:{
- name: "查询",
- req: async function(id){
- return await http.get(
- `${config.API_URL}/opm/operation/${id}/`);
- }
- },
- update: {
- name: "更新",
- req: async function(id, data){
- return await http.put(
- `${config.API_URL}/opm/operation/${id}/`,
- data);
- }
- },
- create: {
- name: "创建",
- req: async function(data){
- return await http.post(
- `${config.API_URL}/opm/operation/`,
- data);
- }
- },
- delete: {
- name: "删除",
- req: async function(id){
- return await http.delete(
- `${config.API_URL}/opm/operation/${id}/`);
- }
+ /*作业*/
+ operation: {
+ list: {
+ name: "获取",
+ req: async function (data) {
+ return await http.get(
+ `${config.API_URL}/opm/operation/`,
+ data
+ );
}
},
-
+ read: {
+ name: "查询",
+ req: async function (id) {
+ return await http.get(
+ `${config.API_URL}/opm/operation/${id}/`);
+ }
+ },
+ update: {
+ name: "更新",
+ req: async function (id, data) {
+ return await http.put(
+ `${config.API_URL}/opm/operation/${id}/`,
+ data);
+ }
+ },
+ create: {
+ name: "创建",
+ req: async function (data) {
+ return await http.post(
+ `${config.API_URL}/opm/operation/`,
+ data);
+ }
+ },
+ delete: {
+ name: "删除",
+ req: async function (id) {
+ return await http.delete(
+ `${config.API_URL}/opm/operation/${id}/`);
+ }
+ }
+ },
/*作业许可证*/
opl: {
list: {
name: "获取",
- req: async function(data){
+ req: async function (data) {
return await http.get(
`${config.API_URL}/opm/opl/`,
data
);
}
},
- read:{
+ read: {
name: "查询",
- req: async function(id){
+ req: async function (id) {
return await http.get(
`${config.API_URL}/opm/opl/${id}/`);
}
},
update: {
name: "更新",
- req: async function(id, data){
+ req: async function (id, data) {
return await http.put(
`${config.API_URL}/opm/opl/${id}/`,
data);
@@ -118,7 +114,7 @@ export default {
},
create: {
name: "创建",
- req: async function(data){
+ req: async function (data) {
return await http.post(
`${config.API_URL}/opm/opl/`,
data);
@@ -126,94 +122,94 @@ export default {
},
delete: {
name: "删除",
- req: async function(id){
+ req: async function (id) {
return await http.delete(
`${config.API_URL}/opm/opl/${id}/`);
}
}
},
-/*作业人员*/
-worker: {
- list: {
- name: "获取",
- req: async function(data){
- return await http.get(
- `${config.API_URL}/opm/opl_worker/`,
- data
- );
+ /*作业人员*/
+ worker: {
+ list: {
+ name: "获取",
+ req: async function (data) {
+ return await http.get(
+ `${config.API_URL}/opm/opl_worker/`,
+ data
+ );
+ }
+ },
+ read: {
+ name: "查询",
+ req: async function (id) {
+ return await http.get(
+ `${config.API_URL}/opm/opl_worker/${id}/`);
+ }
+ },
+ update: {
+ name: "更新",
+ req: async function (id, data) {
+ return await http.put(
+ `${config.API_URL}/opm/opl_worker/${id}/`,
+ data);
+ }
+ },
+ create: {
+ name: "创建",
+ req: async function (data) {
+ return await http.post(
+ `${config.API_URL}/opm/opl_worker/`,
+ data);
+ }
+ },
+ delete: {
+ name: "删除",
+ req: async function (id) {
+ return await http.delete(
+ `${config.API_URL}/opm/opl_worker/${id}/`);
+ }
}
},
- read:{
- name: "查询",
- req: async function(id){
- return await http.get(
- `${config.API_URL}/opm/opl_worker/${id}/`);
- }
- },
- update: {
- name: "更新",
- req: async function(id, data){
- return await http.put(
- `${config.API_URL}/opm/opl_worker/${id}/`,
- data);
- }
- },
- create: {
- name: "创建",
- req: async function(data){
- return await http.post(
- `${config.API_URL}/opm/opl_worker/`,
- data);
- }
- },
- delete: {
- name: "删除",
- req: async function(id){
- return await http.delete(
- `${config.API_URL}/opm/opl_worker/${id}/`);
- }
- }
-},
/*气体检测*/
-gas: {
- list: {
- name: "获取",
- req: async function(data){
- return await http.get(
- `${config.API_URL}/opm/gas_check/`,
- data
- );
+ gas: {
+ list: {
+ name: "获取",
+ req: async function (data) {
+ return await http.get(
+ `${config.API_URL}/opm/gas_check/`,
+ data
+ );
+ }
+ },
+ read: {
+ name: "查询",
+ req: async function (id) {
+ return await http.get(
+ `${config.API_URL}/opm/gas_check/${id}/`);
+ }
+ },
+ update: {
+ name: "更新",
+ req: async function (id, data) {
+ return await http.put(
+ `${config.API_URL}/opm/gas_check/${id}/`,
+ data);
+ }
+ },
+ create: {
+ name: "创建",
+ req: async function (data) {
+ return await http.post(
+ `${config.API_URL}/opm/gas_check/`,
+ data);
+ }
+ },
+ delete: {
+ name: "删除",
+ req: async function (id) {
+ return await http.delete(
+ `${config.API_URL}/opm/gas_check/${id}/`);
+ }
}
},
- read:{
- name: "查询",
- req: async function(id){
- return await http.get(
- `${config.API_URL}/opm/gas_check/${id}/`);
- }
- },
- update: {
- name: "更新",
- req: async function(id, data){
- return await http.put(
- `${config.API_URL}/opm/gas_check/${id}/`,
- data);
- }
- },
- create: {
- name: "创建",
- req: async function(data){
- return await http.post(
- `${config.API_URL}/opm/gas_check/`,
- data);
- }
- },
- delete: {
- name: "删除",
- req: async function(id){
- return await http.delete(
- `${config.API_URL}/opm/gas_check/${id}/`);
- }
- }
-},
-}
\ No newline at end of file
+}
diff --git a/src/components/scOpl/scFire.vue b/src/components/scOpl/scFire.vue
new file mode 100644
index 00000000..da977256
--- /dev/null
+++ b/src/components/scOpl/scFire.vue
@@ -0,0 +1,387 @@
+
+
+
+
+
+
+ {{form.name}}
+
+
+
+
+ {{pagtitle}}
+
+
+
+
+ {{form.start_time}}
+
+
+
+
+ {{form.end_time}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ {{form.other_risk}}
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ 应急处置：
+
+
+
1、发生火灾时立即使用消防器材边灭火边报告
+
2、预判火势无法控制时，应立即疏散人群并拨打110或119求救。
+
+ 3、发生人员烫伤时用清水对烫伤部位进行冲洗或浸泡，用干净的纱布或衣物盖住被烫伤部位，伤势严重时立即拨打120送医。若贴身衣服与伤口粘在一起时，可用剪刀剪开，然后缓慢剥离衣物。
+
+
作业人员
+
+
+
+
+
+ {{ scope.row.worker_.name }}
+
+
+
+
+
+
+ {{item.name}}
+
+
+
+
+
+
+ 绑卡
+
+
+
+
+
+
+ 气体检测记录
+
+
+
+
+
+
+
+
+
+ {{ is_ok_[scope.row.is_ok] }}
+
+
+
+
+ {{ scope.row.checker_.name }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/scui.js b/src/scui.js
index f8690c52..f77ee3ff 100644
--- a/src/scui.js
+++ b/src/scui.js
@@ -23,6 +23,7 @@ import scQrCode from './components/scQrCode'
import scStatusIndicator from './components/scMini/scStatusIndicator'
import scTrend from './components/scMini/scTrend'
+import scFire from './components/scOpl/scFire'
import auth from './directives/auth'
import role from './directives/role'
@@ -62,6 +63,7 @@ export default {
app.component('scStatusIndicator', scStatusIndicator);
app.component('scUserSelect', scUserSelect);
app.component('scTrend', scTrend);
+ app.component('scFire', scFire);
//注册全局指令
app.directive('auth', auth);
diff --git a/src/views/opm/operation.vue b/src/views/opm/operation.vue
index ad4d5747..22bc1139 100644
--- a/src/views/opm/operation.vue
+++ b/src/views/opm/operation.vue
@@ -1,278 +1,280 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{
- stateoptions[scope.row.state]
- }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 关联许可证
- 查看
- 编辑
- 删除
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{stateoptions[scope.row.state]}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 许可证
+
+ 查看
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+ //添加
+ add() {
+ this.dialog.save = true;
+ this.$nextTick(() => {
+ this.$refs.saveDialog.open("add");
+ });
+ },
+
+ //编辑
+ table_edit(row) {
+ this.dialog.save = true;
+ this.$nextTick(() => {
+ this.$refs.saveDialog.open("edit").setData(row);
+ });
+ },
+ //查看
+ table_show(row) {
+ this.dialog.save = true;
+ this.$nextTick(() => {
+ this.$refs.saveDialog.open("show").setData(row);
+ });
+ },
+ //创建作业许可证
+ creatopl(row) {
+ this.$router.push({
+ name: "opl",
+ query: {
+ id: row.id,
+ },
+ });
+ },
+ //权限设置
+ permission() {
+ this.dialog.permission = true;
+ this.$nextTick(() => {
+ this.$refs.permissionDialog.open();
+ });
+ },
+
+ //删除
+ table_del(row) {
+ this.$API.opm.operation.delete
+ .req(row.id)
+ .then((res) => {
+ this.$message.success("删除成功");
+ this.$refs.tableoperation.refresh();
+ return res;
+ })
+ .catch((err) => {
+ return err;
+ });
+
+ },
+
+
+ //表格选择后回调事件
+ selectionChange(selection) {
+ this.selection = selection;
+ },
+ //表格内开关
+ changeSwitch(val, row) {
+ row.status = row.status == "1" ? "0" : "1";
+ row.$switch_status = true;
+ setTimeout(() => {
+ delete row.$switch_status;
+ row.status = val;
+ this.$message.success("操作成功");
+ }, 500);
+ },
+ //搜索
+ upsearch() {
+ },
+ //根据ID获取树结构
+ filterTree(id) {
+ var target = null;
+
+ function filter(tree) {
+ tree.forEach((item) => {
+ if (item.id == id) {
+ target = item;
+ }
+ if (item.children) {
+ filter(item.children);
+ }
+ });
+ }
+
+ filter(this.$refs.tableoperation.tableData);
+ return target;
+ },
+ //本地更新数据
+ handleSaveSuccess(data, mode) {
+ if (mode == "add") {
+ this.$refs.tableoperation.refresh();
+ } else if (mode == "edit") {
+ this.$refs.tableoperation.refresh();
+ }
+ },
+ resetQuery() {
+ this.query = {};
+ },
+ },
+ };
+
diff --git a/src/views/opm/opl.vue b/src/views/opm/opl.vue
index d0f4046d..57b5e50e 100644
--- a/src/views/opm/opl.vue
+++ b/src/views/opm/opl.vue
@@ -1,415 +1,466 @@
-
-
-
-
- {{ item.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+ {{operationObj.name}}
+
+
+ {{operationObj.place }}
+
+
+ {{operationObj.state_work }}
+
+
+ {{state_[operationObj.state] }}
+
+
+ {{operationObj.start_time }}
+
+
+ {{operationObj.end_time }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- 查看
- 编辑
-
-
-
-
-
-
+
+
+
+ 查看
+
+ 编辑
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+ //作业许可证类型列表
+ getoplcate() {
+ this.$API.opm.oplcate.list.req({page: 0}).then((res) => {
+ this.oplcateList = res;
+ console.log(res);
+ });
+ },
+
+ //点击作业类型，创建作业许可证添加
+ addFire(id, name) {
+ switch (name) {
+ case "动火":
+ this.$router.push({
+ name: "fire",
+ query: {
+ operationid: this.$route.query.id, //作业ID
+ oplcateId: id, //许可证类型ID
+ oplId: "", //许可证ID
+ },
+ });
+ break;
+ case "有限空间":
+ this.$router.push({
+ name: "space",
+ query: {
+ operationid: this.$route.query.id, //作业ID
+ oplcateId: id, //许可证类型ID
+ oplId: "", //许可证ID
+ },
+ });
+ break;
+ case "清库":
+ this.$router.push({
+ name: "clear",
+ query: {
+ operationid: this.$route.query.id, //作业ID
+ oplcateId: id, //许可证类型ID
+ oplId: "", //许可证ID
+ },
+ });
+ break;
+ case "高处":
+ this.$router.push({
+ name: "high",
+ query: {
+ operationid: this.$route.query.id, //作业ID
+ oplcateId: id, //许可证类型ID
+ oplId: "", //许可证ID
+ },
+ });
+ break;
+ case "吊装":
+ this.$router.push({
+ name: "hoisting",
+ query: {
+ operationid: this.$route.query.id, //作业ID
+ oplcateId: id, //许可证类型ID
+ oplId: "", //许可证ID
+ },
+ });
+ break;
+ case "预热器清堵":
+ this.$router.push({
+ name: "preheat",
+ query: {
+ operationid: this.$route.query.id, //作业ID
+ oplcateId: id, //许可证类型ID
+ oplId: "", //许可证ID
+ },
+ });
+ break;
+ case "篦冷机清大块":
+ this.$router.push({
+ name: "cooler",
+ query: {
+ operationid: this.$route.query.id, //作业ID
+ oplcateId: id, //许可证类型ID
+ oplId: "", //许可证ID
+ },
+ });
+ break;
+ case "动土":
+ this.$router.push({
+ name: "soil",
+ query: {
+ operationid: this.$route.query.id, //作业ID
+ oplcateId: id, //许可证类型ID
+ oplId: "", //许可证ID
+ },
+ });
+ break;
+ case "临时用电":
+ this.$router.push({
+ name: "usecl",
+ query: {
+ operationid: this.$route.query.id, //作业ID
+ oplcateId: id, //许可证类型ID
+ oplId: "", //许可证ID
+ },
+ });
+ break;
+ }
+ },
+ //编辑
+ table_edit(row) {
+ switch (row.cate_name) {
+ case "动火":
+ this.$router.push({
+ name: "fire",
+ query: {
+ oplId: row.id, //许可证ID
+ },
+ });
+ break;
+ case "有限空间":
+ this.$router.push({
+ name: "space",
+ query: {
+ oplId: row.id, //许可证ID
+ },
+ });
+ break;
+ case "清库":
+ this.$router.push({
+ name: "clear",
+ query: {
+ oplId: row.id, //许可证ID
+ },
+ });
+ break;
+ case "高处":
+ this.$router.push({
+ name: "high",
+ query: {
+ oplId: row.id, //许可证ID
+ },
+ });
+ break;
+ case "吊装":
+ this.$router.push({
+ name: "hoisting",
+ query: {
+ oplId: row.id, //许可证ID
+ },
+ });
+ break;
+ case "预热器清堵":
+ this.$router.push({
+ name: "preheat",
+ query: {
+ oplId: row.id, //许可证ID
+ },
+ });
+ break;
+ case "篦冷机清大块":
+ this.$router.push({
+ name: "cooler",
+ query: {
+ oplId: row.id, //许可证ID
+ },
+ });
+ break;
+ case "动土":
+ this.$router.push({
+ name: "soil",
+ query: {
+ oplId: row.id, //许可证ID
+ },
+ });
+ break;
+ case "临时用电":
+ this.$router.push({
+ name: "usecl",
+ query: {
+ oplId: row.id, //许可证ID
+ },
+ });
+ break;
+ }
+ },
+ //查看
+ table_show(row) {
+ this.showLimited = true;
+ this.oplId = row.id;
+ this.oplName = row.cate_name;
+ this.workId = row.workers[0];
+ },
+ //权限设置
+ permission() {
+ this.dialog.permission = true;
+ this.$nextTick(() => {
+ this.$refs.permissionDialog.open();
+ });
+ },
+ //删除
+ async table_del(row) {
+ var reqData = {id: row.id};
+ var res = await this.$API.demo.post.post(reqData);
+ if (res.code == 200) {
+ this.$refs.table.refresh();
+ this.$message.success("删除成功");
+ } else {
+ this.$alert(res.message, "提示", {type: "error"});
+ }
+ },
+ //批量删除
+ async batch_del() {
+ this.$confirm(
+ `确定删除选中的 ${this.selection.length} 项吗？如果删除项中含有子集将会被一并删除`,
+ "提示",
+ {
+ type: "warning",
+ }
+ )
+ .then(() => {
+ const loading = this.$loading();
+ this.$refs.table.refresh();
+ loading.close();
+ this.$message.success("操作成功");
+ })
+ .catch(() => {
+ });
+ },
+ //表格选择后回调事件
+ selectionChange(selection) {
+ this.selection = selection;
+ },
+ //表格内开关
+ changeSwitch(val, row) {
+ row.status = row.status == "1" ? "0" : "1";
+ row.$switch_status = true;
+ setTimeout(() => {
+ delete row.$switch_status;
+ row.status = val;
+ this.$message.success("操作成功");
+ }, 500);
+ },
+ //搜索
+ upsearch() {
+ },
+ //根据ID获取树结构
+ filterTree(id) {
+ var target = null;
+
+ function filter(tree) {
+ tree.forEach((item) => {
+ if (item.id == id) {
+ target = item;
+ }
+ if (item.children) {
+ filter(item.children);
+ }
+ });
+ }
+
+ filter(this.$refs.table.tableData);
+ return target;
+ },
+ //本地更新数据
+ handleSaveSuccess(data, mode) {
+ if (mode == "add") {
+ this.$refs.table.refresh();
+ } else if (mode == "edit") {
+ this.$refs.table.refresh();
+ }
+ },
+ resetQuery() {
+ this.query = {};
+ },
+ },
+ };
+
diff --git a/src/views/wf/allwork.vue b/src/views/wf/allwork.vue
index c5fe59bc..05c0a9c8 100644
--- a/src/views/wf/allwork.vue
+++ b/src/views/wf/allwork.vue
@@ -80,15 +80,15 @@
this.list = res;
},
handleShow(row) {
- let workflowKey = row.workflow_.key;
- let cateType = '',projectId='';
- if(workflowKey==='visit'){
- cateType = row.workflow_.key;
+ let cateType = row.workflow_.key;
+ let projectId='';
+ if(cateType==='visit'){
projectId = row.ticket_data.visit;
- }else if(workflowKey==='rparty'){
- cateType = row.workflow_.key;
+ }else if(cateType==='rparty'){
projectId = row.ticket_data.rpj;
- }else{}
+ }else{
+ projectId = row.ticket_data.opl;
+ }
this.$router.push({
name: "visitdetail",
query: {
diff --git a/src/views/wf/dutywork.vue b/src/views/wf/dutywork.vue
index b5600ccd..68709e8a 100644
--- a/src/views/wf/dutywork.vue
+++ b/src/views/wf/dutywork.vue
@@ -138,11 +138,20 @@
},
//处理
handleDetail(row){
+ debugger;
+ console.log(row)
+ let projectId = '';
+ let catetype = row.workflow_.key;
+ if(catetype==='visit'){
+ projectId=row.ticket_data.visit;
+ }else if(catetype==='Fire'){
+ projectId=row.ticket_data.opl;
+ }
this.$router.push({
name: "visitdetail",
query: {
id: row.id,
- projectId:row.ticket_data.visit,
+ projectId:projectId,
catetype:row.workflow_.key
},
});
diff --git a/src/views/wf/transform.vue b/src/views/wf/transform.vue
index 3c02233a..d16c1708 100644
--- a/src/views/wf/transform.vue
+++ b/src/views/wf/transform.vue
@@ -83,14 +83,15 @@
-
+ />-->
+
@@ -120,10 +121,11 @@
diff --git a/src/views/wf/visitdetail.vue b/src/views/wf/visitdetail.vue
index 32e2baaf..5a876853 100644
--- a/src/views/wf/visitdetail.vue
+++ b/src/views/wf/visitdetail.vue
@@ -78,6 +78,34 @@