diff --git a/project/pidu/app/AppSeatManagement/AppSeatManagement.vue b/project/pidu/app/AppSeatManagement/AppSeatManagement.vue
index 9eb2e8df..7694d56f 100644
--- a/project/pidu/app/AppSeatManagement/AppSeatManagement.vue
+++ b/project/pidu/app/AppSeatManagement/AppSeatManagement.vue
@@ -7,19 +7,25 @@
-
- 当前机位1有效期为:2024-06-24 ip地址为:192.168.1.120
+
+
+
+
+ 当前机位1有效期为:{{configInfo.validity}} ip地址为:{{configInfo.xbotIp}}
- 启动
+ 启动
-
-
+
+
- 110
+ {{row.groupCount}}
@@ -30,8 +36,10 @@
:visible.sync="dialog"
:destroyOnClose="true"
width="720px"
- @closed="form={}" :customFooter="false">
-
+ @closed="dialog=false" :customFooter="false">
+
+
@@ -51,55 +59,78 @@ export default {
data() {
return {
search: {
- wordName: '',
current: 1,
size: 10,
},
tableData: [],
- size: 10,
total: 0,
- current: 1,
- form: {
- wordName: '',
- // areaList: [],
- deptList: [],
- },
dialog: false,
- flag: false,
+ configList: [],
+ configId: '',
+ configInfo: {id: ''},
+ groupInfo: {},
+ searchGroup: {
+ current: 1,
+ size: 10,
+ },
+ tableDataGroup: [],
+ totalGroup: 0,
}
},
created() {
- this.$dict.load('integralType')
- this.getTableData()
+ this.getConfigList()
},
computed: {
...mapState(['user']),
colConfigs() {
return [
- { prop: "wordName", label: '姓名', align: "left"},
- { prop: "createTime", label: '手机号'},
- { prop: "createUserName", label: '管辖区域'},
- { slot: "num", label: '监控群聊'},
- { prop: "departmentNames", label: '状态'},
+ { slot: "loginUserId", label: '用户id'},
+ { prop: "loginUserName", label: '姓名', align: "left"},
+ { prop: "phone", label: '手机号'},
+ { prop: "girdNames", label: '管辖区域'},
+ { slot: "groupCount", label: '监控群聊'},
+ // { prop: "status", label: '状态'},
]
},
- rules() {
- return {
- wordName: [{required: true, message: '请输入敏感词', trigger: 'blur' }],
- // areaList: [{required: true, message: '请选择生效地区', trigger: 'blur' }],
- deptList: [{required: true, message: '请选择生效部门', trigger: 'blur' }],
- }
+ colConfigsGroup() {
+ return [
+ { prop: "nickname", label: '群名称'},
+ // { prop: "phone", label: '群主'},
+ ]
},
},
methods: {
+ getConfigList() {
+ this.instance.post(`/app/appxbotconfig/list?size=1000`).then(res => {
+ if(res?.data) {
+ res.data.records.map((item) => {
+ item.label = item.xbotName
+ item.value = item.id
+ })
+ this.configList = res.data.records
+ this.configInfo = this.configList[0]
+ this.getTableData()
+ }
+ })
+ },
+ configChange(e) {
+ this.configInfo = this.configList.filter(item => item.id == e)[0]
+ this.search.current = 1
+ this.getTableData()
+ },
+ openWechat() {
+ this.instance.post(`/app/appxbotconfig/openWechat?id=${this.configInfo.id}`).then(res => {
+ if(res.code === 0) {
+ this.configInfo.status = 1
+ this.$message.success('启动成功!')
+ }
+ })
+ },
getTableData() {
- this.instance.post(`/app/appsessionarchivekeywordinfo/list`,null,{
+ this.instance.post(`/app/xbotCallback/list`,null,{
params: {
...this.search,
- current: this.current,
- size: this.size,
- total: this.total,
- wordName: this.search.name
+ xbotId: this.configInfo.id
}
}).then(res => {
if(res?.data) {
@@ -108,22 +139,24 @@ export default {
}
})
},
- changeStatus(row, text, status) {
- this.$confirm(`确定${text}该关键词?`).then(() => {
- this.instance.post(`/app/appsessionarchivekeywordinfo/updateStatusById?id=${row.id}&status=${status}`).then(res => {
- if (res.code == 0) {
- this.$message.success('操作成功!')
- this.getTableData()
- }
- })
- })
- },
showDialog(row) {
- this.form = {...row}
- this.form.deptList = []
- // this.form.areaList = this.form.areaIds.split(',')
- this.form.deptList = row.departmentIds.split(',')
this.dialog = true
+ this.groupInfo = row
+ this.getTableDataGroup()
+ },
+ getTableDataGroup() {
+ this.instance.post(`/app/xbotCallback/groupList`,null,{
+ params: {
+ ...this.searchGroup,
+ managerWxid: this.groupInfo.loginUserId
+ }
+ }).then(res => {
+ if(res?.data) {
+ this.tableDataGroup = res.data.records
+ this.totalGroup = res.data.total
+ }
+ })
+
},
},
}
diff --git a/project/pidu/app/AppWorkOrder/components/Detail.vue b/project/pidu/app/AppWorkOrder/components/Detail.vue
index 30045f26..50174956 100644
--- a/project/pidu/app/AppWorkOrder/components/Detail.vue
+++ b/project/pidu/app/AppWorkOrder/components/Detail.vue
@@ -20,8 +20,8 @@
{{ detail.phone }}
{{ detail.createTime }}
- {{ dict.getLabel('residentEventSource', detail.eventSource) }}
- {{ detail.groupName }}
+
+ {{ detail.flName }}
{{ detail.content }}
@@ -218,7 +218,7 @@ export default {
methods: {
getDetail() {
- this.instance.post('/app/appresidentreportinfo/queryDetailById', null, {
+ this.instance.post('/app/appsessionarchivereportinfo/queryDetailById', null, {
params: {id: this.$route.query.id}
}).then(res => {
if (res?.data) {
@@ -290,7 +290,7 @@ export default {
onForwardConfirm() {
this.$refs.forwardForm.validate(v => {
if (v) {
- this.instance.post('/app/appresidentreportinfo/transfer', {
+ this.instance.post('/app/appsessionarchivereportinfo/transfer', {
...this.forwardForm,
id: this.$route.query.id
}).then(res => {
@@ -388,7 +388,7 @@ export default {
handleEvent() {
this.$refs.form.validate(v => {
if (v) {
- this.instance.post('/app/appresidentreportinfo/finishByGirdMember', {
+ this.instance.post('/app/appsessionarchivereportinfo/finish', {
...this.form,
groupName: this.dictList.filter(v => v.dictValue === this.form.groupId)[0].dictName,
id: this.$route.query.id
diff --git a/project/pidu/app/AppWorkOrder/components/List.vue b/project/pidu/app/AppWorkOrder/components/List.vue
index 8c63d6c7..7f816b09 100644
--- a/project/pidu/app/AppWorkOrder/components/List.vue
+++ b/project/pidu/app/AppWorkOrder/components/List.vue
@@ -65,7 +65,7 @@ import {mapState} from 'vuex'
export default {
name: 'List',
- label: "随手拍",
+ label: "工单管理",
props: {
instance: Function,
@@ -111,8 +111,7 @@ export default {
colConfigs() {
return [
{prop: 'content', label: '内容描述', width: '300px'},
- {prop: 'eventSource', label: '事件来源', align: 'center', dict: 'residentEventSource'},
- {prop: 'groupName', label: '事件类型', align: 'center'},
+ {prop: 'flName', label: '事件类型', align: 'center'},
{prop: 'girdName', label: '所属网格', align: 'center'},
{prop: 'createTime', label: '上报时间', align: 'center'},
{prop: 'name', label: '昵称', align: 'center'},
@@ -131,8 +130,6 @@ export default {
created() {
this.dict.load('clapEventStatus', 'residentEventSource').then(() => {
this.getList()
- this.getGridList()
- this.getTypeList()
})
},
@@ -148,43 +145,8 @@ export default {
this.search.current = 1
this.getList()
},
- // 所有网格
- getGridList() {
- this.instance.post(`/app/appgirdinfo/listAll3`).then((res) => {
- if (res?.code == 0) {
- this.girdOptions = this.toTree(res.data)
- }
- })
- },
- // 转树形结构
- toTree(data) {
- let result = [];
- if (!Array.isArray(data)) {
- return result
- }
- let map = {};
- data.forEach(item => {
- map[item.id] = item;
- });
- data.forEach(item => {
- let parent = map[item.parentGirdId];
- if (parent) {
- (parent.children || (parent.children = [])).push(item);
- } else {
- result.push(item);
- }
- });
- return result;
- },
- gridChange(val) {
- this.girdArr = val
- this.search.girdId = val?.[val.length - 1]
- this.$refs.cascader1.dropDownVisible = false;
- this.search.current = 1
- this.getList()
- },
getList() {
- this.instance.post(`/app/appresidentreportinfo/list`, null, {
+ this.instance.post(`/app/appsessionarchivereportinfo/list`, null, {
params: {
...this.search
}
@@ -195,7 +157,6 @@ export default {
}
})
},
-
toDetail(id) {
this.$emit('change', {
type: 'Detail',
@@ -204,7 +165,6 @@ export default {
}
})
},
-
toSetting() {
this.$emit('change', {
type: 'Setting',
@@ -215,7 +175,7 @@ export default {
},
handleDelete(ids) {
this.$confirm("是否要进行删除?").then(() => {
- this.instance.post("/app/appresidentreportinfo/delete", null, {
+ this.instance.post("/app/appsessionarchivereportinfo/delete", null, {
params: {ids}
}).then(res => {
if (res?.code == 0) {
@@ -225,17 +185,6 @@ export default {
})
}).catch(() => 0)
},
- getTypeList() {
- this.instance.post(`/app/appresidentreportgroup/list?size=10000`).then(res => {
- if (res.code == 0) {
- res.data.records.map((item) => {
- item.dictName = item.groupName
- item.dictValue = item.id
- })
- this.typeList = res.data.records
- }
- })
- }
},
}
diff --git a/project/pidu/app/AppWorkOrder/components/Setting.vue b/project/pidu/app/AppWorkOrder/components/Setting.vue
index bbf38bb3..7f9beb27 100644
--- a/project/pidu/app/AppWorkOrder/components/Setting.vue
+++ b/project/pidu/app/AppWorkOrder/components/Setting.vue
@@ -1,178 +1,190 @@
-
-
-
-
-
-
-
- 添加事件类型
-
-
-
-
-
-
-
-
-
-
- {{ item }}
-
+
-
-
- 编辑
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ 停用
+ 启用
+ 编辑
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/project/pidu/app/AppWorkingVocabulary/AppWorkingVocabulary.vue b/project/pidu/app/AppWorkingVocabulary/AppWorkingVocabulary.vue
deleted file mode 100644
index 936d5b54..00000000
--- a/project/pidu/app/AppWorkingVocabulary/AppWorkingVocabulary.vue
+++ /dev/null
@@ -1,214 +0,0 @@
-
-
-
-
-
-
-
-
-
- 添加
-
-
-
-
-
-
-
-
- 停用
- 启用
- 编辑
- 删除
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-