diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index ab3bdab..854f407 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -24,6 +24,7 @@ "url": "https://gitee.com/y_project/RuoYi-Vue.git" }, "dependencies": { + "@jiaminghi/data-view": "^2.10.0", "@riophae/vue-treeselect": "0.4.0", "axios": "0.28.1", "clipboard": "2.0.8", diff --git a/ruoyi-ui/src/assets/images/bg1.png b/ruoyi-ui/src/assets/images/bg1.png new file mode 100644 index 0000000..b8046c2 Binary files /dev/null and b/ruoyi-ui/src/assets/images/bg1.png differ diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js index da01750..f27f48e 100644 --- a/ruoyi-ui/src/main.js +++ b/ruoyi-ui/src/main.js @@ -36,6 +36,8 @@ import DictTag from '@/components/DictTag' // 字典数据组件 import DictData from '@/components/DictData' +import dataV from '@jiaminghi/data-view' + // 全局方法挂载 Vue.prototype.getDicts = getDicts Vue.prototype.getConfigKey = getConfigKey @@ -58,6 +60,7 @@ Vue.component('ImagePreview', ImagePreview) Vue.use(directive) Vue.use(plugins) +Vue.use(dataV) DictData.install() /** diff --git a/ruoyi-ui/src/router/index.js b/ruoyi-ui/src/router/index.js index bbfd237..04af1b3 100644 --- a/ruoyi-ui/src/router/index.js +++ b/ruoyi-ui/src/router/index.js @@ -51,6 +51,11 @@ export const constantRoutes = [ component: () => import('@/views/register'), hidden: true }, + { + path: '/bigScreen', + component: () => import('@/views/bigScreen'), + hidden: true + }, { path: '/404', component: () => import('@/views/error/404'), diff --git a/ruoyi-ui/src/views/bid/company/index.vue b/ruoyi-ui/src/views/bid/company/index.vue index 0e50902..f8e5ea4 100644 --- a/ruoyi-ui/src/views/bid/company/index.vue +++ b/ruoyi-ui/src/views/bid/company/index.vue @@ -1,425 +1,14 @@ @@ -726,6 +747,7 @@ import { listCompany, getCompany, delCompany, addCompany, updateCompany } from " export default { name: "Company", + dicts: ['sys_user_sex'], data() { return { // 遮罩层 @@ -815,8 +837,13 @@ export default { getList() { this.loading = true listCompany(this.queryParams).then(response => { - this.companyList = response.rows - this.total = response.total + this.companyList = response.rows; + + if(response.rows.length>0){ + this.form=response.rows[0] + }else { + this.reset() + } this.loading = false }) }, @@ -952,3 +979,11 @@ export default { } } + + diff --git a/ruoyi-ui/src/views/bid/info/index.vue b/ruoyi-ui/src/views/bid/info/index.vue index 095ace3..0575e1d 100644 --- a/ruoyi-ui/src/views/bid/info/index.vue +++ b/ruoyi-ui/src/views/bid/info/index.vue @@ -1,6 +1,6 @@