Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
83f1fbe2 by 任超
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

2 parents a1831b0f 88c0d236
Inline Side-by-side
Showing 11 changed files with 550 additions and 16 deletions
...@@ -11,3 +11,26 @@ export function getErrorLogList (data) { ...@@ -11,3 +11,26 @@ export function getErrorLogList (data) {
11 showLoading: true 11 showLoading: true
12 }) 12 })
13 } 13 }
14
15 /*
16 系统监控 -获取操作日志列表
17 */
18 export function getOperationLogList (data) {
19 return request({
20 url: SERVER.SERVERAPI + '/rest/xtjk/view/getOperationLogList',
21 method: 'post',
22 data,
23 showLoading: true
24 })
25 }
26
27 /*
28 系统监控 -主机监控
29 */
30 export function getServerInfo () {
31 return request({
32 url: SERVER.SERVERAPI + '/rest/xtjk/view/getServerInfo',
33 method: 'get',
34 showLoading: true
35 })
36 }
......
...@@ -300,14 +300,14 @@ export const asyncRoutes = [ ...@@ -300,14 +300,14 @@ export const asyncRoutes = [
300 name: 'czrz', 300 name: 'czrz',
301 meta: { title: '操作日志' } 301 meta: { title: '操作日志' }
302 }, 302 },
303 // { 303 {
304 // path: 'monitor', 304 path: 'zjjk',
305 // id: '63', 305 id: '63',
306 // parentId: '6', 306 parentId: '6',
307 // component: () => import('@/views/xtjk/host/monitor.vue'), 307 component: () => import('@/views/xtjk/zjjk/zjjk.vue'),
308 // name: 'monitor', 308 name: 'zjjk',
309 // meta: { title: '主机监控' } 309 meta: { title: '主机监控' }
310 // }, 310 },
311 ] 311 ]
312 } 312 }
313 ] 313 ]
......
1 <template>
2 <div>
3 <el-row :gutter="8">
4 <el-col :span="16">
5 api接口地址：
6 <el-input v-model="formData.item.apiUri"></el-input>
7 </el-col>
8 </el-row>
9 <el-row :gutter="8">
10 <el-col :span="24" class="margin-top-middle">
11 传入参数：
12 <el-input type="textarea" :rows="4" v-model="formData.item.crcs"></el-input>
13 </el-col>
14 </el-row>
15 <el-row :gutter="8">
16 <el-col :span="24" class="margin-top-middle">
17 错误内容：
18 <el-input type="textarea" :rows="10" v-model="formData.item.cwnr"></el-input>
19 </el-col>
20 </el-row>
21 <el-row :gutter="8">
22 <el-col :span="24" class="margin-top-middle">
23 错误位置：
24 <el-input type="textarea" :rows="10" v-model="formData.item.cwdmwz"></el-input>
25 </el-col>
26 </el-row>
27 </div>
28 </template>
29 <script>
30 export default {
31 data () {
32 return {
33 };
34 },
35 components: { },
36 props: {
37 formData: {
38 type: Object,
39 default: () => {}
40 },
41 },
42 created(){
43 console.log(this.formData);
44 },
45 computed: {
46
47 },
48
49 methods: {
50
51 },
52 };
53 </script>
54 <style scoped lang='scss'>
55 @import "~@/styles/public.scss";
56 .margin-top-middle {
57 margin-top:10px
58 }
59 </style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -79,6 +79,26 @@ export default { ...@@ -79,6 +79,26 @@ export default {
79 } 79 }
80 }) 80 })
81 }, 81 },
82 queryClick(){
83 this.fetchData();
84 },
85 viewDetail(e){
86 this.$popup({
87 title: "错误日志",
88 width: "50%",
89 btnShow: false,
90 editItem: "xtjk/cwrz/components/viewDialog",
91 height: "800px",
92 formData: {
93 item: e
94 },
95 cancel: function () { }, //取消事件的回调
96 confirm: function () {
97 that.loadBdcdylist();
98 }, //确认事件的回调
99 });
100
101 }
82 } 102 }
83 }; 103 };
84 </script> 104 </script>
......
...@@ -69,7 +69,7 @@ class data extends filter { ...@@ -69,7 +69,7 @@ class data extends filter {
69 align: 'center', 69 align: 'center',
70 fixed: 'right', 70 fixed: 'right',
71 render: (h, scope) => { 71 render: (h, scope) => {
72 return <el-button type="text" onClick={() => { vm.del(scope.row) }}>查看</el-button> 72 return <el-button type="text" onClick={() => { vm.viewDetail(scope.row) }}>查看</el-button>
73 } 73 }
74 } 74 }
75 ] 75 ]
......
1 <template>
2 <div>
3 <el-row :gutter="8">
4 <el-col :span="16">
5 api接口地址：
6 <el-input v-model="formData.item.apiUri"></el-input>
7 </el-col>
8 </el-row>
9 <el-row :gutter="8">
10 <el-col :span="24" class="margin-top-middle">
11 操作人员：
12 <el-input v-model="formData.item.creater"></el-input>
13 </el-col>
14 </el-row>
15 <el-row :gutter="8">
16 <el-col :span="24" class="margin-top-middle">
17 错误内容：
18 <el-input type="textarea" :rows="10" v-model="formData.item.cznr"></el-input>
19 </el-col>
20 </el-row>
21 </div>
22 </template>
23 <script>
24 export default {
25 data () {
26 return {
27 };
28 },
29 components: { },
30 props: {
31 formData: {
32 type: Object,
33 default: () => {}
34 },
35 },
36 created(){
37 console.log(this.formData);
38 },
39 computed: {
40
41 },
42
43 methods: {
44
45 },
46 };
47 </script>
48 <style scoped lang='scss'>
49 @import "~@/styles/public.scss";
50 .margin-top-middle {
51 margin-top:10px
52 }
53 </style>
...\ No newline at end of file ...\ No newline at end of file
1 <template>
2 <div class="from-clues">
3 <!-- 表单部分 -->
4 <div class="from-clues-header">
5 <el-form :model="queryForm" ref="queryForm" @submit.native.prevent label-width="80px">
6 <el-row>
7 <el-col :span="5">
8 <el-form-item label="操作类型">
9 <el-input placeholder="请输入操作类型" v-model="queryForm.czlx" @clear="queryClick()" clearable class="width100">
10 </el-input>
11 </el-form-item>
12 </el-col>
13 <el-col :span="5">
14 <el-form-item label="接口地址">
15 <el-input placeholder="请输入接口地址" v-model="queryForm.apiUri" @clear="queryClick()" clearable class="width100">
16 </el-input>
17 </el-form-item>
18 </el-col>
19 <el-col :span="4" class="btnColRight">
20 <el-form-item>
21 <el-button type="primary" native-type="submit" @click="queryClick()">查询</el-button>
22 </el-form-item>
23 </el-col>
24 </el-row>
25 </el-form>
26 </div>
27 <div class="from-clues-content">
28 <lb-table :page-size="pageData.size" border :current-page.sync="pageData.currentPage"
29 :heightNum="300" :total="tableData.total" @size-change="handleSizeChange"
30 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="tableData.data">
31 </lb-table>
32 </div>
33 </div>
34 </template>
35 <script>
36 import table from "@/utils/mixin/table"
37 import { datas, sendThis } from "./czrzdata"
38 import { getOperationLogList } from "@/api/xtjk.js"
39 export default {
40 name: "czrz",
41 components: { },
42 mixins: [table],
43 mounted () {
44 sendThis(this);
45 },
46 computed: {
47 },
48 data () {
49 return {
50 queryForm: {
51 czlx: "",
52 apiUrl: "",
53 },
54 pageData: {
55 current: 1,
56 size: 10,
57 },
58 tableData: {
59 total: 0,
60 columns: datas.columns(),
61 data: [],
62 },
63 };
64 },
65 methods: {
66 init (e) {
67 this.fetchData()
68 },
69 // 列表渲染接口
70 fetchData () {
71 getOperationLogList({ ...this.queryForm, ...this.pageData }).then(res => {
72 if (res.code === 200) {
73 let { total, records } = res.result
74 this.tableData.total = total;
75 this.tableData.data = records
76 }
77 })
78 },
79 queryClick(){
80 this.fetchData();
81 },
82 viewDetail(e){
83 this.$popup({
84 title: "操作日志",
85 width: "50%",
86 btnShow: false,
87 editItem: "xtjk/czrz/components/viewDialog",
88 height: "800px",
89 formData: {
90 item: e
91 },
92 cancel: function () { }, //取消事件的回调
93 confirm: function () {
94 that.loadBdcdylist();
95 }, //确认事件的回调
96 });
97
98 }
99 }
100 };
101 </script>
102 <style scoped lang="scss">
103 @import "~@/styles/public.scss";
104 </style>
105
......
1 import filter from '@/utils/filter.js'
2 let vm = null
3
4 const sendThis = (_this) => {
5 vm = _this
6 }
7 class data extends filter {
8 constructor() {
9 super()
10 }
11 columns () {
12 return [
13 {
14 label: '序号',
15 type: 'index',
16 width: '50',
17 render: (h, scope) => {
18 return (
19 <div>
20 {(vm.pageData.currentPage - 1) * vm.pageData.pageSize + scope.$index + 1}
21 </div>
22 )
23 }
24 },
25 {
26 prop: "czlx",
27 label: "操作类型",
28 width: '100'
29 },
30 {
31 prop: "apiUri",
32 label: "api接口",
33 width: '200'
34 },
35 {
36 prop: "creater",
37 label: "操作人员",
38 width: '100'
39 },
40 {
41 prop: "createtime",
42 label: "操作时间",
43 width: '150'
44 },
45 {
46 prop: "czfs",
47 label: "操作方式",
48 width: '100'
49 },
50 {
51 prop: "czywbh",
52 label: "操作业务编号",
53 width: '150'
54 },
55 {
56 prop: "cznr",
57 label: "操作内容",
58 render: (h, scope) => {
59 return <div class="item-cwnr">{scope.row.cznr}</div>
60 }
61 },
62 {
63 label: '操作',
64 width: '80',
65 align: 'center',
66 fixed: 'right',
67 render: (h, scope) => {
68 return <el-button type="text" onClick={() => { vm.viewDetail(scope.row) }}>查看</el-button>
69 }
70 }
71 ]
72 }
73 }
74 let datas = new data()
75 export {
76 datas,
77 sendThis
78 }
1 <template>
2 <div>
3 <el-row :gutter="20">
4 <el-col :span="12">
5 <el-card class="box-card">
6 <div slot="header" class="clearfix">
7 <span class="font-border">CPU</span>
8 </div>
9 <div class="flex-display">
10 <div class="width-50 font-border">属性</div>
11 <div class="font-border">值</div>
12 </div>
13 <div class="flex-display">
14 <div class="width-50">核心数</div>
15 <div>{{serverData.xtjkCpu.cpuNum}}</div>
16 </div>
17 <div class="flex-display">
18 <div class="width-50">用户使用率</div>
19 <div>{{serverData.xtjkCpu.used}}%</div>
20 </div>
21 <div class="flex-display">
22 <div class="width-50">系统使用率</div>
23 <div>{{serverData.xtjkCpu.sys}}%</div>
24 </div>
25 <div class="flex-display">
26 <div class="width-50">当前空闲率</div>
27 <div>{{serverData.xtjkCpu.free}}%</div>
28 </div>
29 </el-card>
30 </el-col>
31 <el-col :span="12">
32 <el-card class="box-card">
33 <div slot="header" class="clearfix">
34 <span class="font-border">内存</span>
35 </div>
36 <div class="flex-display">
37 <div class="width-33 font-border">属性</div>
38 <div class="width-33 font-border">内存</div>
39 <div class="font-border">JVM</div>
40 </div>
41 <div class="flex-display">
42 <div class="width-33">总内存</div>
43 <div class="width-33">{{serverData.xtjkMem.total}}G</div>
44 <div>{{serverData.xtjkJvm.total}}M</div>
45 </div>
46 <div class="flex-display">
47 <div class="width-33">已用内存</div>
48 <div class="width-33">{{serverData.xtjkMem.used}}G</div>
49 <div>{{serverData.xtjkJvm.used}}M</div>
50 </div>
51 <div class="flex-display">
52 <div class="width-33">剩余内存</div>
53 <div class="width-33">{{serverData.xtjkMem.free}}G</div>
54 <div>{{serverData.xtjkJvm.free}}M</div>
55 </div>
56 <div class="flex-display">
57 <div class="width-33">使用率</div>
58 <div class="width-33">{{serverData.xtjkMem.usage}}%</div>
59 <div>{{serverData.xtjkJvm.usage}}%</div>
60 </div>
61 </el-card>
62 </el-col>
63 </el-row>
64 <el-row :gutter="20">
65 <el-col :span="24">
66 <el-card class="box-card">
67 <div slot="header" class="clearfix">
68 <span class=" font-border">服务器信息</span>
69 </div>
70 <div class="flex-display">
71 <div class="width-25 font-border">服务器名称</div>
72 <div class="width-25">{{serverData.xtjkSys.computerName}}</div>
73 <div class="width-25 font-border">操作系统</div>
74 <div>{{serverData.xtjkSys.osName}}</div>
75 </div>
76 <div class="flex-display">
77 <div class="width-25 font-border">服务器IP</div>
78 <div class="width-25">{{serverData.xtjkSys.computerIp}}</div>
79 <div class="width-25 font-border">系统架构</div>
80 <div>{{serverData.xtjkSys.osArch}}</div>
81 </div>
82 </el-card>
83 </el-col>
84 </el-row>
85 <el-row :gutter="20">
86 <el-col :span="24">
87 <el-card class="box-card">
88 <div slot="header" class="clearfix">
89 <span class=" font-border">Java虚拟机信息</span>
90 </div>
91 <div class="flex-display">
92 <div class="width-25 font-border">Java名称</div>
93 <div class="width-25">{{serverData.xtjkJvm.name}}</div>
94 <div class="width-25 font-border">Java版本</div>
95 <div>{{serverData.xtjkJvm.version}}</div>
96 </div>
97 <div class="flex-display">
98 <div class="width-25 font-border">启动时间</div>
99 <div class="width-25">{{serverData.xtjkJvm.startTime}}</div>
100 <div class="width-25 font-border">运行时长</div>
101 <div>{{serverData.xtjkJvm.runTime}}</div>
102 </div>
103 <div class="flex-display">
104 <div class="width-25 font-border">安装路径</div>
105 <div>{{serverData.xtjkJvm.home}}</div>
106 </div>
107 <div class="flex-display">
108 <div class="width-25 font-border">项目路径</div>
109 <div>{{serverData.xtjkSys.userDir}}</div>
110 </div>
111 </el-card>
112 </el-col>
113 </el-row>
114 <el-row :gutter="20">
115 <el-col :span="24">
116 <el-card class="box-card">
117 <div slot="header" class="clearfix">
118 <span class=" font-border">磁盘信息</span>
119 </div>
120 <div>
121 <el-table :data="serverData.sysFiles" stripe style="width: 100%">
122 <el-table-column prop="dirName" label="盘符路径" width="180"></el-table-column>
123 <el-table-column prop="sysTypeName" label="文件系统" width="180"></el-table-column>
124 <el-table-column prop="typeName" label="盘符类型"></el-table-column>
125 <el-table-column prop="total" label="总大小"></el-table-column>
126 <el-table-column prop="free" label="可用大小"></el-table-column>
127 <el-table-column prop="used" label="已用大小"></el-table-column>
128 <el-table-column prop="usage" label="已用百分比"></el-table-column>
129 </el-table>
130 </div>
131 </el-card>
132 </el-col>
133 </el-row>
134 </div>
135 </template>
136 <script>
137 import table from "@/utils/mixin/table"
138 import { getServerInfo } from "@/api/xtjk.js"
139 export default {
140 name: "zjjk",
141 components: { },
142 mixins: [table],
143 mounted () {
144 //sendThis(this);
145 },
146 computed: {
147 },
148 data () {
149 return {
150 serverData: {}
151 };
152 },
153 methods: {
154 init (e) {
155 this.fetchData()
156 },
157 // 列表渲染接口
158 fetchData () {
159 getServerInfo().then(res => {
160 if (res.code === 200) {
161 this.serverData = res.result
162 }
163 })
164 },
165 }
166 };
167 </script>
168 <style scoped lang="scss">
169 @import "~@/styles/public.scss";
170 .box-card{
171 margin: 5px 10px 10px 5px;
172 }
173 .flex-display {
174 display: flex;
175 margin-bottom: 10px;
176 border-bottom: 1px solid #e6ebf5;
177 }
178 .width-50 {
179 width: 50%;
180 padding-bottom: 10px;
181 }
182 .width-33 {
183 width: 33%;
184 padding-bottom: 10px;
185 }
186 .width-25 {
187 width: 25%;
188 padding-bottom: 10px;
189 }
190 .font-border {
191 font-weight: bolder
192 }
193 </style>
194
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
133 <el-row :gutter="10"> 133 <el-row :gutter="10">
134 <el-col :span="14" v-if="ruleForm.qlxx"> 134 <el-col :span="14" v-if="ruleForm.qlxx">
135 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式："> 135 <el-form-item :class="flag ? 'marginBot0' : ''" label="共有方式：">
136 <el-radio-group :disabled="$route.query.viewtype==1" v-model="ruleForm.slywxx.gyfs"> 136 <el-radio-group :disabled="$route.query.viewtype==1" @change="showCZInfo" v-model="ruleForm.slywxx.gyfs">
137 <el-radio label="1">单独所有</el-radio> 137 <el-radio label="1">单独所有</el-radio>
138 <el-radio label="2">共同共有</el-radio> 138 <el-radio label="2">共同共有</el-radio>
139 <el-radio label="3">按份所有</el-radio> 139 <el-radio label="3">按份所有</el-radio>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
142 </el-col> 142 </el-col>
143 <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'"> 143 <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'">
144 <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证："> 144 <el-form-item :class="flag ? 'marginBot0' : ''" label="是否分别持证：">
145 <el-radio-group v-model="ruleForm.sffbcz"> 145 <el-radio-group v-model="ruleForm.slywxx.sffbcz">
146 <el-radio label="1">是</el-radio> 146 <el-radio label="1">是</el-radio>
147 <el-radio label="0">否</el-radio> 147 <el-radio label="0">否</el-radio>
148 </el-radio-group> 148 </el-radio-group>
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
150 </el-col> 150 </el-col>
151 <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'"> 151 <el-col :span="5" v-show="ruleForm.qlxx&&ruleForm.qlxx.gyfs == '2'">
152 <el-form-item :class="flag ? 'marginBot0' : ''" label="持证人："> 152 <el-form-item :class="flag ? 'marginBot0' : ''" label="持证人：">
153 <el-select v-model="ruleForm.czr" placeholder="持证人"> 153 <el-select v-model="ruleForm.slywxx.czr" placeholder="持证人">
154 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value"> 154 <el-option v-for="item in czrOptions" :key="item.value" :label="item.label" :value="item.value">
155 </el-option> 155 </el-option>
156 </el-select> 156 </el-select>
...@@ -222,6 +222,9 @@ export default { ...@@ -222,6 +222,9 @@ export default {
222 upDateQlrxxList (val) { 222 upDateQlrxxList (val) {
223 this.ruleForm.qlrList = _.cloneDeep(val); 223 this.ruleForm.qlrList = _.cloneDeep(val);
224 }, 224 },
225 showCZInfo() {
226 console.log(this.ruleForm.slywxx.gyfs);
227 },
225 // 更新权利人信息 228 // 更新权利人信息
226 upDateYwrxxList (val) { 229 upDateYwrxxList (val) {
227 this.ruleForm.ywrList = _.cloneDeep(val); 230 this.ruleForm.ywrList = _.cloneDeep(val);
......
...@@ -47,9 +47,7 @@ ...@@ -47,9 +47,7 @@
47 <div class="triangle"></div> 47 <div class="triangle"></div>
48 </div> 48 </div>
49 49
50 <el-form-item :class="flag ? 'marginBot0' : ''"> 50 <el-button type="primary" style="float: right;margin-right: 20px; " @click="onClick">数据查看</el-button>
51 <el-button type="primary" @click="onClick">数据查看</el-button>
52 </el-form-item>
53 51
54 <el-row :gutter="10" v-if="ruleForm.qlxx"> 52 <el-row :gutter="10" v-if="ruleForm.qlxx">
55 <el-col :span="8"> 53 <el-col :span="8">
...@@ -190,6 +188,7 @@ ...@@ -190,6 +188,7 @@
190 import InformationTable from "@/views/workflow/components/InformationTable"; 188 import InformationTable from "@/views/workflow/components/InformationTable";
191 import {Init, saveGZBatchData} from "@/api/fwsyqFlow.js"; 189 import {Init, saveGZBatchData} from "@/api/fwsyqFlow.js";
192 import { mapGetters } from "vuex"; 190 import { mapGetters } from "vuex";
191 import SERVER from "@/api/config";
193 export default { 192 export default {
194 async created () { 193 async created () {
195 this.propsParam = this.$attrs; 194 this.propsParam = this.$attrs;
...@@ -258,7 +257,7 @@ export default { ...@@ -258,7 +257,7 @@ export default {
258 this.$popup({ 257 this.$popup({
259 titleStyle: "left", 258 titleStyle: "left",
260 title: "登记簿详情", // 弹窗标题 259 title: "登记簿详情", // 弹窗标题
261 editItem: "ywbl/fdcq2/slxxCompareDetai", // 弹窗内容 260 editItem: SERVER.SERVERAPI+"/rest/ywbl/fdcq2/slxxCompareDetai", // 弹窗内容
262 formData: { 261 formData: {
263 bsmSlsq: this.propsParam.bsmSldy, 262 bsmSlsq: this.propsParam.bsmSldy,
264 qllx: this.propsParam.qllx 263 qllx: this.propsParam.qllx
......