vue2-client 1.20.19 → 1.20.21

package/src/base-client/components/common/XInspectionDetailDrawer/components/HazardPhotos.vue

@@ -112,6 +112,7 @@
 
 <script>
 import { FileImageGroup } from '@vue2-client/base-client/components/common/FileImage'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
 
 export default {
   name: 'HazardPhotos',
@@ -127,7 +128,51 @@ export default {
       default: () => []
     }
   },
+  data () {
+    return {
+      hazardLevelConfig: []
+    }
+  },
   methods: {
+    /**
+     * 加载隐患等级配置
+     */
+    async loadHazardLevelConfig () {
+      try {
+        const config = await getConfigByNameAsync('riskLevelConfig', 'af-system')
+        this.hazardLevelConfig = config?.riskLevel || []
+      } catch (e) {
+        console.warn('[HazardPhotos] 加载隐患等级配置失败:', e)
+        this.hazardLevelConfig = []
+      }
+    },
+
+    /**
+     * 获取隐患等级文本
+     * 优先使用 hazardLevelConfig（格式: [{value: "紧急隐患", result: "级别4"}, ...]）
+     * 如果配置为空则使用默认映射
+     */
+    getHazardLevelText (level) {
+      // 优先使用配置的映射
+      if (this.hazardLevelConfig && this.hazardLevelConfig.length > 0) {
+        const item = this.hazardLevelConfig.find(r => r.value === level)
+        if (item) return item.result || level
+      }
+      // 配置为空时使用默认映射
+      const textMap = {
+        紧急隐患: '紧急隐患',
+        重大隐患: '重大隐患',
+        中等隐患: '中等隐患',
+        一般隐患: '一般隐患',
+        其他隐患: '其他隐患',
+        urgent: '紧急隐患',
+        major: '重大隐患',
+        medium: '中等隐患',
+        minor: '一般隐患'
+      }
+      return textMap[level] || '其他隐患'
+    },
+
     /**
      * 获取Ant Design Vue Tag颜色
      */
@@ -161,32 +206,16 @@ export default {
         minor: 'info-circle'
       }
       return iconMap[level] || 'warning'
-    },
-
-    /**
-     * 获取隐患等级文本
-     */
-    getHazardLevelText (level) {
-      const textMap = {
-        紧急隐患: '紧急隐患',
-        重大隐患: '重大隐患',
-        中等隐患: '中等隐患',
-        一般隐患: '一般隐患',
-        其他隐患: '其他隐患',
-        urgent: '紧急隐患',
-        major: '重大隐患',
-        medium: '中等隐患',
-        minor: '一般隐患'
-      }
-      return textMap[level] || '其他隐患'
     }
+  },
+  mounted() {
+    this.loadHazardLevelConfig()
   }
 }
 </script>
 
 <style lang="less" scoped>
 .hazard-photos {
-  border: 1px solid #f0f0f0;
   border-radius: 8px;
   background: white;
   height: 100%;

package/src/base-client/components/common/XInspectionDetailDrawer/services/inspectionService.js

@@ -424,9 +424,10 @@ class InspectionService {
       if (Array.isArray(item.value)) {
         item.value.forEach((pd, i) => {
           if (typeof pd === 'object' && (pd.id || pd.url)) {
+            const fileId = pd.id || pd
             photos.push({
               id: pd.id || `${item.itemname}_files_${i + 1}`,
-              fileId: pd,
+              fileId,
               url: pd.url,
               title: item.itemname,
               description: pd.f_real_name || `${item.itemname} (${i + 1}/${item.value.length})`
@@ -436,9 +437,10 @@ class InspectionService {
       }
     } else if (Array.isArray(item.f_defect_paths) && item.f_defect_paths.length) {
       item.f_defect_paths.forEach((pd, i) => {
+        const fileId = typeof pd === 'object' ? (pd.id || pd) : pd
         photos.push({
-          id: typeof pd === 'object' ? pd.id : pd,
-          fileId: pd,
+          id: typeof pd === 'object' ? (pd.id || i) : pd,
+          fileId,
           title: item.itemname,
           description: `${item.itemname} - 隐患照片 ${i + 1}`
         })

package/src/base-client/components/common/XStepView/XStepView.vue

@@ -1,252 +1,252 @@
-<template>
-  <div>
-    <a-row type="flex">
-      <a-col :span="stepStyle.flex">
-        <a-steps
-          :type="stepStyle.type"
-          :current="current"
-          :direction="stepStyle.direction"
-          :labelPlacement="stepStyle.labelPlacement"
-          :progressDot="stepStyle.false"
-          :size="stepStyle.size"
-          :initial="initial"
-          :status="status"
-          @chaneg="onChange"
-        >
-          <a-step
-            v-for="(item, index) in this.configContent.step.steps"
-            :key="'step-'+item.name"
-            :title="item.title"
-            :description="item.description"
-            :sub-title="item.subTitle"
-            :disabled="item.disabled">
-            <a-icon v-if="current === index" slot="icon" :type="iconType" />
-          </a-step>
-        </a-steps>
-      </a-col>
-      <a-col :span="panelStyle.flex">
-        <template v-for="(item, index) in this.configContent.step.steps">
-          <a-card
-            v-if="current === index"
-            :bordered="false"
-            :key="'stepCard-'+item.name">
-            <template v-if="item.content.card.type === 'text'">
-              <p>{{ item.content.card.value }}</p>
-            </template>
-            <x-add-native-form v-else-if="item.content.card.type === 'form'" :ref="'XAddNativeForm'+ item.name" @onSubmit="submit"/>
-            <x-table v-else-if="item.content.card.type === 'table'" :fixed-query-form="item.content.card.queryFrom" @action="action" :query-params-name="item.content.card.queryParamsName" :ref="'XAddNativeForm'+item.name" />
-            <a-button v-if="status === 'error'" @click="success" style="color: v-bind()">下一步</a-button>
-          </a-card>
-        </template>
-      </a-col>
-    </a-row>
-  </div>
-</template>
-
-<script>
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import { post } from '@vue2-client/services/api'
-import XTable from '@vue2-client/base-client/components/common/XTable/XTable.vue'
-
-export default {
-  name: 'XStepView',
-  components: { XTable, XAddNativeForm },
-  computed: {
-    stepStyle () {
-      const style = this.configContent.step.style
-      if (style) {
-        return style
-      } else {
-        return {
-          flex: 5,
-          type: 'default',
-          progressDot: 'false',
-          direction: 'horizontal',
-          labelPlacement: 'horizontal',
-          size: 'default',
-        }
-      }
-    },
-    panelStyle () {
-      const style = this.configContent.panelStyle
-      if (style) {
-        return style
-      } else {
-        return {
-          flex: 19
-        }
-      }
-    }
-
-  },
-  props: {
-    params: {
-      type: Object,
-      required: true,
-    },
-    configContent: {
-      type: Object,
-      required: true,
-    }
-  },
-  data () {
-    return {
-      current: -1,
-      initial: 0,
-      status: 'wait',
-      iconType: 'loading',
-      timeOut: undefined
-    }
-  },
-  watch: {
-    async current (newValue) {
-      this.changeIcon()
-      if (this.timeOut !== undefined) { window.clearTimeout(this.timeOut) }
-
-      const setpes = this.configContent.step.steps[newValue]
-      const type = setpes.content.card.type
-      const formValue = setpes.content.card.value
-      console.warn('formValue = ', formValue)
-      if (setpes.before) {
-        const postName = setpes.before.name.split('@')
-        this.timeOut = window.setTimeout(() => {
-          post('/api/af-system/' + postName[0] + '/' + postName[1], setpes.before.params).then(res => {
-            console.warn(setpes.before.name + '执行结果', res)
-            if (res.code === 200) {
-              window.clearInterval(this.timeOut)
-              this.success()
-            } else {
-              setpes.content.card.value = res.msg
-            }
-          }).catch(e => {
-            console.warn(setpes.before.name + '执行结果', e)
-            window.clearInterval(this.timeOut)
-            this.error()
-          })
-        }, 10 * 1000)
-      }
-      if (type === 'form') {
-        this.$nextTick(() => {
-          const stepsss = this.$refs['XAddNativeForm' + setpes.name][0]
-          stepsss.init({
-            formItems: formValue
-          })
-        })
-      } else if (type === 'table') {
-        console.warn('formValue = ', formValue)
-        this.$nextTick(() => {
-          const stepsss = this.$refs['XAddNativeForm' + setpes.name][0]
-          stepsss.init({
-            tableColumns: formValue,
-            buttonState: {
-              add: false,
-              edit: true,
-              delete: false,
-              import: false,
-              export: false
-            }
-          })
-        })
-      } else {
-        if (setpes.run) {
-          post('/api/af-system/logic/' + setpes.run.name, setpes.run.params).then(t => {
-            console.warn(setpes.run.name + '执行结果', t)
-            if (t.code === 200) {
-              this.success()
-            } else {
-              setpes.content.card.value = t.msg
-            }
-          }).catch(e => {
-            console.warn(setpes.run.name + '执行结果', e)
-            this.error()
-          })
-        }
-      }
-    }
-  },
-  mounted () {
-    let paramsStr = JSON.stringify(this.configContent.step)
-    for (const item in this.params) {
-      const regex = new RegExp('\\$\\{' + item + '\\}', 'g')
-      paramsStr = paramsStr.replace(regex, this.params[item])
-    }
-    const params = JSON.parse(paramsStr)
-    this.init({ step: params })
-    this.current++
-  },
-  methods: {
-    init (params) {
-      const {
-        style,
-        panel,
-        step
-      } = params
-      if (style) {
-        this.stepStyle = style
-      }
-      if (panel) {
-        this.panelStyle = panel
-      }
-      if (step) {
-        this.configContent.step = step
-      }
-    },
-    steps () {
-      return this.steps
-    },
-    onChange (current) {
-      this.current = current
-    },
-    submit (res) {
-      console.warn('res', res)
-      const setpes = this.configContent.step.steps[this.current]
-      if (setpes.run) {
-        post('/api/af-system/logic/' + setpes.run.name, res.realForm).then(t => {
-          console.warn(setpes.run.name + '执行结果', t)
-          if (t.code === 200) {
-            this.success()
-          }
-        }).catch(e => {
-          console.warn(setpes.run.name + '执行结果', e)
-          this.error()
-        })
-      }
-    },
-    error () {
-      this.status = 'error'
-      this.iconType = 'close-circle'
-    },
-    success () {
-      this.changeIcon()
-
-      this.current++
-    },
-    changeIcon () {
-      this.status = 'wait'
-      this.iconType = 'loading'
-    },
-    previous () {
-      this.current--
-    },
-    action (record, id, actionType) {
-      console.warn('record', record)
-      console.warn('id', id)
-      console.warn('actionType', actionType)
-      const setpes = this.configContent.step.steps[this.current]
-      if (setpes.run) {
-        post('/api/af-system/logic/' + setpes.run.name, { data: record }).then(t => {
-          console.warn(setpes.run.name + '执行结果', t)
-          if (t.code === 200) {
-            this.success()
-          }
-        }).catch(e => {
-          console.warn(setpes.run.name + '执行结果', e)
-          this.error()
-        })
-      }
-    }
-  },
-}
-</script>
-
-<style lang="less" scoped></style>
+<template>
+  <div>
+    <a-row type="flex">
+      <a-col :span="stepStyle.flex">
+        <a-steps
+          :type="stepStyle.type"
+          :current="current"
+          :direction="stepStyle.direction"
+          :labelPlacement="stepStyle.labelPlacement"
+          :progressDot="stepStyle.false"
+          :size="stepStyle.size"
+          :initial="initial"
+          :status="status"
+          @chaneg="onChange"
+        >
+          <a-step
+            v-for="(item, index) in this.configContent.step.steps"
+            :key="'step-'+item.name"
+            :title="item.title"
+            :description="item.description"
+            :sub-title="item.subTitle"
+            :disabled="item.disabled">
+            <a-icon v-if="current === index" slot="icon" :type="iconType" />
+          </a-step>
+        </a-steps>
+      </a-col>
+      <a-col :span="panelStyle.flex">
+        <template v-for="(item, index) in this.configContent.step.steps">
+          <a-card
+            v-if="current === index"
+            :bordered="false"
+            :key="'stepCard-'+item.name">
+            <template v-if="item.content.card.type === 'text'">
+              <p>{{ item.content.card.value }}</p>
+            </template>
+            <x-add-native-form v-else-if="item.content.card.type === 'form'" :ref="'XAddNativeForm'+ item.name" @onSubmit="submit"/>
+            <x-table v-else-if="item.content.card.type === 'table'" :fixed-query-form="item.content.card.queryFrom" @action="action" :query-params-name="item.content.card.queryParamsName" :ref="'XAddNativeForm'+item.name" />
+            <a-button v-if="status === 'error'" @click="success" style="color: v-bind()">下一步</a-button>
+          </a-card>
+        </template>
+      </a-col>
+    </a-row>
+  </div>
+</template>
+
+<script>
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { post } from '@vue2-client/services/api'
+import XTable from '@vue2-client/base-client/components/common/XTable/XTable.vue'
+
+export default {
+  name: 'XStepView',
+  components: { XTable, XAddNativeForm },
+  computed: {
+    stepStyle () {
+      const style = this.configContent.step.style
+      if (style) {
+        return style
+      } else {
+        return {
+          flex: 5,
+          type: 'default',
+          progressDot: 'false',
+          direction: 'horizontal',
+          labelPlacement: 'horizontal',
+          size: 'default',
+        }
+      }
+    },
+    panelStyle () {
+      const style = this.configContent.panelStyle
+      if (style) {
+        return style
+      } else {
+        return {
+          flex: 19
+        }
+      }
+    }
+
+  },
+  props: {
+    params: {
+      type: Object,
+      required: true,
+    },
+    configContent: {
+      type: Object,
+      required: true,
+    }
+  },
+  data () {
+    return {
+      current: -1,
+      initial: 0,
+      status: 'wait',
+      iconType: 'loading',
+      timeOut: undefined
+    }
+  },
+  watch: {
+    async current (newValue) {
+      this.changeIcon()
+      if (this.timeOut !== undefined) { window.clearTimeout(this.timeOut) }
+
+      const setpes = this.configContent.step.steps[newValue]
+      const type = setpes.content.card.type
+      const formValue = setpes.content.card.value
+      console.warn('formValue = ', formValue)
+      if (setpes.before) {
+        const postName = setpes.before.name.split('@')
+        this.timeOut = window.setTimeout(() => {
+          post('/api/af-system/' + postName[0] + '/' + postName[1], setpes.before.params).then(res => {
+            console.warn(setpes.before.name + '执行结果', res)
+            if (res.code === 200) {
+              window.clearInterval(this.timeOut)
+              this.success()
+            } else {
+              setpes.content.card.value = res.msg
+            }
+          }).catch(e => {
+            console.warn(setpes.before.name + '执行结果', e)
+            window.clearInterval(this.timeOut)
+            this.error()
+          })
+        }, 10 * 1000)
+      }
+      if (type === 'form') {
+        this.$nextTick(() => {
+          const stepsss = this.$refs['XAddNativeForm' + setpes.name][0]
+          stepsss.init({
+            formItems: formValue
+          })
+        })
+      } else if (type === 'table') {
+        console.warn('formValue = ', formValue)
+        this.$nextTick(() => {
+          const stepsss = this.$refs['XAddNativeForm' + setpes.name][0]
+          stepsss.init({
+            tableColumns: formValue,
+            buttonState: {
+              add: false,
+              edit: true,
+              delete: false,
+              import: false,
+              export: false
+            }
+          })
+        })
+      } else {
+        if (setpes.run) {
+          post('/api/af-system/logic/' + setpes.run.name, setpes.run.params).then(t => {
+            console.warn(setpes.run.name + '执行结果', t)
+            if (t.code === 200) {
+              this.success()
+            } else {
+              setpes.content.card.value = t.msg
+            }
+          }).catch(e => {
+            console.warn(setpes.run.name + '执行结果', e)
+            this.error()
+          })
+        }
+      }
+    }
+  },
+  mounted () {
+    let paramsStr = JSON.stringify(this.configContent.step)
+    for (const item in this.params) {
+      const regex = new RegExp('\\$\\{' + item + '\\}', 'g')
+      paramsStr = paramsStr.replace(regex, this.params[item])
+    }
+    const params = JSON.parse(paramsStr)
+    this.init({ step: params })
+    this.current++
+  },
+  methods: {
+    init (params) {
+      const {
+        style,
+        panel,
+        step
+      } = params
+      if (style) {
+        this.stepStyle = style
+      }
+      if (panel) {
+        this.panelStyle = panel
+      }
+      if (step) {
+        this.configContent.step = step
+      }
+    },
+    steps () {
+      return this.steps
+    },
+    onChange (current) {
+      this.current = current
+    },
+    submit (res) {
+      console.warn('res', res)
+      const setpes = this.configContent.step.steps[this.current]
+      if (setpes.run) {
+        post('/api/af-system/logic/' + setpes.run.name, res.realForm).then(t => {
+          console.warn(setpes.run.name + '执行结果', t)
+          if (t.code === 200) {
+            this.success()
+          }
+        }).catch(e => {
+          console.warn(setpes.run.name + '执行结果', e)
+          this.error()
+        })
+      }
+    },
+    error () {
+      this.status = 'error'
+      this.iconType = 'close-circle'
+    },
+    success () {
+      this.changeIcon()
+
+      this.current++
+    },
+    changeIcon () {
+      this.status = 'wait'
+      this.iconType = 'loading'
+    },
+    previous () {
+      this.current--
+    },
+    action (record, id, actionType) {
+      console.warn('record', record)
+      console.warn('id', id)
+      console.warn('actionType', actionType)
+      const setpes = this.configContent.step.steps[this.current]
+      if (setpes.run) {
+        post('/api/af-system/logic/' + setpes.run.name, { data: record }).then(t => {
+          console.warn(setpes.run.name + '执行结果', t)
+          if (t.code === 200) {
+            this.success()
+          }
+        }).catch(e => {
+          console.warn(setpes.run.name + '执行结果', e)
+          this.error()
+        })
+      }
+    }
+  },
+}
+</script>
+
+<style lang="less" scoped></style>

package/src/base-client/components/common/XStepView/index.js

@@ -1,3 +1,3 @@
-import XStepView from './XStepView.vue'
-
-export default XStepView
+import XStepView from './XStepView.vue'
+
+export default XStepView