Merge branch 'pet' of http://47.92.113.182:3000/guoyuepeng/qa-regulatory-gwj-vue into pet

src/views/safetyenvironmental/chief/components/information.vue

@@ -62,6 +62,11 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="4">
+          <el-form-item label="检查人">
+            <el-input v-model="search.INSPECTION_USER_NAME" placeholder="检查人..." />
+          </el-form-item>
+        </el-col>
         <el-col :span="4">
           <el-form-item label-width="10px">
             <el-button v-waves type="primary" icon="el-icon-search" @click="getQuery">
@@ -99,6 +104,8 @@
       <el-table-column prop="INSPECTED_DEPARTMENT_NAME" label="被检查单位" align="center" />
       <el-table-column prop="INSPECTION_DEPARTMENT_NAME" label="检查部门" align="center" />
       <el-table-column prop="INSPECTION_ORIGINATOR_NAME" label="检查发起人" align="center" />
+      <el-table-column prop="INSPECTION_USER_NAME" label="检查人" align="center" />
+      <el-table-column prop="HIDDEN_COUNT" label="隐患数" align="center" />
       <el-table-column prop="INSPECTION_TYPE_NAME" label="检查类型" align="center" />
       <el-table-column label="检查时间" width="260" align="center" >
         <template slot-scope="{row}">
@@ -162,7 +169,8 @@ export default {
         INSPECTION_TYPE: '', // 检查类型
         INSPECTION_TIME: ['', ''], // 检查时间
         INSPECTION_STATUS: '', // 检查状态
-        CORPINFO_ID: ''
+        CORPINFO_ID: '',
+        INSPECTION_USER_NAME:'' //检查人
       },
       CORPINFO_ID: '',
       varList: [],

static/qrcode/views/bsbw/detail.html

@@ -71,7 +71,7 @@
 			<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
 		</div>
  -->
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../assets/js/jquery-3.7.1.min.js"></script>
 		<script type="text/javascript" src="../../assets/js/pre-loader.js"></script>
 		<script src="../../assets/js/sweetalert.min.js"></script>
 		<script type="text/javascript">

static/qrcode/views/bsbw/part-detail.html

@@ -345,7 +345,7 @@
 		<div style="padding: 0 20px;">
 			<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
 		</div>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../assets/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../assets/js/pre-loader.js"></script>
     <script src="../../assets/js/sweetalert.min.js"></script>
 		<script type="text/javascript">

static/qrcode/views/bsbw/part-list.html

@@ -81,7 +81,7 @@
 </div>
 
 <script src="//api.map.BAIDU.com/api?type=webgl&v=1.0&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"></script>
-<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+<script type="text/javascript" src="../../assets/js/jquery-3.7.1.min.js"></script>
 <script type="text/javascript" src="../../assets/js/pre-loader.js"></script>
 <script src="../../assets/js/sweetalert.min.js"></script>
 <script type="text/javascript">

static/qrcode/views/bsbw/record_list.html

@@ -119,7 +119,7 @@
 				</div>
 			</div>
 		</div>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../assets/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../assets/js/pre-loader.js"></script>
     <script src="../../assets/js/sweetalert.min.js"></script>
 		<script type="text/javascript">

static/qrcode/views/electronic_work_card/index.html

@@ -36,7 +36,7 @@
   <van-image-preview v-model="show" :images="images" :start-position="startPosition">
   </van-image-preview>
 </div>
-<script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+<script type="text/javascript" src="../../assets/js/jquery-3.7.1.min.js"></script>
 <script type="text/javascript">
   var vm = new Vue({
     el: '#app',

static/qrcode/views/fxfb/detail.html

@@ -70,7 +70,7 @@
 		<div style="padding: 0 20px;">
 			<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
 		</div>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../assets/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../assets/js/pre-loader.js"></script>
     <script src="../../assets/js/sweetalert.min.js"></script>
 		<script type="text/javascript">
@@ -114,7 +114,7 @@
 									var nameArray=[];
 									for (var i = 0; i < vm.varList.length; i++) {
 										var ACCIDENTS_NAME=vm.varList[i].ACCIDENTS_NAME;
-									
+
 										if(ACCIDENTS_NAME){
 											console.info(ACCIDENTS_NAME)
 											console.info(nameArray)
@@ -123,7 +123,7 @@
 												nameArray.push(names[j]);
 											}
 										}
-										
+
 									}
 									$.unique(nameArray);
 									vm.ACCIDENTS_NAME=nameArray.join(",");

static/qrcode/views/fxfb/index.html

@@ -85,7 +85,7 @@
 				</ul>
 			</div>
 		</div>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../assets/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../assets/js/pre-loader.js"></script>
     <script src="../../assets/js/sweetalert.min.js"></script>
 

static/qrcode/views/fxfb/part-detail.html

@@ -321,7 +321,7 @@
 		<div style="padding: 0 20px;">
 			<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
 		</div>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../assets/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../assets/js/pre-loader.js"></script>
     <script src="../../assets/js/sweetalert.min.js"></script>
 		<script type="text/javascript">

static/qrcode/views/fxfb/part-list.html

@@ -82,7 +82,7 @@
 
 
 <script src="//api.map.baidu.com/api?type=webgl&v=1.0&ak=OElqFYoKiAH8KFtph8ftLKF5NlNrbCUr"></script>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../assets/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../assets/js/pre-loader.js"></script>
     <script src="../../assets/js/sweetalert.min.js"></script>
 		<script type="text/javascript">

static/qrcode/views/fxfb/record_list.html

@@ -60,7 +60,7 @@
 		<div style="padding: 0 20px;margin-top:20px">
 			<a href="javascript:;" class="weui-btn bg-blue" style="font-size: 14px;line-height:2.6;" onclick="back()">返回列表</a>
 		</div>
-    <script type="text/javascript" src="../../assets/js/jquery-1.7.2.js"></script>
+    <script type="text/javascript" src="../../assets/js/jquery-3.7.1.min.js"></script>
     <script type="text/javascript" src="../../assets/js/pre-loader.js"></script>
     <script src="../../assets/js/sweetalert.min.js"></script>
 		<script type="text/javascript">