diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
index 0d48d615..3eea4c3b 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
@@ -214,54 +214,94 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- and problemType = #{problemType}
- and danger_type = #{dangerType}
- and date(createTime) >= date(#{createTime})
- and date(updateTime) <= date(#{updateTime})
- and createUser = #{createUser}
- and lordSent = #{lordSent}
+ and a,problemType = #{problemType}
+ and a.danger_type = #{dangerType}
+ and date(a.createTime) >= date(#{createTime})
+ and date(a.updateTime) <= date(#{updateTime})
+ and a.createUser = #{createUser}
+ and a.lordSent = #{lordSent}
AND
(
- createUser=#{currentUserId} or lordSent=#{currentUserId} or find_in_set(#{currentUserId},copySend) or recheckSend=#{currentUserId}
+ a.createUser=#{currentUserId} or a.lordSent=#{currentUserId} or find_in_set(#{currentUserId},a.copySend) or a.recheckSend=#{currentUserId}
)
diff --git a/yanzhu-ui-vue3/src/components/DictTag/index.vue b/yanzhu-ui-vue3/src/components/DictTag/index.vue
index b40b8961..1593b26f 100644
--- a/yanzhu-ui-vue3/src/components/DictTag/index.vue
+++ b/yanzhu-ui-vue3/src/components/DictTag/index.vue
@@ -2,25 +2,14 @@
- {{ item.label + " " }}
- {{ item.label + " " }}
+ {{ item.label + " " }}
+ {{ item.label + " "
+ }}
-
+
@@ -45,10 +34,6 @@ const props = defineProps({
const values = computed(() => {
if (props.value !== null && typeof props.value !== "undefined") {
- console.log("sssssssssssss1==>",Array.isArray(props.value))
- console.log("sssssssssssss2==>",props.value)
- console.log("sssssssssssss3==>",String(props.value))
- console.log("sssssssssssss4==>",[String(props.value)])
return Array.isArray(props.value) ? props.value : [String(props.value)];
} else {
return [];
@@ -84,7 +69,7 @@ function handleArray(array) {
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/src/views/trouble/problemmodify/detailDrawer.vue b/yanzhu-ui-vue3/src/views/trouble/problemmodify/detailDrawer.vue
new file mode 100644
index 00000000..73400bed
--- /dev/null
+++ b/yanzhu-ui-vue3/src/views/trouble/problemmodify/detailDrawer.vue
@@ -0,0 +1,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue b/yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue
index 0928f0f1..94f38566 100644
--- a/yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue
+++ b/yanzhu-ui-vue3/src/views/trouble/problemmodify/index.vue
@@ -3,7 +3,7 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {{ scope.$index + 1 + (queryParams.pageNum - 1) * queryParams.pageSize }}
+
+
- {{ parseTime(scope.row.nickedTime, '{y}-{m}-{d}') }}
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
-
-
+
- {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
-
-
-
-
-
-
-
-
-
- 修改
- 删除
+
+ 处理
+ 详情
+ 删除
-
+