MSI\liwei 3 years ago
parent
commit
f41d5ff4d8

+ 29 - 4
src/api/qdtl/data.js

@@ -12,7 +12,7 @@ export function getLineData() {
     return request({
       url: 'qdtl/common/resource?date=2022-03-12',
       method: 'get',
-      param:query
+      params:query
     })
   }
 
@@ -21,7 +21,7 @@ export function getLineData() {
     return request({
       url: 'qdtl/common/govern?date=2022-03-12',
       method: 'get',
-      param:query
+      params:query
     })
   }
 
@@ -29,7 +29,7 @@ export function getLineData() {
     return request({
       url: '/qdtl/plan/getSchedule',
       method: 'get',
-      param:query
+      params:query
     })
   }
 
@@ -37,9 +37,34 @@ export function getLineData() {
     return request({
       url: '/qdtl/common/rtmp/'+query,
       method: 'get',
-      param:query
+      params:query
     })
   }
 
+  export function queryCheck(query) {
+    return request({
+      url: '/qdtl/document/queryCheck',
+      method: 'get',
+      params:query
+    })
+  }
+
+  export function documentSave(query) {
+    return request({
+      url: '/qdtl/document',
+      method: 'post',
+      data: query
+    })
+  }
+
+  // export function queryCheck(query) {
+  //   console.log(query);
+  //   return request({
+  //     url: '/qdtl/document/queryCheck/'+query,
+  //     method: 'get',
+  //     param:query
+  //   })
+  // }
+
 
 

+ 6 - 6
src/components/map/index.vue

@@ -892,7 +892,7 @@ export default {
                           new Style({
                               stroke: new Stroke({
                                   color:"#000000",
-                                  width:6,
+                                  width:4,
                                   lineCap:"butt"
                               }),
                               zIndex:20
@@ -900,8 +900,8 @@ export default {
                           new Style({
                               stroke: new Stroke({
                                   color:"#ffffff",
-                                  width:6,
-                                  lineDash:[15,15],
+                                  width:4,
+                                  lineDash:[10,10],
                                   lineCap:"butt"
                               }),
                               zIndex:21
@@ -912,7 +912,7 @@ export default {
                     new Style({
                               stroke: new Stroke({
                                   color:"#535353",
-                                  width:6,
+                                  width:4,
                                   lineCap:"butt"
                               }),
                               zIndex:20
@@ -920,8 +920,8 @@ export default {
                           new Style({
                               stroke: new Stroke({
                                   color:"#ffffff",
-                                  width:6,
-                                  lineDash:[15,15],
+                                  width:4,
+                                  lineDash:[10,10],
                                   lineCap:"butt"
                               }),
                               zIndex:21

+ 7 - 7
src/views/governance/index.vue

@@ -4,7 +4,7 @@
   <div style="display: inline-flex;width:100%">
   <div style="width:25%;height:100%;">
        <div style="width:100%">
-       <div class="divtitle" style="margin-top:0.5rem">
+       <div class="publicTitle" style="margin-top:0.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">今日巡检</div>
         </div>
@@ -36,7 +36,7 @@
                 </div>
         </div>
 
-         <div class="divtitle" style="margin-top:0.5rem">
+         <div class="publicTitle" style="margin-top:0.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">视频资源统计</div>
         </div>
@@ -44,7 +44,7 @@
         <div id='videoeChart' style="width:45rem;height:25rem">
         </div>
 
-        <div class="divtitle" style="margin-top:1.5rem">
+        <div class="publicTitle" style="margin-top:1.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">当日巡检完成率</div>
         </div>
@@ -62,7 +62,7 @@
   
   <div style="width:25%;height:100%;">
         <div style="width:100%;padding-left:1rem">
-        <div class="divtitle" style="margin-top:1.5rem">
+        <div class="publicTitle" style="margin-top:1.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">工作面貌展示</div>
         </div>
@@ -71,14 +71,14 @@
               <img src="../../assets/images/goverce/bg.png" style="width:40rem;height:20rem;margin-top:2rem;margin-left:4rem"/>
         </div>
 
-        <div class="divtitle" style="margin-top:1.5rem">
+        <div class="publicTitle" style="margin-top:1.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">里程数统计</div>
         </div>
 
          <div id='lcChart' style="width:45rem;height:25rem"></div>
 
-        <div class="divtitle" style="margin-top:1.5rem">
+        <div class="publicTitle" style="margin-top:1.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">巡检考核</div>
         </div>
@@ -407,7 +407,7 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
- .divtitle{
+ .publicTitle{
           background: url("~@/assets/images/title@2x.png") no-repeat;
           background-size: 100% 100%;
           width:95%;

+ 13 - 9
src/views/public/index.vue

@@ -3,8 +3,8 @@
   <headerdiv ref="headerDiv" :currentindexP = currentindexNew></headerdiv>
   <div style="display: inline-flex;width:100%">
   <div style="width:25%;height:100%;">
-       <div style="width:100%">
-            <div class="divtitle" style="margin-top:0.5rem">
+                <div>
+                <div class="publicTitle" style="margin-top:0.5rem">
                         <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
                         <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">官网访问数量</div>
                 </div>
@@ -13,18 +13,23 @@
                         <div class="dayCount" style="margin-left:5.5rem;padding-top:1rem;float:left">6002</div>
                         <div class="wordCount" style="margin-left:6rem;padding-top:1rem;float:left">30</div>
                 </div>
+
                 <div style="margin-top:16rem;margin-left:3.8rem">
                         <div class="dayClass" style="float:left;">日访问量</div>
                         <div class="wordClass"style="float:left;margin-left:9.5rem">发文数量</div>
                 </div>
-                <div class="divtitle" style="margin-top:2.5rem">
+                </div>
+                 
+                <div>
+                <div class="publicTitle" style="margin-top:2.5rem">
                         <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
                         <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">公众号统计</div>
                 </div>
+                 </div>
 
                 <div id='gzhchart' style="width:45rem;height:25rem"></div>
 
-                <div class="divtitle" style="margin-top:0.5rem">
+                <div class="publicTitle" style="margin-top:0.5rem">
                         <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
                         <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">重要通知轮播</div>
                 </div>
@@ -48,14 +53,13 @@
                                     </el-table-column>
                         </el-table>
                 </div>
-       </div>
   </div>
   <div style="width:50%;height:90rem;">
       <mapdiv ref="mapdiv" style=""></mapdiv>
   </div>
   <div style="width:25%;height:100%;">
         <div style="width:100%;padding-left:1rem">
-        <div class="divtitle" style="margin-top:1.5rem">
+        <div class="publicTitle" style="margin-top:1.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">服务评价</div>
         </div>
@@ -63,14 +67,14 @@
          <div id='pieChart' style="width:45rem;height:25rem"></div>
          <!-- <div id='lcChart' style="width:45rem;height:25rem"></div> -->
 
-        <div class="divtitle" style="margin-top:1.5rem">
+        <div class="publicTitle" style="margin-top:1.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">投诉数量</div>
         </div>
         
         <div id='tsChart' style="width:45rem;height:25rem"></div>
         
-         <div class="divtitle" style="margin-top:1.5rem">
+         <div class="publicTitle" style="margin-top:1.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">本月统计趋势数据</div>
         </div>
@@ -505,7 +509,7 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
- .divtitle{
+ .publicTitle{
           background: url("~@/assets/images/title@2x.png") no-repeat;
           background-size: 100% 100%;
           width:95%;

+ 125 - 37
src/views/qdtl/document/index.vue

@@ -113,7 +113,7 @@
                                         type="textarea"
                                         :rows="5"
                                         placeholder="请输入200字以内的案例介绍"
-                                        v-model="queryParams.centerNews"
+                                        v-model="queryParams.areaNews"
                                         style="margin-top:2rem">
                                         </el-input>
                                 </div>
@@ -146,7 +146,7 @@
                               </el-form>
                         </div>
                         <div style="margin-top:0.1rem">
-                            <el-table v-loading="loading" :data="basicExampleList"  stripe
+                            <el-table :data="basicExampleList"  stripe
                                         class="my_table"
                                         :row-class-name="tableRowClassName"
                                         :header-cell-style="{background:'#24A3B3 50%',color: '#C5D0D4'}">
@@ -155,19 +155,18 @@
                                         <el-table-column label="内容描述" align="center" prop="content" />
                                         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                                             <template slot-scope="scope">
-                                            <el-button
+                                            <!-- <el-button
                                                 size="mini"
                                                 type="text"
                                                 icon="el-icon-edit"
                                                 @click="handleUpdate(scope.row)"
                                                 v-hasPermi="['qdtl:plan:edit']"
-                                            >修改</el-button>
+                                            >修改</el-button> -->
                                             <el-button
                                                 size="mini"
                                                 type="text"
                                                 icon="el-icon-delete"
-                                                @click="handleDelete(scope.row)"
-                                                v-hasPermi="['qdtl:plan:remove']"
+                                                @click="exampleDelete(scope)"
                                             >删除</el-button>
                                             </template>
                                         </el-table-column>
@@ -194,36 +193,22 @@
                                                 </el-date-picker>
                                         </el-form-item>
                                          <el-form-item>
-                                            <el-button type="primary" size="mini" @click="addExample">确定</el-button>
+                                            <el-button type="primary" size="mini" @click="queryCheck">确定</el-button>
                                         </el-form-item>
                               </el-form>
                         </div>
                         <div style="margin-top:0.1rem">
-                            <el-table v-loading="loading" :data="basicExampleList"  stripe
+                            <el-table :data="checkList"  stripe
                                         class="my_table"
                                         :row-class-name="tableRowClassName"
                                         :header-cell-style="{background:'#24A3B3 50%',color: '#C5D0D4'}">
                                         <el-table-column label="序号" align="center" type="index" />
                                         <el-table-column label="所属区域" align="center" prop="areaName" />
-                                        <el-table-column label="内容描述" align="center" prop="content" />
-                                        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                                            <template slot-scope="scope">
-                                            <el-button
-                                                size="mini"
-                                                type="text"
-                                                icon="el-icon-edit"
-                                                @click="handleUpdate(scope.row)"
-                                                v-hasPermi="['qdtl:plan:edit']"
-                                            >修改</el-button>
-                                            <el-button
-                                                size="mini"
-                                                type="text"
-                                                icon="el-icon-delete"
-                                                @click="handleDelete(scope.row)"
-                                                v-hasPermi="['qdtl:plan:remove']"
-                                            >删除</el-button>
-                                            </template>
-                                        </el-table-column>
+                                        <el-table-column label="巡更点数" align="center" prop="locationPoint" />
+                                        <el-table-column label="打卡次数" align="center" prop="checkPoint" />
+                                        <el-table-column label="平均每日打卡次数" align="center" prop="dailyPoint" />
+                                        <el-table-column label="达标率" align="center" prop="standardPercent" :formatter='formatDataSta'/>
+                                        <el-table-column label="漏检率" align="center" prop="unStandardPercent" :formatter='formatDataUns'/>
                                 </el-table>
                          </div>
               </div>
@@ -255,7 +240,7 @@
                               </el-form>
                         </div>
                         <div style="margin-top:0.1rem">
-                            <el-table v-loading="loading" :data="questionList"  stripe
+                            <el-table :data="questionList"  stripe
                                         class="my_table"
                                         :row-class-name="tableRowClassName"
                                         :header-cell-style="{background:'#24A3B3 50%',color: '#C5D0D4'}">
@@ -275,8 +260,7 @@
                                                 size="mini"
                                                 type="text"
                                                 icon="el-icon-delete"
-                                                @click="handleDelete(scope.row)"
-                                                v-hasPermi="['qdtl:plan:remove']"
+                                                @click="questionDelete(scope)"
                                             >删除</el-button>
                                             </template>
                                         </el-table-column>
@@ -311,7 +295,7 @@
                               </el-form>
                         </div>
                         <div style="margin-top:0.1rem">
-                            <el-table v-loading="loading" :data="adviceList"  stripe
+                            <el-table :data="adviceList"  stripe
                                         class="my_table"
                                         :row-class-name="tableRowClassName"
                                         :header-cell-style="{background:'#24A3B3 50%',color: '#C5D0D4'}">
@@ -331,14 +315,32 @@
                                                 size="mini"
                                                 type="text"
                                                 icon="el-icon-delete"
-                                                @click="handleDelete(scope.row)"
-                                                v-hasPermi="['qdtl:plan:remove']"
+                                                @click="adviceDelete(scope)"
                                             >删除</el-button>
                                             </template>
                                         </el-table-column>
                                 </el-table>
                          </div>
               </div>
+
+
+              <div style="margin-top:1rem">
+                         <div style="font-size: 1.6rem;
+                                    font-family: Microsoft YaHei;
+                                    font-weight: 400;
+                                    color: #FFFFFF;">附件</div>
+                        <el-upload
+                                style="margin-top:1rem"
+                                class="upload-demo"
+                                :action="uploadUrl"
+                                :on-success="handleUploadSuccess"
+                                multiple
+                                :limit="3"
+                                :file-list="fileList">
+                                <el-button size="small" type="primary">点击上传</el-button>
+                                <div slot="tip" class="el-upload__tip">支持上传图片、word、excel文件作为正文附件,文件大小有限制</div>
+                                </el-upload>
+              </div>
         </div>
 
          <div class="divtitle" style="margin-top:2rem">
@@ -412,13 +414,18 @@
                    
              </el-form>
         </div>
+
+        <div style="">
+              <el-button type="primary" @click="saveDocumet">提交</el-button>
+        </div>
       <!-- </div> -->
   </div>
 </template>
 
 <script>
-import { listDevice, getDevice, delDevice, addDevice, updateDevice } from "@/api/qdtl/device";
-import { listArea, getArea, delArea, addArea, updateArea } from "@/api/qdtl/area";
+// import { listDevice, getDevice, delDevice, addDevice, updateDevice } from "@/api/qdtl/device";
+// import { listArea, getArea, delArea, addArea, updateArea } from "@/api/qdtl/area";
+import { queryCheck,documentSave } from "@/api/qdtl/data";
 import mapdiv from "@/components/map/index.vue"
 
 export default {
@@ -426,6 +433,9 @@ export default {
   dicts: ['tl_device_type'],
   data() {
     return {
+          fileList:[],
+          fileUrl:'',
+          uploadUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
           queryParams:{},
           basicExampleList:[
                 {areaName:'汇龙镇',content:'测试内容一'},
@@ -451,12 +461,11 @@ export default {
               areaName:'',
               content:''
           },
+          checkList:[],
           dateArry:[],
     };
   },
   created() {
-    this.getList();
-    this.getAreaList();
   },
   components:{
       mapdiv
@@ -477,6 +486,77 @@ export default {
        },
        addAdvice(){
            this.adviceList.push(this.adviceObj);
+       },
+       queryCheck(){
+           console.log(this.dateArry);
+           var param = {
+               startDate:this.dateArry[0],
+               endDate:this.dateArry[1]
+           }
+        //    var param = '?startDate='+this.dateArry[0]+'&endDate='+this.dateArry[1]
+           console.log(param);
+           queryCheck(param).then(response =>{
+                 this.checkList = response.data
+           })
+       },
+       formatDataUns(row){
+            return row.unStandardPercent+'%'
+       },
+       formatDataSta(row){
+            return row.standardPercent+'%'
+       },
+       exampleDelete(data){
+                //console.log(data.$index); 
+                //var selectUserArry = [];
+                for(var index in this.basicExampleList){
+                    if(index == data.$index){
+                            this.basicExampleList.splice(index,1);
+                    }
+                }   
+               // this.selectUser = selectUserArry
+       },
+        questionDelete(data){
+                for(var index in this.questionList){
+                    if(index == data.$index){
+                            this.questionList.splice(index,1);
+                    }
+                }   
+               // this.selectUser = selectUserArry
+       },
+        adviceDelete(data){
+                for(var index in this.adviceList){
+                    if(index == data.$index){
+                            this.adviceList.splice(index,1);
+                    }
+                }   
+               // this.selectUser = selectUserArry
+       },
+       save(){
+               console.log(111);
+       },
+       saveDocumet(){
+           this.queryParams.basicExample = this.basicExampleList;
+           this.queryParams.question = this.questionList;
+           this.queryParams.advice = this.adviceList
+           this.queryParams.startDate = this.dateArry[0]
+           this.queryParams.endDate = this.dateArry[1]
+           console.log(this.fileList);
+           this.queryParams.fileUrl = this.fileList.join(',');
+           console.log(this.queryParams);
+        //    documentSave().then(response=>{
+
+        //    })
+       },
+       handleUploadSuccess(res, file){
+             if(res.code == 200){
+                    this.fileList.push(res.fileName);
+                //    console.log(res);
+                //    if(this.fileUrl.length >0){
+                //        this.fileUrl += ';'+res.fileName
+                //    }else{
+                //        this.fileUrl = res.fileName
+                //    }
+             }
        }
     
   }
@@ -506,5 +586,13 @@ export default {
 .el-range-editor--medium .el-range-separator{
      color: white
 }
+
+.el-upload__tip{
+     color: white
+}
+
+.el-upload-list__item{
+    color: white
+}
 </style>
 

+ 6 - 6
src/views/safe/index.vue

@@ -4,7 +4,7 @@
   <div style="display: inline-flex;">
   <div style="width:25%;height:100%;">
        <div style="width:100%">
-       <div class="divtitle" style="margin-top:0.5rem">
+       <div class="publicTitle" style="margin-top:0.5rem">
                 <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
                 <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">预警分析</div>
         </div>
@@ -37,8 +37,8 @@
             </div>
         </div>
 
-         <div id='yjchart' style="width:45rem;height:30rem"></div>
-         <div class="divtitle" style="margin-top:0.5rem">
+         <div id='yjchart' style="width:45rem;height:30rem;margin-top:5rem"></div>
+         <div class="publicTitle" style="margin-top:0.5rem">
                 <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
                 <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">站点预警量</div>
          </div>
@@ -54,7 +54,7 @@
   </div>
   <div style="width:25%;height:100%;">
         <div style="width:100%;padding-left:1rem">
-        <div class="divtitle" style="margin-top:1.5rem">
+        <div class="publicTitle" style="margin-top:1.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">各部门处理工单量</div>
         </div>
@@ -104,7 +104,7 @@
         <div class='pieChart' style='margin-top:5rem'></div>
          <!-- <div id='lcChart' style="width:45rem;height:25rem"></div> -->
 
-        <div class="divtitle" style="margin-top:1.5rem">
+        <div class="publicTitle" style="margin-top:1.5rem">
            <img src="../../assets/images/icon.png" style="width:1.8rem;height:1.8rem;margin-top:0.3rem"/>
            <div style="font-size:1.6rem;font-family: Adobe Heiti Std;font-weight: normal;color: #DFEEF3;margin-left:0.5rem">巡检考核</div>
         </div>
@@ -387,7 +387,7 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
- .divtitle{
+ .publicTitle{
           background: url("~@/assets/images/title@2x.png") no-repeat;
           background-size: 100% 100%;
           width:95%;