From 9f59b404ac029e4679df6eb75d3edf84f4e39129 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 30 May 2024 19:31:29 +0800
Subject: [PATCH] E呼即办优化

---
 src/views/cGovernance/statisticalAnalysis/index.vue |  139 ++++++-----
 src/page/index/top/index.vue                        |  458 ++++++++++++++++++++-----------------
 src/views/cGovernance/taskECallTwo/index.vue        |   74 ++---
 src/api/task/eCallEventTwo.js                       |   12 +
 4 files changed, 362 insertions(+), 321 deletions(-)

diff --git a/src/api/task/eCallEventTwo.js b/src/api/task/eCallEventTwo.js
index 81c259f..d9016eb 100644
--- a/src/api/task/eCallEventTwo.js
+++ b/src/api/task/eCallEventTwo.js
@@ -52,4 +52,16 @@
     method: 'post',
     data: row
   })
+}
+
+export const getCount = (current, size, params) => {
+  return request({
+    url: '/api/blade-eCallEventTwo/eCallEventTwo/getCount',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
 }
\ No newline at end of file
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 8f2a921..5d99834 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -1,17 +1,17 @@
 <template>
-    <div class="avue-top">
-        <div class="top-bar__left">
-            <div class="avue-breadcrumb" :class="[{ 'avue-breadcrumb--active': isCollapse }]" v-if="showCollapse">
-                <i class="icon-navicon" @click="setCollapse"></i>
-            </div>
-        </div>
-        <div class="top-bar__title">
-            <div class="top-bar__item top-bar__item--show" v-if="showMenu">
-                <top-menu ref="topMenu"></top-menu>
-            </div>
-        </div>
-        <div class="top-bar__right">
-            <!-- <el-tooltip v-if="showColor"
+  <div class="avue-top">
+    <div class="top-bar__left">
+      <div class="avue-breadcrumb" :class="[{ 'avue-breadcrumb--active': isCollapse }]" v-if="showCollapse">
+        <i class="icon-navicon" @click="setCollapse"></i>
+      </div>
+    </div>
+    <div class="top-bar__title">
+      <div class="top-bar__item top-bar__item--show" v-if="showMenu">
+        <top-menu ref="topMenu"></top-menu>
+      </div>
+    </div>
+    <div class="top-bar__right">
+      <!-- <el-tooltip v-if="showColor"
                   effect="dark"
                   :content="$t('navbar.color')"
                   placement="bottom">
@@ -19,7 +19,7 @@
           <top-color></top-color>
         </div>
       </el-tooltip> -->
-            <!-- <el-tooltip v-if="showDebug"
+      <!-- <el-tooltip v-if="showDebug"
                   effect="dark"
                   :content="logsFlag?$t('navbar.bug'):logsLen+$t('navbar.bugs')"
                   placement="bottom">
@@ -27,7 +27,7 @@
           <top-logs></top-logs>
         </div>
       </el-tooltip> -->
-            <!-- <el-tooltip v-if="showLock"
+      <!-- <el-tooltip v-if="showLock"
                   effect="dark"
                   :content="$t('navbar.lock')"
                   placement="bottom">
@@ -35,239 +35,267 @@
           <top-lock></top-lock>
         </div>
       </el-tooltip> -->
-            <div style="position: relative;">
-                <top-search v-show="searchShow"></top-search>
-            </div>
-            <el-tooltip v-if="showTheme" effect="dark" content="搜索" placement="bottom">
-                <div class="top-bar__item top-bar__item--show">
-                    <i style="font-size: 18px;" class="el-icon-search" @click="searchShow = !searchShow"></i>
-                </div>
-            </el-tooltip>
-            <!-- <el-tooltip v-if="showTheme" effect="dark" :content="$t('navbar.theme')" placement="bottom">
+      <div style="position: relative;">
+        <top-search v-show="searchShow"></top-search>
+      </div>
+      <el-tooltip v-if="showTheme" effect="dark" content="搜索" placement="bottom">
+        <div class="top-bar__item top-bar__item--show">
+          <i style="font-size: 18px;" class="el-icon-search" @click="searchShow = !searchShow"></i>
+        </div>
+      </el-tooltip>
+      <!-- <el-tooltip v-if="showTheme" effect="dark" :content="$t('navbar.theme')" placement="bottom">
                 <div class="top-bar__item top-bar__item--show">
                     <top-theme></top-theme>
                 </div>
             </el-tooltip> -->
-            <el-tooltip effect="dark" :content="$t('navbar.notice')" placement="bottom">
-                <div class="top-bar__item top-bar__item--show">
-                    <top-notice></top-notice>
-                </div>
+      <el-tooltip effect="dark" :content="$t('navbar.notice')" placement="bottom">
+        <div class="top-bar__item top-bar__item--show">
+          <top-notice></top-notice>
+        </div>
 
-            </el-tooltip>
-            <!-- <el-tooltip effect="dark"
+      </el-tooltip>
+      <!-- <el-tooltip effect="dark"
                   :content="$t('navbar.language')"
                   placement="bottom">
         <div class="top-bar__item top-bar__item--show">
           <top-lang></top-lang>
         </div>
       </el-tooltip> -->
-            <el-tooltip v-if="showFullScren" effect="dark"
-                :content="isFullScren ? $t('navbar.screenfullF') : $t('navbar.screenfull')" placement="bottom">
-                <div class="top-bar__item">
-                    <i :class="isFullScren ? 'icon-tuichuquanping' : 'icon-quanping'" @click="handleScreen"></i>
-                </div>
-            </el-tooltip>
-            <img class="top-bar__img" :src="topBarImg">
-            <el-dropdown>
-                <span class="el-dropdown-link">
-                    {{ userInfo.userName }}
-                    <i class="el-icon-arrow-down el-icon--right"></i>
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item>
-                        <router-link to="/">{{ $t('navbar.dashboard') }}</router-link>
-                    </el-dropdown-item>
-                    <el-dropdown-item>
-                        <router-link to="/info/index">{{ $t('navbar.userinfo') }}</router-link>
-                    </el-dropdown-item>
-                    <el-dropdown-item v-if="this.website.switchMode" @click.native="switchDept">{{ $t('navbar.switchDept')
-                    }}
-                    </el-dropdown-item>
-                    <el-dropdown-item @click.native="logout" divided>{{ $t('navbar.logOut') }}
-                    </el-dropdown-item>
-                </el-dropdown-menu>
-            </el-dropdown>
-            <el-dialog title="用户信息选择" append-to-body :visible.sync="userBox" width="350px">
-                <avue-form ref="form" :option="userOption" v-model="userForm" @submit="submitSwitch" />
-            </el-dialog>
+      <el-tooltip v-if="showFullScren" effect="dark"
+        :content="isFullScren ? $t('navbar.screenfullF') : $t('navbar.screenfull')" placement="bottom">
+        <div class="top-bar__item">
+          <i :class="isFullScren ? 'icon-tuichuquanping' : 'icon-quanping'" @click="handleScreen"></i>
         </div>
+      </el-tooltip>
+      <img class="top-bar__img" :src="topBarImg">
+      <el-dropdown>
+        <span class="el-dropdown-link">
+          {{ userInfo.userName }}
+          <i class="el-icon-arrow-down el-icon--right"></i>
+        </span>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item>
+            <router-link to="/">{{ $t('navbar.dashboard') }}</router-link>
+          </el-dropdown-item>
+          <el-dropdown-item>
+            <router-link to="/info/index">{{ $t('navbar.userinfo') }}</router-link>
+          </el-dropdown-item>
+          <el-dropdown-item v-if="this.website.switchMode" @click.native="switchDept">{{ $t('navbar.switchDept')
+                    }}
+          </el-dropdown-item>
+          <el-dropdown-item @click.native="logout" divided>{{ $t('navbar.logOut') }}
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+      <el-dialog title="用户信息选择" append-to-body :visible.sync="userBox" width="350px">
+        <avue-form ref="form" :option="userOption" v-model="userForm" @submit="submitSwitch" />
+      </el-dialog>
     </div>
+  </div>
 </template>
 <script>
-import { getStore } from "@/util/store"
-import { setTheme } from "@/util/util"
-import { resetRouter } from '@/router/router'
-import { mapGetters, mapState } from "vuex"
-import { fullscreenToggel, listenfullscreen } from "@/util/util"
-import topLock from "./top-lock"
-import topMenu from "./top-menu"
-import topSearch from "./top-search"
-import topTheme from "./top-theme"
-import topLogs from "./top-logs"
-import topColor from "./top-color"
-import topNotice from './top-notice'
-import topLang from "./top-lang"
+  import {
+    getStore
+  } from "@/util/store"
+  import {
+    setTheme
+  } from "@/util/util"
+  import {
+    resetRouter
+  } from '@/router/router'
+  import {
+    mapGetters,
+    mapState
+  } from "vuex"
+  import {
+    fullscreenToggel,
+    listenfullscreen
+  } from "@/util/util"
+  import topLock from "./top-lock"
+  import topMenu from "./top-menu"
+  import topSearch from "./top-search"
+  import topTheme from "./top-theme"
+  import topLogs from "./top-logs"
+  import topColor from "./top-color"
+  import topNotice from './top-notice'
+  import topLang from "./top-lang"
 
-export default {
+  export default {
     components: {
-        topLock,
-        topMenu,
-        topSearch,
-        topTheme,
-        topLogs,
-        topColor,
-        topNotice,
-        topLang
+      topLock,
+      topMenu,
+      topSearch,
+      topTheme,
+      topLogs,
+      topColor,
+      topNotice,
+      topLang
     },
     name: "top",
-    data () {
-        return {
-            webType: getStore({ name: "webType" }),
-            searchShow: false,
-            userBox: false,
-            userForm: {
-                deptId: '',
-                roleId: ''
+    data() {
+      return {
+        webType: getStore({
+          name: "webType"
+        }),
+        searchShow: false,
+        userBox: false,
+        userForm: {
+          deptId: '',
+          roleId: ''
+        },
+        userOption: {
+          labelWidth: 70,
+          submitBtn: true,
+          emptyBtn: false,
+          submitText: '切换',
+          column: [{
+              label: '部门',
+              prop: 'deptId',
+              type: 'select',
+              props: {
+                label: 'deptName',
+                value: 'id'
+              },
+              dicUrl: '/api/blade-system/dept/select',
+              span: 24,
+              display: false,
+              rules: [{
+                required: true,
+                message: "请选择部门",
+                trigger: "blur"
+              }],
             },
-            userOption: {
-                labelWidth: 70,
-                submitBtn: true,
-                emptyBtn: false,
-                submitText: '切换',
-                column: [
-                    {
-                        label: '部门',
-                        prop: 'deptId',
-                        type: 'select',
-                        props: {
-                            label: 'deptName',
-                            value: 'id'
-                        },
-                        dicUrl: '/api/blade-system/dept/select',
-                        span: 24,
-                        display: false,
-                        rules: [{
-                            required: true,
-                            message: "请选择部门",
-                            trigger: "blur"
-                        }],
-                    },
-                    {
-                        label: '角色',
-                        prop: 'roleId',
-                        type: 'select',
-                        props: {
-                            label: 'roleName',
-                            value: 'id'
-                        },
-                        dicUrl: '/api/blade-system/role/select',
-                        span: 24,
-                        display: false,
-                        rules: [{
-                            required: true,
-                            message: "请选择角色",
-                            trigger: "blur"
-                        }],
-                    },
-                ]
+            {
+              label: '角色',
+              prop: 'roleId',
+              type: 'select',
+              props: {
+                label: 'roleName',
+                value: 'id'
+              },
+              dicUrl: '/api/blade-system/role/select',
+              span: 24,
+              display: false,
+              rules: [{
+                required: true,
+                message: "请选择角色",
+                trigger: "blur"
+              }],
             },
-            showMenu: getStore({ name: "showMenu" }),
-            globalUserInfo: getStore({ name: "userInfo" }),
-        }
+          ]
+        },
+        showMenu: getStore({
+          name: "showMenu"
+        }),
+        globalUserInfo: getStore({
+          name: "userInfo"
+        }),
+      }
     },
     filters: {},
-    created () {
-        setTheme('theme-white')
+    created() {
+      setTheme('theme-white')
     },
-    mounted () {
-        listenfullscreen(this.setScreen)
+    mounted() {
+      listenfullscreen(this.setScreen)
     },
     computed: {
-        ...mapState({
-            showDebug: state => state.common.showDebug,
-            showTheme: state => state.common.showTheme,
-            showLock: state => state.common.showLock,
-            showFullScren: state => state.common.showFullScren,
-            showCollapse: state => state.common.showCollapse,
-            showSearch: state => state.common.showSearch,
-            showColor: state => state.common.showColor
-        }),
-        ...mapGetters([
-            "userInfo",
-            "isFullScren",
-            "tagWel",
-            "tagList",
-            "isCollapse",
-            "tag",
-            "logsLen",
-            "logsFlag"
-        ]),
-        topBarImg () {
-            if (this.userInfo.avatar.indexOf('upload') != -1) {
-                return this.website.minioUrl + this.userInfo.avatar
-            } else {
-                return this.userInfo.avatar
-            }
+      ...mapState({
+        showDebug: state => state.common.showDebug,
+        showTheme: state => state.common.showTheme,
+        showLock: state => state.common.showLock,
+        showFullScren: state => state.common.showFullScren,
+        showCollapse: state => state.common.showCollapse,
+        showSearch: state => state.common.showSearch,
+        showColor: state => state.common.showColor
+      }),
+      ...mapGetters([
+        "userInfo",
+        "isFullScren",
+        "tagWel",
+        "tagList",
+        "isCollapse",
+        "tag",
+        "logsLen",
+        "logsFlag"
+      ]),
+      topBarImg() {
+        // console.log("*******this.userInfo*********" + JSON.stringify(this.userInfo))
+        if (this.userInfo.avatar.indexOf('upload') != -1) {
+          return this.website.minioUrl + this.userInfo.avatar
+        } else {
+          return this.userInfo.avatar
         }
+      }
     },
     methods: {
-        handleScreen () {
-            fullscreenToggel()
-        },
-        setCollapse () {
-            this.$store.commit("SET_COLLAPSE")
-        },
-        setScreen () {
-            this.$store.commit("SET_FULLSCREN")
-        },
-        switchDept () {
-            const userId = this.userInfo.user_id
-            const deptColumn = this.findObject(this.userOption.column, "deptId")
-            deptColumn.dicUrl = `/api/blade-system/dept/select?userId=${userId}`
-            deptColumn.display = true
-            const roleColumn = this.findObject(this.userOption.column, "roleId")
-            roleColumn.dicUrl = `/api/blade-system/role/select?userId=${userId}`
-            roleColumn.display = true
-            this.userBox = true
-        },
-        submitSwitch (form, done) {
-            this.$store.dispatch("refreshToken", form).then(() => {
-                this.userBox = false
-                this.$router.push({ path: "/" })
-            })
-            done()
-        },
-        logout () {
-            this.$confirm(this.$t("logoutTip"), this.$t("tip"), {
-                confirmButtonText: this.$t("submitText"),
-                cancelButtonText: this.$t("cancelText"),
-                type: "warning"
-            }).then(() => {
-                this.$store.dispatch("LogOut").then(() => {
-                    resetRouter()
+      handleScreen() {
+        fullscreenToggel()
+      },
+      setCollapse() {
+        this.$store.commit("SET_COLLAPSE")
+      },
+      setScreen() {
+        this.$store.commit("SET_FULLSCREN")
+      },
+      switchDept() {
+        const userId = this.userInfo.user_id
+        const deptColumn = this.findObject(this.userOption.column, "deptId")
+        deptColumn.dicUrl = `/api/blade-system/dept/select?userId=${userId}`
+        deptColumn.display = true
+        const roleColumn = this.findObject(this.userOption.column, "roleId")
+        roleColumn.dicUrl = `/api/blade-system/role/select?userId=${userId}`
+        roleColumn.display = true
+        this.userBox = true
+      },
+      submitSwitch(form, done) {
+        this.$store.dispatch("refreshToken", form).then(() => {
+          this.userBox = false
+          this.$router.push({
+            path: "/"
+          })
+        })
+        done()
+      },
+      logout() {
+        this.$confirm(this.$t("logoutTip"), this.$t("tip"), {
+          confirmButtonText: this.$t("submitText"),
+          cancelButtonText: this.$t("cancelText"),
+          type: "warning"
+        }).then(() => {
+          this.$store.dispatch("LogOut").then(() => {
+            resetRouter()
 
-                    if (this.webType == 'default') {
-                        this.$router.push({ path: "/login" })
-                    } else if (this.webType == 'govern') {
-                        this.$router.push({ path: "/governLogin" })
-                    }  else if (this.webType == 'ecall'){
-                        this.$router.push({ path: "/ecallLogin" })
-                    } else {
-                        this.$router.push({ path: "/tenementLogin" })
-                    }
-                })
-            })
-        }
+            if (this.webType == 'default') {
+              this.$router.push({
+                path: "/login"
+              })
+            } else if (this.webType == 'govern') {
+              this.$router.push({
+                path: "/governLogin"
+              })
+            } else if (this.webType == 'ecall') {
+              this.$router.push({
+                path: "/ecallLogin"
+              })
+            } else {
+              this.$router.push({
+                path: "/tenementLogin"
+              })
+            }
+          })
+        })
+      }
     }
-}
+  }
 </script>
 
 <style lang="scss" scoped>
-.noticeBtn {
+  .noticeBtn {
     cursor: pointer;
-}
+  }
 
-.top-bar-item-search {
+  .top-bar-item-search {
     height: 100%;
     display: flex;
     align-items: center;
@@ -277,7 +305,7 @@
     width: 40px;
 
     i {
-        cursor: pointer;
+      cursor: pointer;
     }
-}
-</style>
+  }
+</style>
\ No newline at end of file
diff --git a/src/views/cGovernance/statisticalAnalysis/index.vue b/src/views/cGovernance/statisticalAnalysis/index.vue
index bed2826..894912b 100644
--- a/src/views/cGovernance/statisticalAnalysis/index.vue
+++ b/src/views/cGovernance/statisticalAnalysis/index.vue
@@ -7,10 +7,16 @@
       @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad">
 
       <template slot="menuLeft">
-        <el-button type="success" size="small" plain icon="el-icon-upload2" @click="handleImport">调度单位
+        <!-- <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleOrg('Y')">主办单位
         </el-button>
-        <el-button type="warning" size="small" plain icon="el-icon-download" @click="handleExport">主办单位
-        </el-button>
+        <el-button type="success" size="small" plain icon="el-icon-upload2" @click="handleOrg('N')">调度单位
+        </el-button> -->
+
+        <el-radio-group @change="handleOrg" v-model="radio1">
+          <el-radio-button label="主办单位"></el-radio-button>
+          <el-radio-button label="调度单位"></el-radio-button>
+        </el-radio-group>
+
       </template>
 
     </avue-crud>
@@ -30,7 +36,8 @@
     remove,
     update,
     add,
-    getDetail
+    getDetail,
+    getCount
   } from "@/api/task/eCallEventTwo"
   import {
     add as circleAdd,
@@ -47,10 +54,14 @@
   export default {
     data() {
       return {
+        radio1: '主办单位',
         editPopup: false,
         form: {},
         editForm: {},
-        query: {},
+        query: {
+          tagMain: 'Y',
+          mainFlag: 1
+        },
         loading: true,
         page: {
           pageSize: 10,
@@ -63,130 +74,126 @@
         circleRadio: 0,
         shareCircleRow: {},
         option: {
-          // labelWidth: 130,
-          // searchLabelWidth: 96,
-          // searchShow: true,
-          // searchMenuSpan: 3,
-          // menuWidth: 310,
           delBtn: false,
           editBtn: false,
           addBtn: false,
+          menu: false,
           height: "auto",
           calcHeight: 54,
           dialogWidth: 950,
           tip: false,
           border: true,
-          //stripe:true,
           index: true,
           viewBtn: true,
           selection: true,
-          // excelBtn: true,
           dialogClickModal: false,
           column: [{
-              label: "单位",
-              prop: "orderCode",
-              span: 12,
-              hide: true,
-            },
+              label: "单位名称",
+              prop: "orgName",
+              search: true,
+              overHidden: true,
 
+            },
+            {
+              label: "时间区间",
+              prop: "dateTime",
+              type: "datetimerange",
+              format: "yyyy-MM-dd HH:mm:ss",
+              valueFormat: "yyyy-MM-dd HH:mm:ss",
+              searchSpan: 6,
+              searchRange: true,
+              hide: true,
+              addDisplay: false,
+              editDisplay: false,
+              viewDisplay: false,
+              search: true,
+              rules: [{
+                required: true,
+                message: "请选择时间区间",
+                trigger: "blur",
+              }, ],
+            },
             {
               label: "工单数",
-              prop: "orderCode",
+              prop: "orderNumber",
               span: 12,
               searchSpan: 4,
-              width: 160,
-              hide: true,
-              // overHidden: true,
-              // search: true,
               searchLabelWidth: 76,
               addDisplay: false,
             },
             {
+              hide: true,
               label: "派发单数",
-              prop: "orderCode",
+              prop: "dispatchNumber",
               span: 12,
               searchSpan: 4,
-              width: 160,
               overHidden: true,
               display: false,
-              // search: true,
               searchLabelWidth: 76,
               addDisplay: false,
             },
 
             {
               label: "办理单数(率)",
-              prop: "orderCode",
+              prop: "handRate",
               span: 12,
               searchSpan: 4,
-              width: 160,
               overHidden: true,
-              // search: true,
               searchLabelWidth: 76,
               addDisplay: false,
             },
 
             {
               label: "办结单数(率)",
-              prop: "orderCode",
+              prop: "checkRate",
               span: 12,
               searchSpan: 4,
-              width: 160,
               overHidden: true,
-              // search: true,
               searchLabelWidth: 76,
               addDisplay: false,
             },
 
             {
               label: "答复单数(率)",
-              prop: "orderCode",
+              prop: "doneRate",
               span: 12,
               searchSpan: 4,
-              width: 160,
               overHidden: true,
-              // search: true,
               searchLabelWidth: 76,
               addDisplay: false,
             },
 
             {
               label: "回访单数(率)",
-              prop: "orderCode",
+              prop: "respRate",
               span: 12,
               searchSpan: 4,
-              width: 160,
               overHidden: true,
-              // search: true,
               searchLabelWidth: 76,
               addDisplay: false,
             },
             {
               label: "核实单数(率)",
-              prop: "orderCode",
+              prop: "reviewRate",
               span: 12,
               searchSpan: 4,
-              width: 160,
               overHidden: true,
-              // search: true,
               searchLabelWidth: 76,
               addDisplay: false,
             },
             {
               label: "督办单数",
-              prop: "orderCode",
+              prop: "superviseNumber",
               span: 12,
               searchSpan: 4,
-              width: 160,
               overHidden: true,
-              // search: true,
               searchLabelWidth: 76,
               addDisplay: false,
             },
-
           ],
         },
         data: [],
+        tagMain: 'Y'
       }
     },
 
@@ -222,6 +229,17 @@
       }
     },
     methods: {
+      handleOrg(tagMain) {
+        console.log("***************" + tagMain)
+        if (tagMain === '主办单位') {
+          this.query.tagMain = "Y"
+          this.query.mainFlag = 1
+        } else {
+          this.query.tagMain = "N"
+          this.query.mainFlag = 2
+        }
+        this.onLoad(this.page, this.query)
+      },
       openMap() {
         this.$refs.avueInputMap.box = true
         console.log(this.$refs.avueInputMap)
@@ -244,13 +262,6 @@
       },
 
       rowSave(row, done, loading) {
-        console.log("777777777777777777777" + JSON.stringify(row))
-
-        // let local = this.locationDispose(row.sceneAddr)
-        // row.sceneAddr = local.sceneAddr
-        // row.sceneGeoLat = local.latitude
-        // row.sceneGeoLng = local.longitude
-        console.log("88888888888888888888888888" + JSON.stringify(row))
         add(row).then(
           () => {
             this.onLoad(this.page)
@@ -322,8 +333,14 @@
         this.onLoad(this.page)
       },
       searchChange(params, done) {
-        this.query = params
+        Object.assign(this.query, params)
         this.page.currentPage = 1
+        console.log("*******params**********" + JSON.stringify(params))
+        if (this.query.mainFlag == 1) {
+          params.sinkOrgName = params.orgName
+        } else {
+          params.subjectOrgName = params.orgName
+        }
         this.onLoad(this.page, params)
         done()
       },
@@ -421,6 +438,7 @@
         } = this.query
         let values = {
           ...params,
+          ...this.query,
         }
         if (dateTime) {
           values = {
@@ -432,25 +450,12 @@
           values.dateTime = null
         }
         this.loading = true
-        getList(page.currentPage, page.pageSize, values).then((res) => {
+        getCount(this.page.currentPage, this.page.pageSize, values).then((res) => {
           const data = res.data.data
           this.page.total = data.total
           this.data = data.records
-          this.data.forEach(item => {
-            // this.$set(item, 'phoneflag', false)
-            // if (item.imageUrls) {
-            //   if (item.imageUrls.length > 0) {
-            //     var urls = []
-            //     var names = item.imageUrls.split(",")
-            //     names.forEach(name => {
-            //       urls.push(website.minioUrl + name)
-            //     })
-            //     item.imageUrls = urls.join(",")
-            //   }
-            // }
-          })
           this.loading = false
-          this.selectionClear()
+          // this.selectionClear()
         })
       }
     },
diff --git a/src/views/cGovernance/taskECallTwo/index.vue b/src/views/cGovernance/taskECallTwo/index.vue
index b7a79d9..330c67b 100644
--- a/src/views/cGovernance/taskECallTwo/index.vue
+++ b/src/views/cGovernance/taskECallTwo/index.vue
@@ -87,6 +87,9 @@
     getDetatil as getHouseDetail
   } from "@/api/doorplateAddress/doorplateAddress.js"
   import {
+    getDept
+  } from "@/api/system/dept"
+  import {
     mapGetters
   } from "vuex"
   import website from '@/config/website'
@@ -171,39 +174,19 @@
               width: 100,
               label: "诉求来源",
               prop: "issueOrigin",
+              disabled: true,
               span: 12,
               searchSpan: 4,
               dataType: "number",
               type: "select",
-              dicData: [{
-                label: "热线",
-                value: 0
-              }, {
-                label: "公安110",
-                value: 1
-              }, {
-                label: "微信",
-                value: 2
-              }, {
-                label: "微博",
-                value: 3
-              }],
+              dicUrl: "/api/blade-system/dict-biz/dictionary?code=ehjb_org",
+              props: {
+                label: "dictValue",
+                value: "dictKey",
+              },
               rules: [{
                 required: true,
                 message: "请选择诉求来源",
-                trigger: "blur",
-              }, ],
-            },
-            {
-              label: "诉求内容",
-              parent: false,
-              prop: "issueContent",
-              search: false,
-              width: 160,
-              overHidden: true,
-              rules: [{
-                required: true,
-                message: "请选择诉求内容",
                 trigger: "blur",
               }, ],
             },
@@ -272,6 +255,21 @@
                   trigger: 'blur'
                 }
               ],
+            },
+            {
+              label: "诉求内容",
+              parent: false,
+              prop: "issueContent",
+              search: false,
+              type: 'textarea',
+              width: 160,
+              span: 24,
+              overHidden: true,
+              rules: [{
+                required: true,
+                message: "请选择诉求内容",
+                trigger: "blur",
+              }, ],
             },
             {
               label: "事发地址",
@@ -463,6 +461,7 @@
           ],
         },
         data: [],
+        dept: {},
       }
     },
     watch: {
@@ -543,6 +542,13 @@
       }
     },
     methods: {
+      getDeptInfo() {
+        getDept(this.userInfo.dept_id).then(res => {
+          this.dept = res.data.data
+          this.form.issueOrigin = res.data.data.sort
+          // console.log("*********res.data.data*************" + JSON.stringify(res.data.data))
+        })
+      },
       openMap() {
         this.$refs.avueInputMap.box = true
         console.log(this.$refs.avueInputMap)
@@ -753,23 +759,13 @@
           values.dateTime = null
         }
         this.loading = true
+        this.getDeptInfo();
+
         getList(page.currentPage, page.pageSize, values).then((res) => {
           const data = res.data.data
           this.page.total = data.total
           this.data = data.records
-          this.data.forEach(item => {
-            // this.$set(item, 'phoneflag', false)
-            // if (item.imageUrls) {
-            //   if (item.imageUrls.length > 0) {
-            //     var urls = []
-            //     var names = item.imageUrls.split(",")
-            //     names.forEach(name => {
-            //       urls.push(website.minioUrl + name)
-            //     })
-            //     item.imageUrls = urls.join(",")
-            //   }
-            // }
-          })
+
           this.loading = false
           this.selectionClear()
         })

--
Gitblit v1.9.3