吉安感知网项目-前端
shuishen
2026-02-03 a0ac0b1027c88df240efed42392a1c7f64d66f2d
Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
6 files modified
1 files added
2 files deleted
1036 ■■■■■ changed files
applications/task-work-order/src/main.js 55 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/styles/common/cockpit.scss 42 ●●●● patch | view | raw | blame | history
applications/task-work-order/src/styles/element/index.scss 9 ●●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/appConfiguration/inventory/接口文档.txt 537 ●●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/appConfiguration/materials/index.vue 67 ●●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/appConfiguration/materials/接口文档.txt 321 ●●●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue 1 ●●●● patch | view | raw | blame | history
applications/task-work-order/vite.config.mjs 2 ●●● patch | view | raw | blame | history
applications/task-work-order/src/main.js
@@ -17,7 +17,7 @@
import { language, messages } from './lang/'
import * as ElementPlusIconsVue from '@element-plus/icons-vue'
import ElementPlus from 'element-plus'
import 'element-plus/dist/index.css'
import 'element-plus/theme-chalk/src/index.scss'
import Avue from '@smallwei/avue'
import '@smallwei/avue/lib/index.css'
import crudCommon from '@/mixins/crud.js'
@@ -45,7 +45,7 @@
// 视频回放
import 'video.js/dist/video-js.css'
import "videojs-markers/dist/videojs.markers.css"
import 'videojs-markers/dist/videojs.markers.css'
// 业务组件
import tenantPackage from './views/system/tenantpackage.vue'
@@ -62,36 +62,35 @@
// 获取url中是否存在token
const urlParams = getUrlParams(window.location.href)
if (urlParams?.token && !localStorage.getItem("isReload")) {
    localStorage.setItem("isReload", true)
    // 设置cookie和localStorage
    setStore('saber-token', urlParams.token)
    setToken(urlParams.token)
    setRefreshToken(urlParams.token)
    // 设置用户信息,把大屏用户信息保存到localStorage
    let obj = {}
    obj = localStorage.getItem("bs_userInfo")
    obj = obj ? obj : localStorage.getItem("saber-userInfo")
    if (obj instanceof Object) {
        obj = obj.content
    } else {
        obj = JSON.parse(obj).content
    }
    setStore({ name: 'userInfo', content: obj })
    location.reload()
if (urlParams?.token && !localStorage.getItem('isReload')) {
    localStorage.setItem('isReload', true)
    // 设置cookie和localStorage
    setStore('saber-token', urlParams.token)
    setToken(urlParams.token)
    setRefreshToken(urlParams.token)
    // 设置用户信息,把大屏用户信息保存到localStorage
    let obj = {}
    obj = localStorage.getItem('bs_userInfo')
    obj = obj ? obj : localStorage.getItem('saber-userInfo')
    if (obj instanceof Object) {
        obj = obj.content
    } else {
        obj = JSON.parse(obj).content
    }
    setStore({ name: 'userInfo', content: obj })
    location.reload()
} else {
    if (localStorage.getItem("isReload")) {
        localStorage.removeItem("isReload")
    }
    if (localStorage.getItem('isReload')) {
        localStorage.removeItem('isReload')
    }
}
window.$crudCommon = crudCommon
window.axios = axios
window._ = _
const app = createApp(App)
for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
    app.component(key, component)
    app.component(key, component)
}
app.component('basicContainer', basicContainer)
app.component('welContainer', welContainer)
@@ -113,12 +112,12 @@
app.use(store)
app.use(router)
app.use(ElementPlus, {
    locale: messages[language],
    locale: messages[language],
})
app.use(Avue, {
    axios,
    calcHeight: 10,
    locale: messages[language],
    axios,
    calcHeight: 10,
    locale: messages[language],
})
app.use(avueUeditor, { axios })
app.use(NfDesignBase)
applications/task-work-order/src/styles/common/cockpit.scss
@@ -1028,18 +1028,6 @@
  }
}
.gd-tabs {
  .el-tabs__header {
    .el-tabs__item.is-active {
      color: #3247E5;
    }
    .el-tabs__active-bar {
      background: #3247E5;
    }
  }
}
.gd-dialog-table {
  background: transparent !important;
@@ -1188,6 +1176,35 @@
}
.gd-dialog-form {
  // 最后一排不需要设置 margin-bottom
  // border: 1px solid red;
  // 倒数第二个也设置为0
  // .el-col:nth-last-child(2) {
  //   margin-bottom: 0;
  // }
  // .el-col:nth-last-child(1) {
  //   margin-bottom: 0;
  // }
  // .el-form-item:nth-last-child(2) {
  //   margin-bottom: 0;
  // }
  //  .el-form-item:nth-last-child(1) {
  //   margin-bottom: 0;
  // }
  .gd-select {
    .el-select__wrapper {
      height: 36px;
    }
  }
  .gd-date-picker {
    height: 36px;
  }
  .gd-input {
    height: 36px;
  }
  .el-input,
  .el-input-number {
    min-width: 200px;
@@ -1199,6 +1216,7 @@
    .el-input__inner {
      text-align: left;
      color: #383874;
      &::placeholder {
        text-align: left;
applications/task-work-order/src/styles/element/index.scss
New file
@@ -0,0 +1,9 @@
$--colors: (
  'primary': (
    'base': #4C34FF,
  ),
);
@forward 'element-plus/theme-chalk/src/common/var.scss' with (
  $colors: $--colors,
);
applications/task-work-order/src/views/orderView/appConfiguration/inventory/接口文档.txt
File was deleted
applications/task-work-order/src/views/orderView/appConfiguration/materials/index.vue
@@ -11,24 +11,6 @@
                />
            </el-form-item>
            <!-- <el-form-item label="所属区划" prop="areaCode">
                <el-tree-select
                    class="gd-select gray"
                    popper-class="gd-tree-select-popper"
                    v-model="searchParams.areaCode"
                    node-key="id"
                    :props="treeSelectProps"
                    placeholder="请选择"
                    clearable
                    filterable
                    @change="handleSearch"
                    :check-strictly="true"
                    lazy
                    :load="loadRegionNode"
                    :render-after-expand="false"
                />
            </el-form-item> -->
            <el-form-item class="gd-search-actions">
                <el-button :icon="RefreshRight" @click="resetForm"></el-button>
                <el-button class="search-btn" :icon="Search" @click="handleSearch"></el-button>
@@ -59,7 +41,6 @@
                            {{ getDictLabel(String(row.isAllScenario), dictObj.isAllScenario) }}
                        </template>
                    </el-table-column>
                    <!-- <el-table-column prop="areaName" show-overflow-tooltip label="所属区域" /> -->
                    <el-table-column label="操作" class-name="operation-btns" width="200">
                        <template v-slot="{ row }">
                            <el-link type="primary" @click="openForm('view', row)">查看</el-link>
@@ -91,13 +72,12 @@
import { onMounted, ref, provide, nextTick } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import FormDiaLog from './FormDiaLog.vue'
import { materialsPageApi, materialsRemoveApi, regionLazyTreeApi } from './materialsApi'
import { materialsPageApi, materialsRemoveApi } from './materialsApi'
import { getDictLabel } from '@ztzf/utils'
// 初始化查询参数
const initSearchParams = () => ({
    materialName: '', // 材料名称
    areaCode: '', // 所属区划
    current: 1, // 当前页
    size: 10, // 每页大小
})
@@ -112,17 +92,6 @@
    necessity: [],
    isAllScenario: [],
}) // 字典对象
// 树形选择器配置
const treeSelectProps = {
    value: 'id',
    label: 'name',
    children: 'children',
    // 判断叶子节点
    isLeaf: (data, node) => {
        return data.leaf === true
    },
}
provide('dictObj', dictObj)
@@ -139,40 +108,6 @@
        { dictKey: '1', dictValue: '是' },
        { dictKey: '0', dictValue: '否' },
    ]
}
// 懒加载获取区域节点数据
async function loadRegionNode(node, resolve) {
    try {
        // 限制只加载两级,当前节点 level >= 1 时不加载子节点
        if (node.level >= 2) {
            resolve([])
            return
        }
        // 初始化加载时传递 code 参数,加载子节点时传递 parentCode 参数
        const params = node.data?.id ? { parentCode: node.data.id } : { code: '360800000000' }
        const res = await regionLazyTreeApi(params)
        const nodes = res?.data?.data || []
        // 处理返回的节点数据
        const processedNodes = nodes.map(item => {
            // 判断是否为叶子节点:如果是第二级(node.level === 1)则为叶子节点
            const isLeaf = node.level === 1
            return {
                id: item.id || item.value,
                name: item.name || item.title || item.label,
                hasChildren: item.hasChildren || false,
                leaf: isLeaf,
            }
        })
        resolve(processedNodes)
    } catch (error) {
        console.error('获取区域数据失败:', error)
        resolve([])
    }
}
// 获取列表
applications/task-work-order/src/views/orderView/appConfiguration/materials/接口文档.txt
File was deleted
applications/task-work-order/src/views/orderView/orderManage/inspectionRequest/ViewDiaLog.vue
@@ -93,7 +93,7 @@
                </div>
                <!-- 编辑模式 -->
                <el-form class="gd-dialog-form" v-else ref="formRef" :model="formData" :rules="rules" label-width="110px">
                <el-form class="gd-dialog-form" v-else ref="formRef" :model="formData" :rules="rules" label-width="130px">
                    <div class="detail-title">巡查任务详情</div>
                    <el-row>
                        <el-col :span="12">
applications/task-work-order/src/views/orderView/orderManage/orderManage/FormDiaLog.vue
@@ -108,7 +108,6 @@
                            <el-form-item label="执行时间" prop="executeStartTime">
                                <el-date-picker
                                    class="gd-date-picker"
                                    popper-class="gd-date-picker-popper"
                                    v-model="dateRange"
                                    type="daterange"
                                    range-separator="至"
applications/task-work-order/vite.config.mjs
@@ -68,7 +68,7 @@
      preprocessorOptions: {
        scss: {
          api: 'modern-compiler',
          additionalData: `@use "@/styles/variables.scss" as *;`,
                    additionalData: `@use "@/styles/variables.scss" as *; @use "@/styles/element/index.scss" as *;`,
        },
      },
      postcss: {