caoyan/energy_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备生产日期可选最小值修改、任务列表增加审核状态

Browse Source
This commit is contained in:
jiangyinzhi
2025-05-20 09:12:17 +08:00
parent d8e4579003
commit 91be51e568
14 changed files with 70 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.production
+1 -1
View File
@@ -6,7 +6,7 @@ NODE_ENV=production
# 测试0 生产1
VUE_APP_ENV = '1'
# 定义变量
VUE_APP_CITY_TYPE = 'sx'
VUE_APP_CITY_TYPE = 'ah'
# base api
VUE_APP_BASE_API = ''
src/api/config.js
+3 -2
View File
@@ -16,10 +16,11 @@ if (process.env.NODE_ENV === 'development') {
} else {
// 生产环境
// baseURL = '' // 本地 打包以后只需要空路径就行
// baseURL = '/proxy-ah' //安徽 打包以后的路径
baseURL = '/proxy-ah' //安徽 打包以后的路径
// baseURL = '/proxy-nx' //宁夏 打包以后的路径
// baseURL = '/proxy-xj' //新疆 打包以后的路径
baseURL = '/proxy-sx' //山西 打包以后的路径
// baseURL = '/proxy-sx' //山西 打包以后的路径
// baseURL = '/proxy-cq' //重庆 打包以后的路径
}
src/mixins/mixin.js
+1
View File
@@ -29,6 +29,7 @@ const mixin = {
datePicker: false,
currentDate: new Date(),
maxDate: new Date(),
minDate: new Date('1900/1/1'),
equipTypeOption: {
'01':[
{value: "0101", text: "螺杆式空压机"},
src/settings.js
+1 -1
View File
@@ -12,7 +12,7 @@ module.exports = {
menuExclude: [],
// ${process.env.VUE_APP_BASE_API}
// https://portal.xt.nfjbill.ren:30004
downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-sx/file/minio/download/`,
downloadUrl: `${process.env.VUE_APP_BASE_API}/proxy-ah/file/minio/download/`,
// downloadUrl: `https://www.greensgcc.com/proxy-xj/file/minio/download/`,
// downloadUrl: `http://172.29.69.38:19012/proxy-sx/file/minio/download/`,
uploadUrl: `${process.env.VUE_APP_BASE_API}/file/minio/upload/`,
src/views/energyEfficiency/taskManage.vue
+15 -1
View File
@@ -178,6 +178,11 @@
<!-- </div> -->
<div class="list-bot">
<div >
<van-tag v-if="item.checkState" :type="item.checkState=='10'?'danger':item.checkState=='20'?'warning':'success'" round >
{{checkStateObj[item.checkState]}}
</van-tag>
</div>
<div>
<button
@click="show=true"
@@ -264,6 +269,11 @@ export default {
},
data() {
return {
checkStateObj: {
'10': '地市待审批',
'20': '省级待审批',
'90': '审批完成',
},
show: false,
message: '',
statusPopup: false,
@@ -734,7 +744,11 @@ export default {
.list-bot {
margin-top: 6px;
display: flex;
justify-content: flex-end;
align-items: center;
justify-content: space-between;
.van-tag{
padding: 4px 8px!important;
}
div {
color: #a1a1a1;
margin-top: 3px;
src/views/enterprise/bengjiSystemAddEdit.vue
+1 -1
View File
@@ -39,7 +39,7 @@
<Year :show="yearShow" :num="1" @onConfirmYear="onConfirmYear" @onCancelYear="onCancelYear" />
<!-- 年份选择 -->
<van-popup v-model="datePicker" position="bottom">
<van-datetime-picker v-model="currentDate" type="date" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
<van-datetime-picker v-model="currentDate" type="date" :min-date="minDate" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
</van-popup>
<VanPickerNew :show="showOption" :columns="columnsList" :loading="loading" @onConfirm="onConfirmOption" @onCancel="showOption=false" />
</div>
src/views/enterprise/fengjiSystemAddEdit.vue
+1 -1
View File
@@ -39,7 +39,7 @@
<Year :show="yearShow" :num="1" @onConfirmYear="onConfirmYear" @onCancelYear="onCancelYear" />
<!-- 年份选择 -->
<van-popup v-model="datePicker" position="bottom">
<van-datetime-picker v-model="currentDate" type="date" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
<van-datetime-picker v-model="currentDate" type="date" :min-date="minDate" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
</van-popup>
<VanPickerNew :show="showOption" :columns="columnsList" :loading="loading" @onConfirm="onConfirmOption" @onCancel="showOption=false" />
</div>
src/views/enterprise/generalEnergyAddEdit.vue
+1 -1
View File
@@ -52,7 +52,7 @@
</VanPickerNew>
<!-- 年份选择 -->
<van-popup v-model="datePicker" position="bottom">
<van-datetime-picker v-model="currentDate" type="date" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
<van-datetime-picker v-model="currentDate" type="date" :min-date="minDate" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
</van-popup>
</div>
</template>
src/views/enterprise/kongyajiSystemAddEdit.vue
+1 -1
View File
@@ -39,7 +39,7 @@
<Year :show="yearShow" :num="1" @onConfirmYear="onConfirmYear" @onCancelYear="onCancelYear" />
<!-- 年份选择 -->
<van-popup v-model="datePicker" position="bottom">
<van-datetime-picker v-model="currentDate" type="date" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
<van-datetime-picker v-model="currentDate" type="date" :min-date="minDate" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
</van-popup>
<VanPickerNew :show="showOption" :columns="columnsList" :loading="loading" @onConfirm="onConfirmOption" @onCancel="showOption=false" />
</div>
src/views/facilityManage/bursting/burstingDetail.vue
+1 -1
View File
@@ -123,7 +123,7 @@
<!-- 年份选择 -->
<van-popup v-model="datePicker" position="bottom">
<van-datetime-picker v-model="currentDate" type="date" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
<van-datetime-picker v-model="currentDate" type="date" :min-date="minDate" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
</van-popup>
<VanPickerNew :show="showOption" :columns="columnsList" :loading="loading" @onConfirm="onConfirmOption" @onCancel="showOption=false" />
src/views/facilityManage/components/distributionSystem.vue
+41 -7
View File
@@ -183,7 +183,7 @@
<!-- 年份选择 -->
<van-popup v-model="datePicker" position="bottom">
<van-datetime-picker v-model="currentDate" type="date" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
<van-datetime-picker v-model="currentDate" type="date" :min-date="minDate" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
</van-popup>
<VanPickerNew :show="showOption" :columns="columnsList" :loading="loading" @onConfirm="onConfirmOption" @onCancel="showOption=false" />
</div>
@@ -405,7 +405,40 @@ export default {
//定时器
edSet: null,
modifyTimer:null,
required: false
required: false,
voltageLevelData:[
{
text:'10kV',name:'10kV',
value:'1',code:'1',
},{
text:'380V',name:'380V',
value:'2',code:'2',
},{
text:'6kV',name:'6kV',
value:'3',code:'3',
},{
text:'35kV',name:'35kV',
value:'4',code:'4',
},{
text:'110kV',name:'110kV',
value:'5',code:'5',
},{
text:'220kV',name:'220kV',
value:'6',code:'6',
},{
text:'20kV',name:'20kV',
value:'7',code:'7',
},{
text:'200V',name:'200V',
value:'8',code:'8',
},{
text:'66kV',name:'66kV',
value:'9',code:'9',
},{
text:'330kV',name:'330kV',
value:'10',code:'10',
},
],
// notData: {
// charging: {
// formColumnsField: ['deviceTypeName', 'computeName'],
@@ -507,11 +540,12 @@ export default {
//获取系统码表返回值数据
//电压等级
async getList() {
const dydj = {
id: 80000001022,
type: 'dydj',
}
const level = await getCodeCommon(dydj)
// const dydj = {
// id: 80000001022,
// type: 'dydj',
// }
// const level = await getCodeCommon(dydj)
const level = this.voltageLevelData
console.log(level,335);
level.forEach((v) => {
v.checked = false
src/views/facilityManage/components/heatingSystem.vue
+1 -1
View File
@@ -155,7 +155,7 @@
<!-- 年份选择 -->
<van-popup v-model="datePicker" position="bottom">
<van-datetime-picker v-model="currentDate" type="date" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
<van-datetime-picker v-model="currentDate" type="date" :min-date="minDate" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
</van-popup>
</div>
</van-form>
src/views/facilityManage/components/multipleAir.vue
+1 -1
View File
@@ -114,7 +114,7 @@
<!-- 年份选择 -->
<van-popup v-model="datePicker" position="bottom">
<van-datetime-picker v-model="currentDate" type="date" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
<van-datetime-picker v-model="currentDate" type="date" :min-date="minDate" :max-date="maxDate" @confirm="onConfirmDate" @cancel="datePicker = false" />
</van-popup>
</div>
</template>
vue.config.js
+1
View File
@@ -22,6 +22,7 @@ module.exports = {
// outputDir: ('1006028-' + pkgInfo.version), //生产包
outputDir: 'dist', //测试环境
lintOnSave: false,
parallel: false,
publicPath: '',
chainWebpack: config => {
// config.plugin('webpack-bundle-analyzer').use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin),