coys

src/components/echarts/index.vue

@@ -21,7 +21,7 @@
       },
       chartsHeight:{
         type:String,
-        default:'300px'
+        default:'240px'
       },
       option:{
         type:Object,

src/views/menu/cockpit/components/overviewCom.vue

@@ -206,7 +206,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 ::v-deep.van-cell::after {
-  border-bottom: 1px solid #e7f4fc;
+  border-bottom: 1px solid #008cd6;
 }
 .titleCom {
   // background-color: #f0f0f0;

src/views/menu/cockpit/indexEcharts.js

@@ -1,10 +1,5 @@
 //安全防范设施改造情况数据
 
-// [
-//   { value: 1048, name: 'GA38-2021' },
-//   { value: 735, name: 'GA38-2015' },
-//   { value: 580, name: '未达标' }
-// ]
 let securityPrecautions = (data = []) => {
   var colors = ['#146de0', '#27ef5e', '#ffc140']
   let option = {
@@ -19,7 +14,7 @@ let securityPrecautions = (data = []) => {
     legend: {
       orient: 'vertical',
       top: 'center',
-      left: '50%',
+      left: '58%',
       data: data,
       formatter: function (name) {
         var data = option.series[0].data
@@ -38,10 +33,10 @@ let securityPrecautions = (data = []) => {
     },
     series: [
       {
-        center: ['25%', '60%'],
+        center: ['30%', '50%'],
         name: '生命周期统计',
         type: 'pie',
-        radius: '50%',
+        radius: '70%',
         data: data,
 
         itemStyle: {
@@ -85,27 +80,7 @@ let securityPrecautions = (data = []) => {
   }
   return option
 }
-//GA38-2021标准
-// [
-//   {
-//     value: 55,
-//     name: '203',
-//     label: {
-//       normal: {
-//         show: true
-//       }
-//     }
-//   },
-//   {
-//     value: 45,
-//     name: '正常1',
-//     label: {
-//       normal: {
-//         show: false
-//       }
-//     }
-//   }
-// ]
+
 let pieGaData = (title = '暂无设置标题', data = []) => {
   let option = {
     tooltip: {
@@ -125,7 +100,7 @@ let pieGaData = (title = '暂无设置标题', data = []) => {
       {
         name: '',
         type: 'pie',
-        center: ['50%', '50%'], // 饼图的圆心坐标
+        center: ['45%', '50%'], // 饼图的圆心坐标
         radius: ['50%', '60%'],
         avoidLabelOverlap: false,
         hoverAnimation: false,
@@ -178,7 +153,8 @@ let dotData = (
     legend: {
       orient: 'vertical',
       top: 'center',
-      left: '50%',
+      left: '55%',
+      top:'20%',
       data: data,
       formatter: function (name) {
         var data = option.series[0].data
@@ -203,10 +179,10 @@ let dotData = (
     },
     series: [
       {
-        center: ['25%', '60%'],
+        center: ['27%', '40%'],
         name: '生命周期统计',
         type: 'pie',
-        radius: '50%',
+        radius: '60%',
         data: data,
 
         itemStyle: {

src/views/menu/monitoringCall/components/monitoringList.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
     <div class="topBox">
-      
       <div class="title" style="padding-top: 10px; margin-top: 0px">硬盘录像机:{{ list.hostName }}</div>
       <div class="title">摄像机:{{ list.videoChannelName }}</div>
       <van-row class="List titleList">
@@ -10,21 +9,20 @@
       </van-row>
       <div v-for="item in list.coreMonitoringTaskMonitorInfoList" :key="item.id">
         <van-row>
-          <van-col :class="item.situation == 1 ? 'vancol borderClsyc' : 'vancol borderCls' "  span="10">{{ item.project | proJectListFilter(this_) }}</van-col>
-          <van-col  :class="item.situation == 1 ? 'vancol borderClsyc' : 'vancol borderCls' "  span="14" ><span :style="{ color: item.situation == 1 ? '#12b533' : '#12b533' }">{{
+          <van-col :class="item.situation == 1 ? 'vancol borderClsyc' : 'vancol borderCls'" span="10">{{
+            item.project | proJectListFilter(this_)
+          }}</van-col>
+          <van-col :class="item.situation == 1 ? 'vancol borderClsyc' : 'vancol borderCls'" span="14"
+            ><span :style="{ color: item.situation == 1 ? '#12b533' : '#12b533' }">{{
               item.situation | dictFilter(this_)
             }}</span></van-col
           >
         </van-row>
-        <van-row v-if="item.situation == 1">
-
-          <van-col class="abnorText borderyc" span="10">异常情况描述:</van-col>
-          <van-col class="abnorText borderyc yctext" span="14">{{ item.abnormalIllustrate }}</van-col>
+        <van-row v-if="item.situation == 1" class="borderyc">
+          <van-col class="abnorText yctextleft" span="10" >异常情况描述:</van-col>
+          <van-col class="abnorText yctext" span="14">{{ item.abnormalIllustrate }}</van-col>
         </van-row>
-       
       </div>
-
-     
     </div>
   </div>
 </template>
@@ -119,7 +117,6 @@ export default {
   margin-left: 20px;
 }
 .van-row {
-  
   // padding-left: 10px;
 }
 
@@ -138,43 +135,37 @@ export default {
   height: 100%;
 
   line-height: 60px;
- 
+
   padding-left: 20px;
 }
-.borderCls{
-  border-right: 1px solid #ccc;
-  border-bottom: 1px solid #ccc;
-  
-  border-left: 1px solid #ccc;
+.borderCls {
+  border: 1px solid #ccc;
+  border-top: none;
 }
 .borderClsyc{
-  
+  border: 1px solid #ccc;
+  border-bottom: none;
+}
+
+.borderyc {
+  font-size: 20px;
   border-right: 1px solid #ccc;
-  
-  
   border-left: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
 }
-.borderyc{
-  font-size: 20px;
-   border-right: 1px solid #ccc;
-   
-   
-   border-left: 1px solid #ccc;
-   border-bottom: 1px solid #ccc;
+.yctextleft{
+  border-right: 1px solid #ccc;
 }
-.yctext{
-  
+.yctext {
   border-left: 1px solid #ccc;
-  box-sizing: border-box;
-  border-right: 1px solid #ccc;
-  
+  margin-left: -1px;
  
 }
-.abnorText{
+.abnorText {
   // font-size: 20px;
   color: #ff0202;
   padding-left: 10px;
-  word-wrap:break-word;
+  word-wrap: break-word;
   padding-left: 10px;
 }
 .img {

src/views/menu/resumptionEvaluate/evaluate.vue

@@ -21,7 +21,11 @@
       </div>
       <van-form @submit="onSubmit" ref="form" v-if="addOrInfo == 'add'">
         <van-cell
-          :title="item.code + '.' + 'item.content评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容content评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容'"
+          :title="
+            item.code +
+            '.' +
+            'item.content评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容content评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容'
+          "
           v-for="item in formData.coreEvaluateContentList"
           :key="item.id"
         >
@@ -35,15 +39,27 @@
             />
           </template>
           <template #label v-else>
-            <span style="font-size: 14px">评分:</span
-            ><van-rate
-              count="10"
-              v-model="item.score"
-              :size="20"
-              color="#ffd21e"
-              void-icon="star"
-              void-color="#eee"
-            />{{ item.score }}分
+            <!-- <span style="font-size: 14px">评分:</span
+            > -->
+            <van-field
+              name="rate"
+              style="font-size: 14px"
+              :rules="[{ required: true, message: item.content + '评分不能为空' }]"
+              label="评分"
+              class="pfcls"
+            >
+              <template #input>
+                <van-rate
+                  count="10"
+                  required
+                  v-model="item.score"
+                  :size="20"
+                  color="#ffd21e"
+                  void-icon="star"
+                  void-color="#eee"
+                />{{ item.score || 0 }}分
+              </template>
+            </van-field>
           </template>
         </van-cell>
       </van-form>
@@ -181,22 +197,27 @@ export default {
   }
 }
 </script>
-<style  >
-
+<style lang="scss">
+.pfcls {
+  .van-field__label {
+    width: 80px;
+  }
+  .van-field__error-message {
+    display: block;
+  }
+}
 </style>
 <style lang="scss" scoped>
-
 .evaluate {
-  .van-form{
-    height: calc(100vh - 300px);  
+  .van-form {
+    height: calc(100vh - 300px);
     overflow: scroll;
     padding-bottom: 130px;
   }
   font-size: 30px;
-  .bgcwirte{
+  .bgcwirte {
     background: #fff;
     padding: 20px;
-
   }
 }
 .cell_cls {
@@ -228,7 +249,7 @@ export default {
 }
 .cell-btutton {
   position: fixed;
-  bottom: 0% ;
+  bottom: 0%;
   width: 100%;
 }
 .cardBigBox {

src/views/menu/resumptionEvaluate/index.vue

@@ -200,7 +200,7 @@ export default {
 
     //判断评价按钮是否展示
     evaluateTure(item) {
-    
+       
       if (item.status == 0) {
         return true
       }