样式修改

src/views/index.vue

@@ -228,7 +228,7 @@ const initChinaMap = () => {
   };
   myChart.setOption(option)
   myChart.on('click', function (a) {
-    provinceStr.value = a.data.code
+    provinceStr.value =a.data.code
     provinceName.value = a.name
     initBusinessDistribution()
   })
@@ -365,7 +365,7 @@ const initTrend = () => {
         type: 'value',
         name: '信息量',
         min: 0,
-        max: 1000,
+        max: 100000,
         axisLabel: {
           formatter: '{value}',
           textStyle: {
@@ -702,6 +702,7 @@ let subMapData = ref([])
 let provinceStr = ref('')
 let provinceName = ref('')
 const initBusinessDistribution = () => {
+  console.log(provinceStr.value)
   api.homeApi.businessDistribution(provinceStr.value).then((res: any) => {
     if (!provinceStr.value) {
       if (res.code == 200) {

src/views/personnel/holidaySchedule.vue

@@ -1,12 +1,8 @@
 <!-- 模板区域 -->
 <template>
   <div>
-    <PageMain style="margin-bottom: 92px;height: 100vh;">
-      <!-- 头部 -->
-      <div class="pageheader flex a-c ">
-        <div class="tag"></div>
-        <span class="m-left-10">节假日排班</span>
-      </div>
+    <PageMain style="margin-bottom: 96px;height: 100vh;" title="节假日排班">
+
       <!-- 表单区域 -->
       <el-form ref="scheduleRef" class="m-top-20" style="max-width: 600px" :model="scheduleForm" :rules="scheduleRules"
         label-width="auto" label-position="top">

src/views/personnel/modules/editInstitution.vue

@@ -1,60 +1,60 @@
 <template>
   <div class="institution">
-    <el-form label-position="top" label-width="auto" :rules="rules" :model="form" ref="ruleFormRef">
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="机构名称" prop="name">
-            <el-input v-model.trim="form.name" maxlength="50" placeholder="输入机构名称" clearable />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" >
-          <el-form-item label="上级机构" prop="parentId">
-            <el-cascader clearable style="width: 100%"  v-model="form.parentId"
-              :options="tableData" :props="tableProps" @change="handleChange" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="机构类型" prop="comType">
-            <el-select v-model="form.comType" placeholder="选择机构类型" clearable>
-              <el-option v-for="item in comTypeList" :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="地区" prop="area">
-            <el-cascader clearable style="width: 100%" v-model="form.area" :options="areaOptins" :props="areaProps" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="展业范围" prop="exhibitionScope">
-            <el-select v-model="form.exhibitionScope" placeholder="选择展业范围" multiple clearable>
-              <el-option v-for="item in exhibitionScopeTypeList" :key="item.value" :label="item.label"
-                :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="机构地址" prop="address">
-            <el-input v-model.trim="form.address" maxlength="50" placeholder="请输入机构地址" type="textarea" clearable />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="机构负责人" prop="leaderId">
-            <el-select v-model="form.leaderId" placeholder="选择机构负责人" clearable>
-              <el-option v-for="item in memberList" :key="item.userId" :label="item.name" :value="item.userId" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-
-    <div class="dialog-footer">
+    <PageMain style="margin-bottom: 100px;" title="基本信息">
+      <el-form label-position="top" label-width="auto" class="" :rules="rules" :model="form" ref="ruleFormRef">
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="机构名称" prop="name">
+              <el-input v-model.trim="form.name" maxlength="50" placeholder="输入机构名称" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="上级机构" prop="parentId">
+              <el-cascader clearable style="width: 100%" v-model="form.parentId" :options="tableData"
+                :props="tableProps" @change="handleChange" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="机构类型" prop="comType">
+              <el-select v-model="form.comType" placeholder="选择机构类型" clearable>
+                <el-option v-for="item in comTypeList" :key="item.value" :label="item.label" :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="地区" prop="area">
+              <el-cascader clearable style="width: 100%" v-model="form.area" :options="areaOptins" :props="areaProps" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="展业范围" prop="exhibitionScope">
+              <el-select v-model="form.exhibitionScope" placeholder="选择展业范围" multiple clearable>
+                <el-option v-for="item in exhibitionScopeTypeList" :key="item.value" :label="item.label"
+                  :value="item.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="机构地址" prop="address">
+              <el-input v-model.trim="form.address" maxlength="50" placeholder="请输入机构地址" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="机构负责人" prop="leaderId">
+              <el-select v-model="form.leaderId" placeholder="选择机构负责人" clearable>
+                <el-option v-for="item in memberList" :key="item.userId" :label="item.name" :value="item.userId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </PageMain>
+    <FixedActionBar>
       <el-button @click="router.back()">取 消</el-button>
       <el-button type="primary" @click="confirm(ruleFormRef)">
         保 存
       </el-button>
-
-    </div>
+    </FixedActionBar>
   </div>
 </template>
 
@@ -97,7 +97,7 @@ onMounted(() => {
 
 const handleChange = (e) => {
   console.log(123123123, e)
-  form.parentId=e[e.length-1]
+  form.parentId = e[e.length - 1]
 }
 
 //禁用机构选择
@@ -105,7 +105,7 @@ function disabledEditTree(list) {
   for (let i = 0; i < list.length; i++) {
     const node = list[i];
     if (route.query.id) {
-      if (list[i].id === route.query.id ) {
+      if (list[i].id === route.query.id) {
         list[i].disabled = true;
       }
     } else {
@@ -179,7 +179,7 @@ const rules = reactive<FormRules<RuleForm>>({
 const memberList = ref([]);
 const getAllMemberList = () => {
   // pageInfo.pageNum=item.pageNum
-  api.userApi.AllMemberList({deptId: route.query.id,}).then((res: any) => {
+  api.userApi.AllMemberList({ deptId: route.query.id, }).then((res: any) => {
     if (res.code === 200) memberList.value = res.data;
   });
   // pageInfo.pageSize=item.pageSize
@@ -294,7 +294,7 @@ const confirm = async (formEl: FormInstance | undefined) => {
             city: form.area[1],
             area: form.area[2],
           })
-          .then((res:any) => {
+          .then((res: any) => {
             if (res.code === 200) {
               ElMessage.success("操作成功");
               dialogVisible.value = false;
@@ -308,9 +308,6 @@ const confirm = async (formEl: FormInstance | undefined) => {
 </script>
 <style lang="scss" scoped>
 .institution {
-  padding: 15px;
-  box-sizing: border-box;
-  background: #fff;
 
   .dialog-footer {
     display: flex;
@@ -318,4 +315,23 @@ const confirm = async (formEl: FormInstance | undefined) => {
     justify-content: center;
   }
 }
+
+.pageheader {
+  padding-bottom: 12px;
+  box-sizing: border-box;
+  border-bottom: 1px solid #eee;
+
+  span {
+    font-size: 18px;
+    color: #333;
+    font-weight: bold;
+  }
+
+  .tag {
+    width: 4px;
+    height: 18px;
+    background: #0083FF;
+    border-radius: 10px 10px 10px 10px;
+  }
+}
 </style>

src/views/quoteConfig/agreement/agreementAdd.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <PageMain style="padding: 20px;margin-bottom: 100px;">
+    <PageMain style="margin-bottom: 96px;" >
       <ElRow :gutter="60">
         <ElCol :md="24" :lg="24" style="padding-bottom: 10px;font-size: 14px;">
           <span class="strong">协议信息</span>