zc

src/views/integratedManagement/laboratoryManagement/subject/associationConfiguration.vue

@@ -7,13 +7,14 @@
       <p class="page-top-title-submit-p" @click="submitForm">提交</p>
     </div>
     <div class="content-box scrollbar-box">
-      <el-form  ref="form"  :model="form" label-width="160px" :rules="rules">
-        <div class="title-box">
+      <el-form  ref="form"  :model="form" label-width="200px" :rules="rules">
+        <div class="title-box title-no-border-box">
           <p class="left-title">检查项信息</p>
         </div>
         <div>
-          <el-form-item label="穿戴检查项"  prop="checkIn" class="form-item" v-if="form.checkIn">
-            <el-select v-model="form.checkIn" multiple placeholder="请选择穿戴检查项目" @change="radioChange" style="width:320px;">
+          <el-form-item label="穿戴检查项："  prop="checkIn" class="form-item" v-if="form.checkIn">
+            <el-select v-model="form.checkIn" multiple placeholder="请选择穿戴检查项目"
+                       @change="radioChange" style="width:250px;">
               <el-option
                 v-for="dict in onepcOutcheckIn"
                 :key="dict.value"
@@ -22,14 +23,15 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="穿戴检查可跳过" prop="skipped" class="form-item">
-            <el-radio-group v-model="form.skipped" style="width:260px;" @change="radioChange">
-              <el-radio :label="1" style="width:70px;margin-left:50px;margin-top:4px;">是</el-radio>
+          <el-form-item label="穿戴检查可跳过：" prop="skipped" class="form-item">
+            <el-radio-group v-model="form.skipped" style="width:250px;" @change="radioChange">
+              <el-radio :label="1" style="width:70px;margin-top:4px;">是</el-radio>
               <el-radio :label="0" style="width:70px;margin-top:4px;">否</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="穿戴检查识别上限"  prop="checkCount" class="form-item" v-if="form.skipped == 1 && form.checkIn[0]">
-            <el-input placeholder="请输入内容" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2" v-model="form.checkCount" style="width:320px;">
+          <el-form-item label="穿戴检查识别上限："  prop="checkCount" class="form-item" v-if="form.skipped == 1 && form.checkIn[0]">
+            <el-input placeholder="请输入内容" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2"
+                      v-model="form.checkCount" style="width:250px;">
               <template slot="prepend" style="height:20px;">次</template>
               <div slot="append" style="display: flex;flex-direction: column;">
                 <p class="el-icon-arrow-up" @click="addNum" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>
@@ -39,8 +41,8 @@
           </el-form-item>
         </div>
         <div>
-          <el-form-item label="离开时检查项"  prop="checkOutArr" class="form-item">
-            <el-select v-model="form.checkOut" multiple placeholder="请选择离开检查项"  style="width:320px;">
+          <el-form-item label="离开检查项："  prop="checkOutArr" class="form-item">
+            <el-select v-model="form.checkOut" multiple placeholder="请选择离开检查项" style="width:250px;">
               <el-option
                 v-for="dict in onepcOutcheck"
                 :key="dict.value"
@@ -49,8 +51,9 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="签到有效时间"  prop="signTime" class="form-item">
-            <el-input placeholder="请输入内容" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2" v-model="form.signTime" style="width:320px;">
+          <el-form-item label="签到有效时间："  prop="signTime" class="form-item">
+            <el-input placeholder="请输入内容" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2"
+                      v-model="form.signTime" style="width:250px;">
               <template slot="prepend" style="height:20px;">小时</template>
               <div slot="append" style="display: flex;flex-direction: column;">
                 <p class="el-icon-arrow-up" @click="addNumOne" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>
@@ -63,8 +66,9 @@
           <p class="left-title">检查项信息(巡查人员)</p>
         </div>
         <div>
-          <el-form-item label="穿戴检查项"  prop="inspectCheckIn" class="form-item" v-if="form.inspectCheckIn">
-            <el-select v-model="form.inspectCheckIn" multiple placeholder="请选择穿戴检查项目" @change="radioChange2" style="width:320px;">
+          <el-form-item label="穿戴检查项："  prop="inspectCheckIn" class="form-item" v-if="form.inspectCheckIn">
+            <el-select v-model="form.inspectCheckIn" multiple placeholder="请选择穿戴检查项目"
+                       @change="radioChange2" style="width:250px;">
               <el-option
                 v-for="dict in onepcOutcheckIn"
                 :key="dict.value"
@@ -73,14 +77,15 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="穿戴检查可跳过" prop="inspectSkipped" class="form-item">
-            <el-radio-group v-model="form.inspectSkipped" style="width:260px;" @change="radioChange2">
-              <el-radio :label="1" style="width:70px;margin-left:50px;margin-top:4px;">是</el-radio>
+          <el-form-item label="穿戴检查可跳过：" prop="inspectSkipped" class="form-item">
+            <el-radio-group v-model="form.inspectSkipped" style="width:250px;" @change="radioChange2">
+              <el-radio :label="1" style="width:70px;margin-top:4px;">是</el-radio>
               <el-radio :label="0" style="width:70px;margin-top:4px;">否</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="穿戴检查识别上限"  prop="inspectCheckCount" class="form-item" v-if="form.inspectSkipped == 1 && form.inspectCheckIn[0]">
-            <el-input placeholder="请输入内容" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2" v-model="form.inspectCheckCount" style="width:320px;">
+          <el-form-item label="穿戴检查识别上限："  prop="inspectCheckCount" class="form-item" v-if="form.inspectSkipped == 1 && form.inspectCheckIn[0]">
+            <el-input placeholder="请输入内容" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2"
+                      v-model="form.inspectCheckCount" style="width:250px;">
               <template slot="prepend" style="height:20px;">次</template>
               <div slot="append" style="display: flex;flex-direction: column;">
                 <p class="el-icon-arrow-up" @click="addNum" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>
@@ -90,8 +95,9 @@
           </el-form-item>
         </div>
         <div>
-          <el-form-item label="签到有效时间"  prop="inspectSignTime" class="form-item">
-            <el-input placeholder="请输入内容" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2" v-model="form.inspectSignTime" style="width:320px;">
+          <el-form-item label="签到有效时间："  prop="inspectSignTime" class="form-item">
+            <el-input placeholder="请输入内容" oninput="value=value.replace(/[^0-9.]/g,'')" maxlength="2"
+                      v-model="form.inspectSignTime" style="width:250px;">
               <template slot="prepend" style="height:20px;">小时</template>
               <div slot="append" style="display: flex;flex-direction: column;">
                 <p class="el-icon-arrow-up" @click="addNumOne" style="line-height:18px;width:30px;font-size:14px;text-align: center;border-bottom:1px solid #E0E0E0;cursor: pointer;"></p>
@@ -103,20 +109,20 @@
         <div class="title-box">
           <p class="left-title">危险源信息</p>
         </div>
-        <el-form-item label="气瓶存放总量" prop="bottleTotal" class="form-item input-number-none-box-left">
+        <el-form-item label="气瓶存放总量：" prop="bottleTotal" class="form-item input-number-none-box-left">
           <el-input
             oninput="value=value.replace(/[^0-9.]/g,'')"
-            style="width:320px;"
+            style="width:250px;"
             v-model="form.bottleTotal"
             placeholder="请输入数量"
             maxLength="3"
             clearable
           />
         </el-form-item>
-        <el-form-item label="气瓶单人可存放总量" prop="bottleUserTotal" class="form-item input-number-none-box-left">
+        <el-form-item label="气瓶单人可存放总量：" prop="bottleUserTotal" class="form-item input-number-none-box-left">
           <el-input
             oninput="value=value.replace(/[^0-9.]/g,'')"
-            style="width:320px;"
+            style="width:500px;"
             v-model="form.bottleUserTotal"
             placeholder="请输入数量"
             clearable
@@ -124,29 +130,38 @@
           />
         </el-form-item>
         <div>
-          <el-form-item label="危险源"  prop="hazardId" class="form-item">
+          <el-form-item label="危险源："  prop="hazardId" class="form-item">
             <p class="hazard-add" @click="hazardClick">+配置危险源</p>
           </el-form-item>
         </div>
         <div class="hazard-for-box" v-for="(item,index) in form.hazardSubRelInnerList">
-          <el-form-item label="危险源名称" :prop="'hazardSubRelInnerList.'+ index +'.anotherName'" :rules="rules.anotherName"
-                        class="form-item" label-width="160px">
-            <el-input placeholder="请输入危险源名称" maxlength="20" v-model="item.anotherName"/>
+          <el-form-item label="危险源名称：" :prop="'hazardSubRelInnerList.'+ index +'.anotherName'" :rules="rules.anotherName"
+                        class="form-item" label-width="200px">
+            <el-input placeholder="请输入危险源名称" maxlength="20"
+                      style="width:250px;" v-model="item.anotherName"/>
           </el-form-item>
-          <el-form-item label="类型"
-                        class="form-item" label-width="60px">
-            <el-input placeholder="请输入类型" disabled maxlength="20" v-model="item.smallTypeName"/>
+          <el-form-item label="类型："
+                        class="form-item" label-width="200px">
+            <el-input placeholder="请输入类型" disabled maxlength="20"
+                      style="width:250px;" v-model="item.smallTypeName"/>
           </el-form-item>
-          <el-form-item label="型号"
-                        class="form-item" label-width="60px">
-            <el-input placeholder="请输入型号" disabled maxlength="20" v-model="item.anotherCode"/>
+          <el-form-item label="型号："
+                        class="form-item" label-width="100px">
+            <el-input placeholder="请输入型号" disabled maxlength="20"
+                      style="width:250px;" v-model="item.anotherCode"/>
           </el-form-item>
           <el-form-item label="" class="form-item" label-width="20px">
-            <span class="del-hazard el-icon-error" style="line-height:40px;font-size:24px;" @click="delHazard(index)"></span>
-          </el-form-item>
-          <el-form-item label="" class="form-item" v-if="item.hazardRelId"  label-width="20px">
-            <p class="look-code-p" @click="dialogQrCodeOn(item)">查看二维码</p>
+            <div class="for-button-box">
+              <p class="del-hazard el-icon-circle-close" @click="delHazard(index)"></p>
+              <p class="look-code-p" @click="dialogQrCodeOn(item)">查看二维码</p>
+            </div>
           </el-form-item>
+          <!--<el-form-item label="" class="form-item" label-width="20px">-->
+            <!--<span class="del-hazard el-icon-circle-close" @click="delHazard(index)"></span>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item label="" class="form-item" v-if="item.hazardRelId"  label-width="20px">-->
+            <!--<p class="look-code-p" @click="dialogQrCodeOn(item)">查看二维码</p>-->
+          <!--</el-form-item>-->
         </div>
       </el-form>
     </div>
@@ -580,16 +595,21 @@
     margin:5px 20px 20px 10px!important;
     box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1) !important;
     overflow-y: auto;
+    padding-bottom:20px;
+    .title-no-border-box{
+      margin-top:0 !important;
+      border-top:none !important;
+    }
     .title-box{
       display: flex;
-      margin:0 20px 30px;
-      border-bottom:1px solid #E0E0E0;
+      border-top:20px solid #F5F5F5;
+      margin-top:10px;
       .left-title{
         flex:1;
         height:80px;
         line-height:80px;
-        color:#0045AF;
-        font-size:18px;
+        font-size:16px;
+        margin-left:80px;
       }
       .right-button{
         margin:20px 0;
@@ -598,23 +618,28 @@
     .form-item{
       display: inline-block;
       overflow: hidden;
-      min-height:70px;
-      .look-code-p{
-        font-weight:500;
-        color:#0183fa;
-        cursor: pointer;
-      }
-    }
-    .hazard-for-box{
-      .del-hazard{
-        color:#dedede;
-      }
-      .del-hazard:hover{
-        cursor: pointer;
-        color:#FF6666;
+      .for-button-box{
+        display: flex;
+        .del-hazard{
+          height:40px;
+          line-height:40px;
+          font-size:24px;
+          cursor: pointer;
+          color:#0183FA;
+          margin-right:20px;
+        }
+        .del-hazard:hover{
+          color:#FF6666;
+        }
+        .look-code-p{
+          height:40px;
+          line-height:40px;
+          font-weight:500;
+          color:#0183fa;
+          cursor: pointer;
+        }
       }
     }
-
     .hazard-add{
       width: 250px;
       height: 40px;

src/views/integratedManagement/laboratoryManagement/subject/index.vue

@@ -1,16 +1,15 @@
 <template>
-  <div class="subject">
-    <div class="subject-page" v-if="pageType == 1">
-      <div class="subject-page-min">
-        <div class="left-subject-list left-subject-list-flex">
-          <el-form :model="queryParams" ref="queryForm" :inline="true"
-                   style="border-bottom:1px solid #D8D8D8">
+  <div class="app-container subject">
+    <div class="page-container subject-page" v-if="pageType == 1">
+      <div class="left-subject-list">
+        <div class="page-form-title-box">
+          <el-form :model="queryParams" ref="queryForm" :inline="true">
             <el-form-item label="" prop="searchValue">
               <el-input
                 v-model="queryParams.searchValue"
                 placeholder="实验室/房间号"
                 clearable
-                style="width:150px;margin-left:20px;"
+                style="width:150px;"
               />
             </el-form-item>
             <el-form-item label="" prop="deptId">
@@ -46,7 +45,7 @@
             <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
             <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
             <p class="page-submit-common-style-button"
-               style="float: right;margin-right:20px;"
+               style="float: right;"
                @click="clickPage(2)"
                v-hasPermi="['laboratory:subject:add']"
             >新增</p>
@@ -54,78 +53,73 @@
               <import-component :importConfig="importConfig"></import-component>
             </el-form-item>
           </el-form>
-          <div class="table_border">
-            <el-table class="table-box" ref="multipleTable" border :data="dataList" highlight-current-row
-                      @current-change="handleCurrentChange">
-              <el-table-column label="排序" align="left" prop="orderNum" width="80">
-                <template slot-scope="scope">
-                  <el-input maxlength="4" type="text" oninput="value=value.replace(/[^0-9.]/g,'')"
-                            v-model="scope.row.orderNum" @focus="liveSort(scope.row)"
-                            @blur="editSort(scope.row)"></el-input>
-                </template>
-              </el-table-column>
-              <el-table-column label="实验室名称" align="left" prop="subName" show-overflow-tooltip/>
-              <el-table-column label="房间号" align="left" prop="roomName" width="120" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <span>{{scope.row.roomName?scope.row.roomName:'未绑定'}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="学院" align="left" prop="deptName" width="130" show-overflow-tooltip/>
-              <el-table-column label="分类/分级" align="left" prop="levelName" width="150" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <span>{{scope.row.typeName}}/</span>
-                  <span :style="'color:'+scope.row.levelColor+';'">{{scope.row.levelName}}</span>
-                </template>
-              </el-table-column>
-              <el-table-column label="实验室责任人" align="left" prop="adminName" width="150" show-overflow-tooltip/>
-              <el-table-column label="安全责任人" align="left" prop="safeUserNames" width="150" show-overflow-tooltip/>
-              <el-table-column label="操作" align="left" width="180">
-                <template slot-scope="scope">
-                  <div class="table-button-box">
-                    <p class="table-button-null"></p>
-                    <p class="table-button-p" v-hasPermi="['laboratory:subject:query']" @click="clickPage(7,scope.row)">
-                      详情</p>
-                    <el-dropdown trigger="click" size="mini" @command="(command) => handleCommand(command, scope.row)">
-                      <p class="table-button-p">更多>></p>
-                      <el-dropdown-menu slot="dropdown" style="margin:0!important;">
-                        <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="1"
-                                          v-hasPermiAnd="['laboratory:subject:query','laboratory:subject:edit']">关联配置
-                        </el-dropdown-item>
-                        <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center"
-                                          command="2">物联配置
-                        </el-dropdown-item>
-                        <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="3"
-                                          v-hasPermi="['laboratory:subjectmaterial:add']">准入配置
-                        </el-dropdown-item>
-                        <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="4"
-                                          v-hasPermiAnd="['laboratory:subject:query','laboratory:subject:edit']">编辑
-                        </el-dropdown-item>
-                        <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="5"
-                                          v-hasPermi="['laboratory:subject:remove']">删除
-                        </el-dropdown-item>
-                      </el-dropdown-menu>
-                    </el-dropdown>
-                    <p class="table-button-null"></p>
-                  </div>
-                </template>
-              </el-table-column>
-            </el-table>
-            <pagination
-              v-show="total>0"
-              :total="total"
-              :page.sync="queryParams.page"
-              :limit.sync="queryParams.pageSize"
-              @pagination="getList"
-            />
-          </div>
         </div>
-        <index-right-page ref="indexRightPage"></index-right-page>
+        <div class="page-content-box">
+          <el-table class="table-box" ref="multipleTable" border :data="dataList" highlight-current-row
+                    @current-change="handleCurrentChange">
+            <el-table-column label="排序" align="left" prop="orderNum" width="80">
+              <template slot-scope="scope">
+                <el-input maxlength="4" type="text" oninput="value=value.replace(/[^0-9.]/g,'')"
+                          v-model="scope.row.orderNum" @focus="liveSort(scope.row)"
+                          @blur="editSort(scope.row)"></el-input>
+              </template>
+            </el-table-column>
+            <el-table-column label="实验室名称" align="left" prop="subName" show-overflow-tooltip/>
+            <el-table-column label="房间号" align="left" prop="roomName" width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.roomName?scope.row.roomName:'未绑定'}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="学院" align="left" prop="deptName" width="130" show-overflow-tooltip/>
+            <el-table-column label="分类/分级" align="left" prop="levelName" width="150" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span>{{scope.row.typeName}}/</span>
+                <span :style="'color:'+scope.row.levelColor+';'">{{scope.row.levelName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="实验室责任人" align="left" prop="adminName" width="150" show-overflow-tooltip/>
+            <el-table-column label="安全责任人" align="left" prop="safeUserNames" width="150" show-overflow-tooltip/>
+            <el-table-column label="操作" align="left" width="180">
+              <template slot-scope="scope">
+                <div class="table-button-box">
+                  <p class="table-button-null"></p>
+                  <p class="table-button-p" v-hasPermi="['laboratory:subject:query']" @click="clickPage(7,scope.row)">
+                    详情</p>
+                  <el-dropdown trigger="click" size="mini" @command="(command) => handleCommand(command, scope.row)">
+                    <p class="table-button-p">更多>></p>
+                    <el-dropdown-menu slot="dropdown" style="margin:0!important;">
+                      <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="1"
+                                        v-hasPermiAnd="['laboratory:subject:query','laboratory:subject:edit']">关联配置
+                      </el-dropdown-item>
+                      <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="2"
+                                        v-hasPermi="['laboratory:subjectmaterial:add']">准入配置
+                      </el-dropdown-item>
+                      <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="3"
+                                        v-hasPermiAnd="['laboratory:subject:query','laboratory:subject:edit']">编辑
+                      </el-dropdown-item>
+                      <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="4"
+                                        v-hasPermi="['laboratory:subject:remove']">删除
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
+                  <p class="table-button-null"></p>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+          <pagination
+            v-show="total>0"
+            :total="total"
+            :page.sync="queryParams.page"
+            :limit.sync="queryParams.pageSize"
+            @pagination="getList"
+          />
+        </div>
       </div>
+      <index-right-page ref="indexRightPage"></index-right-page>
     </div>
     <!--新增/编辑-->
     <add-subject v-if="pageType == 2" :subjectData="subjectData"></add-subject>
-    <!--物联设备-->
-    <device-list v-if="pageType == 3" :subjectData="subjectData"></device-list>
     <!--准入配置-->
     <admission-configuration v-if="pageType == 4" :subjectData="subjectData"></admission-configuration>
     <!--关联配置-->
@@ -150,10 +144,8 @@
     laboratorySubRelInfoGetHazardSubRelInfo,
     laboratorySubRelInfoUpdateBySort
   } from '@/api/integratedManagement/index'
-  import { chemicalCabinetGetDoorList } from '@/api/chemicalManage'
   import indexRightPage from './indexRightPage/indexRightPage.vue'
   import addSubject from './addSubject.vue'
-  import deviceList from './deviceList.vue'
   import admissionConfiguration from './admissionConfiguration.vue'
   import associationConfiguration from './associationConfiguration.vue'
   import infoPage from './infoPage.vue'
@@ -162,7 +154,6 @@
     components: {
       importComponent,
       addSubject,
-      deviceList,
       admissionConfiguration,
       associationConfiguration,
       infoPage,
@@ -230,7 +221,7 @@
             this.pageType = type
           }else if (type == 7) {
             //实验室详情
-            this.subjectInfoTwo(row)
+            this.getSubInfo(row,1)
           }
         }
       },
@@ -246,20 +237,15 @@
             })
             break
           case '2':
-            //物联配置
-            this.pageType = 3
-            this.$set(this, 'subjectData', row)
-            break
-          case '3':
             //准入配置
             this.pageType = 4
             this.$set(this, 'subjectData', row)
             break
-          case '4':
+          case '3':
             //编辑页面
-            this.editFun(row)
+            this.getSubInfo(row,2)
             break
-          case '5':
+          case '4':
             //删除
             self.$confirm('是否确认删除?', '', {
               confirmButtonText: '确定',
@@ -278,18 +264,17 @@
             break
         }
       },
-      //实验室编辑
-      editFun(row) {
-        laboratorySubRelInfoGetDetailInfo({ infoId: row.infoId }).then(response => {
-          this.$set(this, 'subjectData', response.data)
-          this.$set(this, 'pageType', 2)
-        })
-      },
-      //获取实验室详情
-      subjectInfoTwo(row) {
+      //获取实验室详情 type:1.详情 2.编辑
+      getSubInfo(row,type){
         laboratorySubRelInfoGetDetailInfo({ infoId: row.infoId }).then(response => {
           this.$set(this, 'subjectData', response.data)
-          this.$set(this, 'pageType', 6)
+          if(type == 1){
+            //详情
+            this.$set(this, 'pageType', 6)
+          }else if(type == 2){
+            //编辑
+            this.$set(this, 'pageType', 2)
+          }
         })
       },
       //保存当前排序
@@ -383,63 +368,46 @@
 
 <style scoped lang="scss">
   .subject {
-    flex: 1;
-    display: flex !important;
+    flex:1;
+    display: flex!important;
     flex-direction: column;
     overflow: hidden;
-    ::v-deep .el-table__row {
-      td:nth-child(1) {
-        padding: 0;
-      }
-    }
-    ::v-deep .el-table__row{
-      cursor: pointer;
-    }
+    box-shadow: none;
+    margin:0;
     .subject-page {
-      flex: 1;
+      flex:1;
       display: flex;
-      flex-direction: column;
+      flex-direction: row;
       overflow: hidden;
-      border-radius: 10px;
-      margin: 5px 0 0 0;
-      //box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1);
-      .subject-page-min {
-        flex: 1;
-        display: flex;
-        overflow: hidden;
-        padding: 2px 0 10px 10px;
-        box-sizing: border-box;
-      }
-      .left-subject-list-flex {
-        flex: 1;
-      }
       .left-subject-list {
-        /*flex:1;*/
+        flex: 1;
         width: 1143px;
         display: flex;
         flex-direction: column;
-        margin-right: 6px;
         overflow: hidden;
         box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.2);
         border-radius: 10px 10px 10px 10px;
-        padding-top: 24px;
-        margin-bottom: 10px;
-        .table_border {
-          flex: 1;
-          display: flex;
-          flex-direction: column;
-          padding: 20px;
-          box-sizing: border-box;
-          overflow: hidden;
-          ::v-deep .el-input--medium .el-input__inner {
-            height: 26px;
-            line-height: 26px;
-            width: 55px;
-            text-align: center;
-            padding: 0 10px;
+        margin: 5px 7px 20px 10px;
+        .page-content-box {
+          .table-box{
+            ::v-deep .el-input--medium .el-input__inner {
+              height: 26px;
+              line-height: 26px;
+              width: 55px;
+              text-align: center;
+              padding: 0 10px;
+            }
           }
         }
       }
     }
+    ::v-deep .el-table__row {
+      td:nth-child(1) {
+        padding: 0;
+      }
+    }
+    ::v-deep .el-table__row{
+      cursor: pointer;
+    }
   }
 </style>

src/views/integratedManagement/laboratoryManagement/subject/indexRightPage/hardwarePage.vue

@@ -43,26 +43,6 @@
           {data1:'通风橱',data2:false,data3:'手动排风',data4:false},
           {data1:'智能通风扇',data2:false,data3:'手动排风',data4:true},
           {data1:'智能通风扇ABCDEFG',data2:true,data3:'定时排风',data4:false},
-          {data1:'设备名称',data2:false,data3:'定时排风',data4:false},
-          {data1:'通风橱',data2:true,data3:'手动排风',data4:true},
-          {data1:'智能通风扇',data2:true,data3:'手动排风',data4:false},
-          {data1:'智能通风扇ABCDEFG',data2:false,data3:'定时排风',data4:true},
-          {data1:'设备名称',data2:true,data3:'定时排风',data4:true},
-          {data1:'通风橱',data2:false,data3:'手动排风',data4:false},
-          {data1:'智能通风扇',data2:false,data3:'手动排风',data4:true},
-          {data1:'智能通风扇ABCDEFG',data2:true,data3:'定时排风',data4:false},
-          {data1:'设备名称',data2:false,data3:'定时排风',data4:false},
-          {data1:'通风橱',data2:true,data3:'手动排风',data4:true},
-          {data1:'智能通风扇',data2:true,data3:'手动排风',data4:false},
-          {data1:'智能通风扇ABCDEFG',data2:false,data3:'定时排风',data4:true},
-          {data1:'设备名称',data2:true,data3:'定时排风',data4:true},
-          {data1:'通风橱',data2:false,data3:'手动排风',data4:false},
-          {data1:'智能通风扇',data2:false,data3:'手动排风',data4:true},
-          {data1:'智能通风扇ABCDEFG',data2:true,data3:'定时排风',data4:false},
-          {data1:'设备名称',data2:false,data3:'定时排风',data4:false},
-          {data1:'通风橱',data2:true,data3:'手动排风',data4:true},
-          {data1:'智能通风扇',data2:true,data3:'手动排风',data4:false},
-          {data1:'智能通风扇ABCDEFG',data2:false,data3:'定时排风',data4:true},
         ],
       }
     },

src/views/integratedManagement/laboratoryManagement/subject/indexRightPage/indexRightPage.vue

@@ -104,9 +104,10 @@
     width:428px;
     display: flex;
     flex-direction: column;
+    margin: 5px 0 20px 7px;
     .top-button-box{
+      overflow: hidden;
       display: flex;
-      margin-left:6px;
       div{
         padding:0 10px;
         height:40px;
@@ -140,9 +141,7 @@
       flex:1;
       display: flex;
       flex-direction: column;
-      margin-left:6px;
       overflow: hidden;
-      margin-bottom:10px;
       .bottom-content-address-box{
         margin:16px 26px;
         display: flex;

src/views/integratedManagement/laboratoryManagement/subject/indexRightPage/sensorPage.vue

@@ -37,30 +37,6 @@
           {data1:false,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
           {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
           {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOCVOCVOCVOCVOCVOCVOCVOCVOC',data4:'',data5:'mg/m³'},
-          {data1:false,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOCVOCVOCVOCVOCVOCVOCVOCVOC',data4:'',data5:'mg/m³'},
-          {data1:false,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOCVOCVOCVOCVOCVOCVOCVOCVOC',data4:'',data5:'mg/m³'},
-          {data1:false,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOCVOCVOCVOCVOCVOCVOCVOCVOC',data4:'',data5:'mg/m³'},
-          {data1:false,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOCVOCVOCVOCVOCVOCVOCVOCVOC',data4:'',data5:'mg/m³'},
-          {data1:false,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOCVOCVOCVOCVOCVOCVOCVOCVOC',data4:'',data5:'mg/m³'},
-          {data1:false,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
-          {data1:true,data2:'',data3:'VOC',data4:'',data5:'mg/m³'},
         ],
       }
     },

src/views/integratedManagement/laboratoryManagement/subject/indexRightPage/videoPage.vue

@@ -24,27 +24,6 @@
             type:'flv',
             url:"ws://192.168.1.43:8230/rtp/440102004920000000010064_34020000001320000064.flv"        //(视频地址:必传)
           },
-          {
-            id:2,        //(ID:非必传-默认随机生成)
-            width:378,    //(宽度:非必传-默认600)
-            height:213,   //(高度:非必传-默认338)
-            type:'flv',
-            url:"ws://192.168.1.43:8230/rtp/440102004920000000010064_34020000001320000064.flv"        //(视频地址:必传)
-          },
-          {
-            id:3,        //(ID:非必传-默认随机生成)
-            width:378,    //(宽度:非必传-默认600)
-            height:213,   //(高度:非必传-默认338)
-            type:'flv',
-            url:"ws://192.168.1.43:8230/rtp/440102004920000000010064_34020000001320000064.flv"        //(视频地址:必传)
-          },
-          {
-            id:4,        //(ID:非必传-默认随机生成)
-            width:378,    //(宽度:非必传-默认600)
-            height:213,   //(高度:非必传-默认338)
-            type:'flv',
-            url:"ws://192.168.1.43:8230/rtp/440102004920000000010064_34020000001320000064.flv"        //(视频地址:必传)
-          },
         ],
       }
     },

src/views/integratedManagement/laboratoryManagement/subject/infoPage.vue

@@ -1,60 +1,61 @@
 <template>
     <div class="infoPage" v-if="subjectData.infoId">
-      <div :class="versionField() == 'xiBeiNongLinDaXue'?'left-max-box-flex':''" class="left-max-box scrollbar-box">
-        <div :class="versionField() == 'xiBeiNongLinDaXue'?'top-max-box-flex':''" class="top-max-box" style="position: relative">
-          <div class="all-title-box">
-            <p></p>
-            <p style="flex:1;">实验室安全信息牌</p>
-            <div v-if="versionField() == 'xiBeiNongLinDaXue'" class="reset-button-one" style="margin-top:-5px;width:80px!important;height:30px!important;line-height:30px!important;" @click="backPage">返回</div>
-          </div>
-          <div class="left-top-title-box">
-            <div class="left-box">
-              <div class="lv-name-box">
-                <p :style="'color:'+subjectData.fiedColor+';border:1px solid '+subjectData.fiedColor+';'">{{subjectData.levelName}}</p>
-                <p>{{subjectData.name}}</p>
-              </div>
-              <div class="type-address-box">
-                <p>{{subjectData.typeName}}</p>
-                <p v-if="subjectData.subAddrr">{{subjectData.subAddrr.buildName}}{{subjectData.subAddrr.floorName}}</p>
-              </div>
+      <div class="left-max-box">
+        <div class="all-title-box">
+          <p></p>
+          <p style="flex:1;">实验室安全信息牌</p>
+          <div v-if="versionField() == 'xiBeiNongLinDaXue'" class="reset-button-one" style="margin-top:-5px;width:80px!important;height:30px!important;line-height:30px!important;" @click="backPage">返回</div>
+        </div>
+        <div class="left-top-title-box">
+          <div class="left-box">
+            <div class="lv-name-box">
+              <p :style="'color:'+subjectData.fiedColor+';border:1px solid '+subjectData.fiedColor+';'">{{subjectData.levelName}}</p>
+              <p>{{subjectData.name}}</p>
             </div>
-            <div class="right-code-img" @click="clickCode">
-              <vue-qr style="display: block;height:60px;width:60px;cursor:pointer;margin:0 10px 0 0;" :text="subjectData.qrCodeUrl" :size="300" @click="clickCode"></vue-qr>
+            <div class="type-address-box">
+              <p>{{subjectData.typeName}}</p>
+              <p v-if="subjectData.subAddrr">{{subjectData.subAddrr.buildName}}{{subjectData.subAddrr.floorName}}</p>
             </div>
           </div>
-          <div class="user-max-box">
-            <div class="left-box">
-              <p>实验室责任人：<span>{{subjectData.adminName}}</span></p>
-              <p>联系方式：<span>{{subjectData.adminPhone}}</span></p>
-            </div>
-            <div class="right-box">
-              <div v-for="(item,index) in subjectData.safeUserName" :key="index">
-                <p>安全责任人：<span>{{subjectData.safeUserName[index]}}</span></p>
-                <p>联系方式：<span>{{subjectData.safeUserPhone[index]?subjectData.safeUserPhone[index]:'未填写'}}</span></p>
-              </div>
-            </div>
+          <div class="right-code-img" @click="clickCode">
+            <vue-qr style="display: block;height:60px;width:60px;cursor:pointer;margin:0 10px 0 0;"
+                    :text="identification+'?code='+subjectData.infoId+'&type=5'" :size="300">
+            </vue-qr>
+          </div>
+        </div>
+        <div class="user-max-box">
+          <div class="left-box">
+            <p>实验室责任人：<span>{{subjectData.adminName}}</span></p>
+            <p>联系方式：<span>{{subjectData.adminPhone}}</span></p>
           </div>
-          <div class="info-max-box">
-            <div class="for-text-box" v-if="item.privateList.length>0 && item.classifyType==1" v-for="(item,index) in  subjectData.classifyList">
-              <p class="info-title">{{item.classifyName}}:</p>
-              <div class="for-box" v-for="(item2,index2) in item.privateList" :key="index2">
-                <p class="for-info-p">● {{item2.infoName}}</p>
-              </div>
+          <div class="right-box">
+            <div v-for="(item,index) in subjectData.safeUserName" :key="index">
+              <p>安全责任人：<span>{{subjectData.safeUserName[index]}}</span></p>
+              <p>联系方式：<span>{{subjectData.safeUserPhone[index]?subjectData.safeUserPhone[index]:'未填写'}}</span></p>
             </div>
-            <div class="for-img-box" v-if="item.privateList.length>0 && item.classifyType==2" v-for="(item,index) in  subjectData.classifyList">
-              <p class="info-title" style="margin-bottom:7px;">{{item.classifyName}}:</p>
-              <img :src="item2.infoContent" v-for="(item2,index2) in item.privateList" :key="index2">
+          </div>
+        </div>
+        <div class="info-max-box">
+          <div class="for-text-box" v-if="item.privateList.length>0 && item.classifyType==1" v-for="(item,index) in  subjectData.classifyList">
+            <p class="info-title">{{item.classifyName}}:</p>
+            <div class="for-box" v-for="(item2,index2) in item.privateList" :key="index2">
+              <p class="for-info-p">● {{item2.infoName}}</p>
             </div>
           </div>
+          <div class="for-img-box" v-if="item.privateList.length>0 && item.classifyType==2" v-for="(item,index) in  subjectData.classifyList">
+            <p class="info-title" style="margin-bottom:7px;">{{item.classifyName}}:</p>
+            <img :src="item2.infoContent" v-for="(item2,index2) in item.privateList" :key="index2">
+          </div>
         </div>
       </div>
-      <!--<div class="right-max-box scrollbar-box" v-if="versionField() != 'xiBeiNongLinDaXue'">-->
-        <!--<div class="all-title-box" style="height:40px;">-->
-          <!--<p></p>-->
-          <!--<p>传感器监测</p>-->
+      <div class="right-max-box scrollbar-box">
+        <div class="all-title-box" style="height:40px;">
+          <p></p>
+          <p>传感器监测</p>
+          <p>数据上报时间：</p>
           <!--<p>{{subjectData.sensorFunctionStatusList[0]?'数据上报时间：'+subjectData.sensorFunctionStatusList[0].sendDate:''}}</p>-->
-          <!--<p class="reset-button-one" @click="backPage">返回</p>-->
-        <!--</div>-->
+          <p class="page-out-common-style-button" @click="backPage">返回</p>
+        </div>
         <!--<p class="sensor-box" v-for="(item,index) in subjectData.sensorFunctionStatusList" :key="index">{{item.funcName}}：<span>{{item.formatVal}}</span></p>-->
         <!--<img class="null-data-img" src="@/assets/ZDimages/basicsModules/null-data.png" v-if="!subjectData.sensorFunctionStatusList[0]">-->
         <!--<p class="null-p" v-if="!subjectData.sensorFunctionStatusList[0]" >暂无环境监测信息，请在更多操作-物联设备配置中进行添加</p>-->
@@ -153,7 +154,7 @@
             <!--</p>-->
           <!--</div>-->
         <!--</div>-->
-      <!--</div>-->
+      </div>
       <!--&lt;!&ndash;展示实验室二维码&ndash;&gt;-->
       <!--<el-dialog title="实验室二维码" :visible.sync="codeType" width="500px" append-to-body>-->
         <!--<vue-qr style="display: block;height:460px;width:460px;cursor:pointer;margin:0 auto;" :text="subjectData.qrCodeUrl" :size="200"></vue-qr>-->
@@ -178,6 +179,7 @@
           <!--<p class="dialog-footer-button-null"></p>-->
         <!--</div>-->
       <!--</el-dialog>-->
+      <qr-code-dialog ref="qrCodeDialog" :qrCodeDialogData="qrCodeDialogData"></qr-code-dialog>
     </div>
 </template>
 
@@ -186,16 +188,23 @@
   import { hardWareControl } from "@/apiDemo/laboratory/hardware";
   import { subjectInfo,mangerVoice  } from "@/apiDemo/laboratory/subject";
   import vueQr from 'vue-qr'
-    export default {
+  //                                  V3
+  import qrCodeDialog from "@/components/qrCodeDialog/index.vue"
+  export default {
       name: "infoPage",
       components: {
-        vueQr
+        vueQr,
+        qrCodeDialog
       },
       props:{
         subjectData:{},
       },
       data() {
         return {
+          //二维码规则 服务器域名,需与微信后台开发配置内一致.
+          identification: localStorage.getItem('codeOnlineAdd'),
+          //二维码参数
+          qrCodeDialogData:{},
           // subjectData:{},
           //主要危险类别
           hazardCategory:[],
@@ -237,6 +246,7 @@
       },
       mounted(){
         let self = this;
+        this.$set(this.subjectData,'qrCodeUrl','code=');
         // setTimeout(function(){
         //   self.videoFunction();
         // },500);
@@ -320,7 +330,15 @@
         },
         //展示实验室二维码
         clickCode(){
-          this.codeType = true;
+          this.$set(this,'qrCodeDialogData',{
+            // title:this.subjectData.subName,                                               //弹窗名称(非必传)
+            download:true,                                                //二维码下载按钮(非必传)
+            type:'5',                                                     //二维码类型 用于区分二维码功能类型
+            parameter:this.subjectData.infoId,                                             //二维码参数
+            name:this.subjectData.subName,                                                //二维码名称用于下载时命名(非必传)
+            codeName:this.subjectData.subName,                                            //二维码图片下名称展示(非必传)
+          });
+          this.$refs['qrCodeDialog'].initialize();
         },
         // 开启关闭验证
         async changeIsNeedCaptcha (row) {
@@ -370,223 +388,131 @@
     flex:1;
     display: flex;
     overflow: hidden;
-    /*padding:5px 20px 20px 10px!important;*/
-    *{
-      margin:0;
-    }
-    .null-data-img{
-      width:137px;
-      height:137px;
-      display: block;
-      margin:10px auto;
-    }
-    .all-title-box{
-      display: flex;
-      height:18px;
-      p{
-        line-height:18px;
-      }
-      p:nth-child(1){
-        width:4px;
-        height:18px;
-        margin-right:12px;
-        background: #0045af;
-      }
-      p:nth-child(2){
-        font-size:18px;
-        color:#0045af;
-        margin-right:28px;
-        font-weight:700;
-      }
-      p:nth-child(3){
-        font-size:14px;
-        color:#999;
-        flex:1;
-      }
-      p:nth-child(4){
-        line-height:40px!important;
-      }
-    }
-    .null-p{
-      line-height:50px;
-      text-align: center;
-      font-size:14px;
-      color:#999;
-    }
-    .left-max-box-flex{
-      flex:1;
-    }
     .left-max-box{
       font-weight:500;
       width:1035px;
       display: flex;
       flex-direction: column;
-      .top-max-box-flex{
-        flex:1;
-      }
-      .top-max-box{
-        border-radius:10px!important;
-        box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1) !important;
-        padding:20px;
-        margin:5px 10px 20px 10px;
-        .left-top-title-box{
-          margin-top:13px;
-          height:74px;
-          display: flex;
-          border-bottom:1px dashed #999999;
-          .left-box{
-            flex:1;
-            .lv-name-box{
-              height:34px;
-              display: flex;
-              p:nth-child(1){
-                height:22px;
-                line-height:20px;
-                margin:6px 15px 0 0;
-                font-size:12px;
-                text-align: center;
-                padding:0 8px;
-                border-radius:4px;
-              }
-              p:nth-child(2){
-                font-size:16px;
-                height:34px;
-                line-height:34px;
-                color:#333;
-              }
+      border-radius:10px!important;
+      box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1) !important;
+      padding:20px;
+      margin:5px 10px 20px 10px;
+      .left-top-title-box{
+        margin-top:13px;
+        height:74px;
+        display: flex;
+        border-bottom:1px dashed #999999;
+        .left-box{
+          flex:1;
+          .lv-name-box{
+            height:34px;
+            display: flex;
+            p:nth-child(1){
+              height:22px;
+              line-height:20px;
+              margin:6px 15px 0 0;
+              font-size:12px;
+              text-align: center;
+              padding:0 8px;
+              border-radius:4px;
             }
-            .type-address-box{
-              display: flex;
-              p{
-                font-size:14px;
-                height:40px;
-                line-height:40px;
-                color:#999;
-              }
-              p:nth-child(1){
-                margin-right:40px;
-              }
+            p:nth-child(2){
+              font-size:16px;
+              height:34px;
+              line-height:34px;
+              color:#333;
             }
           }
-          .right-code-img{
-            width:60px;
-            height:60px;
-            margin:0 10px 0 0;
-            cursor: pointer;
-          }
-        }
-        .user-max-box{
-          margin-top:10px;
-          display: flex;
-          .left-box{
-            width:420px;
+          .type-address-box{
             display: flex;
             p{
-              line-height: 32px;
               font-size:14px;
-              flex:1;
-              color:#333;
-              span{
-                color:#999;
-              }
+              height:40px;
+              line-height:40px;
+              color:#999;
             }
-          }
-          .right-box{
-            flex:1;
-            div{
-              flex:1;
-              display: flex;
-              p{
-                line-height: 32px;
-                font-size:14px;
-                flex:1;
-                color:#333;
-                span{
-                  color:#999;
-                }
-              }
+            p:nth-child(1){
+              margin-right:40px;
             }
           }
         }
-        .info-max-box{
-          margin-top:7px;
+        .right-code-img{
+          width:60px;
+          height:60px;
+          margin:0 10px 0 0;
+          cursor: pointer;
+        }
+      }
+      .user-max-box{
+        margin-top:10px;
+        display: flex;
+        .left-box{
+          width:420px;
           display: flex;
-          flex-wrap: wrap;
-          .for-text-box{
-            width:420px;
-            .info-title{
-              font-size:14px;
-              color:#333;
-              line-height:40px;
-              font-weight:700;
-            }
-            .for-box{
-              overflow: hidden;
-              .for-info-p{
-                line-height:16px;
-                font-size:14px;
-                color:#999;
-                margin:7px 0;
-                overflow: hidden;
-              }
-            }
-          }
-          .for-img-box{
-            width:420px;
-            .info-title{
-              font-size:14px;
-              color:#333;
-              line-height:40px;
-              font-weight:700;
-            }
-            img{
-              width:37px;
-              height:50px;
-              margin:0 14px 14px 0;
+          p{
+            line-height: 32px;
+            font-size:14px;
+            flex:1;
+            color:#333;
+            span{
+              color:#999;
             }
           }
         }
-      }
-      .bottom-max-box{
-        border-radius:10px!important;
-        box-shadow: 0 0 8px 1px rgba(0, 0, 0, 0.1) !important;
-        padding:20px;
-        margin:0 10px 20px 10px;
-        .for-list-box{
-          margin-top:22px;
-          .title-box{
-            background: #F5F5F5;
-            height:50px;
-            line-height:50px;
+        .right-box{
+          flex:1;
+          div{
+            flex:1;
             display: flex;
             p{
+              line-height: 32px;
+              font-size:14px;
               flex:1;
-              font-size:16px;
               color:#333;
-              font-weight:700;
-            }
-            p:nth-child(1){
-              margin-left:50px;
+              span{
+                color:#999;
+              }
             }
           }
-          .list-box:nth-child(2){
-            border:none;
-          }
-          .list-box{
-            border-top:1px solid #E0E0E0;
-            height:40px;
+        }
+      }
+      .info-max-box{
+        margin-top:7px;
+        display: flex;
+        flex-wrap: wrap;
+        .for-text-box{
+          width:420px;
+          .info-title{
+            font-size:14px;
+            color:#333;
             line-height:40px;
-            display: flex;
-            p{
-              flex:1;
+            font-weight:700;
+          }
+          .for-box{
+            overflow: hidden;
+            .for-info-p{
+              line-height:16px;
               font-size:14px;
               color:#999;
-            }
-            p:nth-child(1){
-              margin-left:50px;
+              margin:7px 0;
+              overflow: hidden;
             }
           }
         }
+        .for-img-box{
+          width:420px;
+          .info-title{
+            font-size:14px;
+            color:#333;
+            line-height:40px;
+            font-weight:700;
+          }
+          img{
+            width:37px;
+            height:50px;
+            margin:0 14px 14px 0;
+          }
+        }
       }
     }
     .right-max-box{
@@ -698,5 +624,44 @@
         }
       }
     }
+    .null-p{
+      line-height:50px;
+      text-align: center;
+      font-size:14px;
+      color:#999;
+    }
+    .null-data-img{
+      width:137px;
+      height:137px;
+      display: block;
+      margin:10px auto;
+    }
+    .all-title-box{
+      display: flex;
+      height:18px;
+      p{
+        line-height:18px;
+      }
+      p:nth-child(1){
+        width:4px;
+        height:18px;
+        margin-right:12px;
+        background: #0045af;
+      }
+      p:nth-child(2){
+        font-size:18px;
+        color:#0045af;
+        margin-right:28px;
+        font-weight:700;
+      }
+      p:nth-child(3){
+        font-size:14px;
+        color:#999;
+        flex:1;
+      }
+      p:nth-child(4){
+        line-height:40px!important;
+      }
+    }
   }
 </style>