`fix`

src/layout/components/Navbar.vue

@@ -85,15 +85,21 @@ function handleCommand(command) {
     case "logout":
       logout();
       break;
-    case "godap":
-      location.href = "/work"
+    case "godap": {
+      var tempwindow = window.open('_blank');
+      tempwindow.location = '/work';
+      // location.href = "/work"
       break
+    }
+
     default:
       break;
   }
 }
 function godap() {
-  location.href = "/work";
+  // location.href = "/work";
+  var tempwindow = window.open('_blank');
+  tempwindow.location = '/work';
 }
 
 function logout() {

src/views/detection/detail/index.vue

@@ -465,12 +465,14 @@
       <div>
         <el-form :model="pdobj" label-width="120px">
           <el-form-item label="负责班组"
-            ><el-tree-select
+            ><el-select
               style="width: 100%"
               v-model="pdobj.fzbz"
               multiple
-              :data="treedept"
-          /></el-form-item>
+          >
+          <el-option v-for="item in treedept" :label="item.label" :value="item.id" />
+          </el-select>
+          </el-form-item>
           <el-form-item label="负责人">
             <el-select v-model="pdobj.fzr" placeholder="请选择" style="width: 100%">
               <el-option
@@ -1496,7 +1498,7 @@ onMounted(async () => {
     return dept;
   }
   deptTreeselect().then((res) => {
-    treedept.value = [setdatakey(res.data[0])];
+    treedept.value = setdatakey(res.data[0].children.filter(i => i.id == 202))[0].children;
   });
 }
 

src/views/detection/list/index.vue

@@ -17,6 +17,13 @@
         </el-form-item>
         </el-col>
         <el-col :span="6">
+          <el-form-item label="设施名称">
+            <el-select v-model="queryparameters.facilitiesId" class="m-1" placeholder="请选择">
+              <el-option v-for="item in alldevices" :label="item.ext1.tz_ss_name" :value="item.id"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
         <el-form-item label="计划状态" v-if="currentstatus == 1">
           <el-select v-model="queryparameters.status" class="m-1" placeholder="请选择">
             <el-option
@@ -49,6 +56,13 @@
               start-placeholder="开始时间" end-placeholder="结束时间" />
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="城区">
+            <el-select v-model="queryparameters.area" class="m-2" placeholder="请选择">
+              <el-option v-for="item in sys_area" :label="item.label" :value="item.value"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
 
         <el-col :span="6">
           <el-form-item label="关键字">
@@ -265,10 +279,10 @@
                 label="任务类型"
                 required
                 label-width="150px"
-                prop="maintainType"
+                prop="detectionType"
               >
                 <el-select
-                  v-model="detectioninfo.maintainType"
+                  v-model="detectioninfo.detectionType"
                   filterable
                   placeholder="请选择类型"
                 >
@@ -638,6 +652,8 @@ const queryparameters = ref({
   facilitiesId: "",
   taskDeptRange: [],
   searchkey: "",
+  area: "",
+  params: { },
   pageNum: 1,
   pageSize: 10,
 });
@@ -673,8 +689,11 @@ const resetall = () => {
     facilitiesId: "",
     taskDeptRange: [],
     searchkey: "",
+    area:"",
     pageNum: 1,
     pageSize: 10,
+    params: {
+    },
   }
 }
 
@@ -751,10 +770,11 @@ const onadd = () => {
 const getList = () => {
   if (currentstatus.value != 1) {
     if (currentstatus.value == 2) {
-      queryparameters.value.status = 1;
+      queryparameters.value.params["status"] = "1,2,3";
     } else {
-      queryparameters.value.status = currentstatus.value;
+      queryparameters.value.params["status"] = "4,6";
     }
+    // delete queryparameters.value.status;
   } else {
     queryparameters.value.status = "";
   }
@@ -767,6 +787,9 @@ const getList = () => {
   if (query.searchkey != undefined && query.searchkey !== "") {
     query.params["searchkey"] = query.searchkey;
   }
+  if (query.area != undefined && query.area !== "") {
+    query.params["area"] = query.area;
+  }
   if (query.taskDeptRange != undefined) {
     query.taskDeptRange = query.taskDeptRange.join(",");
   }

src/views/maintain/list/index.vue

@@ -478,6 +478,7 @@ const queryparameters = ref({
   searchkey: "",
   pageNum: 1,
   pageSize: 10,
+  params: {},
 });
 const {
   task_status,
@@ -512,12 +513,14 @@ const treedept = ref([]);
 const resetall = () => {
   queryparameters.value = {
     status: "",
+    params: {},
     maintainType: "",
     facilitiesId: "",
     taskDeptRange: [],
     searchkey: "",
     pageNum: 1,
     pageSize: 10,
+
   };
 }
 
@@ -614,7 +617,7 @@ const onadd = () => {
 const getList = () => {
   if (currentstatus.value != 1) {
     if (currentstatus.value == 2) {
-      queryparameters.value.status = 1;
+      queryparameters.value.params["status"] = "1,2,3,4";
     } else {
       queryparameters.value.status = currentstatus.value;
     }

src/views/screen/index.vue

@@ -30,7 +30,7 @@
               人员动态
             </div>
             <div class="contentp">
-              <el-table :row-class-name="tableRowClassName" :data="sjrydata" header-row-class-name="tblheaderclass"
+              <el-table :row-class-name="tableRowClassName"  @select="(e, e1) => { return false; }" :data="sjrydata" header-row-class-name="tblheaderclass"
                 style="width: 100%;" height="240">
                 <el-table-column prop="params.deptname" label="班组" width="103" />
                 <el-table-column prop="params.username" label="人员" />
@@ -47,7 +47,7 @@
               降雨监测
             </div>
             <div class="contentp">
-              <el-table :row-class-name="tableRowClassName" :data="weatherdata" header-row-class-name="tblheaderclass"
+              <el-table :row-class-name="tableRowClassName"  :highlight-current-row="false" :data="weatherdata" header-row-class-name="tblheaderclass"
                 style="width: 100%;" height="240">
                 <el-table-column prop="fxDate" label="日期" width="103" />
                 <el-table-column prop="textDay" label="天气" />
@@ -254,10 +254,10 @@ function addmarks() {
       position: JSON.parse(`[${currenttask[index].taskLocation}]`),
       map: window.map,
       icon: new AMap.Icon({
-        size: new AMap.Size(50, 50),    // 图标尺寸
+        size: new AMap.Size(25, 25),    // 图标尺寸
         image: currenttask[index].status == 6 ? '/map-marker-green.png' : '/map-marker-red.png',
         // imageOffset: new AMap.Pixel(0, -60),  // 图像相对展示区域的偏移量，适于雪碧图等
-        imageSize: new AMap.Size(50, 50)   // 根据所设置的大小拉伸或压缩图片
+        imageSize: new AMap.Size(25, 25)   // 根据所设置的大小拉伸或压缩图片
       })
 
     });
@@ -274,7 +274,7 @@ function addmarks() {
     // info.style.background = "rgba(0,0,0,0.6)";
     info.style.color = "black";
     info.innerHTML = (`${e.target.content.params.data}`);
-    if (infoWindow == null) { infoWindow = new AMap.InfoWindow({ offset: new AMap.Pixel(25, 0) }); }
+    if (infoWindow == null) { infoWindow = new AMap.InfoWindow({ offset: new AMap.Pixel(0, 0) }); }
     infoWindow.setContent(info);
     infoWindow.open(window.map, e.target.getPosition());
   }
@@ -326,7 +326,7 @@ function addmarks() {
       var myChart2 = echarts.init(document.getElementById('chart2'));
       var sourcex = [['zt',"总数","完成"]];
       for (var index = 0; index < 12; index++) {
-        sourcex.push([month[index],taskdata1.total[index], taskdata1.wc[index]])
+        sourcex.push([month[index],taskdata2.total[index], taskdata2.wc[index]])
       }
       myChart2.setOption({
         legend: { left: 'right' },
@@ -358,8 +358,8 @@ function addmarks() {
       var imgwidth = myChart.getWidth()
 
       let xData = month,
-        yData = taskdata2.wc,
-        barData = taskdata2.wc, maxData = taskdata2.total;
+        yData = taskdata1.wc,
+        barData = taskdata1.wc, maxData = taskdata1.total;
 
       var option = {
         backgroundColor: 'rgb(0, 16, 58)',
@@ -641,7 +641,7 @@ function addmarks() {
 
 
             }
-            tj.number = total + "";
+            tj.number = wctotal + "";
             tj.unit = ism ? "米" : "座";
             tj.wc = ((wctotal / (total == 0 ? 1 : total)) * 100).toFixed(2) + "%"
           }
@@ -809,10 +809,16 @@ function addmarks() {
     --el-table-header-bg-color: rgba(0, 0, 0, 0) !important;
     --el-table-border: none;
     --el-table-border-color: rgba(0, 0, 0, 0) !important;
+    --el-table-row-hover-bg-color:rgba(0,0,0,0) !important;
+    .el-table__header-wrapper th,
+      .el-table .el-table__fixed-header-wrapper th{
+        background: rgba(0, 0, 0, 0) !important;
+      }
     color: #fff;
 
   }
 
+  --el-table-row-hover-bg-color
   .el-table .el-table__header-wrapper th,
   .el-table .el-table__fixed-header-wrapper th {
     background: rgba(0, 0, 0, 0) !important;