From 7e0ec9b7a6899cb47c0230231ca23924cef42c25 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:52:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/point/index.vue | 162 +++++++++++-----------
src/views/system/data-manage/data-detail/list.js | 130 +++++++++++++-----
src/views/system/data-manage/data-detail/index.vue | 75 +++++++---
src/assets/images/profile.jpg | 0
src/assets/images/ht.jpg | 0
src/assets/images/profile1.jpg | 0
src/views/system/contract/contract/index.vue | 6
7 files changed, 231 insertions(+), 142 deletions(-)
diff --git a/src/assets/images/ht.jpg b/src/assets/images/ht.jpg
new file mode 100644
index 0000000..c6893f5
--- /dev/null
+++ b/src/assets/images/ht.jpg
Binary files differ
diff --git a/src/assets/images/profile.jpg b/src/assets/images/profile.jpg
index b3a940b..7fb8db2 100644
--- a/src/assets/images/profile.jpg
+++ b/src/assets/images/profile.jpg
Binary files differ
diff --git a/src/assets/images/profile1.jpg b/src/assets/images/profile1.jpg
new file mode 100644
index 0000000..b3a940b
--- /dev/null
+++ b/src/assets/images/profile1.jpg
Binary files differ
diff --git a/src/views/system/contract/contract/index.vue b/src/views/system/contract/contract/index.vue
index 7740bb7..1d99865 100644
--- a/src/views/system/contract/contract/index.vue
+++ b/src/views/system/contract/contract/index.vue
@@ -39,16 +39,16 @@
</el-row>
<el-row v-if="contractList && contractList.length > 0" v-loading="loading" :gutter="20">
<el-col
- :span="8"
+ :span="6"
v-for="(item, index) in contractList"
:key="index"
style="margin-bottom: 10px"
>
<el-card :body-style="{ padding: '0px' }">
- <ImagePreview
+ <el-image
style="width: 100%; height: 187px"
fit="cover"
- :src="item.attachment"
+ :src="require('../../../../assets/images/ht.jpg')"
class="image"
/>
<div style="padding: 14px">
diff --git a/src/views/system/data-manage/data-detail/index.vue b/src/views/system/data-manage/data-detail/index.vue
index 8619b2d..a41849a 100644
--- a/src/views/system/data-manage/data-detail/index.vue
+++ b/src/views/system/data-manage/data-detail/index.vue
@@ -1,8 +1,12 @@
<template>
<div class="app-container">
+ <div style="display: flex;flex-direction: row;min-width: 158px;max-width: 158px;margin-bottom: 5px;border-radius: 1px">
+ <div @click="allData(0)" class="tab" :class="{tabActive: 0 === selected, tabInactive: 0 !== selected}">鍏ㄩ儴</div>
+ <div @click="provinceData(1)" class="tab" :class="{tabActive: 1 === selected, tabInactive: 1 !== selected}">鐪佸巺鑰冩牳</div>
+ </div>
<el-card class="box-card" v-show="index !== 'image_resource_security'">
<el-row style="display: flex; flex-direction: row; align-items: center" justify="space-between">
- <div style="font-size: 18px;min-width: 200px">{{ruleName}}</div>
+ <div style="font-size: 18px;min-width: 200px;height: 80px;display: flex;align-items: center">{{ruleName}}</div>
<div v-if="cardList && cardList.length > 0" v-for="card in cardList" style="display: flex;flex-direction: row; margin-right: 50px;margin-left: 20px;align-items: center" :key="card.label">
<div>
<div class="icon-container">
@@ -26,24 +30,28 @@
</el-row>
</el-card>
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
- <el-form-item label="鍏抽敭璇�" prop="bayonetNumber">
- <el-input v-model="queryParams.keyword" placeholder="鍏抽敭璇嶆悳绱�" clearable @input="handleQuery"/>
- </el-form-item>
- <el-form-item label="鏃堕棿鑼冨洿" prop="timeRange">
- <el-date-picker
- v-model="queryParams.timeRange"
- type="daterange"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
+ <div style="display: flex;position: relative">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+ <el-form-item label="鍏抽敭璇�" prop="bayonetNumber">
+ <el-input v-model="queryParams.keyword" placeholder="鍏抽敭璇嶆悳绱�" clearable @input="handleQuery"/>
+ </el-form-item>
+ <el-form-item label="鏃堕棿鑼冨洿" prop="timeRange">
+ <el-date-picker
+ v-model="queryParams.timeRange"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="small" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ <right-toolbar style="position: absolute;right: 0px" v-show="index !== 'image_resource_security'" :showSearch.sync="showSearch" @queryTable="handleQuery" :columns="showList"></right-toolbar>
+ </div>
+
<el-row :gutter="10" class="mb8" v-show="index === 'image_resource_security'">
<el-container>
@@ -81,8 +89,6 @@
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
-
- <right-toolbar v-show="index !== 'image_resource_security'" :showSearch.sync="showSearch" @queryTable="handleQuery" :columns="showList"></right-toolbar>
<div>
<el-table v-loading="loading" :data="tableData.list">
@@ -160,6 +166,7 @@
},
data() {
return {
+ selected: 0,
// 瀵煎叆鍙傛暟
upload: {
// 鏄惁鏄剧ず寮瑰嚭灞�
@@ -277,6 +284,12 @@
this.getList();
},
methods: {
+ allData(active) {
+ this.selected = active
+ },
+ provinceData(active) {
+ this.selected = active
+ },
showListPD(item) {
if (!this.showList) {
return true
@@ -399,6 +412,26 @@
};
</script>
<style scoped>
+.tab {
+ padding: 5px 15px;
+}
+.tab:hover {
+ cursor: pointer;
+ user-select: none;
+}
+.tabActive {
+ color: white;
+ background-color: #409eff;
+ border: none;
+ border-radius: 1px;
+}
+.tabInactive {
+ background-color: #edf2f6;
+ color: #409eff;
+}
+.tabInactive:hover {
+ background-color: #edf2f6;
+}
.box-card {
background-color: #F5F9FE;
width: 100%;
diff --git a/src/views/system/data-manage/data-detail/list.js b/src/views/system/data-manage/data-detail/list.js
index d1a8e7b..813dd29 100644
--- a/src/views/system/data-manage/data-detail/list.js
+++ b/src/views/system/data-manage/data-detail/list.js
@@ -338,6 +338,9 @@
{
label: '绾害寮傚父鏁�'
},
+ {
+ label: '鍚堟牸鐜�'
+ },
]
}
],
@@ -666,6 +669,9 @@
},
{
label: '绾害寮傚父鏁�'
+ },
+ {
+ label: '娉ㄥ唽鐜�'
},
]
}
@@ -996,6 +1002,9 @@
{
label: '绾害寮傚父鏁�'
},
+ {
+ label: '鑰冩牳姣�'
+ },
]
}
],
@@ -1155,6 +1164,9 @@
{
label: '璁惧鎬绘暟'
},
+ {
+ label: '鍦ㄧ嚎鐜�'
+ },
]
}
],
@@ -1303,6 +1315,9 @@
{
label: '璁惧鎬绘暟'
},
+ {
+ label: '鍦ㄧ嚎鐜�'
+ },
]
}
],
@@ -1392,6 +1407,9 @@
{
label: '寮傚父'
},
+ {
+ label: '鍙敤鐜�'
+ },
]
}
]
@@ -1468,6 +1486,9 @@
},
{
label: '寮傚父'
+ },
+ {
+ label: '鍙敤鐜�'
},
]
}
@@ -1943,21 +1964,9 @@
{
label: '璁惧鎬绘暟'
},
- // {
- // label: '宸茶仈缃�'
- // },
- // {
- // label: '鏈仈缃�'
- // },
- // {
- // label: '瑙嗛鐩戞帶'
- // },
- // {
- // label: '杞﹁締璇嗗埆'
- // },
- // {
- // label: '浜鸿劯璇嗗埆'
- // },
+ {
+ label: '鍦ㄧ嚎鐜�'
+ },
]
}
],
@@ -2046,6 +2055,9 @@
},
{
label: '寮傚父'
+ },
+ {
+ label: '鍙敤鐜�'
},
]
}
@@ -2144,7 +2156,10 @@
},
{
label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
- }
+ },
+ {
+ label: '鏍囨敞姝ｇ‘鐜�'
+ },
]
}
],
@@ -2236,7 +2251,10 @@
},
{
label: 'osd鏃堕棿鏍囨敞閿欒鏁�'
- }
+ },
+ {
+ label: '鏍℃椂姝ｇ‘鐜�'
+ },
]
}
],
@@ -2393,21 +2411,9 @@
{
label: '璁惧鎬绘暟'
},
- // {
- // label: '宸茶仈缃�'
- // },
- // {
- // label: '鏈仈缃�'
- // },
- // {
- // label: '瑙嗛鐩戞帶'
- // },
- // {
- // label: '杞﹁締璇嗗埆'
- // },
- // {
- // label: '浜哄憳璇嗗埆'
- // },
+ {
+ label: '鍦ㄧ嚎鐜�'
+ },
]
}
],
@@ -2616,6 +2622,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '绋冲畾鎬�'
+ },
]
}
]
@@ -2691,6 +2700,9 @@
dataList: [
{
label: '璁惧鎬绘暟'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
},
]
}
@@ -2998,6 +3010,9 @@
{
label: '绾害寮傚父鏁�'
},
+ {
+ label: '涓�鑷寸巼'
+ },
]
}
],
@@ -3088,6 +3103,9 @@
},
{
label: '绮惧害杩囦綆'
+ },
+ {
+ label: '鍑嗙‘鐜�'
},
]
}
@@ -3192,7 +3210,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '瀹屾暣鎬�'
+ }
]
}
],
@@ -3282,7 +3302,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '鍑嗙‘鎬�'
+ }
]
}
],
@@ -3543,6 +3565,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '鍑嗙‘鎬�'
+ },
]
}
],
@@ -3653,7 +3678,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '鍙婃椂鎬�'
+ }
]
}
]
@@ -3739,7 +3766,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '鍙敤鎬�'
+ }
]
}
]
@@ -3861,7 +3890,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '鍙敤鎬�'
+ }
]
}
],
@@ -3951,6 +3982,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '绋冲畾鎬�'
+ },
]
}
]
@@ -4028,6 +4062,9 @@
},
{
label: '鏁版嵁閲忓皯'
+ },
+ {
+ label: '鍦ㄧ嚎鐜�'
},
]
}
@@ -4335,6 +4372,9 @@
{
label: '绾害寮傚父鏁�'
},
+ {
+ label: '涓�鑷寸巼'
+ },
]
}
],
@@ -4430,6 +4470,9 @@
{
label: '绮惧害杩囦綆'
},
+ {
+ label: '鍑嗙‘鐜�'
+ },
]
}
]
@@ -4490,6 +4533,9 @@
},
{
label: '绮惧害杩囦綆'
+ },
+ {
+ label: '鍚堟牸鎬�'
},
]
}
@@ -4717,6 +4763,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '鍑嗙‘鎬�'
+ },
]
}
],
@@ -4937,6 +4986,9 @@
{
label: '鏁版嵁閲忓皯'
},
+ {
+ label: '鍙婃椂鎬�'
+ },
]
}
],
@@ -5064,7 +5116,9 @@
{
icon: 'el-icon-truck',
dataList: [
-
+ {
+ label: '鍙敤鎬�'
+ }
]
}
],
diff --git a/src/views/system/point/index.vue b/src/views/system/point/index.vue
index c527177..5f162cf 100644
--- a/src/views/system/point/index.vue
+++ b/src/views/system/point/index.vue
@@ -29,7 +29,7 @@
v-hasPermi="['point:remove']">鍒犻櫎</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" plain icon="el-icon-bottom" v-loading="download" size="mini" @click="handleExport"
+ <el-button type="primary" plain icon="el-icon-top" v-loading="download" size="mini" @click="handleExport"
v-hasPermi="['point:export']">瀵煎嚭鐐逛綅</el-button>
</el-col>
<el-col :span="1.5">
@@ -84,7 +84,7 @@
<el-button class="bottom_" type="primary" size="small" v-loading="upload" @click="handleImport"
v-hasPermi="['point:import']">瀵煎叆</el-button>
</div>
- <el-button type="primary" size="mini" plain icon="el-icon-top" slot="reference" v-hasPermi="['point:import']">瀵煎叆鐐逛綅</el-button>
+ <el-button type="primary" size="mini" plain icon="el-icon-bottom" slot="reference" v-hasPermi="['point:import']">瀵煎叆鐐逛綅</el-button>
</el-popover>
</el-col>
<!-- <el-col :span="1.5">-->
@@ -124,81 +124,82 @@
@pagination="getList" />
<!-- 娣诲姞杩愮淮鐐逛綅瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="130px">
- <el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
- <el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
- </el-form-item>
- <el-form-item label="閲嶇偣鏍囩" prop="importantTag">
- <el-switch
- style="display: block"
- v-model="form.importantTag"
- active-color="#13ce66"
- inactive-color="#409EFF"
- active-text="閲嶇偣鐐逛綅"
- inactive-text="鏅�氱偣浣�">
- </el-switch>
- <!-- <el-select v-model="form.importantTag" placeholder="閲嶇偣鏍囩" clearable>
- <el-option label="閲嶇偣鐐逛綅" :value="true" />
- <el-option label="鏅�氱偣浣�" :value="false" />
- </el-select> -->
- </el-form-item>
- <el-form-item label="鐪佸巺鏍囩" prop="provinceTag">
- <el-switch
- style="display: block"
- v-model="form.provinceTag"
- active-color="#13ce66"
- inactive-color="#409EFF"
- active-text="鐪佸巺鐐逛綅"
- inactive-text="鏅�氱偣浣�">
- </el-switch>
- <!-- <el-select v-model="form.provinceTag" placeholder="鐪佸巺鏍囩" clearable>
- <el-option label="鐪佸巺鐐逛綅" :value="true" />
- <el-option label="鏅�氱偣浣�" :value="false" />
- </el-select> -->
- </el-form-item>
- <el-form-item label="閲嶇偣鎸囨尌鍥惧儚鏍囩" prop="importantCommandImageTag">
- <el-switch
- style="display: block"
- v-model="form.importantCommandImageTag"
- active-color="#13ce66"
- inactive-color="#409EFF"
- active-text="閲嶇偣鎸囨尌鍥惧儚鐐逛綅"
- inactive-text="鏅�氱偣浣�">
- </el-switch>
- <!-- <el-select v-model="form.importantCommandImageTag" placeholder="閲嶇偣鎸囨尌鍥惧儚鏍囩" clearable>
- <el-option label="閲嶇偣鎸囨尌鍥惧儚鐐逛綅" :value="true" />
- <el-option label="鏅�氱偣浣�" :value="false" />
- </el-select> -->
- </el-form-item>
- <!-- <el-form-item label="鐐逛綅鎵�鍦ㄥ湴" prop="region">-->
- <!-- <el-cascader v-model="form.region" :options="regionList" placeholder="鐐逛綅鎵�鍦ㄥ湴" :props="props" collapse-tags></el-cascader>-->
- <!-- </el-form-item>-->
- <el-form-item label="鐩戠閮ㄩ棬" prop="deptId">
- <el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
- :props="{ checkStrictly: true }">
- </el-cascader>
- </el-form-item>
- <el-form-item label="杩愮淮鍗曚綅" prop="unitId">
- <el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
- <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="杩愮淮鏃堕棿" prop="timezone">
- <el-date-picker
- size="small"
- v-model="timezone"
- type="daterange"
- range-separator="鑷�"
- start-placeholder="杩愮淮寮�濮嬫椂闂�"
- end-placeholder="杩愮淮缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鐐逛綅澶囨敞" prop="remark">
- <el-input type="textarea" v-model="form.remark"/>
- </el-form-item>
- </el-form>
+ <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
+ <div style="display: flex;flex-direction: row">
+ <div style="flex: 5; border-right: 1px solid #d3d3d3; padding-right: 10px">
+ <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+ <el-form-item label="鐐逛綅鍚嶇О" prop="pointName">
+ <el-input v-model="form.pointName" placeholder="璇疯緭鍏ョ偣浣嶅悕绉�" />
+ </el-form-item>
+ <el-form-item label="鐩戠閮ㄩ棬" prop="deptId">
+ <el-cascader v-model="form.deptId" :options="deptOptions" :show-all-levels="false" clearable
+ :props="{ checkStrictly: true }">
+ </el-cascader>
+ </el-form-item>
+ <el-form-item label="杩愮淮鍗曚綅" prop="unitId">
+ <el-select v-model="form.unitId" placeholder="杩愮淮鍗曚綅">
+ <el-option v-for="item in unitList" :key="item.id" :label="item.value" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="杩愮淮鏃堕棿" prop="timezone">
+ <el-date-picker
+ size="small"
+ v-model="timezone"
+ type="daterange"
+ range-separator="鑷�"
+ start-placeholder="杩愮淮寮�濮嬫椂闂�"
+ end-placeholder="杩愮淮缁撴潫鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="鐐逛綅澶囨敞" prop="remark">
+ <el-input type="textarea" v-model="form.remark"/>
+ </el-form-item>
+ </el-form>
+ </div>
+ <div style="flex: 5">
+ <el-form ref="form" :model="form" :rules="rules" label-width="130px">
+ <el-form-item label="閲嶇偣:" prop="importantTag">
+ <el-switch
+ v-model="form.importantTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="閲嶇偣鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="鐪佸巺:" prop="provinceTag">
+ <el-switch
+ v-model="form.provinceTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="鐪佸巺鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="閮ㄧ骇:" prop="deptTag">
+ <el-switch
+ v-model="form.deptTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="閮ㄧ骇鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ <el-form-item label="閲嶇偣鎸囨尌鍥惧儚:" prop="importantCommandImageTag">
+ <el-switch
+ v-model="form.importantCommandImageTag"
+ active-color="#13ce66"
+ inactive-color="gray"
+ active-text="閲嶇偣鎸囨尌鍥惧儚鐐逛綅"
+ inactive-text="鏅�氱偣浣�">
+ </el-switch>
+ </el-form-item>
+ </el-form>
+
+ </div>
+ </div>
+
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">鍙� 娑�</el-button>
<el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
@@ -241,7 +242,7 @@
export default {
name: "Point",
- dicts: ['point_tag'],
+ dicts: ['point_tag', 'area_code'],
data() {
return {
needUpdateUnit: false,
@@ -460,8 +461,9 @@
createTime: null,
updateTime: null,
deleted: null,
- importantTag: null,
- provinceTag: null
+ importantTag: false,
+ provinceTag: false,
+ deptTag: false,
};
this.resetForm("form");
},
--
Gitblit v1.8.0