coys

src/views/menu/monitoringCall/components/consultInfo.vue

@@ -136,7 +136,7 @@ export default {
       if(this.endNum||(falg&&falg.length>0)){
         this.$refs.scandialog.visible = true
       }else{
-        Dialog({ message: '该调阅没有记录不能进行结束操作!' })
+        Dialog({ message: '调阅项目登记不能为全空!' })
         return
       }
       

src/views/menu/training/components/addTraining.vue

@@ -343,8 +343,8 @@ export default {
 
       let endDate = JSON.parse(JSON.stringify(this.form.trainingEndDateTime))
       endDate = Date.parse(new Date(endDate))
-      if (startDate > endDate) {
-        Toast('开始时间不能大于结束时间')
+      if (startDate >= endDate) {
+        Toast('开始时间不能大于或等于结束时间')
         this.falg = true
         return
       }

src/views/menu/training/index.vue

@@ -57,7 +57,7 @@
           </van-popup>
         </van-col>
       </van-row>
-      <van-row>
+      <!-- <van-row>
         <van-col span="24"
           ><van-field
             v-model="typeName"
@@ -84,10 +84,8 @@
           </van-popup>
         </van-col>
 
-        <!-- <van-col span="6" class="btnf_box">
-        <van-button type="info" class="btn" @click="clearSearch" size="small">重置</van-button>
-      </van-col> -->
-      </van-row>
+       
+      </van-row> -->
     </div>
 
     <!-- //卡片内容区域 -->
@@ -295,8 +293,8 @@ export default {
       }
       //cascaderValue  当前机构ID
       // 当前用户角色ID
-
-      if (this.cascaderValue == list.orgId) {
+      let orgId=JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
+      if (orgId == list.orgId) {
         falg = true
       }
       console.log(list.orgId);

vue.config.js

@@ -109,8 +109,9 @@ module.exports = defineConfig({
         }
       },
       '/dev': {
+        target: "http://10.87.10.55:8080",
         // target: "http://10.87.10.47:8080",
-        target: "http://47.92.229.224:8080",
+        // target: "http://47.92.229.224:8080",
         // ws:true,
         changOrigin:true,
         pathRewrite:{