zc

src/api/basicsModules/index.js

@@ -170,25 +170,28 @@ export function authInfo(query) {
 }
 
 // 查询危险化学品详情
-export function hazard_book_lookUp(id) {
+export function chemicalMsdsDetailNotToken(query) {
   return request({
-    url: '/laboratory/hazard_book/lookUp/'+id,
-    method: 'get'
+    url: '/chemical/msds/detailNotToken',
+    method: 'get',
+    params: query
   })
 }
 
 // 查询安全管理制度
-export function safe_book(id) {
+export function examSafeBookDetailNotToken(query) {
   return request({
-    url: '/laboratory/safe_book/lookUp/'+id,
-    method: 'get'
+    url: '/exam/safeBook/detailNotToken',
+    method: 'get',
+    params: query
   })
 }
 
 // 查询危险源
-export function hazardLookUp(id) {
+export function laboratoryHazardDetailNotToken(query) {
   return request({
-    url: '/laboratory/hazard/lookUp/'+id,
-    method: 'get'
+    url: '/laboratory/hazard/detailNotToken',
+    method: 'get',
+    params: query
   })
 }

src/views/basicsModules/codeHtml.vue

@@ -14,224 +14,88 @@
       </pdf>
     </div>
     <div class="w-e-text" v-html="text" v-if="type==3"></div>
+    <p class="null-p" v-if="type == 4">数据异常,请联系管理员</p>
   </div>
 </template>
 
 <script>
-  import { hazard_book_lookUp,safe_book,hazardLookUp } from "@/api/basicsModules/index";
+  import { chemicalMsdsDetailNotToken, examSafeBookDetailNotToken, laboratoryHazardDetailNotToken } from '@/api/basicsModules/index'
   import pdf from 'vue-pdf'
+
   export default {
-    components:{
+    components: {
       pdf
     },
-    name: "codeHtml",
+    name: 'codeHtml',
     data() {
       return {
         //状态数据相关
-        code:"",
-        type:"",
+        code: '',
+        type: '',
         //富文本相关
-        text:"",
+        text: '',
         //pdf相关
         numPages: null, // pdf 总页数
-        form:{},
+        form: {},
         src: '', // pdf文件地址
         // 加载样式
-        loading:false,
-      };
+        loading: true
+      }
     },
     created() {
 
     },
-    mounted(){
-      this.code = this.$route.query.code;
-      this.type = this.$route.query.type;
-      if(this.$route.query.code&&this.$route.query.type){
-        this.loading = true;
-        if(this.$route.query.type==1){
+    mounted() {
+      this.$set(this, 'code', this.$route.query.code)
+      this.$set(this, 'type', this.$route.query.type)
+      this.$nextTick(() => {
+        if (this.type == 1) {
           //查询MSDS说明书详情
-          this.hazard_book_lookUp(this.$route.query.code);
-        }else if(this.$route.query.type==2){
+          this.chemicalMsdsDetailNotToken(this.$route.query.code)
+        } else if (this.type == 2) {
           //查询安全管理制度
-          this.safe_book(this.$route.query.code);
-        }else if(this.$route.query.type==3){
+          this.examSafeBookDetailNotToken(this.$route.query.code)
+        } else if (this.type == 3) {
           //查询危险源
-          this.hazardLookUp(this.$route.query.code);
+          this.laboratoryHazardDetailNotToken(this.$route.query.code)
+        } else {
+          this.type = 4
+          this.loading = false
         }
-      }
+      })
     },
     methods: {
       //加载接口
-      hazard_book_lookUp(id){
-        hazard_book_lookUp(id).then( data => {
-          this.text = unescape(data.data.content);
-          this.loading = false;
-        });
+      chemicalMsdsDetailNotToken(code) {
+        chemicalMsdsDetailNotToken({id:code}).then(data => {
+          this.text = unescape(data.data.content)
+          this.loading = false
+        })
       },
-      safe_book(id){
-        safe_book(id).then( data => {
-          this.form.content = window.location.href.split('://')[0]+'://'  + this.judgmentNetworkReturnAddress() + '/' + unescape(data.data.content);
-          this.getNumPages();
-        });
+      examSafeBookDetailNotToken(code) {
+        examSafeBookDetailNotToken({id:code}).then(data => {
+          this.form.content = unescape(data.data.realContent)
+          // this.form.content = 'http://192.168.1.8/api'+unescape(data.data.content)
+          this.getNumPages()
+        })
       },
-      hazardLookUp(id){
-        hazardLookUp(id).then( data => {
-          this.text = unescape(data.data.content);
-          // let list = this.text.split('font-size:');
-          // let newText = "";
-          // for (let i=0;i<list.length;i++){
-          //   if(
-          //     (list[i][0] == '0' || list[i][0] == '1' || list[i][0] == '2' || list[i][0] == '3' || list[i][0] == '4' || list[i][0] == '5' || list[i][0] == '6' || list[i][0] == '7' || list[i][0] == '8' || list[i][0] == '9')&&
-          //     (list[i][1] == 'p')&&
-          //     (list[i][2] == 'x')
-          //   ){
-          //     let num = this.accMul(parseInt(list[i][0]),6);
-          //     num = num>140?140:num;
-          //     let textNew = list[i].slice(1)
-          //     newText = newText + 'font-size:'+num+textNew;
-          //   }else if(
-          //     (list[i][0] == ' ')&&
-          //     (list[i][1] == '0' || list[i][1] == '1' || list[i][1] == '2' || list[i][1] == '3' || list[i][1] == '4' || list[i][1] == '5' || list[i][1] == '6' || list[i][1] == '7' || list[i][1] == '8' || list[i][1] == '9')&&
-          //     (list[i][2] == 'p')&&
-          //     (list[i][3] == 'x')
-          //   ){
-          //     let num = this.accMul(parseInt(list[i][1]),6);
-          //     num = num>140?140:num;
-          //     let textNew = list[i].slice(2)
-          //     newText = newText + 'font-size:'+num+textNew;
-          //   }else if(
-          //     (list[i][0] == '0' || list[i][0] == '1' || list[i][0] == '2' || list[i][0] == '3' || list[i][0] == '4' || list[i][0] == '5' || list[i][0] == '6' || list[i][0] == '7' || list[i][0] == '8' || list[i][0] == '9')&&
-          //     (list[i][1] == '0' || list[i][1] == '1' || list[i][1] == '2' || list[i][1] == '3' || list[i][1] == '4' || list[i][1] == '5' || list[i][1] == '6' || list[i][1] == '7' || list[i][1] == '8' || list[i][1] == '9')&&
-          //     (list[i][2] == 'p')&&
-          //     (list[i][3] == 'x')
-          //   ){
-          //     let num = this.accMul(parseInt(list[i][0]+list[i][1]),6);
-          //     num = num>140?140:num;
-          //     let textNew = list[i].slice(2)
-          //     newText = newText + 'font-size:'+num+textNew;
-          //   }else if(
-          //     (list[i][0] == ' ')&&
-          //     (list[i][1] == '0' || list[i][1] == '1' || list[i][1] == '2' || list[i][1] == '3' || list[i][1] == '4' || list[i][1] == '5' || list[i][1] == '6' || list[i][1] == '7' || list[i][1] == '8' || list[i][1] == '9')&&
-          //     (list[i][2] == '0' || list[i][2] == '1' || list[i][2] == '2' || list[i][2] == '3' || list[i][2] == '4' || list[i][2] == '5' || list[i][2] == '6' || list[i][2] == '7' || list[i][2] == '8' || list[i][2] == '9')&&
-          //     (list[i][3] == 'p')&&
-          //     (list[i][4] == 'x')
-          //   ){
-          //     let num = this.accMul(parseInt(list[i][1]+list[i][2]),6);
-          //     num = num>140?140:num;
-          //     let textNew = list[i].slice(3)
-          //     newText = newText + 'font-size:'+num+textNew;
-          //   }else if(
-          //     (list[i][0] == '0' || list[i][0] == '1' || list[i][0] == '2' || list[i][0] == '3' || list[i][0] == '4' || list[i][0] == '5' || list[i][0] == '6' || list[i][0] == '7' || list[i][0] == '8' || list[i][0] == '9')&&
-          //     (list[i][1] == '0' || list[i][1] == '1' || list[i][1] == '2' || list[i][1] == '3' || list[i][1] == '4' || list[i][1] == '5' || list[i][1] == '6' || list[i][1] == '7' || list[i][1] == '8' || list[i][1] == '9')&&
-          //     (list[i][2] == '0' || list[i][2] == '1' || list[i][2] == '2' || list[i][2] == '3' || list[i][2] == '4' || list[i][2] == '5' || list[i][2] == '6' || list[i][2] == '7' || list[i][2] == '8' || list[i][2] == '9')&&
-          //     (list[i][3] == 'p')&&
-          //     (list[i][4] == 'x')
-          //   ){
-          //     let num = this.accMul(parseInt(list[i][0]+list[i][1]+list[i][2]),6);
-          //     num = num>140?140:num;
-          //     let textNew = list[i].slice(3)
-          //     newText = newText + 'font-size:'+num+textNew;
-          //   }else if(
-          //     (list[i][0] == ' ')&&
-          //     (list[i][1] == '0' || list[i][1] == '1' || list[i][1] == '2' || list[i][1] == '3' || list[i][1] == '4' || list[i][1] == '5' || list[i][1] == '6' || list[i][1] == '7' || list[i][1] == '8' || list[i][1] == '9')&&
-          //     (list[i][2] == '0' || list[i][2] == '1' || list[i][2] == '2' || list[i][2] == '3' || list[i][2] == '4' || list[i][2] == '5' || list[i][2] == '6' || list[i][2] == '7' || list[i][2] == '8' || list[i][2] == '9')&&
-          //     (list[i][3] == '0' || list[i][3] == '1' || list[i][3] == '2' || list[i][3] == '3' || list[i][3] == '4' || list[i][3] == '5' || list[i][3] == '6' || list[i][3] == '7' || list[i][3] == '8' || list[i][3] == '9')&&
-          //     (list[i][4] == 'p')&&
-          //     (list[i][5] == 'x')
-          //   ){
-          //     let num = this.accMul(parseInt(list[i][1]+list[i][2]+list[i][3]),6);
-          //     num = num>140?140:num;
-          //     let textNew = list[i].slice(4)
-          //     newText = newText + 'font-size:'+num+textNew;
-          //   }else{
-          //     newText = newText + list[i]
-          //   }
-          // }
-          // list = newText.split('line-height:');
-          // newText = "";
-          // for (let i=0;i<list.length;i++){
-          //   if(
-          //     (list[i][0] == '0' || list[i][0] == '1' || list[i][0] == '2' || list[i][0] == '3' || list[i][0] == '4' || list[i][0] == '5' || list[i][0] == '6' || list[i][0] == '7' || list[i][0] == '8' || list[i][0] == '9')&&
-          //     (list[i][1] == 'p')&&
-          //     (list[i][2] == 'x')
-          //   ){
-          //     let num = this.accMul(parseInt(list[i][0]),6);
-          //     num = num>140?140:num;
-          //     let textNew = list[i].slice(1)
-          //     newText = newText + 'line-height:'+num+textNew;
-          //   }else if(
-          //     (list[i][0] == ' ')&&
-          //     (list[i][1] == '0' || list[i][1] == '1' || list[i][1] == '2' || list[i][1] == '3' || list[i][1] == '4' || list[i][1] == '5' || list[i][1] == '6' || list[i][1] == '7' || list[i][1] == '8' || list[i][1] == '9')&&
-          //     (list[i][2] == 'p')&&
-          //     (list[i][3] == 'x')
-          //   ){
-          //     let num = this.accMul(parseInt(list[i][1]),6);
-          //     num = num>140?140:num;
-          //     let textNew = list[i].slice(2)
-          //     newText = newText + 'line-height:'+num+textNew;
-          //   }else if(
-          //     (list[i][0] == '0' || list[i][0] == '1' || list[i][0] == '2' || list[i][0] == '3' || list[i][0] == '4' || list[i][0] == '5' || list[i][0] == '6' || list[i][0] == '7' || list[i][0] == '8' || list[i][0] == '9')&&
-          //     (list[i][1] == '0' || list[i][1] == '1' || list[i][1] == '2' || list[i][1] == '3' || list[i][1] == '4' || list[i][1] == '5' || list[i][1] == '6' || list[i][1] == '7' || list[i][1] == '8' || list[i][1] == '9')&&
-          //     (list[i][2] == 'p')&&
-          //     (list[i][3] == 'x')
-          //   ){
-          //     let num = this.accMul(parseInt(list[i][0]+list[i][1]),6);
-          //     num = num>140?140:num;
-          //     let textNew = list[i].slice(2)
-          //     newText = newText + 'line-height:'+num+textNew;
-          //   }else if(
-          //     (list[i][0] == ' ')&&
-          //     (list[i][1] == '0' || list[i][1] == '1' || list[i][1] == '2' || list[i][1] == '3' || list[i][1] == '4' || list[i][1] == '5' || list[i][1] == '6' || list[i][1] == '7' || list[i][1] == '8' || list[i][1] == '9')&&
-          //     (list[i][2] == '0' || list[i][2] == '1' || list[i][2] == '2' || list[i][2] == '3' || list[i][2] == '4' || list[i][2] == '5' || list[i][2] == '6' || list[i][2] == '7' || list[i][2] == '8' || list[i][2] == '9')&&
-          //     (list[i][3] == 'p')&&
-          //     (list[i][4] == 'x')
-          //   ){
-          //     let num = this.accMul(parseInt(list[i][1]+list[i][2]),6);
-          //     num = num>140?140:num;
-          //     let textNew = list[i].slice(3)
-          //     newText = newText + 'line-height:'+num+textNew;
-          //   }else if(
-          //     (list[i][0] == '0' || list[i][0] == '1' || list[i][0] == '2' || list[i][0] == '3' || list[i][0] == '4' || list[i][0] == '5' || list[i][0] == '6' || list[i][0] == '7' || list[i][0] == '8' || list[i][0] == '9')&&
-          //     (list[i][1] == '0' || list[i][1] == '1' || list[i][1] == '2' || list[i][1] == '3' || list[i][1] == '4' || list[i][1] == '5' || list[i][1] == '6' || list[i][1] == '7' || list[i][1] == '8' || list[i][1] == '9')&&
-          //     (list[i][2] == '0' || list[i][2] == '1' || list[i][2] == '2' || list[i][2] == '3' || list[i][2] == '4' || list[i][2] == '5' || list[i][2] == '6' || list[i][2] == '7' || list[i][2] == '8' || list[i][2] == '9')&&
-          //     (list[i][3] == 'p')&&
-          //     (list[i][4] == 'x')
-          //   ){
-          //     let num = this.accMul(parseInt(list[i][0]+list[i][1]+list[i][2]),6);
-          //     num = num>140?140:num;
-          //     let textNew = list[i].slice(3)
-          //     newText = newText + 'line-height:'+num+textNew;
-          //   }else if(
-          //     (list[i][0] == ' ')&&
-          //     (list[i][1] == '0' || list[i][1] == '1' || list[i][1] == '2' || list[i][1] == '3' || list[i][1] == '4' || list[i][1] == '5' || list[i][1] == '6' || list[i][1] == '7' || list[i][1] == '8' || list[i][1] == '9')&&
-          //     (list[i][2] == '0' || list[i][2] == '1' || list[i][2] == '2' || list[i][2] == '3' || list[i][2] == '4' || list[i][2] == '5' || list[i][2] == '6' || list[i][2] == '7' || list[i][2] == '8' || list[i][2] == '9')&&
-          //     (list[i][3] == '0' || list[i][3] == '1' || list[i][3] == '2' || list[i][3] == '3' || list[i][3] == '4' || list[i][3] == '5' || list[i][3] == '6' || list[i][3] == '7' || list[i][3] == '8' || list[i][3] == '9')&&
-          //     (list[i][4] == 'p')&&
-          //     (list[i][5] == 'x')
-          //   ){
-          //     let num = this.accMul(parseInt(list[i][1]+list[i][2]+list[i][3]),6);
-          //     num = num>140?140:num;
-          //     let textNew = list[i].slice(4)
-          //     newText = newText + 'line-height:'+num+textNew;
-          //   }else{
-          //     newText = newText + list[i]
-          //   }
-          // }
-          // this.$set(this,'text',newText);
-          this.loading = false;
-        });
+      laboratoryHazardDetailNotToken(code) {
+        laboratoryHazardDetailNotToken({hazardId:code}).then(data => {
+          this.text = unescape(data.data.content)
+          this.loading = false
+        })
       },
       getNumPages() {
         let loadingTask = pdf.createLoadingTask(this.form.content)
         loadingTask.promise.then(pdf => {
-          this.numPages = pdf.numPages;
-          this.loading = false;
+          this.numPages = pdf.numPages
+          this.loading = false
         }).catch(err => {
-          console.error('pdf 加载失败', err);
+          console.error('pdf 加载失败', err)
         })
       },
       //pdf方法
-      changePdfPage (val) {
+      changePdfPage(val) {
         // console.log(val)
         if (val === 0 && this.currentPage > 1) {
           this.currentPage--
@@ -243,29 +107,35 @@
         }
       },
       // pdf加载时
-      loadPdfHandler (e) {
+      loadPdfHandler(e) {
         this.currentPage = 1 // 加载的时候先加载第一页
       },
-      accMul(arg1,arg2){
-        var m=0,s1=arg1.toString(),s2=arg2.toString();
-        try{m+=s1.split(".")[1].length}catch(e){}
-        try{m+=s2.split(".")[1].length}catch(e){}
-        return Number(s1.replace(".",""))*Number(s2.replace(".",""))/Math.pow(10,m)
-      },
+      accMul(arg1, arg2) {
+        var m = 0, s1 = arg1.toString(), s2 = arg2.toString()
+        try {
+          m += s1.split('.')[1].length
+        } catch (e) {
+        }
+        try {
+          m += s2.split('.')[1].length
+        } catch (e) {
+        }
+        return Number(s1.replace('.', '')) * Number(s2.replace('.', '')) / Math.pow(10, m)
+      }
     }
-  };
+  }
 </script>
 <style lang="scss">
-  #codeHtml{
-    video{
-      width:100%!important;
+  #codeHtml {
+    video {
+      width: 100% !important;
       /*object-fit: fill;*/
-      height:100%!important;
+      height: 100% !important;
       /*display: block;*/
     }
-    img{
-      width:100%!important;
-      height:100%!important;
+    img {
+      width: 100% !important;
+      height: 100% !important;
       /*width:1500px;*/
       /*margin:20px 200px;*/
     }
@@ -273,46 +143,51 @@
 </style>
 <style scoped lang="scss">
   #codeHtml {
-    height:100%;
-    overflow:hidden;
+    height: 100%;
+    overflow: hidden;
     display: flex;
     flex-direction: column;
-    font-size:16px;
-    *{
-      margin:0;
-      padding:0;
+    font-size: 16px;
+    * {
+      margin: 0;
+      padding: 0;
     }
-    .pdf-max-box{
-      flex:1;
+    .pdf-max-box {
+      flex: 1;
       overflow-y: scroll;
     }
-    .top-button-box{
-      width:100%;
+    .top-button-box {
+      width: 100%;
       display: flex;
-      .null-p{
-        flex:1;
+      .null-p {
+        flex: 1;
       }
     }
-    .w-e-text{
-      flex:1;
+    .w-e-text {
+      flex: 1;
       overflow-x: scroll;
       overflow-y: scroll;
-      padding:8px;
-      font-size:16px;
+      padding: 8px;
+      font-size: 16px;
     }
-    .w-e-text.table::-webkit-scrollbar{
-      width: 4px;     /*高宽分别对应横竖滚动条的尺寸*/
+    .w-e-text.table::-webkit-scrollbar {
+      width: 4px; /*高宽分别对应横竖滚动条的尺寸*/
       height: 4px;
     }
-    .w-e-text.table::-webkit-scrollbar-thumb{
+    .w-e-text.table::-webkit-scrollbar-thumb {
       border-radius: 5px;
       -webkit-box-shadow: inset 0 0 5px #999;
       background: #fff;
     }
-    .w-e-text.table::-webkit-scrollbar-track{
-      -webkit-box-shadow: inset 0 0 5px rgba(255,255,255,0);
+    .w-e-text.table::-webkit-scrollbar-track {
+      -webkit-box-shadow: inset 0 0 5px rgba(255, 255, 255, 0);
       border-radius: 0;
-      background: rgba(255,255,255,0);
+      background: rgba(255, 255, 255, 0);
+    }
+    .null-p {
+      text-align: center;
+      line-height: 80px;
+      color: #666;
     }
   }
 </style>

src/views/basicsModules/login.vue

@@ -296,6 +296,7 @@ export default {
           localStorage.setItem('codeOnlineAdd',obj.codeOnlineAdd)
           //文件浏览环境
           localStorage.setItem('fileBrowseEnvironment',Decrypt(obj.fileBrowseEnvironmentExtranet))
+          localStorage.setItem('fileBrowseEnvironmentExtranet',Decrypt(obj.fileBrowseEnvironmentExtranet))
         }else{
           //文件预览地址
           localStorage.setItem('filePreviewUrl',urlText+obj.fileIntranetUrl)
@@ -317,6 +318,7 @@ export default {
           localStorage.setItem('codeOnlineAdd',obj.codeOnlineAdd)
           //文件浏览环境
           localStorage.setItem('fileBrowseEnvironment',Decrypt(obj.fileBrowseEnvironment))
+          localStorage.setItem('fileBrowseEnvironmentExtranet',Decrypt(obj.fileBrowseEnvironmentExtranet))
         }
       });
     },

src/views/safetyEducationExam/safeLearning/safe_book/index.vue

@@ -126,10 +126,10 @@
                v-if="!form.content" class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
         </el-form-item>
-        <div v-if="form.content" class="pdf-max-box">
+        <div v-if="pdfContent" class="pdf-max-box">
           <pdf
             ref="pdf"
-            :src="form.content"
+            :src="pdfContent"
             v-for="i in numPages"
             :key="i"
             :page="i"
@@ -209,6 +209,8 @@ export default {
       },
       // 表单参数
       form: {},
+      //上传完展示用地址
+      pdfContent:"",
       // 表单校验
       rules: {
         name:[
@@ -259,8 +261,9 @@ export default {
     },
     //上传
     handleAvatarSuccess(res, file) {
-      this.form.content = window.location.href.split('://')[0]+'://' +this.judgmentNetworkReturnAddress() + '/' + res.data.url;
-      this.form.realcontent =res.data.url;
+      this.pdfContent = window.location.href.split('://')[0]+'://'+localStorage.getItem('fileBrowseEnvironment')+res.data.url;
+      this.form.content = res.data.url;
+      this.form.realContent = window.location.href.split('://')[0]+'://'+localStorage.getItem('fileBrowseEnvironmentExtranet')+res.data.url;
       this.getNumPages();
       this.$forceUpdate()
     },
@@ -310,7 +313,7 @@ export default {
         name: null,
         code: null,
         content: null,
-        realcontent: null,
+        realContent: null,
         qrCodeUrl: null,
         scanCount: null,
         userId: null,
@@ -322,6 +325,7 @@ export default {
         updateTime: null,
         remark: null
       };
+      this.pdfContent = "";
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -353,12 +357,11 @@ export default {
       const id = row.id || this.ids
       examSafeBook(id).then( response => {
         this.form =  response.data;
-        this.form.content = window.location.href.split('://')[0]+'://' + response.data.content.split('://')[1];
+        this.pdfContent = window.location.href.split('://')[0]+'://'+localStorage.getItem('fileBrowseEnvironment')+response.data.content;
         this.getNumPages();
         this.open = true;
         this.title = "修改实验室安全制度";
       });
-
     },
     getNumPages() {
       let loadingTask = pdf.createLoadingTask(this.form.content)
@@ -371,9 +374,6 @@ export default {
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
-        if(this.form.realcontent){
-          this.form.content=this.form.realcontent;
-        }
         if (valid) {
           // this.form.content = escape(this.form.content);
           if (this.form.id != null) {