Просмотр исходного кода

修改演练登记添加点评总结字段 删除评语输入框

coys 1 год назад
Родитель
Сommit
7da268af74

+ 13 - 0
package-lock.json

@@ -3851,6 +3851,14 @@
       "integrity": "sha512-wK2sCs4feiiJeFXn3zvY0p41mdU5VUgbgs1rNsc/y5ngFUijdWd+iIN8eoyuZHKB8xN6BL4PdWmzqFmxNg6V2w==",
       "dev": true
     },
+    "echarts": {
+      "version": "4.9.0",
+      "resolved": "https://registry.npmmirror.com/echarts/-/echarts-4.9.0.tgz",
+      "integrity": "sha512-+ugizgtJ+KmsJyyDPxaw2Br5FqzuBnyOWwcxPKO6y0gc5caYcfnEUIlNStx02necw8jmKmTafmpHhGo4XDtEIA==",
+      "requires": {
+        "zrender": "4.3.2"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmmirror.com/ee-first/-/ee-first-1.1.1.tgz",
@@ -8046,6 +8054,11 @@
       "resolved": "https://registry.npmmirror.com/yargs-parser/-/yargs-parser-20.2.9.tgz",
       "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true
+    },
+    "zrender": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmmirror.com/zrender/-/zrender-4.3.2.tgz",
+      "integrity": "sha512-bIusJLS8c4DkIcdiK+s13HiQ/zjQQVgpNohtd8d94Y2DnJqgM1yjh/jpDb8DoL6hd7r8Awagw8e3qK/oLaWr3g=="
     }
   }
 }

+ 1 - 1
package.json

@@ -19,7 +19,7 @@
     "browser-fs-access": "^0.34.1",
     "core-js": "^3.23.3",
     "dayjs": "^1.11.9",
-    "echarts": "^5.4.3",
+    "echarts": "^4.9.0",
     "js-image-compressor": "^2.0.0",
     "liquor-tree": "^0.2.70",
     "pdfjs-dist": "2.5.207",

+ 64 - 0
src/components/echarts/index.vue

@@ -0,0 +1,64 @@
+<template>
+    <!-- 需要设置改div的宽度和长度才能显示 -->
+    <div :id="id" :style="{'width': chartsWidth, 'height':chartsHeight} "></div>
+  </template>
+  
+  <script>
+  // 第一种方式:哪个组件需要就在哪个组件引入
+  import echarts from "echarts";
+  export default {
+    mounted() {
+      this.initEcharts();
+    },
+    props:{
+      id:{
+        type:String,
+        default:'main'
+      },
+      chartsWidth:{
+        type:String,
+        default:'400px'
+      },
+      chartsHeight:{
+        type:String,
+        default:'300px'
+      },
+      option:{
+        type:Object,
+        default:{
+          title: {
+            text: "ECharts 入门示例",
+          },
+          tooltip: {},
+          legend: {
+            data: ["销量"],
+          },
+          xAxis: {
+            data: ["衬衫", "羊毛衫", "雪纺衫", "裤子", "高跟鞋", "袜子"],
+          },
+          yAxis: {},
+          series: [
+            {
+              name: "销量",
+              type: "line",
+              data: [5, 20, 36, 10, 10, 20],
+            },
+          ],
+        }
+      }
+    },
+    methods: {
+      initEcharts() {
+        var myChart = echarts.init(document.getElementById(`${this.id}`));
+        // 指定图表的配置项和数据
+        var option = this.option ;
+        // 使用刚指定的配置项和数据显示图表。
+        myChart.setOption(option);
+      },
+    },
+  };
+  </script>
+  
+  <style>
+  </style>
+  

+ 1 - 1
src/config/env.development.js

@@ -2,7 +2,7 @@
 module.exports = {
   title: 'soc-app-dev',
   baseUrl: 'http://10.87.10.55:8080', // 本地图片地址
-  baseApi: '/jwx', // 本地api请求地址,注意:如果你使用了代理,请设置成'/'
+  baseApi: '/dev', // 本地api请求地址,注意:如果你使用了代理,请设置成'/'
   APPID: 'xxx',
   APPSECRET: 'xxx',
   $cdn: 'https://www.sunniejs.cn/static'  //静态资源

+ 7 - 6
src/router/router.config.js

@@ -102,6 +102,12 @@ export let routers = [
     component: () => import('@/views/menu/rehearsalTask/components/rehearsalTaskSign.vue'),
     meta: { title: '演练详情', keepAlive: false }
   },
+  {
+    path: '/cockpit',
+    name: 'cockpit',
+    component: () => import('@/views/menu/cockpit/index.vue'),
+    meta: { title: '驾驶舱', keepAlive: false ,hideTabBar:false}
+  },
 
   {
     path: '/home',
@@ -298,12 +304,7 @@ export let routers = [
         component: () => import('@/views/menu/visitRecord/detail.vue'),
         meta: { title: '出入人员登记', keepAlive: false ,hideTabBar:true}
       },
-      {
-        path: '/cockpit',
-        name: 'cockpit',
-        component: () => import('@/views/menu/cockpit/index.vue'),
-        meta: { title: '驾驶舱', keepAlive: false ,hideTabBar:false}
-      },
+      
     ],
   },
 ]

+ 0 - 0
src/views/menu/cockpit/components/orgInfo.vue


+ 278 - 0
src/views/menu/cockpit/components/overviewCom.vue

@@ -0,0 +1,278 @@
+<template>
+  <div class="titleCom">
+    <div>
+      <van-cell v-for="i in 6" :key="i">
+        <!-- 使用 title 插槽来自定义标题 -->
+        <template #title>
+          <span class="custom-title">行社</span>
+        </template>
+        <span class="itemNum" v-for="(item, index) in 6" :key="index">{{ index }}</span>
+      </van-cell>
+    </div>
+    <!-- 设备 -->
+    <div class="equipment">
+      <van-cell>
+        <template #title>
+          <span class="custom-title">大堂式设备数量</span>
+        </template>
+        <span class="itemNum" v-for="(item, index) in 6" :key="index">{{ index }}</span>
+      </van-cell>
+      <van-cell>
+        <template #title>
+          <span class="custom-title">穿墙式设备数量</span>
+        </template>
+        <span class="itemNum" v-for="(item, index) in 6" :key="index">{{ index }}</span>
+      </van-cell>
+    </div>
+    <!-- 模块数据展示 -->
+    <div class="bigModule">
+      <div class="moduleCom">
+        <div>GA38-2021</div>
+        <div class="moduleItem">
+          <div>
+            <div class="numCls wj-title-blue">55%</div>
+            <div class="fontCls">当月完成率</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">150</div>
+            <div class="fontCls">当月完成数</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">
+              <van-icon name="down" class="wj-title-red rate" />
+              <span>10</span>
+            </div>
+            <div class="fontCls">较上月</div>
+          </div>
+        </div>
+      </div>
+
+      <div class="moduleCom">
+        <div>GA38-2021</div>
+        <div class="moduleItem">
+          <div>
+            <div class="numCls wj-title-blue">55%</div>
+            <div class="fontCls">当月完成率</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">150</div>
+            <div class="fontCls">当月完成数</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">
+              <van-icon name="down" class="wj-title-green" />
+              <span>10</span>
+            </div>
+            <div class="fontCls">较上月</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="businessModule">
+      <div class="moduleCom">
+        <div>日常履职</div>
+        <div class="moduleItem">
+          <div>
+            <div class="numCls wj-title-blue">55%</div>
+            <div class="fontCls">当月完成率</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">150</div>
+            <div class="fontCls">当月完成数</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">
+              <van-icon name="down" class="wj-title-green" />
+              <span>10</span>
+            </div>
+            <div class="fontCls">较上月</div>
+          </div>
+        </div>
+      </div>
+      <div class="moduleCom">
+        <div>网点自查</div>
+        <div class="moduleItem">
+          <div>
+            <div class="numCls wj-title-blue">55%</div>
+            <div class="fontCls">当月完成率</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">150</div>
+            <div class="fontCls">当月完成数</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">
+              <van-icon name="down" class="wj-title-green" />
+              <span>10</span>
+            </div>
+            <div class="fontCls">较上月</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="businessModule">
+      <div class="moduleCom">
+        <div>教育培训</div>
+        <div class="moduleItem">
+          <div>
+            <div class="numCls wj-title-blue">55%</div>
+            <div class="fontCls">当月完成率</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">150</div>
+            <div class="fontCls">当月完成数</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">
+              <van-icon name="down" class="wj-title-green" />
+              <span>10</span>
+            </div>
+            <div class="fontCls">较上月</div>
+          </div>
+        </div>
+      </div>
+      <div class="moduleCom">
+        <div>预案演练</div>
+        <div class="moduleItem">
+          <div>
+            <div class="numCls wj-title-blue">55%</div>
+            <div class="fontCls">当月完成率</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">150</div>
+            <div class="fontCls">当季完成数</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">
+              <van-icon name="down" class="wj-title-green" />
+              <span>10</span>
+            </div>
+            <div class="fontCls">较上月</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="businessModule">
+      <div class="moduleCom">
+        <div>监控调阅</div>
+        <div class="moduleItem">
+          <div>
+            <div class="numCls wj-title-blue">55%</div>
+            <div class="fontCls">当月完成率</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">150</div>
+            <div class="fontCls">当月完成数</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">
+              <van-icon name="down" class="wj-title-green" />
+              <span>10</span>
+            </div>
+            <div class="fontCls">较上月</div>
+          </div>
+        </div>
+      </div>
+      <div class="moduleCom">
+        <div>问题整改</div>
+        <div class="moduleItem">
+          <div>
+            <div class="numCls wj-title-blue">55%</div>
+            <div class="fontCls">整改率</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">150</div>
+            <div class="fontCls">应改率</div>
+          </div>
+          <div>
+            <div class="numCls wj-title-blue">
+              <span>10</span>
+            </div>
+            <div class="fontCls">已整改</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'SocAppOverviewCom',
+
+  data() {
+    return {}
+  },
+
+  mounted() {},
+
+  methods: {}
+}
+</script>
+<style lang="scss" scoped>
+.titleCom {
+  background-color: #f0f0f0;
+  margin: 10px;
+  box-shadow: 0 2px 10px #ccc;
+  .itemNum {
+    width: 40px;
+    height: 40px;
+    margin-left: 10px;
+    border: 1px solid #797979;
+    color: #008cd6;
+    display: inline-block;
+    text-align: center;
+    line-height: 40px;
+  }
+}
+.equipment {
+  margin-top: 20px;
+}
+.bigModule {
+  display: flex;
+  flex-wrap: wrap;
+  margin-bottom: 20px;
+}
+.moduleCom {
+  width: 50%;
+  height: 260px;
+  background-color: #fff;
+  margin-top: 20px;
+  padding: 10px;
+  // border-left: 1px solid #008cd6;
+
+  .moduleItem {
+    margin-top: 100px;
+    display: flex;
+    text-align: center;
+    justify-content: space-around;
+    .numCls {
+      font-size: 40px;
+      .iconcls {
+        font-size: 40px;
+      }
+    }
+    .fontCls {
+      font-size: 20px;
+    }
+  }
+}
+.moduleCom:not(.bigModule :has(+ .moduleCom),.businessModule :has(+ .moduleCom)) {
+  border-left: 1px solid #008cd6;
+}
+
+.businessModule {
+  display: flex;
+  flex-wrap: wrap;
+ 
+}
+.businessModule {
+  .moduleCom {
+    margin-top: 0px;
+    border-bottom: 1px solid #008cd6;
+  }
+}
+
+.rate {
+  transform: rotate(180deg);
+}
+</style>

+ 87 - 10
src/views/menu/cockpit/index.vue

@@ -1,21 +1,76 @@
 <template>
-    <div class="index-container">   
-        <div>
-            哈哈哈哈哈
-        </div>
+  <div class="index-container">
+    <NavBar :go="{ type: 'push', path: goBack }" />
+    <van-row>
+      <van-col span="24">
+        <org-tree v-model="cascaderValue" :name="'sss'" @changeItem="getDataList"></org-tree>
+      </van-col>
+    </van-row>
+    <div>
+      <van-tabs type="card" color="#008cd6">
+        <van-tab title="总览">
+          <!-- 总览组件 -->
+          <overview></overview>
+        </van-tab>
+        <van-tab title="基础信息">
+          <!-- 安全防范改造情况 -->
+          <div class="boxCard">
+            <chartsCom ref="charts" :id="'main'" :option="dataopntion"></chartsCom>
+          </div>
+          <!-- GA38-2021标准 -->
+          <div style="display: flex">
+          
+            <van-row>
+              
+              <van-col :span="11">
+                <div class="boxCard">
+                  <chartsCom
+                    ref="chartsff"
+                    :chartsHeight="'150px'"
+                    :chartsWidth="'200px'"
+                    :id="'yewd'"
+                    :option="dataGA"
+                  ></chartsCom>
+                </div>
+              </van-col>
+              <van-col :span="11">
+                <div class="boxCard">
+                  <chartsCom
+                    ref="chartsff"
+                    :chartsHeight="'150px'"
+                    :chartsWidth="'200px'"
+                    :id="'zzyh'"
+                    :option="dataGAzz"
+                  ></chartsCom>
+                </div>
+              </van-col>
+            </van-row>
+          </div>
+        </van-tab>
+        <van-tab title="综合数据">综合数据</van-tab>
+        <van-tab title="履职情况">履职情况</van-tab>
+      </van-tabs>
     </div>
+  </div>
 </template>
 
 <script>
-import TopBar from '@/components/TopBar'
-import OrgInfo from './components/orgInfo.vue';
-import QuestionInfo from './components/questionInfo.vue';
-import TaskInfo from './components/taskInfo.vue';
+import NavBar from '@/components/NavBar'
+import OrgTree from '@/components/orgTree'
+import overview from './components/overviewCom'
+import chartsCom from '@/components/echarts/index.vue'
+import { securityPrecautions, pieGaData } from '@/views/menu/cockpit/indexEcharts.js'
 export default {
   name: 'works',
-  components: { TopBar },
+  components: {
+    NavBar,
+    chartsCom,
+    overview,
+    OrgTree
+  },
   data() {
     return {
+      cascaderValue: '', //机构ID
       tabOptions: [
         {
           value: 1,
@@ -29,8 +84,30 @@ export default {
           value: 3,
           label: '隐患整改'
         }
-      ]
+      ],
+      // 安全防范改造情况
+      dataopntion: securityPrecautions(),
+      // GA38-2021标准
+      dataGA: pieGaData('营业网点'),
+      dataGAzz: pieGaData('离行式自助银行')
     }
+  },
+  mounted() {
+    this.cascaderValue = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
+  },
+  methods: {
+    goBack() {},
+    getDataList() {}
   }
 }
 </script>
+<style lang="scss" scoped>
+.index-container {
+  background-color: #fff;
+}
+.boxCard {
+  background-color: #fff;
+  margin: 10px;
+  box-shadow: 0 2px 10px #ccc;
+}
+</style>

+ 146 - 0
src/views/menu/cockpit/indexEcharts.js

@@ -0,0 +1,146 @@
+//安全防范设施改造情况数据
+let securityPrecautions = (
+  data = [
+    { value: 1048, name: 'GA38-2021' },
+    { value: 735, name: 'GA38-2015' },
+    { value: 580, name: '未达标' }
+  ]
+) => {
+  var colors = ['#5b9bd5', '#ed7d31', '#a5a5a5']
+  let option = {
+    title: {
+      text: '安全防范改造情况',
+
+      left: 'left'
+    },
+    tooltip: {
+      trigger: 'item'
+    },
+    legend: {
+      orient: 'vertical',
+      top: 'center',
+      left: '50%',
+      data: data,
+      formatter: function (name) {
+        var data = option.series[0].data
+        var total = 0
+        var tarValue
+        for (var i = 0; i < data.length; i++) {
+          total += data[i].value
+          if (data[i].name == name) {
+            tarValue = data[i].value
+          }
+        }
+        var v = tarValue
+        var p = Math.round((tarValue / total) * 100)
+        return `${name}  ${v}家  ${p}%`
+      }
+    },
+    series: [
+      {
+        center: ['20%', '60%'],
+        name: '生命周期统计',
+        type: 'pie',
+        radius: '50%',
+        data: data,
+        itemStyle: {
+          color: function (param) {
+            // console.log(param.dataIndex)
+            return colors[param.dataIndex]
+          }
+        },
+        label: {
+          position: 'inner',
+          textStyle: {
+            fontSize: 14,
+            color: '#181818'
+          },
+          formatter: params => {
+            return `${params.value}`
+          }
+        },
+        labelLine: {
+          show: false
+        },
+        emphasis: {
+          itemStyle: {
+            shadowBlur: 10,
+            shadowOffsetX: 0,
+            shadowColor: 'rgba(0, 0, 0, 0.5)'
+          }
+        }
+      }
+    ]
+  }
+  return option
+}
+//GA38-2021标准
+let pieGaData = (title='暂无设置标题',
+  data = [
+    {
+      value: 55,
+      name: '203',
+      label: {
+        normal: {
+          show: true
+        }
+      }
+    },
+    {
+      value: 45,
+      name: '正常',
+      label: {
+        normal: {
+          show: false
+        }
+      }
+    }
+  ]
+) => {
+  let option = {
+    tooltip: {
+      trigger: 'item',
+      formatter: '{a} <br/>{b}: {c} ({d}%)'
+    },
+    title: [
+      {
+        bottom: 1,
+        width: '100%',
+        left: 'center',
+        text: title
+      }
+    ],
+    color: ['#169bd5', '#ccc'],
+    series: [
+      {
+        name: '',
+        type: 'pie',
+        center: ['50%', '50%'], // 饼图的圆心坐标
+        radius: ['50%', '60%'],
+        avoidLabelOverlap: false,
+        hoverAnimation: false,
+        label: {
+          //  饼图图形上的文本标签
+
+          normal: {
+            // normal 是图形在默认状态下的样式
+            show: true,
+            position: 'center',
+            color: '#169bd5',
+            fontSize: 18,
+            fontWeight: 'bold',
+            formatter: '{b}\n{d}%' // {b}:数据名; {c}:数据值; {d}:百分比,可以自定义显示内容,
+          }
+        },
+        labelLine: {
+          normal: {
+            show: false
+          }
+        },
+        data: data
+      }
+    ]
+  }
+  return option
+}
+export { securityPrecautions, pieGaData }

+ 15 - 3
src/views/menu/rehearsalTask/components/addRehearsalTask.vue

@@ -113,7 +113,7 @@
        
         placeholder="请填写预设案由"
       />
-
+      
       <!-- 演练情况 -->
       <van-field
         required
@@ -127,7 +127,19 @@
         show-word-limit
         placeholder="请填写演练情况"
       />
-
+      <van-field
+        required
+        :rules="[{ required: true, message: '点评总结不能为空' }]"
+        v-model="form.comment"
+        name="comment"
+        label="点评总结"
+        type="textarea"
+        row="3"
+        maxlength="2000"
+        show-word-limit
+       
+        placeholder="请填写点评总结"
+      />
       <!-- 参与人员 -->
 
       <!-- 必填 -->
@@ -198,7 +210,7 @@ export default {
         note: '', //演练总结
         taskUserList: [], //人员数组
         imageList: [], //图片数组
-
+        comment:'',
         presetCase: '', //预设案由
         drillSituation: '', //演练情况
         drillEndTime: '', //结束时间

+ 6 - 17
src/views/menu/rehearsalTask/components/rehearsalTaskSign.vue

@@ -48,6 +48,10 @@
       <div class="label">演练情况</div>
       <div>{{ trainingData.drillSituation }}</div>
     </div>
+    <div class="mainItem">
+      <div class="label">点评总结</div>
+      <div>{{ trainingData.comment }}</div>
+    </div>
 
     <div class="mainItem">
       <div class="label">参与人员</div>
@@ -72,28 +76,13 @@
       <div class="label">评分</div>
       <div><van-rate :disabled="disabledShow" v-model="value" :count="10" /></div>
     </div>
-    <van-field
-      v-if="evaluate"
-      required
-      :rules="[{ required: true, message: '评语不能为空' }]"
-      v-model="content"
-      name="content"
-      label="评语"
-      type="textarea"
-      row="3"
-      maxlength="200"
-      show-word-limit
-      placeholder="请填写评语"
-    />
+    
 
     <div class="mainItem" v-if="disabledShow">
       <div class="label">评分</div>
       <div>{{ value }}分</div>
     </div>
-    <div class="mainItem" v-if="disabledShow">
-      <div class="label">评语</div>
-      <div>{{ content }}</div>
-    </div>
+   
     <div class="mainItem" v-if="islearning">
       <div class="label">评优状态</div>
       <div>{{ trainingData.recStatusText }}</div>

+ 17 - 20
src/views/menu/training/index.vue

@@ -112,12 +112,13 @@
             </div>
             <div class="mainItem" @click="goInfo(item.id)">
               <div>培训状态</div>
-              <div v-if="item.status==0" class="wj-title-blue">{{ item.statusText }}</div>
-              <div v-else-if="item.status==1" class="wj-title-orange">{{ item.statusText }}</div>
-              <div v-else-if="item.status==3" class="wj-title-green">{{ item.statusText }}</div>
+              <div v-if="item.status == 0" class="wj-title-blue">{{ item.statusText }}</div>
+              <div v-else-if="item.status == 1" class="wj-title-orange">{{ item.statusText }}</div>
+              <div v-else-if="item.status == 2" class="wj-title-green">{{ item.statusText }}</div>
+              <div v-else-if="item.status == 3" class="wj-title-red">{{ item.statusText }}</div>
               <div v-else class="wj-title-blue">{{ item.statusText }}</div>
             </div>
-            
+
             <div class="mainItem">
               <div>签名情况</div>
               <div class="condition" @click="signatureCondition(item.id)">{{ item.signNums }}</div>
@@ -205,7 +206,6 @@ export default {
     Cascader
   },
 
-
   created() {
     this.presentDate = new Date(+newDateMonth().split('-')[0], +newDateMonth().split('-')[1] - 1)
   },
@@ -235,7 +235,7 @@ export default {
           console.log(list.id, 'ssss')
           timefalg = true
         }
-        if(!list.planId){
+        if (!list.planId) {
           timefalg = true
         }
       }
@@ -261,22 +261,21 @@ export default {
       let endDate = Date.parse(new Date(list.endDate))
       //任务处于待培训状态,且任务在规定完成时间范围内,登录人所在机构和与任务培训机构一致才显示
 
-      if ((list.startDate && list.endDate) && (list.status == 0 || list.status == 4)) {
-        
-        console.log(date);
-        console.log(startDate);
-        console.log(endDate);
+      if (list.startDate && list.endDate && (list.status == 0 || list.status == 4)) {
+        console.log(date)
+        console.log(startDate)
+        console.log(endDate)
         if (date >= startDate && date <= endDate) {
           timefalg = true
         }
       }
       //cascaderValue  当前机构ID
       // 当前用户角色ID
-      let orgId=JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
+      let orgId = JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + ''
       if (orgId == list.orgId) {
         falg = true
       }
-      console.log(list.orgId,'....',timefalg);
+      console.log(list.orgId, '....', timefalg)
       if (date > endDate) {
         //当前时间大于结束时间表示已超期
 
@@ -337,19 +336,18 @@ export default {
               //已加载完全部数据
               this.finished = true
             }
-           
 
             callback()
           } else {
             this.finished = false
-            this.taskList=rows||[]
-            if(rows.length == 0){
-              this.taskList=[]
+            this.taskList = rows || []
+            if (rows.length == 0) {
+              this.taskList = []
             }
           }
-        }else{
+        } else {
           this.finished = true
-          this.taskList =[]
+          this.taskList = []
         }
       })
     },
@@ -565,7 +563,6 @@ export default {
 }
 :deep.van-field--disabled .van-field__label {
   color: #323233;
-
 }
 :deep .van-field__control[disabled] {
   color: #323233;

+ 2 - 2
vue.config.js

@@ -118,10 +118,10 @@ module.exports = defineConfig({
         }
       },
       '/dev': {
-        // target: "http://10.87.10.55:8080",
+        target: "http://10.87.10.55:8080",
         // target: "http://10.87.10.91:8080",
         // target: "http://10.87.11.173:8080",
-        target: "http://10.87.10.47:8080",
+        // target: "http://10.87.10.47:8080",
         // ws:true,
         changOrigin:true,
         pathRewrite:{