diff --git a/components/cs-dict-tag/index.vue b/components/cs-dict-tag/index.vue
index be22cb7..a2395dc 100644
--- a/components/cs-dict-tag/index.vue
+++ b/components/cs-dict-tag/index.vue
@@ -97,9 +97,9 @@ export default {
color: #99a1b7;
}
.dict-tag {
- min-width: 200rpx;
+ min-width: 212rpx;
text-align: center;
font-size: 24rpx;
- padding: 16rpx 40rpx;
+ padding: 4rpx 40rpx;
}
diff --git a/components/cs-text-more/index.vue b/components/cs-text-more/index.vue
index dd3c272..123414c 100644
--- a/components/cs-text-more/index.vue
+++ b/components/cs-text-more/index.vue
@@ -1,11 +1,10 @@
-
+
- {{ isShowAllText ? value : `${value.slice(1, splitLength)}...` }}
-
+ {{ isShowAllText ? value : `${value.slice(0, splitLength)}...` }}
+
{{ isShowAllText ? '收起' : '展开' }}
@@ -47,11 +45,12 @@ export default {
default: '文本简介'.repeat(20)
},
color: {
- type: String
+ type: String,
+ default: '#4b5675'
},
splitLength: {
type: Number,
- default: 100
+ default: 62
}
}
}
diff --git a/config.js b/config.js
index 34dae4f..d098f7a 100644
--- a/config.js
+++ b/config.js
@@ -1,8 +1,8 @@
// 应用全局配置
module.exports = {
// baseUrl: 'http://188.188.5.188:48080',
- baseUrl: 'https://hb.jzce.com',
- // baseUrl: 'http://188.188.3.232:48080',
+ // baseUrl: 'https://hb.jzce.com',
+ baseUrl: 'http://188.188.3.232:48080',
// baseUrl: 'http://localhost:48080',
baseApi: '/admin-api',
imgUrl: 'https://hb.jzce.com',
diff --git a/pages.json b/pages.json
index 1782f90..829e7d8 100644
--- a/pages.json
+++ b/pages.json
@@ -3,13 +3,15 @@
"path": "pages/login",
"style": {
"navigationBarTitleText": "登录",
- "navigationStyle": "custom"
+ "navigationStyle": "custom",
+ "disableScroll": true
}
}, {
"path": "pages/index",
"style": {
"navigationBarTitleText": "首页",
"navigationStyle": "custom",
+ "disableScroll": true,
"usingComponents": {
"van-dropdown-menu": "/wxcomponents/vant/dropdown-menu/index",
"van-dropdown-item": "/wxcomponents/vant/dropdown-item/index"
@@ -21,6 +23,7 @@
"style": {
"navigationBarTitleText": "企业",
"navigationStyle": "custom",
+ "disableScroll": true,
"usingComponents": {
"van-dropdown-menu": "/wxcomponents/vant/dropdown-menu/index",
"van-dropdown-item": "/wxcomponents/vant/dropdown-item/index",
@@ -40,6 +43,7 @@
"style": {
"navigationBarTitleText": "任务",
"navigationStyle": "custom",
+ "disableScroll": true,
"usingComponents": {
"van-dropdown-menu": "/wxcomponents/vant/dropdown-menu/index",
"van-dropdown-item": "/wxcomponents/vant/dropdown-item/index",
@@ -117,7 +121,7 @@
"componentPlaceholder": {}
}
},
-
+
{
"path": "enterprise/edit",
"style": {
@@ -250,6 +254,13 @@
"style": {
"navigationBarTitleText": ""
}
+ },
+ {
+ "path": "owner/notic",
+ "style": {
+ "navigationBarTitleText": "消息通知",
+ "disableScroll": true
+ }
}
]
}],
diff --git a/pages/enterprise.vue b/pages/enterprise.vue
index 17d9761..2372504 100644
--- a/pages/enterprise.vue
+++ b/pages/enterprise.vue
@@ -9,44 +9,47 @@
id="sreach"
@change="handleSearch"
/>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
{{ enterprise.enterprisesName }}
-
+
{{ enterprise.address }}
@@ -206,35 +222,37 @@ export default {
getDropdownOption(key) {
if (!this.dictMap[key]) return []
const keyMap = {
- enterprises_area: '区域',
- hy: '行业',
- st: '生态',
- wr: '污染'
+ enterprises_area: '按区域',
+ hy: '按行业',
+ st: '按生态',
+ wr: '按污染'
}
if (['enterprises_area'].includes(key)) {
return [
+ {
+ value: '',
+ text: keyMap[key]
+ },
...this.dictMap[key].map(i => {
return {
value: i.value,
text: i.label
}
- }),
- {
- value: '',
- text: keyMap[key]
- }
+ })
]
}
- const data = this.dictMap[key].map(d => {
- return {
- value: d.id,
- text: d.tagName
- }
- })
- data.push({
- value: '',
- text: keyMap[key]
- })
+ const data = [
+ {
+ value: '',
+ text: keyMap[key]
+ },
+ ...this.dictMap[key].map(d => {
+ return {
+ value: d.id,
+ text: d.tagName
+ }
+ })
+ ]
return data
},
querySelect(v, key) {
@@ -328,26 +346,14 @@ export default {
font-size: 24rpx;
.address {
color: $uni-text-color-grey;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ width: 448rpx;
+ overflow: hidden;
}
&:active {
background-color: $cs-color-touch;
}
- .tagList {
- margin-top: 16rpx;
- display: flex;
- gap: 8rpx;
- color: $uni-text-color-grey;
- flex-flow: row wrap;
- .tag {
- font-size: 24rpx;
- display: flex;
- padding: 4rpx 12rpx;
- justify-content: center;
- align-items: center;
- border-radius: 4rpx;
- background: #f9f9f9;
- }
- }
.audit {
position: absolute;
right: -38rpx;
@@ -359,13 +365,17 @@ export default {
text-align: center;
}
}
-::v-deep .van-dropdown-menu {
- box-shadow: none;
- height: 70rpx;
- font-size: 26rpx;
- border-bottom: 1px solid #f1f1f4;
+.drop-box {
+ padding: 24rpx;
+ border-bottom: 2rpx solid #f1f1f4;
+ background-color: #fff;
+ ::v-deep .van-dropdown-menu {
+ box-shadow: none;
+ height: fit-content !important;
+ font-size: 26rpx;
+ padding: 12rpx 24rpx;
+ }
}
-
::v-deep .u-list {
padding: 24rpx;
}
diff --git a/pages/index.vue b/pages/index.vue
index 7106d9a..d918329 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -1,33 +1,35 @@
-
+
-
-
-
-
+
+
+
+
+
+
- 任务数量
+ 任务数量
- 执法记录
+ 执法记录
- 企业数量
+ 企业数量
@@ -130,13 +131,13 @@
{{ item.name }}
@@ -166,15 +167,15 @@
-
+
- {{ item.name }}
-
+ {{ item.name }}
+
{
@@ -250,39 +251,55 @@ export default {
const query = uni.createSelectorQuery().in(this)
query
.select('.view-container')
- .boundingClientRect(data => {
- this.viewHeigth = data.height - 35 - 25
+ .boundingClientRect()
+ .select('.drop-box')
+ .boundingClientRect()
+ .select('.cs-tabber-container')
+ .boundingClientRect()
+ .exec(res => {
+ this.viewHeigth = res[0].height - res[1].height
})
- .exec()
},
async getDict() {
const dict = await getDictBatchByType({
type: ['select_week'].join(',')
})
const dept = await getDeptTree()
- this.dropOption.dept = [
- ...dept.data.map(i => {
- return {
- value: i.id,
- text: i.name
+ if (!this.$roles.checkRole(['director'])) {
+ this.dropOption.dept = [
+ ...dept.data
+ .filter(i => {
+ return i.id == this.$store.getters.deptId
+ })
+ .map(i => {
+ return {
+ value: i.id,
+ text: i.name
+ }
+ })
+ ]
+ } else {
+ this.dropOption.dept = [
+ ...dept.data.map(i => {
+ return {
+ value: i.id,
+ text: i.name
+ }
+ }),
+ {
+ value: '',
+ text: '全部'
}
- }),
- {
- value: '',
- text: '全部'
- }
- ]
+ ]
+ }
+
this.dropOption.select_week = [
...dict.data.select_week.map(i => {
return {
value: i.value,
text: i.label
}
- }),
- {
- value: '',
- text: '全部'
- }
+ })
]
},
async init() {
@@ -305,6 +322,7 @@ export default {
colorMap.push(color)
return res
})
+ colorMap.push('#F9F9F9')
this.color = colorMap
this.detail.legendData = data
this.setPieData(data, this.detail.taskCompletionRate)
@@ -322,10 +340,9 @@ export default {
}
})
if (Number(max) < 100) {
- pieData.push({
+ pieData.splice(pieData.length, 0, {
name: '',
- value: 100 - Number(max),
- color: '#F9F9F9'
+ value: 100 - Number(max)
})
}
this.opts = {
@@ -341,9 +358,7 @@ export default {
title: {
name: `${max}%`,
fontSize: 24,
- color: '#071437',
- fontWeight: 'bold',
- fontFamily: 'Tahoma'
+ color: '#071437'
},
subtitle: {
name: '完成率',
@@ -366,7 +381,7 @@ export default {
this.chartData = {
series: [
{
- data: pieData
+ data: [...pieData]
}
]
}
@@ -394,13 +409,7 @@ export default {
refresherrefresh() {
this.init()
},
- dorpToggle(e) {
- if (!this.$roles.checkRole(['director'])) {
- e.detail.callback(false)
- } else {
- e.detail.callback(true)
- }
- },
+
numFilter(value) {
// 先保留三位小数
let tempVal = parseFloat(value).toFixed(3)
@@ -420,33 +429,24 @@ export default {
.view-container {
height: 100%;
}
-.number {
- font-family: 'Tahoma';
-}
-::v-deep .u-count-num {
- font-family: 'Tahoma';
-}
.view {
- padding: 0 24rpx;
- padding-bottom: 24rpx;
- display: flex;
- gap: 24rpx;
- flex-flow: column nowrap;
+ padding: 0 24rpx 48rpx;
+
.box {
padding: 24rpx;
background-color: #fff;
border: 2rpx solid #f9f9f9;
border-radius: 24rpx;
- margin-top: 24rpx;
- &:last-child {
- margin-bottom: 24rpx;
- }
}
.row-1 {
display: flex;
flex-flow: column nowrap;
gap: 24rpx;
+ margin-top: 24rpx;
+ &:last-child {
+ margin-bottom: 84rpx;
+ }
}
.people-name {
max-width: 4rem;
@@ -454,10 +454,11 @@ export default {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
+ color: #4b5675;
}
.tab {
position: relative;
- padding: 16rpx 32rpx;
+ padding: 8rpx 32rpx;
.name {
z-index: 2;
position: inherit;
@@ -474,10 +475,18 @@ export default {
}
}
}
-::v-deep .van-dropdown-menu {
- box-shadow: none;
- height: 70rpx !important;
- font-size: 26rpx;
+.drop-box {
+ padding: 24rpx;
border-bottom: 2rpx solid #f1f1f4;
+ background-color: #fff;
+ ::v-deep .van-dropdown-menu {
+ box-shadow: none;
+ height: fit-content !important;
+ font-size: 26rpx;
+ padding: 8rpx 24rpx;
+ }
+ ::v-deep .van-dropdown-item {
+ margin-bottom: 64rpx;
+ }
}
diff --git a/pages/owner.vue b/pages/owner.vue
index ae6b02a..d3d9189 100644
--- a/pages/owner.vue
+++ b/pages/owner.vue
@@ -26,13 +26,16 @@
-
-
+
+
消息通知
@@ -48,7 +51,6 @@
@@ -81,9 +83,9 @@
政策法规
@@ -108,9 +110,9 @@
企业入驻
@@ -128,9 +130,9 @@
内部专线
@@ -148,10 +150,10 @@
>
工作汇报
@@ -215,8 +217,10 @@ export default {
uni.requestSubscribeMessage({
//此处填写刚才申请模板的模板ID
tmplIds: ['E8RK91cPLMios6ZHoKx6FJOV4H2kodx6yPWYp7jpLJY'],
- success(res) {
- console.log('requestSubscribeMessage', res)
+ complete(res) {
+ uni.navigateTo({
+ url: '/sub/owner/notic'
+ })
}
})
},
@@ -225,13 +229,12 @@ export default {
url: '/sub/owner/edit'
})
},
-
+
invite() {
this.share = {
title: '邀请企业入驻', // 标题
path: `/pages/login?inviteId=${this.$store.getters.userId}`,
- imageUrl:
- 'https://hb.jzce.com/fx_qyrz.png'
+ imageUrl: 'https://hb.jzce.com/fx_qyrz.png'
}
},
callPhone() {
diff --git a/pages/task.vue b/pages/task.vue
index c8adccf..4fa77a1 100644
--- a/pages/task.vue
+++ b/pages/task.vue
@@ -1,44 +1,38 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
- %
+ %
-
+
{{ task.title }}
-
+
-
+
{{ task.deptName }}
@@ -223,28 +225,28 @@ export default {
const keyMap = {
task_priority: '按等级',
zf_lx: '按类型',
- task_state: '按状态',
+ task_state: '按发布',
select_week: '按周期'
}
if (['zf_lx'].includes(key)) {
return [
+ { value: '', text: keyMap[key] },
...this.dictMap[key].map(d => {
return {
value: d.id,
text: d.tagName
}
- }),
- { value: '', text: keyMap[key] }
+ })
]
} else {
return [
+ { value: '', text: keyMap[key] },
...this.dictMap[key].map(d => {
return {
value: d.value,
text: d.label
}
- }),
- { value: '', text: keyMap[key] }
+ })
]
}
},
@@ -322,44 +324,34 @@ export default {
position: relative;
overflow: hidden;
font-size: 24rpx;
+ border: 1px solid var(--LightMode-Grey-Grey-100, #f9f9f9);
&:active {
background-color: $cs-color-touch;
}
.address {
color: $uni-text-color-grey;
}
- .tagList {
- margin-top: 16rpx;
- display: flex;
- gap: 8rpx;
- color: $uni-text-color-grey;
- display: flex;
- .tag {
- font-size: 24rpx;
- display: flex;
- padding: 4rpx 12rpx;
- justify-content: center;
- align-items: center;
- border-radius: 4rpx;
- background: #f9f9f9;
- }
- }
.audit {
position: absolute;
right: 0;
top: 0;
transform-origin: 50% 50%;
- transform: translateX(28px) translateY(9px) rotateZ(45deg);
+ transform: translateX(33px) translateY(9px) rotateZ(45deg);
}
.rate {
position: relative;
}
}
-::v-deep .van-dropdown-menu {
- box-shadow: none;
- height: 70rpx !important;
- font-size: 26rpx;
- border-bottom: 1px solid #f1f1f4;
+.drop-box {
+ padding: 24rpx;
+ border-bottom: 2rpx solid #f1f1f4;
+ background-color: #fff;
+ ::v-deep .van-dropdown-menu {
+ box-shadow: none;
+ height: fit-content !important;
+ font-size: 26rpx;
+ padding: 12rpx 24rpx;
+ }
}
::v-deep .u-list {
diff --git a/static/favicon.png b/static/favicon.png
index b770ec6..fdfa7cd 100644
Binary files a/static/favicon.png and b/static/favicon.png differ
diff --git a/static/images/owner/bill.png b/static/images/owner/bill.png
new file mode 100644
index 0000000..678dc9d
Binary files /dev/null and b/static/images/owner/bill.png differ
diff --git a/static/images/owner/message-grey.png b/static/images/owner/message-grey.png
new file mode 100644
index 0000000..08fa42a
Binary files /dev/null and b/static/images/owner/message-grey.png differ
diff --git a/static/images/owner/policy.png b/static/images/owner/policy.png
new file mode 100644
index 0000000..fdc74bd
Binary files /dev/null and b/static/images/owner/policy.png differ
diff --git a/static/images/tabbers/home-select.png b/static/images/tabbers/home-select.png
index 17f1424..670686d 100644
Binary files a/static/images/tabbers/home-select.png and b/static/images/tabbers/home-select.png differ
diff --git a/static/images/tabbers/home.png b/static/images/tabbers/home.png
index f52eda8..3a2ff80 100644
Binary files a/static/images/tabbers/home.png and b/static/images/tabbers/home.png differ
diff --git a/static/images/tabbers/logo.png b/static/images/tabbers/logo.png
new file mode 100644
index 0000000..bf64331
Binary files /dev/null and b/static/images/tabbers/logo.png differ
diff --git a/static/images/tabbers/position-select.png b/static/images/tabbers/position-select.png
index f7305df..fd60b24 100644
Binary files a/static/images/tabbers/position-select.png and b/static/images/tabbers/position-select.png differ
diff --git a/static/images/tabbers/position.png b/static/images/tabbers/position.png
index 455be4f..5d42dab 100644
Binary files a/static/images/tabbers/position.png and b/static/images/tabbers/position.png differ
diff --git a/static/images/tabbers/task-select.png b/static/images/tabbers/task-select.png
index 1c6979e..51f0139 100644
Binary files a/static/images/tabbers/task-select.png and b/static/images/tabbers/task-select.png differ
diff --git a/static/images/tabbers/task.png b/static/images/tabbers/task.png
index 4122cfc..24cd777 100644
Binary files a/static/images/tabbers/task.png and b/static/images/tabbers/task.png differ
diff --git a/static/images/tabbers/user-select.png b/static/images/tabbers/user-select.png
index f313a9b..76a3f40 100644
Binary files a/static/images/tabbers/user-select.png and b/static/images/tabbers/user-select.png differ
diff --git a/static/images/tabbers/user.png b/static/images/tabbers/user.png
index a0ad8c6..4cb6b59 100644
Binary files a/static/images/tabbers/user.png and b/static/images/tabbers/user.png differ
diff --git a/static/scss/global.scss b/static/scss/global.scss
index 155f587..742c698 100644
--- a/static/scss/global.scss
+++ b/static/scss/global.scss
@@ -9,6 +9,10 @@ page {
color: #071437;
}
+view {
+ box-sizing: border-box;
+}
+
button {
padding-left: 0;
padding-right: 0;
@@ -23,3 +27,23 @@ button {
::v-deep .uni-calendar__box {
padding-bottom: 32px;
}
+
+.tagList {
+ display: flex;
+ align-items: center;
+ gap: 16rpx;
+ .tag {
+ display: flex;
+ padding: 4rpx 12rpx;
+ justify-content: center;
+ align-items: center;
+ border-radius: 4rpx;
+ background: var(--LightMode-Grey-Grey-100, #f9f9f9);
+ color: var(--LightMode-Grey-Grey-600, #78829d);
+ text-align: center;
+ font-size: 24rpx;
+ font-style: normal;
+ font-weight: 400;
+ line-height: normal;
+ }
+}
diff --git a/static/scss/index.scss b/static/scss/index.scss
index 0063035..5001857 100644
--- a/static/scss/index.scss
+++ b/static/scss/index.scss
@@ -10,3 +10,7 @@
border-radius: 50%;
box-shadow: 0 0 4px 2px $cs-shadow-color;
}
+
+* {
+ box-sizing: border-box;
+}
diff --git a/sub/enterprise/detail.vue b/sub/enterprise/detail.vue
index e14f072..022f74e 100644
--- a/sub/enterprise/detail.vue
+++ b/sub/enterprise/detail.vue
@@ -7,8 +7,19 @@
-
-
+
+
{{ detail.address }}
@@ -25,28 +36,31 @@
- 环保负责人
-
+ 环保负责人
+
{{ detail.contactName }}
- 联系方式
-
+ 联系方式
+
{{ detail.environmentalContactPhone }}
-
+
-
+
+
+
+ {{ tab.name }}
+ {{ tab.count }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+ {{ item.time }}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub/owner/notice-detail.vue b/sub/owner/notice-detail.vue
new file mode 100644
index 0000000..e69de29
diff --git a/sub/owner/policy-detail.vue b/sub/owner/policy-detail.vue
index 4cc77c5..0776f04 100644
--- a/sub/owner/policy-detail.vue
+++ b/sub/owner/policy-detail.vue
@@ -1,12 +1,12 @@
-
-
{{ policyDetail.name }}
- 生效时间：{{ policyDetail.effectiveDate }}
-
+
+ 生效时间：{{ policyDetail.effectiveDate }}
+
+
@@ -59,13 +59,19 @@ export default {
formatTime(time) {
if (!time) return ''
const date = new Date(time)
- return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`
+ return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(
+ 2,
+ '0'
+ )}-${String(date.getDate()).padStart(2, '0')}`
},
// 处理富文本内容
formatRichText(html) {
if (!html) return ''
// 添加样式以确保图片自适应
- return html.replace(/![]()
\ No newline at end of file
+
diff --git a/sub/owner/policy.vue b/sub/owner/policy.vue
index 215a2cf..99e0ef1 100644
--- a/sub/owner/policy.vue
+++ b/sub/owner/policy.vue
@@ -3,19 +3,19 @@
-
+ />
-
-
-
+
- {{ item.title }}
- 生效时间: {{ item.effectiveDate }}
+
+ {{ item.title }}
+
+
+ 生效时间: {{ item.effectiveDate }}
+
-
-
@@ -52,30 +58,29 @@ import { PolicyApi, formatPolicyContext } from '@/api/policy/index.js'
import { formatDate } from '@/utils/ruoyi.js'
import config from '@/config'
-
export default {
data() {
return {
isRefreshing: false, // 是否正在刷新
searchValue: '', // 搜索关键字
- abc: '',
+ abc: '',
policyList: [], // 政策法规列表数据
pageNum: 1, // 当前页码
pageSize: 10, // 每页显示条数
total: 0, // 总数据条数
- loadMoreStatus: 'more' ,// 加载更多状态：more-加载前 loading-加载中 noMore-没有更多
- itemImgUrl: config.imgUrl + '/miniohb/c103c92335bdd30d33ff8a062c219ead0626bf0a1898536bd7590285ca11c9db.png'
+ loadMoreStatus: 'more', // 加载更多状态：more-加载前 loading-加载中 noMore-没有更多
+ itemImgUrl:
+ config.imgUrl +
+ '/miniohb/c103c92335bdd30d33ff8a062c219ead0626bf0a1898536bd7590285ca11c9db.png'
}
},
// 页面加载时获取列表数据
onShow() {
- console.log(this.itemImgUrl)
+ console.log(this.itemImgUrl)
this.getPolicyList()
},
-
methods: {
-
// 下拉刷新
onRefresh() {
this.isRefreshing = true
@@ -83,42 +88,45 @@ export default {
this.getPolicyList()
},
loadNextPage() {
- console.log('列表值',this.policyList.length)
- if (this.policyList.length < this.total) {
- this.pageNum++
- this.getPolicyList()
-
- }
- },
+ console.log('列表值', this.policyList.length)
+ if (this.policyList.length < this.total) {
+ this.pageNum++
+ this.getPolicyList()
+ }
+ },
// 获取政策法规列表数据
async getPolicyList() {
try {
- console.log('PolicyApi',this.searchValue)
+ console.log('PolicyApi', this.searchValue)
this.loadMoreStatus = 'loading'
const res = await PolicyApi.getPolicyPage({
pageNum: this.pageNum,
pageSize: this.pageSize,
name: this.searchValue // 搜索关键字
})
-
+
if (res.code === 0 && res.data.total > 0) {
// 限制标题长度，超出显示省略号
const formattedData = res.data.list.map(item => ({
...item,
- title: item.name.length > 15 ? item.name.slice(0, 15) + '...' : item.name,
- effectiveDate: formatDate(item.effectiveDate,'YYYY年MM月DD日')
- }))
-
+ title:
+ item.name.length > 15
+ ? item.name.slice(0, 15) + '...'
+ : item.name,
+ effectiveDate: formatDate(item.effectiveDate, 'YYYY年MM月DD日')
+ }))
+
// 判断是首次加载还是加载更多
if (this.pageNum === 1) {
this.policyList = formattedData
} else {
this.policyList = [...this.policyList, ...formattedData]
}
- console.log('列表信息',res)
+ console.log('列表信息', res)
this.total = res.data.total
// 更新加载状态
- this.loadMoreStatus = this.policyList.length >= this.total ? 'noMore' : 'more'
+ this.loadMoreStatus =
+ this.policyList.length >= this.total ? 'noMore' : 'more'
}
} catch (error) {
console.error(error)
@@ -127,24 +135,23 @@ export default {
title: '获取列表失败',
icon: 'none'
})
- }
- finally {
- this.loadMoreStatus = this.policyList.length >= this.total? 'noMore' :'more'
- // 无论成功失败都关闭刷新状态
- // 确保在数据加载完成后关闭刷新状态
- setTimeout(() => {
+ } finally {
+ this.loadMoreStatus =
+ this.policyList.length >= this.total ? 'noMore' : 'more'
+ // 无论成功失败都关闭刷新状态
+ // 确保在数据加载完成后关闭刷新状态
+ setTimeout(() => {
this.isRefreshing = false
- }, 300) // 添加短暂延时，确保动画效果完整
+ }, 300) // 添加短暂延时，确保动画效果完整
}
},
// 搜索事件处理
handleSearch(e) {
- if(e.detail && e.detail.length > 1){
+ if (e.detail && e.detail.length > 1) {
this.pageNum = 1 // 重置页码
this.searchValue = e.detail // 更新搜索关键字
this.getPolicyList()
}
-
},
// 清除搜索事件处理
handleClear() {
@@ -164,11 +171,11 @@ export default {
\ No newline at end of file
+
diff --git a/sub/task/detail.vue b/sub/task/detail.vue
index 52e425b..737a6fc 100644
--- a/sub/task/detail.vue
+++ b/sub/task/detail.vue
@@ -3,14 +3,22 @@
-
+
{{ detail.title }}
+
+ {{ detail.deptName }}
+
+
+ {{
+ $dict.echoDicValue(dictMap.task_priority, detail.priority)
+ }}
+
-
-
-
+
+
+
{{
`${$util.formatDate(
detail.startDate,
- 'YYYY/M/D'
- )}~${$util.formatDate(detail.endDate, 'YYYY/M/D')}`
+ 'YYYY年M月D日'
+ )} 至 ${$util.formatDate(detail.endDate, 'YYYY年M月D日')}`
}}
-
- {{ detail.description }}
-
-
- {{
- isShowAllText
- ? detail.description
- : `${detail.description.slice(1, 100)}...`
- }}
-
- {{ isShowAllText ? '收起' : '展开' }}
-
-
+
-
+
(当前
{{ list.length }}
条记录)
@@ -139,15 +121,27 @@
@tap.native.stop="select(record.id)"
v-if="['3', null].includes(record.inspectionStatus)"
>
-
+
- {{ record.enterpriseName }}
-
+
+ {{ record.enterpriseName }}
+
+
{{ record.enterpriseAddress }}
-
+
-
+
已选择({{ isSelect.length }})
@@ -263,12 +262,18 @@ export default {
value: '',
text: '按人员'
}
- ]
+ ],
+ // 下拉选项
+ dropOption: {
+ dept: [],
+ userList: [],
+ status: []
+ }
}
},
- onLoad(res) {
+ async onLoad(res) {
this.detail.id = res.id
- this.getDict()
+ await this.getDict()
},
onPageScroll(e) {
this.OptionsOffset.isTop = e.scrollTop + 10 > this.OptionsOffset.top
@@ -304,13 +309,42 @@ export default {
*/
async getDict() {
const dict = await getDictBatchByType({
- type: ['task_state', 'Inspections_status'].join(',')
+ type: ['task_state', 'Inspections_status', 'task_priority'].join(
+ ','
+ )
})
const dept = await getDeptTree()
this.dictMap = {
...dict.data,
dept: dept.data
}
+ this.dropOption = {
+ dept: [
+ {
+ value: '',
+ text: '按部门'
+ },
+ ...dept.data.map(d => {
+ return {
+ value: d.id,
+ text: d.name
+ }
+ })
+ ],
+ status: [
+ {
+ value: '',
+ text: '按状态'
+ },
+ ...dict.data.task_state.map(d => {
+ return {
+ ...d,
+ value: d.value,
+ text: d.label
+ }
+ })
+ ]
+ }
},
getDropdownOption(key) {
const keyMap = {
@@ -385,17 +419,17 @@ export default {
getUserOption({ detail }) {
this.getUser().then(res => {
this.userList = [
+ {
+ value: '',
+ text: '按人员'
+ },
...res.map(i => {
return {
...i,
value: i.userId,
text: i.realName
}
- }),
- {
- value: '',
- text: '按人员'
- }
+ })
]
detail.callback(true)
})
@@ -501,38 +535,18 @@ export default {
position: absolute;
right: 0;
top: 0;
- transform: translateX(23px) translateY(16px) rotateZ(45deg);
+ transform: translateX(58rpx) translateY(24rpx) rotateZ(45deg);
transform-origin: 50% 50%;
}
}
- .tagList {
- display: flex;
- align-items: center;
- gap: var(--Number-4px, 4px);
- .tag {
- display: flex;
- padding: var(--Number-2px, 2px) var(--Number-6px, 6px);
- justify-content: center;
- align-items: center;
- gap: var(--Number-4px, 4px);
- border-radius: var(--Number-2px, 2px);
- background: var(--LightMode-Grey-Grey-100, #f9f9f9);
- color: var(--LightMode-Grey-Grey-600, #78829d);
- text-align: center;
- font-size: 12px;
- font-style: normal;
- font-weight: 400;
- line-height: normal;
- }
- }
.record {
background-color: #fff;
display: flex;
- padding: 12px 16px;
+ padding: 24rpx 32rpx;
align-items: center;
border-radius: var(--Number-8px, 8px);
- border: 1px solid var(--LightMode-Grey-Grey-100, #f9f9f9);
- margin: 12px;
+ border: 2rpx solid var(--LightMode-Grey-Grey-100, #f9f9f9);
+ margin: 24rpx;
margin-top: 0;
position: relative;
overflow: hidden;
@@ -541,45 +555,49 @@ export default {
right: 0;
top: 0;
transform-origin: 50% 50%;
- transform: translateX(30px) translateY(10px) rotateZ(45deg);
+ transform: translateX(64rpx) translateY(18rpx) rotateZ(45deg);
}
.select {
- width: 24px;
- height: 24px;
- border: 2px solid $cs-color-main;
- border-radius: 6px;
+ width: 44rpx;
+ height: 44rpx;
+ border: 4rpx solid $cs-color-main;
+ border-radius: 12rpx;
display: flex;
align-items: center;
justify-content: center;
transition: 0.2s all;
- margin-right: 16px;
+ margin-right: 32rpx;
}
.disable {
- width: 24px;
- height: 24px;
- border: 2px solid #dbdfe9;
- margin-right: 16px;
+ width: 44rpx;
+ height: 44rpx;
+ border: 4rpx solid #dbdfe9;
+ margin-right: 32rpx;
border-radius: 100%;
position: relative;
&::after {
content: '';
position: absolute;
inset: 0;
- border-left: 2px solid #dbdfe9;
+ border-left: 4rpx solid #dbdfe9;
transform-origin: 0 50%;
- transform: translateX(calc(50% - 1px)) rotateZ(45deg);
+ transform: translateX(calc(50% - 2rpx)) rotateZ(45deg);
}
}
.isSelect {
background-color: $cs-color-main;
}
.info {
- font-size: 13px;
+ font-size: 26rpx;
.name {
- font-size: 16px;
+ font-size: 32rpx;
font-weight: 600;
color: #071437;
- margin-bottom: 4px;
+ margin-bottom: 8rpx;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ width: 480rpx;
+ overflow: hidden;
}
}
&:active {
@@ -641,7 +659,7 @@ export default {
display: flex;
.info {
.name {
- font-size: 16px;
+ font-size: 30rpx;
font-weight: bold;
}
.dept {
diff --git a/sub/task/enforce.vue b/sub/task/enforce.vue
index d87db29..d3b55a5 100644
--- a/sub/task/enforce.vue
+++ b/sub/task/enforce.vue
@@ -46,7 +46,7 @@
>
*
- 上传证明
+ 上传照片
@@ -272,29 +272,4 @@ export default {
::v-deep .uni-easyinput__content-textarea {
min-height: 400rpx;
}
-::v-deep .u-upload__button {
- border-radius: 16rpx !important;
- border: 1px solid #f1f1f4;
- background-color: #f9f9f9 !important;
-}
-
-::v-deep .u-upload__wrap {
- .u-upload__wrap__preview {
- width: 192rpx;
- height: 192rpx;
- border-radius: 16rpx !important;
- overflow: visible !important;
- .u-upload__wrap__preview__image {
- border-radius: 16rpx !important;
- }
- .u-upload__deletable {
- border-radius: 100% !important;
- background-color: #f8285a !important;
- transform: translateX(50%) translateY(-50%);
- .u-upload__deletable__icon {
- position: relative;
- }
- }
- }
-}
diff --git a/sub/task/locate.vue b/sub/task/locate.vue
index fe6ecfe..b934103 100644
--- a/sub/task/locate.vue
+++ b/sub/task/locate.vue
@@ -230,7 +230,7 @@ export default {
scene: `aId=${this.inspectionsId}&bId=${this.enterpriseId}`,
path: 'sub/task/locate',
checkPath: false,
- envVersion: 'trial',
+ envVersion: 'develop',
isHyaline: true
})
this.miniCode = `data:image/jpeg;base64,${res.data}`
diff --git a/sub/task/record.vue b/sub/task/record.vue
index 114c599..26410c4 100644
--- a/sub/task/record.vue
+++ b/sub/task/record.vue
@@ -1,7 +1,7 @@
-
+
{{ detail.title }}
@@ -20,7 +20,7 @@
class="wd-flex wd-text-13"
style="justify-content: space-between"
>
-
+
{{
@@ -32,37 +32,7 @@
-
- {{ detail.description }}
-
-
- {{
- isShowAllText
- ? detail.description
- : `${detail.description.slice(1, 100)}...`
- }}
-
- {{ isShowAllText ? '收起' : '展开' }}
-
-
-
+
-
+
{{ detail.enterprise.enterprisesName }}
-
-
-
-
+
+
+
{{ detail.enterprise.address }}
-
+
{{
$dict.echoDicValue(
@@ -128,18 +95,20 @@
:key="item.id"
@tap="goLog(item)"
>
-
+
- {{ $dict.echoDicValue(dictMap.inspections_mark, item.status) }}
+ {{
+ $dict.echoDicValue(dictMap.Inspections_status, item.status)
+ }}
{{ $util.formatDate(item.createTime, 'YYYY/M/D h:m') }}
@@ -153,14 +122,14 @@
class="row"
v-for="people in item.userList"
:key="people.userId"
- style="display: inline-flex; gap: 12px; margin-right: 12px"
+ style="display: inline-flex; gap: 24rpx; margin-right: 24rpx"
>
-
+
{{ people.realName }}
{{ people.deptName }}
@@ -177,7 +146,7 @@
.view-container {
- padding: 0 12px;
+ padding: 0 24rpx;
position: relative;
- padding-bottom: 100px;
+ padding-bottom: 200rpx;
.box {
background-color: #fff;
border-radius: $cs-border-radius;
- padding: 16px;
- margin-top: 12px;
+ padding: 32rpx;
+ margin-top: 24rpx;
}
.row {
border-radius: $cs-border-radius;
- padding: 12px;
- border: 1px solid #f9f9f9;
+ padding: 24rpx;
+ border: 2rpx solid #f9f9f9;
}
.detail {
display: flex;
flex-flow: column nowrap;
- gap: 12px;
+ gap: 24rpx;
position: relative;
overflow: hidden;
- .tagList {
- display: flex;
- align-items: center;
- gap: var(--Number-4px, 4px);
- .tag {
- display: flex;
- padding: var(--Number-2px, 2px) var(--Number-6px, 6px);
- justify-content: center;
- align-items: center;
- gap: var(--Number-4px, 4px);
- border-radius: var(--Number-2px, 2px);
- background: var(--LightMode-Grey-Grey-100, #f9f9f9);
- color: var(--LightMode-Grey-Grey-600, #78829d);
- text-align: center;
- font-size: 12px;
- font-style: normal;
- font-weight: 400;
- line-height: normal;
- }
- }
+
.enterprise {
- border: 1px solid #f9f9f9;
- padding: 12px;
+ border: 2rpx solid #f9f9f9;
+ padding: 24rpx;
border-radius: $cs-border-radius;
- gap: 12px;
+ gap: 24rpx;
position: relative;
overflow: hidden;
- font-size: 12px;
+ font-size: 24rpx;
.address {
color: $uni-text-color-grey;
- text-decoration: underline;
}
&:active {
background-color: $cs-color-touch;
}
- .tagList {
- margin-top: 8px;
- display: flex;
- gap: 4px;
- color: $uni-text-color-grey;
- display: flex;
- flex-flow: row wrap;
- .tag {
- font-size: 12px;
- display: flex;
- padding: 2px 6px;
- justify-content: center;
- align-items: center;
- border-radius: 2px;
- background: #f9f9f9;
- }
- }
- .audit {
- position: absolute;
- right: -19px;
- top: 6px;
- transform: rotateZ(45deg);
- transform-origin: 50% 50%;
- padding: 4px 20px;
- font-size: 12px;
- text-align: center;
- }
}
.audit {
position: absolute;
right: 0;
top: 0;
- transform: translateX(23px) translateY(16px) rotateZ(45deg);
+ transform: translateX(36rpx) translateY(32rpx) rotateZ(45deg);
transform-origin: 50% 50%;
}
}
@@ -423,26 +345,26 @@ export default {
overflow: hidden;
display: flex;
flex-flow: column nowrap;
- gap: 12px;
+ gap: 24rpx;
.emty {
display: flex;
flex-direction: column;
align-items: center;
- gap: 12px;
- border-radius: var(--Number-8px, 8px);
- border: 1px solid var(--LightMode-Grey-Grey-100, #f9f9f9);
- padding: 24px 12px;
- border-radius: 8px;
+ gap: 24rpx;
+ border-radius: 16rpx;
+ border: 2rpx solid var(--LightMode-Grey-Grey-100, #f9f9f9);
+ padding: 48rpx 24rpx;
+ border-radius: 16rpx;
.image {
- width: 64px;
- height: 64px;
+ width: 128rpx;
+ height: 128rpx;
}
}
.audit {
position: absolute;
right: 0;
top: 0;
- transform: translateX(30px) translateY(8px) rotateZ(45deg);
+ transform: translateX(60rpx) translateY(16rpx) rotateZ(45deg);
transform-origin: 50% 50%;
}
}
@@ -452,16 +374,16 @@ export default {
}
}
.operation {
- padding: 12px;
+ padding: 24rpx;
display: flex;
align-items: center;
justify-content: center;
- gap: 12px;
+ gap: 24rpx;
.btn {
flex: 1;
- border-radius: 8px;
+ border-radius: 16rpx;
display: flex;
- padding: 12px 0;
+ padding: 24rpx 0;
align-items: center;
justify-content: center;
}
diff --git a/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue b/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
index 5678f7d..63805a8 100644
--- a/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
+++ b/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
@@ -16,7 +16,7 @@
*
-->
-
+
@@ -30,11 +30,11 @@
-
+
-
+
@@ -81,7 +81,7 @@ export default {
},
computed: {
setClass() {
- return this.$props.isTab ? 'container' : 'noTab'
+ return this.$props.isTab ? 'cs-tabber-container' : 'noTab'
},
isFit() {
return uni.getStorageSync('SYSTEM').includes('iOS')
@@ -101,7 +101,7 @@ export default {
diff --git a/uni_modules/uview-ui/components/u-count-to/u-count-to.vue b/uni_modules/uview-ui/components/u-count-to/u-count-to.vue
index 417b732..5050b27 100644
--- a/uni_modules/uview-ui/components/u-count-to/u-count-to.vue
+++ b/uni_modules/uview-ui/components/u-count-to/u-count-to.vue
@@ -1,16 +1,18 @@
- {{ displayValue }}
+
+ {{ displayValue }}
+
diff --git a/uni_modules/uview-ui/components/u-upload/u-upload.vue b/uni_modules/uview-ui/components/u-upload/u-upload.vue
index 1dac8a7..a770ce7 100644
--- a/uni_modules/uview-ui/components/u-upload/u-upload.vue
+++ b/uni_modules/uview-ui/components/u-upload/u-upload.vue
@@ -1,558 +1,571 @@
-
-
-
-
-
-
-
- {{item.isVideo || (item.type && item.type === 'video') ? '视频' : '文件'}}
-
-
-
-
-
-
- {{ item.message }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ uploadText }}
-
-
-
+
+
+
+
+
+
+
+
+ {{
+ item.isVideo || (item.type && item.type === 'video')
+ ? '视频'
+ : '文件'
+ }}
+
+
+
+
+
+
+
+
+ {{ item.message }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+ {{ uploadText }}
+
+
+
+
+
diff --git a/utils/request.js b/utils/request.js
index 983fdeb..aa1878d 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -60,7 +60,6 @@ const request = config => {
})
}, 500)
}
-
reject('无效的会话，或者会话已过期，请重新登录。')
} else if (code === 500) {
toast(msg)
diff --git a/wxcomponents/vant/dropdown-item/index.wxss b/wxcomponents/vant/dropdown-item/index.wxss
index 80505e9..d234c59 100644
--- a/wxcomponents/vant/dropdown-item/index.wxss
+++ b/wxcomponents/vant/dropdown-item/index.wxss
@@ -1 +1,32 @@
-@import '../common/index.wxss';.van-dropdown-item{left:0;overflow:hidden;position:fixed;right:0}.van-dropdown-item__option{text-align:left}.van-dropdown-item__option--active .van-dropdown-item__icon,.van-dropdown-item__option--active .van-dropdown-item__title{color:var(--dropdown-menu-option-active-color,#ee0a24)}.van-dropdown-item--up{top:0}.van-dropdown-item--down{bottom:0}.van-dropdown-item__icon{display:block;line-height:inherit}
\ No newline at end of file
+@import '../common/index.wxss';
+
+.van-dropdown-item {
+ left: 0;
+ overflow: hidden;
+ position: fixed;
+ right: 0
+}
+
+.van-dropdown-item__option {
+ text-align: left
+}
+
+.van-dropdown-item__option--active .van-dropdown-item__icon,
+.van-dropdown-item__option--active .van-dropdown-item__title {
+ color: var(--dropdown-menu-option-active-color, #ee0a24)
+}
+
+.van-dropdown-item--up {
+ top: 0
+}
+
+.van-dropdown-item--down {
+ /* bottom: 48rpx */
+ bottom: 0;
+ margin-bottom: 48rpx;
+}
+
+.van-dropdown-item__icon {
+ display: block;
+ line-height: inherit
+}
\ No newline at end of file
diff --git a/wxcomponents/vant/dropdown-menu/index.wxml b/wxcomponents/vant/dropdown-menu/index.wxml
index 5b5ee6f..68b523f 100644
--- a/wxcomponents/vant/dropdown-menu/index.wxml
+++ b/wxcomponents/vant/dropdown-menu/index.wxml
@@ -14,6 +14,7 @@
style="{{ item.showPopup ? 'color:' + activeColor : '' }}"
>
+ {{item.title}}
{{ computed.displayTitle(item) }}
diff --git a/wxcomponents/vant/dropdown-menu/index.wxs b/wxcomponents/vant/dropdown-menu/index.wxs
index 2b000f2..2d23ca0 100644
--- a/wxcomponents/vant/dropdown-menu/index.wxs
+++ b/wxcomponents/vant/dropdown-menu/index.wxs
@@ -1,9 +1,8 @@
/* eslint-disable */
function displayTitle(item) {
- if (item.title) {
- return item.title;
- }
-
+ // if (!item.value) {
+ // return item.title;
+ // }
var match = item.options.filter(function(option) {
return option.value === item.value;
});
diff --git a/wxcomponents/vant/dropdown-menu/index.wxss b/wxcomponents/vant/dropdown-menu/index.wxss
index be43ef7..87021fa 100644
--- a/wxcomponents/vant/dropdown-menu/index.wxss
+++ b/wxcomponents/vant/dropdown-menu/index.wxss
@@ -1,8 +1,6 @@
@import '../common/index.wxss';
.van-dropdown-menu {
- background-color: var(--dropdown-menu-background-color, #fff);
- box-shadow: var(--dropdown-menu-box-shadow, 0 2px 12px hsla(210, 1%, 40%, .12));
display: flex;
height: var(--dropdown-menu-height, 50px);
-webkit-user-select: none;
@@ -61,15 +59,15 @@
flex: row nowrap;
justify-content: center;
align-items: center;
- gap: 4px;
+ gap: 8rpx;
}
.select-title {
- font-weight: 600;
+ font-weight: bold;
transition: .2s all;
+ color: #071437;
}
-
.van-dropdown-menu__title .arrow {
border-style: solid;
border-color: #000;