修改完善
This commit is contained in:
ancong
parent
7498a83590
commit
810f195184
|
|
@ -1,12 +1,12 @@
|
|||
ENV='development'
|
||||
# base api
|
||||
VITE_APP_BASE_URL='http://219.146.89.198'
|
||||
VITE_APP_BASE_URLpro='9380'
|
||||
#VITE_APP_BASE_URL='http://219.146.89.198'
|
||||
#VITE_APP_BASE_URLpro='9380'
|
||||
#VITE_APP_BASE_URL='http://192.168.1.115'
|
||||
#VITE_APP_BASE_URLpro='8088'
|
||||
|
||||
#VITE_APP_BASE_URL='http://219.146.89.198'
|
||||
#VITE_APP_BASE_URLpro='18080'
|
||||
VITE_APP_BASE_URL='http://219.146.89.198'
|
||||
VITE_APP_BASE_URLpro='18080'
|
||||
# VITE_APP_BASE_PRE="http://rest.apizza.net/mock/eb75fcfa7845b9bd4a958fe69e3af419"
|
||||
VITE_APP_BASE_PRE="/prod-api"
|
||||
VITE_APP_BASE_NAME='小程序'
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
ENV='production'
|
||||
# base api
|
||||
VITE_APP_BASE_URL='http://219.146.89.198'
|
||||
VITE_APP_BASE_URLpro='9380'
|
||||
|
||||
#VITE_APP_BASE_URL='http://219.146.89.198'
|
||||
#VITE_APP_BASE_URLpro='18080'
|
||||
#VITE_APP_BASE_URLpro='9380'
|
||||
|
||||
VITE_APP_BASE_URL='http://219.146.89.198'
|
||||
VITE_APP_BASE_URLpro='18080'
|
||||
VITE_APP_BASE_PRE='/prod-api'
|
||||
VITE_APP_BASE_NAME='vite项目'
|
||||
|
|
|
|||
|
|
@ -473,7 +473,7 @@
|
|||
// upload(tempFiles);
|
||||
// }
|
||||
const maxSize = 5 * 1024 * 1024; //暂定超过5m压缩
|
||||
|
||||
debugger
|
||||
tempFiles.map((imgInfo, index) => {
|
||||
// debugger
|
||||
if (imgInfo.size > maxSize) {
|
||||
|
|
@ -493,7 +493,8 @@
|
|||
});
|
||||
return
|
||||
} else {
|
||||
upload(tempFiles);
|
||||
// upload(tempFiles);
|
||||
upload([imgInfo]);
|
||||
return
|
||||
}
|
||||
})
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
"appid" : "__UNI__D31BBA7",
|
||||
"package" : "com.skzh.hzyjzaqyhglpt",
|
||||
"description" : "安全隐患排查app",
|
||||
"versionName" : "2.0.0",
|
||||
"versionCode" : 200,
|
||||
"versionName" : "2.0.2",
|
||||
"versionCode" : 202,
|
||||
"transformPx" : false,
|
||||
/* 5+App特有相关 */
|
||||
"app-plus" : {
|
||||
|
|
|
|||
|
|
@ -991,7 +991,7 @@
|
|||
}
|
||||
|
||||
//debugger
|
||||
if (this.projectid != '' & this.isedit) {
|
||||
if (this.projectid & this.isedit) {
|
||||
//编辑
|
||||
upsafety_hazardproject(this.formdata).then(res => {
|
||||
//debugger
|
||||
|
|
@ -1059,7 +1059,7 @@
|
|||
}
|
||||
|
||||
//debugger
|
||||
if (this.projectid != '' & this.isedit) {
|
||||
if (this.projectid & this.isedit) {
|
||||
//编辑
|
||||
upuserprojectbatch(this.xmcylist, this.projectid).then(res => {
|
||||
//debugger
|
||||
|
|
@ -1122,6 +1122,7 @@
|
|||
// jzfllist2: [],
|
||||
// jzfllist3: [],
|
||||
// }],
|
||||
// debugger
|
||||
if (!this.projectid) {
|
||||
this.$modal.msgError(`请先保存项目信息！`)
|
||||
return false;
|
||||
|
|
@ -1185,11 +1186,12 @@
|
|||
}
|
||||
let delIds = this.findDeletedIds(this.buildingCmdsListold, this.buildingCmdsList, 'buildingId');
|
||||
//debugger
|
||||
if (this.projectid != '' & this.isedit) {
|
||||
if (this.projectid & this.isedit) {
|
||||
//编辑
|
||||
addsafety_hazardbuilding(this.buildingCmdsList).then(res => {
|
||||
//debugger
|
||||
upsafety_hazardbuilding(delIds, this.buildingCmdsList).then(res => {
|
||||
// debugger
|
||||
this.$modal.msgSuccess("修改成功！");
|
||||
|
||||
// uni.navigateBack({
|
||||
// delta: 1, // 默认返回上一页，数值越大返回层数越多
|
||||
// success: () => {
|
||||
|
|
@ -1201,9 +1203,12 @@
|
|||
// }, 300);
|
||||
|
||||
});
|
||||
|
||||
|
||||
} else {
|
||||
upsafety_hazardbuilding(delIds, this.buildingCmdsList).then(res => {
|
||||
// debugger
|
||||
//新增
|
||||
addsafety_hazardbuilding(this.buildingCmdsList).then(res => {
|
||||
//debugger
|
||||
this.$modal.msgSuccess("添加成功！");
|
||||
// uni.navigateBack({
|
||||
// delta: 1, // 默认返回上一页，数值越大返回层数越多
|
||||
|
|
@ -1263,7 +1268,7 @@
|
|||
}
|
||||
|
||||
//debugger
|
||||
if (this.projectid != '' & this.isedit) {
|
||||
if (this.projectid & this.isedit) {
|
||||
//编辑
|
||||
|
||||
// let dataform={
|
||||
|
|
|
|||
|
|
@ -184,7 +184,7 @@
|
|||
@click="daochu()"></u-button>
|
||||
</view>
|
||||
</view>
|
||||
<u-table row-key="createTime" rowHeight="60" customClass="mewtable2" ref="pageTable" :scrollX="true"
|
||||
<u-table row-key="createTime" rowHeight="150" customClass="mewtable2" ref="pageTable" :scrollX="true"
|
||||
:cellStyle="{padding:'10px 10px 0px 10px'}" :data="jytableInfolist" :ellipsis="false" height="440"
|
||||
:border="true" style="width:98%; margin: 0 auto;">
|
||||
<u-table-column type="index" fixed width="50" align="center" headerAlign="center"></u-table-column>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<view style="color: #ca4341; margin-right:5px;">*</view>
|
||||
<view>单位名称：</view>
|
||||
</view>
|
||||
<u-input style="width: 300px;" @change="chaxunqy()" v-model="queryParams.createBy" clearable
|
||||
<u-input style="width: 300px;" @change="chaxunqy()" v-model="queryParams.nameLike" clearable
|
||||
placeholder="请输入单位名称"></u-input>
|
||||
</view>
|
||||
<view class="querybox">
|
||||
|
|
@ -93,7 +93,7 @@
|
|||
<scroll-view class="table-body" scroll-y scroll-x :scroll-with-animation="true"
|
||||
:style="{ height: bodyHeight + 'px' }">
|
||||
<block v-for="(item, rowIndex) in tableData" :key="'body-' + rowIndex">
|
||||
<view class="table-row" v-if="item.level === 0 || checkOpen(item.pids[item.pids.length - 1])">
|
||||
<view class="table-row" v-if="item.level === 1|| checkOpen(item.pids[item.pids.length - 1])">
|
||||
<!-- <view v-for="(col, colIndex) in columns" :key="'body-' + rowIndex + '-' + colIndex"
|
||||
class="table-body-cell" :style="{
|
||||
width: col.width + 'px',
|
||||
|
|
@ -103,7 +103,7 @@
|
|||
</view> -->
|
||||
<view class="table-body-cell" :style="{
|
||||
width: columns[0].width + 'px',
|
||||
minWidth: columns[0].minWidth + 'px',paddingLeft:item.level === 0?'8px':item.level === 1?'22px':'34px'
|
||||
minWidth: columns[0].minWidth + 'px',paddingLeft:item.level === 1?'8px':item.level === 2?'22px':'34px'
|
||||
}" style="justify-content:flex-start;">
|
||||
<u-checkbox v-model:checked="item.checked" @change="dianjifxk($event,item, i)"></u-checkbox>
|
||||
<u-icon v-if="item.hasChildren" :name="!checkOpen(item.id) ? 'play-right-fill' : 'arrow-down-fill'"
|
||||
|
|
@ -111,7 +111,8 @@
|
|||
<view v-if="item.level && !item.hasChildren"
|
||||
style="width: 24rpx;height: 26rpx;display: inline-block;">
|
||||
</view>
|
||||
<text class="padding-left-5" @click="open(item, i)">{{ item.name }}</text>
|
||||
<text class="padding-left-5"
|
||||
@click="open(item, i)">{{ item.name }}{{item.shortName?`${'('+item.shortName+')'}`:''}}</text>
|
||||
</view>
|
||||
<view class="table-body-cell" :style="{
|
||||
width: columns[1].width + 'px',
|
||||
|
|
@ -157,7 +158,7 @@
|
|||
<u-modal content="" :closeOnClickOverlay="true" :title="modaltitle" :showCancelButton="true" confirmText="保存"
|
||||
width="600px" :show="addshow" @confirm="baocun()" @cancel="() => addshow = false">
|
||||
<view class="slot-content" style="width: 100%;">
|
||||
<view class="wenjuanadbox" style="width: 100%; height:200px; align-items: left; border-top:1px solid #eee;">
|
||||
<view class="wenjuanadbox" style="width: 100%; height:250px; align-items: left; border-top:1px solid #eee;">
|
||||
<view class="querybox1" style=" margin-top: 10px;">
|
||||
<view class="querybox_title" style="display: flex; flex-direction: row;">
|
||||
<view style="color: #ca4341; margin-right:5px;">*</view>
|
||||
|
|
@ -177,6 +178,15 @@
|
|||
<u-input v-model="formdata.name" clearable placeholder="请输入单位名称"></u-input>
|
||||
</view>
|
||||
</view>
|
||||
<view class="querybox1" style=" margin-top: 10px;">
|
||||
<view class="querybox_title" style="display: flex; flex-direction: row;">
|
||||
<view style="color: #ca4341; margin-right:5px;">*</view>
|
||||
<view>简称：</view>
|
||||
</view>
|
||||
<view style="width: 300px;">
|
||||
<u-input v-model="formdata.shortName" clearable placeholder="请输入公司简称"></u-input>
|
||||
</view>
|
||||
</view>
|
||||
<view class="querybox1" style=" margin-top: 10px;">
|
||||
<view class="querybox_title" style="display: flex; flex-direction: row;">
|
||||
<view style="color: #ca4341; margin-right:5px;"></view>
|
||||
|
|
@ -368,6 +378,7 @@
|
|||
id: null,
|
||||
customerCompanyId: null,
|
||||
selectedArr: [],
|
||||
shortName: '',
|
||||
name: "",
|
||||
code: "",
|
||||
level: null,
|
||||
|
|
@ -483,9 +494,12 @@
|
|||
let arr = [];
|
||||
if (this.isArray(nodes)) {
|
||||
for (let i = 0, l = nodes.length; i < l; i++) {
|
||||
// debugger
|
||||
const node = nodes[i];
|
||||
node.pids = ids;
|
||||
node.level = ids.length - 1;
|
||||
// node.level = ids.length - 1;
|
||||
node.level = nodes[i].level;
|
||||
|
||||
arr.push(node); // 取每项数据放入一个新数组
|
||||
if (this.isArray(node['children']) && node['children'].length > 0)
|
||||
// 若存在children则递归调用，把数据拼接到新数组中，并且删除该children
|
||||
|
|
@ -505,9 +519,11 @@
|
|||
this.openList = list;
|
||||
},
|
||||
checkOpen(id) {
|
||||
//debugger
|
||||
return ~this.openList.findIndex(o => o === id);
|
||||
},
|
||||
open(item, index) {
|
||||
//debugger
|
||||
if (!this.checkOpen(item.id)) {
|
||||
this.openList.push(item.id);
|
||||
} else {
|
||||
|
|
@ -598,6 +614,7 @@
|
|||
list = this.treeToArray(list);
|
||||
// debugger
|
||||
this.tableData = list;
|
||||
this.openList = [list[0].id];
|
||||
|
||||
})
|
||||
},
|
||||
|
|
@ -623,22 +640,36 @@
|
|||
selectedArr: [],
|
||||
name: "",
|
||||
code: "",
|
||||
shortName: '',
|
||||
level: null,
|
||||
parentId: null,
|
||||
status: "0",
|
||||
remark: ""
|
||||
};
|
||||
|
||||
|
||||
//debugger
|
||||
//新增
|
||||
if (this.rowitem) {
|
||||
this.formdata.level = Number(this.rowitem.level) + Number(1);
|
||||
this.formdata.parentId = this.rowitem.customerCompanyId;
|
||||
this.formdata.customerCompanyId = this.rowitem.customerCompanyId;
|
||||
// this.formdata.customerCompanyId = this.rowitem.customerCompanyId;
|
||||
this.formdata.selectedArr = [String(this.rowitem.customerCompanyId)];
|
||||
}
|
||||
|
||||
this.modaltitle = "添加业主单位";
|
||||
},
|
||||
|
||||
upxiangmu() {
|
||||
//详情
|
||||
this.isedit = true;
|
||||
getcustomerCompanyIdinfo(this.rowitem.customerCompanyId).then(res => {
|
||||
//debugger
|
||||
this.formdata = res.data;
|
||||
this.formdata.selectedArr = [String(this.formdata.customerCompanyId)];
|
||||
this.addshow = true;
|
||||
});
|
||||
|
||||
},
|
||||
baocun() {
|
||||
//保存
|
||||
// debugger
|
||||
|
|
@ -648,6 +679,9 @@
|
|||
} else if (!this.formdata.name) {
|
||||
this.$modal.msgError("请输入单位名称！")
|
||||
return;
|
||||
} else if (!this.formdata.shortName) {
|
||||
this.$modal.msgError("请输入公司简称！")
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -666,7 +700,14 @@
|
|||
});
|
||||
} else {
|
||||
// debugger
|
||||
|
||||
if (this.formdata.level == 4) {
|
||||
this.$modal.msgError("单位级别最大为三级！")
|
||||
return;
|
||||
|
||||
}
|
||||
this.formdata.customerCompanyId = this.formdata.selectedArr[0].toString();
|
||||
|
||||
addsafety_hazardcompany(this.formdata).then(res => {
|
||||
// debugger
|
||||
this.$modal.msgSuccess("添加成功！");
|
||||
|
|
@ -719,17 +760,7 @@
|
|||
|
||||
|
||||
},
|
||||
upxiangmu() {
|
||||
//详情
|
||||
this.isedit = true;
|
||||
getcustomerCompanyIdinfo(this.rowitem.customerCompanyId).then(res => {
|
||||
// debugger
|
||||
this.formdata = res.data;
|
||||
this.formdata.selectedArr = [String(this.formdata.customerCompanyId)];
|
||||
this.addshow = true;
|
||||
});
|
||||
|
||||
},
|
||||
statusswitch(e, item, index) {
|
||||
//更改状态
|
||||
// debugger
|
||||
|
|
|
|||
|
|
@ -126,7 +126,7 @@
|
|||
</u-radio-group>
|
||||
</view>
|
||||
</uni-col>
|
||||
<uni-col :xs="24" :sm="12" :md="20" v-if="formdata.result=='1'">
|
||||
<!-- <uni-col :xs="24" :sm="12" :md="20" v-if="formdata.result=='1'">
|
||||
<view class="querybox" style="margin: 15px 0 15px 0;">
|
||||
<view class="querybox_title" style="width:90px;text-align: right;display: flex; flex-direction: row;">
|
||||
<view style="color: #ca4341; ">*</view>
|
||||
|
|
@ -135,10 +135,9 @@
|
|||
<u-radio-group v-model="formdata.issueStandardChanged" placement="row" activeColor="#007aff">
|
||||
<u-radio activeColor="green" :name="1" label="是" style="margin-left: 20px; margin-right: 10px;"></u-radio>
|
||||
<u-radio activeColor="green" :name="2" label="否" style="margin-right: 10px;"></u-radio>
|
||||
<!-- <u-radio activeColor="green" :name="3" label="不涉及" style="margin-right: 10px;"></u-radio> -->
|
||||
</u-radio-group>
|
||||
</view>
|
||||
</uni-col>
|
||||
</uni-col> -->
|
||||
</uni-row>
|
||||
|
||||
|
||||
|
|
@ -814,13 +813,15 @@
|
|||
else if (!this.formdata.result) {
|
||||
this.$modal.msgError("请选择是否存在问题！")
|
||||
return;
|
||||
} else if (this.formdata.result == '1') {
|
||||
if (!this.formdata.issueStandardChanged) {
|
||||
this.$modal.msgError("请选择问题是否因规范更替引起！")
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
// else if (this.formdata.result == '1') {
|
||||
// if (!this.formdata.issueStandardChanged) {
|
||||
// this.$modal.msgError("请选择问题是否因规范更替引起！")
|
||||
// return;
|
||||
// }
|
||||
|
||||
// }
|
||||
this.formdata.imgUrl = this.upimgfileList1.toString();
|
||||
this.formdata.projectId = this.projectid;
|
||||
//debugger
|
||||
|
|
@ -873,13 +874,15 @@
|
|||
else if (!this.formdata.result) {
|
||||
this.$modal.msgError("请选择是否存在问题！")
|
||||
return;
|
||||
} else if (this.formdata.result == '1') {
|
||||
if (!this.formdata.issueStandardChanged) {
|
||||
this.$modal.msgError("请选择问题是否因规范更替引起！")
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
// else if (this.formdata.result == '1') {
|
||||
// if (!this.formdata.issueStandardChanged) {
|
||||
// this.$modal.msgError("请选择问题是否因规范更替引起！")
|
||||
// return;
|
||||
// }
|
||||
|
||||
// }
|
||||
this.formdata.imgUrl = this.upimgfileList1.toString();
|
||||
this.formdata.projectId = this.projectid;
|
||||
|
||||
|
|
|
|||
|
|
@ -44,9 +44,9 @@
|
|||
v-if="$checkPermi(['safety_hazard:log:query'])"></u-button>
|
||||
<u-button style="width:100px; float: left;margin-left: 20px;" type="primary" icon="list-dot" text="评价表"
|
||||
:disabled="!queryParams.projectId" @click="pingjia()" size="small"></u-button>
|
||||
<u-button style="width:100px; float: left; margin-left:10px;" type="success" icon="plus-circle" text="生成处理建议"
|
||||
<!-- <u-button style="width:100px; float: left; margin-left:10px;" type="success" icon="plus-circle" text="生成处理建议"
|
||||
:disabled="!queryParams.projectId" @click="addjianyi()" size="small"
|
||||
v-if="$checkPermi(['safety_hazard:suggestion:add'])"></u-button>
|
||||
v-if="$checkPermi(['safety_hazard:suggestion:add'])"></u-button> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
|
@ -82,14 +82,14 @@
|
|||
</u-tree>
|
||||
</view>
|
||||
<view style="width:80%;display: flex; flex-direction: column;">
|
||||
<u-table row-key="createTime" rowHeight="150" customClass="mewtable2" ref="pageTable" :scrollX="true"
|
||||
<u-table row-key="createTime" rowHeight="180" customClass="mewtable2" ref="pageTable" :scrollX="true"
|
||||
:cellStyle="{padding:'10px 10px 0px 10px'}" :data="tableData" :ellipsis="false" height="460" :border="true"
|
||||
@select="handleSelectionChange">
|
||||
<!-- :span-method="spanMethodWithColspan" -->
|
||||
<u-table-column type="selection" fixed width="55" align="center" headerAlign="center"></u-table-column>
|
||||
|
||||
<u-table-column prop="name3" width="100" label="子项" headerAlign="center" />
|
||||
<u-table-column prop="name4" width="200" label="要素" headerAlign="center">
|
||||
<u-table-column prop="name4" width="240" label="要素" headerAlign="center">
|
||||
<template #default="{ row, index }">
|
||||
<view style="height: auto !important;">
|
||||
<!-- <u-link :text="row.name4" :under-line="true" @click.navite="openright(row)"></u-link> -->
|
||||
|
|
@ -115,19 +115,18 @@
|
|||
size="mini"></u-tag>
|
||||
</template>
|
||||
</u-table-column>
|
||||
<u-table-column prop="" width="70" :headerEllipsis="false" align="center" label="问题是否因规范更替引起"
|
||||
<!-- <u-table-column prop="" width="70" :headerEllipsis="false" align="center" label="问题是否因规范更替引起"
|
||||
headerAlign="center">
|
||||
<template #default="{ row, index }">
|
||||
<!-- {{row.result=='1'?'是':row.result=='2'?'否':row.result=='3'?'不涉及':''}}-->
|
||||
<u-tag v-if="row.issueStandardChanged"
|
||||
:text="row.issueStandardChanged=='1'?'是':row.issueStandardChanged=='2'?'否':row.result=='3'?'不涉及':''"
|
||||
:type="row.issueStandardChanged=='1'?'error':row.issueStandardChanged=='2'?'success':row.issueStandardChanged=='3'?'primary':''"
|
||||
size="mini"></u-tag>
|
||||
</template>
|
||||
</u-table-column>
|
||||
</u-table-column> -->
|
||||
|
||||
|
||||
<u-table-column prop="issue" width="150" label="问题描述" headerAlign="center" />
|
||||
<u-table-column prop="issue" width="180" label="问题描述" headerAlign="center" />
|
||||
<u-table-column prop="" width="50" :headerEllipsis="false" label="问题图片" align="center" headerAlign="center">
|
||||
<template #default="{ row, index }">
|
||||
<u-tag v-if="row.imgNum" @click="showimg(row)" :text="row.imgNum" type="primary" size="mini"></u-tag>
|
||||
|
|
|
|||
Loading…
Reference in New Issue