Merge branch 'sqy_dev' into 'main'

'fix:将分析页代码与工作台互换'

See merge request huang/yun-teng-iot-front!16

 <template>
-  <div class="p-4 md:flex">
-    <div class="md:w-7/10 w-full !mr-4 enter-y">
-      <GrowCard :loading="loading" class="enter-y" />
-      <SiteAnalysis class="!my-4 enter-y" :loading="loading" />
-      <div class="md:flex enter-y">
-        <Card title="核心流程指南" style="width: 100%">
-          <img alt="核心流程指南" src="../../../assets/images/flow.png" />
+  <PageWrapper>
+    <template #headerContent> <WorkbenchHeader /> </template>
+    <div class="lg:flex">
+      <div class="lg:w-7/10 w-full !mr-4 enter-y">
+        <ProjectCard :loading="loading" class="enter-y" />
+        <DynamicInfo :loading="loading" class="!my-4 enter-y" />
+      </div>
+      <div class="lg:w-3/10 w-full enter-y">
+        <QuickNav :loading="loading" class="enter-y" />
+
+        <Card class="!my-4 enter-y" :loading="loading">
+          <img class="xl:h-50 h-30 mx-auto" src="../../../assets/svg/illustration.svg" />
         </Card>
+
+        <SaleRadar :loading="loading" class="enter-y" />
       </div>
     </div>
-    <div class="md:w-3/10 w-full enter-y">
-      <HelpDoc />
-    </div>
-  </div>
+    <BasicModal
+      @register="register"
+      v-bind="$attrs"
+      :mask="true"
+      :showCancelBtn="false"
+      :showOkBtn="false"
+      :canFullscreen="false"
+      :closable="false"
+      :maskStyle="maskColor"
+      :height="600"
+      :width="1500"
+      :maskClosable="false"
+      title="请修改密码"
+      :helpMessage="['请您修改密码']"
+    >
+      <PasswordDialog />
+    </BasicModal>
+  </PageWrapper>
 </template>
 <script lang="ts" setup>
-  import { ref } from 'vue';
-  import GrowCard from './components/GrowCard.vue';
-  import SiteAnalysis from './components/SiteAnalysis.vue';
+  import PasswordDialog from '/@/views/system/password/index.vue';
+  import { BasicModal, useModal } from '/@/components/Modal';
+  import { getAuthCache } from '/@/utils/auth';
+  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
+  import { ref, onMounted } from 'vue';
   import { Card } from 'ant-design-vue';
-  import HelpDoc from './components/HelpDoc.vue';
-  const loading = ref(true);
+  import { PageWrapper } from '/@/components/Page';
+  import WorkbenchHeader from './components/WorkbenchHeader.vue';
+  import ProjectCard from './components/ProjectCard.vue';
+  import QuickNav from './components/QuickNav.vue';
+  import DynamicInfo from './components/DynamicInfo.vue';
+  import SaleRadar from './components/SaleRadar.vue';
+
+  const maskColor = ref({ backgroundColor: 'grey' });
+  const statusModel = ref(false);
+  const [register, { openModal }] = useModal();
+  onMounted(() => {
+    const userInfo: object = getAuthCache(USER_INFO_KEY);
+    if (userInfo.needSetPwd == true) {
+      statusModel.value = true;
+      openModal(statusModel.value);
+    } else if (userInfo.needSetPwd == false) {
+      openModal(statusModel.value);
+    }
+  });
+  //Yunteng123456!!!
+  //Password123456!
+  //System123456!
+  //Testrole123456!
+  const loading = ref(false);
   setTimeout(() => {
     loading.value = false;
   }, 1500);

 <template>
-  <PageWrapper>
-    <template #headerContent> <WorkbenchHeader /> </template>
-    <div class="lg:flex">
-      <div class="lg:w-7/10 w-full !mr-4 enter-y">
-        <ProjectCard :loading="loading" class="enter-y" />
-        <DynamicInfo :loading="loading" class="!my-4 enter-y" />
-      </div>
-      <div class="lg:w-3/10 w-full enter-y">
-        <QuickNav :loading="loading" class="enter-y" />
-
-        <Card class="!my-4 enter-y" :loading="loading">
-          <img class="xl:h-50 h-30 mx-auto" src="../../../assets/svg/illustration.svg" />
+  <div class="p-4 md:flex">
+    <div class="md:w-7/10 w-full !mr-4 enter-y">
+      <GrowCard :loading="loading" class="enter-y" />
+      <SiteAnalysis class="!my-4 enter-y" :loading="loading" />
+      <div class="md:flex enter-y">
+        <Card title="核心流程指南" style="width: 100%">
+          <img alt="核心流程指南" src="../../../assets/images/flow.png" />
         </Card>
-
-        <SaleRadar :loading="loading" class="enter-y" />
       </div>
     </div>
-    <BasicModal
-      @register="register"
-      v-bind="$attrs"
-      :mask="true"
-      :showCancelBtn="false"
-      :showOkBtn="false"
-      :canFullscreen="false"
-      :closable="false"
-      :maskStyle="maskColor"
-      :height="600"
-      :width="1500"
-      :maskClosable="false"
-      title="请修改密码"
-      :helpMessage="['请您修改密码']"
-    >
-      <PasswordDialog />
-    </BasicModal>
-  </PageWrapper>
+    <div class="md:w-3/10 w-full enter-y">
+      <HelpDoc />
+    </div>
+  </div>
 </template>
 <script lang="ts" setup>
-  import PasswordDialog from '/@/views/system/password/index.vue';
-  import { BasicModal, useModal } from '/@/components/Modal';
-  import { getAuthCache } from '/@/utils/auth';
-  import { USER_INFO_KEY } from '/@/enums/cacheEnum';
-  import { ref, onMounted } from 'vue';
+  import { ref } from 'vue';
+  import GrowCard from './components/GrowCard.vue';
+  import SiteAnalysis from './components/SiteAnalysis.vue';
   import { Card } from 'ant-design-vue';
-  import { PageWrapper } from '/@/components/Page';
-  import WorkbenchHeader from './components/WorkbenchHeader.vue';
-  import ProjectCard from './components/ProjectCard.vue';
-  import QuickNav from './components/QuickNav.vue';
-  import DynamicInfo from './components/DynamicInfo.vue';
-  import SaleRadar from './components/SaleRadar.vue';
-
-  const maskColor = ref({ backgroundColor: 'grey' });
-  const statusModel = ref(false);
-  const [register, { openModal }] = useModal();
-  onMounted(() => {
-    const userInfo: object = getAuthCache(USER_INFO_KEY);
-    if (userInfo.needSetPwd == true) {
-      statusModel.value = true;
-      openModal(statusModel.value);
-    } else if (userInfo.needSetPwd == false) {
-      openModal(statusModel.value);
-    }
-  });
-  //Yunteng123456!!!
-  //Password123456!
-  //System123456!
-  //Testrole123456!
-  const loading = ref(false);
+  import HelpDoc from './components/HelpDoc.vue';
+  const loading = ref(true);
   setTimeout(() => {
     loading.value = false;
   }, 1500);

@@ -140,7 +140,7 @@
   }
 
   function goLogin() {
-    userStore.logout(true);
+    userStore.logout();
     lockStore.resetLockInfo();
   }
 

@@ -44,7 +44,7 @@
     </ARow>
     <ARow class="enter-x">
       <ACol :span="12">
-        <FormItem> </FormItem>
+        <FormItem />
       </ACol>
       <ACol :span="12">
         <FormItem :style="{ 'text-align': 'right' }">

@@ -20,6 +20,7 @@
   import { getEnterPriseDetail, updateEnterPriseDetail } from '/@/api/oem/index';
   import { Loading } from '/@/components/Loading';
   import { useMessage } from '/@/hooks/web/useMessage';
+  import { getTownChild } from '/@/api/oem/index';
   export default defineComponent({
     components: {
       Card,
@@ -32,7 +33,7 @@
         loading: false,
         tip: '拼命加载中...',
       });
-      const [registerForm, { getFieldsValue, setFieldsValue }] = useForm({
+      const [registerForm, { getFieldsValue, setFieldsValue, updateSchema }] = useForm({
         labelWidth: 80,
         schemas,
         showResetButton: false,
@@ -59,11 +60,128 @@
           createMessage.error('更新信息失败');
         }
       };
+
       onMounted(async () => {
         const res = await getEnterPriseDetail();
+        console.log(res);
+        updateCityData(res.codeProv, res.codeCity, res.codeCoun);
         setFieldsValue(res);
       });
 
+      async function updateCityData(codeProv: string, codeCity: string, codeCoun: string) {
+        const nameCity = await getTownChild('codeProv', codeProv);
+        const nameCoun = await getTownChild('codeCity', codeCity);
+        const nameTown = await getTownChild('codeCoun', codeCoun);
+        nameCity.forEach((item) => {
+          item.label = item.nameCity;
+          item.value = item.codeCity;
+        });
+        nameCoun.forEach((item) => {
+          item.label = item.nameCoun;
+          item.value = item.codeCoun;
+        });
+        nameTown.forEach((item) => {
+          item.label = item.nameTown;
+          item.value = item.codeTown;
+        });
+        updateSchema({
+          field: 'nameTown',
+          componentProps: {
+            options: nameTown,
+          },
+        });
+        updateSchema({
+          field: 'nameCoun',
+          componentProps: {
+            options: nameCoun,
+            async onChange(value) {
+              if (value === undefined) {
+                setFieldsValue({
+                  nameTown: undefined,
+                });
+                updateSchema({
+                  field: 'nameTown',
+                  componentProps: {
+                    options: [],
+                  },
+                });
+              }
+              let nameTown = await getTownChild('codeCoun', value);
+              console.log(111);
+              nameTown.forEach((item) => {
+                item.label = item.nameTown;
+                item.value = item.codeTown;
+              });
+              setFieldsValue({
+                nameTown: undefined,
+              });
+              updateSchema({
+                field: 'nameTown',
+                componentProps: {
+                  placeholder: '请选择街道/城镇',
+                  options: nameTown,
+                },
+              });
+            },
+          },
+        });
+        updateSchema({
+          field: 'nameCity',
+          componentProps: ({ formModel }) => {
+            return {
+              options: nameCity,
+              onChange: async (value) => {
+                let nameCoun = await getTownChild('codeCity', value);
+                if (value === undefined) {
+                  formModel.nameCoun = undefined; //  reset city value
+                  formModel.nameTown = undefined;
+                  nameCoun = [];
+                  updateSchema({
+                    field: 'nameTown',
+                    componentProps: {
+                      options: [],
+                    },
+                  });
+                }
+                nameCoun.forEach((item) => {
+                  item.label = item.nameCoun;
+                  item.value = item.codeCoun;
+                });
+                formModel.nameCoun = undefined; //  reset city value
+                formModel.nameTown = undefined;
+                updateSchema({
+                  field: 'nameCoun',
+                  componentProps: {
+                    // 请选择区
+                    options: nameCoun,
+                    async onChange(value) {
+                      let nameTown = await getTownChild('codeCoun', value);
+                      if (value === undefined) {
+                        formModel.nameTown = undefined;
+                        nameTown = [];
+                      }
+                      nameTown.forEach((item) => {
+                        item.label = item.nameTown;
+                        item.value = item.codeTown;
+                      });
+
+                      formModel.nameTown = undefined;
+                      updateSchema({
+                        field: 'nameTown',
+                        componentProps: {
+                          placeholder: '请选择街道/城镇',
+                          options: nameTown,
+                        },
+                      });
+                    },
+                  },
+                });
+              },
+            };
+          },
+        });
+      }
+
       return {
         registerForm,
         compState,

@@ -51,6 +51,7 @@ export const schemas: FormSchema[] = [
     field: 'synopsis',
     component: 'InputTextArea',
     label: '公司简介',
+
     colProps: {
       span: 24,
     },
@@ -116,6 +117,9 @@ export const schemas: FormSchema[] = [
               },
             });
           }
+          formModel.nameCity = undefined; //  reset city value
+          formModel.nameCoun = undefined;
+          formModel.nameTown = undefined;
           updateSchema({
             field: 'nameCity',
             componentProps: () => {
@@ -146,14 +150,20 @@ export const schemas: FormSchema[] = [
                       // 请选择区
                       options: nameCoun,
                       async onChange(value) {
-                        let nameTown = await getTownChild('codeCoun', value);
+                        const nameTown = await getTownChild('codeCoun', value);
                         nameTown.forEach((item) => {
                           item.label = item.nameTown;
                           item.value = item.codeTown;
                         });
                         if (value === undefined) {
                           formModel.nameTown = undefined;
-                          nameTown = [];
+                          updateSchema({
+                            field: 'nameTown',
+                            componentProps: {
+                              placeholder: '请选择街道/城镇',
+                              options: [],
+                            },
+                          });
                         }
                         updateSchema({
                           field: 'nameTown',
@@ -177,7 +187,6 @@ export const schemas: FormSchema[] = [
     field: 'nameCity',
     component: 'Select',
     label: '',
-
     colProps: {
       span: 5,
       style: {
@@ -213,13 +222,6 @@ export const schemas: FormSchema[] = [
       placeholder: '请选择街道/城镇',
     },
   },
-
-  // {
-  //   field: 'nameProv',
-  //   label: '所在城市',
-  //   component: 'Cascader',
-  // },
-
   {
     field: 'address',
     component: 'Input',

@@ -23,7 +23,7 @@
   import EnterpriseInfo from './components/EnterpriseInfo.vue';
   import CVIDraw from './components/CVIDraw.vue';
   import AppDraw from './components/AppDraw.vue';
-  const activeKey = ref('APP定制');
+  const activeKey = ref('企业信息');
 </script>
 
 <style lang="less" scoped>