diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index dc1eb3f..cfd14e6 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -131,13 +131,24 @@
- 案卷图片:
+
-
+
-
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
案卷处理:
@@ -462,7 +473,9 @@
this.initProcess()
}
},
- // 每次清空案件处理相关数据
+ /**
+ * 每次进入页面时,清空案件处理相关数据
+ */
resetData() {
// this.operationKey = ''
this.processForm = {
@@ -477,8 +490,11 @@
this.commonLanguage = ''
this.processCompShow = ''
this.processCompObj = {}
+ this.$refs['processForm'].resetFields()
},
- // 初始化案件处理单选键组
+ /**
+ * 初始化案件处理单选键组
+ */
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
@@ -567,7 +583,11 @@
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
},
- setDefaultUserId(radioConfig) { // 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ /**
+ * 设置默认人员id
+ * 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ */
+ setDefaultUserId(radioConfig) {
switch (radioConfig.passBack) {
case 'verifyPersonId': { // 原核实人员
this.$set(this.processCompObj, 'taskUserId', this.caseDetail.verifyPersonId)
@@ -583,7 +603,9 @@
}
}
},
- // 选择案卷处理操作
+ /**
+ * 选择案卷处理操作，初始化所需组件
+ */
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey], this.processCompObj)
const radioConfig = radioMap[this.operationKey]
@@ -623,7 +645,7 @@
this.$set(this.processCompObj, 'eorcList', eorcListRes.data)
this.$set(this.processCompObj, 'eorc', this.caseDetail.eorc)
- // 初始化
+ // 初始化大类、小类、立案标准、完成时限
this.$set(this.processCompObj, 'caseTypeList', [])
this.$set(this.processCompObj, 'caseTypeDetailList', [])
this.$set(this.processCompObj, 'caseTypeTimeList', [])
@@ -684,7 +706,29 @@
break
}
},
- // 构建提交表单
+ /**
+ * 检查输入小时
+ */
+ checkHour(hour) {
+ if (parseInt(hour) >= 0) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 检查输入分钟
+ */
+ checkMin(min) {
+ if (parseInt(min) >= 0 && parseInt(min) < 60) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 构建提交表单
+ */
buildForm() {
console.log('buildForm', this.operationKey)
// 通用参数,processId已有
@@ -793,20 +837,9 @@
console.log(this.processForm)
return true
},
- checkHour(hour) {
- if (parseInt(hour) >= 0) {
- return true
- } else {
- return false
- }
- },
- checkMin(min) {
- if (parseInt(min) >= 0 && parseInt(min) < 60) {
- return true
- } else {
- return false
- }
- },
+ /**
+ * 提交案卷处理
+ */
submit() {
console.log('submit')
this.$confirm('确定提交案件处理吗?', '提示', {
@@ -824,7 +857,7 @@
completeCaseTask(this.processForm).then(response => {
if (response.code === 200) {
this.$message.success('提交成功')
- // this.$emit('submitProcess', this.caseDetail.caseid)
+ // 隐藏案卷处理，重新加载数据
this.showProcess = false
this.$route.query.showProcess = false
this.initData()
@@ -888,7 +921,11 @@
margin-bottom: 30px;
}
.image-container {
+ // width: 80%;
+ // margin-top: 20px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index dc1eb3f..cfd14e6 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -131,13 +131,24 @@
- 案卷图片:
+
-
+
-
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
案卷处理:
@@ -462,7 +473,9 @@
this.initProcess()
}
},
- // 每次清空案件处理相关数据
+ /**
+ * 每次进入页面时,清空案件处理相关数据
+ */
resetData() {
// this.operationKey = ''
this.processForm = {
@@ -477,8 +490,11 @@
this.commonLanguage = ''
this.processCompShow = ''
this.processCompObj = {}
+ this.$refs['processForm'].resetFields()
},
- // 初始化案件处理单选键组
+ /**
+ * 初始化案件处理单选键组
+ */
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
@@ -567,7 +583,11 @@
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
},
- setDefaultUserId(radioConfig) { // 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ /**
+ * 设置默认人员id
+ * 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ */
+ setDefaultUserId(radioConfig) {
switch (radioConfig.passBack) {
case 'verifyPersonId': { // 原核实人员
this.$set(this.processCompObj, 'taskUserId', this.caseDetail.verifyPersonId)
@@ -583,7 +603,9 @@
}
}
},
- // 选择案卷处理操作
+ /**
+ * 选择案卷处理操作，初始化所需组件
+ */
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey], this.processCompObj)
const radioConfig = radioMap[this.operationKey]
@@ -623,7 +645,7 @@
this.$set(this.processCompObj, 'eorcList', eorcListRes.data)
this.$set(this.processCompObj, 'eorc', this.caseDetail.eorc)
- // 初始化
+ // 初始化大类、小类、立案标准、完成时限
this.$set(this.processCompObj, 'caseTypeList', [])
this.$set(this.processCompObj, 'caseTypeDetailList', [])
this.$set(this.processCompObj, 'caseTypeTimeList', [])
@@ -684,7 +706,29 @@
break
}
},
- // 构建提交表单
+ /**
+ * 检查输入小时
+ */
+ checkHour(hour) {
+ if (parseInt(hour) >= 0) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 检查输入分钟
+ */
+ checkMin(min) {
+ if (parseInt(min) >= 0 && parseInt(min) < 60) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 构建提交表单
+ */
buildForm() {
console.log('buildForm', this.operationKey)
// 通用参数,processId已有
@@ -793,20 +837,9 @@
console.log(this.processForm)
return true
},
- checkHour(hour) {
- if (parseInt(hour) >= 0) {
- return true
- } else {
- return false
- }
- },
- checkMin(min) {
- if (parseInt(min) >= 0 && parseInt(min) < 60) {
- return true
- } else {
- return false
- }
- },
+ /**
+ * 提交案卷处理
+ */
submit() {
console.log('submit')
this.$confirm('确定提交案件处理吗?', '提示', {
@@ -824,7 +857,7 @@
completeCaseTask(this.processForm).then(response => {
if (response.code === 200) {
this.$message.success('提交成功')
- // this.$emit('submitProcess', this.caseDetail.caseid)
+ // 隐藏案卷处理，重新加载数据
this.showProcess = false
this.$route.query.showProcess = false
this.initData()
@@ -888,7 +921,11 @@
margin-bottom: 30px;
}
.image-container {
+ // width: 80%;
+ // margin-top: 20px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index 5306d11..8e33af7 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
+
-
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -297,6 +308,8 @@
}
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index dc1eb3f..cfd14e6 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -131,13 +131,24 @@
- 案卷图片:
+
-
+
-
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
案卷处理:
@@ -462,7 +473,9 @@
this.initProcess()
}
},
- // 每次清空案件处理相关数据
+ /**
+ * 每次进入页面时,清空案件处理相关数据
+ */
resetData() {
// this.operationKey = ''
this.processForm = {
@@ -477,8 +490,11 @@
this.commonLanguage = ''
this.processCompShow = ''
this.processCompObj = {}
+ this.$refs['processForm'].resetFields()
},
- // 初始化案件处理单选键组
+ /**
+ * 初始化案件处理单选键组
+ */
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
@@ -567,7 +583,11 @@
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
},
- setDefaultUserId(radioConfig) { // 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ /**
+ * 设置默认人员id
+ * 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ */
+ setDefaultUserId(radioConfig) {
switch (radioConfig.passBack) {
case 'verifyPersonId': { // 原核实人员
this.$set(this.processCompObj, 'taskUserId', this.caseDetail.verifyPersonId)
@@ -583,7 +603,9 @@
}
}
},
- // 选择案卷处理操作
+ /**
+ * 选择案卷处理操作，初始化所需组件
+ */
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey], this.processCompObj)
const radioConfig = radioMap[this.operationKey]
@@ -623,7 +645,7 @@
this.$set(this.processCompObj, 'eorcList', eorcListRes.data)
this.$set(this.processCompObj, 'eorc', this.caseDetail.eorc)
- // 初始化
+ // 初始化大类、小类、立案标准、完成时限
this.$set(this.processCompObj, 'caseTypeList', [])
this.$set(this.processCompObj, 'caseTypeDetailList', [])
this.$set(this.processCompObj, 'caseTypeTimeList', [])
@@ -684,7 +706,29 @@
break
}
},
- // 构建提交表单
+ /**
+ * 检查输入小时
+ */
+ checkHour(hour) {
+ if (parseInt(hour) >= 0) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 检查输入分钟
+ */
+ checkMin(min) {
+ if (parseInt(min) >= 0 && parseInt(min) < 60) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 构建提交表单
+ */
buildForm() {
console.log('buildForm', this.operationKey)
// 通用参数,processId已有
@@ -793,20 +837,9 @@
console.log(this.processForm)
return true
},
- checkHour(hour) {
- if (parseInt(hour) >= 0) {
- return true
- } else {
- return false
- }
- },
- checkMin(min) {
- if (parseInt(min) >= 0 && parseInt(min) < 60) {
- return true
- } else {
- return false
- }
- },
+ /**
+ * 提交案卷处理
+ */
submit() {
console.log('submit')
this.$confirm('确定提交案件处理吗?', '提示', {
@@ -824,7 +857,7 @@
completeCaseTask(this.processForm).then(response => {
if (response.code === 200) {
this.$message.success('提交成功')
- // this.$emit('submitProcess', this.caseDetail.caseid)
+ // 隐藏案卷处理，重新加载数据
this.showProcess = false
this.$route.query.showProcess = false
this.initData()
@@ -888,7 +921,11 @@
margin-bottom: 30px;
}
.image-container {
+ // width: 80%;
+ // margin-top: 20px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index 5306d11..8e33af7 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
+
-
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -297,6 +308,8 @@
}
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue
index 028986c..9bcf43f 100644
--- a/src/components/Map/arcgisMap.vue
+++ b/src/components/Map/arcgisMap.vue
@@ -516,8 +516,8 @@
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index dc1eb3f..cfd14e6 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -131,13 +131,24 @@
- 案卷图片:
+
-
+
-
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
案卷处理:
@@ -462,7 +473,9 @@
this.initProcess()
}
},
- // 每次清空案件处理相关数据
+ /**
+ * 每次进入页面时,清空案件处理相关数据
+ */
resetData() {
// this.operationKey = ''
this.processForm = {
@@ -477,8 +490,11 @@
this.commonLanguage = ''
this.processCompShow = ''
this.processCompObj = {}
+ this.$refs['processForm'].resetFields()
},
- // 初始化案件处理单选键组
+ /**
+ * 初始化案件处理单选键组
+ */
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
@@ -567,7 +583,11 @@
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
},
- setDefaultUserId(radioConfig) { // 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ /**
+ * 设置默认人员id
+ * 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ */
+ setDefaultUserId(radioConfig) {
switch (radioConfig.passBack) {
case 'verifyPersonId': { // 原核实人员
this.$set(this.processCompObj, 'taskUserId', this.caseDetail.verifyPersonId)
@@ -583,7 +603,9 @@
}
}
},
- // 选择案卷处理操作
+ /**
+ * 选择案卷处理操作，初始化所需组件
+ */
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey], this.processCompObj)
const radioConfig = radioMap[this.operationKey]
@@ -623,7 +645,7 @@
this.$set(this.processCompObj, 'eorcList', eorcListRes.data)
this.$set(this.processCompObj, 'eorc', this.caseDetail.eorc)
- // 初始化
+ // 初始化大类、小类、立案标准、完成时限
this.$set(this.processCompObj, 'caseTypeList', [])
this.$set(this.processCompObj, 'caseTypeDetailList', [])
this.$set(this.processCompObj, 'caseTypeTimeList', [])
@@ -684,7 +706,29 @@
break
}
},
- // 构建提交表单
+ /**
+ * 检查输入小时
+ */
+ checkHour(hour) {
+ if (parseInt(hour) >= 0) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 检查输入分钟
+ */
+ checkMin(min) {
+ if (parseInt(min) >= 0 && parseInt(min) < 60) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 构建提交表单
+ */
buildForm() {
console.log('buildForm', this.operationKey)
// 通用参数,processId已有
@@ -793,20 +837,9 @@
console.log(this.processForm)
return true
},
- checkHour(hour) {
- if (parseInt(hour) >= 0) {
- return true
- } else {
- return false
- }
- },
- checkMin(min) {
- if (parseInt(min) >= 0 && parseInt(min) < 60) {
- return true
- } else {
- return false
- }
- },
+ /**
+ * 提交案卷处理
+ */
submit() {
console.log('submit')
this.$confirm('确定提交案件处理吗?', '提示', {
@@ -824,7 +857,7 @@
completeCaseTask(this.processForm).then(response => {
if (response.code === 200) {
this.$message.success('提交成功')
- // this.$emit('submitProcess', this.caseDetail.caseid)
+ // 隐藏案卷处理，重新加载数据
this.showProcess = false
this.$route.query.showProcess = false
this.initData()
@@ -888,7 +921,11 @@
margin-bottom: 30px;
}
.image-container {
+ // width: 80%;
+ // margin-top: 20px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index 5306d11..8e33af7 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
+
-
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -297,6 +308,8 @@
}
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue
index 028986c..9bcf43f 100644
--- a/src/components/Map/arcgisMap.vue
+++ b/src/components/Map/arcgisMap.vue
@@ -516,8 +516,8 @@
diff --git a/src/views/busAdmin/caseType/listCaseType.vue b/src/views/busAdmin/caseType/listCaseType.vue
index cdbba66..4dd8fa7 100644
--- a/src/views/busAdmin/caseType/listCaseType.vue
+++ b/src/views/busAdmin/caseType/listCaseType.vue
@@ -253,6 +253,10 @@
this.fetchData()
},
add() {
+ if (this.listQuery.typeId < 0) { // 点击事件或部件，不展示添加
+ this.$message.warning('请先选择案卷大类')
+ return
+ }
this.dialogFormVisible = true
this.editShow = true
this.$refs.editCaseType.initDialog({
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index dc1eb3f..cfd14e6 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -131,13 +131,24 @@
- 案卷图片:
+
-
+
-
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
案卷处理:
@@ -462,7 +473,9 @@
this.initProcess()
}
},
- // 每次清空案件处理相关数据
+ /**
+ * 每次进入页面时,清空案件处理相关数据
+ */
resetData() {
// this.operationKey = ''
this.processForm = {
@@ -477,8 +490,11 @@
this.commonLanguage = ''
this.processCompShow = ''
this.processCompObj = {}
+ this.$refs['processForm'].resetFields()
},
- // 初始化案件处理单选键组
+ /**
+ * 初始化案件处理单选键组
+ */
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
@@ -567,7 +583,11 @@
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
},
- setDefaultUserId(radioConfig) { // 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ /**
+ * 设置默认人员id
+ * 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ */
+ setDefaultUserId(radioConfig) {
switch (radioConfig.passBack) {
case 'verifyPersonId': { // 原核实人员
this.$set(this.processCompObj, 'taskUserId', this.caseDetail.verifyPersonId)
@@ -583,7 +603,9 @@
}
}
},
- // 选择案卷处理操作
+ /**
+ * 选择案卷处理操作，初始化所需组件
+ */
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey], this.processCompObj)
const radioConfig = radioMap[this.operationKey]
@@ -623,7 +645,7 @@
this.$set(this.processCompObj, 'eorcList', eorcListRes.data)
this.$set(this.processCompObj, 'eorc', this.caseDetail.eorc)
- // 初始化
+ // 初始化大类、小类、立案标准、完成时限
this.$set(this.processCompObj, 'caseTypeList', [])
this.$set(this.processCompObj, 'caseTypeDetailList', [])
this.$set(this.processCompObj, 'caseTypeTimeList', [])
@@ -684,7 +706,29 @@
break
}
},
- // 构建提交表单
+ /**
+ * 检查输入小时
+ */
+ checkHour(hour) {
+ if (parseInt(hour) >= 0) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 检查输入分钟
+ */
+ checkMin(min) {
+ if (parseInt(min) >= 0 && parseInt(min) < 60) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 构建提交表单
+ */
buildForm() {
console.log('buildForm', this.operationKey)
// 通用参数,processId已有
@@ -793,20 +837,9 @@
console.log(this.processForm)
return true
},
- checkHour(hour) {
- if (parseInt(hour) >= 0) {
- return true
- } else {
- return false
- }
- },
- checkMin(min) {
- if (parseInt(min) >= 0 && parseInt(min) < 60) {
- return true
- } else {
- return false
- }
- },
+ /**
+ * 提交案卷处理
+ */
submit() {
console.log('submit')
this.$confirm('确定提交案件处理吗?', '提示', {
@@ -824,7 +857,7 @@
completeCaseTask(this.processForm).then(response => {
if (response.code === 200) {
this.$message.success('提交成功')
- // this.$emit('submitProcess', this.caseDetail.caseid)
+ // 隐藏案卷处理，重新加载数据
this.showProcess = false
this.$route.query.showProcess = false
this.initData()
@@ -888,7 +921,11 @@
margin-bottom: 30px;
}
.image-container {
+ // width: 80%;
+ // margin-top: 20px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index 5306d11..8e33af7 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
+
-
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -297,6 +308,8 @@
}
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue
index 028986c..9bcf43f 100644
--- a/src/components/Map/arcgisMap.vue
+++ b/src/components/Map/arcgisMap.vue
@@ -516,8 +516,8 @@
diff --git a/src/views/busAdmin/caseType/listCaseType.vue b/src/views/busAdmin/caseType/listCaseType.vue
index cdbba66..4dd8fa7 100644
--- a/src/views/busAdmin/caseType/listCaseType.vue
+++ b/src/views/busAdmin/caseType/listCaseType.vue
@@ -253,6 +253,10 @@
this.fetchData()
},
add() {
+ if (this.listQuery.typeId < 0) { // 点击事件或部件，不展示添加
+ this.$message.warning('请先选择案卷大类')
+ return
+ }
this.dialogFormVisible = true
this.editShow = true
this.$refs.editCaseType.initDialog({
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 08e6858..fe204b8 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -164,7 +164,7 @@
-
+
@@ -172,7 +172,7 @@
-
+
@@ -687,8 +687,11 @@
}
-
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index dc1eb3f..cfd14e6 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -131,13 +131,24 @@
- 案卷图片:
+
-
+
-
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
案卷处理:
@@ -462,7 +473,9 @@
this.initProcess()
}
},
- // 每次清空案件处理相关数据
+ /**
+ * 每次进入页面时,清空案件处理相关数据
+ */
resetData() {
// this.operationKey = ''
this.processForm = {
@@ -477,8 +490,11 @@
this.commonLanguage = ''
this.processCompShow = ''
this.processCompObj = {}
+ this.$refs['processForm'].resetFields()
},
- // 初始化案件处理单选键组
+ /**
+ * 初始化案件处理单选键组
+ */
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
@@ -567,7 +583,11 @@
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
},
- setDefaultUserId(radioConfig) { // 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ /**
+ * 设置默认人员id
+ * 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ */
+ setDefaultUserId(radioConfig) {
switch (radioConfig.passBack) {
case 'verifyPersonId': { // 原核实人员
this.$set(this.processCompObj, 'taskUserId', this.caseDetail.verifyPersonId)
@@ -583,7 +603,9 @@
}
}
},
- // 选择案卷处理操作
+ /**
+ * 选择案卷处理操作，初始化所需组件
+ */
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey], this.processCompObj)
const radioConfig = radioMap[this.operationKey]
@@ -623,7 +645,7 @@
this.$set(this.processCompObj, 'eorcList', eorcListRes.data)
this.$set(this.processCompObj, 'eorc', this.caseDetail.eorc)
- // 初始化
+ // 初始化大类、小类、立案标准、完成时限
this.$set(this.processCompObj, 'caseTypeList', [])
this.$set(this.processCompObj, 'caseTypeDetailList', [])
this.$set(this.processCompObj, 'caseTypeTimeList', [])
@@ -684,7 +706,29 @@
break
}
},
- // 构建提交表单
+ /**
+ * 检查输入小时
+ */
+ checkHour(hour) {
+ if (parseInt(hour) >= 0) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 检查输入分钟
+ */
+ checkMin(min) {
+ if (parseInt(min) >= 0 && parseInt(min) < 60) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 构建提交表单
+ */
buildForm() {
console.log('buildForm', this.operationKey)
// 通用参数,processId已有
@@ -793,20 +837,9 @@
console.log(this.processForm)
return true
},
- checkHour(hour) {
- if (parseInt(hour) >= 0) {
- return true
- } else {
- return false
- }
- },
- checkMin(min) {
- if (parseInt(min) >= 0 && parseInt(min) < 60) {
- return true
- } else {
- return false
- }
- },
+ /**
+ * 提交案卷处理
+ */
submit() {
console.log('submit')
this.$confirm('确定提交案件处理吗?', '提示', {
@@ -824,7 +857,7 @@
completeCaseTask(this.processForm).then(response => {
if (response.code === 200) {
this.$message.success('提交成功')
- // this.$emit('submitProcess', this.caseDetail.caseid)
+ // 隐藏案卷处理，重新加载数据
this.showProcess = false
this.$route.query.showProcess = false
this.initData()
@@ -888,7 +921,11 @@
margin-bottom: 30px;
}
.image-container {
+ // width: 80%;
+ // margin-top: 20px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index 5306d11..8e33af7 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
+
-
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -297,6 +308,8 @@
}
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue
index 028986c..9bcf43f 100644
--- a/src/components/Map/arcgisMap.vue
+++ b/src/components/Map/arcgisMap.vue
@@ -516,8 +516,8 @@
diff --git a/src/views/busAdmin/caseType/listCaseType.vue b/src/views/busAdmin/caseType/listCaseType.vue
index cdbba66..4dd8fa7 100644
--- a/src/views/busAdmin/caseType/listCaseType.vue
+++ b/src/views/busAdmin/caseType/listCaseType.vue
@@ -253,6 +253,10 @@
this.fetchData()
},
add() {
+ if (this.listQuery.typeId < 0) { // 点击事件或部件，不展示添加
+ this.$message.warning('请先选择案卷大类')
+ return
+ }
this.dialogFormVisible = true
this.editShow = true
this.$refs.editCaseType.initDialog({
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 08e6858..fe204b8 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -164,7 +164,7 @@
-
+
@@ -172,7 +172,7 @@
-
+
@@ -687,8 +687,11 @@
}
-
diff --git a/src/views/caseCommon/caseDetailRead.vue b/src/views/caseCommon/caseDetailRead.vue
index 2f4001d..54cb279 100644
--- a/src/views/caseCommon/caseDetailRead.vue
+++ b/src/views/caseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -289,6 +300,8 @@
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 40px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index dc1eb3f..cfd14e6 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -131,13 +131,24 @@
- 案卷图片:
+
-
+
-
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
案卷处理:
@@ -462,7 +473,9 @@
this.initProcess()
}
},
- // 每次清空案件处理相关数据
+ /**
+ * 每次进入页面时,清空案件处理相关数据
+ */
resetData() {
// this.operationKey = ''
this.processForm = {
@@ -477,8 +490,11 @@
this.commonLanguage = ''
this.processCompShow = ''
this.processCompObj = {}
+ this.$refs['processForm'].resetFields()
},
- // 初始化案件处理单选键组
+ /**
+ * 初始化案件处理单选键组
+ */
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
@@ -567,7 +583,11 @@
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
},
- setDefaultUserId(radioConfig) { // 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ /**
+ * 设置默认人员id
+ * 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ */
+ setDefaultUserId(radioConfig) {
switch (radioConfig.passBack) {
case 'verifyPersonId': { // 原核实人员
this.$set(this.processCompObj, 'taskUserId', this.caseDetail.verifyPersonId)
@@ -583,7 +603,9 @@
}
}
},
- // 选择案卷处理操作
+ /**
+ * 选择案卷处理操作，初始化所需组件
+ */
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey], this.processCompObj)
const radioConfig = radioMap[this.operationKey]
@@ -623,7 +645,7 @@
this.$set(this.processCompObj, 'eorcList', eorcListRes.data)
this.$set(this.processCompObj, 'eorc', this.caseDetail.eorc)
- // 初始化
+ // 初始化大类、小类、立案标准、完成时限
this.$set(this.processCompObj, 'caseTypeList', [])
this.$set(this.processCompObj, 'caseTypeDetailList', [])
this.$set(this.processCompObj, 'caseTypeTimeList', [])
@@ -684,7 +706,29 @@
break
}
},
- // 构建提交表单
+ /**
+ * 检查输入小时
+ */
+ checkHour(hour) {
+ if (parseInt(hour) >= 0) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 检查输入分钟
+ */
+ checkMin(min) {
+ if (parseInt(min) >= 0 && parseInt(min) < 60) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 构建提交表单
+ */
buildForm() {
console.log('buildForm', this.operationKey)
// 通用参数,processId已有
@@ -793,20 +837,9 @@
console.log(this.processForm)
return true
},
- checkHour(hour) {
- if (parseInt(hour) >= 0) {
- return true
- } else {
- return false
- }
- },
- checkMin(min) {
- if (parseInt(min) >= 0 && parseInt(min) < 60) {
- return true
- } else {
- return false
- }
- },
+ /**
+ * 提交案卷处理
+ */
submit() {
console.log('submit')
this.$confirm('确定提交案件处理吗?', '提示', {
@@ -824,7 +857,7 @@
completeCaseTask(this.processForm).then(response => {
if (response.code === 200) {
this.$message.success('提交成功')
- // this.$emit('submitProcess', this.caseDetail.caseid)
+ // 隐藏案卷处理，重新加载数据
this.showProcess = false
this.$route.query.showProcess = false
this.initData()
@@ -888,7 +921,11 @@
margin-bottom: 30px;
}
.image-container {
+ // width: 80%;
+ // margin-top: 20px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index 5306d11..8e33af7 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
+
-
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -297,6 +308,8 @@
}
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue
index 028986c..9bcf43f 100644
--- a/src/components/Map/arcgisMap.vue
+++ b/src/components/Map/arcgisMap.vue
@@ -516,8 +516,8 @@
diff --git a/src/views/busAdmin/caseType/listCaseType.vue b/src/views/busAdmin/caseType/listCaseType.vue
index cdbba66..4dd8fa7 100644
--- a/src/views/busAdmin/caseType/listCaseType.vue
+++ b/src/views/busAdmin/caseType/listCaseType.vue
@@ -253,6 +253,10 @@
this.fetchData()
},
add() {
+ if (this.listQuery.typeId < 0) { // 点击事件或部件，不展示添加
+ this.$message.warning('请先选择案卷大类')
+ return
+ }
this.dialogFormVisible = true
this.editShow = true
this.$refs.editCaseType.initDialog({
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 08e6858..fe204b8 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -164,7 +164,7 @@
-
+
@@ -172,7 +172,7 @@
-
+
@@ -687,8 +687,11 @@
}
-
diff --git a/src/views/caseCommon/caseDetailRead.vue b/src/views/caseCommon/caseDetailRead.vue
index 2f4001d..54cb279 100644
--- a/src/views/caseCommon/caseDetailRead.vue
+++ b/src/views/caseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -289,6 +300,8 @@
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 40px;
}
.el-image.image {
width: 150px;
diff --git a/src/views/caseCommon/caseDetailSupervise.vue b/src/views/caseCommon/caseDetailSupervise.vue
index 3e4d95a..879a58a 100644
--- a/src/views/caseCommon/caseDetailSupervise.vue
+++ b/src/views/caseCommon/caseDetailSupervise.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -354,7 +365,10 @@
margin-bottom: 30px;
}
.image-container {
+ // margin-left: 40px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 40px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index dc1eb3f..cfd14e6 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -131,13 +131,24 @@
- 案卷图片:
+
-
+
-
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
案卷处理:
@@ -462,7 +473,9 @@
this.initProcess()
}
},
- // 每次清空案件处理相关数据
+ /**
+ * 每次进入页面时,清空案件处理相关数据
+ */
resetData() {
// this.operationKey = ''
this.processForm = {
@@ -477,8 +490,11 @@
this.commonLanguage = ''
this.processCompShow = ''
this.processCompObj = {}
+ this.$refs['processForm'].resetFields()
},
- // 初始化案件处理单选键组
+ /**
+ * 初始化案件处理单选键组
+ */
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
@@ -567,7 +583,11 @@
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
},
- setDefaultUserId(radioConfig) { // 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ /**
+ * 设置默认人员id
+ * 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ */
+ setDefaultUserId(radioConfig) {
switch (radioConfig.passBack) {
case 'verifyPersonId': { // 原核实人员
this.$set(this.processCompObj, 'taskUserId', this.caseDetail.verifyPersonId)
@@ -583,7 +603,9 @@
}
}
},
- // 选择案卷处理操作
+ /**
+ * 选择案卷处理操作，初始化所需组件
+ */
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey], this.processCompObj)
const radioConfig = radioMap[this.operationKey]
@@ -623,7 +645,7 @@
this.$set(this.processCompObj, 'eorcList', eorcListRes.data)
this.$set(this.processCompObj, 'eorc', this.caseDetail.eorc)
- // 初始化
+ // 初始化大类、小类、立案标准、完成时限
this.$set(this.processCompObj, 'caseTypeList', [])
this.$set(this.processCompObj, 'caseTypeDetailList', [])
this.$set(this.processCompObj, 'caseTypeTimeList', [])
@@ -684,7 +706,29 @@
break
}
},
- // 构建提交表单
+ /**
+ * 检查输入小时
+ */
+ checkHour(hour) {
+ if (parseInt(hour) >= 0) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 检查输入分钟
+ */
+ checkMin(min) {
+ if (parseInt(min) >= 0 && parseInt(min) < 60) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 构建提交表单
+ */
buildForm() {
console.log('buildForm', this.operationKey)
// 通用参数,processId已有
@@ -793,20 +837,9 @@
console.log(this.processForm)
return true
},
- checkHour(hour) {
- if (parseInt(hour) >= 0) {
- return true
- } else {
- return false
- }
- },
- checkMin(min) {
- if (parseInt(min) >= 0 && parseInt(min) < 60) {
- return true
- } else {
- return false
- }
- },
+ /**
+ * 提交案卷处理
+ */
submit() {
console.log('submit')
this.$confirm('确定提交案件处理吗?', '提示', {
@@ -824,7 +857,7 @@
completeCaseTask(this.processForm).then(response => {
if (response.code === 200) {
this.$message.success('提交成功')
- // this.$emit('submitProcess', this.caseDetail.caseid)
+ // 隐藏案卷处理，重新加载数据
this.showProcess = false
this.$route.query.showProcess = false
this.initData()
@@ -888,7 +921,11 @@
margin-bottom: 30px;
}
.image-container {
+ // width: 80%;
+ // margin-top: 20px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index 5306d11..8e33af7 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
+
-
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -297,6 +308,8 @@
}
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue
index 028986c..9bcf43f 100644
--- a/src/components/Map/arcgisMap.vue
+++ b/src/components/Map/arcgisMap.vue
@@ -516,8 +516,8 @@
diff --git a/src/views/busAdmin/caseType/listCaseType.vue b/src/views/busAdmin/caseType/listCaseType.vue
index cdbba66..4dd8fa7 100644
--- a/src/views/busAdmin/caseType/listCaseType.vue
+++ b/src/views/busAdmin/caseType/listCaseType.vue
@@ -253,6 +253,10 @@
this.fetchData()
},
add() {
+ if (this.listQuery.typeId < 0) { // 点击事件或部件，不展示添加
+ this.$message.warning('请先选择案卷大类')
+ return
+ }
this.dialogFormVisible = true
this.editShow = true
this.$refs.editCaseType.initDialog({
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 08e6858..fe204b8 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -164,7 +164,7 @@
-
+
@@ -172,7 +172,7 @@
-
+
@@ -687,8 +687,11 @@
}
-
diff --git a/src/views/caseCommon/caseDetailRead.vue b/src/views/caseCommon/caseDetailRead.vue
index 2f4001d..54cb279 100644
--- a/src/views/caseCommon/caseDetailRead.vue
+++ b/src/views/caseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -289,6 +300,8 @@
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 40px;
}
.el-image.image {
width: 150px;
diff --git a/src/views/caseCommon/caseDetailSupervise.vue b/src/views/caseCommon/caseDetailSupervise.vue
index 3e4d95a..879a58a 100644
--- a/src/views/caseCommon/caseDetailSupervise.vue
+++ b/src/views/caseCommon/caseDetailSupervise.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -354,7 +365,10 @@
margin-bottom: 30px;
}
.image-container {
+ // margin-left: 40px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 40px;
}
.el-image.image {
width: 150px;
diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue
index 4bb36da..b94d5d4 100644
--- a/src/views/deptAccess/deptAccessList.vue
+++ b/src/views/deptAccess/deptAccessList.vue
@@ -191,3 +191,10 @@
display: contents;
}
+
+
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index dc1eb3f..cfd14e6 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -131,13 +131,24 @@
- 案卷图片:
+
-
+
-
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
案卷处理:
@@ -462,7 +473,9 @@
this.initProcess()
}
},
- // 每次清空案件处理相关数据
+ /**
+ * 每次进入页面时,清空案件处理相关数据
+ */
resetData() {
// this.operationKey = ''
this.processForm = {
@@ -477,8 +490,11 @@
this.commonLanguage = ''
this.processCompShow = ''
this.processCompObj = {}
+ this.$refs['processForm'].resetFields()
},
- // 初始化案件处理单选键组
+ /**
+ * 初始化案件处理单选键组
+ */
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
@@ -567,7 +583,11 @@
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
},
- setDefaultUserId(radioConfig) { // 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ /**
+ * 设置默认人员id
+ * 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ */
+ setDefaultUserId(radioConfig) {
switch (radioConfig.passBack) {
case 'verifyPersonId': { // 原核实人员
this.$set(this.processCompObj, 'taskUserId', this.caseDetail.verifyPersonId)
@@ -583,7 +603,9 @@
}
}
},
- // 选择案卷处理操作
+ /**
+ * 选择案卷处理操作，初始化所需组件
+ */
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey], this.processCompObj)
const radioConfig = radioMap[this.operationKey]
@@ -623,7 +645,7 @@
this.$set(this.processCompObj, 'eorcList', eorcListRes.data)
this.$set(this.processCompObj, 'eorc', this.caseDetail.eorc)
- // 初始化
+ // 初始化大类、小类、立案标准、完成时限
this.$set(this.processCompObj, 'caseTypeList', [])
this.$set(this.processCompObj, 'caseTypeDetailList', [])
this.$set(this.processCompObj, 'caseTypeTimeList', [])
@@ -684,7 +706,29 @@
break
}
},
- // 构建提交表单
+ /**
+ * 检查输入小时
+ */
+ checkHour(hour) {
+ if (parseInt(hour) >= 0) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 检查输入分钟
+ */
+ checkMin(min) {
+ if (parseInt(min) >= 0 && parseInt(min) < 60) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 构建提交表单
+ */
buildForm() {
console.log('buildForm', this.operationKey)
// 通用参数,processId已有
@@ -793,20 +837,9 @@
console.log(this.processForm)
return true
},
- checkHour(hour) {
- if (parseInt(hour) >= 0) {
- return true
- } else {
- return false
- }
- },
- checkMin(min) {
- if (parseInt(min) >= 0 && parseInt(min) < 60) {
- return true
- } else {
- return false
- }
- },
+ /**
+ * 提交案卷处理
+ */
submit() {
console.log('submit')
this.$confirm('确定提交案件处理吗?', '提示', {
@@ -824,7 +857,7 @@
completeCaseTask(this.processForm).then(response => {
if (response.code === 200) {
this.$message.success('提交成功')
- // this.$emit('submitProcess', this.caseDetail.caseid)
+ // 隐藏案卷处理，重新加载数据
this.showProcess = false
this.$route.query.showProcess = false
this.initData()
@@ -888,7 +921,11 @@
margin-bottom: 30px;
}
.image-container {
+ // width: 80%;
+ // margin-top: 20px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index 5306d11..8e33af7 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
+
-
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -297,6 +308,8 @@
}
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue
index 028986c..9bcf43f 100644
--- a/src/components/Map/arcgisMap.vue
+++ b/src/components/Map/arcgisMap.vue
@@ -516,8 +516,8 @@
diff --git a/src/views/busAdmin/caseType/listCaseType.vue b/src/views/busAdmin/caseType/listCaseType.vue
index cdbba66..4dd8fa7 100644
--- a/src/views/busAdmin/caseType/listCaseType.vue
+++ b/src/views/busAdmin/caseType/listCaseType.vue
@@ -253,6 +253,10 @@
this.fetchData()
},
add() {
+ if (this.listQuery.typeId < 0) { // 点击事件或部件，不展示添加
+ this.$message.warning('请先选择案卷大类')
+ return
+ }
this.dialogFormVisible = true
this.editShow = true
this.$refs.editCaseType.initDialog({
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 08e6858..fe204b8 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -164,7 +164,7 @@
-
+
@@ -172,7 +172,7 @@
-
+
@@ -687,8 +687,11 @@
}
-
diff --git a/src/views/caseCommon/caseDetailRead.vue b/src/views/caseCommon/caseDetailRead.vue
index 2f4001d..54cb279 100644
--- a/src/views/caseCommon/caseDetailRead.vue
+++ b/src/views/caseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -289,6 +300,8 @@
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 40px;
}
.el-image.image {
width: 150px;
diff --git a/src/views/caseCommon/caseDetailSupervise.vue b/src/views/caseCommon/caseDetailSupervise.vue
index 3e4d95a..879a58a 100644
--- a/src/views/caseCommon/caseDetailSupervise.vue
+++ b/src/views/caseCommon/caseDetailSupervise.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -354,7 +365,10 @@
margin-bottom: 30px;
}
.image-container {
+ // margin-left: 40px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 40px;
}
.el-image.image {
width: 150px;
diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue
index 4bb36da..b94d5d4 100644
--- a/src/views/deptAccess/deptAccessList.vue
+++ b/src/views/deptAccess/deptAccessList.vue
@@ -191,3 +191,10 @@
display: contents;
}
+
+
diff --git a/src/views/supControl/supControl.vue b/src/views/supControl/supControl.vue
index 6859f75..b1453b9 100644
--- a/src/views/supControl/supControl.vue
+++ b/src/views/supControl/supControl.vue
@@ -452,6 +452,7 @@
addPersonPoints: function() {
const that = this
getUserOnLine(this.personQuery).then(res => {
+ this.showGraphicLayer(personResultLayerId, true)
const gLayer = this.selectGraphicLayerById(personResultLayerId) // 添加自定义绘制点的图层
res.data.forEach((item, index) => {
const point = new that.esriObj.Point(116.60769581599995, 28.24919796600002 + index * 0.001) // 创建geometry对象
@@ -481,6 +482,7 @@
this.layers.dxbjPoint.queryFeatures(queryDev).then(function(response) {
if (response.features.length > 0) {
const results = response.features
+ that.showGraphicLayer(partsResultLayerId, true)
const gLayer = that.selectGraphicLayerById(partsResultLayerId)
results.forEach((item, index) => {
const point = new that.esriObj.Point(item.geometry.x, item.geometry.y) // 创建geometry对象
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index dc1eb3f..cfd14e6 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -131,13 +131,24 @@
- 案卷图片:
+
-
+
-
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
案卷处理:
@@ -462,7 +473,9 @@
this.initProcess()
}
},
- // 每次清空案件处理相关数据
+ /**
+ * 每次进入页面时,清空案件处理相关数据
+ */
resetData() {
// this.operationKey = ''
this.processForm = {
@@ -477,8 +490,11 @@
this.commonLanguage = ''
this.processCompShow = ''
this.processCompObj = {}
+ this.$refs['processForm'].resetFields()
},
- // 初始化案件处理单选键组
+ /**
+ * 初始化案件处理单选键组
+ */
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
@@ -567,7 +583,11 @@
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
},
- setDefaultUserId(radioConfig) { // 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ /**
+ * 设置默认人员id
+ * 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ */
+ setDefaultUserId(radioConfig) {
switch (radioConfig.passBack) {
case 'verifyPersonId': { // 原核实人员
this.$set(this.processCompObj, 'taskUserId', this.caseDetail.verifyPersonId)
@@ -583,7 +603,9 @@
}
}
},
- // 选择案卷处理操作
+ /**
+ * 选择案卷处理操作，初始化所需组件
+ */
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey], this.processCompObj)
const radioConfig = radioMap[this.operationKey]
@@ -623,7 +645,7 @@
this.$set(this.processCompObj, 'eorcList', eorcListRes.data)
this.$set(this.processCompObj, 'eorc', this.caseDetail.eorc)
- // 初始化
+ // 初始化大类、小类、立案标准、完成时限
this.$set(this.processCompObj, 'caseTypeList', [])
this.$set(this.processCompObj, 'caseTypeDetailList', [])
this.$set(this.processCompObj, 'caseTypeTimeList', [])
@@ -684,7 +706,29 @@
break
}
},
- // 构建提交表单
+ /**
+ * 检查输入小时
+ */
+ checkHour(hour) {
+ if (parseInt(hour) >= 0) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 检查输入分钟
+ */
+ checkMin(min) {
+ if (parseInt(min) >= 0 && parseInt(min) < 60) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 构建提交表单
+ */
buildForm() {
console.log('buildForm', this.operationKey)
// 通用参数,processId已有
@@ -793,20 +837,9 @@
console.log(this.processForm)
return true
},
- checkHour(hour) {
- if (parseInt(hour) >= 0) {
- return true
- } else {
- return false
- }
- },
- checkMin(min) {
- if (parseInt(min) >= 0 && parseInt(min) < 60) {
- return true
- } else {
- return false
- }
- },
+ /**
+ * 提交案卷处理
+ */
submit() {
console.log('submit')
this.$confirm('确定提交案件处理吗?', '提示', {
@@ -824,7 +857,7 @@
completeCaseTask(this.processForm).then(response => {
if (response.code === 200) {
this.$message.success('提交成功')
- // this.$emit('submitProcess', this.caseDetail.caseid)
+ // 隐藏案卷处理，重新加载数据
this.showProcess = false
this.$route.query.showProcess = false
this.initData()
@@ -888,7 +921,11 @@
margin-bottom: 30px;
}
.image-container {
+ // width: 80%;
+ // margin-top: 20px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index 5306d11..8e33af7 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
+
-
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -297,6 +308,8 @@
}
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue
index 028986c..9bcf43f 100644
--- a/src/components/Map/arcgisMap.vue
+++ b/src/components/Map/arcgisMap.vue
@@ -516,8 +516,8 @@
diff --git a/src/views/busAdmin/caseType/listCaseType.vue b/src/views/busAdmin/caseType/listCaseType.vue
index cdbba66..4dd8fa7 100644
--- a/src/views/busAdmin/caseType/listCaseType.vue
+++ b/src/views/busAdmin/caseType/listCaseType.vue
@@ -253,6 +253,10 @@
this.fetchData()
},
add() {
+ if (this.listQuery.typeId < 0) { // 点击事件或部件，不展示添加
+ this.$message.warning('请先选择案卷大类')
+ return
+ }
this.dialogFormVisible = true
this.editShow = true
this.$refs.editCaseType.initDialog({
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 08e6858..fe204b8 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -164,7 +164,7 @@
-
+
@@ -172,7 +172,7 @@
-
+
@@ -687,8 +687,11 @@
}
-
diff --git a/src/views/caseCommon/caseDetailRead.vue b/src/views/caseCommon/caseDetailRead.vue
index 2f4001d..54cb279 100644
--- a/src/views/caseCommon/caseDetailRead.vue
+++ b/src/views/caseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -289,6 +300,8 @@
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 40px;
}
.el-image.image {
width: 150px;
diff --git a/src/views/caseCommon/caseDetailSupervise.vue b/src/views/caseCommon/caseDetailSupervise.vue
index 3e4d95a..879a58a 100644
--- a/src/views/caseCommon/caseDetailSupervise.vue
+++ b/src/views/caseCommon/caseDetailSupervise.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -354,7 +365,10 @@
margin-bottom: 30px;
}
.image-container {
+ // margin-left: 40px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 40px;
}
.el-image.image {
width: 150px;
diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue
index 4bb36da..b94d5d4 100644
--- a/src/views/deptAccess/deptAccessList.vue
+++ b/src/views/deptAccess/deptAccessList.vue
@@ -191,3 +191,10 @@
display: contents;
}
+
+
diff --git a/src/views/supControl/supControl.vue b/src/views/supControl/supControl.vue
index 6859f75..b1453b9 100644
--- a/src/views/supControl/supControl.vue
+++ b/src/views/supControl/supControl.vue
@@ -452,6 +452,7 @@
addPersonPoints: function() {
const that = this
getUserOnLine(this.personQuery).then(res => {
+ this.showGraphicLayer(personResultLayerId, true)
const gLayer = this.selectGraphicLayerById(personResultLayerId) // 添加自定义绘制点的图层
res.data.forEach((item, index) => {
const point = new that.esriObj.Point(116.60769581599995, 28.24919796600002 + index * 0.001) // 创建geometry对象
@@ -481,6 +482,7 @@
this.layers.dxbjPoint.queryFeatures(queryDev).then(function(response) {
if (response.features.length > 0) {
const results = response.features
+ that.showGraphicLayer(partsResultLayerId, true)
const gLayer = that.selectGraphicLayerById(partsResultLayerId)
results.forEach((item, index) => {
const point = new that.esriObj.Point(item.geometry.x, item.geometry.y) // 创建geometry对象
diff --git a/src/views/supControl/supStatisPanel.vue b/src/views/supControl/supStatisPanel.vue
index 85934ef..7f3946b 100644
--- a/src/views/supControl/supStatisPanel.vue
+++ b/src/views/supControl/supStatisPanel.vue
@@ -239,23 +239,23 @@
} else if (this.timeTerm === '2') { // 前三个月
this.caseCounts.labelText = '本期'
- this.query.begTime = getDate(-3, 'yyyy-MM-dd')
+ this.query.begTime = getDate(-90, 'yyyy-MM-dd')
this.query.endTime = getDate(1, 'yyyy-MM-dd')
- this.query4Regist.beginDate = getDate(-3, 'yyyy-MM-dd')
+ this.query4Regist.beginDate = getDate(-90, 'yyyy-MM-dd')
this.query4Regist.endDate = getDate(1, 'yyyy-MM-dd')
} else if (this.timeTerm === '3') { // 前半年
this.caseCounts.labelText = '本期'
- this.query.begTime = getDate(-5, 'yyyy-MM-dd')
+ this.query.begTime = getDate(-180, 'yyyy-MM-dd')
this.query.endTime = getDate(1, 'yyyy-MM-dd')
- this.query4Regist.beginDate = getDate(-5, 'yyyy-MM-dd')
+ this.query4Regist.beginDate = getDate(-180, 'yyyy-MM-dd')
this.query4Regist.endDate = getDate(1, 'yyyy-MM-dd')
} else if (this.timeTerm === '4') { // 前一年
this.caseCounts.labelText = '本期'
- this.query.begTime = getDate(-7, 'yyyy-MM-dd')
+ this.query.begTime = getDate(-365, 'yyyy-MM-dd')
this.query.endTime = getDate(1, 'yyyy-MM-dd')
- this.query4Regist.beginDate = getDate(-7, 'yyyy-MM-dd')
+ this.query4Regist.beginDate = getDate(-365, 'yyyy-MM-dd')
this.query4Regist.endDate = getDate(1, 'yyyy-MM-dd')
}
diff --git a/src/components/CaseCommon/caseDetail.vue b/src/components/CaseCommon/caseDetail.vue
index dc1eb3f..cfd14e6 100644
--- a/src/components/CaseCommon/caseDetail.vue
+++ b/src/components/CaseCommon/caseDetail.vue
@@ -131,13 +131,24 @@
- 案卷图片:
+
-
+
-
+
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
案卷处理:
@@ -462,7 +473,9 @@
this.initProcess()
}
},
- // 每次清空案件处理相关数据
+ /**
+ * 每次进入页面时,清空案件处理相关数据
+ */
resetData() {
// this.operationKey = ''
this.processForm = {
@@ -477,8 +490,11 @@
this.commonLanguage = ''
this.processCompShow = ''
this.processCompObj = {}
+ this.$refs['processForm'].resetFields()
},
- // 初始化案件处理单选键组
+ /**
+ * 初始化案件处理单选键组
+ */
async initProcess() {
const res = await nextNodes(this.caseDetail.caseState)
this.processRadioList = res.data
@@ -567,7 +583,11 @@
this.processCompObj.hours = hours
this.processCompObj.minutes = minutes
},
- setDefaultUserId(radioConfig) { // 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ /**
+ * 设置默认人员id
+ * 注意caseDetail.verifyPersonId和userlist中的id类型要一致
+ */
+ setDefaultUserId(radioConfig) {
switch (radioConfig.passBack) {
case 'verifyPersonId': { // 原核实人员
this.$set(this.processCompObj, 'taskUserId', this.caseDetail.verifyPersonId)
@@ -583,7 +603,9 @@
}
}
},
- // 选择案卷处理操作
+ /**
+ * 选择案卷处理操作，初始化所需组件
+ */
async selectNextOperation() {
console.log(this.operationKey, radioMap[this.operationKey], this.processCompObj)
const radioConfig = radioMap[this.operationKey]
@@ -623,7 +645,7 @@
this.$set(this.processCompObj, 'eorcList', eorcListRes.data)
this.$set(this.processCompObj, 'eorc', this.caseDetail.eorc)
- // 初始化
+ // 初始化大类、小类、立案标准、完成时限
this.$set(this.processCompObj, 'caseTypeList', [])
this.$set(this.processCompObj, 'caseTypeDetailList', [])
this.$set(this.processCompObj, 'caseTypeTimeList', [])
@@ -684,7 +706,29 @@
break
}
},
- // 构建提交表单
+ /**
+ * 检查输入小时
+ */
+ checkHour(hour) {
+ if (parseInt(hour) >= 0) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 检查输入分钟
+ */
+ checkMin(min) {
+ if (parseInt(min) >= 0 && parseInt(min) < 60) {
+ return true
+ } else {
+ return false
+ }
+ },
+ /**
+ * 构建提交表单
+ */
buildForm() {
console.log('buildForm', this.operationKey)
// 通用参数,processId已有
@@ -793,20 +837,9 @@
console.log(this.processForm)
return true
},
- checkHour(hour) {
- if (parseInt(hour) >= 0) {
- return true
- } else {
- return false
- }
- },
- checkMin(min) {
- if (parseInt(min) >= 0 && parseInt(min) < 60) {
- return true
- } else {
- return false
- }
- },
+ /**
+ * 提交案卷处理
+ */
submit() {
console.log('submit')
this.$confirm('确定提交案件处理吗?', '提示', {
@@ -824,7 +857,7 @@
completeCaseTask(this.processForm).then(response => {
if (response.code === 200) {
this.$message.success('提交成功')
- // this.$emit('submitProcess', this.caseDetail.caseid)
+ // 隐藏案卷处理，重新加载数据
this.showProcess = false
this.$route.query.showProcess = false
this.initData()
@@ -888,7 +921,11 @@
margin-bottom: 30px;
}
.image-container {
+ // width: 80%;
+ // margin-top: 20px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/CaseCommon/caseDetailRead.vue b/src/components/CaseCommon/caseDetailRead.vue
index 5306d11..8e33af7 100644
--- a/src/components/CaseCommon/caseDetailRead.vue
+++ b/src/components/CaseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
+
-
+
+ -->
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -297,6 +308,8 @@
}
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 20px;
}
.el-image.image {
width: 150px;
diff --git a/src/components/Map/arcgisMap.vue b/src/components/Map/arcgisMap.vue
index 028986c..9bcf43f 100644
--- a/src/components/Map/arcgisMap.vue
+++ b/src/components/Map/arcgisMap.vue
@@ -516,8 +516,8 @@
diff --git a/src/views/busAdmin/caseType/listCaseType.vue b/src/views/busAdmin/caseType/listCaseType.vue
index cdbba66..4dd8fa7 100644
--- a/src/views/busAdmin/caseType/listCaseType.vue
+++ b/src/views/busAdmin/caseType/listCaseType.vue
@@ -253,6 +253,10 @@
this.fetchData()
},
add() {
+ if (this.listQuery.typeId < 0) { // 点击事件或部件，不展示添加
+ this.$message.warning('请先选择案卷大类')
+ return
+ }
this.dialogFormVisible = true
this.editShow = true
this.$refs.editCaseType.initDialog({
diff --git a/src/views/callCase/callCase.vue b/src/views/callCase/callCase.vue
index 08e6858..fe204b8 100644
--- a/src/views/callCase/callCase.vue
+++ b/src/views/callCase/callCase.vue
@@ -164,7 +164,7 @@
-
+
@@ -172,7 +172,7 @@
-
+
@@ -687,8 +687,11 @@
}
-
diff --git a/src/views/caseCommon/caseDetailRead.vue b/src/views/caseCommon/caseDetailRead.vue
index 2f4001d..54cb279 100644
--- a/src/views/caseCommon/caseDetailRead.vue
+++ b/src/views/caseCommon/caseDetailRead.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
数据流转记录:
@@ -289,6 +300,8 @@
.image-container {
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 40px;
}
.el-image.image {
width: 150px;
diff --git a/src/views/caseCommon/caseDetailSupervise.vue b/src/views/caseCommon/caseDetailSupervise.vue
index 3e4d95a..879a58a 100644
--- a/src/views/caseCommon/caseDetailSupervise.vue
+++ b/src/views/caseCommon/caseDetailSupervise.vue
@@ -127,14 +127,25 @@
- 案卷图片:
+
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -354,7 +365,10 @@
margin-bottom: 30px;
}
.image-container {
+ // margin-left: 40px;
margin-left: 40px;
+ margin-right: 20px;
+ margin-bottom: 40px;
}
.el-image.image {
width: 150px;
diff --git a/src/views/deptAccess/deptAccessList.vue b/src/views/deptAccess/deptAccessList.vue
index 4bb36da..b94d5d4 100644
--- a/src/views/deptAccess/deptAccessList.vue
+++ b/src/views/deptAccess/deptAccessList.vue
@@ -191,3 +191,10 @@
display: contents;
}
+
+
diff --git a/src/views/supControl/supControl.vue b/src/views/supControl/supControl.vue
index 6859f75..b1453b9 100644
--- a/src/views/supControl/supControl.vue
+++ b/src/views/supControl/supControl.vue
@@ -452,6 +452,7 @@
addPersonPoints: function() {
const that = this
getUserOnLine(this.personQuery).then(res => {
+ this.showGraphicLayer(personResultLayerId, true)
const gLayer = this.selectGraphicLayerById(personResultLayerId) // 添加自定义绘制点的图层
res.data.forEach((item, index) => {
const point = new that.esriObj.Point(116.60769581599995, 28.24919796600002 + index * 0.001) // 创建geometry对象
@@ -481,6 +482,7 @@
this.layers.dxbjPoint.queryFeatures(queryDev).then(function(response) {
if (response.features.length > 0) {
const results = response.features
+ that.showGraphicLayer(partsResultLayerId, true)
const gLayer = that.selectGraphicLayerById(partsResultLayerId)
results.forEach((item, index) => {
const point = new that.esriObj.Point(item.geometry.x, item.geometry.y) // 创建geometry对象
diff --git a/src/views/supControl/supStatisPanel.vue b/src/views/supControl/supStatisPanel.vue
index 85934ef..7f3946b 100644
--- a/src/views/supControl/supStatisPanel.vue
+++ b/src/views/supControl/supStatisPanel.vue
@@ -239,23 +239,23 @@
} else if (this.timeTerm === '2') { // 前三个月
this.caseCounts.labelText = '本期'
- this.query.begTime = getDate(-3, 'yyyy-MM-dd')
+ this.query.begTime = getDate(-90, 'yyyy-MM-dd')
this.query.endTime = getDate(1, 'yyyy-MM-dd')
- this.query4Regist.beginDate = getDate(-3, 'yyyy-MM-dd')
+ this.query4Regist.beginDate = getDate(-90, 'yyyy-MM-dd')
this.query4Regist.endDate = getDate(1, 'yyyy-MM-dd')
} else if (this.timeTerm === '3') { // 前半年
this.caseCounts.labelText = '本期'
- this.query.begTime = getDate(-5, 'yyyy-MM-dd')
+ this.query.begTime = getDate(-180, 'yyyy-MM-dd')
this.query.endTime = getDate(1, 'yyyy-MM-dd')
- this.query4Regist.beginDate = getDate(-5, 'yyyy-MM-dd')
+ this.query4Regist.beginDate = getDate(-180, 'yyyy-MM-dd')
this.query4Regist.endDate = getDate(1, 'yyyy-MM-dd')
} else if (this.timeTerm === '4') { // 前一年
this.caseCounts.labelText = '本期'
- this.query.begTime = getDate(-7, 'yyyy-MM-dd')
+ this.query.begTime = getDate(-365, 'yyyy-MM-dd')
this.query.endTime = getDate(1, 'yyyy-MM-dd')
- this.query4Regist.beginDate = getDate(-7, 'yyyy-MM-dd')
+ this.query4Regist.beginDate = getDate(-365, 'yyyy-MM-dd')
this.query4Regist.endDate = getDate(1, 'yyyy-MM-dd')
}
diff --git a/src/views/supervise/overtimeCase.vue b/src/views/supervise/overtimeCase.vue
index 08576ff..f1bb982 100644
--- a/src/views/supervise/overtimeCase.vue
+++ b/src/views/supervise/overtimeCase.vue
@@ -103,15 +103,3 @@
}
-