diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index c5803e4..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index c5803e4..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/build/webpack.dev.conf.js b/build/webpack.dev.conf.js index 08fdca3..12bc708 100644 --- a/build/webpack.dev.conf.js +++ b/build/webpack.dev.conf.js @@ -56,7 +56,7 @@ filename: 'index.html', template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: '智能闸井监测管理系统' }) ] diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js index 9009b9d..18d9c90 100644 --- a/build/webpack.prod.conf.js +++ b/build/webpack.prod.conf.js @@ -54,7 +54,7 @@ filename: config.build.index, template: 'index.html', inject: true, - favicon: resolve('favicon.ico'), + favicon: resolve('favicon1.ico'), title: 'vue-admin-template', minify: { removeComments: true, diff --git a/favicon.ico b/favicon.ico deleted file mode 100644 index c5803e4..0000000 --- a/favicon.ico +++ /dev/null Binary files differ diff --git a/favicon1.ico b/favicon1.ico new file mode 100644 index 0000000..c5803e4 --- /dev/null +++ b/favicon1.ico Binary files differ diff --git a/src/views/caseManage/caseCommon/caseListTable.vue b/src/views/caseManage/caseCommon/caseListTable.vue index 56bb0fd..07ece0e 100644 --- a/src/views/caseManage/caseCommon/caseListTable.vue +++ b/src/views/caseManage/caseCommon/caseListTable.vue @@ -204,7 +204,7 @@ this.$emit('changePage', this.listQuery) }, cellStyle({ row, column, rowIndex, columnIndex }) { - if (columnIndex === 7) { + if (column.label === '处理状态') { const bg = row.stateName === '处理中' ? 'background-color: #45B076;' : row.stateName === '待处理' ? 'background-color: rgb(230, 250, 12);' : '' return bg } else {