Skip to content

W
whp-xl
Commit effe6231 authored by yaqizhang's avatar yaqizhang
Browse files
Options

Merge branch 'master' of ssh://111.61.77.35:15/lizhichao/whp-xl into master

parents 09227322 742c0597
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 47 deletions
dcit-hcsystem-hcsystem-master/public/common.css
View file @ effe6231
......@@ -19,7 +19,7 @@ html{width: 100%;height: 100%;}
.margT10{margin-top: 10px;}
.iconfont{font-size: 20px;}
main > div{background: #ffffff;height:calc(100vh - 120px);padding: 0 10px;}
main > div{background: #ffffff;height:calc(100vh - 110px);padding: 0 10px;}
main > div .el-table{height:calc(100% - 120px);}
main > div .el-table .el-table__body-wrapper{height: calc(100% - 48px); overflow-y: auto;}
.userlist {
......
dcit-hcsystem-hcsystem-master/src/views/EnseList/EnseList.vue
View file @ effe6231
......@@ -4,13 +4,13 @@
<el-col>
<el-form :inline="true" :model="searchData">
<el-form-item>
<el-input v-model="searchData.unitName" placeholder="请输入企业名称查询"></el-input>
<el-input v-model="searchData.unitName" placeholder="请输入企业名称"></el-input>
</el-form-item>
<el-form-item>
<el-input v-model="searchData.userName" placeholder="请输入用户名查询"></el-input>
<el-input v-model="searchData.userName" placeholder="请输入用户名"></el-input>
</el-form-item>
<el-form-item>
<el-input v-model="searchData.orgCode" placeholder="请输入组织机构代码查询"></el-input>
<el-input v-model="searchData.orgCode" placeholder="请输入统一社会信用代码"></el-input>
</el-form-item>
<el-form-item>
<City @changeFun="changeFun" :valueqv="cityval"></City>
......@@ -30,7 +30,7 @@
<el-table-column width="50" type="index" label="序号"></el-table-column>
<el-table-column prop="unitName" label="企业名称"></el-table-column>
<el-table-column prop="legalPerson" label="企业法人"></el-table-column>
<el-table-column prop="orgCode" label="组织机构代码"></el-table-column>
<el-table-column prop="orgCode" label="统一社会信用代码"></el-table-column>
<el-table-column prop="legalPersonEmail" label="法人邮箱"></el-table-column>
<el-table-column prop="userName" label="管理员名称"></el-table-column>
<el-table-column prop="account" label="管理员账号"></el-table-column>
......@@ -53,7 +53,7 @@
</font>
</template>
</el-table-column>
<el-table-column label="操作" width="170">
<el-table-column label="操作" width="170" align="center">
<template slot-scope="scope">
<el-button type="success" size="small" @click="checkDetal(scope.row)">
<i class="el-icon-view"></i>查看详细
......
dcit-hcsystem-hcsystem-master/src/views/Enterprises/EnterprisesCheck.vue
View file @ effe6231
......@@ -4,7 +4,7 @@
<el-col>
<el-form :inline="true" :model="searchData">
<el-form-item>
<el-input v-model="searchData.unitName" placeholder="请输入企业名称查询"></el-input>
<el-input v-model="searchData.unitName" placeholder="请输入企业名称"></el-input>
</el-form-item>
<el-form-item label>
<el-select clearable v-model="searchData.accountStatus" placeholder="请选择审核状态">
......@@ -14,10 +14,10 @@
</el-select>
</el-form-item>
<!-- <el-form-item>
<el-input v-model="searchData.userName" placeholder="请输入用户名查询"></el-input>
<el-input v-model="searchData.userName" placeholder="请输入用户名"></el-input>
</el-form-item>
<el-form-item>
<el-input v-model="searchData.orgCode" placeholder="请输入组织机构代码查询"></el-input>
<el-input v-model="searchData.orgCode" placeholder="请输入统一社会信用代码"></el-input>
</el-form-item> -->
<!-- <el-form-item>
<City @changeFun="changeFun" :valueqv="cityval"></City>
......@@ -37,7 +37,7 @@
<el-table-column width="50" type="index" label="序号"></el-table-column>
<el-table-column prop="unitName" label="企业名称"></el-table-column>
<el-table-column width="100" prop="legalPerson" label="企业法人"></el-table-column>
<el-table-column prop="orgCode" label="组织机构代码"></el-table-column>
<el-table-column prop="orgCode" label="统一社会信用代码"></el-table-column>
<el-table-column prop="legalPersonEmail" label="法人邮箱"></el-table-column>
<el-table-column prop="userName" label="管理员名称"></el-table-column>
<el-table-column prop="createTime" label="申请时间"></el-table-column>
......@@ -60,7 +60,7 @@
</font>
</template>
</el-table-column>
<el-table-column label="操作" width="320" align="center">
<el-table-column label="操作" width="200" align="center">
<template slot-scope="scope">
<el-button type="success" size="small" @click="verrifyFun(scope.row)">
<i class="el-icon-key"></i>审核/查看
......
dcit-hcsystem-hcsystem-master/src/views/Enterprises/EnterprisesMg.vue
View file @ effe6231
......@@ -4,13 +4,13 @@
<el-col>
<el-form :inline="true" :model="searchData">
<el-form-item>
<el-input v-model="searchData.unitName" placeholder="请输入企业名称查询"></el-input>
<el-input v-model="searchData.unitName" placeholder="请输入企业名称"></el-input>
</el-form-item>
<el-form-item>
<el-input v-model="searchData.userName" placeholder="请输入用户名查询"></el-input>
<el-input v-model="searchData.userName" placeholder="请输入用户名"></el-input>
</el-form-item>
<el-form-item>
<el-input v-model="searchData.orgCode" placeholder="请输入组织机构代码查询"></el-input>
<el-input v-model="searchData.orgCode" placeholder="请输入统一社会信用代码"></el-input>
</el-form-item>
<!-- <el-form-item>
<City @changeFun="changeFun" :valueqv="cityval"></City>
......@@ -30,7 +30,7 @@
<el-table-column width="50" type="index" label="序号"></el-table-column>
<el-table-column prop="unitName" label="企业名称"></el-table-column>
<el-table-column width="100" prop="legalPerson" label="企业法人"></el-table-column>
<el-table-column prop="orgCode" label="组织机构代码"></el-table-column>
<el-table-column prop="orgCode" label="统一社会信用代码"></el-table-column>
<el-table-column prop="legalPersonEmail" label="法人邮箱"></el-table-column>
<el-table-column prop="userName" label="管理员名称"></el-table-column>
<el-table-column prop="account" label="管理员账号"></el-table-column>
......@@ -53,7 +53,7 @@
</font>
</template>
</el-table-column>
<el-table-column label="操作" width="320" align="center">
<el-table-column label="操作" width="240" align="center">
<template slot-scope="scope">
<!-- <el-button type="success" size="small" @click="verrifyFun(scope.row)">
<i class="el-icon-key"></i>审核/查看
......
dcit-hcsystem-hcsystem-master/src/views/Enterprises/tongji.vue
View file @ effe6231
......@@ -8,13 +8,13 @@
<el-col>
<el-form :inline="true" :model="searchData">
<el-form-item>
<el-input v-model="searchData.unitName" placeholder="请输入企业名称查询"></el-input>
<el-input v-model="searchData.unitName" placeholder="请输入企业名称"></el-input>
</el-form-item>
<el-form-item>
<el-input v-model="searchData.userName" placeholder="请输入用户名查询"></el-input>
<el-input v-model="searchData.userName" placeholder="请输入用户名"></el-input>
</el-form-item>
<el-form-item>
<el-input v-model="searchData.orgCode" placeholder="请输入组织机构代码查询"></el-input>
<el-input v-model="searchData.orgCode" placeholder="请输入统一社会信用代码"></el-input>
</el-form-item>
<el-form-item>
<City @changeFun="changeFun" :valueqv="cityval"></City>
......@@ -34,7 +34,7 @@
<el-table-column width="50" type="index" label="序号"></el-table-column>
<el-table-column prop="unitName" label="企业名称"></el-table-column>
<el-table-column prop="legalPerson" label="企业法人"></el-table-column>
<el-table-column prop="orgCode" label="组织机构代码"></el-table-column>
<el-table-column prop="orgCode" label="统一社会信用代码"></el-table-column>
<el-table-column prop="legalPersonEmail" label="法人邮箱"></el-table-column>
<el-table-column prop="" label="监管分类"></el-table-column>
<el-table-column prop="" label="危险源数量"></el-table-column>
......@@ -57,7 +57,7 @@
</font>
</template> -->
</el-table-column>
<el-table-column label="操作" width="170">
<el-table-column label="操作" width="170" align="center">
<template slot-scope="scope">
<el-button type="success" size="small" @click="checkDetal(scope.row)">
<i class="el-icon-view"></i>查看详细
......
dcit-hcsystem-hcsystem-master/src/views/Layout/Content.vue
View file @ effe6231
......@@ -97,7 +97,7 @@ export default class Content extends Vue {
border: none;
}
.zk {
width: 200px !important;
width: 215px !important;
}
.notzk {
width: 0px !important;
......
dcit-hcsystem-hcsystem-master/src/views/Layout/Navbar.vue
View file @ effe6231
<template>
<div class="wrapper" id="navbar">
<el-scrollbar class="el-scrollbar">
<!-- <el-scrollbar class="el-scrollbar">-->
<el-menu :default-active="$router.currentRoute.path" class="el-menu-vertical-demo" router>
<!-- router属性 是否使用 vue-router 的模式，启用该模式会在激活导航时以 index 作为 path 进行路由跳转 -->
<template v-for="(item,bindex) in currentRouterArr">
......@@ -31,7 +31,7 @@
</div>
</template>
</el-menu>
</el-scrollbar>
<!-- </el-scrollbar>-->
</div>
</template>
<script lang="ts">
......@@ -62,9 +62,9 @@ export default class Navbar extends Vue {
#navbar {
$bgColor:#5f5f61;
$txtColor:#c9c9c9;
width: 200px;
width: 220px;
height: 100%;
overflow: hidden;
overflow: auto;
.el-menu-item {
&:hover {
background: #9fd0ff;
......
dcit-hcsystem-hcsystem-master/src/views/Plans/PlansMg.vue
View file @ effe6231
......@@ -4,7 +4,7 @@
<el-col>
<el-form :inline="true" :model="searchData">
<el-form-item label>
<el-input v-model="searchData.planTitle" placeholder="请输预案标题查询"></el-input>
<el-input v-model="searchData.planTitle" placeholder="请输预案标题"></el-input>
</el-form-item>
<el-form-item label>
<el-select v-model="searchData.planLevel" placeholder="请输预案等级">
......@@ -86,7 +86,7 @@
<el-button @click="editFun(scope.row)" size="small" v-if="qyvisble">
<i class="el-icon-edit-outline"></i> 编辑
</el-button>
<el-button type="success" @click="checkFun(scope.row)" size="small" v-if="qyvisble">
<el-button type="success" @click="checkFun(scope.row)" size="small" v-if="qyvisble" :disabled="scope.row.checkStatus != 0?true:false">
<i class="el-icon-key"></i> 审核
</el-button>
<el-button type="primary" plain @click="editFun(scope.row)" size="small" v-if="!qyvisble">
......
dcit-hcsystem-hcsystem-master/src/views/Register.vue
View file @ effe6231
......@@ -201,7 +201,7 @@ export default class Register extends Vue {
},
{
pattern: /[0-9A-Z]{18}/,
message: "填写正确的组织机构代码"
message: "填写正确的统一社会信用代码"
},
],
legalPerson: [{
......
dcit-hcsystem-hcsystem-master/src/views/SafetyDevice/SafetyDeviceMg.vue
View file @ effe6231
......@@ -3,20 +3,20 @@
<el-row class="topBar">
<el-col>
<el-form :inline="true" :model="searchData">
<el-form-item label="设备类型">
<el-select v-model="searchData.dataType">
<el-form-item label="">
<el-select v-model="searchData.dataType" placeholder="请选择设备类型">
<el-option label="监控设备" value="5"></el-option>
<el-option label="传感器" value="6"></el-option>
</el-select>
</el-form-item>
<el-form-item label="设备名称">
<el-input v-model="searchData.deviceName" placeholder="请输入..."></el-input>
<el-form-item label="">
<el-input v-model="searchData.deviceName" placeholder="请输入设备名称"></el-input>
</el-form-item>
<el-form-item label="设备号">
<el-input v-model="searchData.deviceNumber" placeholder="请输入..."></el-input>
<el-form-item label="">
<el-input v-model="searchData.deviceNumber" placeholder="请输入设备号"></el-input>
</el-form-item>
<el-form-item label="设备短号">
<el-input v-model="searchData.shortNum" placeholder="请输入..."></el-input>
<el-form-item label="">
<el-input v-model="searchData.shortNum" placeholder="请输入设备短号"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchFun()">
......@@ -49,7 +49,7 @@
<el-table-column prop="goodsName" label="所在厂区位置"></el-table-column>
<!-- <el-table-column prop="stockNum" label="库存数量"></el-table-column> -->
<!-- <el-table-column prop="dangerGrade" label="危险等级"></el-table-column> -->
<el-table-column label="操作" width="150">
<el-table-column label="操作" width="220" align="center">
<template slot-scope="scope">
<el-button @click="editFun(scope.row)" size="small">编辑</el-button>
<el-button type="danger" @click="delFun(scope.row)" size="small">删除</el-button>
......
dcit-hcsystem-hcsystem-master/src/views/Search.vue
View file @ effe6231
......@@ -14,7 +14,7 @@
<h3>查询企业注册信息</h3>
<el-form :inline="true" :model="searchData">
<el-form-item label>
<el-input v-model="searchData.orgCode" placeholder="请输入组织机构代码查询"></el-input>
<el-input v-model="searchData.orgCode" placeholder="请输入统一社会信用代码"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchFun()">
......@@ -85,7 +85,7 @@ export default class Register extends Vue {
}
);
} else {
that.$message.warning("请填写组织机构代码");
that.$message.warning("请填写统一社会信用代码");
}
}
......
dcit-hcsystem-hcsystem-master/src/views/System/APIMg.vue
View file @ effe6231
......@@ -4,7 +4,7 @@
<el-col>
<el-form :inline="true" :model="searchData">
<el-form-item label>
<el-input v-model="searchData.resourceName" placeholder="请输名称查询"></el-input>
<el-input v-model="searchData.resourceName" placeholder="请输入名称"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchFun()">
......
dcit-hcsystem-hcsystem-master/src/views/System/BranchMg.vue
View file @ effe6231
......@@ -28,7 +28,7 @@
<el-col>
<el-form :inline="true" :model="searchData">
<el-form-item label>
<el-input v-model="searchData.deptName" placeholder="请输名称查询"></el-input>
<el-input v-model="searchData.deptName" placeholder="请输入名称"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchFun()">
......
dcit-hcsystem-hcsystem-master/src/views/System/MenuMg.vue
View file @ effe6231
......@@ -4,7 +4,7 @@
<el-col>
<el-form :inline="true" :model="searchData">
<el-form-item label>
<el-input v-model="searchData.menuName" placeholder="请输名称查询"></el-input>
<el-input v-model="searchData.menuName" placeholder="请输入名称"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchFun()">
......
dcit-hcsystem-hcsystem-master/src/views/System/RoleMg.vue
View file @ effe6231
......@@ -4,7 +4,7 @@
<el-col>
<el-form :inline="true" :model="searchData">
<el-form-item label>
<el-input v-model="searchData.roleName" placeholder="请输名称查询"></el-input>
<el-input v-model="searchData.roleName" placeholder="请输入名称"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchFun()">
......
dcit-hcsystem-hcsystem-master/src/views/System/UserMg.vue
View file @ effe6231
......@@ -29,10 +29,10 @@
<el-col>
<el-form :inline="true" :model="searchData">
<el-form-item label>
<el-input v-model="searchData.userName" placeholder="请输用户名"></el-input>
<el-input v-model="searchData.userName" placeholder="请输入用户名"></el-input>
</el-form-item>
<el-form-item label>
<el-input v-model="searchData.account" placeholder="请输账户名"></el-input>
<el-input v-model="searchData.account" placeholder="请输入账户名"></el-input>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="searchFun()">
......
dcit-hcsystem-hcsystem-master/src/views/Video/VideoList.vue
View file @ effe6231
......@@ -82,7 +82,7 @@
}
main > div {
background: #ffffff;
height: calc(100vh - 111px) !important;
height: calc(100vh - 110px) !important;
padding: 0px 0px 0px 10px !important;
}
.row{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment