wenhongquan 2 gadi atpakaļ
vecāks
revīzija
39e64cc80e

+ 1 - 0
src/components/ImageUpload/index.vue

@@ -116,6 +116,7 @@ function handleRemove(file, files) {
 // 上传成功回调
 function handleUploadSuccess(res) {
   uploadList.value.push({ name: res.fileName, url: res.fileName });
+  debugger
   if (uploadList.value.length === number.value) {
     fileList.value = fileList.value.filter(f => f.url !== undefined).concat(uploadList.value);
     uploadList.value = [];

+ 8 - 8
src/views/detection/list/index.vue

@@ -95,7 +95,7 @@
           style="width: 100%"
           @row-click="tblrowclick"
         >
-          <el-table-column prop="taskCode" label="台账编号">
+          <el-table-column prop="taskCode" fixed="left" label="台账编号">
             <template #default="scope">
               {{
                 alldevices.filter((i) => i.id === scope.row.facilitiesId)[0]?.ext1
@@ -103,7 +103,7 @@
               }}
             </template>
           </el-table-column>
-          <el-table-column prop="taskCode" label="设施名称">
+          <el-table-column prop="taskCode" fixed="left" width="200" label="设施名称">
             <template #default="scope">
               {{
                 alldevices.filter((i) => i.id === scope.row.facilitiesId)[0]?.ext1
@@ -133,7 +133,7 @@
               }}
             </template>
           </el-table-column>
-          <el-table-column label="路段范围">
+          <el-table-column width="300" label="路段范围">
             <template #default="scope">
               {{
                 alldevices.filter((i) => i.id === scope.row.facilitiesId)[0]?.ext1
@@ -141,8 +141,8 @@
               }}
             </template>
           </el-table-column>
-          <el-table-column prop="ext1.task.datestart" label="计划时间" />
-          <el-table-column prop="ext1.task.dateend" label="完成时间" />
+          <el-table-column prop="ext1.task.datestart" width="100" label="计划时间" />
+          <el-table-column prop="ext1.task.dateend" width="100" label="完成时间" />
           <el-table-column label="管径(mm)">
             <template #default="scope">
               {{ scope.row.ext1.task.gd.map((i) => i.yh_gj).join("、") }}
@@ -209,14 +209,14 @@
               {{ scope.row.detectionRemark }}
             </template>
           </el-table-column>
-          <el-table-column prop="address" label="操作">
+          <el-table-column prop="address" fixed="right" width="200" label="操作">
             <template #default="scope">
-              <el-button text size="small" @click.stop="edittask(scope.row)"
+              <el-button text type="primary" size="small" @click.stop="edittask(scope.row)"
                 >修改
               </el-button>
               <el-popconfirm title="确定删除?" @confirm="deltask(scope.row)">
                 <template #reference>
-                  <el-button text size="small" @click.stop="">删除</el-button>
+                  <el-button text type="danger" size="small" @click.stop="">删除</el-button>
                 </template>
               </el-popconfirm>
             </template>

+ 4 - 1
src/views/task/list/index.vue

@@ -205,6 +205,7 @@
             <template #default="scope">
               <el-button
                 text
+                type="primary"
                 size="small"
                 v-if="route.params.status != 6"
                 @click.stop="edittask(scope.row)"
@@ -216,12 +217,13 @@
                 v-if="route.params.status == 1"
               >
                 <template #reference>
-                  <el-button text size="small" @click.stop="">删除</el-button>
+                  <el-button text type="danger" size="small" @click.stop="">删除</el-button>
                 </template>
               </el-popconfirm>
               <el-button
                 v-if="scope.row.status == 6 && route.params.status == 6"
                 text
+                type="success"
                 size="small"
                 @click.stop="exportexcel(scope.row)"
                 >导出工单
@@ -229,6 +231,7 @@
               <el-button
                 v-if="scope.row.status == 6 && route.params.status == 6"
                 text
+                type="success"
                 size="small"
                 @click.stop="exportexcel1(scope.row)"
                 >导出热线照片

+ 2 - 2
vite.config.js

@@ -38,8 +38,8 @@ export default defineConfig(({ mode, command }) => {
             proxy: {
                 // 'http://nnbpbg.xt.wenhq.top:8083'
                 "/dev-api": {
-                    // target: "http://localhost:8080/api",
-                    target:"http://nnbpbg.xt.wenhq.top:8083/api",
+                    target: "http://localhost:8080/api",
+                    // target:"http://nnbpbg.xt.wenhq.top:8083/api",
                     changeOrigin: true,
                     rewrite: (p) => p.replace(/^\/dev-api/, ""),
                 },