소스 검색

提交修改

newStyle
corala 2 년 전
부모
커밋
258cb8d9a9
7개의 변경된 파일22개의 추가작업 그리고 44개의 파일을 삭제
  1. +2
    -5
      src/views/Equipment/equipmentDetailList.vue
  2. +2
    -3
      src/views/File/index.vue
  3. +3
    -3
      src/views/ReceivingRecords/index.vue
  4. +4
    -5
      src/views/Statistics/dataScreeSys.vue
  5. +2
    -17
      src/views/admin/file/index.vue
  6. +4
    -4
      src/views/admin/user/index.vue
  7. +5
    -7
      src/views/building/Count.vue

+ 2
- 5
src/views/Equipment/equipmentDetailList.vue 파일 보기

@@ -133,9 +133,7 @@
</div>
</div>

<div class="titlebox" :style="{ 'marginTop': orgType != 3 ? '120px' : '0px' }">


<div class="titlebox" :style="{ 'marginTop': orgType != 3 ? '120px' : '-15px' }">
<div class="kapiannox">
<div class="alllistbox tabcard">

@@ -438,7 +436,6 @@
</div>
</div>
</div>
<!-- v-if="selectTime1" -->
<div style="margin-top: 15px">
<div class="zgutteruo">
<div class="zgutteruo-tit">对比</div>
@@ -1581,7 +1578,7 @@ export default {
<style lang='less' scoped>
.box-center {
width: 100%;
padding: 5px 15px 20px;
padding: 20px 15px 20px;
min-width: 1000px;
}



+ 2
- 3
src/views/File/index.vue 파일 보기

@@ -39,7 +39,6 @@
<div class="cen-tab">
<el-table
:data="tableData"
height="390"
stripe
style="width: 100%">
<el-table-column
@@ -146,7 +145,7 @@ export default {
username:'',
imei:'',
sourceCode:'',
size:30,
size:10,
current:1,
total:0,
initAudioTime:0,
@@ -269,7 +268,7 @@ export default {
.box-center {
width: 100%;
min-height: 100%;
padding: 5px 15px 100px;
padding: 5px 15px 30px;
min-width: 1000px;
}
.cen-tab{


+ 3
- 3
src/views/ReceivingRecords/index.vue 파일 보기

@@ -5,7 +5,6 @@
<div class="app-titel" v-if="orgType != 3">
<div
class="label"
style="color: #32363d; font-weight: 400; font-size: 16px"
>
项目选择:
</div>
@@ -304,7 +303,8 @@
style="margin-left: auto; margin-right: 10px"
v-if="rec_index_downLoad"
>
<el-button @click="downLoad" icon="el-icon-download">导出</el-button>
<el-button @click="downLoad" icon="el-icon-download">
导出</el-button>
</div>
</div>
</div>
@@ -933,7 +933,7 @@ export default {
flex-wrap: wrap;

.label {
font-size: 14px;
font-size: 16px;
font-weight: 400;
color: #32363d;
line-height: 32px;


+ 4
- 5
src/views/Statistics/dataScreeSys.vue 파일 보기

@@ -1889,9 +1889,8 @@ export default {

.box-center {
width: 100%;
padding: 15px;
padding: 20px 15px 30px;
min-width: 1000px;
padding-bottom: 100px;
}

.tabcard {
@@ -1994,9 +1993,9 @@ export default {
border-radius: 4px;

span {
display: block;
// margin-left: 30px;
text-align: center;
display: flex;
justify-content: center;
align-items: center;
}

h2 {


+ 2
- 17
src/views/admin/file/index.vue 파일 보기

@@ -1,19 +1,4 @@
<!--
- Copyright (c) 2018-2025, lengleng All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- Neither the name of the pig4cloud.com developer nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
- Author: lengleng (wangiegie@gmail.com)
-->

<template>
<div class="execution">
<basic-container>
@@ -62,7 +47,7 @@ export default {
page: {
total: 0, // 总页数
currentPage: 1, // 当前页数
pageSize: 20, // 每页显示多少条
pageSize: 10, // 每页显示多少条
},
tableLoading: false,
tableOption: tableOption,


+ 4
- 4
src/views/admin/user/index.vue 파일 보기

@@ -295,8 +295,8 @@
style="width: 100%"
>
<el-table-column type="selection" width="55" align="center"> </el-table-column>
<el-table-column prop="name" label="用户名" align="center"> </el-table-column>
<el-table-column label="登录手机" prop="username" align="center"> </el-table-column>
<el-table-column prop="name" label="用户名" width="120" align="center"> </el-table-column>
<el-table-column label="登录手机" prop="username" width="120" align="center"> </el-table-column>
<el-table-column :show-overflow-tooltip="true" prop="orgName" align="center" label="所属组织"> </el-table-column>
<el-table-column prop="orgTypeName" label="组织类型" align="center"> </el-table-column>
<el-table-column prop="roleName" align="center" label="组织角色"> </el-table-column>
@@ -307,7 +307,7 @@
{{ row.lockFlag == 0 ? "启用" : "禁用" }}
</template>
</el-table-column>
<el-table-column align="center" prop="createTime" label="添加时间"> </el-table-column>
<el-table-column align="center" prop="createTime" label="添加时间" width="160"> </el-table-column>
<el-table-column align="center" prop="address" label="操作" fixed="right" width="150">
<template slot-scope="scope" v-if="scope.row.userRoleType!=11&&scope.row.userRoleType!=12&&scope.row.userRoleType!=13">
<el-button
@@ -1080,7 +1080,7 @@ export default {
page: {
total: 0, // 总页数
current: 1, // 当前页数
size: 30, // 每页显示多少条,
size: 10, // 每页显示多少条,
isAsc: false, // 是否倒序
},
page1: {


+ 5
- 7
src/views/building/Count.vue 파일 보기

@@ -5,8 +5,6 @@
position: fixed;
z-index: 999;
margin-top: -16px;
background: #ecedf0;
box-shadow: 0px 0px 10px 0px #dadada;
">
<div class="toptab" style="cursor: pointer" v-if="orgType != 2">
<div @click="tapclickyab(0)" :class="{ activecllasscet: activeTotal == 0 }"
@@ -133,7 +131,7 @@
<!-- 表格 -->
<div class="cen-tab" :style="{ marginTop: orgType != 2 ? '230px' : '170px' }">
<el-table :header-cell-style="{ background: '#F5F7FA', color: '#333333' }" v-if="activeTotal == 0" :data="tableData"
stripe style="width: 100%" height="640">
stripe style="width: 100%">
<el-table-column prop="propertyName" width="120" label="项目名称" align="center">
</el-table-column>
<el-table-column prop="orgName" width="120" label="公司名称" align="center">
@@ -196,7 +194,7 @@
</el-table>

<el-table :header-cell-style="{ background: '#F5F7FA', color: '#333333' }" v-if="activeTotal == 2" :data="tableData"
stripe style="width: 100%" height="640">
stripe style="width: 100%" >
<el-table-column prop="orgName" width="120" label="公司名称" align="center">
</el-table-column>
<el-table-column prop="houseQuantityOfEnough" label="服务期内项目" align="center" width="140">
@@ -243,7 +241,7 @@
</el-table>

<el-table :header-cell-style="{ background: '#F5F7FA', color: '#333333' }" v-if="activeTotal == 1" :data="tableData"
stripe style="width: 100%" height="640">
stripe style="width: 100%">
<el-table-column prop="agentName" width="120" label="代理商名称" align="center">
</el-table-column>
<el-table-column prop="area" label="地区" width="120" align="center">
@@ -282,7 +280,7 @@
</el-table>
<div style="display: flex; justify-content: flex-end; margin-top: 10px">
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
:page-sizes="[10, 30, 50]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="total">
:page-sizes="[10,20, 30, 50,100]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination>
</div>
</div>
@@ -352,7 +350,7 @@ export default {
},
currentPage: 1,
selflag: "1",
size: 30,
size: 10,
total: 10,
operaList: [],
};


불러오는 중...
취소
저장