Browse Source

Merge remote-tracking branch 'origin/master'

csg6 1 year ago
parent
commit
163d0f71e3

File diff suppressed because it is too large
+ 184 - 0
dist-pc/index.html


BIN
dist-pc/index.html.gz


+ 8 - 1
src/api/risk/analyse.js

@@ -33,7 +33,14 @@ export function hazardList(params) {
33 33
     params
34 34
   });
35 35
 }
36
-
36
+// 分析对象的下拉菜单
37
+export function getList(params) {
38
+  return request({
39
+    url: `/doubledefense/taskInventoryRecord/list`,
40
+    method: "get",
41
+    params
42
+  });
43
+}
37 44
 // 查询区域树
38 45
 export function areaTree(params) {
39 46
   return request({

+ 9 - 9
src/views/facility/facility.vue

@@ -79,27 +79,27 @@
79 79
           </template>
80 80
         </el-table-column>
81 81
 
82
-        <el-table-column label="设备编号" align="center">
82
+        <el-table-column label="工程车编号" align="center">
83 83
           <template slot-scope="scope">
84 84
             <span>{{ scope.row.deviceCode || '-' }}</span>
85 85
           </template>
86 86
         </el-table-column>
87
-        <el-table-column label="设备名称" align="center">
87
+        <el-table-column label="工程车名称" align="center">
88 88
           <template slot-scope="scope">
89 89
             <span>{{ scope.row.deviceName || '-' }}</span>
90 90
           </template>
91 91
         </el-table-column>
92
-        <el-table-column label="设备状态" align="center">
92
+        <el-table-column label="工程车状态" align="center">
93 93
           <template slot-scope="scope">
94 94
             <span>{{ initStatus(scope.row.status) || '-' }}</span>
95 95
           </template>
96 96
         </el-table-column>
97
-        <el-table-column label="设备类型" align="center">
97
+        <el-table-column label="工程车类型" align="center">
98 98
           <template slot-scope="scope">
99 99
             <span>{{ initDevice(scope.row.deviceType) || '-' }}</span>
100 100
           </template>
101 101
         </el-table-column>
102
-        <el-table-column label="过期时间" align="center">
102
+        <el-table-column label="入场时间" align="center">
103 103
           <template slot-scope="scope">
104 104
             <span>{{ scope.row.expirationDate || '-' }}</span>
105 105
           </template>
@@ -143,7 +143,7 @@
143 143
         label-width="150px"
144 144
         class="demo-ruleForm"
145 145
       >
146
-        <el-form-item label="设备名称:" prop="deviceName">
146
+        <el-form-item label="工程车名称:" prop="deviceName">
147 147
           <el-input
148 148
             type="text"
149 149
             v-model="ruleForm.deviceName"
@@ -159,7 +159,7 @@
159 159
             clearable
160 160
           ></el-input>
161 161
         </el-form-item> -->
162
-        <el-form-item label="设备状态:" prop="status">
162
+        <el-form-item label="工程车状态:" prop="status">
163 163
           <el-select v-model="ruleForm.status" style="width: 70%" clearable>
164 164
             <el-option
165 165
               :label="item.label"
@@ -200,7 +200,7 @@
200 200
             />
201 201
           </el-select>
202 202
         </el-form-item>
203
-        <el-form-item label="过期时间:">
203
+        <el-form-item label="入场时间:">
204 204
           <el-date-picker
205 205
             v-model="ruleForm.expirationDate"
206 206
             type="date"
@@ -633,7 +633,7 @@ export default {
633 633
     openMapAddressDialog() {
634 634
       console.log('这是地图选址弹窗组件打开')
635 635
       this.mapDialogVisible = true
636
-     
636
+
637 637
     },
638 638
     // 封面上传格式校验
639 639
     beforeUpload(file) {

+ 2 - 2
src/views/home.vue

@@ -874,13 +874,13 @@ export default {
874 874
       //底部数据
875 875
       deviceOption: [
876 876
         {
877
-          label: "视频监控",
877
+          label: "工程车一类",
878 878
           value: 1,
879 879
           icon: require("@/assets/images/shipin.png"),
880 880
           type: false,
881 881
         },
882 882
         {
883
-          label: "应急物资",
883
+          label: "工程车二类",
884 884
           value: 2,
885 885
           icon: require("@/assets/images/yingji.png"),
886 886
           type: false,

+ 21 - 2
src/views/login.vue

@@ -1,5 +1,8 @@
1 1
 <template>
2 2
   <div class="login">
3
+  <div class="logo">
4
+    <p>双 重 预 防 综 合 管 理 平 台</p>
5
+  </div>
3 6
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
4 7
       <h3 class="title"></h3>
5 8
       <el-form-item prop="username">
@@ -208,15 +211,31 @@ export default {
208 211
   height: 40px;
209 212
   line-height: 40px;
210 213
   position: fixed;
211
-  bottom: 0;
214
+  bottom: 30px;
212 215
   width: 100%;
213 216
   text-align: center;
214
-  color: #fff;
217
+  color: #469199;
215 218
   font-family: Arial;
219
+  font-weight: 600;
216 220
   font-size: 12px;
217 221
   letter-spacing: 1px;
218 222
 }
219 223
 .login-code-img {
220 224
   height: 38px;
221 225
 }
226
+.logo{
227
+  width: 100%;
228
+  position: absolute;
229
+  left: 0;
230
+  top: 80px;
231
+  p{
232
+     text-align: center;
233
+     font-size: 46px;
234
+     font-weight: 600;
235
+     background-image: linear-gradient(to top, rgba(82, 233, 250, 1), #fff);
236
+     color: transparent;
237
+	-webkit-background-clip: text;
238
+  }
239
+
240
+}
222 241
 </style>

+ 224 - 0
src/views/risk/inspection.vue

@@ -0,0 +1,224 @@
1
+<template>
2
+  <el-container>
3
+    <el-header v-if="isSearch">
4
+      <el-form style="margin: 10px 0" :inline="true">
5
+        <el-form-item label="排查状态:">
6
+          <el-select v-model="search.checkType" clearable>
7
+            <el-option
8
+              :label="item.label"
9
+              :value="item.value"
10
+              v-for="item in checkCycleOptions"
11
+              :key="item.value"
12
+            />
13
+          </el-select>
14
+        </el-form-item>
15
+
16
+        <el-form-item label="时间:">
17
+          <el-date-picker
18
+            clearable
19
+            v-model="search.time"
20
+            type="datetimerange"
21
+            value-format="yyyy-MM-dd HH:mm:ss"
22
+            range-separator="至"
23
+            start-placeholder="开始时间"
24
+            end-placeholder="结束时间"
25
+          >
26
+          </el-date-picker>
27
+        </el-form-item>
28
+        <el-form-item>
29
+          <el-button
30
+            style="margin-left: 10px"
31
+            type="primary"
32
+            icon="el-icon-search"
33
+            @click="initList"
34
+          >
35
+            搜索
36
+          </el-button>
37
+          <el-button class="commonBtn" icon="el-icon-refresh" @click="reset">
38
+            重置
39
+          </el-button>
40
+        </el-form-item>
41
+      </el-form>
42
+    </el-header>
43
+    <el-main>
44
+      <div class="headerTop">
45
+        <div>
46
+          <!-- <el-button type="primary" class="el-icon-plus" @click="doAdd(1)">
47
+            新增</el-button
48
+          > -->
49
+        </div>
50
+        <div>
51
+          <right-toolbar
52
+            @queryTable="initList"
53
+            :search="true"
54
+            @update:showSearch="isSearch = !isSearch"
55
+          ></right-toolbar>
56
+        </div>
57
+      </div>
58
+
59
+      <el-table
60
+        height="calc(100% - 200px)"
61
+        :data="list"
62
+        :row-style="{ height: '0px' }"
63
+        :header-cell-style="{ 'text-align': 'center', padding: '0px' }"
64
+        :cell-style="{ 'text-align': 'center', padding: '2px' }"
65
+        style="width: 100%"
66
+      >
67
+        <el-table-column label="序号" align="center" width="50">
68
+          <template slot-scope="scope">
69
+            <span> {{ (pageNum - 1) * pageSize + (scope.$index + 1) }}</span>
70
+          </template>
71
+        </el-table-column>
72
+        <el-table-column
73
+          label="隐患排查要求名称"
74
+          align="center"
75
+          show-overflow-tooltip
76
+        >
77
+          <template slot-scope="scope">
78
+            <span>{{ scope.row.troubleshootContentTask || '-' }}</span>
79
+          </template>
80
+        </el-table-column>
81
+        <el-table-column
82
+          label="区域名称"
83
+          align="center"
84
+          show-overflow-tooltip
85
+        >
86
+          <template slot-scope="scope">
87
+            <span>{{ scope.row.areaName || '-' }}</span>
88
+          </template>
89
+        </el-table-column>
90
+        <el-table-column
91
+          label="分析单元名称"
92
+          align="center"
93
+          show-overflow-tooltip
94
+        >
95
+          <template slot-scope="scope">
96
+            <span>{{ scope.row.riskUnitName || '-' }}</span>
97
+          </template>
98
+        </el-table-column>
99
+
100
+        <el-table-column
101
+          label="管控措施名称"
102
+          align="center"
103
+          show-overflow-tooltip
104
+        >
105
+          <template slot-scope="scope">
106
+            <span>{{ scope.row.riskMeasureDesc }}</span>
107
+          </template>
108
+        </el-table-column>
109
+        <el-table-column
110
+          label="开始时间"
111
+          align="center"
112
+          show-overflow-tooltip
113
+        >
114
+          <template slot-scope="scope">
115
+            <span>{{ scope.row.startDate || '-' }}</span>
116
+          </template>
117
+        </el-table-column>
118
+        <el-table-column
119
+          label="结束时间"
120
+          align="center"
121
+          show-overflow-tooltip
122
+        >
123
+          <template slot-scope="scope">
124
+            <span>{{ scope.row.endDate || '-' }}</span>
125
+          </template>
126
+        </el-table-column>
127
+        <el-table-column label="排查状态" align="center" show-overflow-tooltip>
128
+          <template slot-scope="scope">
129
+            <span>{{ !scope.row.status ? '未排查' : scope.row.status === 1 ? '已排查' : '漏检'}}</span>
130
+          </template>
131
+        </el-table-column>
132
+        <el-table-column label="巡检用户姓名" align="center" show-overflow-tooltip>
133
+          <template slot-scope="scope">
134
+            <span>{{ scope.row.checkUserNickName || '-' }}</span>
135
+          </template>
136
+        </el-table-column>
137
+        <el-table-column label="巡检时间" align="center" show-overflow-tooltip>
138
+          <template slot-scope="scope">
139
+            <span>{{ scope.row.checkTime || '-' }}</span>
140
+          </template>
141
+        </el-table-column>
142
+        <!-- <el-table-column label="操作" fixed="right" align="center" width="120">
143
+          <template slot-scope="scope">
144
+            <el-button type="text" size="mini" @click="doAdd(2, scope.row)">
145
+              编辑
146
+            </el-button>
147
+            <el-button type="text" size="mini" @click="doDelete(scope.row)">
148
+              删除
149
+            </el-button>
150
+          </template>
151
+        </el-table-column> -->
152
+      </el-table>
153
+      <pagination
154
+        v-show="total > 0"
155
+        :page.sync="pageNum"
156
+        :limit.sync="pageSize"
157
+        :page-sizes="[10, 20, 30, 50]"
158
+        :total="total"
159
+        @pagination="initList"
160
+      />
161
+    </el-main>
162
+
163
+  </el-container>
164
+</template>
165
+<script>
166
+import {
167
+  getList
168
+} from "@/api/risk/analyse.js";
169
+export default {
170
+  name: "RuoyiAnalyse",
171
+
172
+  data() {
173
+    return {
174
+      isSearch: false,
175
+      search: {
176
+        checkType: "",
177
+        time: "",
178
+      },
179
+      // 巡查类型的下拉
180
+      checkCycleOptions: [
181
+        { label: "未排查", value: '0' },
182
+        { label: "已排查", value: '1' },
183
+        { label: "漏检", value: '2' },
184
+      ],
185
+
186
+      pageNum: 1,
187
+      pageSize: 10,
188
+      total: 0,
189
+      list: [],
190
+    };
191
+  },
192
+
193
+  mounted() {
194
+    this.initList();
195
+  },
196
+
197
+  methods: {
198
+    async initList() {
199
+      console.log(this.search.checkType)
200
+      const res = await getList({
201
+        status:this.search.checkType || '',
202
+        startDate: this.search.time[0] || null,
203
+        endDate: this.search.time[1] || null,
204
+        pageNum: this.pageNum,
205
+        pageSize: this.pageSize,
206
+      });
207
+      console.log(res)
208
+      this.list = res.rows;
209
+      this.total = res.total;
210
+    },
211
+    // 重置
212
+    reset() {
213
+      this.search = {
214
+        checkType: "",
215
+        time: "",
216
+      };
217
+      this.pageNum = 1;
218
+      this.initList();
219
+    },
220
+  },
221
+};
222
+</script>
223
+
224
+<style lang="scss" scoped></style>