dedsudiyu пре 2 година
родитељ
комит
f7d915bc38

+ 1 - 1
src/router/index.js

@@ -67,7 +67,7 @@ export const constantRoutes = [
   },
   {
     path: '/mine',
-    component: (resolve) => require(['@/views/mine/index'], resolve),
+    component: (resolve) => require(['@/views/mine/index_SuZhouDX'], resolve),
     hidden: true
   },
   {

src/views/comprehensive/laboratoryManagement/subject/deviceList.vue → src/views/comprehensive/laboratoryManagement/subject/deviceList_SuZhouDX.vue


Разлика између датотеке није приказан због своје велике величине
+ 0 - 1403
src/views/comprehensive/laboratoryManagement/subject/indexOne.vue


Разлика између датотеке није приказан због своје велике величине
+ 0 - 1377
src/views/comprehensive/laboratoryManagement/subject/indexTwo.vue


+ 6 - 6
src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -100,7 +100,7 @@
                 <div class="sensor-for-big-box"
                      :class="item.type == 1 ? 'sensor-color-a' : (item.type == 2 ? 'sensor-color-b' : 'sensor-color-c')"
                      v-if="item.funNum != 'huoyan'"
-                     v-for="(item,index) in checkedSubject.sensorFunctionStatusList" :key="index">
+                     v-for="(item,index) in checkedSubject.sensorFunctionStatusList" :key="index_SuZhouDX">
                   <div class="sensor-for-min-box">
                     <img src="@/assets/ZDimages/subject/icon_bj_wd.png" v-if="item.funNum == 'wendu'">
                     <img src="@/assets/ZDimages/subject/icon_bj_sd.png" v-if="item.funNum == 'shidu'">
@@ -135,7 +135,7 @@
             <div class="bottom-switch-box" v-if="rightButtonType == 2">
               <p class="top-title">当前位置:{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</p>
               <div class="switch-for-max-box" v-show="checkedSubject.labHardwareVOList" v-hasPermi="['laboratory:subcontrol:set']">
-                <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.labHardwareVOList" :key="index" v-if="item.isPcfire != 1">
+                <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.labHardwareVOList" :key="index_SuZhouDX" v-if="item.isPcfire != 1">
                   <div class="switch-for-min-box" v-if="item.hardwareTypeEnum.enumName == 'SWITCH'">
                     <p class="switch-for-min-title">{{item.hardwareName?item.hardwareName:item.hardwareTypeEnum.hardwareTypeName}}</p>
                     <el-switch
@@ -179,10 +179,10 @@
             <div class="bottom-video-box" v-if="rightButtonType == 3">
               <p class="top-title">当前位置:{{checkedSubject.subAddrr.buildName}}{{checkedSubject.subAddrr.floorName}}</p>
               <div class="video-for-max-box" v-if="checkedSubject.videoData[0]">
-                <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.videoData" :key="index">
+                <div class="switch-for-big-box" v-for="(item,index) in checkedSubject.videoData" :key="index_SuZhouDX">
                   <video :id="item.divId" ref="videoRef" autoplay controls :poster="videoCover"
                          muted width="490px" height="262px"></video>
-                  <p class="el-icon-full-screen position-p" @click="videoFullScreen(index)"></p>
+                  <p class="el-icon-full-screen position-p" @click="videoFullScreen(index_SuZhouDX)"></p>
                 </div>
               </div>
               <img class="null-data-img" src="@/assets/ZDimages/null-data.png" v-if="!checkedSubject.videoData[0]">
@@ -275,7 +275,7 @@ import {
 } from '@/api/laboratory/subject'
 import { filterDept } from "@/api/medicUniversity-3_1/index";
 import addSubject from "./addSubject.vue";
-import deviceList from "./deviceList.vue";
+import deviceList from "./deviceList_SuZhouDX.vue";
 import admissionConfiguration from "./admissionConfiguration.vue";
 import associationConfiguration from "./associationConfiguration.vue";
 import infoPage from "./infoPage.vue";
@@ -1021,7 +1021,7 @@ export default {
     },
     //视屏全屏方法
     videoFullScreen(index){
-      this.$refs.videoRef[index].webkitRequestFullScreen();
+      this.$refs.videoRef[index_SuZhouDX].webkitRequestFullScreen();
     },
     //断开视频流
     videoOff(){

src/views/comprehensive/personnel/student/addPage.vue → src/views/comprehensive/personnel/student/addPage_SuZhouDX.vue


+ 1 - 1
src/views/comprehensive/personnel/student/index.vue

@@ -213,7 +213,7 @@ import { getToken } from "@/utils/auth";
 import { treeselect } from "@/api/system/dept";
 import {listMajorAll} from "@/api/system/major";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import addPage from "./addPage.vue"
+import addPage from "./addPage_SuZhouDX.vue"
 
 export default {
   name: "User",

src/views/comprehensive/personnel/teacher/addPage.vue → src/views/comprehensive/personnel/teacher/addPage_SuZhouDX.vue


+ 12 - 12
src/views/comprehensive/personnel/teacher/index.vue

@@ -324,24 +324,24 @@
         <el-form-item label="上级部门" prop="id" label-width="90px">
           <treeselect v-model="treeAddForm.id" :options="deptOptions" :show-count="true" @select="deptAddSelect" placeholder="请选择上级部门" />
         </el-form-item>
-        <div style="display:flex;" v-for="(item,index) in treeAddForm.teaCherDpetList" :key="index">
-          <el-form-item label="部门编号" :prop="'teaCherDpetList.' + index + '.deptNum'" :rules="rules.deptNum" label-width="90px">
+        <div style="display:flex;" v-for="(item,index) in treeAddForm.teaCherDpetList" :key="index_SuZhouDX">
+          <el-form-item label="部门编号" :prop="'teaCherDpetList.' + index_SuZhouDX + '.deptNum'" :rules="rules.deptNum" label-width="90px">
             <el-input v-model="item.deptNum" maxlength="10" placeholder="请输入部门编号"/>
           </el-form-item>
-          <el-form-item label="部门名称" :prop="'teaCherDpetList.' + index + '.deptName'" :rules="rules.deptName" label-width="90px">
+          <el-form-item label="部门名称" :prop="'teaCherDpetList.' + index_SuZhouDX + '.deptName'" :rules="rules.deptName" label-width="90px">
             <el-input v-model="item.deptName" maxlength="10" placeholder="请输入部门名称"/>
           </el-form-item>
-          <div style="display: flex;width:100px;" v-if="index != treeAddForm.teaCherDpetList.length-1">
-            <p class="el-icon-delete" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#FF6666;" @click="delDeptItem(index)"></p>
+          <div style="display: flex;width:100px;" v-if="index_SuZhouDX != treeAddForm.teaCherDpetList.length-1">
+            <p class="el-icon-delete" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#FF6666;" @click="delDeptItem(index_SuZhouDX)"></p>
           </div>
-          <div style="display: flex;width:100px;" v-if="index == treeAddForm.teaCherDpetList.length-1 && index < 4 && index != 0">
+          <div style="display: flex;width:100px;" v-if="index_SuZhouDX == treeAddForm.teaCherDpetList.length-1 && index_SuZhouDX < 4 && index_SuZhouDX != 0">
             <p class="el-icon-circle-plus-outline" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#0183FA;" @click="addDeptItem"></p>
-            <p class="el-icon-delete" style="margin:10px 0;font-size:20px;width:20px;cursor: pointer;color:#FF6666;" @click="delDeptItem(index)"></p>
+            <p class="el-icon-delete" style="margin:10px 0;font-size:20px;width:20px;cursor: pointer;color:#FF6666;" @click="delDeptItem(index_SuZhouDX)"></p>
           </div>
-          <div style="display: flex;width:100px;" v-if="index == treeAddForm.teaCherDpetList.length-1 && index == 4">
-            <p class="el-icon-delete" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#FF6666;" @click="delDeptItem(index)"></p>
+          <div style="display: flex;width:100px;" v-if="index_SuZhouDX == treeAddForm.teaCherDpetList.length-1 && index_SuZhouDX == 4">
+            <p class="el-icon-delete" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#FF6666;" @click="delDeptItem(index_SuZhouDX)"></p>
           </div>
-          <div style="display: flex;width:100px;" v-if="index == treeAddForm.teaCherDpetList.length-1 && index < 4 && index == 0">
+          <div style="display: flex;width:100px;" v-if="index_SuZhouDX == treeAddForm.teaCherDpetList.length-1 && index_SuZhouDX < 4 && index_SuZhouDX == 0">
             <p class="el-icon-circle-plus-outline" style="margin:10px 20px;font-size:20px;width:20px;cursor: pointer;color:#0183FA;" @click="addDeptItem"></p>
           </div>
         </div>
@@ -369,7 +369,7 @@
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import { Message } from 'element-ui'
   import userList from "./userList.vue"
-  import addPage from "./addPage.vue"
+  import addPage from "./addPage_SuZhouDX.vue"
 
   export default {
     name: "User",
@@ -644,7 +644,7 @@
       },
       //删除子部门
       delDeptItem(index){
-        this.treeAddForm.teaCherDpetList.splice(index,1)
+        this.treeAddForm.teaCherDpetList.splice(index_SuZhouDX,1)
       },
       //新增部门提交
       addDeptButton(){

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/SmartAccessControl/index.vue → src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/SmartAccessControl/index_SuZhouDX.vue


src/views/mine/index.vue → src/views/mine/index_SuZhouDX.vue


src/views/secureAccess/approval/index.vue → src/views/secureAccess/approval/index_SuZhouDX.vue


src/views/secureAccess/whitelist/index.vue → src/views/secureAccess/whitelist/index_SuZhouDX.vue


src/views/securityCheck/release/index.vue → src/views/securityCheck/release/index_SuZhouDX.vue