bug修复

优化加解密问题
2025-06-23 17:13:54 +08:00 · 2025-06-19 15:10:30 +08:00 · 2025-03-03 11:54:50 +08:00
13 changed files with 304 additions and 173 deletions
--- a/api/project.js
+++ b/api/project.js
@ -74,9 +74,18 @@ export function getDictTableOption(data = {}) {
 }

 // 监理单位-下拉
+// export function selectSupervisionUnit(data = {}) {
+//   return request({
+//     url: '/system/select/selectSupervisionUnit',
+//     method: 'post',
+//     data
+//   })
+// }
+
+// 2025-3-4 更换接口 原接口无数据 已同步与web端一致
 export function selectSupervisionUnit(data = {}) {
  return request({
-    url: '/system/select/selectSupervisionUnit',
+    url: '/system/select/selectSupervisionUnitUser',
    method: 'post',
    data
  })
@ -516,7 +525,7 @@ export function checkIsExistProName(data) {
 export function getQxToken() {
  return request({
    url: '/schedule/job/getQxToken',
-    method: 'get',
+    method: 'get'
  })
 }

--- a/config.js
+++ b/config.js
@ -1,16 +1,20 @@
 // 应用全局配置
 module.exports = {
  // baseUrl: 'https://vue.ruoyi.vip/prod-api',
-  baseUrl: 'http://218.21.27.6:1999/prod-api', // 正式环境
-  // baseUrl: 'http://192.168.0.14:21626/prod-api', // 测试环境
+  // baseUrl: 'http://218.21.27.6:1999/prod-api', // 正式环境
+  baseUrl: 'http://192.168.0.14:21626/nxdt-api', // 测试环境
+  // baseUrl: 'http://192.168.0.60:18080', // 赵福海
  // baseUrl: 'http://192.168.0.58:19090', // 杰
  // baseUrl: 'http://192.168.0.176:18080', // 强
+  // baseUrl: 'http://192.168.0.38:18080', // 强
  // fileUrl: 'http://192.168.0.14:21626/file/statics/', // 测试环境
+  fileUrl: 'http://192.168.0.14:1999/file/statics/', // 测试环境
  // fileUrl2: 'http://192.168.0.14:21626/file/statics', // 测试环境
+  fileUrl2: 'http://192.168.0.14:1999/file/statics', // 测试环境
  // 课件: 文件视频路径
  coursewareUrl: 'http://192.168.0.14:9090/nxdt-courseware',
-  fileUrl: 'http://218.21.27.6:1999/file/statics/', // 产线环境
-  fileUrl2: 'http://218.21.27.6:1999/file/statics', // 产线环境
+  // fileUrl: 'http://218.21.27.6:1999/file/statics/', // 产线环境
+  // fileUrl2: 'http://218.21.27.6:1999/file/statics', // 产线环境
  // baseUrl: 'http://localhost:8080',
  // 应用信息
  appInfo: {
@ -36,7 +40,7 @@ module.exports = {
        url: ''
      }
    ]
-  },
+  }
  // devServer: {
  //   disableHostCheck: true,
  //   proxy: {
--- a/manifest.json
+++ b/manifest.json
@ -1,10 +1,11 @@
 {
    "name" : "宁夏电投二期",
-    "appid" : "__UNI__9ED2404",
+    "appid" : "__UNI__92EF0C0",
    "description" : "",
    "versionName" : "1.1.0",
    "versionCode" : "100",
    "transformPx" : false,
+    "sassImplementationName" : "node-sass",
    "app-plus" : {
        "usingComponents" : true,
        "nvueCompiler" : "uni-app",
@ -65,6 +66,38 @@
                    }
                },
                "maps" : {}
+            },
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
            }
        }
    },
--- a/pages/delayRectificationApproval/index.vue
+++ b/pages/delayRectificationApproval/index.vue
@ -22,7 +22,7 @@
          <div class="list-btn">
            <div><u-button type="primary" size="mini" @click="handleSeeEdit(1, item)">查看</u-button></div>
            <div>
-              <u-button v-if="item.status == '1'" type="primary" size="mini" @click="handleSeeEdit(2, item)">
+              <u-button v-if="item.intoStatus == '1'" type="primary" size="mini" @click="handleSeeEdit(2, item)">
                审批
              </u-button>
            </div>
--- a/pages/hiddenDangerRectificationApproval/index.vue
+++ b/pages/hiddenDangerRectificationApproval/index.vue
@ -22,7 +22,7 @@
          <div class="list-btn">
            <div><u-button type="primary" size="mini" @click="handleSeeEdit(1, item)">查看</u-button></div>
            <div>
-              <u-button v-if="item.status == '1'" type="primary" size="mini" @click="handleSeeEdit(2, item)">
+              <u-button v-if="item.intoStatus == '1'" type="primary" size="mini" @click="handleSeeEdit(2, item)">
                审批
              </u-button>
            </div>
--- a/pages/newProject/index.vue
+++ b/pages/newProject/index.vue
@ -9,7 +9,9 @@
            <span class="line"></span>
            <span class="title">工程基本信息</span>
          </div>
-          <div v-if="formData.projectTypeId == 2"><u-button text="新建" type="primary" size="mini" @click="addSupervision"></u-button></div>
+          <div v-if="formData.projectTypeId == 2">
+            <u-button text="新建" type="primary" size="mini" @click="addSupervision"></u-button>
+          </div>
        </div>

        <!-- 表单 -->
--- a/pages/randomlySnapPicture/addSnapPhoto.vue
+++ b/pages/randomlySnapPicture/addSnapPhoto.vue
@ -18,32 +18,48 @@
              isLink
              :label="formData.proName ? '' : '请选择工程名称'"
              @click="showPicker1 = true"
-              :disabled="opt.type === 'view'"
+              :disabled="opt.pageType === 'view'"
            ></u-cell>
          </u-cell-group>
        </u-form-item>
        <u-form-item label="问题描述" prop="description" required>
-          <u-textarea v-model="formData.description" clearable placeholder="请输入问题描述" @blur="filter"  :disabled="opt.type === 'view'"/>
+          <u-textarea
+            v-model="formData.description"
+            clearable
+            placeholder="请输入问题描述"
+            @blur="filter"
+            :disabled="opt.pageType === 'view'"
+          />
        </u-form-item>
-        <u-form-item label="照片" prop="photoList">
+        <u-form-item label="照片" prop="photoType" required>
          <uni-file-picker
-            v-model="formData.photoList"
+            v-model="photoType"
            :auto-upload="false"
            ref="files"
            limit="9"
            @select="selectImg"
            @delete="deleteImg"
-            :readonly="opt.type === 'view'"
+            :readonly="opt.pageType === 'view'"
          />
        </u-form-item>
      </u-form>
-      <u-button class="btn" type="primary" shape="circle" v-if="opt.type !== 'view'" @click="submitForm">
-        提交
-      </u-button>
-      <u-button class="btn" v-if="opt.type === 'edit' && opt.status === '已保存'" type="primary" shape="circle" @click="changeStatus(2)">
+      <u-button class="btn" type="primary" shape="circle" v-if="opt.type !== 'view'" @click="submitForm">提交</u-button>
+      <u-button
+        class="btn"
+        v-if="opt.pageType === 'edit' && opt.status === '已保存'"
+        type="primary"
+        shape="circle"
+        @click="changeStatus(2)"
+      >
        转违章
      </u-button>
-      <u-button class="btn" v-if="opt.type === 'edit' && opt.status === '已保存'" type="primary" shape="circle" @click="changeStatus(3)">
+      <u-button
+        class="btn"
+        v-if="opt.pageType === 'edit' && opt.status === '已保存'"
+        type="primary"
+        shape="circle"
+        @click="changeStatus(3)"
+      >
        转隐患
      </u-button>
    </div>
@ -79,16 +95,18 @@ export default {
      formData: {
        proName: '', // 工程名称
        proId: '', // 工程id
-        description: '', // 检查级别-显示
-        photoList: [], // 照片
-        photoType: [] // 照片-上传
+        description: '' // 检查级别-显示
+        // photoList: [] // 照片
+        // photoType: [] // 照片-上传
      },
      // 工程-下拉
      proOptions: [],
      rules: {
        proName: { required: true, message: '请输入检查标题', trigger: ['blur'] },
-        description: [{ required: true, message: '请输入问题描述', trigger: ['blur', 'change'] }],
+        description: [{ required: true, message: '请输入问题描述', trigger: ['blur', 'change'] }]
+        // photoType: [{ required: true, message: '请添加照片', trigger: ['blur', 'change'] }]
      },
+      photoType: []
    }
  },
  onLoad(opt) {
@ -96,12 +114,17 @@ export default {
    console.log('🚀 ~ onLoad ~ this.opt:', this.opt)
    this.token = uni.getStorageSync('App-Token')
    this.getProOptions()
-    if (this.opt.type === 'edit' || this.opt.type === 'view') {
+    if (this.opt.pageType === 'edit' || this.opt.pageType === 'view') {
      this.formData = this.opt
-      this.formData.photoList.forEach(item => {
-        item.filePath = item.url = config.fileUrl + item.filePath
+      // this.formData.photoType = []
+      this.photoType = JSON.parse(opt.params).photoList
+
+      if (this.photoType.length > 0) {
+        this.photoType.forEach(item => {
+          item.url = config.fileUrl + item.filePath
        })
      }
+    }
  },
  methods: {
    filter() {
@ -125,9 +148,11 @@ export default {
    },
    selectImg(e) {
      console.log('🚀 ~ selectImg ~ e:', e)
-      e.tempFiles.forEach(item => {
-        this.formData.photoList.push(item)
-      })
+      // e.tempFiles.forEach(item => {
+      //   this.formData.photoList.push(item)
+      // })
+
+      this.upload(e.tempFiles[0].path)
    },
    upload(path) {
      console.log('🚀 ~ upload ~ path:', path)
@ -142,21 +167,48 @@ export default {
          tokenType: 'APP'
        },
        success: res => {
-          console.log('🚀 ~ upload ~ res:', res)
-          console.log(decryptCBC(JSON.parse(res.data).data))
-          this.formData.photoType.push(JSON.parse(res.data).data[0])
-          console.log('🚀 ~ upload ~ this.formData.photoType:', this.formData.photoType)
+          // console.log('上传成功-----', res)
+          // console.log(decryptCBC(JSON.parse(res.data).data))
+
+          const data = JSON.parse(res.data).data[0]
+
+          console.log('data-----', data)
+          // this.formData.photoType.push(JSON.parse(res.data).data[0])
+
+          // console.log(this.formData.photoType, ' this.formData.photoType')
+          this.photoType.push({
+            ...data,
+            url: config.fileUrl + data.filePath
+          })
+          this.formData.photoList.push({
+            ...data,
+            url: config.fileUrl + data.filePath
+          })
+          // console.log('🚀 ~ upload ~ this.formData.photoType:', this.formData.photoType)
        },
        fail: err => {
          console.log('🚀 ~ upload ~ err:', err)
+
+          uni.showToast({
+            title: '上传失败',
+            icon: 'none',
+            duration: 500
+          })
        }
      })
    },
    deleteImg(e) {
-      this.formData.photoList.splice(e.index, 1)
+      console.log(e, '删除----')
+      // this.formData.photoType.splice(e.index, 1)
+      // this.formData.photoType = this.formData.photoType.filter(item => item.uuid !== e.uuid)
+
+      this.photoType = this.photoType.filter(item => item.filePath !== e.tempFile.filePath)
+      this.formData.photoList = this.formData.photoList.filter(item => item.filePath !== e.tempFile.filePath)
+
+      // console.log(this.formData.photoType, '删除----')
    },
    async submitForm() {
-      if (!this.formData.photoList.length) {
+      if (!this.photoType.length) {
        uni.showToast({
          title: '请添加照片',
          icon: 'none',
@ -168,29 +220,30 @@ export default {
      this.$refs.uForm
        .validate()
        .then(async valid => {
-          this.formData.photoType = []
-          // 调用上传
-          const uploadPromises = this.formData.photoList.map(item => {
-            console.log('🚀 ~ submitForm ~ item:', item)
-            if (item.uuid) {
-              return this.upload(item.path)
-            }
-            return Promise.resolve()
-          })
-
-          Promise.all(uploadPromises)
-            .then(() => {
-              // 所有上传操作完成后再提交
-              setTimeout(() => {
+          // this.formData.photoType = []
          this.submit()
-              }, 800)
-            })
-            .catch(error => {
-              // 处理上传失败的情况
-              console.error('上传失败', error)
-              this.isLoading = false
-              this.formData.photoType = []
-            })
+          // 调用上传
+          // const uploadPromises = this.formData.photoList.map(item => {
+          //   console.log('🚀 ~ submitForm ~ item:', item)
+          //   if (item.uuid) {
+          //     return this.upload(item.path)
+          //   }
+          //   return Promise.resolve()
+          // })
+
+          // Promise.all(uploadPromises)
+          //   .then(() => {
+          //     // 所有上传操作完成后再提交
+          //     setTimeout(() => {
+          //       this.submit()
+          //     }, 800)
+          //   })
+          //   .catch(error => {
+          //     // 处理上传失败的情况
+          //     console.error('上传失败', error)
+          //     this.isLoading = false
+          //     this.formData.photoType = []
+          //   })
        })
        .catch(() => {
          this.isLoading = false
@ -200,10 +253,14 @@ export default {
    async submit() {
      console.log('🚀 ~ submit ~ this.formData:', this.formData)
      try {
-        if (this.opt.type === 'edit') {
+        if (this.opt.pageType === 'edit') {
          this.formData.id = this.opt.id
        }
-        const res = await addSnapshotForm(this.formData)
+        const params = JSON.parse(JSON.stringify(this.formData))
+        params.photoType = params.photoList
+
+        console.log('提交参数---', params)
+        const res = await addSnapshotForm(params)
        console.log('🚀 ~ submit ~ res:', res)
        this.isLoading = false
        uni.showToast({
--- a/pages/randomlySnapPicture/index.vue
+++ b/pages/randomlySnapPicture/index.vue
@ -19,9 +19,17 @@
          <div class="list-item">问题描述：{{ item.description }}</div>
          <div class="list-item">状态：{{ item.status }}</div>
          <div class="list-btn">
-            <div><u-button type="primary" size="mini" v-if="item.status !== '已保存'" @click="handleSeeEdit(1, item)">查看</u-button></div>
-            <div><u-button type="primary" size="mini" v-if="item.status === '已保存'" @click="handleSeeEdit(2, item)">编辑</u-button></div>
-<!--            <div><u-button type="primary" size="mini" @click="handleAdd(item)">新增隐患</u-button></div>-->
+            <div>
+              <u-button type="primary" size="mini" v-if="item.status !== '已保存'" @click="handleSeeEdit(1, item)">
+                查看
+              </u-button>
+            </div>
+            <div>
+              <u-button type="primary" size="mini" v-if="item.status === '已保存'" @click="handleSeeEdit(2, item)">
+                编辑
+              </u-button>
+            </div>
+            <!--            <div><u-button type="primary" size="mini" @click="handleAdd(item)">新增隐患</u-button></div>-->
          </div>
        </div>
        <u-empty mode="data" v-if="tableList.length === 0"></u-empty>
@ -54,7 +62,7 @@ export default {
    chickIcon() {
      console.log('🚀 ~ 点击右侧按钮chickIcon')
      const params = {
-        type: 'add',
+        type: 'add'
      }
      uni.navigateTo({
        url: '/pages/randomlySnapPicture/addSnapPhoto?params=' + JSON.stringify(params)
@ -79,9 +87,9 @@ export default {
      console.log('🚀 ~ 查看编辑 ~ item:', item)
      let params = {}
      if (type === 1) {
-        params = { type: 'view', ...item }
+        params = { pageType: 'view', ...item }
      } else if (type === 2) {
-        params = { type: 'edit', ...item }
+        params = { pageType: 'edit', ...item }
      }
      uni.navigateTo({
        url: '/pages/randomlySnapPicture/addSnapPhoto?params=' + JSON.stringify(params)
--- a/pages/violationManagenment/violationPenalty.vue
+++ b/pages/violationManagenment/violationPenalty.vue
@ -21,7 +21,7 @@
          <div class="list-btn">
            <div><u-button type="primary" size="mini" @click="handleSeeEdit(1, item)">查看</u-button></div>
            <div>
-              <u-button v-if="item.status == '1'" type="primary" size="mini" @click="handleSeeEdit(2, item)">
+              <u-button v-if="item.intoStatus == '1'" type="primary" size="mini" @click="handleSeeEdit(2, item)">
                审批
              </u-button>
            </div>
--- a/store/modules/user.js
+++ b/store/modules/user.js
@ -42,6 +42,8 @@ const user = {
    Login({ commit }, userInfo) {
      const username = userInfo.username.trim()
      const password = userInfo.password
+
+      console.log('username', username, 'password', password)
      return new Promise((resolve, reject) => {
        login(username, password)
          .then(res => {
--- a/utils/aescbc.js
+++ b/utils/aescbc.js
@ -6,20 +6,20 @@ const cbc_iv = CryptoJS.enc.Utf8.parse('1234567812345678')
 * 默认参数需要加密
 * @type {boolean}
 */
-const  jia_mi=true;
+const jia_mi = true
 /**
 * 默认后台会自动加密
 * @type {boolean}
 */
-const  jie_mi=true;
+const jie_mi = true
 /**
 * 加密
 * @param word
 * @returns {string}
 */
-export const encryptCBC = function(word) {
-  if(!jia_mi){
-    return  word;
+export const encryptCBC = function (word) {
+  if (!jia_mi) {
+    return word
  }
  const srcs = CryptoJS.enc.Utf8.parse(word)
  const encrypted = CryptoJS.AES.encrypt(srcs, cbc_key, {
@ -34,9 +34,9 @@ export const encryptCBC = function(word) {
 * @param word
 * @returns {*}
 */
-export const decryptCBC = function(word) {
-  if(!jie_mi){
-    return  word;
+export const decryptCBC = function (word) {
+  if (!jie_mi) {
+    return word
  }
  const encrypted = CryptoJS.AES.decrypt(word, cbc_key, {
    iv: cbc_iv,
--- a/utils/bonus.js
+++ b/utils/bonus.js
@ -1,19 +1,17 @@
-
-export function lookFile(){
+export function lookFile() {
  // return  'http://192.168.0.14:21626/file/statics' //14服务器
  return 'http://218.21.27.6:1999/file/statics' //1.6演示服务器
 }
-export function lookFaceFile(){
+export function lookFaceFile() {
  // return 'http://192.168.0.14:21626/file/statics/' //14服务器
  // return 'http://192.168.2.76:18080/file/statics/'
  return 'http://218.21.27.6:1999/file/statics/' //1.6演示服务器
 }
-export function filePreview(){
+export function filePreview() {
  // return 'http://192.168.0.14:8012/onlinePreview?url=' //14服务器
  return 'http://218.21.27.6:18013/onlinePreview?url=' //1.6演示服务器
 }

-
 // lookFile: 'http://218.21.27.6:1999/nxnyback/statics',
 // filePreviewPath: 'http://218.21.27.6:8012/onlinePreview?url=',
 // lookFile: 'http://112.29.103.165:14413/file/statics',
@ -32,12 +30,15 @@ export function parseTime(time, pattern) {
  if (typeof time === 'object') {
    date = time
  } else {
-    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+    if (typeof time === 'string' && /^[0-9]+$/.test(time)) {
      time = parseInt(time)
    } else if (typeof time === 'string') {
-      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
+      time = time
+        .replace(new RegExp(/-/gm), '/')
+        .replace('T', ' ')
+        .replace(new RegExp(/\.[\d]{3}/gm), '')
    }
-    if ((typeof time === 'number') && (time.toString().length === 10)) {
+    if (typeof time === 'number' && time.toString().length === 10) {
      time = time * 1000
    }
    date = new Date(time)
@ -54,7 +55,9 @@ export function parseTime(time, pattern) {
  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
    let value = formatObj[key]
    // Note: getDay() returns 0 on Sunday
-    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
+    if (key === 'a') {
+      return ['日', '一', '二', '三', '四', '五', '六'][value]
+    }
    if (result.length > 0 && value < 10) {
      value = '0' + value
    }
@ -66,89 +69,92 @@ export function parseTime(time, pattern) {
 // 表单重置
 export function resetForm(refName) {
  if (this.$refs[refName]) {
-    this.$refs[refName].resetFields();
+    this.$refs[refName].resetFields()
  }
 }

 // 添加日期范围
 export function addDateRange(params, dateRange, propName) {
-  let search = params;
-  search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
-  dateRange = Array.isArray(dateRange) ? dateRange : [];
-  if (typeof (propName) === 'undefined') {
-    search.params['beginTime'] = dateRange[0];
-    search.params['endTime'] = dateRange[1];
+  let search = params
+  search.params =
+    typeof search.params === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {}
+  dateRange = Array.isArray(dateRange) ? dateRange : []
+  if (typeof propName === 'undefined') {
+    search.params['beginTime'] = dateRange[0]
+    search.params['endTime'] = dateRange[1]
  } else {
-    search.params['begin' + propName] = dateRange[0];
-    search.params['end' + propName] = dateRange[1];
+    search.params['begin' + propName] = dateRange[0]
+    search.params['end' + propName] = dateRange[1]
  }
-  return search;
+  return search
 }

 // 回显数据字典
 export function selectDictLabel(datas, value) {
  if (value === undefined) {
-    return "";
+    return ''
  }
-  var actions = [];
-  Object.keys(datas).some((key) => {
-    if (datas[key].value == ('' + value)) {
-      actions.push(datas[key].label);
-      return true;
+  var actions = []
+  Object.keys(datas).some(key => {
+    if (datas[key].value == '' + value) {
+      actions.push(datas[key].label)
+      return true
    }
  })
  if (actions.length === 0) {
-    actions.push(value);
+    actions.push(value)
  }
-  return actions.join('');
+  return actions.join('')
 }

 // 回显数据字典（字符串、数组）
 export function selectDictLabels(datas, value, separator) {
-  if (value === undefined || value.length ===0) {
-    return "";
+  if (value === undefined || value.length === 0) {
+    return ''
  }
  if (Array.isArray(value)) {
-    value = value.join(",");
+    value = value.join(',')
  }
-  var actions = [];
-  var currentSeparator = undefined === separator ? "," : separator;
-  var temp = value.split(currentSeparator);
-  Object.keys(value.split(currentSeparator)).some((val) => {
-    var match = false;
-    Object.keys(datas).some((key) => {
-      if (datas[key].value == ('' + temp[val])) {
-        actions.push(datas[key].label + currentSeparator);
-        match = true;
+  var actions = []
+  var currentSeparator = undefined === separator ? ',' : separator
+  var temp = value.split(currentSeparator)
+  Object.keys(value.split(currentSeparator)).some(val => {
+    var match = false
+    Object.keys(datas).some(key => {
+      if (datas[key].value == '' + temp[val]) {
+        actions.push(datas[key].label + currentSeparator)
+        match = true
      }
    })
    if (!match) {
-      actions.push(temp[val] + currentSeparator);
+      actions.push(temp[val] + currentSeparator)
    }
  })
-  return actions.join('').substring(0, actions.join('').length - 1);
+  return actions.join('').substring(0, actions.join('').length - 1)
 }

 // 字符串格式化(%s )
 export function sprintf(str) {
-  var args = arguments, flag = true, i = 1;
+  var args = arguments,
+    flag = true,
+    i = 1
  str = str.replace(/%s/g, function () {
-    var arg = args[i++];
+    var arg = args[i++]
    if (typeof arg === 'undefined') {
-      flag = false;
-      return '';
+      flag = false
+      return ''
    }
-    return arg;
-  });
-  return flag ? str : '';
+    return arg
+  })
+  return flag ? str : ''
 }

 // 转换字符串，undefined,null等转化为""
 export function parseStrEmpty(str) {
-  if (!str || str == "undefined" || str == "null") {
-    return "";
+  if (!str || str == 'undefined' || str == 'null') {
+    return ''
  }
-  return str;
+  return str
 }

 // 数据合并
@ -156,16 +162,16 @@ export function mergeRecursive(source, target) {
  for (var p in target) {
    try {
      if (target[p].constructor == Object) {
-        source[p] = mergeRecursive(source[p], target[p]);
+        source[p] = mergeRecursive(source[p], target[p])
      } else {
-        source[p] = target[p];
+        source[p] = target[p]
      }
    } catch (e) {
-      source[p] = target[p];
+      source[p] = target[p]
    }
  }
-  return source;
-};
+  return source
+}

 /**
 * 构造树型结构数据
@ -179,65 +185,65 @@ export function handleTree(data, id, parentId, children) {
    id: id || 'id',
    parentId: parentId || 'parentId',
    childrenList: children || 'children'
-  };
+  }

-  var childrenListMap = {};
-  var nodeIds = {};
-  var tree = [];
+  var childrenListMap = {}
+  var nodeIds = {}
+  var tree = []

  for (let d of data) {
-    let parentId = d[config.parentId];
+    let parentId = d[config.parentId]
    if (childrenListMap[parentId] == null) {
-      childrenListMap[parentId] = [];
+      childrenListMap[parentId] = []
    }
-    nodeIds[d[config.id]] = d;
-    childrenListMap[parentId].push(d);
+    nodeIds[d[config.id]] = d
+    childrenListMap[parentId].push(d)
  }

  for (let d of data) {
-    let parentId = d[config.parentId];
+    let parentId = d[config.parentId]
    if (nodeIds[parentId] == null) {
-      tree.push(d);
+      tree.push(d)
    }
  }

  for (let t of tree) {
-    adaptToChildrenList(t);
+    adaptToChildrenList(t)
  }

  function adaptToChildrenList(o) {
    if (childrenListMap[o[config.id]] !== null) {
-      o[config.childrenList] = childrenListMap[o[config.id]];
+      o[config.childrenList] = childrenListMap[o[config.id]]
    }
    if (o[config.childrenList]) {
      for (let c of o[config.childrenList]) {
-        adaptToChildrenList(c);
+        adaptToChildrenList(c)
      }
    }
  }
-  return tree;
+  return tree
 }

 /**
-* 参数处理
-* @param {*} params  参数
-*/
+ * 参数处理
+ * @param {*} params  参数
+ */
 export function tansParams(params) {
  let result = ''
  for (const propName of Object.keys(params)) {
-    const value = params[propName];
-    var part = encodeURIComponent(propName) + "=";
-    if (value !== null && value !== "" && typeof (value) !== "undefined") {
+    const value = params[propName]
+    var part = encodeURIComponent(propName) + '='
+    if (value !== null && value !== '' && typeof value !== 'undefined') {
      if (typeof value === 'object') {
        for (const key of Object.keys(value)) {
-          if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
-            let params = propName + '[' + key + ']';
-            var subPart = encodeURIComponent(params) + "=";
-            result += subPart + encodeURIComponent(value[key]) + "&";
+          if (value[key] !== null && value[key] !== '' && typeof value[key] !== 'undefined') {
+            let params = propName + '[' + key + ']'
+            var subPart = encodeURIComponent(params) + '='
+            result += subPart + encodeURIComponent(value[key]) + '&'
          }
        }
      } else {
-        result += part + encodeURIComponent(value) + "&";
+        result += part + encodeURIComponent(value) + '&'
      }
    }
  }
@ -266,12 +272,14 @@ export function indexContinuous(num, size) {
 */
 export function hideSensitiveInfo(info) {
  // 假设只显示前三位和后四位，中间用星号代替
-  if (info.length === 11) { // 手机号
-    return info.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
-  } else if (info.length === 18) { // 身份证号
-    return info.replace(/(\d{4})\d{10}(\w{4})/, '$1**********$2');
+  if (info.length === 11) {
+    // 手机号
+    return info.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2')
+  } else if (info.length === 18) {
+    // 身份证号
+    return info.replace(/(\d{4})\d{10}(\w{4})/, '$1**********$2')
  } else {
-    return info; // 其他情况，直接返回原始信息
+    return info // 其他情况，直接返回原始信息
  }
 }

@ -284,7 +292,7 @@ export function getFileData(fileList) {
  return Promise.all(fileList.filter(item => item?.hasOwnProperty('raw')).map(item => item.raw))
 }

-export function getParams(){
+export function getParams() {
  return {
    proId: this.$store.state.user.thisIds.proId,
    supUuid: this.$store.state.user.thisIds.supUuid,
@ -293,8 +301,8 @@ export function getParams(){
    subUuid: this.$store.state.user.thisIds.subUuid,
    userType: this.$store.state.user.userType,
    uuid: this.$store.state.user.thisIds.uuid,
-    parentUuid : this.$store.state.user.thisIds.parentUuid
-  };
+    parentUuid: this.$store.state.user.thisIds.parentUuid
+  }
 }

 /**
--- a/utils/request.js
+++ b/utils/request.js
@ -85,13 +85,21 @@ const request = config => {
        dataType: 'json'
      })
      .then(response => {
-        // console.log('🚀 ~ request ~ response:', response)
+        console.log('🚀 ~ request ~ response:-------------', response)
        if (!response[1]) {
          toast('系统异常, 请联系管理员')
          reject('系统异常, 请联系管理员')
          return
        }
-        let res = JSON.parse(decryptCBC(response[1].data.data))
+        let res = null
+        if (typeof response[1].data.decrypt != 'undefined' && response[1].data.decrypt) {
+          res = JSON.parse(decryptCBC(response[1].data.data))
+        } else {
+          res = decryptCBC(response[1].data)
+        }
+
+        console.log('处理之后的res', res)
+        // let res = JSON.parse(decryptCBC(response[1].data.data))
        // console.log('🚀 ~ request ~ 返回数据-data:', res)
        if (res.code === 200) {
          resolve(res)
Author	SHA1	Message	Date
BianLzhaoMin	6d91392695	bug修复	2025-06-23 17:13:54 +08:00
BianLzhaoMin	76e162abd4	bug修复	2025-06-19 15:10:30 +08:00
BianLzhaoMin	ab6c20aa6f	优化加解密问题	2025-03-03 11:54:50 +08:00