dedsudiyu 2 gadi atpakaļ
vecāks
revīzija
328e1c0437

+ 2 - 1
src/main.js

@@ -13,7 +13,7 @@ import store from './store'
 import router from './router'
 import directive from './directive' //directive
 import { download } from '@/utils/request'
-import { uploadUrl,judgmentNetworkReturnAddress } from '@/utils/ruoyi'
+import { uploadUrl,judgmentNetworkReturnAddress,versionField } from '@/utils/ruoyi'
 import hasPermiDom from './directive/permission/hasPermiDom'
 
 import './assets/icons' // icon
@@ -59,6 +59,7 @@ Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.uploadUrl = uploadUrl
+Vue.prototype.versionField = versionField
 Vue.prototype.hasPermiDom = hasPermiDom.hasPermiDom
 Vue.prototype.handleTree = handleTree
 Vue.prototype.spaceJudgment = spaceJudgment

+ 7 - 0
src/utils/ruoyi.js

@@ -333,3 +333,10 @@ export function urlJudge(url) {
   console.log('url',url);
   return location + url
 }
+
+/**
+ * 返回版本字符字段
+ */
+export function versionField() {
+  return process.env.VUE_APP_VERSION_DIFFERENCE_FIELD
+}

+ 0 - 1
src/views/comprehensive/laboratoryManagement/accessAuthorization/index.vue

@@ -19,7 +19,6 @@ export default {
   },
   data() {
     return {
-      versionField:process.env.VUE_APP_VERSION_DIFFERENCE_FIELD,
       pageType: 1,
     }
   },

+ 1 - 2
src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -87,7 +87,7 @@
             <div :class="rightButtonType == 2 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(2)">物联控制</div>
             <div :class="rightButtonType == 3 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(3)">视频监控</div>
             <div :class="rightButtonType == 4 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(4)">声光报警</div>
-            <div v-if="versionField != 'suZhouDaXue'"
+            <div v-if="versionField() != 'suZhouDaXue'"
               :class="rightButtonType == 5 ? 'buttonColorA' : 'buttonColorB'" @click="rightButtonClick(5)">智能门禁</div>
           </div>
           <!--传感器-->
@@ -357,7 +357,6 @@ export default {
   },
   data(){
     return{
-      versionField:process.env.VUE_APP_VERSION_DIFFERENCE_FIELD,
       pageType:1,
       // 遮罩层
       loading: true,

+ 1 - 2
src/views/comprehensive/personnel/student/addPage.vue

@@ -236,7 +236,7 @@
       </div>
     </el-form>
     <div class="bottom-button-box" v-if="!editType">
-      <addPageSubPageSZDX v-if="versionField === 'suZhouDaXue'"></addPageSubPageSZDX>
+      <addPageSubPageSZDX v-if="versionField() === 'suZhouDaXue'"></addPageSubPageSZDX>
       <addPageSubPagePublic v-else></addPageSubPagePublic>
       <!--<p class="inquire-button-one" @click="upDataClick">提交</p>-->
     </div>
@@ -273,7 +273,6 @@ export default {
   },
   data() {
     return {
-      versionField:process.env.VUE_APP_VERSION_DIFFERENCE_FIELD,
       uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),

+ 1 - 2
src/views/comprehensive/personnel/teacher/addPage.vue

@@ -391,7 +391,7 @@
       </el-dialog>
     </div>
     <div class="bottom-button-box" v-if="!editType">
-      <addPageSubPageSZDX v-if="versionField === 'suZhouDaXue'"></addPageSubPageSZDX>
+      <addPageSubPageSZDX v-if="versionField() === 'suZhouDaXue'"></addPageSubPageSZDX>
       <addPageSubPagePublic v-else></addPageSubPagePublic>
       <!--<p class="inquire-button-one" @click="upDataButton">提交</p>-->
       <p class="add-button-one-150" v-if="form.status == 0 && form.nature == 0" @click="saveDataButton">另存为权限模板</p>
@@ -425,7 +425,6 @@ export default {
   },
   data() {
     return {
-      versionField:process.env.VUE_APP_VERSION_DIFFERENCE_FIELD,
       uploadImgUrl: this.uploadUrl(), // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),

+ 0 - 1
src/views/comprehensive/system/publicConfig/index.vue

@@ -47,7 +47,6 @@ export default {
   },
   data() {
     return {
-      versionField:process.env.VUE_APP_VERSION_DIFFERENCE_FIELD,
       pageType:1,
     }
   },

+ 1 - 1
src/views/home.vue

@@ -2,7 +2,7 @@
   <div class="home" :class="userType != 22&&initPage == 'true' ? 'home-class' : ''" >
     <home-navbar />
     <div class="max-big-home-box" v-if="userType != 22&&initPage == 'true'">
-      <homeSubPageKYDXNH v-if="versionField === 'kuangYeDaXue_nanHu'"></homeSubPageKYDXNH>
+      <homeSubPageKYDXNH v-if="versionField() === 'kuangYeDaXue_nanHu'"></homeSubPageKYDXNH>
       <homeSubPagePublic v-else></homeSubPagePublic>
     </div>
     <backAnimation v-if="userType != '22'&&initPage == 'true'"></backAnimation>

+ 1 - 2
src/views/mine/index.vue

@@ -130,7 +130,7 @@
                   </div>
                 </div>
               </el-form-item>
-              <fingerprintSubPagePublic  v-if="versionField !== 'suZhouDaXue'" :Quantity="Quantity"></fingerprintSubPagePublic>
+              <fingerprintSubPagePublic  v-if="versionField() !== 'suZhouDaXue'" :Quantity="Quantity"></fingerprintSubPagePublic>
             </div>
           </el-form>
           <p class="type-one-max-box add-button-one-120" @click="upDataProfile">保存</p>
@@ -292,7 +292,6 @@ export default {
       }
     };
     return{
-      versionField:process.env.VUE_APP_VERSION_DIFFERENCE_FIELD,
       buttonType:'1',
       uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/laboratory/studentinfo/commit/face", // 上传的图片服务器地址
       uploadImgUrlTwo: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址

+ 1 - 2
src/views/newEvacuationBigData.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="newEvacuationBigData">
-      <newEvacuationBigDataSubPageKYDXNH v-if="versionField === 'kuangYeDaXue_nanHu'"></newEvacuationBigDataSubPageKYDXNH>
+      <newEvacuationBigDataSubPageKYDXNH v-if="versionField() === 'kuangYeDaXue_nanHu'"></newEvacuationBigDataSubPageKYDXNH>
       <newEvacuationBigDataSubPagePublic v-else></newEvacuationBigDataSubPagePublic>
       <div class="evacuation-out-button-position-box">
         <i class="el-icon-switch-button"></i>
@@ -472,7 +472,6 @@
     },
     data() {
       return {
-        versionField:process.env.VUE_APP_VERSION_DIFFERENCE_FIELD,
         videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         //当前路由状态
         routeType:false,

+ 1 - 2
src/views/newEvacuationBigDataHome.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="newEvacuationBigDataHome" ref="maxBox">
-      <newEvacuationBigDataSubPageKYDXNH v-if="versionField === 'kuangYeDaXue_nanHu'"></newEvacuationBigDataSubPageKYDXNH>
+      <newEvacuationBigDataSubPageKYDXNH v-if="versionField() === 'kuangYeDaXue_nanHu'"></newEvacuationBigDataSubPageKYDXNH>
       <newEvacuationBigDataSubPagePublic v-else></newEvacuationBigDataSubPagePublic>
       <div class="evacuation-out-button-position-box">
         <i class="el-icon-switch-button"></i>
@@ -128,7 +128,6 @@
     },
     data() {
       return {
-        versionField:process.env.VUE_APP_VERSION_DIFFERENCE_FIELD,
         videoCover:window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + localStorage.getItem('videoCover'),
         //当前路由状态
         routeType:false,

+ 5 - 6
src/views/secureAccess/approval/infoPage.vue

@@ -53,10 +53,10 @@
       <div class="btn_list">
         <p v-if="isLook" class="button-p reset-button-one" style="width:100px;" @click="handleExport(2,'')">打包下载</p>
         <p v-if="isLook&&subjectData.labSecurityApply.auditStatus!=2" class="inquire-button-one" style="width:100px;" @click="backPage()">确定</p>
-        <addPageSubPageSZDX v-if="!isLook && versionField === 'suZhouDaXue'" :buttonData="{type:0}"></addPageSubPageSZDX>
-        <addPageSubPagePublic v-if="!isLook && versionField !== 'suZhouDaXue'" :buttonData="{type:0}"></addPageSubPagePublic>
-        <addPageSubPageSZDX v-if="!isLook && versionField === 'suZhouDaXue'" :buttonData="{type:1}"></addPageSubPageSZDX>
-        <addPageSubPagePublic v-if="!isLook && versionField !== 'suZhouDaXue'" :buttonData="{type:1}"></addPageSubPagePublic>
+        <addPageSubPageSZDX v-if="!isLook && versionField() === 'suZhouDaXue'" :buttonData="{type:0}"></addPageSubPageSZDX>
+        <addPageSubPagePublic v-if="!isLook && versionField() !== 'suZhouDaXue'" :buttonData="{type:0}"></addPageSubPagePublic>
+        <addPageSubPageSZDX v-if="!isLook && versionField() === 'suZhouDaXue'" :buttonData="{type:1}"></addPageSubPageSZDX>
+        <addPageSubPagePublic v-if="!isLook && versionField() !== 'suZhouDaXue'" :buttonData="{type:1}"></addPageSubPagePublic>
         <!--<p v-if="!isLook" class="button-p reset-button-one" style="width:100px;" @click="auditClick(1)">驳回</p>-->
         <!--<p v-if="!isLook" class="inquire-button-one" style="width:100px;" @click="auditClick(2)">通过</p>-->
       </div>
@@ -113,7 +113,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <addPageSubPageSZDX v-if="versionField === 'suZhouDaXue'" :buttonData="{type:2}"></addPageSubPageSZDX>
+        <addPageSubPageSZDX v-if="versionField() === 'suZhouDaXue'" :buttonData="{type:2}"></addPageSubPageSZDX>
         <addPageSubPagePublic v-else :buttonData="{type:2}"></addPageSubPagePublic>
         <!--<el-button type="primary" @click="laboratoryApply(1)">确 定</el-button>-->
         <!--<el-button @click="cancel">取 消</el-button>-->
@@ -139,7 +139,6 @@ export default {
   },
   data() {
     return {
-      versionField:process.env.VUE_APP_VERSION_DIFFERENCE_FIELD,
       pageType:false,
       forIndex:0,
       subjectData:{},

+ 1 - 2
src/views/secureAccess/whitelist/addPage.vue

@@ -35,7 +35,7 @@
               </div>
             </div>
           </div>
-          <addPageSubPageSZDX v-if="versionField === 'suZhouDaXue'"></addPageSubPageSZDX>
+          <addPageSubPageSZDX v-if="versionField() === 'suZhouDaXue'"></addPageSubPageSZDX>
           <addPageSubPagePublic v-else></addPageSubPagePublic>
           <!--<p class="inquire-button-one" style="margin:100px 50px;" @click="upButton">提交</p>-->
         </el-form>
@@ -159,7 +159,6 @@ export default {
   },
   data() {
     return {
-      versionField:process.env.VUE_APP_VERSION_DIFFERENCE_FIELD,
       isEdit:false,
       form:{},
       loading:false,