diff --git a/src/api/enforce.js b/src/api/enforce.js
index e667494..b74693d 100644
--- a/src/api/enforce.js
+++ b/src/api/enforce.js
@@ -141,3 +141,12 @@ export const getDeptListToDept = (params,success,error) =>_get("/app/enforcement
  * @returns
  */
 export const getDeptListToPerson = (params,success,error) =>_get("/app/enforcementCheckStatistics/getDeptListToPerson",params,success,error)
+
+/**
+ * 综合分析
+ * @param {*} params
+ * @param {*} success
+ * @param {*} error
+ * @returns
+ */
+export const whole = (params,success,error) =>_get("/app/appComprehensiveAnalysis/whole",params,success,error)
diff --git a/src/router/enforceHome.js b/src/router/enforceHome.js
index a9157cf..6a46ea5 100644
--- a/src/router/enforceHome.js
+++ b/src/router/enforceHome.js
@@ -137,6 +137,15 @@ const routes = [
 			isKeepAlive: false
 		},
 	},
+	//新版综合分析
+	{
+		path:"/comprehensiveAnalysis",
+		name:"comprehensiveAnalysis",
+		component: () => import("@/views/enforce/comprehensiveAnalysis.vue"),
+		meta: {
+			isKeepAlive: false
+		},
+	},
 ]
 
 export {routes}
\ No newline at end of file
diff --git a/src/views/enforceHome.vue b/src/views/enforceHome.vue
index 8767cac..db5472f 100644
--- a/src/views/enforceHome.vue
+++ b/src/views/enforceHome.vue
@@ -138,8 +138,11 @@
         });
     }
     const toAnalyseView = async () => {
-        router.push({
+/*         router.push({
             path: "/analyse",
+        }); */
+        router.push({
+            path: "/comprehensiveAnalysis",
         });
     }
     const toNoticeView = async () => {
diff --git a/src/views/enterprise/enterpriseInformation.vue b/src/views/enterprise/enterpriseInformation.vue
new file mode 100644
index 0000000..a49ce8e
--- /dev/null
+++ b/src/views/enterprise/enterpriseInformation.vue
@@ -0,0 +1,340 @@
+<template>
+	<div class="address_edit">
+        <div class="warp_body">
+			<van-cell-group>
+        <van-field
+            v-model="submitData.enterpriseName"
+            label="企业名称"
+            required
+            placeholder="必填 企业名称"
+            :rules="[{ required: true, message: '必填项' }]"
+            readonly
+          />
+        <van-field
+          v-model="submitData.enterpriseNumber"
+          required
+          label="统一社会信用代码"
+          placeholder="必填 统一社会信用代码"
+          readonly
+        />
+        <van-field
+          v-model="submitData.enterpriseTypeText"
+          label="类型"
+          placeholder="选填 企业类型"
+          readonly
+          clickable
+          is-link
+          @click="selectType"
+        />
+        <van-popup v-model:show="data.showPicker" position="bottom">
+        <van-picker
+          v-model="data.selectTypeValue"
+          :columns="data.columns"
+          @cancel="data.showPicker = false"
+          @confirm="onConfirm"
+        />
+      </van-popup>
+      <van-field
+          v-model="submitData.enterpriseAddress"
+          label="注册地址"
+          placeholder="选填 注册地址或经营地址"
+        />
+        <van-field
+          v-model="submitData.legalPerson"
+          label="法定代表人"
+          placeholder="选填 法定代表人姓名"
+        />
+        <van-field
+          v-model="submitData.registeredCapital"
+          label="注册资本"
+          placeholder="选填 注册资本"
+        />
+        <van-field
+          v-model="submitData.establishmentTime"
+          label="成立日期"
+          placeholder="选填 成立日期"
+          is-link
+          readonly
+          @click="selectDate"
+        />
+        <van-popup v-model:show="data.showDatePicker" position="bottom">
+        <van-date-picker
+          title="选择日期"
+          v-model="data.currentDate"
+          :min-date="data.minDate"
+          :max-date="data.maxDate"
+          :columns-type="data.columnsType"
+          @confirm="onDateConfirm"
+          @cancel="cancelSelectDate"
+        />
+      </van-popup>
+        <van-field
+          v-model="submitData.operatingTerm"
+          label="营业期限"
+          placeholder="选填 营业期限"
+          is-link
+          @click="selectOperatingTermDate"
+          readonly
+        />
+        <van-popup v-model:show="data.showOperatingTermPicker" position="bottom">
+        <van-calendar v-model:show="data.showOperatingTermPicker" type="range"
+        :min-date="data.minDate" :max-date="data.maxDate" @confirm="onOperatingTermConfirm" />
+      </van-popup>
+        <van-field
+          v-model="submitData.businessScope"
+          label="经营范围"
+          placeholder="选填 经营范围"
+          rows="1"
+          autosize="{ maxHeight: 100, minHeight: 50 }"
+          type="textarea"
+        />
+      </van-cell-group>
+      <van-action-bar>
+        <van-action-bar-button text="提交"  @click="submit()" />
+      </van-action-bar>
+		</div>
+	</div>
+</template>
+
+<script setup name="register">
+import { showSuccessToast,showToast } from 'vant';
+import 'vant/es/toast/style';
+import {addEnterpriseInformation} from '../../api/enterprise'
+import {editNotQX} from '../../api/enforce'
+import {getDict} from '../../api/Home'
+import { reactive, ref } from "vue";
+import {queryEnterpriseInfoList} from '../../api/enterprise'
+const { useMy,useCommon } = $globalStore
+const router = useRouter();
+const route = useRoute();
+let queryaddressId = ref("");
+const data = reactive({
+	searchResult: [],
+  showTypePicker: false,
+  columns: [],
+  showDatePicker:false,
+  currentDate: [],
+  minDate: new Date(2020, 0, 1),
+  maxDate: new Date(2125, 5, 1),
+  columnsType :['year', 'month','day'],
+  showOperatingTermPicker:false,
+  operatingTermDate: ref(['2024', '01']),
+  selectTypeValue : ref[0],
+});
+//保存参数
+const submitData = reactive({
+  id:"",
+  //企业名称
+  enterpriseName:"",
+  //纳税识别号
+  enterpriseNumber:"",
+  //企业类型
+  enterpriseType: null,
+  enterpriseTypeText: null,
+  //地址
+  enterpriseAddress:"",
+  //法人
+  legalPerson:"",
+  //成立日期
+  establishmentTime:"",
+  //注册资本
+  registeredCapital:"",
+  //营业期限
+  operatingTerm:"",
+  //经营范围
+  businessScope:"",
+})
+
+onMounted(() => {
+  currentDate();
+	getDict({"dictType": "enterpriseType"},success =>{
+    success.data.forEach(res =>{
+      console.log(res)
+      var obj = { text: res.dictLabel, value: res.dictValue };
+      data.columns.push(obj)
+    })
+  });
+  let enterpriseInformation={
+    enterpriseNumber:useCommon.enterpriseNumber,
+  };
+  queryEnterpriseInfoList(enterpriseInformation,success=>{
+    console.log(success);
+    if(success.rows.length>0){
+      submitData.id=success.rows[0].id;
+      submitData.enterpriseName=success.rows[0].enterpriseName;
+      submitData.enterpriseNumber=success.rows[0].enterpriseNumber;
+      //submitData.enterpriseTypeText=success.rows[0].enterpriseType;
+      //data.selectTypeValue=success.rows[0].enterpriseType;
+      submitData.enterpriseAddress=success.rows[0].enterpriseAddress;
+      submitData.legalPerson=success.rows[0].legalPerson;
+      submitData.establishmentTime=success.rows[0].establishmentTime;
+      submitData.registeredCapital=success.rows[0].registeredCapital;
+      submitData.operatingTerm=success.rows[0].operatingTerm;
+      submitData.businessScope=success.rows[0].businessScope;
+      for(let i=0;i<data.columns.length;i++){
+        debugger
+        if(data.columns[i].value==success.rows[0].enterpriseType){
+          submitData.enterpriseTypeText=data.columns[i].text;
+          submitData.enterpriseType=data.columns[i].value;
+          break;
+        }
+      }
+    }
+  })
+});
+
+// 返回
+const goBack = () => {
+	router.go(-1);
+};
+
+
+
+const submit = () =>{
+  console.log(submitData);
+  editNotQX(submitData,success =>{
+    //重新设置本地存储
+    useCommon.SET_USER_ENTERPRISE_NUMBER(submitData.enterpriseNumber);
+    console.log(success)
+    //跳转企业二维码地址
+    if(success.success){
+      console.log("登记成功");
+      //showSuccessToast('修改成功');
+      showToast('操作成功');
+      /* router.push(
+        { 
+          path: "/qrCoedeHistory",
+          query: {
+            enterpriseNumber: submitData.enterpriseNumber,
+          } 
+      }); */
+      goBack();
+    }
+  },error=>{
+      console.log("修改失败")
+  })
+}
+// 保存地址操作
+const onSave = () => {
+	router.replace({ name: "addressList" });
+};
+
+const onConfirm = (value)=> {
+      data.value = value;
+      data.showPicker = false;
+      console.log(value)
+      submitData.enterpriseType  = value.selectedValues[0];
+      submitData.enterpriseTypeText  = value.selectedOptions[0].text;
+}
+const selectType  = () =>{
+  data.showPicker = true;
+  // console.log(data)
+}
+const selectDate  = () =>{
+  data.showDatePicker = true;
+  console.log(data.showDatePicker)
+}
+
+const currentDate =() => {
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = (now.getMonth() + 1).toString().padStart(2, '0');
+    const day = now.getDate().toString().padStart(2, '0');
+    data.currentDate = [year, month, day]
+}
+
+const selectOperatingTermDate  = () =>{
+  data.showOperatingTermPicker = true;
+  console.log(data.showOperatingTermPicker)
+}
+const onDateConfirm = (value)=> {
+      let tmptime = "";
+      value.selectedValues.forEach((item,index) => {
+          tmptime += item + "-";
+      });
+      console.log(tmptime)
+      submitData.establishmentTime = tmptime.substring(0, tmptime.length-1);
+      data.showDatePicker = false;
+}
+const formatDate = (date) => `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`;
+//营业期限日期选择
+const onOperatingTermConfirm = (values)=> {
+      const [start, end] = values;
+      console.log(values);
+      data.showOperatingTermPicker = false;
+      submitData.operatingTerm = `${formatDate(start)}至${formatDate(end)}`;
+}
+//取消日期选择
+const cancelSelectDate = () =>{
+  data.showOperatingTermPicker = false;
+  data.showDatePicker = false;
+}
+
+//搜索结果回显
+const reciveData = (item) =>{
+    console.log(item);
+    console.log(item.establishmentTime);
+    submitData.enterpriseName = item.enterpriseName;
+    submitData.enterpriseNumber = item.enterpriseNumber;
+    submitData.legalPerson = item.legalPerson;
+    submitData.enterpriseType = item.enterpriseType;
+    submitData.enterpriseAddress = item.enterpriseAddress;
+    submitData.registeredCapital = item.registeredCapital;
+    submitData.establishmentTime = item.establishmentTime;
+    submitData.businessScope = item.businessScope;
+    submitData.operatingTerm = item.operatingTerm;
+    data.columns.forEach(res =>{
+      console.log(res);
+      if(res.value == item.enterpriseType){
+          submitData.enterpriseTypeText = res.text;
+      }
+    })
+}
+</script>
+
+<style lang="less" scoped>
+.address_edit {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	overflow: hidden;
+	background-color: #ebf3fb;
+}
+/* vant4的 Toast 和 Popup 样式冲突,会导致 Toast 变成白底 */
+.van-popup.van-toast{
+    background: var(--van-toast-background) !important;
+    box-sizing: content-box !important;
+    /* 下面3条css,影响不大 */
+    transition: all var(--van-duration-fast) !important;
+    width: var(--van-toast-default-width) !important;
+    max-width: var(--van-toast-max-width) !important;
+}
+.van-popup.van-toast .van-toast__icon{
+    font-size: var(--van-toast-icon-size) !important;
+}
+.warp_body {
+        margin: 0 3%;
+        width: 94%;
+        height: 100%;
+        background-color: #ebf3fb;
+        margin-top: 0.15rem;
+  }
+
+/deep/ .van-action-bar {
+  box-shadow: 0 0 0.27rem #e5e5e5;
+}
+
+/deep/ .van-button {
+  margin: 5% 3%;
+  padding: 0;
+  width: 94%;
+  height: 1rem;
+  color: #fff;
+  font-size: 0.4rem;
+  border-radius: 1rem;
+  background: #1367fe;
+  border: 1px solid #1367fe;
+  text-align: center;
+}
+
+</style>
\ No newline at end of file