Browse Source

Merge branch 'fanghuisheng' of uskycloud/usky-web-mobile into master

gez 2 years ago
parent
commit
a65a5ef2f2

+ 45 - 0
src/api/business/mhxf/needMatter/index.js

@@ -0,0 +1,45 @@
+import upload from "@/utils/upload";
+import request from "@/utils/request";
+
+/**
+ * @待办事项列表查询接口
+ */
+export function mobileScheduleList(param) {
+  return request({
+    url: "/service-fire/demFireReform/mobileScheduleList",
+    method: "GET",
+    data: param,
+  });
+}
+
+/**
+ * @去整改
+ */
+export function updateMobileReformStatus(param) {
+  return request({
+    url: "/service-fire/demFireReform/updateMobileReformStatus?reformId=" + param.reformId,
+    method: "PUT",
+  });
+}
+
+/**
+ * @图片上传
+ */
+export function uploadAvatar(data) {
+  return upload({
+    url: "/service-file/upload",
+    name: data.name,
+    filePath: data.filePath,
+  });
+}
+
+/**
+ * @待办事项上传整改资料
+ */
+ export function addReformMaterial(param) {
+  return request({
+    url: "/service-fire/demFireReform/addReformMaterial",
+    method: "POST",
+    data: param,
+  });
+}

+ 8 - 8
src/pages.json

@@ -394,26 +394,26 @@
     "list": [
     "list": [
       {
       {
         "pagePath": "pages/index",
         "pagePath": "pages/index",
-        "iconPath": "static/icons/tabBar/home.svg",
-        "selectedIconPath": "static/icons/tabBar/home-selected.svg",
+        "iconPath": "/static/images/tabBar/home.png",
+        "selectedIconPath": "/static/images/tabBar/home-selected.png",
         "text": "工作台"
         "text": "工作台"
       },
       },
       // {
       // {
       //   "pagePath": "pages/analyse/analyse",
       //   "pagePath": "pages/analyse/analyse",
-      //   "iconPath": "static/icons/tabBar/analyse.svg",
-      //   "selectedIconPath": "static/icons/tabBar/analyse-selected.svg",
+      //   "iconPath": "/static/images/tabBar/analyse.png",
+      //   "selectedIconPath": "/static/images/tabBar/analyse-selected.png",
       //   "text": "分析"
       //   "text": "分析"
       // },
       // },
       {
       {
         "pagePath": "pages/info/info",
         "pagePath": "pages/info/info",
-        "iconPath": "static/icons/tabBar/info.svg",
-        "selectedIconPath": "static/icons/tabBar/info-selected.svg",
+        "iconPath": "/static/images/tabBar/info.png",
+        "selectedIconPath": "/static/images/tabBar/info-selected.png",
         "text": "消息"
         "text": "消息"
       },
       },
       {
       {
         "pagePath": "pages/mine/index",
         "pagePath": "pages/mine/index",
-        "iconPath": "static/icons/tabBar/setting.svg",
-        "selectedIconPath": "static/icons/tabBar/setting-selected.svg",
+        "iconPath": "/static/images/tabBar/setting.png",
+        "selectedIconPath": "/static/images/tabBar/setting-selected.png",
         "text": "我的"
         "text": "我的"
       }
       }
     ]
     ]

+ 264 - 306
src/pages/business/mhxf/needMatter/index.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <u-sticky bgColor="#fff" style="box-shadow: 1px 1px 4px rgb(26 26 26 / 10%)">
   <u-sticky bgColor="#fff" style="box-shadow: 1px 1px 4px rgb(26 26 26 / 10%)">
-    <u-tabs :list="list" @click="tabsClick" :current="current" :scrollable="false"></u-tabs>
+    <u-tabs :list="list" @click="tabsClick" :current="current"></u-tabs>
   </u-sticky>
   </u-sticky>
 
 
   <view class="needMatter" @touchstart="fingerstart" @touchend="fingerend" style="background-color: #f7f7f7">
   <view class="needMatter" @touchstart="fingerstart" @touchend="fingerend" style="background-color: #f7f7f7">
@@ -8,7 +8,7 @@
 
 
     <view class="content" v-else>
     <view class="content" v-else>
       <u-collapse>
       <u-collapse>
-        <u-collapse-item>
+        <u-collapse-item v-for="(cl, index) in classifyData" :key="index">
           <template #title>
           <template #title>
             <view style="display: flex; line-height: 25px">
             <view style="display: flex; line-height: 25px">
               <view style="padding-top: 4px">
               <view style="padding-top: 4px">
@@ -17,12 +17,21 @@
               <view style="padding: 0 10px; white-space: nowrap; font-size: 16px">
               <view style="padding: 0 10px; white-space: nowrap; font-size: 16px">
                 <view>整改通知</view>
                 <view>整改通知</view>
                 <view>整改期限:</view>
                 <view>整改期限:</view>
-                <view style="font-size: 14px; color: #666666">234234569</view>
+                <view style="font-size: 14px; color: #666666">{{ cl.reformId }}</view>
               </view>
               </view>
               <view style="width: 100%; text-align: center; font-size: 16px">
               <view style="width: 100%; text-align: center; font-size: 16px">
-                <view :style="{ color: '#0887f8' }">已接收</view>
-                <view style="text-align: left">2023-07-15</view>
-                <view style="font-size: 14px; color: #666666">2023-02-23 15:15:12</view>
+                <view
+                  :style="{
+                    color:
+                      cl.reformStatus == 1 ? '#0887F8' : cl.reformStatus == 2 ? '#23DEDC' : cl.reformStatus == 3 ? '#16BF00' : cl.reformStatus == 4 ? '#F94343' : cl.reformStatus == 5 ? '#9D40F3' : '',
+                  }"
+                >
+                  {{
+                    cl.reformStatus == 1 ? "已接收" : cl.reformStatus == 2 ? "整改中" : cl.reformStatus == 3 ? "整改完成" : cl.reformStatus == 4 ? "审核不通过" : cl.reformStatus == 5 ? "审核通过" : ""
+                  }}
+                </view>
+                <view style="text-align: left">{{ cl.limitTime }}</view>
+                <view style="font-size: 14px; color: #666666">{{ cl.sendTime }}</view>
               </view>
               </view>
             </view>
             </view>
           </template>
           </template>
@@ -39,35 +48,115 @@
                   <view>原因</view>
                   <view>原因</view>
                 </u-col>
                 </u-col>
               </u-row>
               </u-row>
-              <u-row v-for="(co, index) in content4" :key="index">
+              <u-row v-for="(co, index) in cl.reformPart.data" :key="index">
                 <u-col span="2">
                 <u-col span="2">
-                  <view>{{ co.name1 }}</view>
+                  <view>{{ index + 1 }}</view>
                 </u-col>
                 </u-col>
                 <u-col span="5.5">
                 <u-col span="5.5">
-                  <view>{{ co.name2 }}</view>
+                  <view>{{ co.item }}</view>
                 </u-col>
                 </u-col>
                 <u-col span="4.5">
                 <u-col span="4.5">
-                  <view>{{ co.name3 }}</view>
+                  <view>{{ co.reason }}</view>
                 </u-col>
                 </u-col>
               </u-row>
               </u-row>
             </view>
             </view>
-            <view style="margin-bottom: 10px">
+
+            <view v-if="cl.reformStatus == 1">
+              <u-steps current="0" dot>
+                <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
+                <u-steps-item style="text-align: center" title="整改中" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                <u-steps-item style="text-align: center" title="审核通过" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
+              </u-steps>
+
+              <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
+                <u-button style="width: 60px; height: 23px" type="primary" text="去整改" shape="circle" @click="handleSubmit(cl, '去整改')"></u-button>
+              </view>
+            </view>
+
+            <view v-if="cl.reformStatus == 2">
+              <u-steps current="1" dot>
+                <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
+                <u-steps-item style="text-align: center" title="整改中" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                <u-steps-item style="text-align: center" title="待审核" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
+              </u-steps>
+
+              <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
+                <u-button style="width: 60px; height: 23px" type="primary" text="填报" shape="circle" @click="handleSubmit(cl, '填报')"></u-button>
+              </view>
+            </view>
+
+            <view v-if="cl.reformStatus == 3">
+              <u-steps current="1" dot>
+                <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
+                <u-steps-item style="text-align: center" title="整改完成" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                <u-steps-item style="text-align: center" title="待审核" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
+              </u-steps>
+            </view>
+
+            <view v-if="cl.reformStatus == 4">
               <u-steps current="2" dot>
               <u-steps current="2" dot>
-                <u-steps-item style="text-align: center" title="已接收" :desc="`2023-07-15 \n 14:00:00`"> </u-steps-item>
-                <u-steps-item style="text-align: center" title="整改中" :desc="`2023-07-15 \n 14:00:00`"></u-steps-item>
-                <u-steps-item style="text-align: center" title="审核通过" :desc="`2023-07-15 \n 14:00:00`"></u-steps-item>
+                <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
+                <u-steps-item style="text-align: center" title="整改中" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                <u-steps-item style="text-align: center" title="审核不通过" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''" error></u-steps-item>
               </u-steps>
               </u-steps>
+
+              <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
+                <view>备注:{{ cl.reviewRemark ? cl.reviewRemark : "无" }}</view>
+              </view>
+
+              <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
+                <u-button style="width: 60px; height: 23px" type="primary" text="去整改" shape="circle" @click="handleSubmit(cl, '去整改')"></u-button>
+              </view>
             </view>
             </view>
-            <view style="margin-bottom: 10px">
+
+            <view v-if="cl.reformStatus == 5">
               <u-steps current="2" dot>
               <u-steps current="2" dot>
-                <u-steps-item style="text-align: center" title="已接收" :desc="`2023-07-15 \n 14:00:00`"> </u-steps-item>
-                <u-steps-item style="text-align: center" title="整改中" :desc="`2023-07-15 \n 14:00:00`"></u-steps-item>
-                <u-steps-item style="text-align: center" title="审核不通过" :desc="`2023-07-15 \n 14:00:00`" error></u-steps-item>
+                <u-steps-item style="text-align: center" title="已接收" :desc="cl.sendTime ? cl.sendTime.replace(' ', '\n') : ''"> </u-steps-item>
+                <u-steps-item style="text-align: center" title="整改中" :desc="cl.reformTime ? cl.reformTime.replace(' ', '\n') : ''"></u-steps-item>
+                <u-steps-item style="text-align: center" title="审核通过" :desc="cl.reviewTime ? cl.reviewTime.replace(' ', '\n') : ''"></u-steps-item>
               </u-steps>
               </u-steps>
+
+              <view style="font-size: 14px; line-height: 20px; margin-top: 10px">
+                <view style="display: flex">
+                  <view style="white-space: nowrap">整改资料:</view>
+                  <view style="width: 100%">
+                    <view style="display: flex" v-for="(i, index) in 5" :key="index">
+                      <view>{{ cl["reformPathName" + (index + 1)] }}</view>
+                      <view style="margin: auto 0 auto auto">
+                        <u--image src="/static/images/needMatter/icon2.png" width="15px" height="15px"></u--image>
+                      </view>
+                    </view>
+                  </view>
+                </view>
+                <u-line style="margin: 5px 0" color="#E5E5E5"></u-line>
+                <view>备注:{{ cl.reviewRemark ? cl.reviewRemark : "无" }}</view>
+              </view>
             </view>
             </view>
           </view>
           </view>
         </u-collapse-item>
         </u-collapse-item>
       </u-collapse>
       </u-collapse>
+
+      <view>
+        <u-modal
+          :show="modalShow"
+          title="填报(火灾报警系统)"
+          :showCancelButton="true"
+          :showConfirmButton="true"
+          :closeOnClickOverlay="true"
+          @close="modalShow = false"
+          @cancel="modalShow = false"
+          @confirm="handleConfirm"
+        >
+          <view style="width: 100%">
+            <uni-section title="图片上传:" type="line">
+              <u-upload :fileList="fileList" name="6" @afterRead="afterRead" multiple :maxCount="5" width="80" height="80"> </u-upload>
+            </uni-section>
+            <uni-section title="备注:" type="line">
+              <u--textarea v-model="textValue" placeholder="请输入内容"></u--textarea>
+            </uni-section>
+          </view>
+        </u-modal>
+      </view>
     </view>
     </view>
   </view>
   </view>
 </template>
 </template>
@@ -75,63 +164,58 @@
 <script setup>
 <script setup>
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { onReady, onLoad, onShow, onNavigationBarButtonTap } from "@dcloudio/uni-app";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance } from "vue";
 import { ref, onMounted, inject, shallowRef, reactive, watchEffect, getCurrentInstance } from "vue";
+import useStores from "@/store/modules/user.js";
 import publicStore from "@/store/modules/public";
 import publicStore from "@/store/modules/public";
 
 
-import { dataList } from "@/api/business/mhxf/informationSelect";
+import { mobileScheduleList, updateMobileReformStatus, uploadAvatar, addReformMaterial } from "@/api/business/mhxf/needMatter";
 
 
 const { proxy } = getCurrentInstance();
 const { proxy } = getCurrentInstance();
 
 
+const useStore = useStores();
 const publicStores = publicStore(); //全局公共Store
 const publicStores = publicStore(); //全局公共Store
 
 
 const current = ref(0);
 const current = ref(0);
-const classifyUrl = ref("");
-const dataRes = ref(1);
-const classifyData = ref([]); //警情查询数据存储
-const content4 = ref([
-  {
-    name1: "1",
-    name2: "火灾报警系统",
-    name3: "存在报警未处置",
-  },
-  {
-    name1: "2",
-    name2: "消防水系统",
-    name3: "存在报警未处置",
-  },
-  {
-    name1: "3",
-    name2: "燃气、电气系统监测",
-    name3: "存在报警未处置",
-  },
-]);
+const classifyData = ref([]);
+const modalShow = ref(false);
+
+const arrayList = ref({});
+const fileList = ref([]);
+const textValue = ref("");
 
 
 const list = ref([
 const list = ref([
   {
   {
-    id: 1,
+    id: 0,
     name: "全部",
     name: "全部",
   },
   },
   {
   {
-    id: 2,
+    id: 1,
     name: "已接收",
     name: "已接收",
   },
   },
   {
   {
-    id: 3,
+    id: 2,
     name: "整改中",
     name: "整改中",
     badge: {
     badge: {
       // isDot: true,
       // isDot: true,
       // value: 5,
       // value: 5,
     },
     },
   },
   },
+  {
+    id: 3,
+    name: "整改完成",
+    badge: {
+      // value: 5,
+    },
+  },
   {
   {
     id: 4,
     id: 4,
-    name: "已提交",
+    name: "审核不通过",
     badge: {
     badge: {
       // value: 5,
       // value: 5,
     },
     },
   },
   },
   {
   {
     id: 5,
     id: 5,
-    name: "审核",
+    name: "审核通过",
     badge: {
     badge: {
       // value: 5,
       // value: 5,
     },
     },
@@ -149,6 +233,102 @@ const bottomMed = ref("");
 const leftMed = ref("");
 const leftMed = ref("");
 const rightMed = ref("");
 const rightMed = ref("");
 
 
+/**
+ * @填报
+ * @去整改
+ */
+function handleSubmit(el, type) {
+  if (type === "去整改") {
+    proxy.$modal.loading("加载中");
+    updateMobileReformStatus({ reformId: el.reformId }).then((res) => {
+      if (res.status === "SUCCESS") {
+        goSearch();
+        proxy.$modal.closeLoading();
+      }
+    });
+  } else if (type === "填报") {
+    arrayList.value = el;
+    fileList.value = [];
+    textValue.value = "";
+    modalShow.value = true;
+  }
+}
+
+/**
+ * @填报
+ * @提交按钮点击事件
+ */
+function handleConfirm() {
+  proxy.$modal.loading("加载中");
+
+  let params = {
+    reformId: arrayList.value.reformId, //整改单编号
+    reformPerson: useStore.$state.name, //整改提交人
+    reformRemark: textValue.value, //整改备注
+    reformPath1: "", //整改相关图片或文件路径1
+    reformPath2: "", //整改相关图片或文件路径2
+    reformPath3: "", //整改相关图片或文件路径3
+    reformPath4: "", //整改相关图片或文件路径4
+    reformPath5: "", //整改相关图片或文件路径5
+  };
+
+  fileList.value.forEach((el, index) => {
+    params[`reformPath${index + 1}`] = el.url;
+  });
+
+  addReformMaterial(params).then((res) => {
+    if (res.status === "SUCCESS") {
+      proxy.$modal.closeLoading();
+
+      proxy.$modal.msgSuccess("提交成功");
+
+      modalShow.value = false;
+
+      goSearch();
+    }
+  });
+}
+
+/**
+ * @图片上传成功回调
+ */
+function afterRead(event) {
+  // 当设置 mutiple 为 true 时, file 为数组格式,否则为对象格式
+  let lists = [].concat(event.file);
+  let fileListLen = [`fileList${event.name}`].length;
+  lists.map((item) => {
+    [`fileList${event.name}`].push({
+      ...item,
+      status: "uploading",
+      message: "上传中",
+    });
+  });
+  for (let i = 0; i < lists.length; i++) {
+    const result = uploadFilePromise(lists[i]);
+    let item = [`fileList${event.name}`][fileListLen];
+    [`fileList${event.name}`].splice(
+      fileListLen,
+      1,
+      Object.assign(item, {
+        status: "success",
+        message: "",
+        url: result,
+      })
+    );
+    fileListLen++;
+  }
+}
+
+/**
+ * @调用上传图片接口
+ */
+function uploadFilePromise(el) {
+  let data = { name: "file", filePath: el.url };
+  uploadAvatar(data).then((res) => {
+    fileList.value.push(res.data);
+  });
+}
+
 /**
 /**
  * @当按下去的时候
  * @当按下去的时候
  */
  */
@@ -225,286 +405,58 @@ function leftscroll(dista) {
  */
  */
 function tabsClick(e) {
 function tabsClick(e) {
   current.value = e.index;
   current.value = e.index;
-  console.log(current.value);
-  dataRes.value = 1;
 }
 }
 
 
+/**
+ * @列表查询
+ */
 function goSearch() {
 function goSearch() {
   if (current.value == 0) {
   if (current.value == 0) {
-    //警情查询
-    classifyUrl.value = "/service-fire/demPoliceInfo/page";
-    classifySearch(classifyUrl.value, {
-      caseCode: "",
+    classifySearch({
+      companyId: "", //	单位Id
+      reformId: "", //整改单编号
+      reformStatus: undefined, //整改状态(1 已接收、2 整改中、3 整改完成、4 审核不通过、5 审核通过)
+      pageNum: 1, //当前页
+      pageSize: 20, //每页条数
     });
     });
-  } else if (current.value == 1) {
-    //火灾查询
-    classifyUrl.value = "/service-fire/demFireStatisticsAttach/page";
-    classifySearch(classifyUrl.value, {
-      address: "",
-    });
-  } else if (current.value == 2) {
-    //人员查询
-    classifyUrl.value = "/service-fire/unitBeOnDuty/list";
-    classifySearch(classifyUrl.value, {
-      name: "",
-    });
-  } else if (current.value == 3) {
-    //车辆信息
-    classifyUrl.value = "/service-fire/unitBeOnDuty/vehiclelist";
-    classifySearch(classifyUrl.value, {
-      licensePlate: "",
-    });
-  } else if (current.value == 4) {
-    //站点查询
-    classifyUrl.value = "/service-fire/unitBeOnDuty/page";
-    classifySearch(classifyUrl.value, {
-      stationName: "",
+  } else {
+    classifySearch({
+      companyId: "", //	单位Id
+      reformId: "", //整改单编号
+      reformStatus: current.value, //整改状态(1 已接收、2 整改中、3 整改完成、4 审核不通过、5 审核通过)
+      pageNum: 1, //当前页
+      pageSize: 20, //每页条数
     });
     });
   }
   }
 }
 }
 
 
-//分类信息查询 start
-async function classifySearch(URL, params) {
+/**
+ * @列表查询
+ */
+async function classifySearch(params) {
   proxy.$modal.loading("加载中");
   proxy.$modal.loading("加载中");
   classifyData.value = [];
   classifyData.value = [];
-  dataList(URL, params).then((res) => {
-    proxy.$modal.closeLoading();
-    if (res.status == "SUCCESS") {
-      if (current.value == 2) {
-        if (res.data.length) {
-          dataRes.value = 1;
-        } else {
-          dataRes.value = 0;
-        }
-        var records = res.data[0][0];
-      } else if (current.value == 3) {
-        if (res.data.length) {
-          dataRes.value = 1;
-        } else {
-          dataRes.value = 0;
-        }
 
 
-        var records = res.data[0];
-      } else {
-        //  console.log('111111111')
-        // console.log(res.data.records.length)
-        //  console.log('111222')
-        if (res.data.total) {
-          dataRes.value = 1;
-        } else {
-          dataRes.value = 0;
-        }
-        var records = res.data.records[0];
-      }
+  mobileScheduleList(params).then((res) => {
+    if (res.status === "SUCCESS") {
+      res.data.records.forEach((el) => {
+        el.reformPart = JSON.parse(el.reformPart);
+        el.limitTime = el.limitTime ? el.limitTime.split("T")[0] : "";
+        el.reviewTime = el.reviewTime ? el.reviewTime.replace("T", " ") : "";
+        el.reformTime = el.reformTime ? el.reformTime.replace("T", " ") : "";
 
 
-      console.log(dataRes.value + "------1");
-
-      switch (current.value) {
-        case 0: //警情查询
-          var classifyTitle = [
-            "案件编号",
-            "主管支队",
-            "案件时间段",
-            "通知到场时间",
-            "通知出水时间",
-            "通知控制时间",
-            "通知熄火时间",
-            "通知返队时间",
-            "区域",
-            "案件类型",
-            "案发地址",
-            "立案时间",
-            "立案日期",
-            "处置对象",
-            "案件等级",
-            "主管中队",
-            "区县",
-            "案件状态",
-            "案件性质",
-            "填表时间",
-            "街镇",
-            "创建时间",
-          ];
-          var classifyValue = [
-            records.caseCode,
-            records.branch,
-            records.timeSlot,
-            records.noticeArrivalTime,
-            records.noticeEffluentTime,
-            records.controlTime,
-            records.quenchTime,
-            records.returnTime,
-            records.caseArea,
-            records.caseTypeCode,
-            records.address,
-            records.filingTime,
-            records.filingDate,
-            records.handleObject,
-            records.caseLevel,
-            records.squadron,
-            records.district,
-            records.caseStatus,
-            records.caseNature,
-            records.bdpAudit,
-            records.streetTown,
-            records.createTime,
-          ];
-          break;
-        case 1: //火灾查询
-          var classifyTitle = [
-            "地区",
-            "街镇",
-            "经度",
-            "维度",
-            "平台ID",
-            "火灾地址",
-            "过火面积",
-            "直接财产损失",
-            "死亡人数",
-            "受伤人数",
-            "受灾户数",
-            "火灾原因",
-            "火灾等级",
-            "场所一级",
-            "场所二级",
-            "起火物一级",
-            "起火物二级",
-            "性质",
-          ];
-          var classifyValue = [
-            records.district,
-            records.street,
-            records.longitude,
-            records.latitude,
-            records.id,
-            records.address,
-            records.burnedArea,
-            records.propertyLoss,
-            records.deathToll,
-            records.nonFatal,
-            records.disasterHome,
-            records.fireCause,
-            records.fireLevel,
-            records.placeOne,
-            records.placeTwo,
-            records.fireGoodsOne,
-            records.fireGoodsTwo,
-            records.nature,
-          ];
-          break;
-        case 2: //人员查询
-          var classifyTitle = ["值班人员信息", "岗位名称", "机构名称", "机构简称", "机构地址", "值班日期"];
-          var classifyValue = [records.name, records.postName, records.organizationName, records.organizationShort, records.organizationAddress, records.time];
-          break;
-        case 3: //车辆查询
-          var classifyTitle = [
-            "车辆信息",
-            "单件装备编码",
-            "装备名称",
-            "装备编码",
-            "上级装备编码",
-            "所属消防机构",
-            "车牌号码",
-            "资产编号",
-            "商标",
-            "颜色",
-            "生产厂家名称",
-            "有效期至",
-            "车架号",
-            "发动机编号",
-            "批次号",
-            "电台呼号",
-            "车辆简称",
-            "电台频道",
-            "指挥员姓名",
-            "驾驶员",
-          ];
-          var classifyValue = [
-            records.vehicleId,
-            records.singleEquipCode,
-            records.equipName,
-            records.equipCode,
-            records.superiorEquipCode,
-            records.fireOrga,
-            records.licensePlate,
-            records.assetCode,
-            records.assetCode,
-            records.colour,
-            records.productName,
-            records.validityTime,
-            records.frameCode,
-            records.engineCode,
-            records.batchCode,
-            records.radioCallSign,
-            records.vehicleAbbreviat,
-            records.radioChannel,
-            records.commanderName,
-            records.driver,
-          ];
-          break;
-        case 4: //站点查询
-          var classifyTitle = [
-            "平台ID",
-            "支队名称",
-            "所属辖区中队",
-            "消防站名称",
-            "单位性质",
-            "地址",
-            "所在位置",
-            "联动固定电话",
-            "负责人姓名",
-            "负责人手机号码",
-            "备注",
-            "消防站类型",
-            "经度",
-            "维度",
-            "创建时间",
-            "更新时间",
-            "支队id",
-            "中队id",
-            "编号",
-            "原单位性质",
-          ];
-          var classifyValue = [
-            records.id,
-            records.branchName,
-            records.squadron,
-            records.stationName,
-            records.companyNature,
-            records.address,
-            records.location,
-            records.fixedPhone,
-            records.chargeName,
-            records.chargePhone,
-            records.remark,
-            records.stationType,
-            records.longitude,
-            records.dimension,
-            records.createTime,
-            records.updateTime,
-            records.branchId,
-            records.squadronId,
-            records.number,
-            records.primaryCompanyNature,
-          ];
-          break;
-        // default:
-        //    默认代码块
-      }
+        for (let i = 1; i <= 5; i++) {
+          el["reformPathName" + i] =
+            el["reformPath" + i] && el["reformPath" + i].indexOf("/") != -1 ? el["reformPath" + i].split("/")[el["reformPath" + i].split("/").length - 1] : el["reformPath" + i];
+        }
 
 
-      for (var i = 0; i < classifyTitle.length; i++) {
-        var obj = {};
-        obj.title = classifyTitle[i];
-        obj.value = classifyValue[i];
-        classifyData.value.push(obj);
+        classifyData.value.push(el);
+      });
 
 
-        // console.log(classifyData.value);
-      }
-    } else {
+      proxy.$modal.closeLoading();
     }
     }
   });
   });
 }
 }
-// end
 
 
 watchEffect(() => {
 watchEffect(() => {
   goSearch();
   goSearch();
@@ -547,6 +499,12 @@ onMounted(() => {});
       }
       }
     }
     }
   }
   }
+
+  .uni-section {
+    :deep(.uni-section-header) {
+      padding: 12px 0px;
+    }
+  }
 }
 }
 </style>
 </style>
 
 

+ 7 - 7
src/pages/serveConfig.vue

@@ -31,13 +31,13 @@ const dataList = reactive({
         message: "请输入链接地址",
         message: "请输入链接地址",
         trigger: ["blur"],
         trigger: ["blur"],
       },
       },
-    //   {
-    //     type: "string",
-    //     required: true,
-    //     message: "请输入正确的链接地址",
-    //     pattern: /^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](?:\.[a-zA-Z]{2,})+$/,
-    //     trigger: ["blur", "change"],
-    //   },
+      {
+        type: "string",
+        required: true,
+        message: "请输入正确的链接地址",
+        pattern: /^[a-zA-Z0-9][a-zA-Z0-9-]{1,61}[a-zA-Z0-9](?:\.[a-zA-Z]{2,})+$/,
+        trigger: ["blur", "change"],
+      },
     ],
     ],
   
   
   },
   },