Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.4

.env.development

@@ -10,7 +10,7 @@ ENV = 'development'
 #罗俊
 #VUE_APP_BASE_API = 'http://10.87.21.60:8080'
 #罗伟
-# VUE_APP_BASE_API = 'http://10.87.23.62:8080'
+ VUE_APP_BASE_API = 'http://10.87.23.62:8080'
 #高雄
 #VUE_APP_BASE_API = 'http://10.87.11.94:8080'
 #景远超

src/views/evaluateTable/index.vue

@@ -30,7 +30,7 @@
                   noResultsText="没有搜索结果"
                 />
               </el-form-item>
-              <el-form-item label="外包评价名称:" label-width="50">
+              <el-form-item label="外包评价名称1:" label-width="50">
                 <el-select v-model="queryParams.planId" @change="changeHandler">
                   <el-option
                     v-for="item in options"
@@ -56,15 +56,11 @@
               <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
                 >重置</el-button
               >
-                <!-- <el-button
-                  type="primary"
-                  plain
-                  icon="el-icon-plus"
-                  size="mini"
-                  @click="exportExcel"
-
-                  >导出</el-button
-                > -->
+          
+              <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+                         v-hasPermi="['core:evaluateTaskReport:export']">导出
+              </el-button>
+         
               </el-col>
             </el-row>
           </div>
@@ -122,6 +118,7 @@ export default {
       planRoles: [],
       options: [],
       fullTableTitle: "对押运公司月度评价",
+      orgName:null,
       queryParams: {
         orgId: null,
         planId: "",
@@ -186,7 +183,11 @@ export default {
         children: node.children,
       };
     },
-
+    handleExport() {
+      this.download('core/task/export', {
+        ...this.queryParams
+      }, `${'【'+this.orgName+'】'+'-外包履职评价报表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+    },
     //获取列表
     getList() {
       this.loading = true;
@@ -196,6 +197,7 @@ export default {
         if (code == 200) {
           this.targetList = data.list || [];
           this.fullTableTitle=res.tittle;
+this.orgName=res.orgName;
           this.average=data.average||0
           if (this.targetList) {
             this.obj = Object.keys(this.targetList[0]);

src/views/system/device/index.vue

@@ -248,8 +248,13 @@
               </el-select>
             </el-form-item>
           </el-col>
+
+   
+    
+
         </el-row>
         <el-row>
+        
           <el-col :span="12">
             <el-form-item label="设备名称" prop="deviceName">
               <el-input
@@ -303,6 +308,11 @@
               />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否高清"   v-if="form.deviceType == 2" >
+                <el-switch v-model="form.definition" active-value="1" inactive-value="0"></el-switch>
+              </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row>
@@ -486,6 +496,7 @@ export default {
         maintenanceTerm: null,
         hostId: null,
         channel: null,
+        definition:"1",
       },
       // 表单校验
 
@@ -654,6 +665,7 @@ export default {
         delFlag: null,
         hostId: null,
         channel: null,
+        definition:"1",
       };
       this.resetForm("form");
     },

src/views/system/user/extend.vue

@@ -154,14 +154,14 @@
           </el-row>
           <el-row>
             <el-col :xs="24" :sm="12" :md="8" :lg="6">
-              <el-form-item label="分管领导姓名" prop="responsibilitiesLeaderName">
+              <el-form-item  v-if ="formData.duties==1" label="分管领导姓名" prop="responsibilitiesLeaderName">
                 <el-input maxlength="50" style="width: 217px;" v-model="formData.responsibilitiesLeaderName"
                           placeholder="请输入分管领导姓名">
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :md="8" :lg="6">
-              <el-form-item label="分管领导职务" prop="responsibilitiesLeaderDuties">
+              <el-form-item v-if ="formData.duties==1" label="分管领导职务" prop="responsibilitiesLeaderDuties">
                 <el-select style="width: 217px;" v-model="formData.responsibilitiesLeaderDuties" placeholder="请选择分管领导职务">
                   <el-option v-for="dict in dict.type.sys_duties" :key="dict.value" :label="dict.label"
                              :value="dict.value" />