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

flx:冲突

Browse Source
This commit is contained in:
X_Rian 2024-05-29 22:58:01 +08:00
commit 67a5524569
11 changed files with 118 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/views/projectFront/carManage/carManage.vue
View File

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

3
src/views/projectFront/configManage/roleManage.vue
View File

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

4
src/views/projectFront/emergencyDisposal/emergencyDisposal.vue
View File

@ -312,7 +312,9 @@
</div> </div>
<div style="display: flex;justify-content: center;" <div style="display: flex;justify-content: center;"
v-if="firstAidCallDetail.incidentClosedStatus == 1"> 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> </div>
<div class="case" v-if="firstAidCallDetail.incidentClosedStatus == 2"> <div class="case" v-if="firstAidCallDetail.incidentClosedStatus == 2">

7
src/views/projectFront/inspecPoint/inspection.vue
View File

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

3
src/views/projectFront/inspecPoint/selfInspect.vue
View File

@ -102,7 +102,8 @@
<el-table-column label="操作" align="center" width="280"> <el-table-column label="操作" align="center" width="280">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="operation-style"> <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 <i
class="el-icon-tickets" class="el-icon-tickets"
style="color: #8dacfa; font-size: 16px; margin-right: 2px" style="color: #8dacfa; font-size: 16px; margin-right: 2px"

96
src/views/projectFront/projectSummary/cooperationUnit.vue
View File

@ -54,7 +54,8 @@
</el-form-item>--> </el-form-item>-->
<el-form-item> <el-form-item>
<el-button v-permission="{ key: 'hzdw_delete_pl', menuPath: '/project/summary/cooperationUnit' }" <el-button v-permission="{ key: 'hzdw_delete_pl', menuPath: '/project/summary/cooperationUnit' }"
type="primary" style="height: 32px" :disabled="checkedDeleteList.length == 0" @click="deleteInBatches">{{ type="primary" style="height: 32px" :disabled="checkedDeleteList.length == 0"
@click="deleteInBatches">{{
$t('message.cooperationUnit.deleteInBatches') }}</el-button> $t('message.cooperationUnit.deleteInBatches') }}</el-button>
</el-form-item> </el-form-item>
<!-- <el-form-item> <!-- <el-form-item>
@ -73,17 +74,13 @@
<el-form v-permission="{ key: 'hzdw_inquiry', menuPath: '/project/summary/cooperationUnit' }" :inline="true" <el-form v-permission="{ key: 'hzdw_inquiry', menuPath: '/project/summary/cooperationUnit' }" :inline="true"
class="demo-form-inline" size="small"> class="demo-form-inline" size="small">
<el-form-item> <el-form-item>
<el-input :placeholder="$t('message.laborMange.placeholder1')" v-model="enterpriseName" style="width: 260px" <el-input :placeholder="$t('message.laborMange.placeholder1')" v-model="enterpriseName"
clearable> style="width: 260px" clearable>
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-select v-model="dictionaryItemId" clearable placeholder="请选择项目类型"> <el-select v-model="dictionaryItemId" clearable placeholder="请选择项目类型">
<el-option <el-option v-for="item in dictionaryItemList" :key="item.id" :label="item.name" :value="item.data">
v-for="item in dictionaryItemList"
:key="item.id"
:label="item.name"
:value="item.data">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -190,8 +187,9 @@
<!-- 企业类型 --> <!-- 企业类型 -->
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('message.laborMange.formOfBusiness')" prop="companyTypeName"> <el-form-item :label="$t('message.laborMange.formOfBusiness')" prop="companyTypeName">
<el-select v-model="enterpriseForm.companyTypeName" :placeholder="$t('message.laborMange.pleaseChoose')" <el-select v-model="enterpriseForm.companyTypeName"
style="width: 100%" :disabled="enterpriseTypeName == '全部' ? false : true"> :placeholder="$t('message.laborMange.pleaseChoose')" style="width: 100%"
:disabled="enterpriseTypeName == '全部' ? false : true">
<el-option v-for="item in companyTypeList" :key="item.id" :label="item.companyTypeName" <el-option v-for="item in companyTypeList" :key="item.id" :label="item.companyTypeName"
:value="item.companyTypeName"></el-option> :value="item.companyTypeName"></el-option>
</el-select> </el-select>
@ -303,8 +301,7 @@
<el-select v-model="enterpriseForm.enterpriseProperty" <el-select v-model="enterpriseForm.enterpriseProperty"
:placeholder="$t('message.laborMange.pleaseChoose')" style="width: 100%"> :placeholder="$t('message.laborMange.pleaseChoose')" style="width: 100%">
<el-option :label="$t('message.laborMange.stateOwnedBusiness')" :value="1"></el-option> <el-option :label="$t('message.laborMange.stateOwnedBusiness')" :value="1"></el-option>
<el-option :label=" <el-option :label="$t('message.laborMange.overseasInvestedEnterprises')
$t('message.laborMange.overseasInvestedEnterprises')
" :value="2"></el-option> " :value="2"></el-option>
<el-option :label="$t('message.laborMange.collectiveEnterprises')" :value="3"></el-option> <el-option :label="$t('message.laborMange.collectiveEnterprises')" :value="3"></el-option>
<el-option :label="$t('message.laborMange.privateEnterprise')" :value="4"></el-option> <el-option :label="$t('message.laborMange.privateEnterprise')" :value="4"></el-option>
@ -316,12 +313,11 @@
<el-col :span="12"> <el-col :span="12">
<!-- 父级企业 --> <!-- 父级企业 -->
<el-form-item :label="$t('message.projectInfo.theParentCompany')" prop="parentEnterpriseId"> <el-form-item :label="$t('message.projectInfo.theParentCompany')" prop="parentEnterpriseId">
<el-select v-model="enterpriseForm.parentEnterpriseId" :placeholder=" <el-select v-model="enterpriseForm.parentEnterpriseId" :placeholder="$t('message.projectInfo.pleaseChoose') +
$t('message.projectInfo.pleaseChoose') +
$t('message.projectInfo.theParentCompany') $t('message.projectInfo.theParentCompany')
" filterable clearable style="width: 100%"> " filterable clearable style="width: 100%">
<el-option v-for="(item, index) in parentEnterpriseList" :label="item.enterpriseName" :value="item.id" <el-option v-for="(item, index) in parentEnterpriseList" :label="item.enterpriseName"
:key="index"> :value="item.id" :key="index">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -329,7 +325,8 @@
<el-col :span="12"> <el-col :span="12">
<!-- 排序 --> <!-- 排序 -->
<el-form-item :label="$t('message.projectInfo.sort')" prop="num"> <el-form-item :label="$t('message.projectInfo.sort')" prop="num">
<el-input-number v-model="enterpriseForm.sortNum" @change="handleChangeNum" :min="0"></el-input-number> <el-input-number v-model="enterpriseForm.sortNum" @change="handleChangeNum"
:min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -349,11 +346,10 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('message.laborMange.photosOfQualification')" prop="enterpriseQualificationUrl"> <el-form-item :label="$t('message.laborMange.photosOfQualification')" prop="enterpriseQualificationUrl">
<el-upload class="upload-demo" :action="uploadUrl" :on-remove=" <el-upload class="upload-demo" limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 1)
(file, flexList) => handleRemove(file, flexList, 1)
" :on-success="(file) => handleSuccess(file, 1)" :on-error="(file) => handleError(file, 1)" " :on-success="(file) => handleSuccess(file, 1)" :on-error="(file) => handleError(file, 1)"
:on-preview="(file) => handlePreview(file, 1)" :before-upload="(file) => handleBeforeUpload(file, 1)" :on-preview="(file) => handlePreview(file, 1)"
name="files" :file-list="aptitudeFileList"> :before-upload="(file) => handleBeforeUpload(file, 1)" name="files" :file-list="aptitudeFileList">
<el-button size="small" type="primary">{{ <el-button size="small" type="primary">{{
$t('message.laborMange.clickOnTheUpload') $t('message.laborMange.clickOnTheUpload')
}}</el-button> }}</el-button>
@ -362,11 +358,10 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="logo" prop="logo"> <el-form-item label="logo" prop="logo">
<el-upload class="upload-demo" :action="uploadUrl" :on-remove=" <el-upload class="upload-demo" limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 2)
(file, flexList) => handleRemove(file, flexList, 2)
" :on-success="(file) => handleSuccess(file, 2)" :on-error="(file) => handleError(file, 2)" " :on-success="(file) => handleSuccess(file, 2)" :on-error="(file) => handleError(file, 2)"
:on-preview="(file) => handlePreview(file, 2)" :before-upload="(file) => handleBeforeUpload(file, 2)" :on-preview="(file) => handlePreview(file, 2)"
name="files" :file-list="logoFileList"> :before-upload="(file) => handleBeforeUpload(file, 2)" name="files" :file-list="logoFileList">
<el-button size="small" type="primary">{{ <el-button size="small" type="primary">{{
$t('message.laborMange.clickOnTheUpload') $t('message.laborMange.clickOnTheUpload')
}}</el-button> }}</el-button>
@ -393,8 +388,8 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="竣工日期" prop="completionDate"> <el-form-item label="竣工日期" prop="completionDate">
<el-date-picker value-format="yyyy-MM-dd" v-model="enterpriseForm.projectEnterprise.completionDate" type="date" <el-date-picker value-format="yyyy-MM-dd" v-model="enterpriseForm.projectEnterprise.completionDate"
placeholder="选择日期"> type="date" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -448,7 +443,8 @@
<el-form-item label="工程类别" prop="projectType"> <el-form-item label="工程类别" prop="projectType">
<el-select v-model="enterpriseForm.projectEnterprise.projectType" placeholder="请选择工程类别" filterable <el-select v-model="enterpriseForm.projectEnterprise.projectType" placeholder="请选择工程类别" filterable
clearable style="width: 100%"> clearable style="width: 100%">
<el-option v-for="(item, index) in projectTypeList" :label="item.name" :value="Number(item.data)" :key="index"> <el-option v-for="(item, index) in projectTypeList" :label="item.name" :value="Number(item.data)"
:key="index">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -485,16 +481,17 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="开工日期" prop="enterpriseEmail"> <el-form-item label="开工日期" prop="enterpriseEmail">
<el-date-picker value-format="yyyy-MM-dd" v-model="enterpriseForm.projectEnterprise.startWorkDate" type="date" placeholder="选择日期"> <el-date-picker value-format="yyyy-MM-dd" v-model="enterpriseForm.projectEnterprise.startWorkDate"
type="date" placeholder="选择日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="施工阶段" prop="constructionStage"> <el-form-item label="施工阶段" prop="constructionStage">
<el-select v-model="enterpriseForm.projectEnterprise.constructionStage" placeholder="请选择施工阶段" filterable <el-select v-model="enterpriseForm.projectEnterprise.constructionStage" placeholder="请选择施工阶段"
clearable style="width: 100%"> filterable clearable style="width: 100%">
<el-option v-for="(item, index) in constructionStageList" :label="item.name" :value="Number(item.data)" <el-option v-for="(item, index) in constructionStageList" :label="item.name"
:key="index"> :value="Number(item.data)" :key="index">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -508,11 +505,11 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="现场施工图" prop="constructionMapUrl"> <el-form-item label="现场施工图" prop="constructionMapUrl">
<el-upload class="upload-demo" :action="uploadUrl" :on-remove=" <el-upload class="upload-demo" limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 4)
(file, flexList) => handleRemove(file, flexList, 4)
" :on-success="(file) => handleSuccess(file, 4)" :on-error="(file) => handleError(file, 4)" " :on-success="(file) => handleSuccess(file, 4)" :on-error="(file) => handleError(file, 4)"
:on-preview="(file) => handlePreview(file, 4)" :before-upload="(file) => handleBeforeUpload(file, 4)" :on-preview="(file) => handlePreview(file, 4)"
lis name="files" :file-list="constructionMapUrlList"> :before-upload="(file) => handleBeforeUpload(file, 4)" lis name="files"
:file-list="constructionMapUrlList">
<el-button size="small" type="primary">{{ <el-button size="small" type="primary">{{
$t('message.laborMange.clickOnTheUpload') $t('message.laborMange.clickOnTheUpload')
}}</el-button> }}</el-button>
@ -523,11 +520,10 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="现场布置图" prop="layoutImage"> <el-form-item label="现场布置图" prop="layoutImage">
<el-upload class="upload-demo" :action="uploadUrl" :on-remove=" <el-upload class="upload-demo" limit="1" :action="uploadUrl" :on-remove="(file, flexList) => handleRemove(file, flexList, 3)
(file, flexList) => handleRemove(file, flexList, 3)
" :on-success="(file) => handleSuccess(file, 3)" :on-error="(file) => handleError(file, 3)" " :on-success="(file) => handleSuccess(file, 3)" :on-error="(file) => handleError(file, 3)"
:on-preview="(file) => handlePreview(file, 3)" :before-upload="(file) => handleBeforeUpload(file, 3)" :on-preview="(file) => handlePreview(file, 3)"
name="files" :file-list="layoutImageList"> :before-upload="(file) => handleBeforeUpload(file, 3)" name="files" :file-list="layoutImageList">
<el-button size="small" type="primary">{{ <el-button size="small" type="primary">{{
$t('message.laborMange.clickOnTheUpload') $t('message.laborMange.clickOnTheUpload')
}}</el-button> }}</el-button>
@ -537,21 +533,22 @@
</el-row> </el-row>
</el-form> </el-form>
<div class="dialog-footer addpage"> <div class="dialog-footer addpage">
<el-button class="cancleBtn" @click="addEnterpriseDialog = false" icon="el-icon-circle-close" size="medium">{{ <el-button class="cancleBtn" @click="addEnterpriseDialog = false" icon="el-icon-circle-close"
size="medium">{{
$t('message.laborMange.cancel') }}</el-button> $t('message.laborMange.cancel') }}</el-button>
<el-button type="primary" icon="el-icon-circle-check" @click="saveEnterpriseFn('enterpriseForm')" <el-button type="primary" icon="el-icon-circle-check" @click="saveEnterpriseFn('enterpriseForm')"
size="medium">{{ $t('message.laborMange.confirm') }}</el-button> size="medium">{{
$t('message.laborMange.confirm') }}</el-button>
</div> </div>
</div> </div>
</vue-scroll> </vue-scroll>
</el-dialog> </el-dialog>
<el-dialog :modal-append-to-body="false" :title="$t('message.projectInfo.batchMobile')" :close-on-click-modal="false" <el-dialog :modal-append-to-body="false" :title="$t('message.projectInfo.batchMobile')"
:visible.sync="moveEnterpriseDialog" width="750px"> :close-on-click-modal="false" :visible.sync="moveEnterpriseDialog" width="750px">
<el-form :inline="true" size="medium" ref="selectForm"> <el-form :inline="true" size="medium" ref="selectForm">
<!-- 目标企业类型 --> <!-- 目标企业类型 -->
<el-form-item :label="$t('message.projectInfo.targetCompanyType')" prop="enterpriseType"> <el-form-item :label="$t('message.projectInfo.targetCompanyType')" prop="enterpriseType">
<el-select v-model="enterpriseType" :placeholder=" <el-select v-model="enterpriseType" :placeholder="$t('message.projectInfo.pleaseChoose') +
$t('message.projectInfo.pleaseChoose') +
$t('message.projectInfo.targetCompanyType') $t('message.projectInfo.targetCompanyType')
" filterable clearable> " filterable clearable>
<el-option v-for="(item, index) in enterpriseTypeList" :label="item.companyTypeName" :value="item.id" <el-option v-for="(item, index) in enterpriseTypeList" :label="item.companyTypeName" :value="item.id"
@ -887,7 +884,7 @@ export default {
pageSize: this.pageSize, pageSize: this.pageSize,
enterpriseTypeId: this.enterpriseTypeSelectId, enterpriseTypeId: this.enterpriseTypeSelectId,
enterpriseName: this.enterpriseName, enterpriseName: this.enterpriseName,
dictionaryItemId:this.dictionaryItemId cbsProjectType: this.dictionaryItemId
} }
getCooperatorListApi(data).then((res) => { getCooperatorListApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
@ -1356,6 +1353,9 @@ export default {
// color: #282e49; // color: #282e49;
border-bottom: 2px #ebf0fc solid; border-bottom: 2px #ebf0fc solid;
font-weight: 600; font-weight: 600;
overflow: hidden; //超出的文本隐藏
text-overflow: ellipsis; //溢出用省略号显示
white-space: nowrap; //溢出不换行
} }
.el-menu-item2 { .el-menu-item2 {

4
src/views/projectFront/projectSummary/cooperatorDatails.vue
View File

@ -510,7 +510,7 @@ export default {
fieldName: this.$t("message.laborMange.laborCertificateNo"), fieldName: this.$t("message.laborMange.laborCertificateNo"),
fieldName2: this.$t("message.laborMange.safetyProductionLicense"), fieldName2: this.$t("message.laborMange.safetyProductionLicense"),
value: res.result.qualificationNumber, value: res.result.qualificationNumber,
value2: res.result.enterpriseSafeAllow, value2: res.result.enterpriseSafeAllow ? this.$store.state.FILEURL + res.result.enterpriseSafeAllow : '',
}, },
{ {
fieldName: this.$t("message.laborMange.natureOfUnit"), fieldName: this.$t("message.laborMange.natureOfUnit"),
@ -523,7 +523,7 @@ export default {
: res.result.enterpriseProperty == 3 : res.result.enterpriseProperty == 3
? this.$t("message.laborMange.collectiveEnterprises") ? this.$t("message.laborMange.collectiveEnterprises")
: this.$t("message.laborMange.privateEnterprise"), : this.$t("message.laborMange.privateEnterprise"),
value2: res.result.logo ? res.result.logo : "", value2: res.result.logo ? this.$store.state.FILEURL +res.result.logo : "",
}, },
{ {
fieldName: this.$t("message.projectInfo.projectLeader"), fieldName: this.$t("message.projectInfo.projectLeader"),

5
src/views/projectFront/quality/criterionModule/qualityProblemBank.vue
View File

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

1
src/views/projectFront/quality/inspectionLedger.vue
View File

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

8
src/views/projectFront/smartSafeHat/deviceCentral/deviceCentral.vue
View File

@ -19,7 +19,9 @@
<el-button type="primary" size="medium" @click="add" <el-button type="primary" size="medium" @click="add"
v-permission="{key: 'deviceCentral_add', menuPath: '/project/smartSafeHat/deviceCentral'}" v-permission="{key: 'deviceCentral_add', menuPath: '/project/smartSafeHat/deviceCentral'}"
>新增</el-button> >新增</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 <el-upload
style="display: inline-block; margin: 0 15px" style="display: inline-block; margin: 0 15px"
class="upload-demo expintBtn" class="upload-demo expintBtn"
@ -31,7 +33,9 @@
:show-file-list="false" :show-file-list="false"
:headers="headers" :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-upload>
</el-form-item> </el-form-item>
</el-form> </el-form>