From 185429a94cd9fb0b72de637c5de8e0f25b743c3e Mon Sep 17 00:00:00 2001
From: monanxiao <monanxiao@qq.com>
Date: Fri, 18 Oct 2024 17:27:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=AE=A2=E6=88=B7=E5=8F=8D?=
 =?UTF-8?q?=E9=A6=88=E9=9C=80=E6=B1=82=E8=BF=9B=E8=A1=8C=E4=BA=86=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9=E5=B7=B2=E5=AE=8C=E6=88=90=EF=BC=8C?=
 =?UTF-8?q?=E6=9A=82=E6=9C=AA=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3=EF=BC=8C?=
 =?UTF-8?q?=E7=AD=89=E5=BE=85=E5=90=8E=E7=AB=AF=E4=BF=AE=E6=94=B9=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=90=8E=E5=AF=B9=E6=8E=A5=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/user.js               |  9 ++++
 src/api/request.js                    |  2 +-
 src/mock/permission.js                |  2 +-
 src/router/originalRoutingTable.js    |  4 +-
 src/views/engineer/maintain.vue       | 65 ++++++++++++++++++---------
 src/views/engineer/reconnaissance.vue | 48 ++++++++++++++++----
 src/views/order/index.vue             | 14 +++++-
 src/views/users/maintain.vue          | 42 ++++++++++++++++-
 src/views/users/reconnaissance.vue    | 42 ++++++++++++++++-
 9 files changed, 189 insertions(+), 39 deletions(-)

diff --git a/src/api/modules/user.js b/src/api/modules/user.js
index b1fbc49..8c156b7 100644
--- a/src/api/modules/user.js
+++ b/src/api/modules/user.js
@@ -27,4 +27,13 @@ export function getMaintenanceList(query) {
         url: `${API_BASE_URL}/maintenance`,
         data: query,
     });
+}
+
+// 删除人员
+export function deleteUser(ItemId) {
+    return service({
+        method: "delete",
+        url: `${API_BASE_URL}/${ItemId}`,
+        data: query,
+    });
 }
\ No newline at end of file
diff --git a/src/api/request.js b/src/api/request.js
index 41ea237..26f21af 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -11,7 +11,7 @@ const errorCode = {
 
 // const url = "https://repair.cpolar.top"; // 开发地址
 // const url = "https://xcx.cqcxj.cn"; // 正式地址
-const url = "https://cqjql.scdswj.cn:9443"; // 临时地址
+const url = "https://cqjql.scdswj.cn:9443"; // 临时地址n
 
 const service = axios.create({
     baseURL: url,
diff --git a/src/mock/permission.js b/src/mock/permission.js
index af55dfd..13511bd 100644
--- a/src/mock/permission.js
+++ b/src/mock/permission.js
@@ -88,7 +88,7 @@ export const menuListItem = [
         icon: "Menu",
       },
       {
-        title: "勘察工程师",
+        title: "勘测工程师",
         url: "/reconnaissanceScheduling",
         icon: "Menu",
       },
diff --git a/src/router/originalRoutingTable.js b/src/router/originalRoutingTable.js
index 882b69e..2903f7e 100644
--- a/src/router/originalRoutingTable.js
+++ b/src/router/originalRoutingTable.js
@@ -139,7 +139,7 @@ const routerList = [
         component: () => import("../views/users/reconnaissance.vue"),
         meta: {
           requiresAuth: true,
-          name: "勘察工程师",
+          name: "勘测工程师",
         },
       },
       {
@@ -206,7 +206,7 @@ const routerList = [
         component: () => import("../views/scheduling/reconnaissance.vue"),
         meta: {
           requiresAuth: true,
-          name: "勘察人员排班",
+          name: "勘测人员排班",
         },
       },
       {
diff --git a/src/views/engineer/maintain.vue b/src/views/engineer/maintain.vue
index 393bc84..936e9b2 100644
--- a/src/views/engineer/maintain.vue
+++ b/src/views/engineer/maintain.vue
@@ -1,22 +1,48 @@
 <template>
   <el-card class="mt10">
 
+    <el-row>
+      <el-col :span="6">
+        <el-statistic title="合计" :value="268500" />
+      </el-col>
+      <el-col :span="6">
+        <el-statistic title="已通过" :value="268500" />
+      </el-col>
+      <el-col :span="6">
+        <el-statistic title="待审核" :value="268500" />
+      </el-col>
+      <el-col :span="6">
+        <el-statistic title="已驳回" :value="268500" />
+      </el-col>
+
+    </el-row>
+  </el-card>
+
+    <el-card class="mt10">
+
     <el-form :inline="true" :model="formSearch" class="demo-form-inline">
-      <el-form-item label="微信昵称">
+      <el-form-item label="姓名">
         <el-input
-            v-model="searchWechatNickname"
+            v-model="formSearch.nickName"
             style="max-width: 300px"
-            placeholder="模糊查询微信昵称"
+            placeholder="模糊查询姓名"
             class="input-with-select"
         />
       </el-form-item>
 
-      <el-form-item label="手机号">
-        <el-input
-            v-model="searchWechatNickname"
-            style="max-width: 300px"
-            placeholder="模糊查询手机号"
-            class="input-with-select"
+      <!--      <el-form-item label="手机号">-->
+      <!--        <el-input-->
+      <!--            v-model="searchWechatNickname"-->
+      <!--            style="max-width: 300px"-->
+      <!--            placeholder="模糊查询手机号"-->
+      <!--            class="input-with-select"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item label="时间">
+        <el-date-picker
+            v-model="formSearch.date"
+            type="dates"
+            placeholder="请选择时间"
         />
       </el-form-item>
 
@@ -24,8 +50,13 @@
         <el-button type="primary" @click="onSearchSubmit">搜索</el-button>
       </el-form-item>
 
+      <el-form-item style="float: right">
+        <el-button type="warning">导出</el-button>
+      </el-form-item>
+
     </el-form>
 
+
       <el-table
           ref="table"
           :data="tableData"
@@ -141,6 +172,7 @@ const formSearch = ref({
   amount: ''
 });
 
+
 const initData = () => {
   // 加载示例数据
   // tableData.value = exampleData.value;
@@ -253,19 +285,8 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-.mt-4 {
-  float: right;
-  text-align: right;
-  margin-bottom: 20px;
-}
 
-.input-with-select {
-  max-width: 300px;
-}
-
-.expand-title {
-  padding: 10px;
-  color: #919399;
-  font-weight: 600;
+.el-col {
+  text-align: center;
 }
 </style>
diff --git a/src/views/engineer/reconnaissance.vue b/src/views/engineer/reconnaissance.vue
index dca657a..e0ac83b 100644
--- a/src/views/engineer/reconnaissance.vue
+++ b/src/views/engineer/reconnaissance.vue
@@ -1,22 +1,49 @@
 <template>
+
+  <el-card class="mt10">
+
+    <el-row>
+      <el-col :span="6">
+        <el-statistic title="合计" :value="268500" />
+      </el-col>
+      <el-col :span="6">
+        <el-statistic title="已通过" :value="268500" />
+      </el-col>
+      <el-col :span="6">
+        <el-statistic title="待审核" :value="268500" />
+      </el-col>
+      <el-col :span="6">
+        <el-statistic title="已驳回" :value="268500" />
+      </el-col>
+
+    </el-row>
+  </el-card>
+
   <el-card class="mt10">
 
     <el-form :inline="true" :model="formSearch" class="demo-form-inline">
-      <el-form-item label="微信昵称">
+      <el-form-item label="姓名">
         <el-input
-        v-model="searchWechatNickname"
+        v-model="formSearch.nickName"
         style="max-width: 300px"
-        placeholder="模糊查询微信昵称"
+        placeholder="模糊查询姓名"
         class="input-with-select"
          />
       </el-form-item>
 
-      <el-form-item label="手机号">
-        <el-input
-            v-model="searchWechatNickname"
-            style="max-width: 300px"
-            placeholder="模糊查询手机号"
-            class="input-with-select"
+<!--      <el-form-item label="手机号">-->
+<!--        <el-input-->
+<!--            v-model="searchWechatNickname"-->
+<!--            style="max-width: 300px"-->
+<!--            placeholder="模糊查询手机号"-->
+<!--            class="input-with-select"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="时间">
+        <el-date-picker
+            v-model="formSearch.date"
+            type="dates"
+            placeholder="请选择时间"
         />
       </el-form-item>
 
@@ -24,6 +51,9 @@
         <el-button type="primary" @click="onSearchSubmit">搜索</el-button>
       </el-form-item>
 
+      <el-form-item style="float: right">
+        <el-button type="warning">导出</el-button>
+      </el-form-item>
     </el-form>
 
       <el-table
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 0de9569..a2ac711 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -39,13 +39,21 @@
 
       <el-form-item label="用户昵称">
         <el-input
-            v-model="searchName"
+            v-model="formSearch.nickName"
             style="max-width: 300px"
             placeholder="用户昵称"
             class="input-with-select"
         />
       </el-form-item>
 
+      <el-form-item label="时间">
+        <el-date-picker
+            v-model="formSearch.month"
+            type="month"
+            placeholder="请选择时间"
+        />
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" @click="onSearchSubmit">搜索</el-button>
       </el-form-item>
@@ -323,9 +331,11 @@ const queryData = ref({
 
 const formSearch = ref({
   goodsName:'',
+  nickName: '',
   status: ' ',
   id: '',
-  amount: ''
+  amount: '',
+  month: '',
 });
 
 const detailData = ref();
diff --git a/src/views/users/maintain.vue b/src/views/users/maintain.vue
index 92981ac..d475875 100644
--- a/src/views/users/maintain.vue
+++ b/src/views/users/maintain.vue
@@ -76,6 +76,25 @@
           sortable
       />
 
+      <el-table-column
+          label="操作"
+          align="center"
+      >
+        <template #default="scope">
+          <el-popconfirm
+              confirm-button-text="确认"
+              cancel-button-text="取消"
+              :icon="InfoFilled"
+              icon-color="#626AEF"
+              title="确定要删除该维修人员吗?"
+              @confirm="deleteItem(scope.row)"
+          >
+            <template #reference>
+              <el-button type="danger">删除</el-button>
+            </template>
+          </el-popconfirm>
+        </template>
+      </el-table-column>
     </el-table>
     <el-pagination
         size="small"
@@ -100,7 +119,9 @@ import {
 import {nextTick, onMounted, reactive, ref} from 'vue'
 
 import {options} from './options.js'
-import {getUserList} from "../../api/modules/user";
+import {deleteUser, getUserList} from "../../api/modules/user";
+import {delGoods} from "../../api/modules/goods";
+import {ElMessage} from "element-plus";
 
 const tableData = ref([])
 const dataList = ref([])
@@ -139,6 +160,25 @@ const handleCurrentChange = (val) => {
   initData(queryData.value)
 }
 
+
+// 删除项
+const deleteItem = (env) => {
+
+  let ItemId = env.id; // 项目ID
+
+  // 删除
+  deleteUser(ItemId).then((res) =>{
+
+    ElMessage({
+      message: '删除成功',
+      type: 'success',
+    });
+
+    initData(); // 重新加载数据
+  });
+
+}
+
 // 搜索事件
 const searchEvnt = ()=> {
   console.log('点击搜索');
diff --git a/src/views/users/reconnaissance.vue b/src/views/users/reconnaissance.vue
index cbed561..20ab6c9 100644
--- a/src/views/users/reconnaissance.vue
+++ b/src/views/users/reconnaissance.vue
@@ -87,6 +87,26 @@
           sortable
       />
 
+      <el-table-column
+          label="操作"
+          align="center"
+      >
+        <template #default="scope">
+          <el-popconfirm
+              confirm-button-text="确认"
+              cancel-button-text="取消"
+              :icon="InfoFilled"
+              icon-color="#626AEF"
+              title="确定要删除该勘测人员吗?"
+              @confirm="deleteItem(scope.row)"
+          >
+            <template #reference>
+              <el-button type="danger">删除</el-button>
+            </template>
+          </el-popconfirm>
+        </template>
+      </el-table-column>
+
     </el-table>
     <el-pagination
         size="small"
@@ -111,7 +131,8 @@ import {
 import {nextTick, onMounted, reactive, ref} from 'vue'
 
 import {options} from './options.js'
-import {getUserList} from "../../api/modules/user";
+import {deleteUser, getUserList} from "../../api/modules/user";
+import {ElMessage} from "element-plus";
 
 const tableData = ref([])
 const dataList = ref([])
@@ -149,6 +170,25 @@ const handleCurrentChange = (val) => {
   initData(queryData.value)
 }
 
+
+// 删除项
+const deleteItem = (env) => {
+
+  let ItemId = env.id; // 项目ID
+
+  // 删除
+  deleteUser(ItemId).then((res) =>{
+
+    ElMessage({
+      message: '删除成功',
+      type: 'success',
+    });
+
+    initData(); // 重新加载数据
+  });
+
+}
+
 // 搜索事件
 const searchEvnt = ()=> {
   console.log('点击搜索');