提交

back/src/views/modules/ability/assignedScene/area-add.vue

@@ -21,7 +21,7 @@
               <el-form-item label="赋能领域:" prop="unit">
                 <el-select v-model="dataForm.applicationArea" placeholder="请选择">
                   <el-option v-for="item in sceneAreas" :key="item.data" :label="item.dict_label"
-                    :value="item.dict_value"></el-option>
+                    :value="item.dict_label"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="场景名称:" prop="name">

back/src/views/modules/ability/assignedScene/city-add.vue

@@ -36,7 +36,7 @@
               <el-form-item label="赋能领域:" prop="unit">
                 <el-select v-model="dataForm.applicationArea" placeholder="请选择">
                   <el-option v-for="item in sceneAreas" :key="item.data" :label="item.dict_label"
-                    :value="item.dict_value"></el-option>
+                    :value="item.dict_label"></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="场景名称:" prop="name">

front/src/api/home.js

@@ -588,3 +588,11 @@ export function sysnoticemanagement(params) {
     params,
   })
 }
+//获取所有区市
+export function getRegion(params) {
+  return request({
+    url: '/sys/region/list/',
+    method: 'get',
+     params,
+  })
+}

front/src/views/home/algorithmCompare.vue

@@ -667,12 +667,23 @@
 </script>
 
 <style>
+
   .ant-modal-footer {
     display: block;
   }
 </style>
 
 <style lang="less" scoped>
+
+  :deep(.ant-table-tbody > tr.ant-table-row-selected > td){
+    background: #e6eefb;
+ }
+ :deep(.ant-checkbox-checked .ant-checkbox-inner){
+  background-color: #0058e1;
+ }
+ :deep(.ant-checkbox-indeterminate .ant-checkbox-inner::after){
+  background-color: #0058e1;
+ }
   .bg {
     background: #fff;
     height: 100vh;
@@ -884,6 +895,7 @@
   .modal-box {
     height: 650px;
     width: 800px;
+
   }
 
   .add-img {

front/src/views/home/components/CanAssignCase.vue

@@ -82,14 +82,14 @@ watch(
     justify-items: center;
 
     .caseBox {
-      width: 3.5rem;
-      height: 3rem;
-      box-shadow: 1px 1px 5px 5px rgba(222, 222, 222, 0.152);
-      background: #ffffff;
-      border-radius: 0.05rem;
-      padding: 0.2rem;
-      margin-bottom: 0.2rem;
-      cursor: pointer;
+        width: 3.5rem;
+    height: 3rem;
+    border: 1px solid #ebecef;
+    box-shadow: 1px 1px 5px 5px rgb(222 222 222 / 15%);
+    background: #ffffff;
+    padding: 0.2rem;
+    margin-bottom: 0.2rem;
+    cursor: pointer;
 
       img {
         width: 3rem;

front/src/views/home/components/header.vue

@@ -189,6 +189,9 @@
   }else if(newValue=='/demandDetails'){
     select.value='demandCenter'
   }
+  else if(newValue=='/integrationServicesDetails'){
+    select.value='integrationServices'
+  }
   
     },
     { immediate: true }

front/src/views/home/components/searchResultList.vue

@@ -969,6 +969,7 @@
       // margin: 11px 0 20px;
       // background: #e5f2ff;
       // padding-left: 20px;
+      padding-top:10px;
       display: flex;
       align-items: center;
       position: relative;

front/src/views/home/infrastructurePage.vue

@@ -408,18 +408,23 @@
             :wrapper-col="{ span: 14, offset: 4 }"
             style="text-align: center; margin-top: 0.4rem"
           >
-            <a-button @click="appointmentRoom = false" type="primary" danger>
-              取消
-            </a-button>
-            <a-button
-              style="margin-left: 10px"
-              type="primary"
+          <a-button
+             class="tijiao"
+            
               @click="onSubmit"
             >
               提交
             </a-button>
+            <a-button class="quxiao" @click="appointmentRoom = false" >
+              取消
+            </a-button>
+   
           </a-form-item>
         </a-form>
+       
+          
+            
+   
       </a-modal>
     </div>
     <div v-if="room">
@@ -1210,7 +1215,7 @@
     if (item && item.status != 1) {
       return
       // return message.warning('当前设备离线, 不可预览！')
-    }
+    }handleChose
     console.log('打开视频', id)
     const param = {
       key: id,
@@ -2515,6 +2520,38 @@
   })
 </script>
 <style lang="less" scoped>
+ 
+.quxiao{
+      margin-right:12px;
+      cursor: pointer;
+      width: 90px;
+      height: 32px;
+      background: #ffffff;
+      color:#0058e1;
+      border-radius: 2px;
+      border: 1px #0058e1 solid;
+    }
+    .quxiao:hover{
+      background: #fff;
+  color: #0558e1;
+  opacity: 0.8;
+    }
+    .tijiao{
+      margin-right:12px;
+      cursor: pointer;
+      width: 90px;
+      height: 32px;
+      background: #0058e1;
+      color:#ffffff;
+      border-radius: 2px;
+      border: 1px #0058e1 solid;
+      margin-left:20px;
+    }
+    .tijiao:hover{
+      background: #0558e1;
+      color: #fff;
+      opacity: 0.8;
+    }
   .queding {
     margin-left: 16px;
     cursor: pointer;
@@ -2862,10 +2899,20 @@
     // }
   }
   :deep(.ant-table-thead > tr > th) {
-    color: #5580f7 !important;
+    color: #0058e1 !important;
     font-size: 16px !important;
     font-weight: 600 !important;
   }
+  :deep(.ant-table-tbody > tr.ant-table-row-selected > td){
+    background: #e6eefb;
+ }
+ :deep(.ant-checkbox-checked .ant-checkbox-inner){
+  background-color: #0058e1;
+ }
+ :deep(.ant-checkbox-indeterminate .ant-checkbox-inner::after){
+  background-color: #0058e1;
+ }
+
 </style>
 <style lang="less">
   .eia-dropdown-class {
@@ -2897,16 +2944,19 @@
 
   .appModal {
     .ant-modal-body {
-      height: 4.8rem !important;
+      height: 3.8rem !important;
       overflow-y: scroll !important;
     }
 
     .ant-modal-title {
       font-weight: 600;
+      color:#fff;
     }
-
+    
     .ant-modal-content {
       .ant-modal-header {
+        background: #0058e1;
+      margin-bottom: 16px;
         border-bottom: 0 !important;
       }
     }