This commit is contained in:
”Rain“ 2024-05-29 21:17:28 +08:00
commit 19b88468a8
10 changed files with 122 additions and 110 deletions

View File

@ -28,77 +28,77 @@ function getLang() {
}
// 环境的切换
if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL = 'http://8.142.139.165:7080' // 湖里区
// axios.defaults.baseURL = 'http://124.71.87.250/'
// axios.defaults.baseURL = 'http://139.9.66.234:30/'
// axios.defaults.baseURL = 'http://14.29.220.211:6023/'
// axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光
// axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/'
// axios.defaults.baseURL = 'http://36.137.53.203:9090/' // 南昌地铁 17512009894 123456789 gdjt 87654321
// axios.defaults.baseURL = 'http://192.168.34.125:6023/'
// axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
// tag: 本地
// axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上(旧)地址
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/';
// axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
// axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
// axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲
// axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //
// axios.defaults.baseURL = 'http://120.236.247.200:9000/'; //横琴线上
// axios.defaults.baseURL = 'http://223.82.100.80:9000/'; //南昌地铁
// axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌地铁二期
// axios.defaults.baseURL = 'http://124.71.178.44:30/';
// axios.defaults.baseURL = 'http://192.168.34.125:9090/';
// axios.defaults.baseURL = 'http://192.168.88.220:6023/';
// axios.defaults.baseURL = 'http://124.71.178.44:9000/'; //中建 cscec101 123456
// axios.defaults.baseURL = 'https://jk.cscec1b1.com:5138/';//沃尔
// axios.defaults.baseURL = 'http://61.190.32.219:9050/'
// axios.defaults.baseURL = 'http://183.95.84.54:5800/'//合展-宿迁 zxsd 123456
// axios.defaults.baseURL = 'http://183.95.84.54:9500/'//贵州-敏尚 17512075572 123456
// axios.defaults.baseURL = 'http://183.95.84.34:7185/' //测试服
// axios.defaults.baseURL = 'http://183.60.227.61:30246/'
// axios.defaults.baseURL = 'http://183.60.227.61:30249/' //测试服2
// axios.defaults.baseURL = 'http://183.60.227.61:20561/' //龙光地产 龙光地产 123456
// axios.defaults.baseURL = 'http://218.92.215.138:9090/' //盐城 新佳城小区 123456
// axios.defaults.baseURL = 'http://36.137.53.203:9090/' //盐城 gdjt 123456789
// axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789
// axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上
// axios.defaults.baseURL = 'http://58.250.210.9:9090/' //深汕线上
// axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
// axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
// axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上(新)地址
// 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://192.168.34.221:8188/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
// axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖
// axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖(最新)地址
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工)
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
axios.defaults.baseURL = 'http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上(最新)地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上(最新)地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
// axios.defaults.baseURL = 'http://8.142.139.165:7080' // 湖里区
// axios.defaults.baseURL = 'http://124.71.87.250/'
// axios.defaults.baseURL = 'http://139.9.66.234:30/'
// axios.defaults.baseURL = 'http://14.29.220.211:6023/'
// axios.defaults.baseURL = 'https://zhgd.loganwy.com/' //龙光
// axios.defaults.baseURL = 'https://zhgd-uat.logan.com.cn/'
// axios.defaults.baseURL = 'http://36.137.53.203:9090/' // 南昌地铁 17512009894 123456789 gdjt 87654321
// axios.defaults.baseURL = 'http://192.168.34.125:6023/'
// axios.defaults.baseURL = 'http://124.71.178.44:100/' // 河南
// tag: 本地
// axios.defaults.baseURL = 'http://139.9.66.234:6324/' // 河南春笋
// axios.defaults.baseURL ='http://124.71.67.160:8088/' //中建四局线上(旧)地址
// axios.defaults.baseURL ='http://47.97.202.104:6023/' //金林湾线上旧
// axios.defaults.baseURL = 'http://47.97.202.104:6023/';
// axios.defaults.baseURL = 'http://139.9.66.234:8/';
// axios.defaults.baseURL = 'http://120.196.217.6:7000/'; // 鹤洲
// axios.defaults.baseURL = 'http://182.90.224.237:7000/'; // 广西
// axios.defaults.baseURL = 'http://120.196.217.6:7000/' //鹤洲
// axios.defaults.baseURL = 'http://117.156.17.59:9090/'; //
// axios.defaults.baseURL = 'http://120.236.247.200:9000/'; //横琴线上
// axios.defaults.baseURL = 'http://223.82.100.80:9000/'; //南昌地铁
// axios.defaults.baseURL = 'http://139.9.66.234:40001/'; //南昌地铁二期
// axios.defaults.baseURL = 'http://124.71.178.44:30/';
// axios.defaults.baseURL = 'http://192.168.34.125:9090/';
// axios.defaults.baseURL = 'http://192.168.88.220:6023/';
// axios.defaults.baseURL = 'http://124.71.178.44:9000/'; //中建 cscec101 123456
// axios.defaults.baseURL = 'https://jk.cscec1b1.com:5138/';//沃尔
// axios.defaults.baseURL = 'http://61.190.32.219:9050/'
// axios.defaults.baseURL = 'http://183.95.84.54:5800/'//合展-宿迁 zxsd 123456
// axios.defaults.baseURL = 'http://183.95.84.54:9500/'//贵州-敏尚 17512075572 123456
// axios.defaults.baseURL = 'http://183.95.84.34:7185/' //测试服
// axios.defaults.baseURL = 'http://183.60.227.61:30246/'
// axios.defaults.baseURL = 'http://183.60.227.61:30249/' //测试服2
// axios.defaults.baseURL = 'http://183.60.227.61:20561/' //龙光地产 龙光地产 123456
// axios.defaults.baseURL = 'http://218.92.215.138:9090/' //盐城 新佳城小区 123456
// axios.defaults.baseURL = 'http://36.137.53.203:9090/' //盐城 gdjt 123456789
// axios.defaults.baseURL = 'http://183.234.150.152:9090/' //华发 huaxin 123456789
// axios.defaults.baseURL = 'http://182.90.224.147:18170' //瑞士恒通线上
// axios.defaults.baseURL = 'http://58.250.210.9:9090/' //深汕线上
// axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
// axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
// axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上(新)地址
// 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://192.168.34.221:8188/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:30001/' //郭圣雄本地
// axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
// axios.defaults.baseURL ='http://42.194.144.62:8099/' //坪山沙湖
// axios.defaults.baseURL ='http://125.88.207.86:8099/' //坪山沙湖(最新)地址
// axios.defaults.baseURL ='http://huli.zjzhiliao.com/jxjgdapi/' //金林湾测试线上
// axios.defaults.baseURL ='http://101.43.164.214:45001/' //上海张江
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工)
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目
// axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上(最新)地址
// axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上(最新)地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址
// axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址
// axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用)
// axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址
} else if (process.env.NODE_ENV == 'debug') {
axios.defaults.baseURL = 'https://www.ceshi.com'

View File

@ -44,22 +44,22 @@ export default new Vuex.Store({
}),
],
state: {
PAGESIZRS: [10, 20, 30, 50],
// UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色
// FILEURL:' http://101.43.164.214:11111/image/',// 百色
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',
// FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地
FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
// FILEURL:'http://42.180.188.17:11211/image/',//测试
state: {
PAGESIZRS: [10, 20, 30, 50],
// UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色
// FILEURL:' http://101.43.164.214:11111/image/',// 百色
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',
// FILEURL:'http://182.90.224.237:51234/image/',
// UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地
// FILEURL: "http://http://192.168.34.155:19111/image/", //洁本地
UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地
FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地
// WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地)
WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地)
// UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程
// FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
// FILEURL:'http://42.180.188.17:11211/image/',//测试
// BASEURL: baseUrl
// ? baseUrl

View File

@ -141,19 +141,19 @@
<!-- {{ $t('message.carManage.isBlackArr')[scope.row.isBlack] }} -->
<!-- v-permission="{key: 'clgl_blackWhiteList', menuPath: '/project/carManage/carManage'}" -->
{{ $t("message.carManage.isBlackArr")[scope.row.isBlack] }}
<!-- :disabled="
!editPermission
? true
: [2, 3].includes(scope.row.carModuleType)
? true
: false
" -->
<el-switch
v-model="scope.row.isBlack"
active-color="#409EFF"
:active-value="0"
inactive-color="#000000"
:inactive-value="1"
:disabled="
!editPermission
? true
: [2, 3].includes(scope.row.carModuleType)
? true
: false
"
@change="(e) => blackSwich(e, scope.row)"
>
</el-switch>
@ -768,7 +768,7 @@
:placeholder="$t('message.deviceManage.placeholder')"></el-input>
</el-form-item> -->
<!-- 是否黑名单 -->
<!-- <el-form-item :label="$t('message.carManage.isBlack')" prop="isBlack">
<el-form-item :label="$t('message.carManage.isBlack')" prop="isBlack">
<el-radio-group v-model="addEditForm.isBlack">
<el-radio
v-for="(i, index) in $t('message.carManage.isBlackArr')"
@ -777,7 +777,7 @@
>{{ i }}
</el-radio>
</el-radio-group>
</el-form-item> -->
</el-form-item>
<!-- 报警推送人 -->
<el-form-item :label="$t('message.deviceManage.alarmPushWorkerId')">
<el-select
@ -1007,7 +1007,7 @@
>是否黑名单</span
>
<span class="value">{{
entityDetail.isBlack === 0 ? "是" : "否"
entityDetail.isBlack === 1 ? "是" : "否"
}}</span>
</div>
</el-col>
@ -1464,6 +1464,7 @@ export default {
],
addEditForm: {
// uDevId: [],
isBlack: 0
},
pagInfo: {
pageNo: 1, //
@ -1858,7 +1859,7 @@ export default {
if (valid) {
if (this.Popup.type === "add") {
//
params.isBlack = 0;
// params.isBlack = 0;
addCarInfoApi(params).then((result) => {
if (result.success) {
this.$message.success(result.message);
@ -1930,7 +1931,9 @@ export default {
});
},
close() {
this.addEditForm = {};
this.addEditForm = {
isBlack: 0
};
this.fileList = [];
this.fileList2 = [];
this.fileList3 = [];

View File

@ -50,8 +50,7 @@
<el-table-column prop="roleDesc" :label="$t('message.roleManage.miaoshu')" align="center"></el-table-column >
<el-table-column :label="$t('message.alarmValueSet.operation')" align="center">
<template slot-scope="scope">
<!-- style="margin-left: 120px !important" -->
<div class="tableBtns" >
<div class="operation-style">
<div v-permission="{key: 'roleManage_edit', menuPath: '/project/configManage/roleManage'}" @click="edit(scope.row)" class="operationText">
<img src="@/assets/images/icon-edit.png" width="15px" height="15px" />
<span>{{ $t("message.alarmValueSet.edit") }}</span>

View File

@ -312,7 +312,9 @@
</div>
<div style="display: flex;justify-content: center;"
v-if="firstAidCallDetail.incidentClosedStatus == 1">
<el-button type="primary" @click="onSubmitAll()">提交救援记录</el-button>
<el-button type="primary" @click="onSubmitAll()"
v-permission="{key: 'emergencyDisposal_add', menuPath: '/project/emergencyDisposal/emergencyDisposal'}"
>提交救援记录</el-button>
</div>
</div>
<div class="case" v-if="firstAidCallDetail.incidentClosedStatus == 2">

View File

@ -107,7 +107,8 @@
>
<template slot-scope="scope">
<div class="tableBtns">
<div class="operationText">
<div class="operationText"
v-permission="{key: 'inspection_download', menuPath: '/project/inspecPoint/inspection'}">
<i
class="el-icon-download"
style="
@ -122,12 +123,12 @@
target="_blank"
:href="$store.state.FILEURL + scope.row.qrCode"
download
v-permission="{key: 'inspection_download', menuPath: '/project/inspecPoint/inspection'}"
>下载巡检二维码</a
>
</div>
<div class="operationText" @click="deilBtn(scope.row)">
<div class="operationText" @click="deilBtn(scope.row)"
v-permission="{key: 'inspection_detail', menuPath: '/project/inspecPoint/inspection'}">
<i
class="el-icon-tickets"
style="color: #8dacfa; font-size: 16px; margin-right: 2px"

View File

@ -102,7 +102,8 @@
<el-table-column label="操作" align="center" width="280">
<template slot-scope="scope">
<div class="operation-style">
<div class="operationText styleDom" @click="detailBtn(scope.row)">
<div class="operationText styleDom" @click="detailBtn(scope.row)"
v-permission="{key: 'selfInspect_detail', menuPath: '/project/inspecPoint/selfInspect'}">
<i
class="el-icon-tickets"
style="color: #8dacfa; font-size: 16px; margin-right: 2px"

View File

@ -49,7 +49,6 @@
type="text"
size="mini"
@click.stop="() => singleEditState(node, data, 0)"
v-permission="{key: 'criterion_open', menuPath: '/project/quality/criterion'}"
>
{{ $t('message.quality.click')
}}{{ $t('message.quality.startUsing') }}
@ -59,7 +58,7 @@
type="text"
size="mini"
@click.stop="() => singleEditState(node, data, 1)"
v-permission="{key: 'criterion_stop', menuPath: '/project/quality/criterion'}"
>
{{ $t('message.quality.click')
}}{{ $t('message.quality.forbidden') }}
@ -188,6 +187,7 @@
size="small"
:disabled="showBatch"
@click="editState(0)"
v-permission="{key: 'criterion_open', menuPath: '/project/quality/criterion'}"
>{{
$t('message.quality.batch') + $t('message.quality.startUsing')
}}</el-button
@ -197,6 +197,7 @@
size="small"
:disabled="showBatch"
@click="editState(1)"
v-permission="{key: 'criterion_stop', menuPath: '/project/quality/criterion'}"
>{{
$t('message.quality.batch') + $t('message.quality.forbidden')
}}</el-button

View File

@ -330,6 +330,7 @@
<div
@click="newShowDatadetails(scope.row, scope.$index)"
class="operationText last"
v-permission="{key: 'inspectionLedger_detail', menuPath: '/project/quality/inspectionLedger'}"
>
<i
class="el-icon-tickets"

View File

@ -19,7 +19,9 @@
<el-button type="primary" size="medium" @click="add"
v-permission="{key: 'deviceCentral_add', menuPath: '/project/smartSafeHat/deviceCentral'}"
>新增</el-button>
<el-button size="medium" type="primary" @click="downloadFn()"> 下载模板</el-button>
<el-button size="medium" type="primary" @click="downloadFn()"
v-permission="{key: 'deviceCentral_download', menuPath: '/project/smartSafeHat/deviceCentral'}"
> 下载模板</el-button>
<el-upload
style="display: inline-block; margin: 0 15px"
class="upload-demo expintBtn"
@ -31,7 +33,9 @@
:show-file-list="false"
:headers="headers"
>
<el-button size="medium" type="primary">导入</el-button>
<el-button size="medium" type="primary"
v-permission="{key: 'deviceCentral_import', menuPath: '/project/smartSafeHat/deviceCentral'}"
>导入</el-button>
</el-upload>
</el-form-item>
</el-form>