Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
73058327 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 54efdc3e 03f2535e
Inline Side-by-side
Showing 21 changed files with 41 additions and 54 deletions

25.4 KB | W: | H:

25.1 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
......@@ -8,8 +8,8 @@
:modal-append-to-body="false"
>
<div class="search">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-button type="primary" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
......
......@@ -18,7 +18,7 @@
</div>
<div slot="footer" class="dialog_footer">
<el-button type="primary" size="small" @click="submitForm('ruleForm')">保存</el-button>
<el-button size="small" @click="resetForm('ruleForm')">重置</el-button>
<el-button size="small" @click="resetForm('ruleForm')" icon="el-icon-refresh">重置</el-button>
<el-button size="small" @click="closeDialog('ruleForm')">关闭</el-button>
</div>
</el-dialog>
......
......@@ -12,30 +12,17 @@
:header-cell-style="{'text-align':'center'}"
:cell-style="{'text-align':'center'}">
<el-table-column
width="300">
width="200">
<template slot="header">
多幢:
<el-button
type="primary"
class="changeBtn outAdd addMinus"
@click="newAddDz"
>+
<el-button style="border:0;padding:0 10px" @click="newAddDz">
<i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>多幢
</el-button>
自然幢:
<el-button
type="primary"
class="changeBtn outAdd addMinus"
@click="newAddZrz"
>+
<el-button style="border:0;padding:0 10px" @click="newAddDz">
<i class="iconfont iconicon-test2" style="color:#66b1ff;font-size:20px;position: relative;top:2px;left:-2px"></i>自然幢
</el-button>
</template>
<template slot-scope="scope">
<el-button
type="primary"
class="changeBtn outMinus addMinus"
@click="deleteData(scope.$index)"
>-
</el-button>
<i class="iconfont icon-" style="color:#FA6400;font-size:26px;position: relative;top:2px;cursor: pointer;" @click="deleteData(scope.$index)"></i>
</template>
</el-table-column>
<el-table-column
......@@ -209,8 +196,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......@@ -307,8 +294,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......
......@@ -30,8 +30,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......
......@@ -61,7 +61,7 @@
</div>
<div class="shop">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-button type="primary" @click="cancel">取消</el-button>
</div>
</el-dialog>
......
......@@ -211,7 +211,7 @@
</div>
<div class="shop">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="reset">重置</el-button>
<el-button type="primary" @click="reset" icon="el-icon-refresh">重置</el-button>
<el-button type="primary" @click="cancel">取消</el-button>
</div>
</el-dialog>
......
......@@ -74,7 +74,7 @@
</div>
<div class="shop">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-button type="primary" @click="cancel">取消</el-button>
</div>
</el-dialog>
......
......@@ -94,7 +94,7 @@
</div>
<div class="shop">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-button type="primary" @click="close">取消</el-button>
</div>
</el-dialog>
......
<template>
<div class="main">
<div class="search">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-button type="primary" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button>
<el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
......
......@@ -9,7 +9,7 @@
>
<div class="search">
<!-- <el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button> -->
<el-button type="primary" @click="result" icon="el-icon-refresh">重置</el-button> -->
<el-row>
<el-col :span="24">
......@@ -33,8 +33,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......
......@@ -27,7 +27,7 @@
></el-input>
</el-form-item>
<el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
<el-button
type="primary"
@click="moreSearch"
......
......@@ -30,8 +30,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......
......@@ -3,8 +3,8 @@
<div class="log-search">
字典名称：
<el-input v-model="searchKey" style="border: 1px solid #C0C4CC;width: 230px;border-radius: 4px" placeholder="请输入内容"></el-input>
<el-button type="primary" @click="query">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</div>
<div class="log-detail">
<div class="log-menu">
......
......@@ -19,8 +19,8 @@
value-format="yyyy-MM-dd HH:mm:ss"
:picker-options="pickerOptions">
</el-date-picker>
<el-button type="primary" @click="query">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
<el-button type="info" @click="getError">错误日志</el-button>
</div>
......
......@@ -25,8 +25,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" @click="search">查询</el-button>
<el-button type="warning" style="margin-left:10px" @click="result">重置</el-button>
<el-button type="primary" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" style="margin-left:10px" @click="result" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......
......@@ -4,7 +4,7 @@
<el-tab-pane label="宗地分割" name="zd">
<div class="fg-tabs top20">
<span class="tips">分割前宗地信息</span>
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<el-button type="primary" class="addBtn" @click="newAdd" icon="el-icon-plus">新增</el-button>
<div class="fgq">
<el-card class="data">
<div slot="header" class="clearfix">
......@@ -1212,13 +1212,14 @@
}
.cz, .xh {
width: 100px;
width: 80px;
}
.xzq, .djq, .djzq {
width: 150px;
}
.search {
color: #BBB !important;
}
......@@ -1227,6 +1228,7 @@
width: 210px;
display: block;
margin: 10px auto;
border: 1px solid #F2F2F2;
}
/deep/ .el-select{
width: 100%;
......
......@@ -22,8 +22,8 @@
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
<el-button type="primary" style="margin-left:30px" @click="search" icon="el-icon-search">查询</el-button>
<el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
</el-form>
</el-col>
</el-row>
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" @tab-click="handleClick" type="card">
<el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
<el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane>
<el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane>
<el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
<el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane>
</el-tabs>
</div>
</template>
<script>
......
......@@ -241,7 +241,7 @@
</div>
<div class="btnGroup">
<el-button type="primary" @click="saveInfo">保存</el-button>
<el-button type="primary" @click="resetInfo">重置</el-button>
<el-button type="primary" @click="resetInfo" icon="el-icon-refresh">重置</el-button>
<el-button type="primary" @click="dialogVisible = false"
>取消</el-button
>
......