Merge branch 'master' of http://120.76.47.59:3000/liu_li/yxk-storeroom-system

src/api/system/logs.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request'
+
+// 报警日志 手动处理
+export function warnRemark(data) {
+  return request({
+    url: 'api/alarmlog/remark',
+    method: 'post',
+    data
+  })
+}
+
+export default { warnRemark }

src/assets/icons/svg/empty.svg

@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:url(#SVGID_1_);}
+	.st1{fill:url(#SVGID_2_);}
+	.st2{fill:url(#SVGID_3_);}
+	.st3{fill:url(#SVGID_4_);}
+	.st4{fill:url(#SVGID_5_);}
+	.st5{fill:url(#SVGID_6_);}
+	.st6{fill:url(#SVGID_7_);}
+	.st7{fill:url(#SVGID_8_);}
+	.st8{fill:#C6D0E0;}
+	.st9{fill:none;stroke:#B2BBC9;stroke-miterlimit:10;stroke-dasharray:12;}
+	.st10{fill:url(#SVGID_9_);}
+	.st11{fill:url(#SVGID_10_);}
+	.st12{fill:url(#SVGID_11_);}
+	.st13{fill:url(#SVGID_12_);}
+	.st14{fill:url(#SVGID_13_);}
+	.st15{fill:url(#SVGID_14_);}
+	.st16{fill:url(#SVGID_15_);}
+	.st17{fill:url(#SVGID_16_);}
+	.st18{fill:url(#SVGID_17_);}
+	.st19{fill:url(#SVGID_18_);}
+	.st20{fill:url(#SVGID_19_);}
+	.st21{fill:url(#SVGID_20_);}
+	.st22{fill:url(#SVGID_21_);}
+	.st23{fill:url(#SVGID_22_);}
+	.st24{opacity:0.5;fill:#FFFFFF;enable-background:new    ;}
+</style>
+<g>
+	
+		<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="298" y1="121.56" x2="298" y2="1076.4399" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+		<stop  offset="0.4171" style="stop-color:#F8FAFC;stop-opacity:0"/>
+		<stop  offset="1" style="stop-color:#ECEFF4"/>
+	</linearGradient>
+	<ellipse class="st0" cx="512.4" cy="518.1" rx="512" ry="477.4"/>
+	
+		<linearGradient id="SVGID_2_" gradientUnits="userSpaceOnUse" x1="298" y1="431.0641" x2="298" y2="687.3201" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+		<stop  offset="0" style="stop-color:#DFE2E5;stop-opacity:0"/>
+		<stop  offset="1" style="stop-color:#D7DCE2;stop-opacity:0.5"/>
+	</linearGradient>
+	<ellipse class="st1" cx="512.4" cy="557.9" rx="330.2" ry="128.1"/>
+	
+		<linearGradient id="SVGID_3_" gradientUnits="userSpaceOnUse" x1="361.232" y1="445.4" x2="361.232" y2="627.032" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+		<stop  offset="0" style="stop-color:#DFE2E5;stop-opacity:0"/>
+		<stop  offset="1" style="stop-color:#D7DCE2;stop-opacity:0.7"/>
+	</linearGradient>
+	<polygon class="st2" points="810.1,671.7 341.1,671.7 360,512.4 522.7,490 668.7,513.4 	"/>
+	<g>
+		
+			<linearGradient id="SVGID_4_" gradientUnits="userSpaceOnUse" x1="300.4462" y1="828.9953" x2="161.4243" y2="588.2025" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+			<stop  offset="0" style="stop-color:#C6D0E0"/>
+			<stop  offset="1" style="stop-color:#D7DDE2"/>
+		</linearGradient>
+		<path class="st3" d="M507.4,552L362,520.9l-3.5-213.1l138.8-29.8L507.4,552z"/>
+		
+			<linearGradient id="SVGID_5_" gradientUnits="userSpaceOnUse" x1="460.592" y1="606.2" x2="255.408" y2="811.384" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+			<stop  offset="0" style="stop-color:#C6D0E0"/>
+			<stop  offset="1" style="stop-color:#DFE4EA"/>
+		</linearGradient>
+		<path class="st4" d="M670.4,515.4l-163.1,36.7l-10-274l171.1,17.5L670.4,515.4z"/>
+		
+			<linearGradient id="SVGID_6_" gradientUnits="userSpaceOnUse" x1="463.536" y1="609.144" x2="295.408" y2="777.272" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+			<stop  offset="0" style="stop-color:#A7B1C1"/>
+			<stop  offset="1" style="stop-color:#C6D0E0"/>
+		</linearGradient>
+		<path class="st5" d="M523,555.8l147.5-40.4l-1.9-219.8l-145.7,31.1v229.1H523z"/>
+		
+			<linearGradient id="SVGID_7_" gradientUnits="userSpaceOnUse" x1="333.84" y1="586.456" x2="128.3999" y2="791.896" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+			<stop  offset="0" style="stop-color:#C6D0E0"/>
+			<stop  offset="1" style="stop-color:#EFF2F6"/>
+		</linearGradient>
+		<path class="st6" d="M523,555.8h-0.3l-163.5-35.5V308.6l163.7,18v228.9C523,555.6,523,555.7,523,555.8z"/>
+		
+			<linearGradient id="SVGID_8_" gradientUnits="userSpaceOnUse" x1="268.144" y1="706.488" x2="154.8" y2="819.832" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+			<stop  offset="0" style="stop-color:#C6D0E0"/>
+			<stop  offset="1" style="stop-color:#EFF2F6"/>
+		</linearGradient>
+		<path class="st7" d="M487.4,405.7l-164.4-29.8l35.5-68l164.7,18.7L487.4,405.7z"/>
+		<path class="st8" d="M716.8,363.8l-141.4,41.9l-52-79.1l145.2-31L716.8,363.8z"/>
+	</g>
+	<path class="st9" d="M526.7,304.6c0,0-85.1-12-100.6-52.6s13.7-64,50.3-58.2c36.6,5.8,27.4,60.5,68.6,56.1
+		c19.7-2.2,20.2-23.9,27.4-35.5c7.8-12.5,21.8-14.8,21.8-14.8"/>
+	<g>
+		
+			<linearGradient id="SVGID_9_" gradientUnits="userSpaceOnUse" x1="430.2036" y1="927.0204" x2="384.3156" y2="972.9084" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+			<stop  offset="0" style="stop-color:#A7B1C1"/>
+			<stop  offset="1" style="stop-color:#C6D0E0"/>
+		</linearGradient>
+		<path class="st10" d="M603.9,210.6l10.2,10l54.8-66.8v-2.3l-100.5,23v2.3l18.3,17.2l70.7-34.3l-63.9,41L603.9,210.6z"/>
+		
+			<linearGradient id="SVGID_10_" gradientUnits="userSpaceOnUse" x1="384.941" y1="901.947" x2="374.7439" y2="912.144" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+			<stop  offset="0" style="stop-color:#A7B1C1"/>
+			<stop  offset="1" style="stop-color:#C6D0E0"/>
+		</linearGradient>
+		<path class="st11" d="M593.5,200.5v20.1l10.2-10v-2.3L593.5,200.5z"/>
+		
+			<linearGradient id="SVGID_11_" gradientUnits="userSpaceOnUse" x1="429.68" y1="928.6961" x2="384.9439" y2="973.432" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+			<stop  offset="0" style="stop-color:#C6D0E0"/>
+			<stop  offset="1" style="stop-color:#EFF2F6"/>
+		</linearGradient>
+		<path class="st12" d="M603.9,208.3l10.2,10l54.8-66.8l-100.5,23l18.3,17.2l70.7-34.3l-63.9,41L603.9,208.3z"/>
+		
+			<linearGradient id="SVGID_12_" gradientUnits="userSpaceOnUse" x1="379.1889" y1="908.824" x2="389.4836" y2="908.824" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+			<stop  offset="0" style="stop-color:#B3BECE"/>
+			<stop  offset="1" style="stop-color:#CAD3DD"/>
+		</linearGradient>
+		<path class="st13" d="M593.5,198.2v20.1l10.2-10L593.5,198.2z"/>
+	</g>
+	
+		<linearGradient id="SVGID_13_" gradientUnits="userSpaceOnUse" x1="79.76" y1="451.8" x2="79.76" y2="611.288" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+		<stop  offset="0" style="stop-color:#DFE2E5;stop-opacity:0"/>
+		<stop  offset="1" style="stop-color:#D7DCE2;stop-opacity:0.7"/>
+	</linearGradient>
+	<polygon class="st14" points="317.8,664 270.4,665.3 274.3,506 285.7,505.8 	"/>
+	
+		<linearGradient id="SVGID_14_" gradientUnits="userSpaceOnUse" x1="122.64" y1="490.2" x2="122.64" y2="624.728" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+		<stop  offset="0" style="stop-color:#DFE2E5;stop-opacity:0"/>
+		<stop  offset="1" style="stop-color:#D7DCE2;stop-opacity:0.7"/>
+	</linearGradient>
+	<polygon class="st15" points="375.4,626.9 298.6,626.9 302.4,495.5 343.3,492.3 	"/>
+	
+		<linearGradient id="SVGID_15_" gradientUnits="userSpaceOnUse" x1="106.896" y1="645.976" x2="25.36" y2="727.512" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+		<stop  offset="0" style="stop-color:#C6D0E0"/>
+		<stop  offset="1" style="stop-color:#EFF2F6"/>
+	</linearGradient>
+	<polygon class="st16" points="277.6,351.7 274.3,506.5 285.8,506.5 284.3,351.7 	"/>
+	<g>
+		<path class="st8" d="M268.9,361.5c0,0,70.1-4.7,7.2-86.8c0,0-45.4,20.2-40.7,63C235.4,337.8,235.4,361.5,268.9,361.5z"/>
+		
+			<linearGradient id="SVGID_16_" gradientUnits="userSpaceOnUse" x1="93.7807" y1="747.3456" x2="34.6071" y2="806.5192" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+			<stop  offset="0" style="stop-color:#C6D0E0"/>
+			<stop  offset="1" style="stop-color:#EFF2F6"/>
+		</linearGradient>
+		<path class="st17" d="M274.5,285.5c0,0-57.1,49.9-42.8,74.9c0,0,17.8,23.8,71.3,7.2C356.6,350.9,307.8,285.5,274.5,285.5z"/>
+	</g>
+	<g>
+		
+			<linearGradient id="SVGID_17_" gradientUnits="userSpaceOnUse" x1="541.2" y1="464.728" x2="541.2" y2="588.248" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+			<stop  offset="0" style="stop-color:#DFE2E5;stop-opacity:0"/>
+			<stop  offset="1" style="stop-color:#D7DCE2;stop-opacity:0.7"/>
+		</linearGradient>
+		<polygon class="st18" points="756.8,652.3 745.3,532 755.6,528.8 765.8,531.9 763.2,652.3 		"/>
+		<g>
+			
+				<linearGradient id="SVGID_18_" gradientUnits="userSpaceOnUse" x1="540.9527" y1="584.6438" x2="540.9527" y2="695" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+				<stop  offset="0" style="stop-color:#C6D0E0"/>
+				<stop  offset="1" style="stop-color:#EFF2F6"/>
+			</linearGradient>
+			<path class="st19" d="M749.2,422.1c0,0,4.7,66.3-1.3,97.9c-1,5.1-5.1,10.9-2.6,12.2c2.6,1.3,3.3-2.3,9.7-2.3
+				c3.2,0,9.5,3.6,10.8,2.3c1.3-1.3-1.4-4.9-3.2-13.1c-4.1-19.3-10.2-57.5-5.8-97H749.2z"/>
+			<path class="st8" d="M763.8,440.4c0,15.6-20.5,23.2-36.1,23.2c-15.6,0-25.9-15.2-25.9-30.8c0-15.6,16.5-28.4,32.3-28.4
+				S763.8,424.7,763.8,440.4z"/>
+			
+				<linearGradient id="SVGID_19_" gradientUnits="userSpaceOnUse" x1="564.866" y1="680.5838" x2="509.0592" y2="736.3905" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+				<stop  offset="0" style="stop-color:#C6D0E0"/>
+				<stop  offset="1" style="stop-color:#EFF2F6"/>
+			</linearGradient>
+			<path class="st20" d="M791.8,414.8c0,20.2-26.4,29.8-46.5,29.8s-33.2-19.7-33.2-39.8c0-20.2,21.4-36.5,41.5-36.5
+				S791.8,394.5,791.8,414.8z"/>
+			
+				<linearGradient id="SVGID_20_" gradientUnits="userSpaceOnUse" x1="574.8622" y1="653.991" x2="542.4911" y2="710.0593" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+				<stop  offset="0" style="stop-color:#C6D0E0"/>
+				<stop  offset="1" style="stop-color:#EFF2F6"/>
+			</linearGradient>
+			<path class="st21" d="M765.3,463.3c-14.5,0-26.5-15.7-26.5-31.1c0-15.4,19.2-29.7,33.7-29.7s35.3,10.8,32.8,37.9
+				C802.7,467.5,779.9,463.3,765.3,463.3z"/>
+		</g>
+	</g>
+	<g>
+		
+			<linearGradient id="SVGID_21_" gradientUnits="userSpaceOnUse" x1="115.5644" y1="618.1076" x2="94.8" y2="638.872" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+			<stop  offset="0" style="stop-color:#C6D0E0"/>
+			<stop  offset="1" style="stop-color:#D7DDE2"/>
+		</linearGradient>
+		<polygon class="st22" points="321.5,465.8 302.4,496.2 323.8,505 		"/>
+		
+			<linearGradient id="SVGID_22_" gradientUnits="userSpaceOnUse" x1="122.192" y1="617.752" x2="97.936" y2="642.008" gradientTransform="matrix(1 0 0 -1 214.3622 1117.0552)">
+			<stop  offset="0" style="stop-color:#A7B1C1"/>
+			<stop  offset="1" style="stop-color:#C6D0E0"/>
+		</linearGradient>
+		<polygon class="st23" points="323.8,505 343.4,492.5 321.5,465.8 		"/>
+	</g>
+	<polygon class="st24" points="480.4,447.7 394.6,432.3 394.6,411.8 480.4,427.2 	"/>
+	<path class="st24" d="M554.6,431v57.6l85.8-23V408L554.6,431z M566.1,457.1l45.7-13.2v4.5l-45.7,13.3V457.1z M630.1,454.8l-64,18.4
+		v-4.6l64-18.4V454.8z M630.1,427.9l-64,18.4v-4.6l64-18.4V427.9z"/>
+</g>
+</svg>

src/views/archivesManage/archivesCheck/index.vue

@@ -187,8 +187,6 @@ export default {
       } else {
         this.crud.query.orderNo = this.keyWord
       }
-      console.log(this.crud.query, '2')
-
       this.crud.downloadLoading = false
     },
     // 删除

src/views/archivesManage/archivesCheck/module/checkDetail.vue

@@ -48,7 +48,14 @@
           <el-table-column prop="securityClass" align="center" label="保密程度" min-width="90" />
           <el-table-column prop="department" align="center" label="部门" min-width="90" />
           <el-table-column prop="caseName" align="center" label="盒名称" min-width="180" />
-          <el-table-column prop="folderLocationDetails" align="center" :show-overflow-tooltip="true" label="所在位置" min-width="220" />
+          <el-table-column prop="folderLocationDetails" align="center" :show-overflow-tooltip="true" label="所在位置" min-width="280">
+            <template slot-scope="scope">
+              <span v-if="!scope.row.folderLocationDetails">-</span>
+              <span v-else>
+                <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column prop="createTime" align="center" label="创建时间" min-width="150">
             <template slot-scope="scope">
               <div>{{ scope.row.createTime | parseTime }}</div>

src/views/archivesManage/archivesList/module/archivesInfo/index.vue

@@ -117,6 +117,8 @@ export default {
               item.context = '待归还'
             } else if (item.context === 4 || item.context === '' || item.context === null) {
               item.context = '-'
+            } else if (item.context === -1) {
+              item.context = '在库'
             }
           }
         })

src/views/archivesManage/archivesSearch/index.vue

@@ -49,7 +49,14 @@
           <el-table-column prop="security_class" label="保密程度" align="center" min-width="100" />
           <el-table-column prop="department" label="部门" align="center" min-width="100" />
           <el-table-column prop="case_name" label="盒名称" align="center" min-width="180" />
-          <el-table-column prop="folder_location_details" label="所在位置" align="center" min-width="180" />
+          <el-table-column prop="folder_location_details" label="所在位置" align="center" min-width="260">
+            <template slot-scope="scope">
+              <span v-if="!scope.row.folder_location_details">-</span>
+              <span v-else>
+                <el-tag effect="dark">{{ scope.row.folder_location_details }}</el-tag>
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column prop="create_time" label="创建时间" align="center" min-width="180">
             <template slot-scope="scope">
               <div>{{ scope.row.create_time | parseTime }}</div>

src/views/archivesManage/archivesSearch/module/detailDialog.vue

@@ -54,7 +54,14 @@
                 <p class="right"><span class="color-blue">盒名称：</span><span class="color-white">{{ rowData.fieldCnName }}</span></p>
               </div>
               <div class="dpflex">
-                <p class="left"><span class="color-blue">库房位置：</span><span class="color-white">{{ rowData.folder_location }}</span></p>
+                <p class="left"><span class="color-blue">库房位置：</span>
+                  <span v-if="!rowData.folder_location" class="color-white">-</span>
+                  <span v-else class="color-white"><el-tag effect="dark">{{ rowData.folder_location }}</el-tag></span>
+                <!-- <span v-if="!scope.row.folder_location_details">-</span>
+                <span v-else>
+                  <el-tag effect="dark">{{ scope.row.folder_location_details }}</el-tag>
+                </span> -->
+                </p>
                 <p class="right"><span class="color-blue">借阅状态：</span><span class="color-white">{{ rowData.borrow_type | borrowStatus }}</span></p>
               </div>
               <p class="sin-row"><span class="color-blue">条形码：</span><span class="color-white">{{ rowData.barcode }}</span></p>

src/views/archivesManage/caseManage/caseList/index.vue

@@ -51,8 +51,10 @@
       <el-table-column prop="barcode" label="条形码" align="center" min-width="120" />
       <el-table-column label="存放位置" align="center" min-width="150">
         <template slot-scope="scope">
-          <span v-if="scope.row.folderLocationDetails === ''">-</span>
-          <span v-else>{{ scope.row.folderLocationDetails }}</span>
+          <span v-if="!scope.row.folderLocationDetails">-</span>
+          <span v-else>
+            <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+          </span>
         </template>
       </el-table-column>
       <el-table-column prop="update_time" width="175" label="操作时间" align="center">

src/views/archivesManage/caseManage/caseList/module/detailDialog.vue

@@ -33,7 +33,14 @@
           <el-table-column prop="securityClass" label="保密程度" align="center" width="150" />
           <el-table-column prop="department" label="部门名称" align="center" width="150" />
           <el-table-column prop="caseName" label="盒名称" align="center" width="150" />
-          <el-table-column prop="folderLocationDetails" align="center" label="所在位置" width="180" />
+          <el-table-column prop="folderLocationDetails" align="center" label="所在位置" width="260">
+            <template slot-scope="scope">
+              <span v-if="!scope.row.folderLocationDetails">-</span>
+              <span v-else>
+                <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column prop="create_time" align="center" label="创建时间" width="150">
             <template slot-scope="scope">
               <div>{{ scope.row.create_time | parseTime }}</div>

src/views/archivesManage/lendManage/toLend/index.vue

@@ -34,7 +34,7 @@
             </el-tag>
           </div>
           <div v-else>
-            <el-tag effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
+            <el-tag v-if="scope.row.folderLocationDetails" effect="dark">{{ scope.row.folderLocationDetails }}</el-tag>
           </div>
         </template>
       </el-table-column>

src/views/environmentalScreen/index.vue

@@ -242,6 +242,7 @@ export default {
     this.timer = setInterval(() => {
       this.nowDate = getCurrentTime()
     }, 1000)
+    window.getIframeLoading = this.getIframeLoading // 把vue实例中的方法引用给window对象
   },
   mounted() {
     this.tableData = data1.rows
@@ -259,6 +260,14 @@ export default {
     }
   },
   methods: {
+    // 加载完成状态传值
+    getIframeLoading(value) {
+      // console.log(`我是iframe传过来的参数：${value}`)
+      if (value === 'false') {
+        this.handleHide('DAK_MO_OAO_001')
+        this.handleAlarm('DAK_MO_OAO_003')
+      }
+    },
     // 传入设备状态data  / 给iframe传初始值
     deviceState(e) {
       this.iframeWin.postMessage({

src/views/system/archiveStatistics/index.vue

@@ -48,9 +48,13 @@
               value-format="yyyy-MM"
               @change="handleTypeDate"
             />
-            <div class="chart-wrapper" style="height: calc(100% - 40px);">
+            <div v-if="typeData.length !== 0" class="chart-wrapper" style="height: calc(100% - 40px);">
               <type-pie :type-data="typeData" />
             </div>
+            <div v-else class="empty-main">
+              <svg-icon icon-class="empty" class-name="empty-img" />
+              <p>暂无数据</p>
+            </div>
           </div>
         </el-col>
       </el-row>
@@ -91,8 +95,12 @@
               value-format="yyyy-MM"
               @change="handleSearchDate"
             />
-            <div class="chart-wrapper" style="height: calc(100% - 40px);">
-              <AcrossBar :search-acrives-data="searchAcrivesData" />
+            <div v-if="searchAcrivesData.searchName.length !==0 && searchAcrivesData.searchName.searchValue !==0" class="chart-wrapper" style="height: calc(100% - 40px);">
+              <AcrossBar ref="searchCharts" :search-acrives-data="searchAcrivesData" />
+            </div>
+            <div v-else class="empty-main">
+              <svg-icon icon-class="empty" class-name="empty-img" />
+              <p>暂无数据</p>
             </div>
           </div>
         </el-col>
@@ -178,7 +186,6 @@ export default {
   }
 }
 .center-box{
-  // width:100%;
   margin:20px 0;
   display: flex;
   justify-content: space-between;
@@ -188,4 +195,22 @@ export default {
     flex: 1;
   }
 }
+
+.empty-main{
+  display: flex;
+  height: calc(100% - 40px);
+  flex-flow: column;
+  justify-content: center;
+  align-items: center;
+  .empty-img{
+    width: 140px;
+    height: 140px;
+    vertical-align: middle;
+  }
+  p{
+    font-size: 12px;
+    color: #999;
+    margin-top: -10px;
+  }
+}
 </style>

src/views/system/archiveStatistics/module/acrossBar.vue

@@ -126,7 +126,6 @@ export default {
           }
         ]
       }
-
       option && this.chart.setOption(option)
     }
   }
@@ -134,5 +133,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 </style>

src/views/system/archiveStatistics/module/barEcharts.vue

@@ -144,18 +144,6 @@ export default {
           axisPointer: {
             type: 'shadow'
           },
-          // formatter: function(params) {
-          //   var res = "<div style='width:100%;height:24px;margin-bottom:5px;padding:0 12px;line-height:24px;'><p>" + echarts.format.formatTime('yyyy年M月', new Date(params[0].name)) + ' </p></div>'
-          //   for (var i = 0; i < params.length; i++) {
-          //     res += `<div style="color: #fff;font-size: 14px; padding:0 12px;line-height: 24px">
-          //               <span style="display:inline-block;margin-right:5px;border-radius:2px;width:10px;height:10px;background-color:${[params[i].color]};"></span>
-          //               ${params[i].color}
-          //               ${params[i].seriesName}
-          //               ${params[i].data}
-          //             </div>`
-          //   }
-          //   return res
-          // },
           formatter(params) {
             const val0 = params[0]['data']
             const val1 = params[1]['data']
@@ -280,7 +268,6 @@ export default {
           }
         ]
       }
-
       option && this.chart.setOption(option)
     }
   }
@@ -288,5 +275,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 </style>

src/views/system/archiveStatistics/module/lineEchart.vue

@@ -45,7 +45,6 @@ export default {
   },
   mounted() {
     this.drawChart()
-    console.log(this.year)
     window.addEventListener('resize', this.__resizeHandler)
   },
   methods: {
@@ -177,5 +176,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 </style>

src/views/system/logManage/warnLog/index.vue

@@ -15,6 +15,7 @@
         placeholder="请输入关键词"
         style="width: 300px;margin-right:10px;padding-left:10px"
         class="input-prepend filter-item"
+        @keyup.enter.native="crud.toQuery"
       >
         <!-- <el-select slot="prepend" v-model="optionVal" style="width: 100px" @keyup.enter.native="crud.toQuery"> -->
         <el-select slot="prepend" v-model="optionVal" style="width: 80px">
@@ -34,18 +35,32 @@
       :data="crud.data"
       style="width: 100%;"
       height="calc(100vh - 356px)"
+      :cell-class-name="cell"
       @row-click="clickRowHandler"
       @selection-change="selectionChangeHandler"
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="100" align="center" />
-      <el-table-column prop="" label="状态" min-width="150" align="center" />
-      <el-table-column prop="" label="库房" align="center" min-width="150" />
-      <el-table-column prop="" label="设备" align="center" min-width="150" />
-      <el-table-column prop="" label="警情描述" align="center" min-width="180" />
-      <el-table-column prop="" label="说明" align="center" min-width="180" />
-      <el-table-column prop="" label="报警时间" align="center" min-width="180" />
-      <el-table-column prop="" label="处理时间" align="center" min-width="180" />
+      <el-table-column prop="state" label="状态" min-width="150" align="center">
+        <template slot-scope="scope">
+          <span v-if="scope.row.state" class="clear">已处理</span>
+          <span v-if="!scope.row.state" class="clear">未处理</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="storeroomName" label="库房" align="center" min-width="150" />
+      <el-table-column prop="deviceName" label="设备" align="center" min-width="150" />
+      <el-table-column prop="content" label="警情描述" align="center" min-width="180" />
+      <el-table-column prop="remark" label="说明" align="center" min-width="180" />
+      <el-table-column prop="create_time" label="报警时间" align="center" min-width="180">
+        <template slot-scope="scope">
+          <div>{{ scope.row.create_time | parseTime }}</div>
+        </template>
+      </el-table-column>
+      <el-table-column prop="update_time" label="处理时间" align="center" min-width="180">
+        <template slot-scope="scope">
+          <div>{{ scope.row.update_time | parseTime }}</div>
+        </template>
+      </el-table-column>
     </el-table>
     <pagination />
     <!-- 手动处理 -->
@@ -59,7 +74,7 @@
           </el-form-item>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="handleConfirm">确定</el-button>
+          <el-button type="primary" @click="handleSave">保存</el-button>
         </div>
       </div>
     </el-dialog>
@@ -71,15 +86,15 @@ import rrOperation from '@crud/RR.operation'
 import CRUD, { presenter, crud } from '@crud/crud'
 import DateRangePicker from '@/components/DateRangePicker'
 import pagination from '@crud/Pagination'
-
+import { warnRemark } from '@/api/system/logs'
 export default {
   name: 'LoginLog',
   components: { rrOperation, DateRangePicker, pagination },
   mixins: [presenter(), crud()],
   cruds() {
     return CRUD({
-      url: 'api/storage/initStorageLogList',
-      sort: ['update_time,desc'],
+      url: 'api/alarmlog/',
+      sort: ['createTime,desc'],
       // crudMethod: caseCrudMethod,
       optShow: {
         add: false,
@@ -91,14 +106,15 @@ export default {
   },
   data() {
     return {
+      tableData: [],
       handleVisible: false,
       selections: [],
       keyWord: '',
-      oprType: 0,
+      oprType: -1,
       oprTypeOptions: [
-        { value: 0, label: '全部' },
+        { value: -1, label: '全部' },
         { value: 1, label: '已处理' },
-        { value: 2, label: '未处理' }
+        { value: 0, label: '未处理' }
       ],
       optionVal: 1,
       options: [
@@ -111,12 +127,27 @@ export default {
       },
       rules: {
         description: [
-          { required: true, message: '请输入内容', trigger: 'blur' }
+          { required: true, message: '说明不能为空', trigger: 'blur' }
         ]
       }
     }
   },
   methods: {
+    // 获取数据前的处理
+    [CRUD.HOOK.beforeRefresh]() {
+      this.crud.downloadLoading = true
+      this.crud.query.state = null
+      this.crud.query.blurry = this.keyWord
+      if (this.oprType > -1) {
+        this.crud.query.state = this.oprType
+      }
+      console.log(this.crud.query, '--')
+      this.crud.downloadLoading = false
+    },
+    getData() {
+      const arr = this.crud.data
+      console.log(arr, 'arr')
+    },
     // 导出
     handleDownload() {
 
@@ -132,24 +163,56 @@ export default {
     },
     // 手动处理
     handleHand() {
+      this.form.description = this.selections[0].remark
       this.handleVisible = true
     },
-    handleConfirm() {
+    handleSave() {
+      const row = this.selections[0]
+      const params = {
+        'id': row.id,
+        // 'storeroom_name': row.storeroomName,
+        'state': true,
+        // 'device_id': row.deviceId,
+        // 'device_name': row.deviceName,
+        // 'content': row.content,
+        'remark': this.form.description
+      }
+      console.log(params)
       this.$refs.formDom.validate((valid) => {
         if (valid) {
+          warnRemark(params).then(res => {
+            console.log(res, '手动处理')
+            if (res === 'SUCCESS') {
+              this.crud.refresh()
+              this.$message({
+                message: '处理成功',
+                type: 'success'
+              })
               this.handleVisible = false
               this.$refs.formDom.resetFields()
               this.$refs.formDom.clearValidate()
+            } else {
+              this.$message.error('处理失败')
+            }
+          })
         } else {
           return false
         }
       })
+    },
+    cell({ row, columnIndex }) {
+      if (row.state === true && columnIndex === 2) {
+        return 'have-clear'
+      } else if (row.state === false && columnIndex === 2) {
+        return 'fail-clear'
+      }
     }
   }
 }
 </script>
 
 <style lang="scss" scoped>
+@import '~@/assets/styles/lend-manage.scss';
 @import "~@/assets/styles/archives-manage.scss";
 textarea{
   background-color: #021941;