Merge branch 'test' of http://120.46.222.128:10021/elink-star/epmet-work-pc into dev

1 year ago · 091f2b30ec
5 changed files with 193 additions and 17 deletions
--- a/.env.test
+++ b/.env.test
@ -0,0 +1,5 @@
+NODE_ENV=test
+VUE_APP_API_SERVER =  https://epmet-test.elinkservice.cn/api
+VUE_APP_BIPASS_API_SERVER = https://epmet-test.elinkservice.cn/linkdata/linkdata-gateway/route
+VUE_APP_NODE_ENV=test
+VUE_APP_PUBLIC_PATH=epmet-work-pc
--- a/package.json
+++ b/package.json
@ -10,6 +10,7 @@
    "build:uat": "vue-cli-service build --mode production.uat",
    "build:preview": "vue-cli-service build --mode preview",
    "build:prod": "vue-cli-service build --mode production",
+    "build:test": "vue-cli-service build --mode test",
    "build:shibei_prod": "vue-cli-service build --mode shibei_production",
    "lint": "vue-cli-service lint",
    "et": "node_modules/.bin/et",
--- a/src/views/modules/shequzhili/analysis/css/index.scss
+++ b/src/views/modules/shequzhili/analysis/css/index.scss
@ -82,4 +82,170 @@
 .br{
 padding: 20px 0;
 border-left: #777 solid   1px;
-}
+}
+.div_room {
+    // height: calc(88vh - 40px);
+    // margin-top: 9px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-start;
+    margin-left: 42px;
+    // margin: 0 21px 0 21px;
+  
+    .item {
+      width: 282px;
+      height: 86px;
+      background: #E6F0FF;
+      border-radius: 6px;
+      margin: 15px 25px 15px 0;
+      display: flex;
+      position: relative;
+  
+  
+      .item_category {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        padding: 8px;
+        > img {
+          width: 66px;
+          height: 66px;
+        }
+        .item_content {
+          margin-left: 5px;
+          width: 100%;
+          text-align: left;
+          display: flex;
+          flex-direction: column;
+          justify-content: flex-start;
+  
+          .item_count {
+            font-size: 28px;
+            font-family: PingFang SC;
+            font-weight: bold;
+            color: #333333;
+          }
+          .item_row1 {
+            border-radius: 4px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            height: 23px;
+  
+            .row_left {
+              font-size: 14px;
+              font-family: PingFang SC;
+              font-weight: 500;
+              color: #666666; 
+              text-align: center;
+              margin-left: 5px;
+            }
+  
+            .row_right {
+              margin: 0px 5px 0 0;
+        
+              cursor: pointer;
+              display: flex;
+              flex-direction: row;
+              .img{
+                width: 16px;
+                height: 16px;
+                margin-top: 2px;
+              }
+              .text{
+                font-size: 20px;
+                font-family: PingFang SC;
+                color: #333333; 
+                margin-right: 5px;
+              }
+              
+            }
+          }
+          .item_row2 {
+            border-radius: 4px;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+            height: 23px;
+            margin-top: 10px;
+            .row_left {
+              font-size: 14px;
+              font-family: PingFang SC;
+              font-weight: 500;
+              color: #666666; 
+              text-align: center;
+              margin-left: 5px;
+            }
+  
+            .row_right {
+              margin: 0px 5px 0 0;
+        
+              cursor: pointer;
+              display: flex;
+              flex-direction: row;
+              .img{
+                width: 16px;
+                height: 16px;
+                margin-top: 2px
+              }
+              .text{
+                font-size: 18px;
+                font-family: PingFang SC;
+                color: #666666; 
+                margin-right: 5px;
+              }
+              
+            }
+          }
+        }
+  
+        > span {
+          margin-left: 16px;
+          font-size: 24px;
+        }
+      }
+  
+      .item_add {
+        cursor: pointer;
+        font-size: 24px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: #333333;
+        display: flex;
+        align-items: center;
+        padding: 17px 16px;
+  
+        > img {
+          width: 86px;
+          height: 86px;
+        }
+  
+        > span {
+          font-size: 24px;
+          font-family: PingFang SC;
+          font-weight: 500;
+          color: #333333;
+  
+          margin-left: 16px;
+        }
+      }
+  
+      .icon_circle {
+        cursor: pointer;
+        position: absolute;
+        top: -10px;
+        right: -10px;
+        height: 23px;
+        width: 23px;
+        background-color: #ffffff;
+        border-radius: 50%;
+        border: 1px solid #a5a5a5;
+      }
+  
+      .icon_sel {
+        cursor: pointer;
+        background-color: #6bb9f8;
+        border: 1px solid #6bb9f8;
+      }
+    }
+  }
--- a/src/views/modules/shequzhili/analysis/index.vue
+++ b/src/views/modules/shequzhili/analysis/index.vue
@ -146,10 +146,14 @@
          label="同级占比"
          sortable
         >
+         <template slot-scope="scope">
+        {{ scope.row.proportion }}%
+      </template>
+
        </el-table-column>
      </el-table>

-        <div style="display: flex;justify-content: space-between;flex-direction:row;">
+        <div style="display: flex;justify-content: space-between;flex-direction:row; height:500px">
          <div style="display: flex;justify-content: space-between;flex-direction:column;">
            <h1 style="font-size: 24px; font-weight: bold;"> 部门科室工单量统计 </h1>
            <el-table :data="departmentList"  height="250" border class="m-table-item" style="width: 100%">
@ -214,7 +218,7 @@
        <div>
          <h2 style="font-size: 20px; font-weight: bold;"> ➤ 同一人员重复投诉</h2>
        </div>
-
+      <el-table>
          <el-table-column label="序号" fixed="left" type="index" align="center" width="50" />
          <el-table-column prop="mobile" align="center" label="联系方式" :show-overflow-tooltip="true">
            <template slot-scope="scope">
@ -667,16 +671,16 @@ export default {
      ...mapGetters(["clientHeight", "iframeHeight"]),
  },
  watch: {},
-  async mounted() {
+   mounted() {
      this.user = this.$store.state.user;
      this.agencyId = this.user.agencyId;
-      await this.getOrgData();
+       this.getOrgData();
      this.agencyLevel = localStorage.getItem("level", this.orgData.level);
-      await this.getTableData();
-      await this.initEcharts();
-      await this.EventCategoryAnalysis();
-      await this.EventCate();
-      await this.getCategoryTree()
+       this.getTableData();
+      //  this.initEcharts();
+       this.EventCategoryAnalysis();
+       this.EventCate();
+       this.getCategoryTree()
  },
  methods: {
    calculateRowspan(item) {
@ -827,15 +831,15 @@ export default {
      },

      // 搜索事件
-      async handleSearch(val) {
+       handleSearch(val) {
          console.log(this.formData);
          // 清空数据
          this.cleanReportData();
-          await this.getTableData();
-          await this.initEcharts();
-          await this.EventCategoryAnalysis();
-          await this.EventCate();
-          await this.getCategoryTree()
+           this.getTableData();
+          // await this.initEcharts();
+           this.EventCategoryAnalysis();
+           this.EventCate();
+           this.getCategoryTree()
      },
      //事件类型统计
      async getCategoryTree(){
--- a/src/views/modules/shequzhili/eventHandling/index.vue
+++ b/src/views/modules/shequzhili/eventHandling/index.vue
@ -135,7 +135,7 @@
                    <el-table-column fixed="right" label="操作" align="center" width="200px" prop="status">
                        <template slot-scope="scope">
                            <el-button @click="handleWatch(scope.row)" type="text" size="small">查看</el-button>
-                            <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small" class="">办理</el-button>
+                            <el-button  @click="handleDispose(scope.row,'dispose')" type="text" size="small" v-if="scope.row.operationType != '11'&&scope.row.operationType!= '12' ">办理</el-button>

                        </template>
                    </el-table-column>