diff --git a/pages.json b/pages.json
index d819442..b5cabff 100644
--- a/pages.json
+++ b/pages.json
@@ -4,16 +4,16 @@
   },
   "pages": [
     {
-      "path" : "pages/login/login",
-      "style" : {
-        "navigationBarTitleText" : ""
+      "path": "pages/login/login",
+      "style": {
+        "navigationBarTitleText": ""
       }
     },
     {
-      "path" : "pages/rain/rain",
-      "style" : {
-          "navigationBarTitleText": "",
-          "enablePullDownRefresh": false
+      "path": "pages/rain/rain",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false
       }
     },
     {
@@ -34,6 +34,24 @@
         "navigationBarTitleText": ""
       }
     },
+    {
+      "path": "pages/xxsb/fromSeverity",
+      "style": {
+        "navigationBarTitleText": ""
+      }
+    },
+    {
+      "path": "pages/xxsb/dsfrom",
+      "style": {
+        "navigationBarTitleText": ""
+      }
+    },
+    {
+      "path": "pages/xxsb/map",
+      "style": {
+        "navigationBarTitleText": "地图示例"
+      }
+    },
     {
       "path": "pages/gqzq/index",
       "style": {
@@ -65,118 +83,121 @@
       }
     },
     {
-      "path" : "pages/personInfo/personInfo",
+      "path": "pages/personInfo/personInfo",
       "style": {
-        "navigationBarTitleText" : ""
+        "navigationBarTitleText": ""
       }
     },
     {
-      "path" : "pages/modifyPassword/modifyPassword",
-      "style" : {
-        "navigationBarTitleText" : ""
+      "path": "pages/modifyPassword/modifyPassword",
+      "style": {
+        "navigationBarTitleText": ""
       }
     },
     {
-    	"path" : "pages/forewarning/forewarning",
-    	"style" : {
-    		"navigationBarTitleText" : ""
-    	}
+      "path": "pages/forewarning/forewarning",
+      "style": {
+        "navigationBarTitleText": ""
+      }
     },
     {
-    	"path" : "pages/forewarning/sh",
-    	"style" : {
-    		"navigationBarTitleText" : ""
-    	}
+      "path": "pages/forewarning/sh",
+      "style": {
+        "navigationBarTitleText": ""
+      }
     },
     {
-    	"path" : "pages/forewarning/shInformation/shInformation",
-    	"style" : {
-    		"navigationBarTitleText" : ""
-    	}
+      "path": "pages/forewarning/shInformation/shInformation",
+      "style": {
+        "navigationBarTitleText": ""
+      }
     },
     {
-    	"path" : "pages/addressBook/addressBook",
-    	"style" : {
-    		"navigationBarTitleText" : ""
-    	}
+      "path": "pages/addressBook/addressBook",
+      "style": {
+        "navigationBarTitleText": ""
+      }
     },
     {
-      "path" : "pages/water/water",
-      "style" : {
-          "navigationBarTitleText": "",
-          "enablePullDownRefresh": false
+      "path": "pages/water/water",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false
       },
       "onMessage": "handleMessage"
     },
     {
-      "path" : "pages/rainDetail/rainDetail",
-      "style" : {
-          "navigationBarTitleText": "",
-          "enablePullDownRefresh": false
+      "path": "pages/rainDetail/rainDetail",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false
       }
     },
     {
-      "path" : "pages/hdDetail/hdDetail",
-      "style" : {
-          "navigationBarTitleText": "",
-          "enablePullDownRefresh": false
+      "path": "pages/hdDetail/hdDetail",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false
       }
     },
     {
-      "path" : "pages/skDetail/skDetail",
-      "style" : {
-          "navigationBarTitleText": "",
-          "enablePullDownRefresh": false
+      "path": "pages/skDetail/skDetail",
+      "style": {
+        "navigationBarTitleText": "",
+        "enablePullDownRefresh": false
       }
     },
     {
-      "path" : "pages/addressBook/follow",
-      "style" : {
-        "navigationBarTitleText" : ""
+      "path": "pages/addressBook/follow",
+      "style": {
+        "navigationBarTitleText": ""
       }
     },
     {
-      "path" : "pages/addressBook/myDept",
-      "style" : {
-        "navigationBarTitleText" : ""
+      "path": "pages/addressBook/myDept",
+      "style": {
+        "navigationBarTitleText": ""
       }
     },
     {
-      "path" : "pages/orderFeedback/orderFeedback",
-      "style" : {
-        "navigationBarTitleText" : ""
+      "path": "pages/orderFeedback/orderFeedback",
+      "style": {
+        "navigationBarTitleText": ""
       }
     },
     {
-      "path" : "pages/orderFeedback/orderInformation",
-      "style" : {
-        "navigationBarTitleText" : ""
+      "path": "pages/orderFeedback/orderInformation",
+      "style": {
+        "navigationBarTitleText": ""
       }
     }
   ],
+  "usingComponents": {
+    "map": "/uni_modules/@dcloudio/uni-map/components/uni-map/uni-map"
+  },
 
   "tabBar": {
     "color": "#333333",
-    "selectedColor": "#eb4450",
+    "selectedColor": "#59A7FF",
     "list": [
-	  {
-		 "pagePath": "pages/homeIndex/index",
-		 "iconPath": "/static/tabs/home.png",
-		 "selectedIconPath": "static/tabs/home1.png",
-		 "text": "首页"
-	  },
-    {
-      "pagePath": "pages/addressBook/addressBook",
-      "iconPath": "/static/tabs/my2_icon@2x.png",
-      "selectedIconPath": "static/tabs/my2_icon@2x.png",
-      "text": "通讯录"
-    },
-	  {
-	     "pagePath": "pages/mypage/mypage",
-	     "iconPath": "/static/images/my1.png",
-	     "selectedIconPath": "static/images/my.png",
-	     "text": "我的"
-	  }
+      {
+        "pagePath": "pages/homeIndex/index",
+        "iconPath": "/static/tabs/home.png",
+        "selectedIconPath": "static/tabs/home2.png",
+        "text": "首页"
+      },
+      {
+        "pagePath": "pages/addressBook/addressBook",
+        "iconPath": "/static/tabs/phone_icon@2x.png",
+        "selectedIconPath": "static/tabs/phone_icon@2x2.png",
+        "text": "通讯录"
+      },
+      {
+        "pagePath": "pages/mypage/mypage",
+        "iconPath": "/static/images/my2_icon@2x.png",
+        "selectedIconPath": "static/images/my2_icon@2x2.png",
+        "text": "我的"
+      }
     ]
   },
   "globalStyle": {
@@ -190,21 +211,25 @@
       "background": "#efeff4"
     }
   },
-  "subPackages":[{
-    "root": "subpkg",
-    "pages": [{
-      "path": "rainDetail/rainDetail"
-    }]
-  }],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
-		"navigationBarBackgroundColor": "#F8F8F8",
-		"backgroundColor": "#F8F8F8",
-    "backgroundColorTop":"transparent",
-     "navigationStyle": "custom",
-		"app-plus": {
-			"background": "#efeff4"
-		}
-	}
+  "subPackages": [
+    {
+      "root": "subpkg",
+      "pages": [
+        {
+          "path": "rainDetail/rainDetail"
+        }
+      ]
+    }
+  ],
+  "globalStyle": {
+    "navigationBarTextStyle": "black",
+    "navigationBarTitleText": "uni-app",
+    "navigationBarBackgroundColor": "#F8F8F8",
+    "backgroundColor": "#F8F8F8",
+    "backgroundColorTop": "transparent",
+    "navigationStyle": "custom",
+    "app-plus": {
+      "background": "#efeff4"
+    }
+  }
 }
diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue
index 168961f..4cf8182 100644
--- a/pages/homeIndex/index.vue
+++ b/pages/homeIndex/index.vue
@@ -65,9 +65,11 @@
         >24小时中共有<span class="ye">{{ list.data.stationNum }}</span
         >个降雨测站(山洪测站<span class="ye">{{ list.data.shStationNum }}</span
         >个)，其中最大降雨测站为<span class="ye">{{
-          list.data.maxRain.stnm || '-'
+          list.data.maxRain ? list.data.maxRain.stnm : '-'
+        }}</span
+        >，降雨量<span class="ye">{{
+          list.data.maxRain ? list.data.maxRain.drp : '-'
         }}</span
-        >，降雨量<span class="ye">{{ list.data.maxRain.drp || '-' }}</span
         >mm，
         <template v-if="list.data.cntDrp10 != 0"
           ><span class="b1">10mm</span>以下测站数为<apan class="ye">{{
diff --git a/pages/xxsb/dsfrom.vue b/pages/xxsb/dsfrom.vue
new file mode 100644
index 0000000..413c92e
--- /dev/null
+++ b/pages/xxsb/dsfrom.vue
@@ -0,0 +1,777 @@
+<template>
+  <view class="u-page">
+    <u-navbar
+      title="实时灾情上报"
+      @leftClick="navigateBack"
+      safeAreaInsetTop
+      fixed
+      placeholder
+    ></u-navbar>
+    <view class="info">
+      <view class="u-demo-block__content">
+        <!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
+        <!-- 工程详情上报 -->
+        <u--form
+          labelPosition="left"
+          :model="formList"
+          ref="form2"
+          labelWidth="100"
+          v-if="key == 3"
+        >
+          <u-form-item
+            label="灾害发生时间"
+            prop="projectName"
+            @click="
+              isTime2 = true
+              hideKeyboard()
+            "
+            :borderBottom="false"
+            ref="item1"
+          >
+            <u--input
+              placeholder="请选择"
+              v-model="formList.otime"
+              suffixIcon="arrow-right"
+              suffixIconStyle="color: #909399"
+            ></u--input>
+          </u-form-item>
+          <u-form-item
+            label="严重程度"
+            prop="severityList"
+            :borderBottom="false"
+            @click="
+              isseverity = true
+              hideKeyboard()
+            "
+            ref="item1"
+          >
+            <u--input
+              placeholder="请选择"
+              v-model="formList.severity"
+              suffixIcon="arrow-right"
+              suffixIconStyle="color: #909399"
+            ></u--input>
+          </u-form-item>
+          <!-- @click="toMap" -->
+          <u-form-item
+            label="灾害发生地点"
+            prop="address"
+            :borderBottom="false"
+            ref="item1"
+          >
+            <u--input
+              placeholder="请输入"
+              v-model="formList.address"
+              suffixIconStyle="color: #909399"
+            ></u--input>
+          </u-form-item>
+          <u-form-item label="经度：" :borderBottom="false" ref="item1">
+            <u--input
+              placeholder="请选择"
+              v-model="formList.lgtd"
+              suffixIconStyle="color: #909399"
+            ></u--input>
+          </u-form-item>
+          <u-form-item label="纬度" :borderBottom="false" ref="item1">
+            <u--input
+              placeholder="请选择"
+              v-model="formList.lttd"
+              suffixIconStyle="color: #909399"
+            ></u--input>
+          </u-form-item>
+
+          <!-- 水位(m) -->
+          <u-form-item
+            label="灾情描述"
+            prop="ddscrib"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u--textarea
+              placeholder="请输入"
+              v-model="formList.ddscrib"
+              count
+            ></u--textarea>
+          </u-form-item>
+          <!-- 管控责任人： -->
+          <u-form-item label="伤亡人数" prop="dpcount" ref="item3">
+            <u--input
+              v-model="formList.dpcount"
+              placeholder="请输入"
+              border="surround"
+              clearable
+            ></u--input>
+          </u-form-item>
+          <!-- 出库流量     (m³/s)： -->
+          <u-form-item
+            label="失踪人数"
+            prop="mpcount"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u--input
+              v-model="formList.mpcount"
+              placeholder="请输入"
+              type="number"
+              clearable
+              border="surround"
+            ></u--input>
+          </u-form-item>
+          <u-form-item
+            label="转移人数"
+            prop="spcount"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u--input
+              v-model="formList.spcount"
+              placeholder="请输入"
+              type="number"
+              clearable
+              border="surround"
+            ></u--input>
+          </u-form-item>
+          <u-form-item
+            label="损毁房屋(间)"
+            prop="chcount"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u--input
+              v-model="formList.chcount"
+              placeholder="请输入"
+              type="number"
+              clearable
+              border="surround"
+              @blur="BlurText($event)"
+            ></u--input>
+          </u-form-item>
+          <u-form-item
+            label="直接经济损失 (万元)"
+            prop="elose"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u--input
+              v-model="formList.elose"
+              placeholder="请输入"
+              type="number"
+              clearable
+              border="surround"
+              @blur="BlurText($event)"
+            ></u--input>
+          </u-form-item>
+
+          <u-form-item
+            label="过程降雨量(mm)"
+            prop="pfrain"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u--input
+              v-model="formList.pfrain"
+              placeholder="请输入"
+              type="number"
+              clearable
+              border="surround"
+              @blur="BlurText($event)"
+            ></u--input>
+          </u-form-item>
+          <!-- 其他运行情况 -->
+          <u-form-item
+            label="其他情况说明"
+            prop="remark"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u--textarea
+              placeholder="请输入"
+              v-model="formList.remark"
+              count
+            ></u--textarea>
+          </u-form-item>
+          <u-form-item
+            label="附件"
+            prop="fileList"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u-upload
+              :fileList="fileList1"
+              @afterRead="afterRead"
+              @delete="deletePic"
+              name="1"
+              multiple
+              :maxCount="10"
+              :previewFullImage="true"
+            ></u-upload>
+          </u-form-item>
+        </u--form>
+
+        <u-button
+          type="primary"
+          text="提交"
+          customStyle="margin-top: 50px"
+          @click="submit"
+        ></u-button>
+
+        <!-- 下拉选择 -->
+
+        <u-datetime-picker
+          :show="isTime2"
+          v-model="valueTime2"
+          mode="date"
+          @confirm="confirm2"
+          @cancel="cancel2"
+        ></u-datetime-picker>
+        <!--  mode="top" -->
+        <view v-if="isName">
+          <u-popup
+            :show="isName"
+            @close="isName = false"
+            mode="right"
+            @open="open"
+          >
+            <view style="padding: 30px 20px">
+              <view class="tabs_h">
+                <div
+                  class="leftTab"
+                  :class="{ activetextTypeTab: showTextTypeTab == 1 }"
+                  @click="tabChange(1)"
+                >
+                  {{ namelabel }}
+                </div>
+                <div
+                  class="rightTab"
+                  :class="{ activetextTypeTab: showTextTypeTab == 2 }"
+                  @click="tabChange(2)"
+                >
+                  {{ gclabel }}
+                </div>
+              </view>
+              <!-- 水电站和水库 -->
+              <view class="" v-if="isSk">
+                <div
+                  class="ul_list"
+                  :class="{ activeTypeClass: activeType == 1 }"
+                  @click="todetail(1, '水库')"
+                >
+                  <div class="left">水库</div>
+                  <u-icon
+                    v-if="activeType == 1"
+                    name="checkmark"
+                    color="#2286f6"
+                    size="20"
+                  ></u-icon>
+                </div>
+
+                <div
+                  class="ul_list"
+                  :class="{ activeTypeClass: activeType == 2 }"
+                  @click="todetail(2, '水电站')"
+                >
+                  <div class="left">水电站</div>
+                  <u-icon
+                    v-if="activeType == 2"
+                    name="checkmark"
+                    color="#2286f6"
+                    size="20"
+                  ></u-icon>
+                </div>
+              </view>
+              <!-- 具体水库或者水电站 -->
+              <view v-else style="height: 300px; overflow-y: auto">
+                <div v-for="(item, index) in resList" :key="index">
+                  <div
+                    class="ul_list"
+                    :class="{ activeTypeClass: item.isShow }"
+                    @click="infoClick(item)"
+                  >
+                    <div class="left">{{ item.resName }}</div>
+                    <u-icon
+                      v-if="item.isShow"
+                      name="checkmark"
+                      color="#2286f6"
+                      size="20"
+                    ></u-icon>
+                  </div>
+                </div>
+              </view>
+            </view>
+          </u-popup>
+        </view>
+
+        <!-- 严重程度 -->
+        <u-action-sheet
+          :show="isseverity"
+          :actions="severityList"
+          title="请选择"
+          @close="isseverity = false"
+          @select="severitySelect"
+        >
+        </u-action-sheet>
+
+        <!-- 是否已管控 -->
+        <u-action-sheet
+          :show="isControlled"
+          :actions="actions"
+          title="请选择"
+          @close="isControlled = false"
+          @select="controlledSelect"
+        >
+        </u-action-sheet>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import moment from 'moment'
+export default {
+  data () {
+    return {
+      showTextTypeTab: 1,
+      activeType: '',
+      valueTime2: Number(moment()),
+      isSk: true,
+      isTime2: false,
+      resList: [],
+      key: '',
+      title: {
+        1: '运行情况上报',
+        2: '工程险情上报',
+        3: '实时灾情上报'
+      },
+      namelabel: '请选择',
+      gclabel: '工程',
+      fileList1: [],
+      disabled1: false,
+      tips: '',
+      value: '',
+      showCalendar: false,
+      showBirthday: false,
+      formList: {
+        otime: '',
+        severity: '', //   严重程度（1一般险情 2较大险情 3重大险情 4特别重大险情）
+        address: '',
+        lgtd: '',
+        lttd: '',
+        ddscrib: '',
+        dpcount: '',
+        mpcount: '',
+        chcount: '',
+        spcount: '',
+        elose: '',
+
+        projectName: '', //工程名称
+        projectType: '', //工程类型
+
+        isControlled: '', // 是否已管控（0 否 1 是）
+        incidentDescription: '',
+        controlResponsiblePerson: '', // 管控责任人
+        responsiblePersonPhone: '', //责任人电话
+        remark: ''
+      },
+
+      fileIds: [],
+      isControlled: false,
+      isseverity: false, // 严重程度
+      showSex: false,
+      isRelease: false,
+      isName: false,
+
+      severityList: [
+        {
+          name: '一般险情'
+        },
+        {
+          name: '较大险情'
+        },
+        {
+          name: '重大险情'
+        },
+        {
+          name: '特别重大险情'
+        }
+      ],
+
+      actions: [
+        {
+          name: '是'
+        },
+        {
+          name: '否'
+        }
+      ],
+      rules: {
+        projectName: [
+          {
+            type: 'string',
+            required: true,
+            message: '请选择工程名称',
+            trigger: ['blur', 'change']
+          }
+        ]
+      },
+      projectType: 1
+    }
+  },
+  onLoad (options) {
+    this.key = options.key
+    console.log('搜索框22', options.key)
+
+    this.getresList()
+  },
+  onReady () {
+    console.log('搜索框22key', this.key)
+    // 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
+    if (this.key == 1) {
+      this.$refs.form1.setRules(this.rules)
+    } else if (this.key == 1) {
+      this.$refs.form2.setRules(this.rules)
+    }
+  },
+  methods: {
+    async getresList () {
+      let res = null
+      this.resList = []
+      res = await uni.$http.get('/gunshiApp/xfflood/webi/resList')
+      this.resList = res.data.data.map(item => {
+        item.isShow = false
+
+        return item
+      })
+    },
+
+    async gethystList () {
+      this.resList = []
+      let res = await uni.$http.get('/gunshiApp/xfflood/webi/hystList')
+      console.log('res', res.data.data)
+      this.resList = res.data.data.map(item => {
+        item.isShow = false
+        item.resName = item.hystName
+
+        return item
+      })
+    },
+
+    tabChange (val) {
+      this.showTextTypeTab = val
+      if (val == 1) {
+        this.isSk = true
+      } else {
+        this.isSk = false
+      }
+    },
+    todetail (val, title) {
+      this.activeType = val
+      this.showTextTypeTab = 2
+      this.isSk = false
+      this.namelabel = title
+      this.projectType = val
+      if (val == 1) {
+        this.getresList()
+      } else {
+        this.gethystList()
+      }
+    },
+    infoClick (obj) {
+      if (this.activeType == 1) {
+        this.resList = this.resList.map(item => {
+          if (item.resCode == obj.resCode) {
+            item.isShow = true
+            this.gclabel = item.resName
+            this.formList.projectName = item.resName
+
+            this.$refs.form1.validateField('isPowerGeneration')
+          } else {
+            item.isShow = false
+          }
+          return item
+        })
+      } else {
+        this.resList = this.resList.map(item => {
+          if (item.hystCode == obj.hystCode) {
+            item.isShow = true
+            this.gclabel = item.resName
+            this.formList.projectName = item.resName
+          } else {
+            item.isShow = false
+          }
+          return item
+        })
+      }
+    },
+    // 删除图片
+    deletePic (event) {
+      this[`fileList${event.name}`].splice(event.index, 1)
+    },
+    // 新增图片
+    async afterRead (event) {
+      // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+      let lists = [].concat(event.file)
+      let fileListLen = this[`fileList${event.name}`].length
+      lists.map(item => {
+        this[`fileList${event.name}`].push({
+          ...item,
+          status: 'uploading',
+          message: '上传中'
+        })
+      })
+      for (let i = 0; i < lists.length; i++) {
+        const result = await this.uploadFilePromise(lists[i].url)
+        let item = this[`fileList${event.name}`][fileListLen]
+        this[`fileList${event.name}`].splice(
+          fileListLen,
+          1,
+          Object.assign(item, {
+            status: 'success',
+            message: '',
+            url: result
+          })
+        )
+        fileListLen++
+      }
+    },
+    uploadFilePromise (url) {
+      return new Promise((resolve, reject) => {
+        let a = uni.uploadFile({
+          url: uni.$http.baseUrl + '/xfProjectRun/file/upload/singleSimple', // 仅为示例，非真实的接口地址
+          filePath: url,
+          name: 'file',
+          formData: {
+            user: 'test'
+          },
+          success: res => {
+            setTimeout(() => {
+              resolve(res.data.data)
+            }, 1000)
+          }
+        })
+      })
+    },
+
+    open () {},
+    groupChange (n) {
+      // console.log('groupChange', n);
+    },
+    radioChange (n) {
+      // console.log('radioChange', n);
+    },
+    navigateBack () {
+      uni.navigateBack()
+    },
+
+    severitySelect (e) {
+      console.log('severitySelect0', e)
+      this.formList.severity = e.name
+      this.$refs.form2.validateField('severity')
+    },
+    controlledSelect (e) {
+      this.formList.isControlled = e.name
+      this.$refs.form2.validateField('isControlled')
+    },
+
+    submit () {
+      if (key == 2) {
+        this.$refs.form2
+          .validate()
+          .then(res => {
+            uni.$u.toast('校验通过', res)
+
+            let params = Object.assign(this.formList)
+            if (this.fileId !== '') {
+              params = Object.assign(this.formList, this.fileId)
+            }
+            // 严重程度（1一般险情 2较大险情 3重大险情 4特别重大险情
+            let type = {
+              一般险情: 1,
+              较大险情: 2,
+              重大险情: 3,
+              特别重大险情: 4
+            }
+            params.severity = this.formLis.severity[type]
+            params.projectType = this.params.projectType
+
+            uni.$http
+              .post('/gunshiApp/xfflood/iaCHsfwater/insert', params)
+              .then(res => {
+                console.log('this.---', res)
+                if (res.data.code == 200) {
+                  console.log('this.model122', res.data)
+                  uni.reLaunch({
+                    url: '/pages/xxsb/index'
+                  })
+                }
+              })
+          })
+          .catch(errors => {
+            uni.$u.toast('校验失败', res)
+          })
+      } else if (key == 3) {
+        this.$refs.form3
+          .validate()
+          .then(res => {
+            uni.$u.toast('校验通过', res)
+            console.log('this.==', this.formList)
+
+            let params = Object.assign(this.formList)
+            if (this.fileId !== '') {
+              params = Object.assign(this.formList, this.fileId)
+            }
+            // 严重程度（1一般险情 2较大险情 3重大险情 4特别重大险情
+            let type = {
+              一般险情: 1,
+              较大险情: 2,
+              重大险情: 3,
+              特别重大险情: 4
+            }
+            params.severity = this.formLis.severity[type]
+            params.projectType = this.params.projectType
+
+            uni.$http
+              .post('/gunshiApp/xfProjectIncident/insert', params)
+              .then(res => {
+                console.log('this---', res)
+                if (res.data.code == 200) {
+                  console.log('this.model122', res.data)
+                  uni.reLaunch({
+                    url: '/pages/xxsb/index'
+                  })
+                }
+              })
+          })
+          .catch(errors => {
+            uni.$u.toast('校验失败', res)
+          })
+      } else {
+      }
+      // 如果有错误，会在catch中返回报错信息数组，校验通过则在then中返回true
+    },
+    reset () {
+      const validateList = ['projectName', 'isPowerGeneration', 'radiovalue1']
+      this.$refs.form1.resetFields()
+      this.$refs.form1.clearValidate()
+      setTimeout(() => {
+        this.$refs.form1.clearValidate(validateList)
+        // 或者使用 this.$refs.form1.clearValidate()
+      }, 10)
+    },
+    hideKeyboard () {
+      uni.hideKeyboard()
+    },
+    confirm2 (val) {
+      console.log(
+        '点击确定按钮时触发',
+        val.value,
+        moment(val.value).format('YYYY-MM-DD HH:mm:ss')
+      )
+
+      this.valueTime2 = Number(val)
+      this.formList.otime = moment(val.value).format('YYYY-MM-DD HH:mm:ss')
+      this.isTime2 = false
+    },
+    cancel2 () {
+      console.log('取消')
+      this.isTime2 = false
+    },
+    toMap () {
+      uni.navigateTo({
+        url: `./map`
+      })
+    },
+    // 过滤字符串
+    BlurText (e) {
+      console.log('e', e)
+      let reg = /^\d+$/.test(e)
+      if (!reg) {
+        // this.
+        console.log('22e', e)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  font-size: 14px;
+  background-color: #f3f5f8;
+}
+.tabs_h {
+  display: flex;
+  // justify-content: center;
+  align-items: center;
+  height: 56rpx;
+  line-height: 88rpx;
+  background-color: #fff;
+  margin-bottom: 12rpx;
+  text-align: center;
+}
+.leftTab {
+  // width: 80px;
+  margin-right: 20px;
+}
+.rightTab {
+  // width: 80px;
+}
+.activetextTypeTab,
+.activetextTypeTab:hover {
+  border-bottom: 3rpx solid #2286f6;
+  color: #026be0;
+}
+.activeTypeClass,
+.activeTypeClass:hover {
+  color: #026be0;
+}
+
+.nav_bar {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  margin-top: 30px;
+  padding-top: 20px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #dfdfdf;
+  box-shadow: 0 5px 10px -8px #dfdfdf inset;
+  background-color: #fff;
+  margin-bottom: 12rpx;
+}
+.nav_bar_tit {
+  text-align: center;
+}
+.info {
+  background-color: #fff;
+  margin-bottom: 12rpx;
+  padding: 20px;
+}
+
+.fl {
+  display: flex;
+  justify-content: start;
+  align-items: left;
+}
+.flsb {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.bottom {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.u-image {
+  width: 100%; /* 或者其他尺寸 */
+  transition: transform 0.3s; /* 平滑的放大效果 */
+}
+.ul_list {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 48px;
+  // border-bottom: 1px solid #dfdfdf;
+}
+</style>
diff --git a/pages/xxsb/from.vue b/pages/xxsb/from.vue
index dc246ec..ef4de06 100644
--- a/pages/xxsb/from.vue
+++ b/pages/xxsb/from.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="u-page">
     <u-navbar
-      title="表单"
+      :title="title[key]"
       @leftClick="navigateBack"
       safeAreaInsetTop
       fixed
@@ -15,10 +15,11 @@
           :model="model1"
           ref="form1"
           labelWidth="100"
+          v-if="key == 1"
         >
           <u-form-item
             label="工程名称"
-            prop="userInfo.name"
+            prop="projectName"
             @click="
               isName = true
               hideKeyboard()
@@ -28,14 +29,14 @@
           >
             <u--input
               placeholder="请选择"
-              v-model="model1.userInfo.name"
+              v-model="model1.projectName"
               suffixIcon="arrow-right"
               suffixIconStyle="color: #909399"
             ></u--input>
           </u-form-item>
           <u-form-item
             label="是否发电"
-            prop="userInfo.sex"
+            prop="isPowerGeneration"
             :borderBottom="false"
             @click="
               showSex = true
@@ -45,7 +46,7 @@
           >
             <u--input
               placeholder="请选择"
-              v-model="model1.userInfo.sex"
+              v-model="model1.isPowerGeneration"
               suffixIcon="arrow-right"
               suffixIconStyle="color: #909399"
             ></u--input>
@@ -134,15 +135,146 @@
               name="1"
               multiple
               :maxCount="10"
+              :previewFullImage="true"
             ></u-upload>
           </u-form-item>
         </u--form>
+        <!-- 工程详情上报 -->
+        <u--form
+          labelPosition="left"
+          :model="formList"
+          ref="form2"
+          labelWidth="100"
+          v-if="key == 2"
+        >
+          <u-form-item
+            label="工程名称"
+            prop="projectName"
+            @click="
+              isName = true
+              hideKeyboard()
+            "
+            :borderBottom="false"
+            ref="item1"
+          >
+            <u--input
+              placeholder="请选择"
+              v-model="model1.projectName"
+              suffixIcon="arrow-right"
+              suffixIconStyle="color: #909399"
+            ></u--input>
+          </u-form-item>
+          <u-form-item
+            label="严重程度"
+            prop="severityList"
+            :borderBottom="false"
+            @click="
+              isseverity = true
+              hideKeyboard()
+            "
+            ref="item1"
+          >
+            <u--input
+              placeholder="请选择"
+              v-model="formList.severity"
+              suffixIcon="arrow-right"
+              suffixIconStyle="color: #909399"
+            ></u--input>
+          </u-form-item>
+          <u-form-item
+            label="是否已管控"
+            prop="isControlled"
+            :borderBottom="false"
+            @click="
+              isControlled = true
+              hideKeyboard()
+            "
+            ref="item1"
+          >
+            <u--input
+              placeholder="请选择"
+              v-model="formList.isControlled"
+              suffixIcon="arrow-right"
+              suffixIconStyle="color: #909399"
+            ></u--input>
+          </u-form-item>
+          <!-- 水位(m) -->
+          <u-form-item
+            label="险情描述"
+            prop="incidentDescription"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u--textarea
+              placeholder="请输入"
+              v-model="formList.incidentDescription"
+              count
+            ></u--textarea>
+          </u-form-item>
+          <!-- 管控责任人： -->
+          <u-form-item label="管控责任人" prop="controlResponsiblePerson" ref="item3">
+            <u--input
+              v-model="formList.controlResponsiblePerson"
+              placeholder="请输入"
+              border="surround"
+              clearable
+            ></u--input>
+          </u-form-item>
+          <!-- 出库流量     (m³/s)： -->
+          <u-form-item
+            label="联系电话"
+            prop="responsiblePersonPhone"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u--input
+              v-model="formList.responsiblePersonPhone"
+              placeholder="请输入"
+              type="number"
+              clearable
+              border="surround"
+              @blur="BlurText($event)"
+            ></u--input>
+          </u-form-item>
+          <!-- 其他运行情况 -->
+          <u-form-item
+            label="其他情况说明"
+            prop="remark"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u--textarea
+              placeholder="请输入"
+              v-model="formList.remark"
+              count
+            ></u--textarea>
+          </u-form-item>
+          <u-form-item
+            label="附件"
+            prop="fileList"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u-upload
+              :fileList="fileList1"
+              @afterRead="afterRead"
+              @delete="deletePic"
+              name="1"
+              multiple
+              :maxCount="10"
+              :previewFullImage="true"
+            ></u-upload>
+          </u-form-item>
+        </u--form>
+
         <u-button
           type="primary"
           text="提交"
           customStyle="margin-top: 50px"
           @click="submit"
         ></u-button>
+
+        <!-- 下拉选择 -->
         <!-- isRelease -->
         <u-action-sheet
           :show="isRelease"
@@ -161,9 +293,14 @@
           @select="sexSelect"
         >
         </u-action-sheet>
-        <!--  -->
+        <!--  mode="top" -->
         <view v-if="isName">
-          <u-popup :show="isName" @close="isName = false" @open="open">
+          <u-popup
+            :show="isName"
+            @close="isName = false"
+            mode="right"
+            @open="open"
+          >
             <view style="padding: 30px 20px">
               <view class="tabs_h">
                 <div
@@ -232,6 +369,27 @@
             </view>
           </u-popup>
         </view>
+
+        <!-- 严重程度 -->
+        <u-action-sheet
+          :show="isseverity"
+          :actions="severityList"
+          title="请选择"
+          @close="isseverity = false"
+          @select="severitySelect"
+        >
+        </u-action-sheet>
+
+        <!-- 是否已管控 -->
+        <u-action-sheet
+          :show="isControlled"
+          :actions="actions"
+          title="请选择"
+          @close="isControlled = false"
+          @select="controlledSelect"
+        >
+        </u-action-sheet>
+        </u-action-sheet>
       </view>
     </view>
   </view>
@@ -259,21 +417,51 @@ export default {
       value: '',
       showCalendar: false,
       showBirthday: false,
+      formList: {
+        projectName: '', //工程名称
+        projectType: '', //工程类型
+        severity: '', //   严重程度（1一般险情 2较大险情 3重大险情 4特别重大险情）
+        isControlled:'' ,// 是否已管控（0 否 1 是）
+        incidentDescription:'',
+        controlResponsiblePerson:"", // 管控责任人
+        responsiblePersonPhone:'' //责任人电话
+
+      },
       model1: {
-        userInfo: {
-          name: '',
-          sex: ''
-        },
+        projectName: '',
+        isPowerGeneration: '',
         isFloodRelease: '',
         waterLevel: '',
         inflowVolume: '',
         outflowVolume: '',
         remark: ''
       },
+      fileIds: [],
+      isControlled:false, 
+      isseverity: false, // 严重程度
       showSex: false,
       isRelease: false,
       isName: false,
 
+      severityList: [
+        {
+          name: '一般险情',
+          
+        },
+        {
+          name: '较大险情',
+          
+        },
+        {
+          name: '重大险情',
+          
+        },
+        {
+          name: '特别重大险情',
+         
+        }
+      ],
+
       actions: [
         {
           name: '是'
@@ -283,7 +471,7 @@ export default {
         }
       ],
       rules: {
-        'userInfo.name': [
+        projectName: [
           {
             type: 'string',
             required: true,
@@ -291,17 +479,24 @@ export default {
             trigger: ['blur', 'change']
           }
         ]
-      }
+      },
+      projectType: 1
     }
   },
   onLoad (options) {
     this.key = options.key
-    console.log('搜索框', options.key)
+    console.log('搜索框22', options.key)
+    
     this.getresList()
   },
   onReady () {
+    console.log('搜索框22key', this.key )
     // 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
-    this.$refs.form1.setRules(this.rules)
+    if (this.key == 1) {
+      this.$refs.form1.setRules(this.rules)
+    } else if(this.key == 1) {
+      this.$refs.form2.setRules(this.rules)
+    }
   },
   methods: {
     async getresList () {
@@ -340,6 +535,7 @@ export default {
       this.showTextTypeTab = 2
       this.isSk = false
       this.namelabel = title
+      this.projectType = val
       if (val == 1) {
         this.getresList()
       } else {
@@ -352,8 +548,8 @@ export default {
           if (item.resCode == obj.resCode) {
             item.isShow = true
             this.gclabel = item.resName
-            this.model1.userInfo.name = item.resName
-            this.$refs.form1.validateField('userInfo.sex')
+            this.model1.projectName = item.resName
+            this.$refs.form1.validateField('isPowerGeneration')
           } else {
             item.isShow = false
           }
@@ -364,7 +560,7 @@ export default {
           if (item.hystCode == obj.hystCode) {
             item.isShow = true
             this.gclabel = item.resName
-            this.model1.userInfo.name = item.resName
+            this.model1.projectName = item.resName
           } else {
             item.isShow = false
           }
@@ -406,7 +602,7 @@ export default {
     uploadFilePromise (url) {
       return new Promise((resolve, reject) => {
         let a = uni.uploadFile({
-          url: 'http://192.168.2.21:7001/upload', // 仅为示例，非真实的接口地址
+          url: uni.$http.baseUrl + '/xfProjectRun/file/upload/singleSimple', // 仅为示例，非真实的接口地址
           filePath: url,
           name: 'file',
           formData: {
@@ -440,32 +636,63 @@ export default {
     },
     // 是否发电
     sexSelect (e) {
-      this.model1.userInfo.sex = e.name
-      this.$refs.form1.validateField('userInfo.sex')
+      this.model1.isPowerGeneration = e.name
+      this.$refs.form1.validateField('isPowerGeneration')
     },
     // 是否泄洪
     releaseSelect (e) {
       this.model1.isFloodRelease = e.name
       this.$refs.form1.validateField('isFloodRelease')
     },
-    change (e) {
-      console.log(e)
+
+    severitySelect (e) {
+      console.log('severitySelect0', e)
+      this.formList.severity = e.name
+      this.$refs.form2.validateField('severity')
+    },
+    controlledSelect (e){
+      this.formList.isControlled = e.name
+      this.$refs.form2.validateField('isControlled')
     },
 
+
     submit () {
-      // 如果有错误，会在catch中返回报错信息数组，校验通过则在then中返回true
-      this.$refs.form1
+      if(key ==1){
+        this.$refs.form1
         .validate()
         .then(res => {
-          uni.$u.toast('校验通过')
+          uni.$u.toast('校验通过', res)
           console.log('this.model1', this.model1)
+
+          let params = Object.assign(this.model1)
+          if (this.fileId !== '') {
+            params = Object.assign(this.model1, this.fileId)
+          }
+          params.projectType = this.params.projectType
+          params.isPowerGeneration = params.isPowerGeneration == '是' ? 1 : 0
+          params.isFloodRelease = params.isFloodRelease == '是' ? 1 : 0
+
+          uni.$http
+            .post('/gunshiApp/xfflood/xfProjectRun/insert', params)
+            .then(res => {
+              console.log('this.model1---', res)
+              if (res.data.code == 200) {
+                console.log('this.model122', res.data)
+                uni.reLaunch({
+                  url: '/pages/xxsb/index'
+                })
+              }
+            })
         })
         .catch(errors => {
-          uni.$u.toast('校验失败')
+          uni.$u.toast('校验失败', res)
         })
+      }
+      // 如果有错误，会在catch中返回报错信息数组，校验通过则在then中返回true
+      
     },
     reset () {
-      const validateList = ['userInfo.name', 'userInfo.sex', 'radiovalue1']
+      const validateList = ['projectName', 'isPowerGeneration', 'radiovalue1']
       this.$refs.form1.resetFields()
       this.$refs.form1.clearValidate()
       setTimeout(() => {
diff --git a/pages/xxsb/fromSeverity.vue b/pages/xxsb/fromSeverity.vue
new file mode 100644
index 0000000..3c0eb49
--- /dev/null
+++ b/pages/xxsb/fromSeverity.vue
@@ -0,0 +1,689 @@
+<template>
+  <view class="u-page">
+    <u-navbar
+      :title="title[key]"
+      @leftClick="navigateBack"
+      safeAreaInsetTop
+      fixed
+      placeholder
+    ></u-navbar>
+    <view class="info">
+      <view class="u-demo-block__content">
+        <!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
+        <!-- 工程详情上报 -->
+        <u--form
+          labelPosition="left"
+          :model="formList"
+          ref="form2"
+          labelWidth="100"
+          v-if="key == 2"
+        >
+          <u-form-item
+            label="工程名称"
+            prop="projectName"
+            @click="
+              isName = true
+              hideKeyboard()
+            "
+            :borderBottom="false"
+            ref="item1"
+          >
+            <u--input
+              placeholder="请选择"
+              v-model="formList.projectName"
+              suffixIcon="arrow-right"
+              suffixIconStyle="color: #909399"
+            ></u--input>
+          </u-form-item>
+          <u-form-item
+            label="严重程度"
+            prop="severityList"
+            :borderBottom="false"
+            @click="
+              isseverity = true
+              hideKeyboard()
+            "
+            ref="item1"
+          >
+            <u--input
+              placeholder="请选择"
+              v-model="formList.severity"
+              suffixIcon="arrow-right"
+              suffixIconStyle="color: #909399"
+            ></u--input>
+          </u-form-item>
+          <u-form-item
+            label="是否已管控"
+            prop="isControlled"
+            :borderBottom="false"
+            @click="
+              isControlled = true
+              hideKeyboard()
+            "
+            ref="item1"
+          >
+            <u--input
+              placeholder="请选择"
+              v-model="formList.isControlled"
+              suffixIcon="arrow-right"
+              suffixIconStyle="color: #909399"
+            ></u--input>
+          </u-form-item>
+          <!-- 水位(m) -->
+          <u-form-item
+            label="险情描述"
+            prop="incidentDescription"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u--textarea
+              placeholder="请输入"
+              v-model="formList.incidentDescription"
+              count
+            ></u--textarea>
+          </u-form-item>
+          <!-- 管控责任人： -->
+          <u-form-item label="管控责任人" prop="controlResponsiblePerson" ref="item3">
+            <u--input
+              v-model="formList.controlResponsiblePerson"
+              placeholder="请输入"
+              border="surround"
+              clearable
+            ></u--input>
+          </u-form-item>
+          <!-- 出库流量     (m³/s)： -->
+          <u-form-item
+            label="联系电话"
+            prop="responsiblePersonPhone"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u--input
+              v-model="formList.responsiblePersonPhone"
+              placeholder="请输入"
+              type="number"
+              clearable
+              border="surround"
+              @blur="BlurText($event)"
+            ></u--input>
+          </u-form-item>
+          <!-- 其他运行情况 -->
+          <u-form-item
+            label="其他情况说明"
+            prop="remark"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u--textarea
+              placeholder="请输入"
+              v-model="formList.remark"
+              count
+            ></u--textarea>
+          </u-form-item>
+          <u-form-item
+            label="附件"
+            prop="fileList"
+            :borderBottom="false"
+            ref="item3"
+          >
+            <u-upload
+              :fileList="fileList1"
+              @afterRead="afterRead"
+              @delete="deletePic"
+              name="1"
+              multiple
+              :maxCount="10"
+              :previewFullImage="true"
+            ></u-upload>
+          </u-form-item>
+        </u--form>
+
+        <u-button
+          type="primary"
+          text="提交"
+          customStyle="margin-top: 50px"
+          @click="submit"
+        ></u-button>
+
+        <!-- 下拉选择 -->
+
+
+        <!--  mode="top" -->
+        <view v-if="isName">
+          <u-popup
+            :show="isName"
+            @close="isName = false"
+            mode="right"
+            @open="open"
+          >
+            <view style="padding: 30px 20px">
+              <view class="tabs_h">
+                <div
+                  class="leftTab"
+                  :class="{ activetextTypeTab: showTextTypeTab == 1 }"
+                  @click="tabChange(1)"
+                >
+                  {{ namelabel }}
+                </div>
+                <div
+                  class="rightTab"
+                  :class="{ activetextTypeTab: showTextTypeTab == 2 }"
+                  @click="tabChange(2)"
+                >
+                  {{ gclabel }}
+                </div>
+              </view>
+              <!-- 水电站和水库 -->
+              <view class="" v-if="isSk">
+                <div
+                  class="ul_list"
+                  :class="{ activeTypeClass: activeType == 1 }"
+                  @click="todetail(1, '水库')"
+                >
+                  <div class="left">水库</div>
+                  <u-icon
+                    v-if="activeType == 1"
+                    name="checkmark"
+                    color="#2286f6"
+                    size="20"
+                  ></u-icon>
+                </div>
+
+                <div
+                  class="ul_list"
+                  :class="{ activeTypeClass: activeType == 2 }"
+                  @click="todetail(2, '水电站')"
+                >
+                  <div class="left">水电站</div>
+                  <u-icon
+                    v-if="activeType == 2"
+                    name="checkmark"
+                    color="#2286f6"
+                    size="20"
+                  ></u-icon>
+                </div>
+              </view>
+              <!-- 具体水库或者水电站 -->
+              <view v-else style="height: 300px; overflow-y: auto">
+                <div v-for="(item, index) in resList" :key="index">
+                  <div
+                    class="ul_list"
+                    :class="{ activeTypeClass: item.isShow }"
+                    @click="infoClick(item)"
+                  >
+                    <div class="left">{{ item.resName }}</div>
+                    <u-icon
+                      v-if="item.isShow"
+                      name="checkmark"
+                      color="#2286f6"
+                      size="20"
+                    ></u-icon>
+                  </div>
+                </div>
+              </view>
+            </view>
+          </u-popup>
+        </view>
+
+        <!-- 严重程度 -->
+        <u-action-sheet
+          :show="isseverity"
+          :actions="severityList"
+          title="请选择"
+          @close="isseverity = false"
+          @select="severitySelect"
+        >
+        </u-action-sheet>
+
+        <!-- 是否已管控 -->
+        <u-action-sheet
+          :show="isControlled"
+          :actions="actions"
+          title="请选择"
+          @close="isControlled = false"
+          @select="controlledSelect"
+        >
+        </u-action-sheet>
+        </u-action-sheet>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      showTextTypeTab: 1,
+      activeType: '',
+      isSk: true,
+      resList: [],
+      key: '',
+      title: {
+        1: '运行情况上报',
+        2: '工程险情上报',
+        3: '实时灾情上报'
+      },
+      namelabel: '请选择',
+      gclabel: '工程',
+      fileList1: [],
+      disabled1: false,
+      tips: '',
+      value: '',
+      showCalendar: false,
+      showBirthday: false,
+      formList: {
+        projectName: '', //工程名称
+        projectType: '', //工程类型
+        severity: '', //   严重程度（1一般险情 2较大险情 3重大险情 4特别重大险情）
+        isControlled:'' ,// 是否已管控（0 否 1 是）
+        incidentDescription:'',
+        controlResponsiblePerson:"", // 管控责任人
+        responsiblePersonPhone:'', //责任人电话
+        remark:""
+
+      },
+
+      fileIds: [],
+      isControlled:false, 
+      isseverity: false, // 严重程度
+      showSex: false,
+      isRelease: false,
+      isName: false,
+
+      severityList: [
+        {
+          name: '一般险情',
+          
+        },
+        {
+          name: '较大险情',
+          
+        },
+        {
+          name: '重大险情',
+          
+        },
+        {
+          name: '特别重大险情',
+         
+        }
+      ],
+
+      actions: [
+        {
+          name: '是'
+        },
+        {
+          name: '否'
+        }
+      ],
+      rules: {
+        projectName: [
+          {
+            type: 'string',
+            required: true,
+            message: '请选择工程名称',
+            trigger: ['blur', 'change']
+          }
+        ]
+      },
+      projectType: 1
+    }
+  },
+  onLoad (options) {
+    this.key = options.key
+    console.log('搜索框22', options.key)
+    
+    this.getresList()
+  },
+  onReady () {
+    console.log('搜索框22key', this.key )
+    // 如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则
+    if (this.key == 1) {
+      this.$refs.form1.setRules(this.rules)
+    } else if(this.key == 1) {
+      this.$refs.form2.setRules(this.rules)
+    }
+  },
+  methods: {
+    async getresList () {
+      let res = null
+      this.resList = []
+      res = await uni.$http.get('/gunshiApp/xfflood/webi/resList')
+      this.resList = res.data.data.map(item => {
+        item.isShow = false
+
+        return item
+      })
+    },
+
+    async gethystList () {
+      this.resList = []
+      let res = await uni.$http.get('/gunshiApp/xfflood/webi/hystList')
+      console.log('res', res.data.data)
+      this.resList = res.data.data.map(item => {
+        item.isShow = false
+        item.resName = item.hystName
+
+        return item
+      })
+    },
+
+    tabChange (val) {
+      this.showTextTypeTab = val
+      if (val == 1) {
+        this.isSk = true
+      } else {
+        this.isSk = false
+      }
+    },
+    todetail (val, title) {
+      this.activeType = val
+      this.showTextTypeTab = 2
+      this.isSk = false
+      this.namelabel = title
+      this.projectType = val
+      if (val == 1) {
+        this.getresList()
+      } else {
+        this.gethystList()
+      }
+    },
+    infoClick (obj) {
+      if (this.activeType == 1) {
+        this.resList = this.resList.map(item => {
+          if (item.resCode == obj.resCode) {
+            item.isShow = true
+            this.gclabel = item.resName
+            this.formList.projectName = item.resName
+
+            this.$refs.form1.validateField('isPowerGeneration')
+          } else {
+            item.isShow = false
+          }
+          return item
+        })
+      } else {
+        this.resList = this.resList.map(item => {
+          if (item.hystCode == obj.hystCode) {
+            item.isShow = true
+            this.gclabel = item.resName
+            this.formList.projectName = item.resName
+          } else {
+            item.isShow = false
+          }
+          return item
+        })
+      }
+    },
+    // 删除图片
+    deletePic (event) {
+      this[`fileList${event.name}`].splice(event.index, 1)
+    },
+    // 新增图片
+    async afterRead (event) {
+      // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
+      let lists = [].concat(event.file)
+      let fileListLen = this[`fileList${event.name}`].length
+      lists.map(item => {
+        this[`fileList${event.name}`].push({
+          ...item,
+          status: 'uploading',
+          message: '上传中'
+        })
+      })
+      for (let i = 0; i < lists.length; i++) {
+        const result = await this.uploadFilePromise(lists[i].url)
+        let item = this[`fileList${event.name}`][fileListLen]
+        this[`fileList${event.name}`].splice(
+          fileListLen,
+          1,
+          Object.assign(item, {
+            status: 'success',
+            message: '',
+            url: result
+          })
+        )
+        fileListLen++
+      }
+    },
+    uploadFilePromise (url) {
+      return new Promise((resolve, reject) => {
+        let a = uni.uploadFile({
+          url: uni.$http.baseUrl + '/xfProjectRun/file/upload/singleSimple', // 仅为示例，非真实的接口地址
+          filePath: url,
+          name: 'file',
+          formData: {
+            user: 'test'
+          },
+          success: res => {
+            setTimeout(() => {
+              resolve(res.data.data)
+            }, 1000)
+          }
+        })
+      })
+    },
+    afterRead (event) {
+      this.fileList1.push({
+        url: event.file,
+        status: 'uploading',
+        message: '上传中'
+      })
+    },
+
+    open () {},
+    groupChange (n) {
+      // console.log('groupChange', n);
+    },
+    radioChange (n) {
+      // console.log('radioChange', n);
+    },
+    navigateBack () {
+      uni.navigateBack()
+    },
+
+
+
+    severitySelect (e) {
+      console.log('severitySelect0', e)
+      this.formList.severity = e.name
+      this.$refs.form2.validateField('severity')
+    },
+    controlledSelect (e){
+      this.formList.isControlled = e.name
+      this.$refs.form2.validateField('isControlled')
+    },
+
+
+    submit () {
+   if(key ==2){
+        this.$refs.form2
+        .validate()
+        .then(res => {
+          uni.$u.toast('校验通过', res)
+         
+
+          let params = Object.assign(this.formList)
+          if (this.fileId !== '') {
+            params = Object.assign(this.formList, this.fileId)
+          }
+          // 严重程度（1一般险情 2较大险情 3重大险情 4特别重大险情
+          let type ={
+            '一般险情':1,
+            '较大险情':2,
+            '重大险情':3,
+            '特别重大险情':4,
+          }
+          params.severity = this.formLis.severity[type]
+          params.projectType = this.params.projectType
+          params.isControlled = params.isControlled == '是' ? 1 : 0
+        
+
+          uni.$http
+            .post('/gunshiApp/xfProjectIncident/insert', params)
+            .then(res => {
+              console.log('this.---', res)
+              if (res.data.code == 200) {
+                console.log('this.model122', res.data)
+                uni.reLaunch({
+                  url: '/pages/xxsb/index'
+                })
+              }
+            })
+        })
+        .catch(errors => {
+          uni.$u.toast('校验失败', res)
+        })
+      }else if(key ==3){
+        this.$refs.form3
+        .validate()
+        .then(res => {
+          uni.$u.toast('校验通过', res)
+          console.log('this.==', this.formList)
+
+          let params = Object.assign(this.formList)
+          if (this.fileId !== '') {
+            params = Object.assign(this.formList, this.fileId)
+          }
+          // 严重程度（1一般险情 2较大险情 3重大险情 4特别重大险情
+          let type ={
+            '一般险情':1,
+            '较大险情':2,
+            '重大险情':3,
+            '特别重大险情':4,
+          }
+          params.severity = this.formLis.severity[type]
+          params.projectType = this.params.projectType
+          params.isControlled = params.isControlled == '是' ? 1 : 0
+        
+
+          uni.$http
+            .post('/gunshiApp/xfProjectIncident/insert', params)
+            .then(res => {
+              console.log('this---', res)
+              if (res.data.code == 200) {
+                console.log('this.model122', res.data)
+                uni.reLaunch({
+                  url: '/pages/xxsb/index'
+                })
+              }
+            })
+        })
+        .catch(errors => {
+          uni.$u.toast('校验失败', res)
+        })
+      }else{
+        
+      }
+      // 如果有错误，会在catch中返回报错信息数组，校验通过则在then中返回true
+      
+    },
+    reset () {
+      const validateList = ['projectName', 'isPowerGeneration', 'radiovalue1']
+      this.$refs.form1.resetFields()
+      this.$refs.form1.clearValidate()
+      setTimeout(() => {
+        this.$refs.form1.clearValidate(validateList)
+        // 或者使用 this.$refs.form1.clearValidate()
+      }, 10)
+    },
+    hideKeyboard () {
+      uni.hideKeyboard()
+    },
+    // 过滤字符串
+    BlurText (e) {
+      console.log('e', e)
+      let reg = /^\d+$/.test(e)
+      if (!reg) {
+        // this.
+        console.log('22e', e)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.container {
+  font-size: 14px;
+  background-color: #f3f5f8;
+}
+.tabs_h {
+  display: flex;
+  // justify-content: center;
+  align-items: center;
+  height: 56rpx;
+  line-height: 88rpx;
+  background-color: #fff;
+  margin-bottom: 12rpx;
+  text-align: center;
+}
+.leftTab {
+  // width: 80px;
+  margin-right: 20px;
+}
+.rightTab {
+  // width: 80px;
+}
+.activetextTypeTab,
+.activetextTypeTab:hover {
+  border-bottom: 3rpx solid #2286f6;
+  color: #026be0;
+}
+.activeTypeClass,
+.activeTypeClass:hover {
+  color: #026be0;
+}
+
+.nav_bar {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+  margin-top: 30px;
+  padding-top: 20px;
+  padding-bottom: 10px;
+  border-bottom: 1px solid #dfdfdf;
+  box-shadow: 0 5px 10px -8px #dfdfdf inset;
+  background-color: #fff;
+  margin-bottom: 12rpx;
+}
+.nav_bar_tit {
+  text-align: center;
+}
+.info {
+  background-color: #fff;
+  margin-bottom: 12rpx;
+  padding: 20px;
+}
+
+.fl {
+  display: flex;
+  justify-content: start;
+  align-items: left;
+}
+.flsb {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.bottom {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.u-image {
+  width: 100%; /* 或者其他尺寸 */
+  transition: transform 0.3s; /* 平滑的放大效果 */
+}
+.ul_list {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  height: 48px;
+  // border-bottom: 1px solid #dfdfdf;
+}
+</style>
diff --git a/pages/xxsb/index.vue b/pages/xxsb/index.vue
index 8423449..01ef34a 100644
--- a/pages/xxsb/index.vue
+++ b/pages/xxsb/index.vue
@@ -1,9 +1,12 @@
 <template>
   <view class="container">
-    <view class="nav_bar">
-      <u-icon name="arrow-left" color="#000" size="28"></u-icon>
-      <view class="nav_bar_tit"> 工情灾情 </view>
-    </view>
+    <u-navbar
+      title="信息上报"
+      @leftClick="navigateBack"
+      safeAreaInsetTop
+      fixed
+      placeholder
+    ></u-navbar>
 
     <view class="info">
       <div class="ul_list" @click="todetail(1)">
@@ -28,11 +31,24 @@ export default {
   },
   onLoad () {},
   methods: {
+    navigateBack () {
+      uni.navigateBack()
+    },
     todetail (val) {
       console.log('val', val)
-      uni.navigateTo({
-        url: `./from?key=${val}`
-      })
+      if (val == 2) {
+        uni.navigateTo({
+          url: `./fromSeverity?key=${val}`
+        })
+      } else if (val == 1) {
+        uni.navigateTo({
+          url: `./from?key=${val}`
+        })
+      } else {
+        uni.navigateTo({
+          url: `./dsfrom?key=${val}`
+        })
+      }
     }
   }
 }
diff --git a/pages/xxsb/map.vue b/pages/xxsb/map.vue
new file mode 100644
index 0000000..1cdd867
--- /dev/null
+++ b/pages/xxsb/map.vue
@@ -0,0 +1,30 @@
+<template>
+  <view class="mapBox">
+    <div>fdfdfd</div>
+    <map id="myMap"></map>
+    <button  text="确定"></button>
+  </view>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      lng: 120.12345,
+      lat: 30.6789,
+      scale: 16
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.mapBox {
+  width: 100%;
+  height: 100%;
+  padding: 10px;
+}
+#id {
+  height: 300px;
+  background-color: pink;
+}
+</style>
diff --git a/static/images/home.png b/static/images/home.png
new file mode 100644
index 0000000..021b1cd
Binary files /dev/null and b/static/images/home.png differ
diff --git a/static/images/home1.png b/static/images/home1.png
new file mode 100644
index 0000000..538ae02
Binary files /dev/null and b/static/images/home1.png differ
diff --git a/static/images/home2.png b/static/images/home2.png
new file mode 100644
index 0000000..538ae02
Binary files /dev/null and b/static/images/home2.png differ
diff --git a/static/images/my2_icon@2x.png b/static/images/my2_icon@2x.png
new file mode 100644
index 0000000..5a76d5c
Binary files /dev/null and b/static/images/my2_icon@2x.png differ
diff --git a/static/images/my2_icon@2x2.png b/static/images/my2_icon@2x2.png
new file mode 100644
index 0000000..b953974
Binary files /dev/null and b/static/images/my2_icon@2x2.png differ
diff --git a/static/images/phone_icon@2x.png b/static/images/phone_icon@2x.png
new file mode 100644
index 0000000..d4bf6f3
Binary files /dev/null and b/static/images/phone_icon@2x.png differ
diff --git a/static/images/phone_icon@2x2.png b/static/images/phone_icon@2x2.png
new file mode 100644
index 0000000..cbcdf53
Binary files /dev/null and b/static/images/phone_icon@2x2.png differ
diff --git a/static/tabs/home2.png b/static/tabs/home2.png
new file mode 100644
index 0000000..538ae02
Binary files /dev/null and b/static/tabs/home2.png differ
diff --git a/static/tabs/my2_icon@2x.png b/static/tabs/my2_icon@2x.png
index 76c1469..5a76d5c 100644
Binary files a/static/tabs/my2_icon@2x.png and b/static/tabs/my2_icon@2x.png differ
diff --git a/static/tabs/my2_icon@2x2.png b/static/tabs/my2_icon@2x2.png
new file mode 100644
index 0000000..b953974
Binary files /dev/null and b/static/tabs/my2_icon@2x2.png differ
diff --git a/static/tabs/phone_icon@2x.png b/static/tabs/phone_icon@2x.png
index 683c0e4..d4bf6f3 100644
Binary files a/static/tabs/phone_icon@2x.png and b/static/tabs/phone_icon@2x.png differ
diff --git a/static/tabs/phone_icon@2x2.png b/static/tabs/phone_icon@2x2.png
new file mode 100644
index 0000000..cbcdf53
Binary files /dev/null and b/static/tabs/phone_icon@2x2.png differ
diff --git a/unpackage/dist/dev/app-plus/app-config-service.js b/unpackage/dist/dev/app-plus/app-config-service.js
index f1c55c4..9d6d320 100644
--- a/unpackage/dist/dev/app-plus/app-config-service.js
+++ b/unpackage/dist/dev/app-plus/app-config-service.js
@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/login/login","pages/rain/rain","pages/homeIndex/index","pages/xxsb/index","pages/xxsb/from","pages/gqzq/index","pages/gqzq/gqxx","pages/gqzq/zqxx","pages/gqzq/detail/index","pages/mypage/mypage","pages/personInfo/personInfo","pages/modifyPassword/modifyPassword","pages/forewarning/forewarning","pages/forewarning/sh","pages/forewarning/shInformation/shInformation","pages/addressBook/addressBook","pages/water/water","pages/rainDetail/rainDetail","pages/hdDetail/hdDetail","pages/skDetail/skDetail","pages/addressBook/follow","pages/addressBook/myDept","pages/orderFeedback/orderFeedback","pages/orderFeedback/orderInformation","subpkg/rainDetail/rainDetail"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8","backgroundColorTop":"transparent","navigationStyle":"custom","background":"#efeff4"},"tabBar":{"color":"#333333","selectedColor":"#eb4450","list":[{"pagePath":"pages/homeIndex/index","iconPath":"/static/tabs/home.png","selectedIconPath":"static/tabs/home1.png","text":"首页"},{"pagePath":"pages/addressBook/addressBook","iconPath":"/static/tabs/my2_icon@2x.png","selectedIconPath":"static/tabs/my2_icon@2x.png","text":"通讯录"},{"pagePath":"pages/mypage/mypage","iconPath":"/static/images/my1.png","selectedIconPath":"static/images/my.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"xffxkh-app","compilerVersion":"4.15","entryPagePath":"pages/login/login","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/login/login","meta":{"isQuit":true},"window":{"navigationBarTitleText":""}},{"path":"/pages/rain/rain","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/homeIndex/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":""}},{"path":"/pages/xxsb/index","meta":{},"window":{"navigationBarTitleText":"信息上报"}},{"path":"/pages/xxsb/from","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/gqzq/index","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/gqzq/gqxx","meta":{},"window":{"navigationBarTitleText":"工情信息"}},{"path":"/pages/gqzq/zqxx","meta":{},"window":{"navigationBarTitleText":"灾情信息"}},{"path":"/pages/gqzq/detail/index","meta":{},"window":{"navigationBarTitleText":"查看"}},{"path":"/pages/mypage/mypage","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":""}},{"path":"/pages/personInfo/personInfo","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/modifyPassword/modifyPassword","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/forewarning/forewarning","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/forewarning/sh","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/forewarning/shInformation/shInformation","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/addressBook/addressBook","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":""}},{"path":"/pages/water/water","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/rainDetail/rainDetail","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/hdDetail/hdDetail","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/skDetail/skDetail","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/addressBook/follow","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/addressBook/myDept","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/orderFeedback/orderFeedback","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/orderFeedback/orderInformation","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/subpkg/rainDetail/rainDetail","meta":{},"window":{}}];
+var __uniConfig = {"pages":["pages/login/login","pages/rain/rain","pages/homeIndex/index","pages/xxsb/index","pages/xxsb/from","pages/xxsb/fromSeverity","pages/xxsb/dsfrom","pages/xxsb/map","pages/gqzq/index","pages/gqzq/gqxx","pages/gqzq/zqxx","pages/gqzq/detail/index","pages/mypage/mypage","pages/personInfo/personInfo","pages/modifyPassword/modifyPassword","pages/forewarning/forewarning","pages/forewarning/sh","pages/forewarning/shInformation/shInformation","pages/addressBook/addressBook","pages/water/water","pages/rainDetail/rainDetail","pages/hdDetail/hdDetail","pages/skDetail/skDetail","pages/addressBook/follow","pages/addressBook/myDept","pages/orderFeedback/orderFeedback","pages/orderFeedback/orderInformation","subpkg/rainDetail/rainDetail"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8","backgroundColorTop":"transparent","navigationStyle":"custom","background":"#efeff4"},"tabBar":{"color":"#333333","selectedColor":"#59A7FF","list":[{"pagePath":"pages/homeIndex/index","iconPath":"/static/tabs/home.png","selectedIconPath":"static/tabs/home2.png","text":"首页"},{"pagePath":"pages/addressBook/addressBook","iconPath":"/static/tabs/phone_icon@2x.png","selectedIconPath":"static/tabs/phone_icon@2x2.png","text":"通讯录"},{"pagePath":"pages/mypage/mypage","iconPath":"/static/images/my2_icon@2x.png","selectedIconPath":"static/images/my2_icon@2x2.png","text":"我的"}]},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"xffxkh-app","compilerVersion":"4.15","entryPagePath":"pages/login/login","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/login/login","meta":{"isQuit":true},"window":{"navigationBarTitleText":""}},{"path":"/pages/rain/rain","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/homeIndex/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":""}},{"path":"/pages/xxsb/index","meta":{},"window":{"navigationBarTitleText":"信息上报"}},{"path":"/pages/xxsb/from","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/xxsb/fromSeverity","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/xxsb/dsfrom","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/xxsb/map","meta":{},"window":{"navigationBarTitleText":"地图示例"}},{"path":"/pages/gqzq/index","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/gqzq/gqxx","meta":{},"window":{"navigationBarTitleText":"工情信息"}},{"path":"/pages/gqzq/zqxx","meta":{},"window":{"navigationBarTitleText":"灾情信息"}},{"path":"/pages/gqzq/detail/index","meta":{},"window":{"navigationBarTitleText":"查看"}},{"path":"/pages/mypage/mypage","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":""}},{"path":"/pages/personInfo/personInfo","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/modifyPassword/modifyPassword","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/forewarning/forewarning","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/forewarning/sh","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/forewarning/shInformation/shInformation","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/addressBook/addressBook","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":""}},{"path":"/pages/water/water","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/rainDetail/rainDetail","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/hdDetail/hdDetail","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/skDetail/skDetail","meta":{},"window":{"navigationBarTitleText":"","enablePullDownRefresh":false}},{"path":"/pages/addressBook/follow","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/addressBook/myDept","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/orderFeedback/orderFeedback","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/pages/orderFeedback/orderInformation","meta":{},"window":{"navigationBarTitleText":""}},{"path":"/subpkg/rainDetail/rainDetail","meta":{},"window":{}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});
diff --git a/unpackage/dist/dev/app-plus/manifest.json b/unpackage/dist/dev/app-plus/manifest.json
index e775ebe..8225760 100644
--- a/unpackage/dist/dev/app-plus/manifest.json
+++ b/unpackage/dist/dev/app-plus/manifest.json
@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__CB311EF","name":"xffxkh-app","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"VideoPlayer":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","distribute":{"splashscreen":{"androidStyle":"common"},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"]},"apple":{"dSYMs":false},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.15","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333333","selectedColor":"#eb4450","list":[{"pagePath":"pages/homeIndex/index","iconPath":"/static/tabs/home.png","selectedIconPath":"static/tabs/home1.png","text":"首页"},{"pagePath":"pages/addressBook/addressBook","iconPath":"/static/tabs/my2_icon@2x.png","selectedIconPath":"static/tabs/my2_icon@2x.png","text":"通讯录"},{"pagePath":"pages/mypage/mypage","iconPath":"/static/images/my1.png","selectedIconPath":"static/images/my.png","text":"我的"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px"},"launch_path":"__uniappview.html"}}
\ No newline at end of file
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__CB311EF","name":"xffxkh-app","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"VideoPlayer":{},"Contacts":{},"Messaging":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"dark","background":"#F8F8F8"},"usingComponents":true,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","distribute":{"splashscreen":{"androidStyle":"common"},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>","<uses-permission android:name=\"android.permission.CALL_PHONE\"/>"]},"apple":{"dSYMs":false},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.15","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333333","selectedColor":"#59A7FF","list":[{"pagePath":"pages/homeIndex/index","iconPath":"/static/tabs/home.png","selectedIconPath":"static/tabs/home2.png","text":"首页"},{"pagePath":"pages/addressBook/addressBook","iconPath":"/static/tabs/phone_icon@2x.png","selectedIconPath":"static/tabs/phone_icon@2x2.png","text":"通讯录"},{"pagePath":"pages/mypage/mypage","iconPath":"/static/images/my2_icon@2x.png","selectedIconPath":"static/images/my2_icon@2x2.png","text":"我的"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px"},"launch_path":"__uniappview.html"}}
\ No newline at end of file