From 983fc52780616887a2ccd8ea920481aec749b95f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BC=96=E7=A0=81=E7=8C=BF?= <www.2271608011@qq.com>
Date: Fri, 29 Aug 2025 21:59:23 +0800
Subject: [PATCH] www

---
 .pydio                                        |   1 -
 .../src/application/page/index/analysis.tsx   | 203 ++++++------
 .../src/application/page/index/pipe.tsx       | 292 +++++++++---------
 .../src/core/service/impl/data.service.impl.ts |   4 +
 4 files changed, 251 insertions(+), 249 deletions(-)
 delete mode 100644 .pydio

diff --git a/.pydio b/.pydio
deleted file mode 100644
index 7ee41d7..0000000
--- a/.pydio
+++ /dev/null
@@ -1 +0,0 @@
-871006d1-20ee-4296-8a7d-a7a4ad9b9a96
\ No newline at end of file
diff --git a/王凯私活/TsxVueClassApi/src/application/page/index/analysis.tsx b/王凯私活/TsxVueClassApi/src/application/page/index/analysis.tsx
index af56507..2a8047f 100644
--- a/王凯私活/TsxVueClassApi/src/application/page/index/analysis.tsx
+++ b/王凯私活/TsxVueClassApi/src/application/page/index/analysis.tsx
@@ -21,30 +21,30 @@ import { engineListItemTypes } from "@type/page/project.types";
 export default class Analysis extends VueCustomize {
   logic: AnalysisLogic<Analysis> = new AnalysisLogic(this);
   RouterMeta: RouterMeta = {
-    title  : '数据分析',
+    title: '数据分析',
     showNav: true,
     isLogin: true
   };
 
   public tableHeaderConfig: tableHeaderTypes[] = [
-    { label: `${ TEXT.DEVICE_NAME }`, prop: 'deviceName', width: 100 },
+    { label: `${TEXT.DEVICE_NAME}`, prop: 'deviceName', width: 100 },
     { label: TEXT.DEVICE_TYPE, prop: 'deviceModel' },
-    { label: `${ TEXT.COMMPANY }名称`, prop: 'companyName', width: 150 },
+    { label: `${TEXT.COMMPANY}名称`, prop: 'companyName', width: 150 },
     { label: TEXT.PROJECT_NAME, prop: 'engineName', width: 120 },
     { label: TEXT.DOTTED_LINE, prop: 'pointNum' },
     { label: TEXT.IGUCHI_NUM, prop: 'wellNo' },
     { label: TEXT.AREA, prop: 'area' },
     { label: TEXT.ROAD, prop: 'road' },
-    { label: TEXT.LATITUDE_AND_LONGITUDE, prop: 'longitude', width: 150, action: [ this.longitude ] },
+    { label: TEXT.LATITUDE_AND_LONGITUDE, prop: 'longitude', width: 150, action: [this.longitude] },
     { label: TEXT.MEASURE, prop: 'testUnit' },
     { label: TEXT.OWNERSHIP, prop: 'ownUnit' },
-    { label: TEXT.CREATED_TIME, prop: 'createTime', width: 110, action: [ this.createTime ] },
-    { label: TEXT.EDIT_TIME, prop: 'updateTime', width: 110, action: [ this.updateTime ] },
+    { label: TEXT.CREATED_TIME, prop: 'createTime', width: 110, action: [this.createTime] },
+    { label: TEXT.EDIT_TIME, prop: 'updateTime', width: 110, action: [this.updateTime] },
     {
 
-      label : TEXT.OPERATE,
-      prop  : 'operate',
-      action: [ this.operateAction ]
+      label: TEXT.OPERATE,
+      prop: 'operate',
+      action: [this.operateAction]
     },
   ];
 
@@ -59,19 +59,19 @@ export default class Analysis extends VueCustomize {
 
   public longitude(e: { row: dataAnalysisListItemTypes }): JSX.Element {
     return <div>
-      { e.row.longitude } <br/> { e.row.latitude }
+      {e.row.longitude} <br /> {e.row.latitude}
     </div>
   }
 
   public createTime(e: { row: dataAnalysisListItemTypes }): JSX.Element {
     return <div>
-      { this.logic.utils.formatDate(e.row.createTime) }
+      {this.logic.utils.formatDate(e.row.createTime)}
     </div>
   }
 
   public updateTime(e: { row: dataAnalysisListItemTypes }): JSX.Element {
     return <div>
-      { this.logic.utils.formatDate(e.row.updateTime) }
+      {this.logic.utils.formatDate(e.row.updateTime)}
     </div>
   }
 
@@ -79,14 +79,14 @@ export default class Analysis extends VueCustomize {
   public operateAction(e: { row: engineListItemTypes }): JSX.Element {
     return (
       <div class="table_action_list">
-        <el-button type="text" onclick={ async () => {
+        <el-button type="text" onclick={async () => {
           this.logic.isDisabledForm = true
           this.logic.formDialogType = 'view';
           await this.logic.getDataAnalysisById(e.row)
           this.logic.isShowFormDialog = true
-        } }>
-          <img src="/img/icon@2x(32).png" alt=""/>
-          <p>{ TEXT.VIEW }</p>
+        }}>
+          <img src="/img/icon@2x(32).png" alt="" />
+          <p>{TEXT.VIEW}</p>
         </el-button>
       </div>
     )
@@ -96,121 +96,121 @@ export default class Analysis extends VueCustomize {
   public formDialog(): JSX.Element {
     return (
       <div>
-        <el-form label-position={ 'right' }
-                 disabled={ this.logic.isDisabledForm }
-                 label-width="117px">
-          <el-row gutter={ 30 }>
-            <el-col span={ 12 }>
+        <el-form label-position={'right'}
+          disabled={this.logic.isDisabledForm}
+          label-width="117px">
+          <el-row gutter={30}>
+            <el-col span={12}>
 
-              {/*{*/ }
-              {/*  this.userInfo.roleId === 1*/ }
-              {/*    ? <el-form-item label={ `${ TEXT.COMMPANY }名称：` }>*/ }
-              {/*      <el-input v-model={ this.logic.addAnalysisParams.companyName } type="text"*/ }
-              {/*                placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>*/ }
-              {/*    </el-form-item>*/ }
-              {/*    : null*/ }
-              {/*}*/ }
+              {/*{*/}
+              {/*  this.userInfo.roleId === 1*/}
+              {/*    ? <el-form-item label={ `${ TEXT.COMMPANY }名称：` }>*/}
+              {/*      <el-input v-model={ this.logic.addAnalysisParams.companyName } type="text"*/}
+              {/*                placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>*/}
+              {/*    </el-form-item>*/}
+              {/*    : null*/}
+              {/*}*/}
 
-              <el-form-item label={ `${ TEXT.PROJECT_NAME }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.engineName } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.PROJECT_NAME}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.engineName} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.DEVICE_NAME }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.deviceName } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.DEVICE_NAME}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.deviceName} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.DEVICE_TYPE }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.deviceModel } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.DEVICE_TYPE}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.deviceModel} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.OWNERSHIPUNIT }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.ownUnit } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.OWNERSHIPUNIT}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.ownUnit} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.ROAD }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.road } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.ROAD}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.road} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.IGUCHI_NUM }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.wellNo } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.IGUCHI_NUM}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.wellNo} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.DESIGN_INNER_DIAMETER }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.realInner } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.DESIGN_INNER_DIAMETER}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.realInner} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.DETECTION_FREQUENCY }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.checkNum } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.DETECTION_FREQUENCY}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.checkNum} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.DETECTION_FOR_MAXIMUM_TIME }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.maxCheckTime } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.DETECTION_FOR_MAXIMUM_TIME}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.maxCheckTime} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
             </el-col>
 
-            <el-col span={ 12 }>
+            <el-col span={12}>
 
-              <el-form-item label={ `${ TEXT.MEASURE }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.testUnit } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.MEASURE}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.testUnit} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.AREA }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.area } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.AREA}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.area} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.LATITUDE_AND_LONGITUDE }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.longitude } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.LATITUDE_AND_LONGITUDE}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.longitude} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.DOTTED_LINE }：` }>
-                {/*<div class="dotted_line">*/ }
-                {/*  <el-tag type="success">9-10</el-tag>*/ }
-                {/*</div>*/ }
-                <el-input v-model={ this.logic.addAnalysisParams.pointNum }
-                          type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.DOTTED_LINE}：`}>
+                {/*<div class="dotted_line">*/}
+                {/*  <el-tag type="success">9-10</el-tag>*/}
+                {/*</div>*/}
+                <el-input v-model={this.logic.addAnalysisParams.pointNum}
+                  type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.MEASURE_INNER_DIAMETE }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.testInner } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.MEASURE_INNER_DIAMETE}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.testInner} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.INNER_DIAMETER_ERROR }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.innerError } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.INNER_DIAMETER_ERROR}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.innerError} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.TESTED_BY }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.checkUserName } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.TESTED_BY}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.checkUserName} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.MINIMUM_DETECTION_TIME }：` }>
-                <el-input v-model={ this.logic.addAnalysisParams.minCheckTime } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.MINIMUM_DETECTION_TIME}：`}>
+                <el-input v-model={this.logic.addAnalysisParams.minCheckTime} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
         <div class="dialog-footer">
           <el-button
-            onclick={ () => {
+            onclick={() => {
               this.logic.isShowFormDialog = false
-            } }>
-            { TEXT.CANCEL }
+            }}>
+            {TEXT.CANCEL}
           </el-button>
         </div>
       </div>
@@ -221,30 +221,29 @@ export default class Analysis extends VueCustomize {
     return (
       <div class="analysis">
         <Container
-          filters={ this.logic.filterList }
-          action={ this.logic.tableAction }/>
+          filters={this.logic.filterList}
+          action={this.logic.tableAction} />
 
         <Table
-          loading={ this.logic.loading }
-          pageSize={ this.logic.pageSize }
-          totalCount={ this.logic.totalCount }
-          tableHeader={ this.tableHeaderConfig }
-          tableData={ this.logic.tableData.dataList }
-          sizeChange={ async (page: number) => {
+          loading={this.logic.loading}
+          pageSize={this.logic.pageSize}
+          totalCount={this.logic.totalCount}
+          tableHeader={this.tableHeaderConfig}
+          tableData={this.logic.tableData.dataList}
+          sizeChange={async (page: number) => {
             this.logic.filterParams.pageSize = page
             await this.logic.dataAnalysisList()
-          } }
-          pageChange={ async (page: number) => {
+          }}
+          pageChange={async (page: number) => {
             this.logic.filterParams.pageNum = page;
             await this.logic.dataAnalysisList()
-          } }/>
+          }} />
 
         <Dialog
-          isShow={ this.logic.isShowFormDialog }
-          dialogContent={ this.formDialog }/>
+          isShow={this.logic.isShowFormDialog}
+          dialogContent={this.formDialog} />
 
       </div>
     )
   }
 }
-        
\ No newline at end of file
diff --git a/王凯私活/TsxVueClassApi/src/application/page/index/pipe.tsx b/王凯私活/TsxVueClassApi/src/application/page/index/pipe.tsx
index dede600..9e48830 100644
--- a/王凯私活/TsxVueClassApi/src/application/page/index/pipe.tsx
+++ b/王凯私活/TsxVueClassApi/src/application/page/index/pipe.tsx
@@ -26,31 +26,31 @@ import { engineListItemTypes } from "@type/page/project.types";
 export default class Pipe extends VueCustomize {
   logic: PipeLogic<Pipe> = new PipeLogic(this);
   RouterMeta: RouterMeta = {
-    title  : '管道管理',
+    title: '管道管理',
     showNav: true,
     isLogin: true
   };
 
   public tableHeaderConfig: tableHeaderTypes[] = [
     {
-      type  : 'selection',
-      label : '',
-      prop  : '',
+      type: 'selection',
+      label: '',
+      prop: '',
       change: (e) => this.logic.multipleChoiceList = e
     },
-    { label: `${ TEXT.PIPE_NUMBER }`, prop: 'pointNum' },
+    { label: `${TEXT.PIPE_NUMBER}`, prop: 'pointNum' },
     { label: TEXT.PROJECT_NAME, prop: 'engineName' },
     { label: TEXT.TESTED_BY, prop: 'checkUserName' },
     { label: TEXT.DETECTION_FREQUENCY, prop: 'checkNum' },
     { label: TEXT.LONGITUDE, prop: 'longitude' },
     { label: TEXT.DIMENSION, prop: 'latitude' },
-    { label: TEXT.DETECTION_TIME, prop: 'checkTime', action: [ this.checkTimeAction ] },
-    { label: TEXT.CREATED_TIME, prop: 'createTime', action: [ this.createTimeAction ] },
+    { label: TEXT.DETECTION_TIME, prop: 'checkTime', action: [this.checkTimeAction] },
+    { label: TEXT.CREATED_TIME, prop: 'createTime', action: [this.createTimeAction] },
     {
-      width : 389,
-      label : TEXT.STATE,
-      prop  : 'operate',
-      action: [ this.operateAction ]
+      width: 389,
+      label: TEXT.STATE,
+      prop: 'operate',
+      action: [this.operateAction]
     },
   ];
 
@@ -65,13 +65,13 @@ export default class Pipe extends VueCustomize {
 
   public checkTimeAction(e: { row: engineListItemTypes }): JSX.Element {
     return (
-      <span>{ this.logic.utils.formatDate(e.row.checkTime) }</span>
+      <span>{this.logic.utils.formatDate(e.row.checkTime)}</span>
     )
   }
 
   public createTimeAction(e: { row: engineListItemTypes }): JSX.Element {
     return (
-      <span>{ this.logic.utils.formatDate(e.row.createTime) }</span>
+      <span>{this.logic.utils.formatDate(e.row.createTime)}</span>
     )
   }
 
@@ -79,7 +79,7 @@ export default class Pipe extends VueCustomize {
   public operateAction(e: { row: pointListItemTypes }): JSX.Element {
     return (
       <div class="table_action_list">
-        <el-button type="text" onclick={ async () => {
+        <el-button type="text" onclick={async () => {
           this.logic.isDisabledForm = true
           this.logic.formDialogType = 'view';
 
@@ -87,12 +87,12 @@ export default class Pipe extends VueCustomize {
           // 查看详情 时候 ，没有 companyName，从 列表接口 取出，存放显示
           this.logic.addDataParams.companyName = e.row.companyName
           this.logic.isShowFormDialog = true
-        } }>
-          <img src="/img/icon@2x(32).png" alt=""/>
-          <p>{ TEXT.VIEW }</p>
+        }}>
+          <img src="/img/icon@2x(32).png" alt="" />
+          <p>{TEXT.VIEW}</p>
         </el-button>
 
-        <el-button type="text" onclick={ async () => {
+        <el-button type="text" onclick={async () => {
           this.logic.isDisabledForm = false;
           this.logic.formDialogType = 'edit';
 
@@ -105,16 +105,16 @@ export default class Pipe extends VueCustomize {
           await this.logic.getPointById(e.row)
 
           this.logic.isShowFormDialog = true
-        } }>
-          <img src="/img/icon@2x(33).png" alt=""/>
-          <p>{ TEXT.EDIT }</p>
+        }}>
+          <img src="/img/icon@2x(33).png" alt="" />
+          <p>{TEXT.EDIT}</p>
         </el-button>
 
-        <el-button type="text" onclick={ async () => {
+        <el-button type="text" onclick={async () => {
           await this.logic.deletePointById(e.row)
-        } }>
-          <img src="/img/icon@2x(30).png" alt=""/>
-          <p>{ TEXT.DELETE }</p>
+        }}>
+          <img src="/img/icon@2x(30).png" alt="" />
+          <p>{TEXT.DELETE}</p>
         </el-button>
       </div>
     )
@@ -125,55 +125,55 @@ export default class Pipe extends VueCustomize {
       {
         // roleId == 1 才显示
         this.logic.userInfo.roleId === 1
-          ? <el-form-item label={ `${ TEXT.COMMPANY }：` } prop="companyId">
+          ? <el-form-item label={`${TEXT.COMMPANY}：`} prop="companyId">
             {
               // 如果是 查看 弹窗，只显示公司名称给用户看
               this.logic.isDisabledForm
-                ? <el-input v-model={ this.logic.addDataParams.companyName } type="text"
-                            placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+                ? <el-input v-model={this.logic.addDataParams.companyName} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
                 // 如果是 编辑 & 新增，显示选项
-                : <el-select v-model={ this.logic.addDataParams.companyId }
-                             clearable={ true }
-                             filterable={ true }
-                             remote={ true }
-                             onclear={ async () => {
-                               // 将搜索参数置空
-                               this.logic.engineListParams.engineName = ""
-                               this.logic.engineListParams.companyId = null
+                : <el-select v-model={this.logic.addDataParams.companyId}
+                  clearable={true}
+                  filterable={true}
+                  remote={true}
+                  onclear={async () => {
+                    // 将搜索参数置空
+                    this.logic.engineListParams.engineName = ""
+                    this.logic.engineListParams.companyId = null
 
-                               this.logic.engineSelectData.dataList = []
-                             } }
-                             onchange={ async (e: string) => {
-                               if (e.length !== 0) {
-                                 this.logic.engineListParams.engineName = ""
-                                 this.logic.engineListParams.companyId = null
+                    this.logic.engineSelectData.dataList = []
+                  }}
+                  onchange={async (e: string) => {
+                    if (e.length !== 0) {
+                      this.logic.engineListParams.engineName = ""
+                      this.logic.engineListParams.companyId = null
 
-                                 // @ts-ignore
-                                 this.logic.engineListParams.companyId = Number(e)
-                                 await this.logic.getEngineSelectList();
-                                 await this.logic.getUserListByCompanyId(Number(e))
-                               }
-                             } }
-                             remote-method={ async (e: string) => {
-                               // 远程搜索
-                               this.logic.companyListParams.companyName = e
-                               await this.logic.getCompanyList()
-                             } }
-                             on-visible-change={ async (action: boolean) => {
-                               // 显示的时候 查询 所有选项一次
-                               if (action) {
-                                 this.logic.companyListParams.companyName = ""
-                                 await this.logic.getCompanyList()
-                               }
-                             } }
-                             v-loadMore={ () => {
-                               console.log("滚动加载...")
-                             } }
-                             placeholder={ TEXT.SELECT_PLACEHOLDER }>
+                      // @ts-ignore
+                      this.logic.engineListParams.companyId = Number(e)
+                      await this.logic.getEngineSelectList();
+                      await this.logic.getUserListByCompanyId(Number(e))
+                    }
+                  }}
+                  remote-method={async (e: string) => {
+                    // 远程搜索
+                    this.logic.companyListParams.companyName = e
+                    await this.logic.getCompanyList()
+                  }}
+                  on-visible-change={async (action: boolean) => {
+                    // 显示的时候 查询 所有选项一次
+                    if (action) {
+                      this.logic.companyListParams.companyName = ""
+                      await this.logic.getCompanyList()
+                    }
+                  }}
+                  v-loadMore={() => {
+                    console.log("滚动加载...")
+                  }}
+                  placeholder={TEXT.SELECT_PLACEHOLDER}>
                   {
                     this.logic.companySelectData.dataList.map(v => {
-                      return <el-option key={ v.companyId } label={ v.companyName }
-                                        value={ v.companyId }></el-option>
+                      return <el-option key={v.companyId} label={v.companyName}
+                        value={v.companyId}></el-option>
                     })
                   }
                 </el-select>
@@ -187,23 +187,23 @@ export default class Pipe extends VueCustomize {
   // 项目名称
   public ProjectNameItem(): JSX.Element {
     return (
-      <el-form-item label={ `${ TEXT.PROJECT_NAME }：` } prop="engineId">
+      <el-form-item label={`${TEXT.PROJECT_NAME}：`} prop="engineId">
         {
           this.logic.isDisabledForm
-            ? <el-input v-model={ this.logic.addDataParams.engineName } type="text"
-                        placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
-            : <el-select v-model={ this.logic.addDataParams.engineId }
-                         filterable={ true }
-                         remote={ true }
-                         placeholder={ TEXT.SELECT_PLACEHOLDER }
-                         remote-method={ async (e: string) => {
-                           // 远程搜索
-                           this.logic.engineListParams.engineName = e
-                           await this.logic.getEngineSelectList()
-                         } }>
+            ? <el-input v-model={this.logic.addDataParams.engineName} type="text"
+              placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
+            : <el-select v-model={this.logic.addDataParams.engineId}
+              filterable={true}
+              remote={true}
+              placeholder={TEXT.SELECT_PLACEHOLDER}
+              remote-method={async (e: string) => {
+                // 远程搜索
+                this.logic.engineListParams.engineName = e
+                await this.logic.getEngineSelectList()
+              }}>
               {
                 this.logic.engineSelectData.dataList.map((v, i) => {
-                  return <el-option key={ i } label={ v.engineName } value={ v.id }></el-option>
+                  return <el-option key={i} label={v.engineName} value={v.id}></el-option>
                 })
               }
             </el-select>
@@ -213,24 +213,24 @@ export default class Pipe extends VueCustomize {
   }
 
   public testedBy(): JSX.Element {
-    return <el-form-item label={ `${ TEXT.TESTED_BY }：` } prop="checkUserId">
+    return <el-form-item label={`${TEXT.TESTED_BY}：`} prop="checkUserId">
       {
         this.logic.isDisabledForm
           // 如果是添加弹窗
-          ? <el-input v-model={ this.logic.addDataParams.checkUserName } type="text"
-                      placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+          ? <el-input v-model={this.logic.addDataParams.checkUserName} type="text"
+            placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
 
-          : <el-select v-model={ this.logic.addDataParams.checkUserId }
-                       onchange={ async (e: string) => {
-                         if (e.length !== 0) {
-                           // this.logic.addOrUpdateAndEditParams.userList = []
-                           // await this.logic.getDeviceByUserId(Number(e))
-                         }
-                       } }
-                       placeholder={ TEXT.SELECT_PLACEHOLDER }>
+          : <el-select v-model={this.logic.addDataParams.checkUserId}
+            onchange={async (e: string) => {
+              if (e.length !== 0) {
+                // this.logic.addOrUpdateAndEditParams.userList = []
+                // await this.logic.getDeviceByUserId(Number(e))
+              }
+            }}
+            placeholder={TEXT.SELECT_PLACEHOLDER}>
             {
               this.logic.userListCompany.dataList.map((v, i) => {
-                return <el-option label={ v.nickname } value={ v.id }></el-option>
+                return <el-option label={v.nickname} value={v.id}></el-option>
               })
             }
           </el-select>
@@ -242,53 +242,53 @@ export default class Pipe extends VueCustomize {
   public formDialog(): JSX.Element {
     return (
       <div>
-        <el-form label-position={ 'right' }
-                 props={ { model: this.logic.addDataParams } }
-                 ref={ 'ruleForm' }
-                 rules={ this.logic.formRules }
-                 disabled={ this.logic.isDisabledForm }
-                 label-width="117px">
-          <el-row gutter={ 30 }>
-            <el-col span={ 12 }>
+        <el-form label-position={'right'}
+          props={{ model: this.logic.addDataParams }}
+          ref={'ruleForm'}
+          rules={this.logic.formRules}
+          disabled={this.logic.isDisabledForm}
+          label-width="117px">
+          <el-row gutter={30}>
+            <el-col span={12}>
 
-              { this.commpanyList() }
+              {this.commpanyList()}
 
-              { this.ProjectNameItem() }
+              {this.ProjectNameItem()}
 
-              { this.testedBy() }
+              {this.testedBy()}
 
-              <el-form-item label={ `${ TEXT.DETECTION_TIME }：` }>
-                <el-input disabled={ true }
-                          v-model={ this.logic.addDataParams.checkTime } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.DETECTION_TIME}：`}>
+                <el-input disabled={true}
+                  v-model={this.logic.addDataParams.checkTime} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
             </el-col>
 
-            <el-col span={ 12 }>
+            <el-col span={12}>
 
-              <el-form-item label={ `${ TEXT.PIPE_NUMBER }：` } prop="pointNum">
-                <el-input v-model={ this.logic.addDataParams.pointNum } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.PIPE_NUMBER}：`} prop="pointNum">
+                <el-input v-model={this.logic.addDataParams.pointNum} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.DETECTION_FREQUENCY }：` }>
-                <el-input disabled={ true } v-model={ this.logic.addDataParams.checkNum } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.DETECTION_FREQUENCY}：`}>
+                <el-input disabled={true} v-model={this.logic.addDataParams.checkNum} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.LONGITUDE }：` } prop="longitude">
-                <el-input v-model={ this.logic.addDataParams.longitude } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.LONGITUDE}：`} prop="longitude">
+                <el-input v-model={this.logic.addDataParams.longitude} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.DIMENSION }：` } prop="latitude">
-                <el-input v-model={ this.logic.addDataParams.latitude } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.DIMENSION}：`} prop="latitude">
+                <el-input v-model={this.logic.addDataParams.latitude} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
-              <el-form-item label={ `${ TEXT.CREATED_TIME }：` }>
-                <el-input disabled={ true } v-model={ this.logic.addDataParams.createTime } type="text"
-                          placeholder={ TEXT.INPUT_PLACEHOLDER }></el-input>
+              <el-form-item label={`${TEXT.CREATED_TIME}：`}>
+                <el-input disabled={true} v-model={this.logic.addDataParams.createTime} type="text"
+                  placeholder={TEXT.INPUT_PLACEHOLDER}></el-input>
               </el-form-item>
 
             </el-col>
@@ -298,20 +298,20 @@ export default class Pipe extends VueCustomize {
           {
             this.logic.formDialogType != "view"
               ? <el-button type="primary"
-                           onclick={ async () => {
-                             this.logic.formDialogType === 'add'
-                               ? await this.logic.addPoint(this.formRulesRef)
-                               : await this.logic.updatePoint(this.formRulesRef)
-                           } }>
-                { TEXT.SAVE }
+                onclick={async () => {
+                  this.logic.formDialogType === 'add'
+                    ? await this.logic.addPoint(this.formRulesRef)
+                    : await this.logic.updatePoint(this.formRulesRef)
+                }}>
+                {TEXT.SAVE}
               </el-button>
               : ''
           }
           <el-button
-            onclick={ () => {
+            onclick={() => {
               this.logic.isShowFormDialog = false
-            } }>
-            { TEXT.CANCEL }
+            }}>
+            {TEXT.CANCEL}
           </el-button>
         </div>
       </div>
@@ -320,30 +320,30 @@ export default class Pipe extends VueCustomize {
 
   protected render() {
     return (
-      <div class={ this.userInfo.roleId != 1 ? 'hidden pipe' : 'pipe' }>
+      <div class={this.userInfo.roleId != 1 ? 'hidden pipe' : 'pipe'}>
         <Container
-          filters={ this.logic.filterList }
-          action={ this.logic.tableAction }/>
+          filters={this.logic.filterList}
+          action={this.logic.tableAction} />
 
         <Table
-          loading={ this.logic.loading }
-          pageSize={ this.logic.pageSize }
-          totalCount={ this.logic.totalCount }
-          tableHeader={ this.tableHeaderConfig }
-          tableData={ this.logic.tableData.dataList }
-          sizeChange={ async (page: number) => {
+          loading={this.logic.loading}
+          pageSize={this.logic.pageSize}
+          totalCount={this.logic.totalCount}
+          tableHeader={this.tableHeaderConfig}
+          tableData={this.logic.tableData.dataList}
+          sizeChange={async (page: number) => {
             this.logic.filterParams.pageSize = page
             await this.logic.pointList()
-          } }
-          pageChange={ async (page: number) => {
+          }}
+          pageChange={async (page: number) => {
             this.logic.filterParams.pageNum = page;
             await this.logic.pointList()
-          } }/>
+          }} />
 
         <Dialog
-          top={ '6vh' }
-          isShow={ this.logic.isShowFormDialog }
-          dialogContent={ this.formDialog }/>
+          top={'6vh'}
+          isShow={this.logic.isShowFormDialog}
+          dialogContent={this.formDialog} />
 
 
       </div>
diff --git a/王凯私活/TsxVueClassApi/src/core/service/impl/data.service.impl.ts b/王凯私活/TsxVueClassApi/src/core/service/impl/data.service.impl.ts
index a8f91f2..7d7ecfd 100644
--- a/王凯私活/TsxVueClassApi/src/core/service/impl/data.service.impl.ts
+++ b/王凯私活/TsxVueClassApi/src/core/service/impl/data.service.impl.ts
@@ -17,6 +17,10 @@ export class DataServiceImpl extends BaseService {
   @POST()
   public async deleteWellById(params: object = {}): Promise<void> { }
 
+  @POST()
+  public async deleteWellById(params: object = {}): Promise<void> {}
+
+
   @POST()
   public async batchDeleteWell(params: object = {}): Promise<void> { }