Merge branch 'main' of http://175.6.124.250:3100/luozhun/policeSecurity

securityManagement/src/views/login.vue

@@ -2,13 +2,13 @@
   <div class="root">
     <div class="header">
       <img src="@/assets/vue.svg" alt="Logo" height="33" width="33"/>
-      <div class="logo-text">超级后台</div>
+      <div class="logo-text">保安后台</div>
     </div>
     <div class="container">
       <div class="left-banner"></div>
       <div class="login-card">
         <div class="title">
-          欢迎来到超级后台
+          欢迎来到保安后台
         </div>
         <a-tabs class="account-tab" v-model:active-key="activeKey">
           <a-tab-pane :key="0" tab="账号登录">

securityManagement/src/views/serviceManagement/index.vue

@@ -83,7 +83,7 @@ const formParams = ref<{
   type:string,
   twoType?: number,
   outsourceName?:string,
-  isFiling?:number,
+  isFiling:number,
   idNumber?: string,
   serviceArea?:number,
   buildingTotal?:number,
@@ -94,7 +94,8 @@ const formParams = ref<{
 }>({
   name:'',
   enterprisesUnitId:null,
-  type:'security'
+  type:'security',
+  isFiling:0
 })
 
 const columns: TableProps['columns'] = [
@@ -315,6 +316,7 @@ const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdatePara
     type: 'radioGroup',
     label: '二级类型',
     options:netType,
+    required: true,
     componentsProps:{
        onChange:(e)=>{
          if(e.target.value !== "outsource"){
@@ -334,6 +336,7 @@ const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdatePara
   isFiling:{
     type: 'radioGroup',
     label: '是否备案',
+    required: true,
     options:dictSelectNodes('IsOrNot'),
   },
   idNumber: {
@@ -399,6 +402,7 @@ const formItemOptions = ref<FormProMaxItemOptions<serviceProjectSaveOrUpdatePara
 
 const UnitId = ref('')
 const submit = async()=>{
+  console.log(13123)
   await formRef.value.validate()
   const snowFlakeId = ref('')
   if (serviceTitle.value === '新增服务项目') {
@@ -444,13 +448,13 @@ const closeModal = async()=>{
        houseTotal:null,
        staffTotal:null,
        securityUserTotal:null,
-       remark:''
+       remark:'',
+       isFiling:0
    }
     formRef.value.resetFields()
     enterprisesUnitId.value = ''
     serviceTitle.value = '新增服务项目'
-    // isRecruitSecurityHidden.value = false
-    idNumberDisabled.value = false
+    idNumberDisabled.value = true
 }
 const addServiceProjects = () => {
   visible.value = true

securityManagement/src/views/test.vue.bak

@@ -1,114 +0,0 @@
-<template>
-  <div class="search" id="search">
-    <a-input v-model="valueInput" @input="searchInput" placeholder="请进行搜索"></a-input>
-    <div v-if="valueInput">
-      <ul>
-        <li v-for="item in searchResults" :key="item.id">{{item}}</li>
-      </ul>
-    </div>
-    <div v-else >
-      没有找到相关结果
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-import {onMounted, ref,} from "vue";
-const valueInput = ref('')
-const list = ref([])
-const dataList = ref([
-  {
-    id:0,
-    value:'齐家园'
-  },
-  {
-    id:1,
-    value:'刘德华'
-  },
-  {
-    id:2,
-    value:'张学友'
-  },{
-    id:3,
-    value:'黎明'
-  },
-  {
-    id:4,
-    value:'家具城'
-  },
-  {
-    id:5,
-    value:'左岸春天'
-  },
-  {
-    id:6,
-    value:'麦德龙商城'
-  },
-  {
-    id:7,
-    value:'世纪酒店'
-  },
-  {
-    id:8,
-    value:'四方小学'
-  },
-  {
-    id:9,
-    value:'海洋半岛'
-  },
-  {
-    id:10,
-    value:'育英小学'
-  },
-  {
-    id:11,
-    value:'明德小学'
-  },{
-    id:12,
-    value:'希望小学',
-  }
-])
-const searchResults =  ref([])
-const searchInput = (e:any)=>{
-  valueInput.value = e.target.value
-  if (!valueInput.value) {
-    searchResults.value = []
-    return;
-  }else{
-    searchResults.value =  list.value.filter(item =>
-        item.toLowerCase().includes(valueInput.value.toLowerCase())
-    );
-  }
-}
-// watch(()=>valueInput.value,(value)=>{
-//    if(!value){
-//      searchResults.value = []
-//    }
-// })
-
-onMounted(()=>{
-  dataList.value.map((item)=>{
-    return list.value.push(item.value)
-  })
-})
-</script>
-
-
-
-<style scoped lang="scss">
-.search{
-  padding: 0 10px;
-  overflow: hidden;
-  border: 1px solid #4e71f2;
-  margin: 1px 5px;
-  border-radius: 10px;
-  width: 30%;
-  .ceShi{
-    height: 300px;
-    background: #ccc;
-  }
-}
-.nut-input{
-  padding: 20rpx 20rpx;
-  margin: 5px 0;
-}
-</style>