admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-cjw' into shenzhen-dev

Browse Source
This commit is contained in:
Vce 2024-03-26 16:28:10 +08:00
commit c6364d35b3
7 changed files with 33 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/assets/js/http.js
View File

@ -73,7 +73,7 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://101.43.164.214:12350/'//中建五局线上
// axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
// axios.defaults.baseURL = 'http://118.121.198.147:23232/'//港投(成润)正式
// axios.defaults.baseURL ='http://jxj.zhgdyun.com:100/' //演示平台/·
axios.defaults.baseURL ='http://jxj.zhgdyun.com:100/' //演示平台/·
// axios.defaults.baseURL ='http://192.168.34.221:8188/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地

4
src/components/account.vue
View File

@ -125,7 +125,9 @@
@click="goto6()"
v-if="
$route.path.indexOf('/firm/projectManage') == -1 &&
$store.state.userInfo.systemLogoConfig.isShowProjectFront == 1
$store.state.userInfo.systemLogoConfig.isShowProjectFront == 1 &&
$store.state.userInfo.accountType == 5 &&
$store.state.userInfo.accountType == 6
"
:title="projectFront"
>

3
src/store/index.js
View File

@ -48,8 +48,11 @@ export default new Vuex.Store({
// FILEURL:' http://101.43.164.214:11111/image/',// 百色
// UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄
// FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄
// UPLOADURL:'http://jxj.zhgdyun.com:100/upload/image/',// 演示平台
// FILEURL:'http://jxj.zhgdyun.com:100/image/',// 演示平台
// UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
// FILEURL:'http://10.0.1.43:6023/image/',//测试
BASEURL: baseUrl
? baseUrl
: window.location.protocol + "//" + window.location.host + "/", //正式环境

5
src/views/projectFront/devicePosition/dataPay/dataModule/dataPayAlarmRecord.vue
View File

@ -4,8 +4,8 @@
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<!-- 机械设备名称 -->
<el-form-item label="机械设备名称" prop="equipmentName">
<el-select v-model="searchForm.equipmentName" placeholder="请选择" clearable :style="{ width: '100%' }" >
<el-option v-for="(item, index) in equipmentList" :key="index" :label="item.equipmentName" :value="item.equipmentName" ></el-option>
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
<el-option v-for="(item, index) in equipmentList" :key="index" :label="item.equipmentName" :value="item.devSn" ></el-option>
</el-select>
</el-form-item>
<!-- 设备序号 -->
@ -123,6 +123,7 @@ export default {
},
refresh() {
this.searchForm = {}
this.daterange = []
this.pageInfo.pageNo = 1 //页数
this.pageInfo.pageSize = 10 //条数
this.getPage()

25
src/views/projectFront/devicePosition/dataPay/dataModule/dataPayRealTimeData.vue
View File

@ -4,8 +4,8 @@
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<!-- 机械设备名称 -->
<el-form-item label="机械设备名称" prop="equipmentName">
<el-select v-model="searchForm.equipmentName" placeholder="请选择" clearable :style="{ width: '100%' }" >
<el-option v-for="(item, index) in equipmentList" :key="index" :label="item.equipmentName" :value="item.equipmentName" ></el-option>
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }">
<el-option v-for="(item, index) in equipmentList" :key="index" :label="item.equipmentName" :value="item.devSn"></el-option>
</el-select>
</el-form-item>
<!-- 设备序号 -->
@ -16,9 +16,9 @@
</el-form-item>
<!-- 时间 -->
<el-form-item label="时间">
<el-date-picker size="medium" v-model="daterange" type="datetimerange" :default-time="['00:00:00', '23:59:59']"
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" :start-placeholder="'开始日期'" :end-placeholder="'结束日期'"
@change="changeDate">
<el-date-picker size="medium" v-model="daterange" type="datetimerange"
:default-time="['00:00:00', '23:59:59']" range-separator="至" value-format="yyyy-MM-dd HH:mm:ss"
:start-placeholder="'开始日期'" :end-placeholder="'结束日期'" @change="changeDate">
</el-date-picker>
</el-form-item>
<!-- 条件查询按钮 -->
@ -63,17 +63,9 @@
<el-table-column label="上传时间" align="center" prop="uploadTime" width="180" />
</el-table>
</vue-scroll>
<el-pagination
class="pagerBox"
@size-change="SizeChange"
@current-change="CurrentChange"
:current-page="pageInfo.pageNo"
:page-sizes="$store.state.PAGESIZRS"
:page-size="pageInfo.pageSize"
layout="total, sizes, prev, pager, next"
:total="Number(pageInfo.total)"
background
></el-pagination>
<el-pagination class="pagerBox" @size-change="SizeChange" @current-change="CurrentChange"
:current-page="pageInfo.pageNo" :page-sizes="$store.state.PAGESIZRS" :page-size="pageInfo.pageSize"
layout="total, sizes, prev, pager, next" :total="Number(pageInfo.total)" background></el-pagination>
</div>
</div>
</template>
@ -149,6 +141,7 @@ export default {
},
refresh() {
this.searchForm = {}
this.daterange = []
this.pageInfo.pageNo = 1 //页数
this.pageInfo.pageSize = 10 //条数
this.getPage()

6
src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayAlarmRecord.vue
View File

@ -4,8 +4,9 @@
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<!-- 人员名称 -->
<el-form-item label="人员名称" prop="workerInfoId">
<el-select v-model="searchForm.workerInfoId" placeholder="请选择" clearable :style="{ width: '100%' }" >
<el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option>
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
<!-- <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option> -->
<el-option v-for="(item, index) in devSnList" :key="index" :label="item.workerName" :value="item.devSn" ></el-option>
</el-select>
</el-form-item>
<!-- 设备序号 -->
@ -143,6 +144,7 @@ export default {
},
refresh() {
this.searchForm = {}
this.daterange = []
this.pageInfo.pageNo = 1 //页数
this.pageInfo.pageSize = 10 //条数
this.getPage()

30
src/views/projectFront/smartSafeHat/dataPay/dataModule/dataPayRealTimeData.vue
View File

@ -9,34 +9,15 @@
>
<!-- 人员名称 -->
<el-form-item label="人员名称" prop="workerInfoId">
<el-select
v-model="searchForm.workerInfoId"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in workerList"
:key="index"
:label="item.workerName"
:value="item.id"
></el-option>
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
<!-- <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option> -->
<el-option v-for="(item, index) in devSnList" :key="index" :label="item.workerName" :value="item.devSn" ></el-option>
</el-select>
</el-form-item>
<!-- 设备序号 -->
<el-form-item label="设备序号" prop="devSn">
<el-select
v-model="searchForm.devSn"
placeholder="请选择"
clearable
:style="{ width: '100%' }"
>
<el-option
v-for="(item, index) in devSnList"
:key="index"
:label="item.devSn"
:value="item.devSn"
></el-option>
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" >
<el-option v-for="(item, index) in devSnList" :key="index" :label="item.devSn" :value="item.devSn" ></el-option>
</el-select>
</el-form-item>
<!-- 时间 -->
@ -181,6 +162,7 @@ export default {
},
refresh() {
this.searchForm = {};
this.daterange = []
this.pageInfo.pageNo = 1; //页数
this.pageInfo.pageSize = 10; //条数
this.getPage();