Merge branch 'refs/heads/master' into sso

zhsq_qk-ui/src/router/index.js

@@ -165,11 +165,11 @@ export const constantRoutes = [
     path: '/401',
     component: () => import('@/views/error/401'),
     hidden: true
-  },
-  {
-    path: '/bjzshz',
-    component: () => import('@/views/fusion/bjzshz'),
-    hidden: true
+  },
+  {
+    path: '/bjzshz',
+    component: () => import('@/views/fusion/bjzshz'),
+    hidden: true
   },
 
   {
@@ -185,19 +185,19 @@ export const constantRoutes = [
       }
     ]
   },
-  {
-    path: '/',
-    component: Layout,
-    redirect: 'weather',
-    children: [
-      {
-        path: 'weather',
-        component: () => import('@/views/fusion/index'),
-        name: 'weather',
-        meta: {title: '首页', icon: 'dashboard', affix: true}
-      }
-    ]
-  },
+  // {
+  //   path: '/',
+  //   component: Layout,
+  //   redirect: 'weather',
+  //   children: [
+  //     {
+  //       path: 'weather',
+  //       component: () => import('@/views/fusion/index'),
+  //       name: 'weather',
+  //       meta: {title: '首页', icon: 'dashboard', affix: true}
+  //     }
+  //   ]
+  // },
   {
     path: '/user',
     component: Layout,

zhsq_qk-ui/src/views/fusion/fwyq.vue

@@ -3440,19 +3440,6 @@ $(function () {
     $(this).addClass('current').siblings('li').removeClass('current');
   });
 });
-
-//切换单屏电视墙
-$(function () {
-  $(this.$el).find('.facility_tab .div_tab a').TL_Tab({
-    tab: ".facility_tab .div_tab a",
-    box: ".facility_tab .tab_cont",
-    events: "click",
-    num: 1,
-    speed: 10
-  });
-});
-
-
 </script>
 
 <style>

zhsq_qk-ui/src/views/system/doingBusiness/index.vue

@@ -3,6 +3,7 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="受理率" prop="acceptanceRate">
         <el-input-number
+          :precision="2":step="0.1"
           :min="0"
           :max="1000000"
           size="medium"
@@ -14,6 +15,8 @@
       </el-form-item>
       <el-form-item label="办结率" prop="completionRate">
         <el-input-number
+          :precision="2"
+          :step="0.1"
           :min="0"
           :max="1000000"
           size="medium"
@@ -110,10 +113,10 @@
           <el-input-number :min="0" :max="1000000" v-model="form.demandProblem" placeholder="请输入企业群众需求问题"/>
         </el-form-item>
         <el-form-item label="受理率" prop="acceptanceRate">
-          <el-input-number :min="0" :max="1000000" v-model="form.acceptanceRate" placeholder="请输入受理率"/>
+          <el-input-number :precision="2" :step="0.1" :min="0" :max="1000000" v-model="form.acceptanceRate" placeholder="请输入受理率"/>
         </el-form-item>
         <el-form-item label="办结率" prop="completionRate">
-          <el-input-number :min="0" :max="1000000" v-model="form.completionRate" placeholder="请输入办结率"/>
+          <el-input-number :precision="2" :step="0.1" :min="0" :max="1000000" v-model="form.completionRate" placeholder="请输入办结率"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

zhsq_qk-ui/src/views/system/government/index.vue

@@ -3,6 +3,8 @@
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="108px">
       <el-form-item label="按时办结数" prop="completionRate">
         <el-input-number
+          :precision="2"
+          :step="0.1"
           :min="0"
           :max="1000000"
           size="medium"
@@ -14,6 +16,8 @@
       </el-form-item>
       <el-form-item label="承诺时限压缩" prop="serviceCompress">
         <el-input-number
+          :precision="2"
+          :step="0.1"
           :min="0"
           :max="1000000"
           size="medium"
@@ -25,6 +29,8 @@
       </el-form-item>
       <el-form-item label="承诺时限压缩" prop="licenseCompress">
         <el-input-number
+          :precision="2"
+          :step="0.1"
           :min="0"
           :max="1000000"
           size="medium"
@@ -117,22 +123,22 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="180px">
         <el-form-item label="政务服务好评率" prop="goodRate">
-          <el-input-number :min="0" :max="1000000"  v-model="form.goodRate" placeholder="请输入政务服务好评率"/>
+          <el-input-number :precision="2" :step="0.1" :min="0" :max="1000000"  v-model="form.goodRate" placeholder="请输入政务服务好评率"/>
         </el-form-item>
         <el-form-item label="按时办结数" prop="completionRate">
-          <el-input-number :min="0" :max="1000000"  v-model="form.completionRate" placeholder="请输入按时办结数"/>
+          <el-input-number :precision="2" :step="0.1" :min="0" :max="1000000"  v-model="form.completionRate" placeholder="请输入按时办结数"/>
         </el-form-item>
         <el-form-item label="政务服务事项即办件占比" prop="serviceProportion">
-          <el-input-number :min="0" :max="1000000"  v-model="form.serviceProportion" placeholder="请输入政务服务事项即办件占比"/>
+          <el-input-number :precision="2" :step="0.1" :min="0" :max="1000000"  v-model="form.serviceProportion" placeholder="请输入政务服务事项即办件占比"/>
         </el-form-item>
         <el-form-item label="承诺时限压缩" prop="serviceCompress">
-          <el-input-number :min="0" :max="1000000"  v-model="form.serviceCompress" placeholder="请输入承诺时限压缩"/>
+          <el-input-number :precision="2" :step="0.1" :min="0" :max="1000000"  v-model="form.serviceCompress" placeholder="请输入承诺时限压缩"/>
         </el-form-item>
         <el-form-item label="行政许可事项即办件占比" prop="licenseProportion">
-          <el-input-number :min="0" :max="1000000"  v-model="form.licenseProportion" placeholder="请输入行政许可事项即办件占比"/>
+          <el-input-number :precision="2" :step="0.1" :min="0" :max="1000000"  v-model="form.licenseProportion" placeholder="请输入行政许可事项即办件占比"/>
         </el-form-item>
         <el-form-item label="承诺时限压缩" prop="licenseCompress">
-          <el-input-number :min="0" :max="1000000"  v-model="form.licenseCompress" placeholder="请输入承诺时限压缩"/>
+          <el-input-number :precision="2" :step="0.1" :min="0" :max="1000000"  v-model="form.licenseCompress" placeholder="请输入承诺时限压缩"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">