dedsudiyu hai 5 meses
pai
achega
fb4ae71db9

+ 24 - 0
src/api/hierarchicalControl/index.js

@@ -48,3 +48,27 @@ export function laboratoryGradeManageDelete(data) {
     data: data
   })
 }
+// 查询分级控管理列表
+export function gradeManageWorkList(query) {
+  return request({
+    url: '/laboratory/gradeManageWork/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询管控执行记录列表
+export function laboratoryGradeManageRecordList(data) {
+  return request({
+    url: '/laboratory/gradeManageRecord/list',
+    method: 'post',
+    data: data
+  })
+}
+// 管控执行记录详情
+export function laboratoryGradeManageWorkDetail(query) {
+  return request({
+    url: '/laboratory/gradeManageWork/detail',
+    method: 'get',
+    params: query
+  })
+}

+ 11 - 124
src/views/hierarchicalControl/gradeManageRecord/index.vue

@@ -86,14 +86,15 @@
           <el-table-column label="安全分级" align="center" prop="levelName" width="130"/>
           <el-table-column label="学院" align="center" prop="deptName" width="130" show-overflow-tooltip/>
           <el-table-column label="执行周期" align="center" prop="cycle" width="149"/>
-          <!--<el-table-column label="执行人身份" align="center" prop="userPosition" />-->
           <el-table-column label="状态" align="center" prop="status"width="149">
             <template slot-scope="scope">
               <span :class="scope.row.status==2?'tableTypeColorA':''">{{scope.row.status==0?'未执行':(scope.row.status==2?'已执行':'')}}</span>
             </template>
           </el-table-column>
-          <el-table-column label="执行时间" align="center" prop="carryTime" width="130">
-            <template slot-scope="scope">{{scope.row.carryTime?scope.row.carryTime:'-'}}</template>
+          <el-table-column label="执行时间" align="center" prop="carryTime" width="150">
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.carryTime,"{y}-{m}-{d} {h}:{i}") }}</span>
+            </template>
           </el-table-column>
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" v-if="tableButtonType">
             <template slot-scope="scope">
@@ -118,56 +119,13 @@
       </div>
     </div>
     <info-page v-if="pageType == 2" :recordId="recordId"></info-page>
-    <!-- 添加或修改管控执行记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="规则ID" prop="ruleId">
-          <el-input v-model="form.ruleId" placeholder="请输入规则ID" />
-        </el-form-item>
-        <el-form-item label="规则名称" prop="ruleName">
-          <el-input v-model="form.ruleName" placeholder="请输入规则名称" />
-        </el-form-item>
-        <el-form-item label="实验室ID" prop="subId">
-          <el-input v-model="form.subId" placeholder="请输入实验室ID" />
-        </el-form-item>
-        <el-form-item label="执行用户ID" prop="joinUserId">
-          <el-input v-model="form.joinUserId" placeholder="请输入执行用户ID" />
-        </el-form-item>
-        <el-form-item label="执行人身份" prop="userPosition">
-          <el-input v-model="form.userPosition" placeholder="请输入执行人身份" />
-        </el-form-item>
-        <el-form-item label="执行状态">
-          <el-radio-group v-model="form.status">
-            <el-radio label="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="执行时间" prop="carryTime">
-          <el-date-picker clearable size="small"
-            v-model="form.carryTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="选择执行时间">
-          </el-date-picker>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
 import {
-  listGradeManageRecord,
-  getGradeManageRecord, delGradeManageRecord,
-  addGradeManageRecord, updateGradeManageRecord,
-  queryOption,gradeManageWorkInfo
-} from "@/api/hierarchicalControl/indexDemo";
+  laboratoryGradeManageRecordList
+} from "@/api/hierarchicalControl/index";
 import {
   getDeptDropList,
   laboratoryClassLevelGetList,
@@ -219,7 +177,6 @@ export default {
       recordId:"",
       //学院列表
       deptIdOptionList:[],
-      labMoldList:[],
       levelOptionList:[],
       typeOptionList:[],
       cycleList:['一天','一周','一月','季度','半年','一年'],
@@ -232,16 +189,8 @@ export default {
     this.getDeptDropList();
     this.laboratoryClassLevelGetList();
     this.laboratoryClassTypeGetList();
-    this.queryOption();
   },
   methods: {
-    queryOption(){
-      queryOption({}).then(response=>{
-        if(response.code==200){
-          this.$set(this,'labMoldList',response.data);
-        }
-      })
-    },
     //查询安全分级
     laboratoryClassLevelGetList(){
       laboratoryClassLevelGetList({}).then(response=>{
@@ -263,14 +212,8 @@ export default {
         if(type == 1){
           this.pageType = 1;
         }else if(type == 2){
-          gradeManageWorkInfo(row.id).then( response => {
-            if (response.code == 504){
-              this.msgError(response.msg);
-            }else if (response.code == 200){
-              this.recordId = row.id;
-              this.pageType = 2;
-            }
-          })
+          this.recordId = row.id;
+          this.pageType = 2;
         }
       }
     },
@@ -284,9 +227,9 @@ export default {
         this.queryParams.endTime = null
       }
       this.loading = true;
-      listGradeManageRecord(this.queryParams).then( response => {
-        this.gradeManageRecordList =  response.rows;
-        this.total =  response.total;
+      laboratoryGradeManageRecordList(this.queryParams).then( response => {
+        this.$set(this,'gradeManageRecordList',response.data.records);
+        this.$set(this,'total',response.data.total);
         this.loading = false;
       });
     },
@@ -343,62 +286,6 @@ export default {
       });
       this.handleQuery();
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加管控执行记录";
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getGradeManageRecord(id).then( response => {
-        this.form =  response.data;
-        this.open = true;
-        this.title = "修改管控执行记录";
-      });
-    },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateGradeManageRecord(this.form).then( response => {
-              this.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addGradeManageRecord(this.form).then( response => {
-              this.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$confirm('是否确认删除管控执行记录编号为"' + ids + '"的数据项?', "警告", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          return delGradeManageRecord(ids);
-        }).then(() => {
-          this.getList();
-          this.msgSuccess("删除成功");
-        }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download('laboratory/gradeManageRecord/export', {
-        ...this.queryParams
-      }, `laboratory_gradeManageRecord.xlsx`)
-    }
   }
 };
 </script>

+ 24 - 51
src/views/hierarchicalControl/gradeManageRecord/infoPage.vue

@@ -1,13 +1,13 @@
 <template>
   <div class="gradeManageRecord-infoPage" v-if="infoData">
-    <div class="gradeManageRecord-infoPage-min" v-if="pageType == 1">
+    <div class="gradeManageRecord-infoPage-min">
       <div class="title-max-box">
         <p>基本信息</p>
-        <p class="reset-button-one" @click="backPage">返回</p>
+        <p class="page-out-common-style-button" @click="backPage">返回</p>
       </div>
       <div class="top-subject-box">
         <p :style="'color:'+infoData.fiedColor+';border:1px solid ;'+infoData.fiedColor+';'">{{infoData.levelName}}</p>
-        <p>{{infoData.subName}}</p>
+        <p>{{infoData.subName}}{{infoData.roomNum?'('+infoData.roomNum+')':''}}</p>
         <p>{{infoData.typeName}}</p>
       </div>
       <div class="top-info-box">
@@ -32,21 +32,9 @@
         <div class="info-text-box">
           <div>
             <p>执行截止时间:</p>
-            <p :class="infoData.status == 0?'tableTypeColorA':''">{{infoData.endDate}}</p>
+            <p :class="infoData.status == 0?'tableTypeColorA':''">{{parseTime(infoData.endDate,"{y}-{m}-{d} {h}:{i}")}}</p>
           </div>
         </div>
-        <!--<div class="info-text-box">-->
-        <!--<div>-->
-        <!--<p>执行人身份:</p>-->
-        <!--<p>{{infoData.userPosition}}</p>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<div class="info-text-box">-->
-        <!--<div>-->
-        <!--<p>截止执行时间:</p>-->
-        <!--<p>{{infoData.endTime}}</p>-->
-        <!--</div>-->
-        <!--</div>-->
       </div>
       <div class="top-info-box">
         <div class="info-text-box">
@@ -65,25 +53,17 @@
       <div class="title-max-box">
         <p>执行信息</p>
       </div>
-      <!--<div class="bottom-item-box">-->
-      <!--<p>实际执行时间:</p>-->
-      <!--<p>{{infoData.carryTime}}</p>-->
-      <!--</div>-->
-      <!--<div class="bottom-item-box" v-if="infoData.detail">-->
-      <!--<p>执行描述:</p>-->
-      <!--<p>{{infoData.detail.remark}}</p>-->
-      <!--</div>-->
       <div class="bottom-item-box bottom-item-box-one" v-if="infoData.status == 0">
         <p>指定执行人员:</p>
         <p>{{infoData.allUserName}}</p>
       </div>
       <div class="bottom-item-box bottom-item-box-one" v-if="infoData.status == 2">
         <p>执行时间:</p>
-        <p>{{infoData.detail.createTime}}</p>
+        <p>{{parseTime(infoData.detail.createTime,"{y}-{m}-{d} {h}:{i}")}}</p>
       </div>
       <div class="bottom-item-box" v-if="infoData.status == 2">
         <p>执行人:</p>
-        <p>{{infoData.nickName}}</p>
+        <p>{{infoData.detail.createName}}</p>
       </div>
       <div class="bottom-item-box" v-if="infoData.status == 2">
         <p>身份:</p>
@@ -96,24 +76,23 @@
       <div class="bottom-for-box" v-if="infoData.status == 2">
         <p class="left-name-p">执行材料:</p>
         <div class="right-max-box" v-if="infoData.detail.imgUrl">
-          <p v-for="(item,index) in infoData.detail.imgUrlList" :key="index">{{item.name}} <span @click="pageTypeClickMin(2,item)">查看</span></p>
-          <!--<a :href="item.url" v-for="(item,index) in infoData.detail.imgUrlList" :key="index">{{item.name}}</a>-->
+          <p v-for="(item,index) in infoData.detail.imgUrlList" :key="index">{{item.name}} <span @click="fullScreenViewClick(infoData.detail.imgUrlList,index)">查看</span></p>
         </div>
       </div>
     </div>
-    <preview-page :previewData="previewData" v-if="pageType == 2"></preview-page>
+    <fullScreenView :fullScreenViewProps="fullScreenViewProps" ref="fullScreenView"></fullScreenView>
   </div>
 </template>
 
 <script>
   import {
-    gradeManageWorkInfo
-  } from "@/api/hierarchicalControl/indexDemo";
-  import previewPage from "./previewPage.vue"
+    laboratoryGradeManageWorkDetail
+  } from "@/api/hierarchicalControl/index";
+  import fullScreenView from "@/components/fullScreenView/fullScreenView.vue";
   export default {
     name: "infoPage",
     components: {
-      previewPage
+      fullScreenView
     },
     props:{
       recordId:{},
@@ -123,33 +102,27 @@
         iframeSrc:"",
         iframeIndex:0,
         infoData:null,
-        pageType:1,
-        previewData:{},
+        fullScreenViewProps:[],
       }
     },
     created() {
 
     },
     mounted(){
-      this.gradeManageWorkInfo();
+      this.laboratoryGradeManageWorkDetail();
     },
     methods: {
-      pageTypeClickMin(type,item){
-        if (type == 1){
-          this.pageType = 1;
-          this.previewData = {};
-        } else {
-          this.previewData = item;
-          this.pageType = 2;
+      //照片预览
+      fullScreenViewClick(list, index) {
+        let newList = [];
+        for(let i=0;i<list.length;i++){
+          newList.push(list[i].url)
         }
+        this.$set(this, 'fullScreenViewProps', newList)
+        this.$refs['fullScreenView'].initialize(index)
       },
-      //点击切换文件
-      iframeClick(item,index){
-        this.iframeSrc = this.urlJudge(item.url)
-        this.iframeIndex = index;
-      },
-      gradeManageWorkInfo(){
-        gradeManageWorkInfo(this.recordId).then( response => {
+      laboratoryGradeManageWorkDetail(){
+        laboratoryGradeManageWorkDetail({id:this.recordId}).then( response => {
           if(response.data.detail){
             if(response.data.detail.imgUrl){
               response.data.detail.imgUrlList = [];
@@ -191,7 +164,6 @@
       flex:1;
       display: flex!important;
       flex-direction: column;
-      padding:0 20px!important;
 
     }
     *{
@@ -201,6 +173,7 @@
     .title-max-box{
       display: flex;
       border-bottom:1px solid #dedede;
+      padding: 0 20px;
       p:nth-child(1){
         flex:1;
         font-size:18px;

+ 36 - 52
src/views/hierarchicalControl/gradeManageWork/addPage.vue

@@ -1,14 +1,14 @@
 <template>
-  <div class="gradeManageRecord-addPage scrollbar-box">
-    <div class="gradeManageRecord-addPage-min" v-if="pageType == 1">
-      <div class="title-max-box">
-        <p>基本信息</p>
-        <p class="reset-button-one" @click="backPage">返回</p>
-      </div>
+  <div class="gradeManageRecord-addPage">
+    <div class="title-max-big-box">
+      <p>基本信息</p>
+      <p class="page-submit-common-style-button" @click="buttonClick">提交</p>
+      <p class="page-out-common-style-button" style="margin:20px 0 0 20px;" @click="backPage">返回</p>
+    </div>
+    <div class="gradeManageRecord-addPage-min scrollbar-box">
       <div class="top-subject-box">
-        <!--<p :style="'color:'+infoData.fiedColor+';border:1px solid ;'+infoData.fiedColor+';'">啊啊啊啊啊啊啊</p>-->
         <p :style="'color:'+addData.bigItem.levelColor+';border:1px solid '+addData.bigItem.levelColor+';'" v-if="addData.bigItem.levelName">{{addData.bigItem.levelName}}</p>
-        <p>{{addData.bigItem.subName}}</p>
+        <p style="font-weight:700;">{{addData.bigItem.subName}}{{addData.bigItem.roomNum?'('+addData.bigItem.roomNum+')':''}}</p>
         <p>{{addData.bigItem.typeName}}</p>
       </div>
       <div class="top-info-box">
@@ -33,22 +33,9 @@
         <div class="info-text-box">
           <div>
             <p>执行截止时间:</p>
-            <!--<p :class="infoData.nickName?'tableTypeColorA':''">啊啊啊啊啊啊啊</p>-->
             <p :class="addData.minItem.status == 0?'tableTypeColorA':''">{{addData.minItem.endDate}}</p>
           </div>
         </div>
-        <!--<div class="info-text-box">-->
-        <!--<div>-->
-        <!--<p>执行人身份:</p>-->
-        <!--<p>{{infoData.userPosition}}</p>-->
-        <!--</div>-->
-        <!--</div>-->
-        <!--<div class="info-text-box">-->
-        <!--<div>-->
-        <!--<p>截止执行时间:</p>-->
-        <!--<p>{{infoData.endTime}}</p>-->
-        <!--</div>-->
-        <!--</div>-->
       </div>
       <div class="top-info-box">
         <div class="info-text-box">
@@ -99,33 +86,17 @@
               <p v-if="pictureType">图片请上传 png / jpeg / gif 格式</p>
             </div>
           </div>
-          <!--<el-upload-->
-          <!--class="avatar-uploader"-->
-          <!--:action="uploadImgUrl"-->
-          <!--:show-file-list="false"-->
-          <!--:on-success="(res)=>handleAvatarSuccess(res)"-->
-          <!--:headers="headers"-->
-          <!--:before-upload="beforeAvatarUpload">-->
-          <!--<p class="reset-button-one left-button"><i class="el-icon-upload2" style="margin-right:10px;"></i>请上传执行材料</p>-->
-          <!--</el-upload>-->
         </el-form-item>
         <div class="right-for-max-box">
           <div class="right-for-min-box" v-for="(item,index) in form.list" :key="index">
-            <!--<el-tooltip class="item" effect="dark" :content="item.name" placement="top" v-if="">-->
-              <!--<p>{{item.name}}</p>-->
-            <!--</el-tooltip>-->
             <p>{{item.name}}</p>
-            <p @click="pageTypeClickMin(2,item)">查看</p>
+            <p @click="fullScreenViewClick(form.list,index)">查看</p>
             <p @click="delItem(index)">删除</p>
           </div>
         </div>
       </el-form>
-      <div class="bottom-button">
-        <!--<p class="reset-button-one" @click="backPage">取消</p>-->
-        <p class="inquire-button-one" @click="buttonClick">提交</p>
-      </div>
     </div>
-    <preview-page :previewData="previewData" v-if="pageType == 2"></preview-page>
+    <fullScreenView :fullScreenViewProps="fullScreenViewProps" ref="fullScreenView"></fullScreenView>
   </div>
 </template>
 
@@ -133,22 +104,21 @@
   import {
     gradeManageWorkFinish
   } from "@/api/hierarchicalControl/indexDemo";
+  import fullScreenView from "@/components/fullScreenView/fullScreenView.vue";
   import { getToken } from "@/utils/auth";
-  import previewPage from "./previewPage.vue"
   export default {
     name: "addPage",
     components: {
-      previewPage
+      fullScreenView,
     },
     props:{
       addData:{},
     },
     data() {
       return {
-        pageType:1,
         uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
         headers: {
-          Authorization: "Bearer " + getToken(),
+          Authorization: getToken(),
         },
         upDataName:[],
         form:{
@@ -171,6 +141,7 @@
         videoType:false,
         pictureType:false,
         indexOfList:[],
+        fullScreenViewProps:[],
       }
     },
     created() {
@@ -237,14 +208,14 @@
           }
         });
       },
-      pageTypeClickMin(type,item){
-        if (type == 1){
-          this.pageType = 1;
-          this.previewData = {};
-        } else {
-          this.previewData = item;
-          this.pageType = 2;
+      //照片预览
+      fullScreenViewClick(list, index) {
+        let newList = [];
+        for(let i=0;i<list.length;i++){
+          newList.push(list[i].url)
         }
+        this.$set(this, 'fullScreenViewProps', newList)
+        this.$refs['fullScreenView'].initialize(index)
       },
       //返回
       backPage(){
@@ -304,16 +275,29 @@
     flex:1;
     display: flex!important;
     flex-direction: column;
+    overflow: hidden;
     *{
       margin:0;
       padding:0;
     }
+    .title-max-big-box{
+      display: flex;
+      border-bottom:1px solid #dedede;
+      padding:0 20px!important;
+      p:nth-child(1){
+        flex:1;
+        font-size:18px;
+        line-height:80px;
+        color:#0045AF;
+      }
+      p:nth-child(2){
+        margin-top:20px;
+      }
+    }
     .gradeManageRecord-addPage-min{
       flex:1;
       display: flex!important;
       flex-direction: column;
-      margin:5px 20px 20px 10px!important;
-      box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1)!important;
       border-radius:10px;
       .title-max-box{
         display: flex;

+ 6 - 39
src/views/hierarchicalControl/gradeManageWork/index.vue

@@ -42,7 +42,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="执行周期" prop="cycle">
+          <el-form-item label="" prop="cycle">
             <el-select v-model="queryParams.cycle" placeholder="请选择执行周期" clearable style="width:150px;">
               <el-option
                 v-for="dict in cycleList"
@@ -63,17 +63,13 @@
         <div class="for-max-box" v-for="(item,index) in gradeManageList" :key="index">
           <div class="for-title-box">
             <div class="for-title-type-box" :style="'color:'+item.levelColor+';border:1px solid '+item.levelColor+';'" v-if="item.levelName">
-              <!--<p>{{item.typeName}}</p>-->
               <p>{{item.levelName}}</p>
             </div>
-            <p class="for-title-name-p">{{item.subName}}</p>
+            <p class="for-title-name-p">{{item.subName}}{{item.roomNum?'('+item.roomNum+')':''}}</p>
             <p class="for-title-dept-p">学院:{{item.deptName}}</p>
           </div>
           <el-table :data="item.detailList" border class="table-box">
             <el-table-column label="规则名称" align="left" prop="ruleName" />
-            <!--<el-table-column label="截止执行时间" align="left" prop="endDate" width="200">-->
-            <!--<template slot-scope="scope">{{scope.row.endDate?scope.row.endDate:'-'}}</template>-->
-            <!--</el-table-column>-->
             <el-table-column label="执行周期" align="left" prop="cycle" width="230"/>
             <el-table-column label="截止执行时间" align="left" prop="carryTime" width="300">
               <template slot-scope="scope">{{scope.row.endDate?scope.row.endDate:'-'}}</template>
@@ -92,26 +88,23 @@
       </div>
     </div>
     <add-page v-if="pageType == 2" :addData="addData"></add-page>
-    <info-page v-if="pageType == 3" :recordId="recordId"></info-page>
   </div>
 </template>
 
 <script>
 import {
   gradeManageWorkList,
-} from "@/api/hierarchicalControl/indexDemo";
+} from "@/api/hierarchicalControl/index";
 import {
   getDeptDropList,
   laboratoryClassLevelGetList,
   laboratoryClassTypeGetList,
 } from '@/api/commonality/permission'
 import addPage from "./addPage.vue"
-import infoPage from "./infoPage.vue"
 export default {
   name: "GradeManageWork",
   components: {
-    addPage,
-    infoPage
+    addPage
   },
   data() {
     return {
@@ -204,7 +197,7 @@ export default {
     },
     gradeManageWorkList(){
       gradeManageWorkList(this.queryParams).then( response => {
-        this.gradeManageList = response.data
+        this.$set(this,'gradeManageList',response.data);
       });
     },
     pageTypeClick(type,item,row){
@@ -221,34 +214,7 @@ export default {
           this.pageType = 2;
         }
       }
-      // if(this.pageType != type){
-        // if(type == 1){
-        //   this.gradeManageWorkList();
-        //   this.pageType = 1;
-        // }else if(type == 2){
-          // if(row.status==1){
-          //   let obj = {
-          //     subId:item.subId,
-          //     ruleId:row.ruleId,
-          //     ruleUserId:row.ruleUserId,
-          //     isUpload:row.isUpload,
-          //     endDate:row.endDate,
-          //     detail:{
-          //       remark:"",
-          //       imgUrl:"",
-          //     },
-          //     ruleType:row.ruleType
-          //   };
-          //   this.addData = JSON.parse(JSON.stringify(obj));
-          //   this.pageType = 2;
-          // }else if(row.status==2){
-          //   this.recordId = row.recordId;
-          //   this.pageType = 3;
-          // }
-        // }
-      // }
     },
-
   }
 };
 </script>
@@ -284,6 +250,7 @@ export default {
     }
     .gradeManageRecord-page{
       .for-max-big-box{
+        padding:20px;
         .for-max-box{
           .for-title-box{
             display: flex;

+ 0 - 287
src/views/hierarchicalControl/gradeManageWork/infoPage.vue

@@ -1,287 +0,0 @@
-<template>
-  <div class="gradeManageRecord-infoPage scrollbar-box" v-if="infoData">
-    <div class="title-max-box">
-      <p>基本信息</p>
-      <p class="reset-button-one" @click="backPage">返回</p>
-    </div>
-    <div class="top-subject-box">
-      <p :style="'color:'+infoData.fiedColor+';border:1px solid ;'+infoData.fiedColor+';'">{{infoData.levelName}}</p>
-      <p>{{infoData.subName}}</p>
-      <p>{{infoData.typeName}}</p>
-    </div>
-    <div class="top-info-box">
-      <div class="info-text-box">
-        <div>
-          <p>学院:</p>
-          <p>{{infoData.ruleName}}</p>
-        </div>
-      </div>
-      <div class="info-text-box">
-        <div>
-          <p>执行周期:</p>
-          <p>{{infoData.subName}}</p>
-        </div>
-      </div>
-      <div class="info-text-box">
-        <div>
-          <p>执行方式:</p>
-          <p>{{infoData.status==1?'未执行':(infoData.status==2?'已执行':'')}}</p>
-        </div>
-      </div>
-      <div class="info-text-box">
-        <div>
-          <p>执行截止时间:</p>
-          <p :class="infoData.status == 0?'tableTypeColorA':''">{{infoData.nickName}}</p>
-        </div>
-      </div>
-      <!--<div class="info-text-box">-->
-      <!--<div>-->
-      <!--<p>执行人身份:</p>-->
-      <!--<p>{{infoData.userPosition}}</p>-->
-      <!--</div>-->
-      <!--</div>-->
-      <!--<div class="info-text-box">-->
-      <!--<div>-->
-      <!--<p>截止执行时间:</p>-->
-      <!--<p>{{infoData.endTime}}</p>-->
-      <!--</div>-->
-      <!--</div>-->
-    </div>
-    <div class="top-info-box">
-      <div class="info-text-box">
-        <div>
-          <p>规则名称:</p>
-          <p>{{infoData.ruleName}}</p>
-        </div>
-      </div>
-      <div class="info-text-box">
-        <div>
-          <p>规则描述:</p>
-          <p>{{infoData.subName}}</p>
-        </div>
-      </div>
-    </div>
-    <div class="title-max-box">
-      <p>执行信息</p>
-    </div>
-    <!--<div class="bottom-item-box">-->
-    <!--<p>实际执行时间:</p>-->
-    <!--<p>{{infoData.carryTime}}</p>-->
-    <!--</div>-->
-    <!--<div class="bottom-item-box" v-if="infoData.detail">-->
-    <!--<p>执行描述:</p>-->
-    <!--<p>{{infoData.detail.remark}}</p>-->
-    <!--</div>-->
-    <div class="bottom-item-box" v-if="infoData.detail">
-      <p>指定执行人员:</p>
-      <p>{{infoData.detail.remark}}</p>
-    </div>
-    <div class="bottom-for-box" v-if="infoData.detail">
-      <p class="left-name-p">执行材料:</p>
-      <div class="right-max-box" v-if="infoData.detail.imgUrl">
-        <p :class="iframeIndex == index ?'colorA':'colorB'" v-for="(item,index) in infoData.detail.imgUrlList" :key="index" @click="iframeClick(item,index)">{{item.name}}</p>
-        <!--<a :href="item.url" v-for="(item,index) in infoData.detail.imgUrlList" :key="index">{{item.name}}</a>-->
-      </div>
-    </div>
-    <iframe
-      class="iframe-box"
-      :src="iframeSrc" scrolling="auto" frameborder="0">
-    </iframe>
-  </div>
-</template>
-
-<script>
-import {
-  gradeManageWorkInfo
-} from "@/api/hierarchicalControl/indexDemo";
-  export default {
-    name: "infoPage",
-    props:{
-      recordId:{},
-    },
-    data() {
-      return {
-        iframeSrc:"",
-        iframeIndex:0,
-        infoData:null
-      }
-    },
-    created() {
-
-    },
-    mounted(){
-      this.gradeManageWorkInfo();
-    },
-    methods: {
-      //点击切换文件
-      iframeClick(item,index){
-        this.iframeSrc = this.urlJudge(item.url);
-        this.iframeIndex = index;
-      },
-      gradeManageWorkInfo(){
-        gradeManageWorkInfo(this.recordId).then( response => {
-          if(response.data.detail.imgUrl){
-            response.data.detail.imgUrlList = [];
-            let nameList = response.data.detail.imgName.split(',')
-            let urlList = response.data.detail.imgUrl.split(',')
-            for(let i=0;i<urlList.length;i++){
-              if(urlList[i] !='' && urlList[i] != undefined){
-                let obj = {
-                  name:nameList[i],
-                  url:urlList[i],
-                };
-                response.data.detail.imgUrlList.push(obj)
-              }
-            }
-            if(response.data.detail.imgUrlList[0]){
-              this.iframeSrc = this.urlJudge(response.data.detail.imgUrlList[0].url);
-              this.iframeIndex = 0;
-            }
-          }
-          this.infoData = response.data;
-        });
-      },
-      //返回
-      backPage(){
-        this.$parent.pageTypeClick(1);
-      },
-    }
-
-  }
-</script>
-
-<style lang="scss" scoped>
-  .gradeManageRecord-infoPage{
-    flex:1;
-    display: flex!important;
-    flex-direction: column;
-    padding:0 20px!important;
-    margin:5px 20px 20px 10px!important;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1)!important;
-    border-radius:10px;
-    *{
-      margin:0;
-      padding:0;
-    }
-    .title-max-box{
-      display: flex;
-      border-bottom:1px solid #dedede;
-      p:nth-child(1){
-        flex:1;
-        font-size:18px;
-        line-height:80px;
-        color:#0045AF;
-      }
-      p:nth-child(2){
-        margin-top:20px;
-      }
-    }
-    .top-subject-box{
-      display: flex;
-      margin:30px 0 0 50px;
-      p:nth-child(1){
-        line-height:30px;
-        padding:0 16px;
-        border-radius:6px;
-        font-size:14px;
-        font-weight:500;
-        margin-right:18px;
-      }
-      p:nth-child(2){
-        line-height:30px;
-        font-size:16px;
-        color:#333;
-        margin-right:18px;
-      }
-      p:nth-child(3){
-        line-height:30px;
-        font-size:14px;
-        color:#333;
-        font-weight:500;
-      }
-    }
-    .top-info-box{
-      display: flex;
-      .info-text-box{
-        /*display: inline-block;*/
-        flex:1;
-        /*width:280px;*/
-        margin-top:30px;
-        div{
-          display: flex;
-          p{
-            font-size:14px;
-            font-weight: 500;
-          }
-          p:nth-child(1){
-            width:120px;
-            text-align: right;
-            color:#999;
-          }
-          p:nth-child(2){
-            flex:1;
-            color:#333;
-          }
-          .tableTypeColorA{
-            color:#FF6464!important;
-          }
-        }
-      }
-    }
-    .bottom-item-box{
-      display: flex;
-      margin-top:30px;
-      p{
-        font-size:14px;
-        font-weight:500;
-      }
-      p:nth-child(1){
-        width:120px;
-        text-align: right;
-        color: #999;
-      }
-      p:nth-child(2){
-        flex:1;
-        color:#333;
-      }
-    }
-    .bottom-for-box{
-      display: flex;
-      margin-top:30px;
-      .left-name-p{
-        width:120px;
-        text-align: right;
-        line-height:30px;
-        font-weight: 500;
-        font-size:14px;
-        color:#999999;
-      }
-      .right-max-box{
-        flex:1;
-        p{
-          font-weight: 500;
-          display: inline-block;
-          padding: 0 20px;
-          line-height:30px;
-          font-size:14px;
-          cursor: pointer;
-          border-radius:4px;
-          margin:0 20px 20px 0;
-        }
-        .colorA{
-          background: rgba(204,230,254,1);
-          color:#0183FA;
-        }
-        .colorB{
-          background: #e0e0e0;
-          color:#999;
-        }
-      }
-    }
-    .iframe-box{
-      margin:20px 40px;
-      width:1100px;
-      height:800px;
-    }
-  }
-</style>

+ 0 - 78
src/views/hierarchicalControl/gradeManageWork/previewPage.vue

@@ -1,78 +0,0 @@
-<template>
-  <div class="previewPage">
-    <div class="title-box">
-      <p>{{previewData.name}}</p>
-      <p class="reset-button-one" @click="backPage">返回</p>
-    </div>
-    <div class="info-box" v-if="iframeSrc">
-      <iframe
-        class="iframe"
-        :src="iframeSrc" scrolling="auto" frameborder="0">
-      </iframe>
-    </div>
-  </div>
-</template>
-
-<script>
-  export default {
-    name: "previewPage",
-    props:{
-      previewData:{},
-    },
-    data(){
-      return{
-        iframeSrc:"",
-      }
-    },
-    mounted(){
-      this.iframeSrcFunction();
-    },
-    methods: {
-      iframeSrcFunction(){
-        this.iframeSrc = this.urlJudge(this.previewData.url);
-      },
-      // 返回按钮
-      backPage(){
-        this.$parent.pageTypeClickMin(1);
-      },
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .previewPage{
-    flex:1;
-    display: flex!important;
-    flex-direction: column;
-    margin:5px 20px 20px 10px!important;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1)!important;
-    border-radius:10px;
-    *{
-      margin:0;
-    }
-    .title-box{
-      display: flex;
-      border-bottom:1px solid #dedede;
-      p:nth-child(1){
-        flex:1;
-        font-size:18px;
-        line-height:80px;
-        color:#0045AF;
-        padding-left:20px;
-      }
-      p:nth-child(2){
-        margin:20px;
-      }
-    }
-    .info-box{
-      margin:20px;
-      overflow-y: scroll;
-      flex:1;
-      display: flex;
-      flex-direction: column;
-      iframe{
-        flex:1;
-      }
-    }
-  }
-</style>